39 lines
1.2 KiB
Plaintext
39 lines
1.2 KiB
Plaintext
$OpenBSD: patch-configure_in,v 1.4 2004/07/14 23:35:09 naddy Exp $
|
|
--- configure.in.orig Mon Jan 7 10:09:28 2002
|
|
+++ configure.in Thu Jul 15 01:23:30 2004
|
|
@@ -161,7 +161,7 @@ for I in $LDFLAGS $LIBS -L/usr/lib; do
|
|
-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 "`echo $THEFILE/libwrap.so*`" != "$THEFILE/libwrap.so*"; then
|
|
LIB_WRAP=-lwrap
|
|
echo "Found $THEFILE/libwrap.so" 1>&5
|
|
break
|
|
@@ -197,7 +197,7 @@ fi
|
|
|
|
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 @@ fi
|
|
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
|
|
|
|
@@ -324,7 +324,6 @@ AC_CHECK_ALIGNOF(CORBA_pointer)
|
|
CPPFLAGS=$orig_CPPFLAGS
|
|
|
|
AC_CONFIG_SUBDIRS(libIDL)
|
|
-AC_CONFIG_SUBDIRS(popt)
|
|
|
|
AC_SUBST(pkglibdir)
|
|
|