2006-03-05 [paul] 2.0.0cvs110
authorPaul Mangan <paul@claws-mail.org>
Sun, 5 Mar 2006 10:04:40 +0000 (10:04 +0000)
committerPaul Mangan <paul@claws-mail.org>
Sun, 5 Mar 2006 10:04:40 +0000 (10:04 +0000)
* AUTHORS
* configure.ac
* src/Makefile.am
* src/common/Makefile.am
* src/common/utils.h
* src/etpan/imap-thread.c
* src/gtk/authors.h
* src/plugins/clamav/Makefile.am
* src/plugins/demo/Makefile.am
* src/plugins/dillo_viewer/Makefile.am
* src/plugins/pgpcore/Makefile.am
* src/plugins/pgpcore/passphrase.c
* src/plugins/pgpinline/Makefile.am
* src/plugins/pgpmime/Makefile.am
* src/plugins/spamassassin/Makefile.am
* src/plugins/trayicon/Makefile.am
fix builiding on cygwin
Patch by Ralgh Young <bamanzi@gmail.com>

18 files changed:
AUTHORS
ChangeLog
PATCHSETS
configure.ac
src/Makefile.am
src/common/Makefile.am
src/common/utils.h
src/etpan/imap-thread.c
src/gtk/authors.h
src/plugins/clamav/Makefile.am
src/plugins/demo/Makefile.am
src/plugins/dillo_viewer/Makefile.am
src/plugins/pgpcore/Makefile.am
src/plugins/pgpcore/passphrase.c
src/plugins/pgpinline/Makefile.am
src/plugins/pgpmime/Makefile.am
src/plugins/spamassassin/Makefile.am
src/plugins/trayicon/Makefile.am

diff --git a/AUTHORS b/AUTHORS
index 903ed9c40a9e91a6d81d28c05b1cdcbee93657ae..7f276343136d7557b43848902109b2d36cf856d6 100644 (file)
--- a/AUTHORS
+++ b/AUTHORS
@@ -244,4 +244,5 @@ contributors (beside the above; based on Changelog)
        Andrew Nelson
        Marien Zwart
        Joshua M. Kwan
+       Ralgh Young
 
index 9bec420dd37bba5c9a7fe02cccaf462146ab96c9..b1185680224de0a830ab3f996b4b0a50be68dac9 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,24 @@
+2006-03-05 [paul]      2.0.0cvs110
+
+       * AUTHORS
+       * configure.ac
+       * src/Makefile.am
+       * src/common/Makefile.am
+       * src/common/utils.h
+       * src/etpan/imap-thread.c
+       * src/gtk/authors.h
+       * src/plugins/clamav/Makefile.am
+       * src/plugins/demo/Makefile.am
+       * src/plugins/dillo_viewer/Makefile.am
+       * src/plugins/pgpcore/Makefile.am
+       * src/plugins/pgpcore/passphrase.c
+       * src/plugins/pgpinline/Makefile.am
+       * src/plugins/pgpmime/Makefile.am
+       * src/plugins/spamassassin/Makefile.am
+       * src/plugins/trayicon/Makefile.am
+               fix builiding on cygwin
+               Patch by Ralgh Young <bamanzi@gmail.com>
+
 2006-03-04 [wwp]       2.0.0cvs109
 
        * manual/keyboard.xml
index d0d47028f5871b07874c55ee4a363ddf007438fe..58688189d7386ed2ada6fa5e361ffa08779748b7 100644 (file)
--- a/PATCHSETS
+++ b/PATCHSETS
 ( cvs diff -u -r 1.1.2.6 -r 1.1.2.7 manual/plugins.xml;  cvs diff -u -r 1.3 -r 1.4 src/plugins/spamassassin/README;  ) > 2.0.0cvs107.patchset
 ( cvs diff -u -r 1.8.2.8 -r 1.8.2.9 README;  cvs diff -u -r 1.29.2.8 -r 1.29.2.9 INSTALL;  ) > 2.0.0cvs108.patchset
 ( cvs diff -u -r 1.1.2.5 -r 1.1.2.6 manual/keyboard.xml;  ) > 2.0.0cvs109.patchset
