diff options
| author | Jelmer Vernooij <jelmer@samba.org> | 2006-04-29 14:01:49 +0000 |
|---|---|---|
| committer | Gerald (Jerry) Carter <jerry@samba.org> | 2007-10-10 14:05:16 -0500 |
| commit | 25bd77ad555a8c6992beb60434c411413ef79896 (patch) | |
| tree | 659296c5443fd848b7c55e79d73252cec1537334 | |
| parent | d81890c1cc4dbdc9bb8645958693f42f9e96848d (diff) | |
| download | samba-25bd77ad555a8c6992beb60434c411413ef79896.tar.gz samba-25bd77ad555a8c6992beb60434c411413ef79896.tar.bz2 samba-25bd77ad555a8c6992beb60434c411413ef79896.zip | |
r15323: Fix internal popt build
(This used to be commit e392c1e167da5fb2ee8c813e416b8fa51b3969e4)
| -rw-r--r-- | source4/lib/basic.mk | 1 | ||||
| -rw-r--r-- | source4/lib/popt/config.m4 | 4 | ||||
| -rw-r--r-- | source4/lib/popt/config.mk | 10 |
3 files changed, 2 insertions, 13 deletions
diff --git a/source4/lib/basic.mk b/source4/lib/basic.mk index 0a616ce6fd..27f1f1afb9 100644 --- a/source4/lib/basic.mk +++ b/source4/lib/basic.mk @@ -10,7 +10,6 @@ include tls/config.mk include registry/config.mk include messaging/config.mk include events/config.mk -include popt/config.mk include cmdline/config.mk include socket_wrapper/config.mk include appweb/config.mk diff --git a/source4/lib/popt/config.m4 b/source4/lib/popt/config.m4 index 62003f9e16..d48cbe1dff 100644 --- a/source4/lib/popt/config.m4 +++ b/source4/lib/popt/config.m4 @@ -27,8 +27,8 @@ AC_MSG_CHECKING(whether to use included popt) if test x"$INCLUDED_POPT" != x"no"; then CPPFLAGS="$CPPFLAGS -I$srcdir/lib/popt" SMB_SUBSYSTEM(LIBPOPT, - [], - [INT_LIB_POPT]) + [lib/popt/findme.o lib/popt/popt.o lib/popt/poptconfig.o lib/popt/popthelp.o lib/popt/poptparse.o], []) + AC_MSG_RESULT(yes) else SMB_EXT_LIB(LIBPOPT, [${TMP_LIBPOPT_LIBS}]) diff --git a/source4/lib/popt/config.mk b/source4/lib/popt/config.mk deleted file mode 100644 index 123b12e5d2..0000000000 --- a/source4/lib/popt/config.mk +++ /dev/null @@ -1,10 +0,0 @@ -############################## -# Start SUBSYSTEM INT_LIB_POPT -[SUBSYSTEM::INT_LIB_POPT] -OBJ_FILES = findme.o \ - popt.o \ - poptconfig.o \ - popthelp.o \ - poptparse.o -# End SUBSYSTEM INT_LIB_POPT -############################## |