diff options
| author | Denis Ovsienko <denis@ovsienko.info> | 2018-07-28 13:36:17 +0100 |
|---|---|---|
| committer | Denis Ovsienko <denis@ovsienko.info> | 2018-07-28 13:36:17 +0100 |
| commit | 40e217a816cee20d4aa92f5d06d7ad5d4acc4050 (patch) | |
| tree | b0d443d5b0887051640ea539d4d9c18d4c867e3c /configure.ac | |
| parent | 93350deda8f0099b4cd1541f2c72ae5c38fc25a5 (diff) | |
| download | tcpdump-40e217a816cee20d4aa92f5d06d7ad5d4acc4050.tar.gz | |
Stick with one version of pcap_dump_ftell.c.
It looks like CMake after commit 3e9e2b6 started to use the newly added
missing/pcap_dump_ftell.c to make pcap_dump_ftell() available in tcpdump
if libpcap does not have it. However, autotools continued to use the
previously existing ./pcap_dump_ftell.c for the same purpose. Remove the
previously existing file and amend autotools files to cover
pcap_dump_ftell() the same way as the other functions in the missing/
directory files.
Amend missing/pcap_dump_ftell.c not to use pcap_dump_file(), as it may be
unavailable.
This has been tested to work with libpcap 0.6.1.
Diffstat (limited to 'configure.ac')
| -rw-r--r-- | configure.ac | 13 |
1 files changed, 1 insertions, 12 deletions
diff --git a/configure.ac b/configure.ac index 46f841c0..5a253743 100644 --- a/configure.ac +++ b/configure.ac @@ -409,7 +409,7 @@ AC_INCLUDES_DEFAULT fi ]) -AC_REPLACE_FUNCS(strlcat strlcpy strdup strsep getservent getopt_long) +AC_REPLACE_FUNCS(strlcat strlcpy strdup strsep getservent getopt_long pcap_dump_ftell) AC_CHECK_FUNCS(fork vfork strftime) AC_CHECK_FUNCS(setlinebuf) @@ -672,17 +672,6 @@ dnl so just define the HAVE_ value if it's there. dnl AC_CHECK_FUNCS(pcap_breakloop) -dnl -dnl Check for "pcap_dump_ftell()" and use a substitute version -dnl if it's not present. -dnl -AC_CHECK_FUNC(pcap_dump_ftell, - AC_DEFINE(HAVE_PCAP_DUMP_FTELL, 1, - [define if libpcap has pcap_dump_ftell()]), - [ - AC_LIBOBJ(pcap_dump_ftell) - ]) - # # Do we have the new open API? Check for pcap_create, and assume that, # if we do, we also have pcap_activate() and the other new routines |