From ca72dbec9a66d5624ccdc79076b30f4e13883e2a Mon Sep 17 00:00:00 2001 From: Jelmer Vernooij Date: Sun, 6 May 2007 15:58:12 +0000 Subject: r22699: Reduce amount of magic required for popt detection. (This used to be commit 05ca6ecef70b0e66348b479badcb77d0a0bef9f2) --- source4/lib/popt/config.mk | 7 +++++++ source4/lib/popt/samba.m4 | 4 +--- 2 files changed, 8 insertions(+), 3 deletions(-) create mode 100644 source4/lib/popt/config.mk 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 -- cgit