aboutsummaryrefslogtreecommitdiffstats
path: root/wiretap
diff options
context:
space:
mode:
authorGuy Harris <guy@alum.mit.edu>2001-07-26 07:25:49 +0000
committerGuy Harris <guy@alum.mit.edu>2001-07-26 07:25:49 +0000
commitae251f8426ca1100481de82d652ad0bf11c41e22 (patch)
treea67815389a48d6d2a6dd802008cdfa809d14a7c9 /wiretap
parentd299f1e4ed8427801562bf3677aa0e3a3c284dc1 (diff)
MacOS support changes, from Michael Tuexen (with some modifications):
replace "--with-plugindir" with "--with-plugins", and have the plugin directory optional - this allows plugins to be disabled; add "--traditional-cpp" on MacOS X/Darwin (Apple's "cc" compiler requires it, for some annoying reason, even though it is, as far as I know, GCC-based, and other GCC's don't require it); on MacOS X, don't use "pcap_version[]", as, for some annoying reason, libpcap on MacOS X doesn't define it. Clean up some whitespace in the help messages for the configure script. Move the AM_CONDITIONAL for SETUID_INSTALL after the point at which "enable_setuid_install" is set, as it tests "enable_setuid_install". svn path=/trunk/; revision=3788
Diffstat (limited to 'wiretap')
-rw-r--r--wiretap/configure.in14
1 files changed, 11 insertions, 3 deletions
diff --git a/wiretap/configure.in b/wiretap/configure.in
index 88c23375c8..2e7701b097 100644
--- a/wiretap/configure.in
+++ b/wiretap/configure.in
@@ -1,4 +1,4 @@
-# $Id: configure.in,v 1.28 2001/07/13 00:55:57 guy Exp $
+# $Id: configure.in,v 1.29 2001/07/26 07:25:49 guy Exp $
dnl
dnl Process this file with autoconf 2.13 or later to produce a
dnl configure script; 2.12 doesn't generate a "configure" script that
@@ -16,6 +16,8 @@ AC_PREREQ(2.13)
AM_INIT_AUTOMAKE(libwtap.a, 0.0.0)
AM_CONFIG_HEADER(config.h)
+AC_CANONICAL_HOST
+
dnl Checks for programs.
AC_PROG_CC
AC_PROG_CPP
@@ -59,7 +61,15 @@ then
;;
esac
else
+ case "$host_os" in
+ darwin*)
+ CFLAGS="-traditional-cpp $CFLAGS"
+ AC_MSG_RESULT(Apple cc compiler - added -traditional-cpp)
+ ;;
+ *)
AC_MSG_RESULT(none needed)
+ ;;
+ esac
fi
# Check for glib.
@@ -96,8 +106,6 @@ dnl Checks for header files
AC_HEADER_STDC
AC_CHECK_HEADERS(sys/time.h netinet/in.h unistd.h fcntl.h sys/stat.h sys/types.h)
-AC_CANONICAL_HOST
-
# We must know our byte order
AC_C_BIGENDIAN