diff options
| author | guy <guy@f5534014-38df-0310-8fa8-9805f1628bb7> | 2000-01-15 10:25:41 +0000 |
|---|---|---|
| committer | guy <guy@f5534014-38df-0310-8fa8-9805f1628bb7> | 2000-01-15 10:25:41 +0000 |
| commit | 959bdb65567862091af34861cb5c5c45c0b08d16 (patch) | |
| tree | 37cf248364e4cef4a0c1f06a309ee7bb8c8e9b80 | |
| parent | 1c9e31499d3f8c2f29a50b4b2d1a0e3ab118339b (diff) | |
As we're not using the default action for AC_CHECK_LIB in
AC_ETHEREAL_PCAP_CHECK, we have to explicitly define HAVE_LIBPCAP if we
find it, otherwise it doesn't get defined.
git-svn-id: http://anonsvn.wireshark.org/wireshark/trunk@1486 f5534014-38df-0310-8fa8-9805f1628bb7
| -rw-r--r-- | acconfig.h | 4 | ||||
| -rw-r--r-- | acinclude.m4 | 9 |
2 files changed, 10 insertions, 3 deletions
diff --git a/acconfig.h b/acconfig.h index a16b4d0b84..32b4ecc721 100644 --- a/acconfig.h +++ b/acconfig.h @@ -1,7 +1,7 @@ /* acconfig.h * #ifdefs to be controlled by "configure" * - * $Id: acconfig.h,v 1.14 2000/01/15 00:22:29 gram Exp $ + * $Id: acconfig.h,v 1.15 2000/01/15 10:25:41 guy Exp $ * * Ethereal - Network traffic analyzer * By Gerald Combs <gerald@zing.org> @@ -39,4 +39,6 @@ #undef NEED_MKSTEMP +#undef HAVE_LIBPCAP + #undef PLUGIN_DIR diff --git a/acinclude.m4 b/acinclude.m4 index d1a7c80e9f..f3b0123c58 100644 --- a/acinclude.m4 +++ b/acinclude.m4 @@ -2,7 +2,7 @@ dnl Macros that test for specific features. dnl This file is part of the Autoconf packaging for Ethereal. dnl Copyright (C) 1998-2000 by Gerald Combs. dnl -dnl $Id: acinclude.m4,v 1.17 2000/01/15 09:46:28 guy Exp $ +dnl $Id: acinclude.m4,v 1.18 2000/01/15 10:25:41 guy Exp $ dnl dnl This program is free software; you can redistribute it and/or modify dnl it under the terms of the GNU General Public License as published by @@ -269,7 +269,10 @@ AC_DEFUN(AC_ETHEREAL_PCAP_CHECK, # Try various directories to find libpcap # AC_CHECK_LIB(pcap, pcap_open_live, - PCAP_LIBS=-lpcap, + [ + PCAP_LIBS=-lpcap + AC_DEFINE(HAVE_LIBPCAP) + ], [ # # Throw away the cached "we didn't find it" @@ -296,6 +299,7 @@ AC_DEFUN(AC_ETHEREAL_PCAP_CHECK, unset ac_cv_lib_pcap_pcap_open_live AC_ETHEREAL_ADD_DASH_L(PCAP_LIBS, /usr/local/lib) PCAP_LIBS="$PCAP_LIBS -lpcap" + AC_DEFINE(HAVE_LIBPCAP) LIBS="$save_LIBS" ], [ @@ -316,6 +320,7 @@ AC_DEFUN(AC_ETHEREAL_PCAP_CHECK, unset ac_cv_lib_pcap_pcap_open_live AC_ETHEREAL_ADD_DASH_L(PCAP_LIBS, $prefix/lib) PCAP_LIBS="$PCAP_LIBS -lpcap" + AC_DEFINE(HAVE_LIBPCAP) LIBS="$save_LIBS" ], AC_MSG_ERROR(Library libpcap not found.), |