* config.mak.in: Replace LIBWRAP with AUX_LIBS so that they

will be included in gsweb.make makefile fragment.
	* configure.ac: Fine tune check to test whether we need
	libnsl.
	* GSWeb.framework/gsweb.gsdoc: Remove obsolete documentation
	of libwrap realted build option.


git-svn-id: svn+ssh://svn.gna.org/svn/gnustep/libs/gsweb/trunk@19355 72102866-910b-0410-8b05-ffd578937521

ChangeLog

@@ -8,6 +8,12 @@
 	* GSWeb.framework/GSWSession.m,
 	* GSWeb.framework/GSWTemplateParser.m: Do not initialize va_list
 	with NULL.
+
+	* config.mak.in: Replace LIBWRAP with AUX_LIBS so that they will
+	be included in gsweb.make makefile fragment.
+	* configure.ac: Fine tune check to test whether we need libnsl.
+	* GSWeb.framework/gsweb.gsdoc: Remove obsolete documentation of
+	libwrap realted build option.
 	
 2004-05-14   Manuel Guesdon <mguesdon@orange-concept.com>
 

GSWeb.framework/gsweb.gsdoc

@@ -25,10 +25,6 @@
           <desc>
             Use GNUstepWeb with gdl2 library
           </desc>
-          <term>LIBWRAP=yes</term>
-          <desc>
-            Link with tcpd_libwrap (you know: hosts.deny, hosts.allow and this kind of things)
-          </desc>
           <term>GSWDEBUG_DEEP=yes</term>
           <desc>
             Activate deep debug features (works only if debug=yes is set)

config.mak.in

@@ -3,7 +3,7 @@
 #
 DYNAMIC_LINKER=simple
 GDL2=@GDL2@
-LIBWRAP=@LIBWRAP@
+AUX_LIBS=@AUX_LIBS@
 
 #EOControl dependancy
 ifeq ($(GDL2),yes)

configure

@@ -1212,6 +1212,7 @@ fi
 #--------------------------------------------------------------------
 # Check for libwrap
 #--------------------------------------------------------------------
+saved_LIBS="$LIBS"
 ac_ext=c
 ac_cpp='$CPP $CPPFLAGS'
 ac_compile='$CC -c $CFLAGS $CPPFLAGS conftest.$ac_ext >&5'
@@ -2027,15 +2028,107 @@ else
 fi
 
 if test "$wrap_ok" = yes; then
-  AUX_LIBS="$AUX_LIBS -lwrap"
+  LIBS="-lwrap"
-  USE_LIBWRAP=1
+  echo -n "checking whether libnsl is needed... "
-  cat >>confdefs.h <<\_ACEOF
+  cat >conftest.$ac_ext <<_ACEOF
+#line $LINENO "configure"
+#include "confdefs.h"
+#include <tcpd.h>
+	       int allow_severity, deny_severity;
+#ifdef F77_DUMMY_MAIN
+#  ifdef __cplusplus
+     extern "C"
+#  endif
+   int F77_DUMMY_MAIN() { return 1; }
+#endif
+int
+main ()
+{
+struct request_info *request; hosts_access(request);
+  ;
+  return 0;
+}
+_ACEOF
+rm -f conftest.$ac_objext conftest$ac_exeext
+if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5
+  (eval $ac_link) 2>&5
+  ac_status=$?
+  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+  (exit $ac_status); } &&
+         { ac_try='test -s conftest$ac_exeext'
+  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
+  (eval $ac_try) 2>&5
+  ac_status=$?
+  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+  (exit $ac_status); }; }; then
+  need_nsl=no
+else
+  echo "$as_me: failed program was:" >&5
+cat conftest.$ac_ext >&5
+need_nsl=yes
+fi
+rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
+  echo $need_nsl
+  if test "$need_nsl" = yes; then
+    LIBS="$LIBS -lnsl";
+    echo -n "checking whether -lwrap and -lnsl work... "
+    cat >conftest.$ac_ext <<_ACEOF
+#line $LINENO "configure"
+#include "confdefs.h"
+#include <tcpd.h>
+	         int allow_severity, deny_severity;
+#ifdef F77_DUMMY_MAIN
+#  ifdef __cplusplus
+     extern "C"
+#  endif
+   int F77_DUMMY_MAIN() { return 1; }
+#endif
+int
+main ()
+{
+struct request_info *request; hosts_access(request);
+  ;
+  return 0;
+}
+_ACEOF
+rm -f conftest.$ac_objext conftest$ac_exeext
+if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5
+  (eval $ac_link) 2>&5
+  ac_status=$?
+  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+  (exit $ac_status); } &&
+         { ac_try='test -s conftest$ac_exeext'
+  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
+  (eval $ac_try) 2>&5
+  ac_status=$?
+  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+  (exit $ac_status); }; }; then
+  need_nsl=yes
+else
+  echo "$as_me: failed program was:" >&5
+cat conftest.$ac_ext >&5
+need_nsl=error
+fi
+rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
+    if test "$need_nsl" = error; then
+      echo -n " libwrap seems unusable even with libnsl! :"
+      wrap_ok=no
+    fi
+    echo $need_nsl
+  fi
+
+  if test "$wrap_ok" = yes; then
+    AUX_LIBS="$AUX_LIBS $LIBS"
+    HAVE_LIBWRAP=1
+    cat >>confdefs.h <<\_ACEOF
 #define HAVE_LIBWRAP 1
 _ACEOF
 
+  fi
 fi
 LIBWRAP=$wrap_ok
 
+LIBS="$saved_LIBS"
 
 #--------------------------------------------------------------------
 # Check recent libxml for XML parser

configure.ac

@@ -56,13 +56,38 @@ AC_SUBST(GDL2)
 #--------------------------------------------------------------------
 # Check for libwrap
 #--------------------------------------------------------------------
+saved_LIBS="$LIBS"
 AC_CHECK_LIB(wrap, main, wrap_ok=yes, wrap_ok=no)
 if test "$wrap_ok" = yes; then
-  AUX_LIBS="$AUX_LIBS -lwrap"
+  LIBS="-lwrap"
-  USE_LIBWRAP=1
+  echo -n "checking whether libnsl is needed... "
-  AC_DEFINE(HAVE_LIBWRAP)
+  AC_TRY_LINK([#include <tcpd.h>
+	       int allow_severity, deny_severity;],
+	      [struct request_info *request; hosts_access(request);],
+	need_nsl=no, need_nsl=yes)
+  echo $need_nsl
+  if test "$need_nsl" = yes; then
+    LIBS="$LIBS -lnsl";
+    echo -n "checking whether -lwrap and -lnsl work... "
+    AC_TRY_LINK([#include <tcpd.h>
+	         int allow_severity, deny_severity;],
+	        [struct request_info *request; hosts_access(request);],
+	need_nsl=yes,need_nsl=error)
+    if test "$need_nsl" = error; then
+      echo -n " libwrap seems unusable even with libnsl! :"
+      wrap_ok=no
+    fi
+    echo $need_nsl
+  fi
+
+  if test "$wrap_ok" = yes; then
+    AUX_LIBS="$AUX_LIBS $LIBS"
+    HAVE_LIBWRAP=1
+    AC_DEFINE(HAVE_LIBWRAP)
+  fi
 fi
 AC_SUBST(LIBWRAP,$wrap_ok)
+LIBS="$saved_LIBS"
 
 #--------------------------------------------------------------------
 # Check recent libxml for XML parser