Changeset 1709

Timestamp:

02/25/07 21:18:36 (23 months ago)

Author:

aturner

Message:

remove code detection for Lyx, etc.
make tcprewrite enabled by default
add HAVE_WINPCAP
refs #66, #75, #15, #110

Location:

trunk

Files:

• configure.in (modified) (5 diffs)
• src/Makefile.am (modified) (1 diff)
• src/config.h.in (modified) (2 diffs)

trunk/configure.in

@@ -49 +49 @@
 AC_EXEEXT
 AC_PATH_PROG(PRINTF, printf)
-AC_PATH_PROG(FIG2DEV, fig2dev)
-
-dnl Look for lyx in the normal locations
-dnl The OS X installer puts Lyx at /Applications/Lyx.app/Contents/MacOS/LyX
-
-AC_ARG_WITH(lyx,
-    AC_HELP_STRING([--with-lyx=FILE], [Path to Lyx binary]),
-    [ AC_MSG_CHECKING(for lyx)
-    if test -x $withval ; then
-          td=$withval
-          AC_MSG_RESULT($td)
-      else
-          AC_MSG_RESULT([Error: $withval does not exist or is not executable])
-      fi ],
-    [ 
-    case $host in
-        powerpc-apple-darwin*)
-        lyx=/Applications/Lyx.app/Contents/MacOS/LyX
-        if test -x $lyx ; then
-            AC_MSG_CHECKING(for lyx)
-            AC_SUBST(LYX, $lyx)
-            AC_MSG_RESULT($lyx) 
-        else
-            AC_PATH_PROG(LYX, lyx)
-        fi
-        ;;
-
-        *)
-        AC_PATH_PROG(LYX, lyx)
-        ;;
-        esac
-    ])
-
-AC_PATH_PROG(DVIPS, dvips)
-AC_PATH_PROG(TEXI2DVI, texi2dvi)
-AC_PATH_PROG(LATEX2HTML, latex2html)
-AC_PATH_PROG(DVIPDFM, dvipdfm)
 AC_PATH_PROG(AUTOGEN, autogen)
 
@@ -129 +92 @@
 
 AC_C_BIGENDIAN
-
-doctools=no
-if test -n "$FIG2DEV" -a -n "$LYX" -a -n "$DVIPS" -a -n "$TEXI2DVI" \
-         -a -n "$LATEX2HTML" -a -n "$DVIPDFM" ; then
-    doctools=yes
-fi
-AM_CONDITIONAL(HAVE_DOCTOOLS, test $doctools = yes)
 
 dnl Enable debugging in code/compiler options
@@ -278 +234 @@
 AM_CONDITIONAL([ENABLE_FLOWREPLAY], [test x$flowreplay = xyes])
 
-dnl Enable tcpbridge
-tcpbridge=no
-AC_ARG_ENABLE(tcpbridge,
-    AC_HELP_STRING([--enable-tcpbridge], [Enable building tcpbridge (beta)]),
-    [ if test x$enableval = xyes; then
-         tcpbridge=yes
-         AC_DEFINE([ENABLE_TCPBRIDGE], [1], [Enable building tcpbridge (beta)]) 
-      fi])
-
-AM_CONDITIONAL([ENABLE_TCPBRIDGE], [test x$tcpbridge = xyes])
-
-
 dnl ##################################################
 dnl Checks for libnet (shamelessly horked from dsniff)
@@ -417 +361 @@
     [trypcapdir=$withval])
 
-    for testdir in $trypcapdir /usr/local /usr ; do 
-     if test -f "${testdir}/include/pcap.h" -a $foundpcap = no ; then
-         LPCAPINC="${testdir}/include/pcap.h"
-         LPCAPINCDIR="${testdir}/include"
-         if test $dynamic_link = yes; then
-             LPCAPLIB="-L${testdir}/lib -lpcap"
-         elif test -f "${testdir}/lib64/libpcap.a" ; then
-             LPCAPLIB="${testdir}/lib64/libpcap.a"
-         elif test -f "${testdir}/lib/libpcap.a" ; then
-             LPCAPLIB="${testdir}/lib/libpcap.a"
-         else
-             LPCAPLIB="${testdir}/lib/libwpcap.a"
-         fi 
-        foundpcap=$testdir
-     fi
-   done
-
-   if test $foundpcap = no ; then
-     AC_MSG_RESULT(no)
-     AC_ERROR(libpcap not found)
-   else
-     AC_MSG_RESULT($foundpcap)
-   fi
+        for testdir in $trypcapdir /usr/local /usr ; do 
+        if test -f "${testdir}/include/pcap.h" -a $foundpcap = no ; then
+                LPCAPINC="${testdir}/include/pcap.h"
+                LPCAPINCDIR="${testdir}/include"
+                if test $dynamic_link = yes; then
+                    LPCAPLIB="-L${testdir}/lib -lpcap"
+                elif test -f "${testdir}/lib64/libpcap.a" ; then
+                    LPCAPLIB="${testdir}/lib64/libpcap.a"
+                elif test -f "${testdir}/lib/libpcap.a" ; then
+                    LPCAPLIB="${testdir}/lib/libpcap.a"
+                elif test -f "${testdir}/lib/libwpcap.a"
+                    LPCAPLIB="${testdir}/lib/libwpcap.a"
+                                AC_DEFINE([HAVE_WINPCAP], [1], [Do we have WinPcap?])
+                        else
+                                AC_ERROR(Unable to find matching library for header file in ${testdir})
+                        fi
+                foundpcap=$testdir
+        fi
+        done
+
+        if test $foundpcap = no ; then
+                AC_MSG_RESULT(no)
+                AC_ERROR(libpcap not found)
+        else
+                AC_MSG_RESULT($foundpcap)
+        fi
 
 AC_SUBST(LPCAPINC)
@@ -963 +910 @@
            scripts/Makefile
            tcpreplay.spec])
-
-if test $doctools = no; then
-    AC_MSG_NOTICE([One or more tool for creating documentation is unavailable.])
-    AC_MSG_NOTICE([This is only an issue for developers, so don't worry.])
-fi
-

trunk/src/Makefile.am

@@ -33 +33 @@
         @AUTOGEN@ -T agman1.tpl $(opts_list) --base-name tcpbridge tcpbridge_opts.def
 
-man_MANS = tcpreplay.1 tcpprep.1 tcprewrite.1
+man_MANS = tcpreplay.1 tcpprep.1 tcprewrite.1 tcpbridge.1
 EXTRA_DIST = tcpreplay.1 tcpprep.1 tcprewrite.1 tcpbridge.1 flowreplay.1
-bin_PROGRAMS = tcpreplay tcpprep tcprewrite
+bin_PROGRAMS = tcpreplay tcpprep tcprewrite tcpbridge
 
 if ENABLE_FLOWREPLAY
 man_MANS += flowreplay.1
 bin_PROGRAMS += flowreplay
-endif
-
-if ENABLE_TCPBRIDGE
-man_MANS += tcpbridge.1
-bin_PROGRAMS += tcpbridge
 endif
 

trunk/src/config.h.in

@@ -15 +15 @@
 /* Enable building flowreplay (alpha) */
 #undef ENABLE_FLOWREPLAY
-
-/* Enable building tcpbridge (beta) */
-#undef ENABLE_TCPBRIDGE
 
 /* fopen(3) accepts a 'b' in the mode flag */
@@ -319 +316 @@
 /* Define to 1 if you have the `vsnprintf' function. */
 #undef HAVE_VSNPRINTF
+
+/* Do we have WinPcap? */
+#undef HAVE_WINPCAP
 
 /* What is the path (if any) to the pcap-bpf.h header? */