2005-11-07 [paul] 1.9.99cvs14

[claws.git] / configure.ac

diff --git a/configure.ac b/configure.ac
index c10be9ddc719d947fa4cb2a6619bec81953d409a..48a3b162a173d5b97e2e10759d2de7dce72a38a7 100644 (file)
--- a/configure.ac
+++ b/configure.ac
@@ -8,10 +8,10 @@ PACKAGE=sylpheed-claws
 dnl version number
 MAJOR_VERSION=1
 MINOR_VERSION=9
-MICRO_VERSION=15
+MICRO_VERSION=99
 INTERFACE_AGE=0
 BINARY_AGE=0
-EXTRA_VERSION=50
+EXTRA_VERSION=14
 EXTRA_RELEASE=
 EXTRA_GTK2_VERSION=
 
@@ -343,10 +343,10 @@ AC_ARG_WITH(passcrypt-key, [  --with-passcrypt-key=KEY     Key used to encode pa
 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-gtk2)],
-             ac_cv_with_config_dir="$withval", ac_cv_with_config_dir=".sylpheed-gtk2")
+AC_ARG_WITH(config-dir,    [  --with-config-dir=RCDIR      Local configuration dir (default: .sylpheed-claws)],
+             ac_cv_with_config_dir="$withval", ac_cv_with_config_dir=".sylpheed-claws")
 if test x"$ac_cv_with_config_dir" = x""; then
-       ac_cv_with_config_dir=".sylpheed-gtk2"
+       ac_cv_with_config_dir=".sylpheed-claws"
 fi 
 AC_DEFINE_UNQUOTED(CFG_RC_DIR, "$ac_cv_with_config_dir", Configuration directory)
 
@@ -734,16 +734,18 @@ if test x"$ac_cv_enable_libetpan" = xyes; then
           LIBETPAN_CPPFLAGS="`$libetpanconfig --cflags`"
           LIBETPAN_LIBS="`$libetpanconfig --libs`"
           LIBETPAN_VERSION=`$libetpanconfig --version | sed "s/\.//g" | sed "s/-.*$//"`
-          if test "$LIBETPAN_VERSION" -lt "039"; then
-               AC_MSG_ERROR([Sylpheed requires libetpan 0.39 or newer. See http://www.etpan.org/])
-               AC_MSG_ERROR([You can use --disable-libetpan if you don't need IMAP4 support.])
+          if test "$LIBETPAN_VERSION" -lt "040"; then
+               AC_MSG_RESULT([*** Sylpheed requires libetpan 0.40 or newer. See http://www.etpan.org/])
+               AC_MSG_RESULT([*** You can use --disable-libetpan if you don't need IMAP4 support.])
+                AC_MSG_ERROR([libetpan 0.40 not found])
           fi
           AC_SUBST(LIBETPAN_FLAGS)
           AC_SUBST(LIBETPAN_LIBS)
           AC_DEFINE(HAVE_LIBETPAN, 1, Define if you want IMAP support.)
        else
-          AC_MSG_ERROR([Sylpheed requires libetpan 0.39 or newer. See http://www.etpan.org/ ])
-          AC_MSG_ERROR([You can use --disable-libetpan if you don't need IMAP4 support.])
+          AC_MSG_RESULT([*** Sylpheed requires libetpan 0.40 or newer. See http://www.etpan.org/ ])
+          AC_MSG_RESULT([*** You can use --disable-libetpan if you don't need IMAP4 support.])
+           AC_MSG_ERROR([libetpan 0.40 not found])
        fi
 else
        AC_MSG_RESULT(no)
@@ -776,7 +778,6 @@ dnl ****************************
 
 AC_OUTPUT([
 Makefile
-sylpheed.spec
 m4/Makefile
 po/Makefile.in
 src/common/version.h