Fix a configure error when the IPFILTER option is selected. An example

of the error is:

checking for struct natlookup.nl_inipaddr.in6... no
checking for struct natlookup.nl_realipaddr.in6... eval: ${+...}: Bad substitution
===>  Script "configure" failed unexpectedly.
Please report the problem to timp87@gmail.com [maintainer] and attach the
"/export/wrkdir/amd64/export/home/cy/freebsd/git/ports/www/squid-devel/work/squid-4.0.25/config.log"
including the output of the failure of your make command. Also, it might be
a good idea to provide an overview of all packages installed on your system
(e.g. a /usr/local/sbin/pkg-static info -g -Ea).
*** Error code 1

Stop.
make[1]: stopped in /export/home/cy/freebsd/git/ports/www/squid-devel
*** Error code 1

Stop.
make: stopped in /export/home/cy/freebsd/git/ports/www/squid-devel

PR:		229244
Submitted by:	cy
Reported by:	cy
Approved by:	Maintainer <timp87@gmail.com>
This commit is contained in:
Cy Schubert 2018-06-29 21:36:03 +00:00
parent 44da72fee3
commit b2824d0dc1
Notes: svn2git 2021-03-31 03:12:20 +00:00
svn path=/head/; revision=473583

View File

@ -1,6 +1,6 @@
--- configure.orig 2018-06-11 16:48:04 UTC
+++ configure
@@ -34345,7 +34345,7 @@ done
--- configure.orig 2018-06-11 09:48:04.000000000 -0700
+++ configure 2018-06-22 20:34:58.827873000 -0700
@@ -34345,7 +34345,7 @@
##
BUILD_HELPER="NIS"
@ -9,7 +9,7 @@
do :
as_ac_Header=`$as_echo "ac_cv_header_$ac_header" | $as_tr_sh`
ac_fn_cxx_check_header_compile "$LINENO" "$ac_header" "$as_ac_Header" "
@@ -34360,8 +34360,10 @@ if eval test \"x\$"$as_ac_Header"\" = x"
@@ -34360,8 +34360,10 @@
#define `$as_echo "HAVE_$ac_header" | $as_tr_cpp` 1
_ACEOF
@ -22,7 +22,7 @@
fi
done
@@ -34834,7 +34836,7 @@ done
@@ -34834,7 +34836,7 @@
# unconditionally requires crypt(3), for now
if test "x$ac_cv_func_crypt" != "x"; then
@ -31,7 +31,7 @@
do :
as_ac_Header=`$as_echo "ac_cv_header_$ac_header" | $as_tr_sh`
ac_fn_cxx_check_header_mongrel "$LINENO" "$ac_header" "$as_ac_Header" "$ac_includes_default"
@@ -37226,7 +37228,7 @@ for ac_header in \
@@ -37226,7 +37228,7 @@
arpa/nameser.h \
assert.h \
bstring.h \
@ -40,7 +40,7 @@
ctype.h \
direct.h \
errno.h \
@@ -37434,6 +37436,7 @@ ac_fn_cxx_check_header_compile "$LINENO"
@@ -37434,6 +37436,7 @@
#include <netinet/ip.h>
#endif
#if HAVE_NETINET_IP_COMPAT_H
@ -48,7 +48,7 @@
#include <netinet/ip_compat.h>
#endif
#if HAVE_NETINET_IP_FIL_H
@@ -41450,6 +41453,7 @@ if test "x$enable_ipf_transparent" != "x
@@ -41450,6 +41453,7 @@
# include <sys/ioccom.h>
# include <netinet/in.h>
@ -56,7 +56,7 @@
# include <netinet/ip_compat.h>
# include <netinet/ip_fil.h>
# include <netinet/ip_nat.h>
@@ -41480,6 +41484,7 @@ else
@@ -41480,6 +41484,7 @@
# include <sys/ioccom.h>
# include <netinet/in.h>
#undef minor_t
@ -64,7 +64,7 @@
# include <netinet/ip_compat.h>
# include <netinet/ip_fil.h>
# include <netinet/ip_nat.h>
@@ -41524,6 +41529,7 @@ _ACEOF
@@ -41524,6 +41529,7 @@
ip_fil_compat.h \
ip_fil.h \
ip_nat.h \
@ -72,7 +72,7 @@
netinet/ip_compat.h \
netinet/ip_fil_compat.h \
netinet/ip_fil.h \
@@ -41553,6 +41559,7 @@ ac_fn_cxx_check_header_compile "$LINENO"
@@ -41553,6 +41559,7 @@
#if HAVE_IP_COMPAT_H
#include <ip_compat.h>
#elif HAVE_NETINET_IP_COMPAT_H
@ -80,3 +80,13 @@
#include <netinet/ip_compat.h>
#endif
#if HAVE_IP_FIL_H
@@ -41616,8 +41623,7 @@
fi
-ac_fn_cxx_check_member "$LINENO" "struct natlookup" "nl_realipaddr.in6"
- "ac_cv_member_struct_natlookup_nl_realipaddr_in6___" "
+ac_fn_cxx_check_member "$LINENO" "struct natlookup" "nl_realipaddr.in6" "ac_cv_member_struct_natlookup_nl_realipaddr_in6___" "
#if USE_SOLARIS_IPFILTER_MINOR_T_HACK
#define minor_t fubar
#endif