0.8.10claws71

[claws.git] / configure.ac

diff --git a/configure.ac b/configure.ac
index 030aa19f1cb67fa5cfcc51dd505967298775de1f..7c114841ca9064a752757bd40d3f30e10adb18fc 100644 (file)
--- a/configure.ac
+++ b/configure.ac
@@ -8,10 +8,10 @@ PACKAGE=sylpheed
 dnl version number
 MAJOR_VERSION=0
 MINOR_VERSION=8
-MICRO_VERSION=9
+MICRO_VERSION=10
 INTERFACE_AGE=0
 BINARY_AGE=0
-EXTRA_VERSION=claws50
+EXTRA_VERSION=claws71
 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)
@@ -194,6 +196,11 @@ fi
 dnl Check for OpenSSL
 AM_PATH_OPENSSL
 
+dnl Key for password encryption
+AC_ARG_WITH(passcrypt-key, [  --with-passcrypt-key=KEY     Key used to encode passwords (8 byte string)],
+           with_passcrypt_key="$withval", with_passcrypt_key="passkey0")
+AC_SUBST(PASSCRYPT_KEY, $with_passcrypt_key)
+
 dnl ************************
 dnl ** GTK user interface **
 dnl ************************
@@ -369,6 +376,7 @@ PLUGINS=""
 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
@@ -376,15 +384,12 @@ fi
 AC_ARG_ENABLE(spamassassin-plugin,
        [  --enable-spamassassin-plugin    Build spamassassin plugin [default=no]],
        [ac_cv_enable_spamassassin_plugin=$enableval], [ac_cv_enable_spamassassin_plugin=no])
+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
 
-AC_SUBST(PLUGINS)
-AC_SUBST(PLUGINDIR)
-
 dnl ****************************
 dnl ** Final configure output **
 dnl ****************************
@@ -398,6 +403,7 @@ po/Makefile.in
 src/common/version.h
 src/Makefile
 src/common/Makefile
+src/common/passcrypt.h
 src/gtk/Makefile
 src/plugins/Makefile
 src/plugins/demo/Makefile