From: Guy Harris <guy@alum.mit.edu>
Date: Mon, 22 Jan 2018 03:33:54 +0000 (-0800)
Subject: Clean up comments to reflect reality.
X-Git-Tag: tcpdump-4.99-bp~1423
X-Git-Url: https://git.tcpdump.org/tcpdump/commitdiff_plain/2a3509a466d10d68dc6442187f7bf9372acef77a

Clean up comments to reflect reality.
---

diff --git a/configure b/configure
index f2b5fdb9..1587a589 100755
--- a/configure
+++ b/configure
@@ -5959,16 +5959,6 @@ esac
 
 fi
 
-for ac_func in pcap_set_datalink
-do :
-  ac_fn_c_check_func "$LINENO" "pcap_set_datalink" "ac_cv_func_pcap_set_datalink"
-if test "x$ac_cv_func_pcap_set_datalink" = xyes; then :
-  cat >>confdefs.h <<_ACEOF
-#define HAVE_PCAP_SET_DATALINK 1
-_ACEOF
-
-fi
-done
 
 ac_fn_c_check_func "$LINENO" "pcap_datalink_name_to_val" "ac_cv_func_pcap_datalink_name_to_val"
 if test "x$ac_cv_func_pcap_datalink_name_to_val" = xyes; then :
@@ -6005,6 +5995,18 @@ esac
 fi
 
 
+for ac_func in pcap_set_datalink
+do :
+  ac_fn_c_check_func "$LINENO" "pcap_set_datalink" "ac_cv_func_pcap_set_datalink"
+if test "x$ac_cv_func_pcap_set_datalink" = xyes; then :
+  cat >>confdefs.h <<_ACEOF
+#define HAVE_PCAP_SET_DATALINK 1
+_ACEOF
+
+fi
+done
+
+
 for ac_func in pcap_breakloop
 do :
   ac_fn_c_check_func "$LINENO" "pcap_breakloop" "ac_cv_func_pcap_breakloop"
diff --git a/configure.ac b/configure.ac
index b8e8958b..579c5df2 100644
--- a/configure.ac
+++ b/configure.ac
@@ -567,9 +567,8 @@ don't.])
 fi
 
 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 Check for "pcap_list_datalinks()" and use a substitute version
+dnl if it's not present.
 dnl
 AC_CHECK_FUNC(pcap_list_datalinks,
 	[
@@ -580,7 +579,11 @@ AC_CHECK_FUNC(pcap_list_datalinks,
 	[
 	    AC_LIBOBJ(datalinks)
 	])
-AC_CHECK_FUNCS(pcap_set_datalink)
+
+dnl
+dnl Check for "pcap_datalink_name_to_val()", and use a substitute version
+dnl if it's not present.
+dnl
 AC_CHECK_FUNC(pcap_datalink_name_to_val,
 	[
 	    AC_DEFINE(HAVE_PCAP_DATALINK_NAME_TO_VAL, 1,
@@ -596,6 +599,13 @@ AC_CHECK_FUNC(pcap_datalink_name_to_val,
 	    AC_LIBOBJ(dlnames)
 	])
 
+dnl
+dnl Check for "pcap_set_datalink()"; you can't substitute for it if
+dnl it's absent (it has hooks into libpcap), so just define the
+dnl HAVE_ value if it's there.
+dnl
+AC_CHECK_FUNCS(pcap_set_datalink)
+
 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),