diff options
Diffstat (limited to 'source4')
| -rw-r--r-- | source4/lib/popt/config.m4 | 38 | ||||
| -rw-r--r-- | source4/lib/popt/libpopt.m4 | 14 |
2 files changed, 14 insertions, 38 deletions
diff --git a/source4/lib/popt/config.m4 b/source4/lib/popt/config.m4 deleted file mode 100644 index af9cb27851..0000000000 --- a/source4/lib/popt/config.m4 +++ /dev/null @@ -1,38 +0,0 @@ -################################################# -# Check to see if we should use the included popt - -INCLUDED_POPT=auto -AC_ARG_WITH(included-popt, -[ --with-included-popt use bundled popt library, not from system], -[ -case "$withval" in - yes) - INCLUDED_POPT=yes - ;; - no) - INCLUDED_POPT=no - ;; -esac ], -) -if test x"$INCLUDED_POPT" != x"yes"; then - AC_CHECK_HEADERS(popt.h) - AC_CHECK_LIB_EXT(popt, TMP_LIBPOPT_LIBS, poptGetContext, [], [], INCLUDED_POPT=no) - if test x"$ac_cv_header_popt_h" = x"no"; then - INCLUDED_POPT=yes - TMP_LIBPOPT_LIBS="" - fi -fi - -AC_MSG_CHECKING(whether to use included popt) -if test x"$INCLUDED_POPT" != x"no"; then - SMB_SUBSYSTEM(LIBPOPT, - [lib/popt/findme.o lib/popt/popt.o lib/popt/poptconfig.o lib/popt/popthelp.o lib/popt/poptparse.o], [], [-I$srcdir/lib/popt]) - - AC_MSG_RESULT(yes) -else - SMB_EXT_LIB(LIBPOPT, [${TMP_LIBPOPT_LIBS}]) - SMB_ENABLE(LIBPOPT,YES) - AC_MSG_RESULT(no) -fi - -AC_CHECK_HEADERS([float.h alloca.h]) diff --git a/source4/lib/popt/libpopt.m4 b/source4/lib/popt/libpopt.m4 new file mode 100644 index 0000000000..19b99f2bd0 --- /dev/null +++ b/source4/lib/popt/libpopt.m4 @@ -0,0 +1,14 @@ +dnl find the popt sources. This is meant to work both for +dnl popt standalone builds, and builds of packages using popt +poptdir="" +for d in "$srcdir" "$srcdir/lib/popt" "$srcdir/popt" "$srcdir/../popt"; do + if test -f "$d/popt.c"; then + poptdir="$d" + AC_SUBST(poptdir) + break; + fi +done +POPTOBJ="popt.o findme.o poptconfig.o popthelp.o poptparse.o" +AC_SUBST(POPTOBJ) + +AC_CHECK_HEADERS([float.h alloca.h]) |