48 lines
1.9 KiB
Plaintext
48 lines
1.9 KiB
Plaintext
$OpenBSD: patch-configure_in,v 1.4 2010/10/16 11:26:33 jsg Exp $
|
|
--- configure.in.orig Sun Dec 3 06:16:50 2000
|
|
+++ configure.in Fri Oct 15 18:47:09 2010
|
|
@@ -109,13 +109,13 @@ AC_ARG_WITH(db,
|
|
AC_DEFINE(HAVE_DB_185_H)
|
|
DBINC="-I$withval/dist"
|
|
DBLIB="-L$withval/dist -ldb"
|
|
- elif test -f $withval/include/db_185.h -a \
|
|
- -f $withval/lib/libdb.a; then
|
|
+ elif test -f $withval/include/db/db_185.h -a \
|
|
+ -f $withval/lib/db/libdb.a; then
|
|
owd=`pwd`
|
|
if cd $withval; then withval=`pwd`; cd $owd; fi
|
|
AC_DEFINE(HAVE_DB_185_H)
|
|
- DBINC="-I$withval/include"
|
|
- DBLIB="-L$withval/lib -ldb"
|
|
+ DBINC="-I$withval/include/db"
|
|
+ DBLIB="-L$withval/lib/db -ldb"
|
|
else
|
|
AC_ERROR(db_185.h or libdb.a not found in $withval or not configured with --enable-compat185)
|
|
fi
|
|
@@ -212,8 +212,8 @@ AC_ARG_WITH(libnet,
|
|
if test -f $withval/include/libnet.h -a -f $withval/lib/libnet.a; then
|
|
owd=`pwd`
|
|
if cd $withval; then withval=`pwd`; cd $owd; fi
|
|
- if test -f $withval/bin/libnet-config; then
|
|
- CFLAGS="$CFLAGS `$withval/bin/libnet-config --defines`"
|
|
+ if test -f $withval/bin/libnet-config-1.0; then
|
|
+ CFLAGS="$CFLAGS `$withval/bin/libnet-config-1.0 --defines`"
|
|
elif test -f $withval/libnet-config; then
|
|
CFLAGS="$CFLAGS `$withval/libnet-config --defines`"
|
|
else
|
|
@@ -226,10 +226,10 @@ AC_ARG_WITH(libnet,
|
|
fi
|
|
;;
|
|
esac ],
|
|
-[ if test -f ${prefix}/include/libnet.h; then
|
|
- CFLAGS="$CFLAGS `${prefix}/bin/libnet-config --defines`"
|
|
- LNETINC="-I${prefix}/include"
|
|
- LNETLIB="-L${prefix}/lib -lnet"
|
|
+[ if test -f ${prefix}/include/libnet-1.0/libnet.h; then
|
|
+ CFLAGS="$CFLAGS `${prefix}/bin/libnet-config-1.0 --defines`"
|
|
+ LNETINC="-I${prefix}/include/libnet-1.0"
|
|
+ LNETLIB="-L${prefix}/lib/libnet-1.0 -lnet"
|
|
elif test -f /usr/include/libnet.h; then
|
|
CFLAGS="$CFLAGS `libnet-config --defines`"
|
|
LNETLIB="-lnet"
|