DeforaNetworks/fwknop
3
0
Fork 0
Code Releases Activity

Merging fixes_for_2.0.4 into hmac_support

Browse Source
This commit is contained in:
Damien Stuart
2013-02-25 21:46:09 -05:00
parent bdb32cf634 bf990821ff
commit 9c1b1d531d
1 changed files with 29 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files
configure.ac
+29 -4
View File
@@ -431,7 +431,7 @@ dnl
AS_IF([ test "x$withval" = xno ], [],
AS_IF([ test "x$withval" = x -o "x$withval" = xyes ],
[AC_MSG_ERROR([--with-iptables requires an argument specifying a path to iptables])],
[ IPTABLES_EXE=$withval ]
[ FORCE_IPTABLES_EXE=$withval ]
)
)
],
@@ -449,7 +449,7 @@ dnl
AS_IF([ test "x$withval" = xno ], [],
AS_IF([ test "x$withval" = x -o "x$withval" = xyes ],
[AC_MSG_ERROR([--with-ipfw requires an argument specifying a path to ipfw])],
[ IPFW_EXE=$withval ]
[ FORCE_IPFW_EXE=$withval ]
)
)
],
@@ -467,7 +467,7 @@ dnl
AS_IF([ test "x$withval" = xno ], [],
AS_IF([ test "x$withval" = x -o "x$withval" = xyes ],
[AC_MSG_ERROR([--with-pf requires an argument specifying a path to pf])],
[ PF_EXE=$withval ]
[ FORCE_PF_EXE=$withval ]
)
)
],
@@ -485,7 +485,7 @@ dnl
AS_IF([ test "x$withval" = xno ], [],
AS_IF([ test "x$withval" = x -o "x$withval" = xyes ],
[AC_MSG_ERROR([--with-ipf requires an argument specifying a path to ipf])],
[ IPF_EXE=$withval ]
[ FORCE_IPF_EXE=$withval ]
)
)
],
@@ -494,6 +494,31 @@ dnl
]
)
dnl If a firewall was forced. set the appropriate _EXE var and clear the others.
dnl
AS_IF([test "x$FORCE_IPTABLES_EXE" != x], [
IPTABLES_EXE="$FORCE_IPTABLES_EXE"
],[
AS_IF([test "x$FORCE_IPFW_EXE" != x], [
IPFW_EXE="$FORCE_IPFW_EXE"
IPTABLES_EXE=""
],[
AS_IF([test "x$FORCE_PF_EXE" != x], [
PF_EXE="$FORCE_PF_EXE"
IPFW_EXE=""
IPTABLES_EXE=""
],[
AS_IF([test "x$FORCE_IPF_EXE" != x], [
IPF_EXE="$FORCE_IPF_EXE"
PF_EXE=""
IPFW_EXE=""
IPTABLES_EXE=""
]
]
]
]
))))
dnl Determine which firewall exe we use (if we have one).
dnl If iptables was found or specified, it wins, then we fallback to ipfw,
dnl then pf, and otherwise we try ipf.