r22699: Reduce amount of magic required for popt detection.

(This used to be commit 05ca6ecef70b0e66348b479badcb77d0a0bef9f2)

diff --git a/source4/lib/popt/config.mk b/source4/lib/popt/config.mk
new file mode 100644 (file)
index 0000000..ad21851
--- /dev/null
+++ b/source4/lib/popt/config.mk
@@ -0,0 +1,7 @@
+[SUBSYSTEM::LIBPOPT]
+OBJ_FILES = findme.o \
+                       popt.o \
+                       poptconfig.o \
+                       popthelp.o \
+                       poptparse.o
+CFLAGS = -Ilib/popt

diff --git a/source4/lib/popt/samba.m4 b/source4/lib/popt/samba.m4
index b6e939f5a0421e56fe5ec494476ba52b436a62f1..855fd6c402690d2ff03d21f9ca51a666af537896 100644 (file)
--- a/source4/lib/popt/samba.m4
+++ b/source4/lib/popt/samba.m4
@@ -2,9 +2,7 @@ m4_include(lib/popt/libpopt.m4)
 
 if test x"$POPT_OBJ" = "x"; then
        SMB_EXT_LIB(LIBPOPT, [${POPT_LIBS}])
-       SMB_ENABLE(LIBPOPT,YES)
 else
-       SMB_SUBSYSTEM(LIBPOPT,
-       [lib/popt/findme.o lib/popt/popt.o lib/popt/poptconfig.o lib/popt/popthelp.o lib/popt/poptparse.o], [], [-Ilib/popt])
+       SMB_INCLUDE_MK(lib/popt/config.mk)
 fi