2007-10-05 [paul] 3.0.2cvs12

	* configure.ac
	* src/Makefile.am
		fix bug 1347, '-Wno-unused-function, optional'

diff --git a/ChangeLog b/ChangeLog
index 0e2025994fb935bb25bcd2f3eaca5003b74d9ea6..54a3c995b6b00e112cd4da21c03a9e1cbbab3604 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,9 @@
+2007-10-05 [paul]      3.0.2cvs12
+
+       * configure.ac
+       * src/Makefile.am
+               fix bug 1347, '-Wno-unused-function, optional'
+

 2007-10-05 [colin]     3.0.2cvs11
 
        * src/procmime.c
 2007-10-05 [colin]     3.0.2cvs11
 
        * src/procmime.c

diff --git a/PATCHSETS b/PATCHSETS
index 1a93678590be90632b71a68e861e7315b1a95d27..b5a22936372f3c1c68b80c9e6bb82172f31c7bee 100644 (file)
--- a/PATCHSETS
+++ b/PATCHSETS
@@ -2924,3 +2924,4 @@
 ( cvs diff -u -r 1.12.2.48 -r 1.12.2.49 src/action.c;  cvs diff -u -r 1.22.2.16 -r 1.22.2.17 src/addrbook.c;  cvs diff -u -r 1.28.2.31 -r 1.28.2.32 src/addrindex.c;  cvs diff -u -r 1.382.2.412 -r 1.382.2.413 src/compose.c;  cvs diff -u -r 1.5.2.22 -r 1.5.2.23 src/exporthtml.c;  cvs diff -u -r 1.1.4.17 -r 1.1.4.18 src/exportldif.c;  cvs diff -u -r 1.213.2.164 -r 1.213.2.165 src/folder.c;  cvs diff -u -r 1.115.2.168 -r 1.115.2.169 src/main.c;  cvs diff -u -r 1.75.2.49 -r 1.75.2.50 src/matcher.c;  cvs diff -u -r 1.28.2.38 -r 1.28.2.39 src/mbox.c;  cvs diff -u -r 1.94.2.153 -r 1.94.2.154 src/messageview.c;  cvs diff -u -r 1.79.2.63 -r 1.79.2.64 src/mh.c;  cvs diff -u -r 1.101.2.40 -r 1.101.2.41 src/news.c;  cvs diff -u -r 1.1.2.20 -r 1.1.2.21 src/partial_download.c;  cvs diff -u -r 1.56.2.56 -r 1.56.2.57 src/pop.c;  cvs diff -u -r 1.49.2.98 -r 1.49.2.99 src/procmime.c;  cvs diff -u -r 1.150.2.103 -r 1.150.2.104 src/procmsg.c;  cvs diff -u -r 1.43.2.83 -r 1.43.2.84 src/toolbar.c;  cvs diff -u -r 1.6.2.17 -r 1.6.2.18 src/common/log.c;  cvs diff -u -r 1.1.4.7 -r 1.1.4.8 src/common/mgutils.c;  cvs diff -u -r 1.13.2.31 -r 1.13.2.32 src/common/plugin.c;  cvs diff -u -r 1.36.2.115 -r 1.36.2.116 src/common/utils.c;  cvs diff -u -r 1.1.4.21 -r 1.1.4.22 src/common/xml.c;  cvs diff -u -r 1.1.4.11 -r 1.1.4.12 src/common/xml.h;  cvs diff -u -r 1.1.4.6 -r 1.1.4.7 src/common/xmlprops.c;  cvs diff -u -r 1.2.2.5 -r 1.2.2.6 src/common/xmlprops.h;  cvs diff -u -r 1.1.2.34 -r 1.1.2.35 src/plugins/bogofilter/bogofilter.c;  cvs diff -u -r 1.13.2.34 -r 1.13.2.35 src/plugins/clamav/clamav_plugin.c;  cvs diff -u -r 1.5.2.16 -r 1.5.2.17 src/plugins/dillo_viewer/dillo_prefs.c;  cvs diff -u -r 1.1.2.27 -r 1.1.2.28 src/plugins/pgpcore/prefs_gpg.c;  cvs diff -u -r 1.1.2.35 -r 1.1.2.36 src/plugins/pgpinline/pgpinline.c;  cvs diff -u -r 1.1.2.50 -r 1.1.2.51 src/plugins/pgpmime/pgpmime.c;  cvs diff -u -r 1.18.2.57 -r 1.18.2.58 src/plugins/spamassassin/spamassassin.c;  cvs diff -u -r 1.1.2.5 -r 1.1.2.6 src/plugins/trayicon/trayicon_prefs.c;  ) > 3.0.2cvs9.patchset
 ( cvs diff -u -r 1.1.2.42 -r 1.1.2.43 manual/advanced.xml;  cvs diff -u -r 1.1.2.11 -r 1.1.2.12 manual/es/advanced.xml;  ) > 3.0.2cvs10.patchset
 ( cvs diff -u -r 1.49.2.99 -r 1.49.2.100 src/procmime.c;  cvs diff -u -r 1.1.4.8 -r 1.1.4.9 src/common/mgutils.c;  ) > 3.0.2cvs11.patchset
 ( cvs diff -u -r 1.12.2.48 -r 1.12.2.49 src/action.c;  cvs diff -u -r 1.22.2.16 -r 1.22.2.17 src/addrbook.c;  cvs diff -u -r 1.28.2.31 -r 1.28.2.32 src/addrindex.c;  cvs diff -u -r 1.382.2.412 -r 1.382.2.413 src/compose.c;  cvs diff -u -r 1.5.2.22 -r 1.5.2.23 src/exporthtml.c;  cvs diff -u -r 1.1.4.17 -r 1.1.4.18 src/exportldif.c;  cvs diff -u -r 1.213.2.164 -r 1.213.2.165 src/folder.c;  cvs diff -u -r 1.115.2.168 -r 1.115.2.169 src/main.c;  cvs diff -u -r 1.75.2.49 -r 1.75.2.50 src/matcher.c;  cvs diff -u -r 1.28.2.38 -r 1.28.2.39 src/mbox.c;  cvs diff -u -r 1.94.2.153 -r 1.94.2.154 src/messageview.c;  cvs diff -u -r 1.79.2.63 -r 1.79.2.64 src/mh.c;  cvs diff -u -r 1.101.2.40 -r 1.101.2.41 src/news.c;  cvs diff -u -r 1.1.2.20 -r 1.1.2.21 src/partial_download.c;  cvs diff -u -r 1.56.2.56 -r 1.56.2.57 src/pop.c;  cvs diff -u -r 1.49.2.98 -r 1.49.2.99 src/procmime.c;  cvs diff -u -r 1.150.2.103 -r 1.150.2.104 src/procmsg.c;  cvs diff -u -r 1.43.2.83 -r 1.43.2.84 src/toolbar.c;  cvs diff -u -r 1.6.2.17 -r 1.6.2.18 src/common/log.c;  cvs diff -u -r 1.1.4.7 -r 1.1.4.8 src/common/mgutils.c;  cvs diff -u -r 1.13.2.31 -r 1.13.2.32 src/common/plugin.c;  cvs diff -u -r 1.36.2.115 -r 1.36.2.116 src/common/utils.c;  cvs diff -u -r 1.1.4.21 -r 1.1.4.22 src/common/xml.c;  cvs diff -u -r 1.1.4.11 -r 1.1.4.12 src/common/xml.h;  cvs diff -u -r 1.1.4.6 -r 1.1.4.7 src/common/xmlprops.c;  cvs diff -u -r 1.2.2.5 -r 1.2.2.6 src/common/xmlprops.h;  cvs diff -u -r 1.1.2.34 -r 1.1.2.35 src/plugins/bogofilter/bogofilter.c;  cvs diff -u -r 1.13.2.34 -r 1.13.2.35 src/plugins/clamav/clamav_plugin.c;  cvs diff -u -r 1.5.2.16 -r 1.5.2.17 src/plugins/dillo_viewer/dillo_prefs.c;  cvs diff -u -r 1.1.2.27 -r 1.1.2.28 src/plugins/pgpcore/prefs_gpg.c;  cvs diff -u -r 1.1.2.35 -r 1.1.2.36 src/plugins/pgpinline/pgpinline.c;  cvs diff -u -r 1.1.2.50 -r 1.1.2.51 src/plugins/pgpmime/pgpmime.c;  cvs diff -u -r 1.18.2.57 -r 1.18.2.58 src/plugins/spamassassin/spamassassin.c;  cvs diff -u -r 1.1.2.5 -r 1.1.2.6 src/plugins/trayicon/trayicon_prefs.c;  ) > 3.0.2cvs9.patchset
 ( cvs diff -u -r 1.1.2.42 -r 1.1.2.43 manual/advanced.xml;  cvs diff -u -r 1.1.2.11 -r 1.1.2.12 manual/es/advanced.xml;  ) > 3.0.2cvs10.patchset
 ( cvs diff -u -r 1.49.2.99 -r 1.49.2.100 src/procmime.c;  cvs diff -u -r 1.1.4.8 -r 1.1.4.9 src/common/mgutils.c;  ) > 3.0.2cvs11.patchset

