move the -lpopt replacement to a LIBPOPT subsystem

[samba.git] / source4 / popt / config.m4

diff --git a/source4/popt/config.m4 b/source4/popt/config.m4
index 7532c5826e76dc05c39fad3773a3791e2d0e9043..0be7d308c7d1e411d2c8d1e6387c7051664d3d63 100644 (file)
--- a/source4/popt/config.m4
+++ b/source4/popt/config.m4
@@ -1,31 +1,40 @@
 #################################################
-# Check to see if we should use the included popt 
+# 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],
 [ 
-  case "$withval" in
+case "$withval" in
        yes)
                INCLUDED_POPT=yes
                ;;
         no)
-               INCLUDED_POPT=no
-                ;;
-  esac ],
+               INCLUDED_POPT=no
+               ;;
+esac ],
 )
 if test x"$INCLUDED_POPT" != x"yes"; then
-    AC_CHECK_LIB(popt, poptGetContext,
-                INCLUDED_POPT=no, INCLUDED_POPT=yes)
+       AC_CHECK_HEADERS(popt.h)
+       AC_CHECK_LIB_EXT(popt, TMP_LIBPOPT_LIBS, poptGetContext, [], [], INCLUDED_POPT=no)
+       if test x"$ac_cv_header_popt_h" = x"no"; then
+               INCLUDED_POPT=yes
+               TMP_LIBPOPT_LIBS=""
+       fi
 fi
 
 AC_MSG_CHECKING(whether to use included popt)
-if test x"$INCLUDED_POPT" = x"yes"; then
-    AC_MSG_RESULT(yes)
-    BUILD_POPT='$(POPT_OBJS)'
-    FLAGS1="-I$srcdir/popt"
+if test x"$INCLUDED_POPT" != x"no"; then
+       TMP_LIBPOPT_OBJS="popt/findme.o popt/popt.o popt/poptconfig.o \
+                               popt/popthelp.o popt/poptparse.o"
+       CPPFLAGS="$CPPFLAGS -I$srcdir/popt"
+       AC_MSG_RESULT(yes)
 else
-    AC_MSG_RESULT(no)
-    LIBS="$LIBS -lpopt"
+       AC_MSG_RESULT(no)
 fi
-AC_SUBST(BUILD_POPT)
-AC_SUBST(FLAGS1)
+
+SMB_SUBSYSTEM(LIBPOPT,[],
+               [${TMP_LIBPOPT_OBJS}],
+               [],
+               [],
+               [${TMP_LIBPOPT_LIBS}])