r18157: Fix building with external popt.

(This used to be commit 72e71de3e591091d71e43a3c9efd1cafd82d6c89)

source4/lib/popt/libpopt.m4

@@ -1,14 +1,39 @@
-dnl find the popt sources. This is meant to work both for 
-dnl popt standalone builds, and builds of packages using popt
-poptdir=""
-for d in "$srcdir" "$srcdir/lib/popt" "$srcdir/popt" "$srcdir/../popt"; do
-	if test -f "$d/popt.c"; then
-		poptdir="$d"		
-		AC_SUBST(poptdir)
-		break;
-	fi
-done
-POPTOBJ="popt.o findme.o poptconfig.o popthelp.o poptparse.o"
-AC_SUBST(POPTOBJ)
+dnl Check to see if we should use the included popt
 
-AC_CHECK_HEADERS([float.h alloca.h])
+INCLUDED_POPT=auto
+AC_ARG_WITH(included-popt,
+[  --with-included-popt    use bundled popt library, not from system],
+[ INCLUDED_POPT=$withval ])
+
+AC_SUBST(POPT_LIBS)
+AC_SUBST(POPT_CFLAGS)
+
+if test x"$INCLUDED_POPT" != x"yes"; then
+	AC_CHECK_HEADERS(popt.h)
+	AC_CHECK_LIB(popt, poptGetContext, [ POPT_LIBS="-lpopt" ])
+	if test x"$ac_cv_header_popt_h" = x"no"; then
+		INCLUDED_POPT=yes
+		POPT_CFLAGS=""
+	else
+		INCLUDED_POPT=no
+	fi
+fi
+
+AC_MSG_CHECKING(whether to use included popt)
+AC_MSG_RESULT($INCLUDED_POPT)
+if test x"$INCLUDED_POPT" != x"no"; then
+	dnl find the popt sources. This is meant to work both for 
+	dnl popt standalone builds, and builds of packages using popt
+	poptdir=""
+	for d in "$srcdir" "$srcdir/lib/popt" "$srcdir/popt" "$srcdir/../popt"; do
+		if test -f "$d/popt.c"; then
+			poptdir="$d"		
+			POPT_CFLAGS="-I$d"
+			AC_SUBST(poptdir)
+			break
+		fi
+	done
+	POPTOBJ="popt.o findme.o poptconfig.o popthelp.o poptparse.o"
+	AC_SUBST(POPTOBJ)
+	AC_CHECK_HEADERS([float.h alloca.h])
+fi

source4/lib/popt/samba.m4

@@ -1,3 +1,10 @@
 m4_include(lib/popt/libpopt.m4)
-SMB_SUBSYSTEM(LIBPOPT,
+
+if test x"$POPTOBJ" = "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], [], [-I$srcdir/lib/popt])
+fi
+