- fix libwrap detection when having a shared library; based on NetBSD

patch
- also fixed autoconf to have HAVE_HOSTS_ACCESS defined when using a
shared libwrap library
This commit is contained in:
brad 2001-03-15 01:15:23 +00:00
parent eac1f0ea98
commit 83e3e9c25f
2 changed files with 60 additions and 0 deletions

View File

@ -0,0 +1,30 @@
$OpenBSD: patch-configure,v 1.1 2001/03/15 01:15:23 brad Exp $
--- configure.orig Wed Mar 14 17:34:52 2001
+++ configure Wed Mar 14 17:35:47 2001
@@ -3450,7 +3450,7 @@
-L*)
THEFILE="`echo $I | sed -e 's,^-L,,'`"
echo "From $I, checking in dir $THEFILE for libwrap.so" 1>&5
- if test -f $THEFILE/libwrap.so; then
+ if test -f $THEFILE/libwrap.so*; then
LIB_WRAP=-lwrap
echo "Found $THEFILE/libwrap.so" 1>&5
break
@@ -3485,7 +3485,7 @@
fi
LIB_NSL=
-if test -n "$LIBWRAP_PATH"; then
+if test -n "$LIBWRAP_PATH" || test -n "$LIB_WRAP"; then
echo $ac_n "checking whether -lwrap requires -lnsl""... $ac_c" 1>&6
echo "configure:3491: checking whether -lwrap requires -lnsl" >&5
ORIG_LIBS="$LIBS"
@@ -3555,7 +3555,7 @@
HAVE_HOSTS_ACCESS_TRUE='#'
HAVE_HOSTS_ACCESS_FALSE=
fi
-if test -n "$LIBWRAP_PATH"; then
+if test -n "$LIBWRAP_PATH" || test -n "$LIB_WRAP"; then
cat >> confdefs.h <<\EOF
#define HAVE_HOSTS_ACCESS 1
EOF

View File

@ -0,0 +1,30 @@
$OpenBSD: patch-configure_in,v 1.1 2001/03/15 01:15:23 brad Exp $
--- configure.in.orig Tue Jan 30 15:49:57 2001
+++ configure.in Wed Mar 14 17:33:43 2001
@@ -161,7 +161,7 @@
-L*)
THEFILE="`echo $I | sed -e 's,^-L,,'`"
echo "From $I, checking in dir $THEFILE for libwrap.so" 1>&5
- if test -f $THEFILE/libwrap.so; then
+ if test -f $THEFILE/libwrap.so*; then
LIB_WRAP=-lwrap
echo "Found $THEFILE/libwrap.so" 1>&5
break
@@ -197,7 +197,7 @@
dnl find out if we need -lnsl or whatever
LIB_NSL=
-if test -n "$LIBWRAP_PATH"; then
+if test -n "$LIBWRAP_PATH" || test -n "$LIB_WRAP"; then
AC_MSG_CHECKING(whether -lwrap requires -lnsl)
ORIG_LIBS="$LIBS"
LIBS="$LIBWRAP_PATH $LIB_WRAP $LIBS"
@@ -227,7 +227,7 @@
AC_SUBST(LIBWRAP_PATH)
AC_SUBST(LIB_WRAP)
AM_CONDITIONAL(HAVE_HOSTS_ACCESS, test -n "$LIBWRAP_PATH")
-if test -n "$LIBWRAP_PATH"; then
+if test -n "$LIBWRAP_PATH" || test -n "$LIB_WRAP"; then
AC_DEFINE(HAVE_HOSTS_ACCESS)
fi