0.9.3claws66

[claws.git] / configure.ac

diff --git a/configure.ac b/configure.ac
index 81df286534712f11d7d8e3f695410fc2fcf25abd..fbd513396e2b472a599530a2a0b351933f67f0cc 100644 (file)
--- a/configure.ac
+++ b/configure.ac
@@ -8,11 +8,15 @@ PACKAGE=sylpheed
 dnl version number
 MAJOR_VERSION=0
 MINOR_VERSION=9
-MICRO_VERSION=0
+MICRO_VERSION=3
 INTERFACE_AGE=0
 BINARY_AGE=0
-EXTRA_VERSION=claws74
-VERSION=$MAJOR_VERSION.$MINOR_VERSION.$MICRO_VERSION$EXTRA_VERSION
+EXTRA_VERSION=66
+if test $EXTRA_VERSION -eq 0; then
+    VERSION=${MAJOR_VERSION}.${MINOR_VERSION}.${MICRO_VERSION}claws
+else
+    VERSION=${MAJOR_VERSION}.${MINOR_VERSION}.${MICRO_VERSION}claws${EXTRA_VERSION}
+fi
 
 dnl set $target
 AC_CANONICAL_SYSTEM
@@ -23,6 +27,10 @@ dnl AC_DEFINE_UNQUOTED(PACKAGE, "$PACKAGE")
 dnl AC_DEFINE_UNQUOTED(VERSION, "$VERSION")
 AC_SUBST(PACKAGE)
 AC_SUBST(VERSION)
+AC_SUBST(MAJOR_VERSION)
+AC_SUBST(MINOR_VERSION)
+AC_SUBST(MICRO_VERSION)
+AC_SUBST(EXTRA_VERSION)
 
 dnl GNOME installed?
 AC_PATH_PROG(GNOME_CONFIG, gnome-config, no)
@@ -219,6 +227,14 @@ AC_ARG_WITH(passcrypt-key, [  --with-passcrypt-key=KEY     Key used to encode pa
            with_passcrypt_key="$withval", with_passcrypt_key="passkey0")
 AC_SUBST(PASSCRYPT_KEY, $with_passcrypt_key)
 
+dnl RC dir (will be default at a certain point in time)
+AC_ARG_WITH(config-dir,    [  --with-config-dir=RCDIR      Local configuration dir (default: .sylpheed)],
+             ac_cv_with_config_dir="$withval", ac_cv_with_config_dir=".sylpheed")
+if test x"$ac_cv_with_config_dir" = x""; then
+       ac_cv_with_config_dir=".sylpheed"
+fi 
+AC_DEFINE_UNQUOTED(CFG_RC_DIR, "$ac_cv_with_config_dir", Configuration directory)
+
 dnl ************************
 dnl ** GTK user interface **
 dnl ************************
@@ -391,8 +407,7 @@ AC_ARG_ENABLE(mathml-viewer-plugin,
        [ac_cv_enable_mathml_viewer_plugin=$enableval], [ac_cv_enable_mathml_viewer_plugin=no])
 AM_CONDITIONAL(BUILD_MATHML_VIEWER_PLUGIN, test x"$ac_cv_enable_mathml_viewer_plugin" = xyes)
 if test x"$ac_cv_enable_mathml_viewer_plugin" = xyes; then
-       GTK_MATH_VIEW_CFLAGS=$( gtkmathview-config --cflags )
-       GTK_MATH_VIEW_LIBS=$( gtkmathview-config --libs )
+       PKG_CHECK_MODULES(GTK_MATH_VIEW, gtkmathview >= 0.4.2)
        AC_SUBST(GTK_MATH_VIEW_CFLAGS)
        AC_SUBST(GTK_MATH_VIEW_LIBS)
 
@@ -420,7 +435,7 @@ if test x"$ac_cv_enable_image_viewer_plugin" = xyes; then
                        AC_DEFINE(HAVE_GDK_IMLIB, 1, Define if you use gdk_imlib to support image viewer),
                        [ac_cv_enable_imlib=no])
        fi
-       if test "$ac_cv_enable_gdk_pixbuf" = no -a "$ac_cv_enable_imlib" = no; then
+       if test x"$ac_cv_enable_gdk_pixbuf" = xno -a x"$ac_cv_enable_imlib" = xno; then
                $ac_cv_enable_image_viewer_plugin = no
        fi
 fi
@@ -520,6 +535,7 @@ echo "IPv6          : $ac_cv_enable_ipv6"
 echo "GNU/aspell    : $ac_cv_enable_aspell"
 echo "Crash dialog  : $ac_cv_enable_crash_dialog"
 echo "Plugins       : $PLUGINS"
+echo "Config dir    : $ac_cv_with_config_dir"
 echo ""
 echo "The binary will be installed in $prefix/bin"
 echo ""