diff options
| author | Guy Harris <guy@alum.mit.edu> | 2001-07-26 07:25:49 +0000 |
|---|---|---|
| committer | Guy Harris <guy@alum.mit.edu> | 2001-07-26 07:25:49 +0000 |
| commit | ae251f8426ca1100481de82d652ad0bf11c41e22 (patch) | |
| tree | a67815389a48d6d2a6dd802008cdfa809d14a7c9 /gtk | |
| parent | d299f1e4ed8427801562bf3677aa0e3a3c284dc1 (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 'gtk')
| -rw-r--r-- | gtk/main.c | 6 |
1 files changed, 5 insertions, 1 deletions
diff --git a/gtk/main.c b/gtk/main.c index 3e82dcd7e8..1550e2b842 100644 --- a/gtk/main.c +++ b/gtk/main.c @@ -1,6 +1,6 @@ /* main.c * - * $Id: main.c,v 1.203 2001/07/05 00:34:40 guy Exp $ + * $Id: main.c,v 1.204 2001/07/26 07:25:48 guy Exp $ * * Ethereal - Network traffic analyzer * By Gerald Combs <gerald@ethereal.com> @@ -839,9 +839,13 @@ main(int argc, char *argv[]) #ifdef WIN32 char pcap_version[] = WPCAP_STRING; #else +#ifdef __APPLE__ + char pcap_version[] = "Unknown"; +#else extern char pcap_version[]; #endif #endif +#endif #ifdef WIN32 WSADATA wsaData; |