corrections

[claws.git] / configure.ac

diff --git a/configure.ac b/configure.ac
index 5fcda4a6ce22b2b5028a5ef6771c0a7b90a12e23..f4b374cbaf7a7ce75f2d5fa7cdf8c386df23bc52 100644 (file)
--- a/configure.ac
+++ b/configure.ac
@@ -7,11 +7,11 @@ PACKAGE=claws-mail
 
 dnl version number
 MAJOR_VERSION=2
-MINOR_VERSION=7
-MICRO_VERSION=2
+MINOR_VERSION=8
+MICRO_VERSION=1
 INTERFACE_AGE=0
 BINARY_AGE=0
-EXTRA_VERSION=74
+EXTRA_VERSION=63
 EXTRA_RELEASE=
 EXTRA_GTK2_VERSION=
 
@@ -433,6 +433,22 @@ dnl check if GDB is somewhere
        AC_MSG_RESULT($ac_cv_enable_crash_dialog)
 fi
 
+dnl Maemo platform
+AC_ARG_ENABLE(maemo,
+       [  --enable-maemo   Build for the Maemo platform [default=no]],
+       [ac_cv_enable_maemo=$enableval], [ac_cv_enable_maemo=no])
+if test $ac_cv_enable_maemo = yes; then
+       PKG_CHECK_MODULES(MAEMO, libosso hildon-libs, 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(libosso or hildon-libs not found)
+       else
+               AC_DEFINE(MAEMO, 1, Build for maemo)
+       fi
+fi
+
 dnl Check for X-Face support
 AC_ARG_ENABLE(compface,
        [  --disable-compface      Do not use compface (X-Face)],
@@ -829,6 +845,24 @@ else
 fi
 AM_CONDITIONAL(CLAWS_GNOMEPRINT, test x"$ac_cv_enable_gnomeprint" = x"yes")
 
+AC_MSG_CHECKING([whether to use valgrind])
+AC_ARG_ENABLE(valgrind,
+       [  --disable-valgrind           Do not use valgrind for debugging],
+       [ac_cv_enable_valgrind=$enableval], [ac_cv_enable_valgrind=yes])
+if test x$ac_cv_enable_valgrind = xyes; then
+       AC_MSG_RESULT(yes)
+       PKG_CHECK_MODULES(VALGRIND, valgrind >= 2.4.0,
+                         ac_cv_enable_valgrind=yes, ac_cv_enable_valgrind=no)
+       if test x"$ac_cv_enable_valgrind" = xyes; then
+               AC_DEFINE(HAVE_VALGRIND, 1, Define if you want valgrind support)
+       else
+               AC_MSG_RESULT(not found)
+       fi
+else
+       AC_MSG_RESULT(no)
+fi
+AM_CONDITIONAL(CLAWS_VALGRIND, test x"$ac_cv_enable_valgrind" = x"yes")
+
 dnl ****************************
 dnl ** Final configure output **
 dnl ****************************
@@ -903,6 +937,7 @@ echo "Libgnomeprint : $ac_cv_enable_gnomeprint"
 echo "LibSM         : $ac_cv_enable_libsm"
 echo "Manual        : $ac_cv_enable_manual"
 echo "Plugins       : $PLUGINS"
+echo "Maemo  build  : $ac_cv_enable_maemo"
 echo "Config dir    : $ac_cv_with_config_dir"
 echo ""
 echo "The binary will be installed in $prefix/bin"