2005-07-17 [colin] 1.9.12cvs72

	* src/plugins/pgpcore/Makefile.am
	* src/plugins/pgpmime/Makefile.am
		Add gpgme libs

diff --git a/ChangeLog-gtk2.claws b/ChangeLog-gtk2.claws
index 2144b3d479d22b232458203c1ffb43d6cc464966..29d9ea63c7d8f5137b130a8a8cfdd0c5f9277edb 100644 (file)
--- a/ChangeLog-gtk2.claws
+++ b/ChangeLog-gtk2.claws
@@ -1,3 +1,9 @@
+2005-07-17 [colin]     1.9.12cvs72
+
+       * src/plugins/pgpcore/Makefile.am
+       * src/plugins/pgpmime/Makefile.am
+               Add gpgme libs
+

 2005-07-17 [paul]      1.9.12cvs71
 
        * configure.ac
 2005-07-17 [paul]      1.9.12cvs71
 
        * configure.ac

diff --git a/PATCHSETS b/PATCHSETS
index 31814fa0aa18accdee5449eb78c8947278e08f75..926aafe90c6d6148d9cdc25bc9b93c032f23be78 100644 (file)
--- a/PATCHSETS
+++ b/PATCHSETS
@@ -666,3 +666,4 @@
 ( cvs diff -u -r 1.1.2.3 -r 1.1.2.4 src/image_viewer.c;  ) > 1.9.12cvs69.patchset
 ( cvs diff -u -r 1.61.2.32 -r 1.61.2.33 src/account.c;  cvs diff -u -r 1.12.2.23 -r 1.12.2.24 src/action.c;  cvs diff -u -r 1.60.2.19 -r 1.60.2.20 src/addressbook.c;  cvs diff -u -r 1.382.2.142 -r 1.382.2.143 src/compose.c;  cvs diff -u -r 1.26.2.17 -r 1.26.2.18 src/foldersel.c;  cvs diff -u -r 1.207.2.45 -r 1.207.2.46 src/folderview.c;  cvs diff -u -r 1.12.2.8 -r 1.12.2.9 src/html.c;  cvs diff -u -r 1.1.2.15 -r 1.1.2.16 src/imap_gtk.c;  cvs diff -u -r 1.115.2.44 -r 1.115.2.45 src/main.c;  cvs diff -u -r 1.274.2.45 -r 1.274.2.46 src/mainwindow.c;  cvs diff -u -r 1.94.2.56 -r 1.94.2.57 src/messageview.c;  cvs diff -u -r 1.2.2.8 -r 1.2.2.9 src/mh_gtk.c;  cvs diff -u -r 1.83.2.34 -r 1.83.2.35 src/mimeview.c;  cvs diff -u -r 1.2.2.5 -r 1.2.2.6 src/news_gtk.c;  cvs diff -u -r 1.105.2.27 -r 1.105.2.28 src/prefs_account.c;  cvs diff -u -r 1.1.2.4 -r 1.1.2.5 src/prefs_send.c;  cvs diff -u -r 1.1.2.4 -r 1.1.2.5 src/prefs_summaries.c;  cvs diff -u -r 1.150.2.30 -r 1.150.2.31 src/procmsg.c;  cvs diff -u -r 1.395.2.93 -r 1.395.2.94 src/summaryview.c;  cvs diff -u -r 1.9.2.11 -r 1.9.2.12 src/common/defs.h;  cvs diff -u -r 1.36.2.36 -r 1.36.2.37 src/common/utils.c;  cvs diff -u -r 1.1.4.7 -r 1.1.4.8 src/common/xml.c;  cvs diff -u -r 1.1.2.1 -r 1.1.2.2 src/plugins/pgpcore/passphrase.c;  cvs diff -u -r 1.1.2.1 -r 1.1.2.2 src/plugins/pgpcore/select-keys.c;  ) > 1.9.12cvs70.patchset
 ( cvs diff -u -r 1.654.2.705 -r 1.654.2.706 configure.ac;  ) > 1.9.12cvs71.patchset
 ( cvs diff -u -r 1.1.2.3 -r 1.1.2.4 src/image_viewer.c;  ) > 1.9.12cvs69.patchset
 ( cvs diff -u -r 1.61.2.32 -r 1.61.2.33 src/account.c;  cvs diff -u -r 1.12.2.23 -r 1.12.2.24 src/action.c;  cvs diff -u -r 1.60.2.19 -r 1.60.2.20 src/addressbook.c;  cvs diff -u -r 1.382.2.142 -r 1.382.2.143 src/compose.c;  cvs diff -u -r 1.26.2.17 -r 1.26.2.18 src/foldersel.c;  cvs diff -u -r 1.207.2.45 -r 1.207.2.46 src/folderview.c;  cvs diff -u -r 1.12.2.8 -r 1.12.2.9 src/html.c;  cvs diff -u -r 1.1.2.15 -r 1.1.2.16 src/imap_gtk.c;  cvs diff -u -r 1.115.2.44 -r 1.115.2.45 src/main.c;  cvs diff -u -r 1.274.2.45 -r 1.274.2.46 src/mainwindow.c;  cvs diff -u -r 1.94.2.56 -r 1.94.2.57 src/messageview.c;  cvs diff -u -r 1.2.2.8 -r 1.2.2.9 src/mh_gtk.c;  cvs diff -u -r 1.83.2.34 -r 1.83.2.35 src/mimeview.c;  cvs diff -u -r 1.2.2.5 -r 1.2.2.6 src/news_gtk.c;  cvs diff -u -r 1.105.2.27 -r 1.105.2.28 src/prefs_account.c;  cvs diff -u -r 1.1.2.4 -r 1.1.2.5 src/prefs_send.c;  cvs diff -u -r 1.1.2.4 -r 1.1.2.5 src/prefs_summaries.c;  cvs diff -u -r 1.150.2.30 -r 1.150.2.31 src/procmsg.c;  cvs diff -u -r 1.395.2.93 -r 1.395.2.94 src/summaryview.c;  cvs diff -u -r 1.9.2.11 -r 1.9.2.12 src/common/defs.h;  cvs diff -u -r 1.36.2.36 -r 1.36.2.37 src/common/utils.c;  cvs diff -u -r 1.1.4.7 -r 1.1.4.8 src/common/xml.c;  cvs diff -u -r 1.1.2.1 -r 1.1.2.2 src/plugins/pgpcore/passphrase.c;  cvs diff -u -r 1.1.2.1 -r 1.1.2.2 src/plugins/pgpcore/select-keys.c;  ) > 1.9.12cvs70.patchset
 ( cvs diff -u -r 1.654.2.705 -r 1.654.2.706 configure.ac;  ) > 1.9.12cvs71.patchset

