diff options
| author | Guy Harris <guy@alum.mit.edu> | 2010-03-17 22:09:19 +0000 |
|---|---|---|
| committer | Guy Harris <guy@alum.mit.edu> | 2010-03-17 22:09:19 +0000 |
| commit | 1e0bcd0740f5c3f71a6e194d0f09deef0489d53d (patch) | |
| tree | cf03cdf2a7d01b52234bfd4fc33a8e55882d435b | |
| parent | 7ad6ee505642e9295f8e6ba538b046ed6821b145 (diff) | |
Define HAVE_PCAP_LIST_DATALINKS, HAVE_PCAP_FREE_DATALINKS, and
HAVE_PCAP_SET_DATALINK only if we have the WinPcap development package;
otherwise, don't define them - if you don't have the WinPcap development
package when building on Windows, we don't define HAVE_LIBPCAP, so we
won't include any of the code controlled by those ifdefs in any case,
and, if you do have the WinPcap development package, you'll need to have
the 4.1 version (you won't need WinPcap 4.1 at run time, but you will
need the 4.1 development package at build time).
svn path=/trunk/; revision=32230
| -rw-r--r-- | config.nmake | 16 |
1 files changed, 12 insertions, 4 deletions
diff --git a/config.nmake b/config.nmake index 18a1ad8c80..3decc3d6a1 100644 --- a/config.nmake +++ b/config.nmake @@ -938,12 +938,21 @@ AIRPDCAP_CONFIG= !IFDEF PCAP_DIR # Nmake uses carets to escape special characters WINPCAP_CONFIG=^#define HAVE_LIBPCAP 1 +# +# This requires that, if you're *building* Wireshark, you have +# the most recent WinPcap's development package. If, at *run* +# time, an older version of WinPcap, missing some routines, +# is found, we work around that. +# PCAP_FINDALLDEVS_CONFIG=^#define HAVE_PCAP_FINDALLDEVS 1 PCAP_DATALINK_NAME_TO_VAL_CONFIG=^#define HAVE_PCAP_DATALINK_NAME_TO_VAL 1 PCAP_DATALINK_VAL_TO_NAME_CONFIG=^#define HAVE_PCAP_DATALINK_VAL_TO_NAME 1 PCAP_DATALINK_VAL_TO_DESCRIPTION_CONFIG=^#define HAVE_PCAP_DATALINK_VAL_TO_DESCRIPTION 1 # PCAP_BREAKLOOP won't have any benefit on Win32, but breaks compatibility with 3.0 PCAP_BREAKLOOP_CONFIG= +PCAP_LIST_DATALINKS_CONFIG=^#define HAVE_PCAP_LIST_DATALINKS 1 +PCAP_FREE_DATALINKS_CONFIG=^#define HAVE_PCAP_FREE_DATALINKS 1 +PCAP_SET_DATALINK_CONFIG=^#define HAVE_PCAP_SET_DATALINK 1 !ELSE # no WpdPack installed WINPCAP_CONFIG= @@ -952,12 +961,11 @@ PCAP_DATALINK_NAME_TO_VAL_CONFIG= PCAP_DATALINK_VAL_TO_NAME_CONFIG= PCAP_DATALINK_VAL_TO_DESCRIPTION_CONFIG= PCAP_BREAKLOOP_CONFIG= +PCAP_LIST_DATALINKS_CONFIG= +PCAP_FREE_DATALINKS_CONFIG= +PCAP_SET_DATALINK_CONFIG= !ENDIF -PCAP_LIST_DATALINKS_CONFIG=^#define HAVE_PCAP_LIST_DATALINKS 1 -PCAP_FREE_DATALINKS_CONFIG=^#define HAVE_PCAP_FREE_DATALINKS 1 -PCAP_SET_DATALINK_CONFIG=^#define HAVE_PCAP_SET_DATALINK 1 - !IF DEFINED(PCAP_DIR) && DEFINED(PCAP_REMOTE) PCAP_HAVE_REMOTE_CONFIG=^#define HAVE_REMOTE 1 PCAP_REMOTE_CONFIG=^#define HAVE_PCAP_REMOTE 1 |