+( cvs diff -u -r 1.654.2.2980 -r 1.654.2.2981 configure.ac;  cvs diff -u -r 1.155.2.76 -r 1.155.2.77 src/Makefile.am;  ) > 3.0.2cvs12.patchset

diff --git a/configure.ac b/configure.ac
index d2e9459a1fabe3bb5eb8a755faa8942b087eab67..70858dd0b7a1b495058b553c139436fdefebdfc4 100644 (file)
--- a/configure.ac
+++ b/configure.ac
@@ -11,7 +11,7 @@ MINOR_VERSION=0
 MICRO_VERSION=2
 INTERFACE_AGE=0
 BINARY_AGE=0
 MICRO_VERSION=2
 INTERFACE_AGE=0
 BINARY_AGE=0

-EXTRA_VERSION=11
+EXTRA_VERSION=12

 EXTRA_RELEASE=
 EXTRA_GTK2_VERSION=
 
 EXTRA_RELEASE=
 EXTRA_GTK2_VERSION=
 


@@ -136,6 +136,11 @@ esac
 AC_MSG_RESULT([$env_cygwin])
 AM_CONDITIONAL(CYGWIN, test x"$env_cygwin" = x"yes")
 
 AC_MSG_RESULT([$env_cygwin])
 AM_CONDITIONAL(CYGWIN, test x"$env_cygwin" = x"yes")
 

