2005-07-04 [colin] 1.9.12cvs13

	* configure.ac
		Add a check for libetpan's version (>= 0.37)

diff --git a/ChangeLog-gtk2.claws b/ChangeLog-gtk2.claws
index 050a346239a8993e443d99d62877f793748a2c8f..27b7b67e731063cf2f8627e0b506ed45e3b4d743 100644 (file)
--- a/ChangeLog-gtk2.claws
+++ b/ChangeLog-gtk2.claws
@@ -1,3 +1,8 @@
+2005-07-04 [colin]     1.9.12cvs13
+
+       * configure.ac
+               Add a check for libetpan's version (>= 0.37)
+

 2005-07-04 [hoa]       1.9.12cvs12
 
        * commitHelper
 2005-07-04 [hoa]       1.9.12cvs12
 
        * commitHelper

diff --git a/PATCHSETS b/PATCHSETS
index 770db3e45142d4362ebaeb71a6c92717cb4baa86..b14168986813f1c8e8a4e0d6f4d7065637f2e8c8 100644 (file)
--- a/PATCHSETS
+++ b/PATCHSETS
@@ -607,3 +607,4 @@
 ( cvs diff -u -r 1.155.2.27 -r 1.155.2.28 src/Makefile.am;  cvs diff -u -r 1.213.2.38 -r 1.213.2.39 src/folder.c;  cvs diff -u -r 1.87.2.12 -r 1.87.2.13 src/folder.h;  cvs diff -u -r 1.207.2.44 -r 1.207.2.45 src/folderview.c;  cvs diff -u -r 1.204.2.45 -r 1.204.2.46 src/prefs_common.c;  cvs diff -u -r 1.103.2.20 -r 1.103.2.21 src/prefs_common.h;  cvs diff -u -r 1.1.2.3 -r 1.1.2.4 src/prefs_send.c;  cvs diff -u -r 1.150.2.29 -r 1.150.2.30 src/procmsg.c;  cvs diff -u -r 1.60.2.12 -r 1.60.2.13 src/procmsg.h;  cvs diff -u -r 1.25.2.12 -r 1.25.2.13 src/stock_pixmap.c;  cvs diff -u -r 1.18.2.8 -r 1.18.2.9 src/stock_pixmap.h;  cvs diff -u -r 1.43.2.18 -r 1.43.2.19 src/toolbar.c;  diff -u /dev/null src/pixmaps/dir_close_mark.xpm;  diff -u /dev/null src/pixmaps/dir_open_hrm_mark.xpm;  diff -u /dev/null src/pixmaps/dir_open_mark.xpm;  diff -u /dev/null src/pixmaps/drafts_close_mark.xpm;  diff -u /dev/null src/pixmaps/drafts_open_mark.xpm;  diff -u /dev/null src/pixmaps/inbox_hrm_mark.xpm;  diff -u /dev/null src/pixmaps/inbox_mark.xpm;  diff -u /dev/null src/pixmaps/outbox_hrm_mark.xpm;  diff -u /dev/null src/pixmaps/outbox_mark.xpm;  diff -u /dev/null src/pixmaps/trash_hrm_mark.xpm;  diff -u /dev/null src/pixmaps/trash_mark.xpm;  cvs diff -u -r 1.14.2.17 -r 1.14.2.18 src/plugins/trayicon/trayicon.c;  ) > 1.9.12cvs10.patchset
 (diff -u /dev/null src/etpan/Makefile.am; diff -u /dev/null src/etpan/etpan-errors.h; diff -u /dev/null src/etpan/etpan-log.c; diff -u /dev/null src/etpan/etpan-log.h; diff -u /dev/null src/etpan/etpan-thread-manager-types.h; diff -u /dev/null src/etpan/etpan-thread-manager.c; diff -u /dev/null src/etpan/etpan-thread-manager.h; diff -u /dev/null src/etpan/imap-thread.c; diff -u /dev/null src/etpan/imap-thread.h; cvs diff -u -r 1.155.2.28 -r 1.155.2.29 src/Makefile.am; cvs diff -u -r 1.179.2.42 -r 1.179.2.43 src/imap.c; cvs diff -u -r 1.115.2.40 -r 1.115.2.41 src/main.c; cvs diff -u -r 1.1.2.2 -r 1.1.2.3 src/prefs_other.c) > 1.9.12cvs11.patchset
 ( cvs diff -u -r 1.1.2.22 -r 1.1.2.23 commitHelper;  cvs diff -u -r 1.179.2.43 -r 1.179.2.44 src/imap.c;  cvs diff -u -r 1.1.4.2 -r 1.1.4.3 src/etpan/imap-thread.c;  cvs diff -u -r 1.1.4.2 -r 1.1.4.3 src/etpan/imap-thread.h;  ) > 1.9.12cvs12.patchset
 ( cvs diff -u -r 1.155.2.27 -r 1.155.2.28 src/Makefile.am;  cvs diff -u -r 1.213.2.38 -r 1.213.2.39 src/folder.c;  cvs diff -u -r 1.87.2.12 -r 1.87.2.13 src/folder.h;  cvs diff -u -r 1.207.2.44 -r 1.207.2.45 src/folderview.c;  cvs diff -u -r 1.204.2.45 -r 1.204.2.46 src/prefs_common.c;  cvs diff -u -r 1.103.2.20 -r 1.103.2.21 src/prefs_common.h;  cvs diff -u -r 1.1.2.3 -r 1.1.2.4 src/prefs_send.c;  cvs diff -u -r 1.150.2.29 -r 1.150.2.30 src/procmsg.c;  cvs diff -u -r 1.60.2.12 -r 1.60.2.13 src/procmsg.h;  cvs diff -u -r 1.25.2.12 -r 1.25.2.13 src/stock_pixmap.c;  cvs diff -u -r 1.18.2.8 -r 1.18.2.9 src/stock_pixmap.h;  cvs diff -u -r 1.43.2.18 -r 1.43.2.19 src/toolbar.c;  diff -u /dev/null src/pixmaps/dir_close_mark.xpm;  diff -u /dev/null src/pixmaps/dir_open_hrm_mark.xpm;  diff -u /dev/null src/pixmaps/dir_open_mark.xpm;  diff -u /dev/null src/pixmaps/drafts_close_mark.xpm;  diff -u /dev/null src/pixmaps/drafts_open_mark.xpm;  diff -u /dev/null src/pixmaps/inbox_hrm_mark.xpm;  diff -u /dev/null src/pixmaps/inbox_mark.xpm;  diff -u /dev/null src/pixmaps/outbox_hrm_mark.xpm;  diff -u /dev/null src/pixmaps/outbox_mark.xpm;  diff -u /dev/null src/pixmaps/trash_hrm_mark.xpm;  diff -u /dev/null src/pixmaps/trash_mark.xpm;  cvs diff -u -r 1.14.2.17 -r 1.14.2.18 src/plugins/trayicon/trayicon.c;  ) > 1.9.12cvs10.patchset
 (diff -u /dev/null src/etpan/Makefile.am; diff -u /dev/null src/etpan/etpan-errors.h; diff -u /dev/null src/etpan/etpan-log.c; diff -u /dev/null src/etpan/etpan-log.h; diff -u /dev/null src/etpan/etpan-thread-manager-types.h; diff -u /dev/null src/etpan/etpan-thread-manager.c; diff -u /dev/null src/etpan/etpan-thread-manager.h; diff -u /dev/null src/etpan/imap-thread.c; diff -u /dev/null src/etpan/imap-thread.h; cvs diff -u -r 1.155.2.28 -r 1.155.2.29 src/Makefile.am; cvs diff -u -r 1.179.2.42 -r 1.179.2.43 src/imap.c; cvs diff -u -r 1.115.2.40 -r 1.115.2.41 src/main.c; cvs diff -u -r 1.1.2.2 -r 1.1.2.3 src/prefs_other.c) > 1.9.12cvs11.patchset
 ( cvs diff -u -r 1.1.2.22 -r 1.1.2.23 commitHelper;  cvs diff -u -r 1.179.2.43 -r 1.179.2.44 src/imap.c;  cvs diff -u -r 1.1.4.2 -r 1.1.4.3 src/etpan/imap-thread.c;  cvs diff -u -r 1.1.4.2 -r 1.1.4.3 src/etpan/imap-thread.h;  ) > 1.9.12cvs12.patchset