+( cvs diff -u -r 1.100.2.36 -r 1.100.2.37 AUTHORS;  cvs diff -u -r 1.654.2.1339 -r 1.654.2.1340 configure.ac;  cvs diff -u -r 1.155.2.37 -r 1.155.2.38 src/Makefile.am;  cvs diff -u -r 1.24.2.9 -r 1.24.2.10 src/common/Makefile.am;  cvs diff -u -r 1.20.2.32 -r 1.20.2.33 src/common/utils.h;  cvs diff -u -r 1.1.4.30 -r 1.1.4.31 src/etpan/imap-thread.c;  cvs diff -u -r 1.1.2.15 -r 1.1.2.16 src/gtk/authors.h;  cvs diff -u -r 1.4.2.5 -r 1.4.2.6 src/plugins/clamav/Makefile.am;  cvs diff -u -r 1.3.2.1 -r 1.3.2.2 src/plugins/demo/Makefile.am;  cvs diff -u -r 1.4.2.3 -r 1.4.2.4 src/plugins/dillo_viewer/Makefile.am;  cvs diff -u -r 1.1.2.4 -r 1.1.2.5 src/plugins/pgpcore/Makefile.am;  cvs diff -u -r 1.1.2.12 -r 1.1.2.13 src/plugins/pgpcore/passphrase.c;  cvs diff -u -r 1.1.2.4 -r 1.1.2.5 src/plugins/pgpinline/Makefile.am;  cvs diff -u -r 1.1.2.6 -r 1.1.2.7 src/plugins/pgpmime/Makefile.am;  cvs diff -u -r 1.5.2.4 -r 1.5.2.5 src/plugins/spamassassin/Makefile.am;  cvs diff -u -r 1.4.2.3 -r 1.4.2.4 src/plugins/trayicon/Makefile.am;  ) > 2.0.0cvs110.patchset
index f525b8eb3e83af5282cf0bbc40d7cfd9d5dcab56..c15eacab7e07a603a99486cbea09febcf46a9ece 100644 (file)
@@ -11,7 +11,7 @@ MINOR_VERSION=0
 MICRO_VERSION=0
 INTERFACE_AGE=0
 BINARY_AGE=0
-EXTRA_VERSION=109
+EXTRA_VERSION=110
 EXTRA_RELEASE=
 EXTRA_GTK2_VERSION=
 
@@ -122,6 +122,18 @@ esac
 AC_MSG_RESULT([$os_win32])
 AM_CONDITIONAL(OS_WIN32, test x"$os_win32" = x"yes")
 
+AC_MSG_CHECKING([for Cygwin])
+case "$host" in
+  *-*-cygwin*)
+    env_cygwin=yes
+    ;;
+  *)
+    env_cygwin=no
+    ;;
+esac
+AC_MSG_RESULT([$env_cygwin])
+AM_CONDITIONAL(CYGWIN, test x"$env_cygwin" = x"yes")
+
 CFLAGS="$CFLAGS -Wall"
 
 pthread_name=
index 1dbb5b8cd021e337e338be0a8b77a84c8fe10d89..7010607b132dfc93788b2ce4a88da82663a9b614 100644 (file)
@@ -7,7 +7,7 @@ etpan_dir =
 etpan_library = 
 endif
 
-SUBDIRS = common gtk plugins $(etpan_dir)
+SUBDIRS = common gtk $(etpan_dir) . plugins
 
 bin_PROGRAMS = sylpheed-claws
 
@@ -450,3 +450,20 @@ AM_CPPFLAGS = \
 #to call inside gpgme due to our lack of LARGEFILE support
 
 AM_YFLAGS = -d
