r18157: Fix building with external popt.

[bbaumbach/samba-autobuild/.git] / source4 / lib / popt / libpopt.m4

diff --git a/source4/lib/popt/libpopt.m4 b/source4/lib/popt/libpopt.m4
index 19b99f2bd0f92ca2a6dcf9505c9109b965568660..b6b8808a4e24332c7413f87695dd074a96d5fab1 100644 (file)
--- a/source4/lib/popt/libpopt.m4
+++ b/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;
+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