+( cvs diff -u -r 1.654.2.647 -r 1.654.2.648 configure.ac;  ) > 1.9.12cvs13.patchset

diff --git a/configure.ac b/configure.ac
index dc0da0a90975385ff6c1132b7c5ac7fb10874960..8e8d61d4b46098a6cb565e7b556a687278249dcb 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=12
+EXTRA_VERSION=13

 EXTRA_RELEASE=
 EXTRA_GTK2_VERSION=
 
 EXTRA_RELEASE=
 EXTRA_GTK2_VERSION=
 


@@ -629,8 +629,12 @@ fi
 if test "x$libetpan" = "xyes"; then
    LIBETPAN_CPPFLAGS="`$libetpanconfig --cflags`"
    LIBETPAN_LIBS="`$libetpanconfig --libs`"
 if test "x$libetpan" = "xyes"; then
    LIBETPAN_CPPFLAGS="`$libetpanconfig --cflags`"
    LIBETPAN_LIBS="`$libetpanconfig --libs`"

+   LIBETPAN_VERSION=`$libetpanconfig --version | sed "s/\.//g" | sed "s/-.*$//"`
+   if test "$LIBETPAN_VERSION" -lt "037"; then
+       AC_MSG_ERROR([Sylpheed requires libetpan 0.37 or newer. See http://www.etpan.org/])
+   fi

 else
 else

-   AC_MSG_ERROR([Sylpheed requires libetpan.])
+   AC_MSG_ERROR([Sylpheed requires libetpan 0.37 or newer. See http://www.etpan.org/ ])

 fi
 
 AC_SUBST(LIBETPAN_FLAGS)
 fi
 
 AC_SUBST(LIBETPAN_FLAGS)