[client+server] Added --disable-gpg to the autoconf config

Added --disable-gpg to the autoconf ./configure script
via configure.ac.  This makes it easy to not have fwknop/fwknopd
link against libgpgme even if it is installed on the local system.

ChangeLog

@@ -52,6 +52,9 @@ fwknop-2.0.4 (11//2012):
     - Updated build CFLAGS and LDFLAGS to conform to the Debian
       hardening-includes file for PIE support (e.g. '-fPIE' for CFLAGS and
       '-fPIE -pie' for LDFLAGS).
+    - [client+server] Added --disable-gpg to the autoconf ./configure script
+      via configure.ac.  This makes it easy to not have fwknop/fwknopd
+      link against libgpgme even if it is installed on the local system.
 
 fwknop-2.0.3 (09/03/2012):
     - [server] Fernando Arnaboldi from IOActive found several DoS/code

configure.ac

@@ -299,6 +299,20 @@ AS_IF([test "$want_file_cache" = yes], [
     AC_DEFINE([USE_FILE_CACHE], [1], [Define this to enable non-gdbm/ndbm digest storing (eliminates gdbm/ndbm dependency).])
 ])
 
+dnl Add various common way to sbin dir to the path (just in case)
+APP_PATH=$PATH$PATH_SEPARATOR/sbin$PATH_SEPARATOR/usr/sbin$PATH_SEPARATOR/usr/local/sbin
+
+dnl Decide whether or not to enable gpg support
+dnl
+use_gpg=yes
+AC_ARG_ENABLE([gpg],
+  [AS_HELP_STRING([--disable-gpg],
+    [Do not enable gpg support via libgpgme @<:@default is on@:>@])],
+  [use_gpg=$enableval],
+  [])
+
+if test "x$use_gpg" = "xyes"; then
+
     # Check for 3rd-party libs
     #
     AC_ARG_WITH([gpgme],
@@ -319,9 +333,6 @@ AS_IF([test "x$with_gpgme" != xno],
          fi
         ], [have_gpgme=no])], [have_gpgme=no])
 
-dnl Add various common way to sbin dir to the path (just in case)
-  APP_PATH=$PATH$PATH_SEPARATOR/sbin$PATH_SEPARATOR/usr/sbin$PATH_SEPARATOR/usr/local/sbin
-
 dnl Check for gpg (not gpg2)
 dnl
     AC_ARG_WITH([gpg],
@@ -358,6 +369,9 @@ case "$host" in
         ;;
     esac
     fi
+    else
+        have_gpgme=no
+fi
 
 dnl Check for libpcap, gdbm (or ndbm) if we are building the server component
 dnl

todo.org

@@ -2,6 +2,12 @@
   This is the main todo org mode file for the fwknop project
 ** COMPLETED
    This bucket is for completed tasks.
+*** Add --disable-gpg arg to the autoconf configure script
+    :CLOSED: <2012-10-31 Wed>
+    There needs to be a way to easily disable libgpgme usage even if it is
+    installed - this could be done with a new --disable-gpg argument to the
+    configure script.
+    - Added --disable-gpg to the autoconf configure script (via configure.ac)
 *** [client] Add --icmp-type and --icmp-code args
     :CLOSED: <2012-10-11 Thu>
     For SPA packets sent over ICMP via raw socket, allow the user to specify
@@ -112,10 +118,6 @@
 ** [client] Update to not send SPA packet if Ctrl-C is used
    The client currently sends an SPA packet when an encryption key is
    requested but the user tries to exit out with Ctrl-C.
-** Add --disable-gpg arg to the autoconf configure script
-   There needs to be a way to easily disable libgpgme usage even if it is
-   installed - this could be done with a new --disablegpg argument to the
-   configure script.
 ** [test suite] client/server only tests
    When only the client or server is being installed on a system, the test
    suite should be able to run only the relevant tests.