summaryrefslogtreecommitdiff
path: root/source4
diff options
context:
space:
mode:
authorJelmer Vernooij <jelmer@samba.org>2007-05-06 15:58:12 +0000
committerGerald (Jerry) Carter <jerry@samba.org>2007-10-10 14:52:03 -0500
commitca72dbec9a66d5624ccdc79076b30f4e13883e2a (patch)
tree951c65ca4d4d6880e0b08620a635ed4f5ee3223d /source4
parentb3a4fd11e9a006ca6cd2a6910d7dfd68af0a6c9a (diff)
downloadsamba-ca72dbec9a66d5624ccdc79076b30f4e13883e2a.tar.gz
samba-ca72dbec9a66d5624ccdc79076b30f4e13883e2a.tar.bz2
samba-ca72dbec9a66d5624ccdc79076b30f4e13883e2a.zip
r22699: Reduce amount of magic required for popt detection.
(This used to be commit 05ca6ecef70b0e66348b479badcb77d0a0bef9f2)
Diffstat (limited to 'source4')
-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