diff -uprk.orig tcpdump-3.8.2.orig/aclocal.m4 tcpdump-3.8.2/aclocal.m4 --- tcpdump-3.8.2.orig/aclocal.m4 2004-01-31 08:26:50 +0300 +++ tcpdump-3.8.2/aclocal.m4 2004-03-30 02:49:01 +0400 @@ -325,19 +325,28 @@ AC_DEFUN(AC_LBL_LIBPCAP, 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), - AC_LIBOBJ(datalinks)) - AC_CHECK_FUNC(pcap_set_datalink, - AC_DEFINE(HAVE_PCAP_SET_DATALINK)) - AC_CHECK_FUNC(pcap_datalink_name_to_val, - [ - AC_DEFINE(HAVE_PCAP_DATALINK_NAME_TO_VAL) - AC_CHECK_FUNC(pcap_datalink_val_to_description, - AC_DEFINE(HAVE_PCAP_DATALINK_VAL_TO_DESCRIPTION), - AC_LIBOBJ(dlnames)) - ], - AC_LIBOBJ(dlnames)) + AC_CHECK_FUNC(pcap_list_datalinks) + if test $ac_cv_func_pcap_list_datalinks = "yes" ; then + AC_DEFINE(HAVE_PCAP_LIST_DATALINKS) + else + AC_LIBOBJ(datalinks) + fi + AC_CHECK_FUNC(pcap_set_datalink) + if test $ac_cv_func_pcap_set_datalink = "yes" ; then + AC_DEFINE(HAVE_PCAP_SET_DATALINK) + fi + AC_CHECK_FUNC(pcap_datalink_name_to_val) + if test $ac_cv_func_pcap_datalink_name_to_val = "yes" ; then + AC_DEFINE(HAVE_PCAP_DATALINK_NAME_TO_VAL) + AC_CHECK_FUNC(pcap_datalink_val_to_description) + if test $ac_cv_func_pcap_datalink_val_to_description = "yes" ; then + AC_DEFINE(HAVE_PCAP_DATALINK_VAL_TO_DESCRIPTION) + else + AC_LIBOBJ(dlnames) + fi + else + AC_LIBOBJ(dlnames) + fi dnl dnl Check for "pcap_breakloop()"; you can't substitute for it if