Permalink
Browse files

Applied patch by sardenmff7 to fix bug 3344648

  • Loading branch information...
1 parent c04eb1f commit cd3280a26eece7983f396f54ac5ac19cc1501253 @alvesh88 alvesh88 committed Sep 1, 2011
Showing with 8 additions and 6 deletions.
  1. +7 −5 build/geanypg.m4
  2. +1 −1 geanypg/src/Makefile.am
View
@@ -2,11 +2,13 @@ AC_DEFUN([GP_CHECK_GEANYPG],
[
GP_ARG_DISABLE([geanypg], [auto])
if test "$enable_geanypg" = "auto"; then
- AM_PATH_GPGME(, enable_geanypg=yes, enable_geanypg=no)
- else
- AM_PATH_GPGME(,,
- [AC_MSG_ERROR([Could not find GPGME. Please define GPGME_CFLAGS and
- GPGME_LIBS if it is installed.])])
+ enable_geanypg=no
+ m4_ifdef([AM_PATH_GPGME], [AM_PATH_GPGME(, enable_geanypg=yes)])
+ elif test "$enable_geanypg" = "yes"; then
+ m4_ifdef([AM_PATH_GPGME],
+ [AM_PATH_GPGME(,, [AC_MSG_ERROR([Could not find GPGME. Please define GPGME_CFLAGS and GPGME_LIBS if it is installed.])])],
+ [AC_MSG_ERROR([Could not find GPGME. Please install it])])
+
fi
AM_CONDITIONAL(ENABLE_GEANYPG, test "$enable_geanypg" = "yes")
@@ -22,7 +22,7 @@ geanypg_la_LIBADD = \
$(COMMON_LIBS) \
$(GPGME_LIBS)
-geanypg_la__CFLAGS = \
+geanypg_la_CFLAGS = \
$(AM_CFLAGS) \
$(GPGME_CFLAGS)

0 comments on commit cd3280a

Please sign in to comment.