bryson/pacman
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Fix gpgme detection

Browse source 
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 <allan@archlinux.org>
This commit is contained in:
Allan McRae 2013-02-11 13:28:04 +10:00
parent 3fa2830829
commit 1d0a69c655
1 changed files with 5 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

9
configure.ac
View file

@ -246,13 +246,14 @@ AS_IF([test "x$with_gpgme" != "xno"],
unset GPGME_CFLAGS] unset GPGME_CFLAGS]
AS_IF([test "x$with_gpgme" = "xyes"], AS_IF([test "x$with_gpgme" = "xyes"],
[AC_MSG_FAILURE([*** gpgme >= 1.3.0 is needed for GPG signature support])]) [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" CPPFLAGS="$CPPFLAGS_save"
CFLAGS="$CFLAGS_save" CFLAGS="$CFLAGS_save"
unset CPPFLAGS_save unset CPPFLAGS_save
unset CFLAGS_save]) unset CFLAGS_save],)])
AS_IF([test "x$have_gpgme" = xno -a "x$with_gpgme" = xyes], AS_IF([test "x$have_gpgme" = xno -a "x$with_gpgme" = xyes],
[AC_MSG_FAILURE([--with-gpgme was given, but gpgme was not found])]) [AC_MSG_FAILURE([--with-gpgme was given, but gpgme was not found])])
AM_CONDITIONAL([HAVE_LIBGPGME], [test "x$have_gpgme" = "xyes"]) AM_CONDITIONAL([HAVE_LIBGPGME], [test "x$have_gpgme" = "xyes"])