summaryrefslogtreecommitdiff
path: root/source4
diff options
context:
space:
mode:
authorAndrew Tridgell <tridge@samba.org>2006-09-05 23:48:05 +0000
committerGerald (Jerry) Carter <jerry@samba.org>2007-10-10 14:17:18 -0500
commitbbb725a8b6ac412c44495f59bea4afdefef885f4 (patch)
tree35ce9ff7f1e11dc4df471474f44b90d327d26955 /source4
parentea086c1cc894f3bf54688d9435174fe33ec6ffd2 (diff)
downloadsamba-bbb725a8b6ac412c44495f59bea4afdefef885f4.tar.gz
samba-bbb725a8b6ac412c44495f59bea4afdefef885f4.tar.bz2
samba-bbb725a8b6ac412c44495f59bea4afdefef885f4.zip
r18110: renamed config.m4 for popt
(This used to be commit 495fcdddb2ead6f2cd6d1479cade1f025997f8ba)
Diffstat (limited to 'source4')
-rw-r--r--source4/lib/popt/config.m438
-rw-r--r--source4/lib/popt/libpopt.m414
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])