re-order 'Signature' items in Account Prefs

[claws.git] / configure.ac

diff --git a/configure.ac b/configure.ac
index 86aa4af427daeb6cfd8510e963da2c120ca63ef4..f88d46c4d852a8196b61a6c9f81b63ac8f6b269a 100644 (file)
--- a/configure.ac
+++ b/configure.ac
@@ -11,7 +11,7 @@ MINOR_VERSION=8
 MICRO_VERSION=10
 INTERFACE_AGE=0
 BINARY_AGE=0
-EXTRA_VERSION=claws4
+EXTRA_VERSION=claws61
 VERSION=$MAJOR_VERSION.$MINOR_VERSION.$MICRO_VERSION$EXTRA_VERSION
 
 dnl set $target
@@ -27,10 +27,12 @@ AC_SUBST(VERSION)
 dnl GNOME installed?
 AC_PATH_PROG(GNOME_CONFIG, gnome-config, no)
 if test "$GNOME_CONFIG" != no; then
-       gnomedir="`gnome-config --prefix`"
-       AC_SUBST(gnomedir)
+       gnomedatadir="`gnome-config --datadir`"
+       gnomeprefix="`gnome-config --prefix`"
+       gnomedatadir="${prefix}/${gnomedatadir#${gnomeprefix}}"
+       AC_SUBST(gnomedatadir)
 fi
-AM_CONDITIONAL(SYLPHEED_GNOME, test -d "$gnomedir")
+AM_CONDITIONAL(SYLPHEED_GNOME, test -n "$gnomedatadir")
 
 dnl Claws version
 AC_DEFINE(CLAWS, 1, Compiling Claws branch of sylpheed)
@@ -370,6 +372,9 @@ AC_ARG_ENABLE(demo-plugin,
        [  --enable-demo-plugin    Build demo plugin [default=no]],
        [ac_cv_enable_demo_plugin=$enableval], [ac_cv_enable_demo_plugin=no])
 AM_CONDITIONAL(BUILD_DEMO_PLUGIN, test x"$ac_cv_enable_demo_plugin" = xyes)
+if test x"$ac_cv_enable_demo_plugin" = xyes; then
+       PLUGINS="demo $PLUGINS"
+fi
 
 AC_ARG_ENABLE(spamassassin-plugin,
        [  --enable-spamassassin-plugin    Build spamassassin plugin [default=no]],
@@ -377,6 +382,7 @@ AC_ARG_ENABLE(spamassassin-plugin,
 AM_CONDITIONAL(BUILD_SPAMASSASSIN_PLUGIN, test x"$ac_cv_enable_spamassassin_plugin" = xyes)
 if test x"$ac_cv_enable_spamassassin_plugin" = xyes; then
        AC_SPAMASSASSIN
+       PLUGINS="spamassassin $PLUGINS"
 fi
 
 dnl ****************************