summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--source4/lib/popt/config.mk7
-rw-r--r--source4/lib/popt/samba.m44
2 files changed, 8 insertions, 3 deletions
diff --git a/source4/lib/popt/config.mk b/source4/lib/popt/config.mk
new file mode 100644
index 0000000000..ad218517b3
--- /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 b6e939f5a0..855fd6c402 100644
--- 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