+( cvs diff -u -r 1.1.2.1 -r 1.1.2.2 src/plugins/pgpcore/Makefile.am;  cvs diff -u -r 1.1.2.3 -r 1.1.2.4 src/plugins/pgpmime/Makefile.am;  ) > 1.9.12cvs72.patchset

diff --git a/configure.ac b/configure.ac
index 08e707e741a6fb7ec1c81a42cd2b5cd5ffad77e4..47b4f47cafeabe079e9291fc4273bc01c7868822 100644 (file)
--- a/configure.ac
+++ b/configure.ac
@@ -11,7 +11,7 @@ MINOR_VERSION=9
 MICRO_VERSION=12
 INTERFACE_AGE=0
 BINARY_AGE=0
 MICRO_VERSION=12
 INTERFACE_AGE=0
 BINARY_AGE=0

-EXTRA_VERSION=71
+EXTRA_VERSION=72

 EXTRA_RELEASE=
 EXTRA_GTK2_VERSION=
 
 EXTRA_RELEASE=
 EXTRA_GTK2_VERSION=
 

diff --git a/src/plugins/pgpcore/Makefile.am b/src/plugins/pgpcore/Makefile.am
index 832bef1901ac672d08da080c66e340bc8fbfb1cf..c607a4df43c2539a7fcc9449d98fe381b7708a45 100644 (file)
--- a/src/plugins/pgpcore/Makefile.am
+++ b/src/plugins/pgpcore/Makefile.am
@@ -17,7 +17,9 @@ plugininclude_HEADERS = \
        sgpgme.h
 
 pgpcore_la_LDFLAGS = \
        sgpgme.h
 
 pgpcore_la_LDFLAGS = \

-       -avoid-version -module
+       -avoid-version -module \
+        $(GTK_LIBS) \
+       $(GPGME_LIBS)

 
 INCLUDES = \
        -I../../ \
 
 INCLUDES = \
        -I../../ \

diff --git a/src/plugins/pgpmime/Makefile.am b/src/plugins/pgpmime/Makefile.am
index a5cffef19f9c64898af3f3e38957a1742c1f5a74..065e7cee35b599ac149a51be9db2f6db99c2593d 100644 (file)
--- a/src/plugins/pgpmime/Makefile.am
+++ b/src/plugins/pgpmime/Makefile.am
@@ -14,7 +14,10 @@ plugininclude_HEADERS = \
        pgpmime.h 
 
 pgpmime_la_LDFLAGS = \
        pgpmime.h 
 
 pgpmime_la_LDFLAGS = \

-       -avoid-version -module
+       -avoid-version -module \
+        $(GTK_LIBS) \
+       $(GPGME_LIBS)
+               

 
 INCLUDES = \
        -I../../ \
 
 INCLUDES = \
        -I../../ \