add --with-firewalld autoconf argument as a synonym for --with-firewall-cmd

ChangeLog

@@ -4,6 +4,9 @@ fwknop-2.6.7 (05//2015):
       take advantage of this will likely be OpenWRT thanks to Jonathan.
     - Added a script from Jonathan Bennett at extras/console-qr/console-qr.sh
       to generate QR codes from fwknopd access.conf keys.
+    - Added --with-firewalld to the autoconf configure script. This is a
+      synonym for --with-firewall-cmd to avoid confusion. Some package
+      maintainers use --with-firewalld to build fwknop.
 
 fwknop-2.6.6 (04/23/2015):
     - [server] Add the ability for fwknopd to function as an generic SPA

configure.ac

@@ -579,6 +579,22 @@ dnl
     ]
   )
 
+  AC_ARG_WITH([firewalld],
+    [AS_HELP_STRING([--with-firewalld=/path/to/firewall-cmd],
+      [Synonym for --with-firewall-cmd, specify path to the firewall-cmd executable @<:@default=check path@:>@])],
+    [
+      AS_IF([ test "x$withval" = xno ], [],
+        AS_IF([ test "x$withval" = x -o "x$withval" = xyes ],
+          [AC_MSG_ERROR([--with-firewalld requires an argument specifying a path to firewall-cmd])],
+          [ FORCE_FIREWALLD_EXE=$withval ]
+        )
+      )
+    ],
+    [
+     AC_PATH_PROG(FIREWALLD_EXE, [firewalld], [], [$APP_PATH])
+    ]
+  )
+
 dnl Check for iptables
 dnl
   AC_ARG_WITH([iptables],
@@ -654,29 +670,29 @@ dnl
 dnl If a firewall was forced. set the appropriate _EXE var and clear the others.
 dnl
   AS_IF([test "x$FORCE_FIREWALLD_EXE" != x], [
-    FIREWALLD_EXE="$FORCE_FIREWALLD_EXE"    
+    FIREWALLD_EXE="$FORCE_FIREWALLD_EXE"
   ],[
     AS_IF([test "x$FORCE_IPTABLES_EXE" != x], [
-      IPTABLES_EXE="$FORCE_IPTABLES_EXE"    
-      FIREWALLD_EXE=""    
+      IPTABLES_EXE="$FORCE_IPTABLES_EXE"
+      FIREWALLD_EXE=""
     ],[
       AS_IF([test "x$FORCE_IPFW_EXE" != x], [
-        IPFW_EXE="$FORCE_IPFW_EXE"    
-        IPTABLES_EXE=""    
-        FIREWALLD_EXE=""    
+        IPFW_EXE="$FORCE_IPFW_EXE"
+        IPTABLES_EXE=""
+        FIREWALLD_EXE=""
       ],[
         AS_IF([test "x$FORCE_PF_EXE" != x], [
-          PF_EXE="$FORCE_PF_EXE"    
-          IPFW_EXE=""    
-          IPTABLES_EXE=""    
-          FIREWALLD_EXE=""    
+          PF_EXE="$FORCE_PF_EXE"
+          IPFW_EXE=""
+          IPTABLES_EXE=""
+          FIREWALLD_EXE=""
         ],[
           AS_IF([test "x$FORCE_IPF_EXE" != x], [
-            IPF_EXE="$FORCE_IPF_EXE"    
-            PF_EXE=""    
-            IPFW_EXE=""    
-            IPTABLES_EXE=""    
-            FIREWALLD_EXE=""    
+            IPF_EXE="$FORCE_IPF_EXE"
+            PF_EXE=""
+            IPFW_EXE=""
+            IPTABLES_EXE=""
+            FIREWALLD_EXE=""
           ]
         ]
       ]
@@ -690,19 +706,19 @@ dnl then ipfw, pf, and otherwise we try ipf.
 dnl
   AS_IF([test "x$FIREWALLD_EXE" != x], [
       FW_DEF="FW_FIREWALLD"
-      FIREWALL_TYPE="firewalld" 
+      FIREWALL_TYPE="firewalld"
       FIREWALL_EXE=$FIREWALLD_EXE
       AC_DEFINE_UNQUOTED([FIREWALL_FIREWALLD], [1], [The firewall type: firewalld.])
   ],[
     AS_IF([test "x$IPTABLES_EXE" != x], [
         FW_DEF="FW_IPTABLES"
-        FIREWALL_TYPE="iptables" 
+        FIREWALL_TYPE="iptables"
         FIREWALL_EXE=$IPTABLES_EXE
         AC_DEFINE_UNQUOTED([FIREWALL_IPTABLES], [1], [The firewall type: iptables.])
     ],[
       AS_IF([test "x$IPFW_EXE" != x], [
           FW_DEF="FW_IPFW"
-          FIREWALL_TYPE="ipfw" 
+          FIREWALL_TYPE="ipfw"
           FIREWALL_EXE=$IPFW_EXE
           AC_DEFINE_UNQUOTED([FIREWALL_IPFW], [1], [The firewall type: ipfw.])
       ],[
@@ -714,7 +730,7 @@ dnl
           ],[
               AS_IF([test "x$IPF_EXE" != x], [
                 AC_MSG_ERROR([Sorry - ipf was specified or the only one found, however, it is not supported yet.])
-                FIREWALL_TYPE="ipf" 
+                FIREWALL_TYPE="ipf"
                 FIREWALL_EXE=$IPF_EXE
                 AC_DEFINE_UNQUOTED([FIREWALL_IPF], [1], [The firewall type: ipf.])
             ], [AC_MSG_ERROR([No firewall program was found or specified.]) ]