83 lines
3.1 KiB
Plaintext
83 lines
3.1 KiB
Plaintext
$OpenBSD: patch-configure_in,v 1.1 2008/04/23 20:49:46 okan Exp $
|
|
--- configure.in.orig Thu Jan 13 04:24:28 2005
|
|
+++ configure.in Thu Apr 10 02:03:36 2008
|
|
@@ -272,7 +272,9 @@ AC_SEARCH_LIBS(gzopen,c z,,AC_MSG_ERROR(not found.))
|
|
dnl
|
|
dnl Do we have dn_expand ?
|
|
dnl
|
|
-EC_RESOLVE_CHECK()
|
|
+HAVE_DN_EXPAND_TRUE='#'
|
|
+HAVE_DN_EXPAND_FALSE=
|
|
+ac_ec_dns=no
|
|
|
|
dnl ===============================
|
|
dnl Check for non standard libs
|
|
@@ -328,17 +330,17 @@ AC_ARG_ENABLE(debug, AC_HELP_STRING(--enable-debug,cre
|
|
[ case "$enableval" in
|
|
yes)
|
|
AC_DEFINE(DEBUG, 1)
|
|
- DEBUG_FLAGS="-g -ggdb -Wmissing-prototypes -Wno-uninitialized -Werror -Wformat-security -Wsign-compare -Wall"
|
|
+ DEBUG_FLAGS="-g -ggdb -Wmissing-prototypes -Wno-uninitialized -Wformat-security -Wsign-compare -Wall"
|
|
AC_MSG_RESULT(yes)
|
|
ac_ec_debug=yes
|
|
;;
|
|
no) AC_MSG_RESULT(no)
|
|
- DEBUG_FLAGS="-O2 -funroll-loops -fomit-frame-pointer -Wall"
|
|
+ DEBUG_FLAGS="-Wall"
|
|
ac_ec_debug=no
|
|
;;
|
|
esac ],
|
|
AC_MSG_RESULT(no)
|
|
- DEBUG_FLAGS="-O2 -funroll-loops -fomit-frame-pointer -Wall"
|
|
+ DEBUG_FLAGS="-Wall"
|
|
ac_ec_debug=no
|
|
)
|
|
|
|
@@ -447,15 +449,6 @@ AC_ARG_WITH(libpcap, AC_HELP_STRING(--with-libpcap=DIR
|
|
AC_MSG_RESULT(yes) ]
|
|
)
|
|
|
|
-if test "$OS" = "WINDOWS"; then
|
|
- EC_CHECK_FUNC(wpcap, pcap_datalink_val_to_description, $PCAPLIB, $LIBS,, AC_MSG_ERROR([Incorrect libpcap version. libpcap >= 0.8.1 required]))
|
|
- EC_CHECK_FUNC(packet, PacketInitPacket, $PCAPLIB, $LIBS,, AC_MSG_ERROR([Incorrect libpcap version. libpcap >= 0.8.1 required]))
|
|
- AC_CHECK_LIB(ws2_32, ntohs,, AC_MSG_ERROR([Incorrect ws2_32 version.]))
|
|
- AC_CHECK_LIB(iphlpapi, main)
|
|
-else
|
|
- EC_CHECK_FUNC(pcap, pcap_datalink_val_to_description, $PCAPLIB, $LIBS,, AC_MSG_ERROR([Incorrect libpcap version. libpcap >= 0.8.1 required]))
|
|
-fi
|
|
-
|
|
dnl ---------
|
|
dnl libnet
|
|
dnl ---------
|
|
@@ -483,6 +476,13 @@ AC_ARG_WITH(libnet, AC_HELP_STRING(--with-libnet=DIR,u
|
|
LNETLIB="-L$withval/lib -L$withval/src -lnet"
|
|
ac_ec_libnet=$withval
|
|
AC_MSG_RESULT($withval)
|
|
+ elif test -f $withval/include/libnet-1.1/libnet.h; then
|
|
+ owd=`pwd`
|
|
+ if cd $withval; then withval=`pwd`; cd $owd; fi
|
|
+ LNETINC="-I$withval/include/libnet-1.1"
|
|
+ LNETLIB="-L$withval/lib/libnet-1.1 -lnet"
|
|
+ ac_ec_libnet=$withval
|
|
+ AC_MSG_RESULT($withval)
|
|
else
|
|
AC_MSG_RESULT(no)
|
|
AC_MSG_ERROR([libnet.h not found in $withval])
|
|
@@ -500,7 +500,6 @@ AC_ARG_WITH(libnet, AC_HELP_STRING(--with-libnet=DIR,u
|
|
]
|
|
)
|
|
|
|
-EC_CHECK_FUNC(net, libnet_adv_free_packet, $LNETLIB, $LIBS,, AC_MSG_ERROR([Incorrect libnet version. libnet >= 1.1.2.1 required]))
|
|
|
|
dnl ------------------
|
|
dnl Checks for openssl
|
|
@@ -793,7 +792,7 @@ AC_ARG_ENABLE(gtk, AC_HELP_STRING(--enable-gtk,enable
|
|
dnl -----------------------
|
|
dnl set up the final vars
|
|
dnl -----------------------
|
|
-EC_CFLAGS="$DEBUG_FLAGS $PCAPINC $LNETINC $SSLINC $PCREINC $ICONVINC"
|
|
+EC_CFLAGS="$CFLAGS $DEBUG_FLAGS $PCAPINC $LNETINC $SSLINC $PCREINC $ICONVINC"
|
|
EC_LIBS="$LIBS $PCAPLIB $LNETLIB $SSLLIB $PCRELIB $NCURSLIB $GTK_LIBS $ICONVLIB"
|
|
|
|
AC_SUBST(EC_CFLAGS)
|