diff options
| author | Jelmer Vernooij <jelmer@samba.org> | 2005-03-19 19:31:25 +0000 |
|---|---|---|
| committer | Gerald (Jerry) Carter <jerry@samba.org> | 2007-10-10 13:11:08 -0500 |
| commit | 105660d3f9b537fa47fe6e33c0418a1d8f85e0e9 (patch) | |
| tree | d2dc24b88f363ab04f63a48de22486de22629aa2 /source4/lib/popt/config.m4 | |
| parent | 63b5ad6d5403f97423af0e8c542714ed691e667f (diff) | |
| download | samba-105660d3f9b537fa47fe6e33c0418a1d8f85e0e9.tar.gz samba-105660d3f9b537fa47fe6e33c0418a1d8f85e0e9.tar.bz2 samba-105660d3f9b537fa47fe6e33c0418a1d8f85e0e9.zip | |
r5906: Fix the usage of the internal popt (make proto should ignore it)
Updated included popt to 1.7.
(This used to be commit d60cb643e8a46771f3d836307ea45b869f34dc9b)
Diffstat (limited to 'source4/lib/popt/config.m4')
| -rw-r--r-- | source4/lib/popt/config.m4 | 15 |
1 files changed, 8 insertions, 7 deletions
diff --git a/source4/lib/popt/config.m4 b/source4/lib/popt/config.m4 index ff4455efa2..d5a8df9200 100644 --- a/source4/lib/popt/config.m4 +++ b/source4/lib/popt/config.m4 @@ -25,16 +25,17 @@ fi AC_MSG_CHECKING(whether to use included popt) if test x"$INCLUDED_POPT" != x"no"; then - TMP_LIBPOPT_OBJS="lib/popt/findme.o lib/popt/popt.o lib/popt/poptconfig.o \ - lib/popt/popthelp.o lib/popt/poptparse.o" CPPFLAGS="$CPPFLAGS -I$srcdir/lib/popt" + SMB_SUBSYSTEM(LIBPOPT,[], + [], + [INT_LIB_POPT]) AC_MSG_RESULT(yes) else + SMB_SUBSYSTEM(LIBPOPT,[], + [], + [EXT_LIB_POPT]) + SMB_EXT_LIB(POPT, [${TMP_LIBPOPT_LIBS}]) AC_MSG_RESULT(no) fi -SMB_EXT_LIB(POPT, [${TMP_LIBPOPT_LIBS}]) - -SMB_SUBSYSTEM(LIBPOPT,[], - [${TMP_LIBPOPT_OBJS}], - [EXT_LIB_POPT]) +AC_CHECK_HEADERS([float.h]) |