2007-11-26 [colin] 3.1.0cvs29

[claws.git] / configure.ac

diff --git a/configure.ac b/configure.ac
index ed7ca332c0939d10c70ca5042bbf605ae3caa7ad..163a3f889bfc052b6447351136f41cb3d83f3e02 100644 (file)
--- a/configure.ac
+++ b/configure.ac
@@ -7,11 +7,11 @@ PACKAGE=claws-mail
 
 dnl version number
 MAJOR_VERSION=3
-MINOR_VERSION=0
-MICRO_VERSION=2
+MINOR_VERSION=1
+MICRO_VERSION=0
 INTERFACE_AGE=0
 BINARY_AGE=0
-EXTRA_VERSION=124
+EXTRA_VERSION=29
 EXTRA_RELEASE=
 EXTRA_GTK2_VERSION=
 
@@ -492,7 +492,17 @@ if test $ac_cv_enable_maemo = yes; then
        AC_SUBST(MAEMO_CFLAGS)
        AC_SUBST(MAEMO_LIBS)
        if test $ac_cv_enable_maemo = no; then
-               AC_MSG_ERROR(libosso, hildon-libs or hildon-fm not found)
+               #test for chinook
+               PKG_CHECK_MODULES(MAEMO, libosso hildon-1 hildon-fm-2 gnome-vfs-2.0 hal, ac_cv_enable_maemo=yes,
+                         ac_cv_enable_maemo=no)
+               AC_SUBST(MAEMO_CFLAGS)
+               AC_SUBST(MAEMO_LIBS)
+               if test $ac_cv_enable_maemo = no; then
+                       AC_MSG_ERROR(one of libosso hildon-libs hildon-fm hildon-1 hildon-fm-2 not found)
+               else
+                       AC_DEFINE(MAEMO, 1, Build for maemo)
+                       AC_DEFINE(CHINOOK, 1, Maemo chinook)
+               fi
        else
                AC_DEFINE(MAEMO, 1, Build for maemo)
        fi