summaryrefslogtreecommitdiff
path: root/aclocal.m4
diff options
context:
space:
mode:
authorGuy Harris <guy@alum.mit.edu>2015-02-10 13:52:51 -0800
committerGuy Harris <guy@alum.mit.edu>2015-02-10 13:52:51 -0800
commitfa51b14a3d60a9faa0941821c402e4928143c992 (patch)
treeb42e4bef047869a4fbdb8a9867e36a64e71355c8 /aclocal.m4
parentf105f8b5a87fbaba30649e72ec3c7561cb1ca546 (diff)
downloadtcpdump-fa51b14a3d60a9faa0941821c402e4928143c992.tar.gz
Move pcap function checks to configure.in.
It was doing some of the function checks; move the remaining ones out of AC_LBL_LIBPCAP(), which is now solely responsible for finding libpcap, making sure it'll work, and setting compiler and linker flags appropriately. Checks for functions that were introduced in later versions of libpcap, which we use if available, are all done in configure.in.
Diffstat (limited to 'aclocal.m4')
-rw-r--r--aclocal.m448
1 files changed, 0 insertions, 48 deletions
diff --git a/aclocal.m4 b/aclocal.m4
index cd0a9441..285000d9 100644
--- a/aclocal.m4
+++ b/aclocal.m4
@@ -624,54 +624,6 @@ not be able to determine why this is happening, and thus will not be
able to fix it, without that information, as we have not been able to
reproduce this problem ourselves.])
])
-
- dnl
- dnl Check for "pcap_list_datalinks()", "pcap_set_datalink()",
- dnl and "pcap_datalink_name_to_val()", and use substitute versions
- dnl if they're not present.
- dnl
- AC_CHECK_FUNC(pcap_list_datalinks,
- [
- AC_DEFINE(HAVE_PCAP_LIST_DATALINKS, 1,
- [define if libpcap has pcap_list_datalinks()])
- AC_CHECK_FUNCS(pcap_free_datalinks)
- ],
- [
- AC_LIBOBJ(datalinks)
- ])
- AC_CHECK_FUNCS(pcap_set_datalink)
- AC_CHECK_FUNC(pcap_datalink_name_to_val,
- [
- AC_DEFINE(HAVE_PCAP_DATALINK_NAME_TO_VAL, 1,
- [define if libpcap has pcap_datalink_name_to_val()])
- AC_CHECK_FUNC(pcap_datalink_val_to_description,
- AC_DEFINE(HAVE_PCAP_DATALINK_VAL_TO_DESCRIPTION, 1,
- [define if libpcap has pcap_datalink_val_to_description()]),
- [
- AC_LIBOBJ(dlnames)
- ])
- ],
- [
- AC_LIBOBJ(dlnames)
- ])
-
- dnl
- dnl Check for "pcap_breakloop()"; you can't substitute for it if
- dnl it's absent (it has hooks into the live capture routines),
- 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)
- ])
])
dnl