From f13f2d6edb017cd79bd4df0680b7872e4c0a51f3 Mon Sep 17 00:00:00 2001 From: Colin Leroy Date: Thu, 28 Sep 2006 05:35:51 +0000 Subject: [PATCH 1/1] 2006-09-28 [colin] 2.5.2cvs12 * configure.ac Possibly fix link errors --- ChangeLog | 5 +++++ PATCHSETS | 1 + configure.ac | 4 ++-- 3 files changed, 8 insertions(+), 2 deletions(-) diff --git a/ChangeLog b/ChangeLog index 9918e6dd8..f39466c25 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,8 @@ +2006-09-28 [colin] 2.5.2cvs12 + + * configure.ac + Possibly fix link errors + 2006-09-27 [wwp] 2.5.2cvs11 * src/gtk/authors.h diff --git a/PATCHSETS b/PATCHSETS index 7c59b282f..c0d26adeb 100644 --- a/PATCHSETS +++ b/PATCHSETS @@ -1925,3 +1925,4 @@ ( cvs diff -u -r 1.11.2.12 -r 1.11.2.13 src/editgroup.c; cvs diff -u -r 1.17.2.32 -r 1.17.2.33 src/send_message.c; cvs diff -u -r 1.149.2.58 -r 1.149.2.59 src/inc.c; cvs diff -u -r 1.204.2.103 -r 1.204.2.104 src/prefs_common.c; cvs diff -u -r 1.103.2.61 -r 1.103.2.62 src/prefs_common.h; cvs diff -u -r 1.1.4.18 -r 1.1.4.19 src/gtk/progressdialog.c; ) > 2.5.2cvs9.patchset ( cvs diff -u -r 1.60.2.65 -r 1.60.2.66 src/addressbook.c; ) > 2.5.2cvs10.patchset ( cvs diff -u -r 1.1.2.25 -r 1.1.2.26 src/gtk/authors.h; cvs diff -u -r 1.1.2.4 -r 1.1.2.5 doc/man/sylpheed-claws.1; cvs diff -u -r 1.1.2.6 -r 1.1.2.7 manual/ack.xml; cvs diff -u -r 1.1.2.2 -r 1.1.2.3 manual/es/ack.xml; cvs diff -u -r 1.1.2.5 -r 1.1.2.6 manual/fr/ack.xml; cvs diff -u -r 1.1.2.2 -r 1.1.2.3 manual/pl/ack.xml; ) > 2.5.2cvs11.patchset +( cvs diff -u -r 1.654.2.1975 -r 1.654.2.1976 configure.ac; ) > 2.5.2cvs12.patchset diff --git a/configure.ac b/configure.ac index 8407be952..3e28530db 100644 --- a/configure.ac +++ b/configure.ac @@ -11,7 +11,7 @@ MINOR_VERSION=5 MICRO_VERSION=2 INTERFACE_AGE=0 BINARY_AGE=0 -EXTRA_VERSION=11 +EXTRA_VERSION=12 EXTRA_RELEASE= EXTRA_GTK2_VERSION= @@ -207,7 +207,7 @@ if test x"$ac_cv_enable_libsm" = xyes; then AC_CHECK_LIB(SM, SmcSaveYourselfDone, [SM_LIBS="$X_LIBS -lSM -lICE"],ac_cv_enable_libsm=no, $X_LIBS -lICE) - AC_CHECK_HEADERS(X11/SM/SMlib.h,,SC_HAVE_SM=false) + AC_CHECK_HEADERS(X11/SM/SMlib.h,,ac_cv_enable_libsm=no) if test x"$ac_cv_enable_libsm" = xyes; then AC_DEFINE(HAVE_LIBSM, 1, [Define to 1 if you have libSM installed]) else -- 2.25.1