svn commit: samba r18157 - in branches/SAMBA_4_0/source/lib/popt: .

jelmer at samba.org jelmer at samba.org
Wed Sep 6 10:50:53 GMT 2006


Author: jelmer
Date: 2006-09-06 10:50:52 +0000 (Wed, 06 Sep 2006)
New Revision: 18157

WebSVN: http://websvn.samba.org/cgi-bin/viewcvs.cgi?view=rev&root=samba&rev=18157

Log:
Fix building with external popt.

Modified:
   branches/SAMBA_4_0/source/lib/popt/libpopt.m4
   branches/SAMBA_4_0/source/lib/popt/samba.m4


Changeset:
Modified: branches/SAMBA_4_0/source/lib/popt/libpopt.m4
===================================================================
--- branches/SAMBA_4_0/source/lib/popt/libpopt.m4	2006-09-06 10:40:36 UTC (rev 18156)
+++ branches/SAMBA_4_0/source/lib/popt/libpopt.m4	2006-09-06 10:50:52 UTC (rev 18157)
@@ -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;
+dnl Check to see if we should use the included popt
+
+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
-done
-POPTOBJ="popt.o findme.o poptconfig.o popthelp.o poptparse.o"
-AC_SUBST(POPTOBJ)
+fi
 
-AC_CHECK_HEADERS([float.h alloca.h])
+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

Modified: branches/SAMBA_4_0/source/lib/popt/samba.m4
===================================================================
--- branches/SAMBA_4_0/source/lib/popt/samba.m4	2006-09-06 10:40:36 UTC (rev 18156)
+++ branches/SAMBA_4_0/source/lib/popt/samba.m4	2006-09-06 10:50:52 UTC (rev 18157)
@@ -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
+



More information about the samba-cvs mailing list