Revision: 2189 http://geany-plugins.svn.sourceforge.net/geany-plugins/?rev=2189&view=re... Author: alvesh88 Date: 2011-09-01 16:40:01 +0000 (Thu, 01 Sep 2011) Log Message: ----------- Applied patch by sardenmff7 to fix bug 3344648

Modified Paths: -------------- trunk/geany-plugins/build/geanypg.m4 trunk/geany-plugins/geanypg/src/Makefile.am

Modified: trunk/geany-plugins/build/geanypg.m4 =================================================================== --- trunk/geany-plugins/build/geanypg.m4 2011-09-01 13:00:17 UTC (rev 2188) +++ trunk/geany-plugins/build/geanypg.m4 2011-09-01 16:40:01 UTC (rev 2189) @@ -2,11 +2,13 @@ [ 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")

Modified: trunk/geany-plugins/geanypg/src/Makefile.am =================================================================== --- trunk/geany-plugins/geanypg/src/Makefile.am 2011-09-01 13:00:17 UTC (rev 2188) +++ trunk/geany-plugins/geanypg/src/Makefile.am 2011-09-01 16:40:01 UTC (rev 2189) @@ -22,7 +22,7 @@ $(COMMON_LIBS) \ $(GPGME_LIBS)

-geanypg_la__CFLAGS = \ +geanypg_la_CFLAGS = \ $(AM_CFLAGS) \ $(GPGME_CFLAGS)

This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.