The gpgme detection had a couple of issues which are fixed:

1) In some cases it would not error out when gpgme was missing and
--with-gpgme was passed.

2) In some cases, the CFLAGS/LDFLAGS etc would not be properly
restored.

Signed-off-by: Allan McRae <[email protected]>
---
 configure.ac | 9 +++++----
 1 file changed, 5 insertions(+), 4 deletions(-)

diff --git a/configure.ac b/configure.ac
index a7364ba..1e1c37c 100644
--- a/configure.ac
+++ b/configure.ac
@@ -246,13 +246,14 @@ AS_IF([test "x$with_gpgme" != "xno"],
                        unset GPGME_CFLAGS]
                        AS_IF([test "x$with_gpgme" = "xyes"],
                                [AC_MSG_FAILURE([*** gpgme >= 1.3.0 is needed 
for GPG signature support])])
-                       )],
-               [with_gpgme=no])]
-               [LIBS="$LIBS_save"
+                       )
+
+               LIBS="$LIBS_save"
                CPPFLAGS="$CPPFLAGS_save"
                CFLAGS="$CFLAGS_save"
                unset CPPFLAGS_save
-               unset CFLAGS_save])
+               unset CFLAGS_save],)])
+
 AS_IF([test "x$have_gpgme" = xno -a "x$with_gpgme" = xyes],
        [AC_MSG_FAILURE([--with-gpgme was given, but gpgme was not found])])
 AM_CONDITIONAL([HAVE_LIBGPGME], [test "x$have_gpgme" = "xyes"])
-- 
1.8.1.3


Reply via email to