sad/firehol
1
0
Fork 0
mirror of https://github.com/firehol/firehol.git synced 2024-06-30 19:02:21 +00:00
Code Issues Packages Projects Releases Wiki Activity

Ensure iprange is treated specially

Browse Source
This commit is contained in:
Philip Whineray 2015-11-12 21:43:33 +00:00
parent b73d00f7d9
commit e3cd023085
2 changed files with 4 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
configure.ac
View File

@ -148,7 +148,6 @@ fi
if test x"$enable_ipv6" = xyes; then
AX_CHECK_PROG([IP6TABLES_SAVE], [ip6tables-save], [])
fi
AX_CHECK_PROG([IPRANGE], [iprange], [])
AX_CHECK_PROG([IPSET], [ipset], [])
if test x"$enable_ipv4" = xyes; then
AX_CHECK_PROG([IPTABLES], [iptables], [])
@ -226,7 +225,6 @@ AX_NEED_PROG([ENV], [env], [])
AX_NEED_PROG([FLOCK], [flock], [])
AX_CHECK_PROG([HEAD], [head], [])
AX_NEED_PROG([IP], [ip], [])
AX_NEED_PROG([IPRANGE], [iprange], [])
AX_CHECK_PROG([JQ], [jq], [])
AX_NEED_PROG([LN], [ln], [])
AX_NEED_PROG([LOGGER], [logger], [])
@ -268,7 +266,6 @@ AX_CHECK_PROG([FUNZIP], [funzip], [])
AX_CHECK_PROG([GAWK], [gawk], [])
AX_NEED_PROG([GAWK], [awk], [])
AX_CHECK_PROG([GIT], [git], [])
AX_NEED_PROG([IPRANGE], [iprange], [])
AX_NEED_PROG([IPSET], [ipset], [])
AX_NEED_PROG([LN], [ln], [])
AX_NEED_PROG([LOGGER], [logger], [])
@ -331,7 +328,7 @@ AC_CHECK_HEADERS(sys/time.h,,AC_MSG_ERROR(sys/time.h missing))
AC_CHECK_FUNC(htonl,,AC_MSG_ERROR(htonl() not found))
else
dnl Try and detect it on the system anyway
AX_CHECK_PROG([IPRANGE], [iprange], [])
AX_NEED_PROG([IPRANGE], [iprange], [])
dnl Horrible but how else to make the compiler completely optional?
AM_CONDITIONAL([AMDEP], false)

5
packaging/gen-config-detect.pl
View File

@ -56,6 +56,7 @@ my %special = (
SED => "AX_NEED_SED()",
GREP => "AX_NEED_GREP()",
EGREP => "AX_NEED_EGREP()",
IPRANGE => "",
);
my %ipv = (
@ -71,7 +72,7 @@ my %ipv = (
print "dnl --- OUTPUT OF './packaging/gen-config-detect.pl sbin/*.in' BEGIN ---\n";
foreach my $special (sort(values(%special))) {
print $special . "\n";
print $special . "\n" if ($special);
}
foreach my $s (sort(keys(%scripts))) {
@ -89,7 +90,7 @@ foreach my $s (sort(keys(%scripts))) {
}
if ($required) {
if ($special{$c}) {
if (defined($special{$c})) {
# Already handled
} else {
my $i = 0;