From 25bd77ad555a8c6992beb60434c411413ef79896 Mon Sep 17 00:00:00 2001
From: Jelmer Vernooij <jelmer@samba.org>
Date: Sat, 29 Apr 2006 14:01:49 +0000
Subject: r15323: Fix internal popt build (This used to be commit
 e392c1e167da5fb2ee8c813e416b8fa51b3969e4)

---
 source4/lib/basic.mk       |  1 -
 source4/lib/popt/config.m4 |  4 ++--
 source4/lib/popt/config.mk | 10 ----------
 3 files changed, 2 insertions(+), 13 deletions(-)
 delete mode 100644 source4/lib/popt/config.mk

(limited to 'source4')

diff --git a/source4/lib/basic.mk b/source4/lib/basic.mk
index 0a616ce6fd..27f1f1afb9 100644
--- a/source4/lib/basic.mk
+++ b/source4/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/source4/lib/popt/config.m4 b/source4/lib/popt/config.m4
index 62003f9e16..d48cbe1dff 100644
--- a/source4/lib/popt/config.m4
+++ b/source4/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/source4/lib/popt/config.mk b/source4/lib/popt/config.mk
deleted file mode 100644
index 123b12e5d2..0000000000
--- a/source4/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
-##############################
-- 
cgit