+
+if CYGWIN
+sylpheed-claws$(EXEEXT): $(sylpheed_claws_OBJECTS) $(sylpheed_claws_DEPENDENCIES) 
+       @rm -f sylpheed-claws$(EXEEXT)
+       @rm -f sylpheed-claws.def sylpheed-claws.base sylpheed-claws.exp libsylpheed-claws.a .libs/libsylpheed-claws.a
+       $(LINK) -shared $(sylpheed_clawsLDFLAGS) -Wl,--out-implib=libsylpheed-claws.a -Wl,--export-all-symbols,--exclude-symbols,main $(sylpheed_claws_OBJECTS) -Wl,--no-whole-archive $(sylpheed_claws_LDADD) $(LIBS)
+       dlltool --output-def sylpheed-claws.def --dllname sylpheed-claws$(EXEEXT) --export-all-symbols --exclude-symbols main $(sylpheed_claws_OBJECTS) gtk/.libs/libsylpheedgtk.a
+       $(LINK) $(sylpheed_claws_LDFLAGS) -Wl,--base-file,sylpheed-claws.base $(sylpheed_claws_OBJECTS) $(sylpheed_claws_LDADD) $(LIBS)
+       sleep 5
+       dlltool --base-file sylpheed-claws.base --input-def sylpheed-claws.def --output-exp sylpheed-claws.exp
+       $(LINK) $(sylpheed_claws_LDFLAGS) -Wl,sylpheed-claws.exp $(sylpheed_claws_OBJECTS) $(sylpheed_claws_LDADD) $(LIBS)
+       @cp libsylpheed-claws.a .libs/libsylpheed-claws.a
+else
+#sylpheed-claws$(EXEEXT): $(sylpheed_claws_OBJECTS) $(sylpheed_claws_DEPENDENCIES) 
+#      @rm -f sylpheed-claws$(EXEEXT)
+#      $(LINK) $(sylpheed_claws_LDFLAGS) $(sylpheed_claws_OBJECTS) $(sylpheed_claws_LDADD) $(LIBS)
+endif
index e3ef26d180aba272645c47ecb77201b7934f206b..c275ab0e1078bf4a76335cd7919866581466f0b7 100644 (file)
@@ -1,7 +1,7 @@
 PLUGINDIR = $(pkglibdir)/plugins/
 noinst_LTLIBRARIES = libsylpheedcommon.la
 
-if PLATFORM_WIN32
+if OS_WIN32
 arch_sources = fnmatch.c \
                w32_dirent.c w32_reg.c w32_signal.c w32_stat.c \
                w32_stdio.c w32_stdlib.c w32_string.c w32_time.c \
index 5529ca3d6630ca655f284d5ae849b5ef9aa2bcb3..9cc3f2734d9f5ea5e90fe8f673f9c36836511ccf 100644 (file)
@@ -188,9 +188,17 @@ typedef gpointer (*GNodeMapFunc)   (gpointer nodedata, gpointer data);
 /* debug functions */
 void debug_set_mode            (gboolean mode);
 gboolean debug_get_mode                (void);
+
+#ifndef __CYGWIN__
 #define debug_print \
        debug_print_real("%s:%d:", debug_srcname(__FILE__), __LINE__), \
        debug_print_real
+#else
+  /* FIXME: cygwin: why debug_srcname couldn't be resolved in library? */
+#define debug_print \
+       debug_print_real("%s:%d:", __FILE__, __LINE__), \
+       debug_print_real
+#endif
 
 /* for macro expansion */
 #define Str(x) #x
index 77f06e42284c71bbb9b47478f2a94f6a44b320cc..61f02a7633d6122f94cd81581cf0e136b988bb39 100644 (file)
@@ -8,7 +8,7 @@
 #include <imap.h>
 #include <sys/types.h>
 #include <sys/stat.h>
-#if (defined (__NetBSD__) || defined (__FreeBSD__))
+#if (defined (__NetBSD__) || defined (__FreeBSD__) || defined (__CYGWIN__))
 #include <sys/socket.h>
 #endif
 #include <fcntl.h>
