0.8.10claws86

[claws.git] / configure.ac

diff --git a/configure.ac b/configure.ac
index f04aeef82e4cadfa2f99746a33ad69c6ee008123..eb2f3e786ad8c6d0b6e267eddbf861e1532f8fba 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=claws54
+EXTRA_VERSION=claws86
 VERSION=$MAJOR_VERSION.$MINOR_VERSION.$MICRO_VERSION$EXTRA_VERSION
 
 dnl set $target
@@ -29,7 +29,11 @@ AC_PATH_PROG(GNOME_CONFIG, gnome-config, no)
 if test "$GNOME_CONFIG" != no; then
        gnomedatadir="`gnome-config --datadir`"
        gnomeprefix="`gnome-config --prefix`"
-       gnomedatadir="${prefix}/${gnomedatadir#${gnomeprefix}}"
+       if test "${prefix}" = "NONE"; then
+               gnomedatadir="${ac_default_prefix}/${gnomedatadir#${gnomeprefix}}"
+       else
+               gnomedatadir="${prefix}/${gnomedatadir#${gnomeprefix}}"
+       fi
        AC_SUBST(gnomedatadir)
 fi
 AM_CONDITIONAL(SYLPHEED_GNOME, test -n "$gnomedatadir")
@@ -196,6 +200,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 ************************
@@ -383,6 +392,7 @@ AM_CONDITIONAL(BUILD_SPAMASSASSIN_PLUGIN, test x"$ac_cv_enable_spamassassin_plug
 if test x"$ac_cv_enable_spamassassin_plugin" = xyes; then
        AC_SPAMASSASSIN
        PLUGINS="spamassassin $PLUGINS"
+       AC_DEFINE(USE_SPAMASSASSIN, 1, Define if you use the SpamAssassin plugin)
 fi
 
 dnl ****************************
@@ -398,6 +408,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