commit 3cdf9b4273732516a45d5c437ec88ffe3e7b9f59
parent 293c116f2a14cab63c3e24301089a709ac5f553b
Author: Colin Leroy <colin@colino.net>
Date: Wed, 7 May 2008 11:17:57 +0000
2008-05-07 [colin] 3.4.0cvs29
* configure.ac
Fix --enable-maemo (assume --enable-generic-umpc)
Diffstat:
3 files changed, 18 insertions(+), 10 deletions(-)
diff --git a/ChangeLog b/ChangeLog
@@ -1,3 +1,8 @@
+2008-05-07 [colin] 3.4.0cvs29
+
+ * configure.ac
+ Fix --enable-maemo (assume --enable-generic-umpc)
+
2008-05-07 [colin] 3.4.0cvs28
* configure.ac
diff --git a/PATCHSETS b/PATCHSETS
@@ -3324,3 +3324,4 @@
( cvs diff -u -r 1.36.2.138 -r 1.36.2.139 src/common/utils.c; ) > 3.4.0cvs26.patchset
( cvs diff -u -r 1.1.2.14 -r 1.1.2.15 tools/claws.i18n.status.pl; ) > 3.4.0cvs27.patchset
( cvs diff -u -r 1.654.2.3384 -r 1.654.2.3385 configure.ac; cvs diff -u -r 1.61.2.78 -r 1.61.2.79 src/account.c; cvs diff -u -r 1.27.2.40 -r 1.27.2.41 src/addr_compl.c; cvs diff -u -r 1.382.2.447 -r 1.382.2.448 src/compose.c; cvs diff -u -r 1.14.2.49 -r 1.14.2.50 src/editaddress.c; cvs diff -u -r 1.207.2.199 -r 1.207.2.200 src/folderview.c; cvs diff -u -r 1.274.2.239 -r 1.274.2.240 src/mainwindow.c; cvs diff -u -r 1.94.2.176 -r 1.94.2.177 src/messageview.c; cvs diff -u -r 1.83.2.129 -r 1.83.2.130 src/mimeview.c; cvs diff -u -r 1.105.2.130 -r 1.105.2.131 src/prefs_account.c; cvs diff -u -r 1.204.2.168 -r 1.204.2.169 src/prefs_common.c; cvs diff -u -r 1.16.2.34 -r 1.16.2.35 src/prefs_display_header.c; cvs diff -u -r 1.59.2.67 -r 1.59.2.68 src/prefs_filtering.c; cvs diff -u -r 1.1.2.51 -r 1.1.2.52 src/prefs_summaries.c; cvs diff -u -r 1.12.2.62 -r 1.12.2.63 src/prefs_template.c; cvs diff -u -r 1.30.2.49 -r 1.30.2.50 src/prefs_toolbar.c; cvs diff -u -r 1.25.2.53 -r 1.25.2.54 src/stock_pixmap.c; cvs diff -u -r 1.395.2.366 -r 1.395.2.367 src/summaryview.c; cvs diff -u -r 1.68.2.45 -r 1.68.2.46 src/summaryview.h; cvs diff -u -r 1.96.2.200 -r 1.96.2.201 src/textview.c; cvs diff -u -r 1.43.2.97 -r 1.43.2.98 src/toolbar.c; cvs diff -u -r 1.4.2.61 -r 1.4.2.62 src/gtk/about.c; cvs diff -u -r 1.1.4.43 -r 1.1.4.44 src/gtk/gtksctree.c; cvs diff -u -r 1.5.2.27 -r 1.5.2.28 src/gtk/menu.c; cvs diff -u -r 1.12.2.45 -r 1.12.2.46 src/gtk/prefswindow.c; cvs diff -u -r 1.9.2.19 -r 1.9.2.20 src/gtk/sslcertwindow.c; ) > 3.4.0cvs28.patchset
+( cvs diff -u -r 1.654.2.3385 -r 1.654.2.3386 configure.ac; ) > 3.4.0cvs29.patchset
diff --git a/configure.ac b/configure.ac
@@ -11,7 +11,7 @@ MINOR_VERSION=4
MICRO_VERSION=0
INTERFACE_AGE=0
BINARY_AGE=0
-EXTRA_VERSION=28
+EXTRA_VERSION=29
EXTRA_RELEASE=
EXTRA_GTK2_VERSION=
@@ -482,6 +482,15 @@ dnl check if GDB is somewhere
AC_MSG_RESULT($ac_cv_enable_crash_dialog)
fi
+dnl generic umpc
+AC_ARG_ENABLE(generic-umpc,
+ [ --enable-generic-umpc Enable generic UMPC code [default=no]],
+ [ac_cv_enable_generic_umpc=$enableval], [ac_cv_enable_generic_umpc=no])
+if test $ac_cv_enable_generic_umpc = yes; then
+ AC_DEFINE(GENERIC_UMPC, 1, Generic UMPC code)
+ AC_MSG_RESULT($ac_cv_enable_generic_umpc)
+fi
+
dnl Maemo platform
AC_ARG_ENABLE(maemo,
[ --enable-maemo build for the Maemo platform [default=no]],
@@ -502,23 +511,16 @@ if test $ac_cv_enable_maemo = yes; then
else
AC_DEFINE(MAEMO, 1, Build for maemo)
AC_DEFINE(CHINOOK, 1, Maemo chinook)
+ AC_DEFINE(GENERIC_UMPC, 1, Generic UMPC code)
ac_cv_enable_generic_umpc=yes
fi
else
AC_DEFINE(MAEMO, 1, Build for maemo)
+ AC_DEFINE(GENERIC_UMPC, 1, Generic UMPC code)
ac_cv_enable_generic_umpc=yes
fi
fi
-dnl generic umpc
-AC_ARG_ENABLE(generic-umpc,
- [ --enable-generic-umpc Enable generic UMPC code [default=no]],
- [ac_cv_enable_generic_umpc=$enableval], [ac_cv_enable_generic_umpc=no])
-if test $ac_cv_enable_generic_umpc = yes; then
- AC_DEFINE(GENERIC_UMPC, 1, Generic UMPC code)
- AC_MSG_RESULT($ac_cv_enable_generic_umpc)
-fi
-
PKG_CHECK_MODULES(CONIC, conic, ac_cv_enable_conic=yes,
ac_cv_enable_conic=no)
AC_SUBST(CONIC_CFLAGS)
