Changeset 1812

Timestamp:

04/15/07 11:04:30 (21 months ago)

Author:

aturner

Message:

no longer offically support or by default use libnet. You must
now specify --enable-libnet to link it. However, you may need to use
--enable-force-libnet to actually select it. fixes #148

Location:

trunk

Files:

• configure.in (modified) (3 diffs)
• docs/CHANGELOG (modified) (1 diff)

trunk/configure.in

@@ -289 +289 @@
 
 dnl ##################################################
-dnl Checks for libnet (shamelessly horked from dsniff)
+dnl Checks for libnet IFF you specify --enable-libnet.
+dnl We no longer by default use libnet unless you tell me to.
 dnl ##################################################
 foundnet=no
-trynetdir=/usr/local
-AC_MSG_CHECKING(for libnet)
+trynetdir=no
+have_libnet=no
+
+AC_ARG_ENABLE(libnet,
+        AC_HELP_STRING([--enable-libnet], [Enable using the libnet 1.1.x library (unsupported)]),
+        [ if test x$enableval = xyes; then
+                trynetdir=yes
+                AC_MSG_WARN([Due to bugs in libnet, it is no longer officially supported])
+          fi]
+)
+
 AC_ARG_WITH(libnet,
     AC_HELP_STRING([--with-libnet=DIR], [Use libnet in DIR]),
     [trynetdir=$withval])
 
-for testdir in $trynetdir /usr/local /opt/local /usr ; do
-    if test -f "${testdir}/include/libnet.h" -a $foundnet = no ; then
-     LNETINC="${testdir}/include/libnet.h"
-     LNETINCDIR="$testdir/include"
-     if test $dynamic_link = yes; then
-         LNETLIB="-L${testdir}/lib -lnet"
-     elif test -f "${testdir}/lib64/libnet.a" ; then
-         LNETLIB="${testdir}/lib64/libnet.a"
-     else
-         LNETLIB="${testdir}/lib/libnet.a"
-     fi
-     foundnet=$testdir
-    fi
-done
-
-if test $foundnet = no ; then
-    AC_MSG_RESULT(no)
-else 
-    AC_MSG_RESULT($foundnet) 
-        AC_DEFINE([HAVE_LIBNET], [1], [Enable libnet support])
-fi
+if test x$trynetdir = xyes ; then
+        AC_MSG_CHECKING(for libnet)
+
+        for testdir in $trypcapdir /usr/local /opt/local /usr ; do 
+        if test -f "${testdir}/include/libnet.h" -a $foundnet = no ; then
+                LNETINC="${testdir}/include/libnet.h"
+                LNETINCDIR="${testdir}/include"
+                if test $dynamic_link = yes; then
+                                if test -f "${testdir}/lib/libnet.a" ; then
+                            LPCAPLIB="-L${testdir}/lib -lnet"
+                                elif test -f "${testdir}/lib64/libnet.a" ; then
+                                        LPCAPLIB="-L${testdir}/lib64 -lnet"
+                                else
+                                        AC_ERROR([Unable to find libnet in ${testdir}])
+                                fi
+                elif test -f "${testdir}/lib64/libnet.a" ; then
+                    LNETLIB="${testdir}/lib64/libnet.a"
+                elif test -f "${testdir}/lib/libnet.a" ; then
+                    LNETLIB="${testdir}/lib/libnet.a"
+                        else
+                                AC_ERROR([Unable to find matching library for header file in ${testdir}])
+                        fi
+                foundnet=$testdir
+        fi
+        done
+        
+
+        if test x$foundnet = xno ; then
+            AC_MSG_RESULT(no)
+        else
+            AC_MSG_RESULT($foundnet)
+                have_libnet=yes
+                AC_DEFINE([HAVE_LIBNET], [1], [Enable libnet support])
+        fi
+
+fi
+
 
 AC_SUBST(LNETINC)
 AC_SUBST(LNETLIB)
 
-if test $foundnet = yes ; then
+if test $foundnet != no ; then
         OLDLIBS="$LIBS"
         OLDCFLAGS="$CFLAGS"
@@ -453 +479 @@
 
 
-have_libnet=no
 dnl Check to see what version of libpcap
 dnl this code has been reduced a lot, but probably still could be
@@ -717 +742 @@
 if test $have_bpf = no -a $have_pcap_inject = no -a $have_pcap_sendpacket = no \
         -a $have_libnet = no -a $have_pf = no ; then
-        AC_MSG_ERROR([Unable to find a supported method to send packets])
+        AC_MSG_ERROR([Unable to find a supported method to send packets.  Please upgrade your libpcap or enable libnet])
 fi
 

trunk/docs/CHANGELOG

@@ -1 +1 @@
 $Id$
+
+05/??/2007: Version 3.0
+        - By default, no longer try to use libnet.  You must now specify --enable-libnet (#148)
 
 04/14/2007: Version 3.0.RC1