index f4930fe07b82b84f5b5d95ae9b440912a127353b..afa074163eb4d32ac49037bd817a4abb08cfeb90 100644 (file)
@@ -220,6 +220,7 @@ static char *CONTRIBS_LIST[] = {
 "T. Yamamoto",
 "Yanase",
 "Yasumatsu",
+"Ralgh Young",
 "Gál Zoltán",
 "Marien Zwart",
 "Martin Zwickel",
index 81ecae6da1b9c5b2790ebf3748992a851f2686a4..d81da0ed7b3bf1495e77be27f538553e4e024e5e 100644 (file)
@@ -7,7 +7,13 @@ clamav_plugin_la_SOURCES = \
        clamav_plugin_gtk.c clamav_plugin.h
 
 clamav_plugin_la_LDFLAGS = \
-       -avoid-version -module \
+       -avoid-version -module -no-undefined
+if CYGWIN
+cygwin_export_lib = -L$(top_builddir)/src -lsylpheed-claws
+else
+cygwin_export_lib =
+endif
+clamav_plugin_la_LIBADD = $(cygwin_export_lib) \
        $(GTK_LIBS) \
        $(CLAMAV_LIBS)
        
index 8e8171ed096cd8c762f719a9660ffa1583aa6f71..e808b8bdfc6f8e7a7bc0a7fcf955bff96ee4b68c 100644 (file)
@@ -6,8 +6,16 @@ demo_la_SOURCES = \
        demo.c
 
 demo_la_LDFLAGS = \
-       -avoid-version -module
+       -avoid-version -module -no-undefined
 
+if CYGWIN
+cygwin_export_lib = -L$(top_builddir)/src -lsylpheed-claws
+else
+cygwin_export_lib = 
+endif
+
+demo_la_LIBADD = $(cygwin_export_lib) \
+       $(GTK_LIBS) 
 INCLUDES = \
        -I$(top_srcdir)/src \
        -I$(top_srcdir)/src/common 
index e6436db2c581dfec618d005a7bcbdbf302e0a1ef..b0b37984ed14bc91af562af0af13a7c74a53d2af 100644 (file)
@@ -7,7 +7,14 @@ dillo_viewer_la_SOURCES = \
          dillo_prefs.c dillo_prefs.h
 
 dillo_viewer_la_LDFLAGS = \
-       -avoid-version -module \
+       -avoid-version -module -no-undefined
+
+if CYGWIN
+cygwin_export_lib = -L$(top_builddir)/src -lsylpheed-claws
+else
+cygwin_export_lib =
+endif
+dillo_viewer_la_LIBADD = $(cygwin_export_lib) \
        $(GTK_LIBS)
 
 INCLUDES = \
index 24d0eb9b074e73725d3d433f48197c59786d9442..83dcf6b6c7c94bbb0ac3d3514e7bb987b8e02485 100644 (file)
@@ -1,6 +1,6 @@
 EXTRA_DIST = version.rc plugin.def sylpheed.def
 
-if PLATFORM_WIN32
+if OS_WIN32
 
 LTRCCOMPILE = $(LIBTOOL) --mode=compile $(RC) \
      `echo $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) | \
@@ -12,7 +12,6 @@ LTRCCOMPILE = $(LIBTOOL) --mode=compile $(RC) \
 plugin_res = version.lo
 plugin_res_ldflag = -Wl,.libs/version.o
 
-no_undefined = -no-undefined
 export_symbols = -export-symbols $(srcdir)/plugin.def
 
 plugin_deps = libsylpheed.a $(plugin_res) plugin.def
@@ -25,12 +24,22 @@ plugin_ldadd = -L . -lsylpheed
 else
 plugin_res =
 plugin_res_ldflag =
-no_undefined =
 export_symbols =
 plugin_deps =
 plugin_ldadd =
 endif
 
+if PLATFORM_WIN32
+no_undefined = -no-undefined
+else
+no_undefined =
+endif
+
+if CYGWIN
+cygwin_export_lib = -L$(top_builddir)/src -lsylpheed-claws
+else
+cygwin_export_lib =
+endif
 
 plugindir = $(pkglibdir)/plugins
 
@@ -52,11 +61,11 @@ plugininclude_HEADERS = \
 
 pgpcore_la_LDFLAGS = \
        $(plugin_res_ldflag) $(no_undefined) $(export_symbols) \
-       -avoid-version -module \
+       -avoid-version -module 
+pgpcore_la_DEPENDENCIES = $(plugin_deps)
+pgpcore_la_LIBADD = $(cygwin_export_lib) $(plugin_ldadd) \
         $(GTK_LIBS) \
        $(GPGME_LIBS)
-pgpcore_la_DEPENDENCIES = $(plugin_deps)
-pgpcore_la_LIBADD = $(plugin_ldadd)
 
 INCLUDES = \
        -I$(top_srcdir)/src \
index 93a3b776cd36395029b560c024ce9ca8f1d99098..2e7a45b77bd307962215c5bcd8be9caa4bb582ee 100644 (file)
@@ -289,7 +289,7 @@ create_description(const gchar *uid_hint, const gchar *pass_hint, gint prev_bad)
 static int free_passphrase(gpointer _unused)
 {
     if (last_pass != NULL) {
-#ifndef G_OS_WIN32
+#ifndef G_PLATFORM_WIN32
         munlock(last_pass, strlen(last_pass));
 #endif
         g_free(last_pass);
@@ -321,7 +321,7 @@ gpgmegtk_passphrase_cb(void *opaque, const char *uid_hint,
     else {
         if (prefs_gpg_get_config()->store_passphrase) {
             last_pass = g_strdup(pass);
-#ifndef G_OS_WIN32
+#ifndef G_PLATFORM_WIN32
             if (mlock(last_pass, strlen(last_pass)) == -1)
                 debug_print("%% locking passphrase failed");
 #endif
index 97cac91473e9c93c99a7ff7a34478ca41948dce7..2b9a75d2073a8ae6b28303fa458c4aadba2c7466 100644 (file)
@@ -1,7 +1,7 @@
 EXTRA_DIST = version.rc plugin.def sylpheed.def mypgpcore.def pgpinline.deps
 
 
-if PLATFORM_WIN32
+if OS_WIN32
 
 LTRCCOMPILE = $(LIBTOOL) --mode=compile $(RC) \
      `echo $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) | \
