allow gpgme in non-standard locations

diff --git a/AUTHORS b/AUTHORS
index e7ed114a49a5e04c26df8394487680e3f179dfeb..9bba4d3e8624644abb3036683847151fca67e126 100644 (file)
--- a/AUTHORS
+++ b/AUTHORS
@@ -111,3 +111,4 @@ contributors (beside the above; based on Changelog)
        Motonobu Ichimura
        Luca Rosellini
        Yasuzaki Masayoshi
        Motonobu Ichimura
        Luca Rosellini
        Yasuzaki Masayoshi

+       Stoyen Genov

diff --git a/ChangeLog.claws b/ChangeLog.claws
index 0e03f4acdcc09d51e266f65031987c671bda6285..1f9b4ea58305a5d66bc4204d20aeb94ed9fb9a06 100644 (file)
--- a/ChangeLog.claws
+++ b/ChangeLog.claws
@@ -1,3 +1,10 @@
+2002-01-25 [paul]      0.7.0claws26
+
+       * src/Makefile.am
+               add $(GPGME_CFLAGS) to INCLUDES so that gpgme can 
+               be found in non-standard locations. 
+               Closes Patch #507976, submitted by Stoyen Genov.
+

 2002-01-25 [paul]      0.7.0claws25
 
        * sync with sylpheed 0.7.0cvs16
 2002-01-25 [paul]      0.7.0claws25
 
        * sync with sylpheed 0.7.0cvs16

diff --git a/configure.in b/configure.in
index c0556c05ea698587b040fc07163bd49e1cf48e43..feac83b99e21a946e8eafb4d6fd550ca9326df65 100644 (file)
--- a/configure.in
+++ b/configure.in
@@ -8,7 +8,7 @@ MINOR_VERSION=7
 MICRO_VERSION=0
 INTERFACE_AGE=0
 BINARY_AGE=0
 MICRO_VERSION=0
 INTERFACE_AGE=0
 BINARY_AGE=0

-EXTRA_VERSION=claws25
+EXTRA_VERSION=claws26

 VERSION=$MAJOR_VERSION.$MINOR_VERSION.$MICRO_VERSION$EXTRA_VERSION
 
 dnl set $target
 VERSION=$MAJOR_VERSION.$MINOR_VERSION.$MICRO_VERSION$EXTRA_VERSION
 
 dnl set $target

diff --git a/src/Makefile.am b/src/Makefile.am
index afe428a96cfa70b9f1bf68637933fdb917e1674b..a8cec79a229e48a0a6130d775b04f890aba1523e 100644 (file)
--- a/src/Makefile.am
+++ b/src/Makefile.am
@@ -201,6 +201,7 @@ INCLUDES = \
        $(GTK_CFLAGS) \
        $(GDK_IMLIB_CFLAGS) \
        $(GDK_PIXBUF_CFLAGS) \
        $(GTK_CFLAGS) \
        $(GDK_IMLIB_CFLAGS) \
        $(GDK_PIXBUF_CFLAGS) \

+       $(GPGME_CFLAGS) \

         $(PSPELL_CFLAGS)    \
        -I$(includedir)
 
         $(PSPELL_CFLAGS)    \
        -I$(includedir)