2008-12-12 [colin] 3.6.1cvs72

	* configure.ac
	* src/plugins/pgpinline/claws.def
		Windows build fixes

diff --git a/ChangeLog b/ChangeLog
index eda38b1be2d218199e04bca8f30e07a38d4d96e9..1ccbea9023aca8c1e9edfb7e2952e60e1845510b 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,9 @@
+2008-12-12 [colin]     3.6.1cvs72
+
+       * configure.ac
+       * src/plugins/pgpinline/claws.def
+               Windows build fixes
+

 2008-12-12 [paul]      3.6.1cvs71
 
        * src/imap.c
 2008-12-12 [paul]      3.6.1cvs71
 
        * src/imap.c

diff --git a/PATCHSETS b/PATCHSETS
index 4c724a9de7c6d5f648be443355112c64871a004e..b05854565a6d77949242880e2d061825c4024c48 100644 (file)
--- a/PATCHSETS
+++ b/PATCHSETS
@@ -3653,3 +3653,4 @@
 ( cvs diff -u -r 1.1.2.17 -r 1.1.2.18 manual/faq.xml;  ) > 3.6.1cvs69.patchset
 ( cvs diff -u -r 1.42.2.44 -r 1.42.2.45 po/fr.po;  cvs diff -u -r 1.1.2.18 -r 1.1.2.19 manual/fr/advanced.xml;  ) > 3.6.1cvs70.patchset
 ( cvs diff -u -r 1.179.2.237 -r 1.179.2.238 src/imap.c;  cvs diff -u -r 1.79.2.66 -r 1.79.2.67 src/mh.c;  cvs diff -u -r 1.1.2.22 -r 1.1.2.23 src/partial_download.c;  cvs diff -u -r 1.96.2.211 -r 1.96.2.212 src/textview.c;  cvs diff -u -r 1.1.2.6 -r 1.1.2.7 src/common/claws.c;  cvs diff -u -r 1.5.2.12 -r 1.5.2.13 src/common/prefs.c;  cvs diff -u -r 1.36.2.155 -r 1.36.2.156 src/common/utils.c;  ) > 3.6.1cvs71.patchset
 ( cvs diff -u -r 1.1.2.17 -r 1.1.2.18 manual/faq.xml;  ) > 3.6.1cvs69.patchset
 ( cvs diff -u -r 1.42.2.44 -r 1.42.2.45 po/fr.po;  cvs diff -u -r 1.1.2.18 -r 1.1.2.19 manual/fr/advanced.xml;  ) > 3.6.1cvs70.patchset
 ( cvs diff -u -r 1.179.2.237 -r 1.179.2.238 src/imap.c;  cvs diff -u -r 1.79.2.66 -r 1.79.2.67 src/mh.c;  cvs diff -u -r 1.1.2.22 -r 1.1.2.23 src/partial_download.c;  cvs diff -u -r 1.96.2.211 -r 1.96.2.212 src/textview.c;  cvs diff -u -r 1.1.2.6 -r 1.1.2.7 src/common/claws.c;  cvs diff -u -r 1.5.2.12 -r 1.5.2.13 src/common/prefs.c;  cvs diff -u -r 1.36.2.155 -r 1.36.2.156 src/common/utils.c;  ) > 3.6.1cvs71.patchset

+( cvs diff -u -r 1.654.2.3718 -r 1.654.2.3719 configure.ac;  cvs diff -u -r 1.1.2.3 -r 1.1.2.4 src/plugins/pgpinline/claws.def;  ) > 3.6.1cvs72.patchset

diff --git a/configure.ac b/configure.ac
index 6e7e243def51555890f4e35852c2b0639f763aea..e4184d9ab4cc8b29989a88c8b9d81ab911c61b05 100644 (file)
--- a/configure.ac
+++ b/configure.ac
@@ -11,7 +11,7 @@ MINOR_VERSION=6
 MICRO_VERSION=1
 INTERFACE_AGE=0
 BINARY_AGE=0
 MICRO_VERSION=1
 INTERFACE_AGE=0
 BINARY_AGE=0

-EXTRA_VERSION=71
+EXTRA_VERSION=72

 EXTRA_RELEASE=
 EXTRA_GTK2_VERSION=
 
 EXTRA_RELEASE=
 EXTRA_GTK2_VERSION=
 


@@ -411,7 +411,11 @@ if test "x$ac_cv_enable_gnutls" != "xno"; then
        ],[ac_cv_enable_gnutls=no])
   fi
   if test "x$ac_cv_enable_gnutls" = "xyes"; then
        ],[ac_cv_enable_gnutls=no])
   fi
   if test "x$ac_cv_enable_gnutls" = "xyes"; then

-       GNUTLS_LIBS="-lgnutls -lgcrypt -lz ${GCRYPT_LIBS}"
+       if test x"$platform_win32" = "xyes"; then
+               GNUTLS_LIBS="-lgnutls -lgcrypt -lz ${GCRYPT_LIBS}"
+       else
+               GNUTLS_LIBS="-lgnutls -lgcrypt ${GCRYPT_LIBS}"
+       fi

   fi
 else
    CPPFLAGS="$OCPPFLAGS"
   fi
 else
    CPPFLAGS="$OCPPFLAGS"

diff --git a/src/plugins/pgpinline/claws.def b/src/plugins/pgpinline/claws.def
index c92c6bb7c644b3c9302d7730f9c6f23fb4106a24..c9f0ecd18500d027aea4d0b18bb7edd28a430cb4 100644 (file)
--- a/src/plugins/pgpinline/claws.def
+++ b/src/plugins/pgpinline/claws.def
@@ -20,3 +20,5 @@ procmime_mimeinfo_get_parameter
 procmime_mimeinfo_parent
 procmime_scan_file
 procmime_write_mimeinfo
 procmime_mimeinfo_parent
 procmime_scan_file
 procmime_write_mimeinfo

+procmime_get_part
+procmime_get_tmp_file_name