+if test "$GCC" = "yes"
+then
+       CFLAGS="$CFLAGS -Wno-unused-function"
+fi
+

 CFLAGS="$CFLAGS -Wall"
 
 pthread_name=
 CFLAGS="$CFLAGS -Wall"
 
 pthread_name=

diff --git a/src/Makefile.am b/src/Makefile.am
index f2265255b24c74264f68a833cc6682cde2f0df5c..4c884a0eedc7c6b08492f4c951c41212d11688cb 100644 (file)
--- a/src/Makefile.am
+++ b/src/Makefile.am
@@ -507,8 +507,7 @@ AM_CPPFLAGS = \
        $(LIBETPAN_CPPFLAGS) \
        $(STARTUP_NOTIFICATION_CFLAGS) \
        $(MAEMO_CFLAGS) \
        $(LIBETPAN_CPPFLAGS) \
        $(STARTUP_NOTIFICATION_CFLAGS) \
        $(MAEMO_CFLAGS) \

-       $(CONIC_CFLAGS) \
-       -Wno-unused-function
+       $(CONIC_CFLAGS)

         
 #no-unused-function is there because of bison stuff
 #no-deprecated-declarations because of gpgme_data_rewind, which we have
         
 #no-unused-function is there because of bison stuff
 #no-deprecated-declarations because of gpgme_data_rewind, which we have