Stop m4 from mangling C source in libpcap check

This commit is contained in:
dmiller 2026-08-13 14:54:46 +00:00
parent 4c36cf12f2
commit 5e40d2be2e
4 changed files with 10 additions and 10 deletions

View file

@ -34,10 +34,10 @@ AC_DEFUN([PCAP_IS_SUITABLE],
[
AC_CHECK_HEADERS(sys/ioccom.h sys/time.h net/bpf.h)
AC_MSG_CHECKING(if libpcap is suitable)
AC_RUN_IFELSE([AC_LANG_PROGRAM([
AC_RUN_IFELSE([AC_LANG_PROGRAM([[
#include <stdio.h>
extern char pcap_version[];
], [
]], [
int major, minor1, minor2;
sscanf(pcap_version,"%d.%d.%d", &major, &minor1, &minor2);
if (major > 0)
@ -47,7 +47,7 @@ extern char pcap_version[];
if (minor2 < 4)
return 1;
])], [
AC_RUN_IFELSE([AC_LANG_PROGRAM([
AC_RUN_IFELSE([AC_LANG_PROGRAM([[
#include <stdio.h>
#include <sys/types.h>
#ifdef HAVE_SYS_IOCCOM_H
@ -60,7 +60,7 @@ extern char pcap_version[];
#include <net/bpf.h>
#endif
extern char pcap_version[];
], [
]], [
int major, minor;
sscanf(pcap_version,"%d.%d", &major, &minor);
if ((major == 1 && minor >= 1) || major > 1)

4
configure vendored
View file

@ -7448,7 +7448,7 @@ else $as_nop
/* end confdefs.h. */
#include <stdio.h>
extern char pcap_version;
extern char pcap_version[];
int
main (void)
@ -7491,7 +7491,7 @@ else $as_nop
#ifdef HAVE_NET_BPF_H
#include <net/bpf.h>
#endif
extern char pcap_version;
extern char pcap_version[];
int
main (void)

4
ncat/configure vendored
View file

@ -5758,7 +5758,7 @@ else $as_nop
/* end confdefs.h. */
#include <stdio.h>
extern char pcap_version;
extern char pcap_version[];
int
main (void)
@ -5801,7 +5801,7 @@ else $as_nop
#ifdef HAVE_NET_BPF_H
#include <net/bpf.h>
#endif
extern char pcap_version;
extern char pcap_version[];
int
main (void)

4
nping/configure vendored
View file

@ -6251,7 +6251,7 @@ else $as_nop
/* end confdefs.h. */
#include <stdio.h>
extern char pcap_version;
extern char pcap_version[];
int
main (void)
@ -6294,7 +6294,7 @@ else $as_nop
#ifdef HAVE_NET_BPF_H
#include <net/bpf.h>
#endif
extern char pcap_version;
extern char pcap_version[];
int
main (void)