r15323: Fix internal popt build

diff --git a/source/lib/basic.mk b/source/lib/basic.mk
index 0a616ce6fdd9b9d5253dca0d712c647591bf6eb4..27f1f1afb9e641854e86ab2752c4c9abe3ab9dcb 100644 (file)
--- a/source/lib/basic.mk
+++ b/source/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/source/lib/popt/config.m4 b/source/lib/popt/config.m4
index 62003f9e16848f77959aec109ed2dd028e5c7b6c..d48cbe1dff42b53ed7f20dccd1d19f5c9a253b41 100644 (file)
--- a/source/lib/popt/config.m4
+++ b/source/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/source/lib/popt/config.mk b/source/lib/popt/config.mk
deleted file mode 100644 (file)
index 123b12e..0000000
--- a/source/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
-##############################