Andrew Nelson
Marien Zwart
Joshua M. Kwan
+ Ralgh Young
+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
( 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
MICRO_VERSION=0
INTERFACE_AGE=0
BINARY_AGE=0
-EXTRA_VERSION=109
+EXTRA_VERSION=110
EXTRA_RELEASE=
EXTRA_GTK2_VERSION=
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=
etpan_library =
endif
-SUBDIRS = common gtk plugins $(etpan_dir)
+SUBDIRS = common gtk $(etpan_dir) . plugins
bin_PROGRAMS = sylpheed-claws
#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
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 \
/* 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
#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>
"T. Yamamoto",
"Yanase",
"Yasumatsu",
+"Ralgh Young",
"Gál Zoltán",
"Marien Zwart",
"Martin Zwickel",
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)
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
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 = \
EXTRA_DIST = version.rc plugin.def sylpheed.def
-if PLATFORM_WIN32
+if OS_WIN32
LTRCCOMPILE = $(LIBTOOL) --mode=compile $(RC) \
`echo $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) | \
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
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
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 \
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);
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
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) | \
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
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
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 \
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) | \
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
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
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 \
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 \
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 = \