Added the ability to create a read-only ethereal, i.e., one that

doesn't link with libpcap, so no packet captures can be made. The
"--disable-pcap" option has been added to the configure script. Docs
have been updated. And the string buffer size in the simple_dialog()
has been doubled so that Johan's e-mail address in the "About" dialogue
window doesn't get chopped off.

svn path=/trunk/; revision=351

1 files changed, 35 insertions, 23 deletions

diff --git a/configure.in b/configure.in
index 916bf848e0..0d189ec87e 100644
--- a/configure.in
+++ b/configure.in
@@ -1,4 +1,4 @@
-# $Id: configure.in,v 1.28 1999/07/07 22:51:36 gram Exp $
+# $Id: configure.in,v 1.29 1999/07/09 04:18:33 gram Exp $
 dnl Process this file with autoconf to produce a configure script.
 AC_INIT(etypes.h)
 
@@ -51,31 +51,40 @@ esac
 AM_PATH_GTK(1.2.0, CFLAGS="$CFLAGS $GTK_CFLAGS" LIBS="$LIBS $GTK_LIBS",
                    AC_MSG_ERROR(GTK+ distribution not found.))
 
-# Evidently, some systems have pcap.h, etc. in */include/pcap
-AC_MSG_CHECKING(for extraneous pcap header directories)
-found_pcap_dir=""
-for pcap_dir in /usr/include/pcap /usr/local/include/pcap
-do
-  if test -d $pcap_dir ; then
-    LIBS="$LIBS -L$pcap_dir"
-    CFLAGS="$CFLAGS -I$pcap_dir"
-    CPPFLAGS="$CPPFLAGS -I$pcap_dir"
-    found_pcap_dir=" $found_pcap_dir -L$pcap_dir"
-  fi
-done
-
-if test "$found_pcap_dir" != "" ; then
-  AC_MSG_RESULT(found --$found_pcap_dir added to LIBS)
+dnl pcap check
+AC_ARG_ENABLE(pcap,
+[  --enable-pcap           use libpcap for packet capturing.  [default=yes]],,enable_pcap=yes)
+
+AC_MSG_CHECKING(whether to use libpcap for packet capture)
+if test "x$enable_pcap" = "xno" ; then
+	AC_MSG_RESULT(no)
 else
-  AC_MSG_RESULT(not found)
+	AC_MSG_RESULT(yes)
+	# Evidently, some systems have pcap.h, etc. in */include/pcap
+	AC_MSG_CHECKING(for extraneous pcap header directories)
+	found_pcap_dir=""
+	for pcap_dir in /usr/include/pcap /usr/local/include/pcap
+	do
+	  if test -d $pcap_dir ; then
+	    LIBS="$LIBS -L$pcap_dir"
+	    CFLAGS="$CFLAGS -I$pcap_dir"
+	    CPPFLAGS="$CPPFLAGS -I$pcap_dir"
+	    found_pcap_dir=" $found_pcap_dir -L$pcap_dir"
+	  fi
+	done
+
+	if test "$found_pcap_dir" != "" ; then
+	  AC_MSG_RESULT(found --$found_pcap_dir added to LIBS)
+	else
+	  AC_MSG_RESULT(not found)
+	fi
+
+	# Pcap checks
+	AC_CHECK_HEADER(net/bpf.h,, AC_MSG_ERROR(Header file net/bpf.h not found.))
+	AC_CHECK_HEADER(pcap.h,, AC_MSG_ERROR(Header file pcap.h not found.))
+	AC_CHECK_LIB(pcap, pcap_open_offline,, AC_MSG_ERROR(Library libpcap not found.))
 fi
 
-# Pcap checks
-AC_CHECK_HEADER(net/bpf.h,, AC_MSG_ERROR(Header file net/bpf.h not found.))
-AC_CHECK_HEADER(pcap.h,, AC_MSG_ERROR(Header file pcap.h not found.))
-AC_CHECK_LIB(pcap, pcap_open_offline,, AC_MSG_ERROR(Library libpcap not found.))
-
-AC_SUBST(SUBDIRS)
 
 dnl ipv6 check
 AC_ARG_ENABLE(ipv6,
@@ -155,6 +164,9 @@ fi
 AC_SUBST(STRERROR_C)
 AC_SUBST(STRERROR_O)
 
+dnl blank for now, but will be used in future
+AC_SUBST(SUBDIRS)
+
 AM_CONFIG_HEADER(config.h)
 AC_CONFIG_SUBDIRS(wiretap)
 AC_OUTPUT(Makefile)