@@ -13,7 +13,6 @@ LTRCCOMPILE = $(LIBTOOL) --mode=compile $(RC) \
 plugin_res = version.lo
 plugin_res_ldflag = -Wl,.libs/version.o
 
-no_undefined = -no-undefined
 export_symbols = -export-symbols $(srcdir)/plugin.def
 
 plugin_deps = libsylpheed.a libmypgpcore.a $(plugin_res) plugin.def
@@ -29,12 +28,24 @@ plugin_ldadd = -L . -lsylpheed  -lmypgpcore
 else
 plugin_res =
 plugin_res_ldflag =
-no_undefined =
 export_symbols =
 plugin_deps =
 plugin_ldadd =
 endif
 
+if PLATFORM_WIN32
+no_undefined = -no-undefined
+else
+no_undefined =
+endif
+
+if CYGWIN
+cygwin_export_lib = -L$(top_builddir)/src -lsylpheed-claws
+pgpcore_lib = ../pgpcore/pgpcore.la
+else
+cygwin_export_lib = 
+pgpcore_lib = 
+endif
 
 plugindir = $(pkglibdir)/plugins
 plugin_DATA=pgpinline.deps
@@ -51,11 +62,11 @@ plugininclude_HEADERS = \
 
 pgpinline_la_LDFLAGS = \
        $(plugin_res_ldflag) $(no_undefined) $(export_symbols) \
-       -avoid-version -module \
-        $(GTK_LIBS) \
-       $(GPGME_LIBS)
+       -avoid-version -module 
 pgpinline_la_DEPENDENCIES = $(plugin_deps)
-pgpinline_la_LIBADD = $(plugin_ldadd)
+pgpinline_la_LIBADD = $(plugin_ldadd) $(pgpcore_lib) $(cygwin_export_lib) \
+        $(GTK_LIBS)  \
+       $(GPGME_LIBS)
 
 INCLUDES = \
        -I$(top_srcdir)/src \
index 858fade98ee7c9cafdc6218d4ee0f5559a4fa04c..3145d153575f6f8705434546eb37d360432a0799 100644 (file)
@@ -1,6 +1,6 @@
 EXTRA_DIST = version.rc plugin.def sylpheed.def mypgpcore.def pgpmime.deps
 
-if PLATFORM_WIN32
+if OS_WIN32
 
 LTRCCOMPILE = $(LIBTOOL) --mode=compile $(RC) \
      `echo $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) | \
@@ -12,7 +12,6 @@ LTRCCOMPILE = $(LIBTOOL) --mode=compile $(RC) \
 plugin_res = version.lo
 plugin_res_ldflag = -Wl,.libs/version.o
 
-no_undefined = -no-undefined
 export_symbols = -export-symbols $(srcdir)/plugin.def
 
 plugin_deps = libsylpheed.a libmypgpcore.a $(plugin_res) plugin.def
@@ -28,12 +27,23 @@ plugin_ldadd = -L . -lsylpheed -lmypgpcore
 else
 plugin_res =
 plugin_res_ldflag =
-no_undefined =
 export_symbols =
 plugin_deps =
 plugin_ldadd =
 endif
 
+if PLATFORM_WIN32
+no_undefined = -no-undefined
+else
+no_undefined =
+endif
+
+if CYGWIN
+cygwin_export_lib = -L$(top_builddir)/src -lsylpheed-claws
+pgpcore_lib = ../pgpcore/pgpcore.la
+else
+pgpcore_lib = 
+endif
 
 plugindir = $(pkglibdir)/plugins
 plugin_DATA=pgpmime.deps
@@ -51,11 +61,11 @@ plugininclude_HEADERS = \
 
 pgpmime_la_LDFLAGS = \
        $(plugin_res_ldflag) $(no_undefined) $(export_symbols) \
-       -avoid-version -module \
+       -avoid-version -module 
+pgpmime_la_DEPENDENCIES = $(plugin_deps)
+pgpmime_la_LIBADD = $(plugin_ldadd) $(pgpcore_lib) $(cygwin_export_lib) \
         $(GTK_LIBS) \
        $(GPGME_LIBS)
-pgpmime_la_DEPENDENCIES = $(plugin_deps)
-pgpmime_la_LIBADD = $(plugin_ldadd)
 
 INCLUDES = \
        -I$(top_srcdir)/src \
index 51e7c901e20d29dd34df5463e02c088df6d102ff..30abf54b2193af6ed0086dd9dc5980f2be16765b 100644 (file)
@@ -9,8 +9,16 @@ spamassassin_la_SOURCES = \
        utils.c utils.h
 
 spamassassin_la_LDFLAGS = \
-       -avoid-version -module \
-       $(GTK_LIBS)
+       -avoid-version -module -no-undefined
+
+if CYGWIN
+cygwin_export_lib = -L$(top_builddir)/src -lsylpheed-claws
+else
+cygwin_export_lib =
+endif
+spamassassin_la_LIBADD = $(cygwin_export_lib) \
+       $(GTK_LIBS)     \
+       $(OPENSSL_LIBS)
 
 INCLUDES = \
        -I$(top_srcdir)/src \
index 72ace4ce9bda5bc1552c8c0cd6653af41a87fe9f..8959c9ed1d1f118f9d661e7422b0394a78390031 100644 (file)
@@ -4,20 +4,27 @@ plugindir = $(pkglibdir)/plugins
 
 plugin_LTLIBRARIES = trayicon.la
 
+if CYGWIN
+cygwin_export_lib = -L$(top_builddir)/src -lsylpheed-claws
+else
+cygwin_export_lib = 
+endif 
+
 trayicon_la_SOURCES = \
        trayicon.c
 
 trayicon_la_LDFLAGS = \
-       -avoid-version -module
+       -avoid-version -module -no-undefined
 
-trayicon_la_LIBADD = \
+trayicon_la_LIBADD = libeggtrayicon/libeggtrayicon.la \
+       $(cygwin_export_lib) \
        $(GTK_LIBS) \
-       libeggtrayicon/libeggtrayicon.la
+       -L/usr/X11R6/lib -lX11
 
 INCLUDES = \
-       -I../../ \
-       -I../../common \
-       -I../../gtk \
+       -I$(top_srcdir)/src \
+       -I$(top_srcdir)/src/common \
+       -I$(top_srcdir)/src/gtk \
        -Ilibeggtrayicon
 
 AM_CPPFLAGS = \