2006-11-12 [colin] 2.6.0cvs38

[claws.git] / configure.ac

diff --git a/configure.ac b/configure.ac
index 6eeb75681966fed837f71b9e73b6606c3af14bbe..a9a92484dccd6dacea90ff60b4b7788fa9e0ebfd 100644 (file)
--- a/configure.ac
+++ b/configure.ac
@@ -3,15 +3,15 @@ AC_PREREQ(2.60)
 AC_INIT(src/main.c)
 AC_CONFIG_AUX_DIR(config)
 
-PACKAGE=sylpheed-claws
+PACKAGE=claws-mail
 
 dnl version number
 MAJOR_VERSION=2
-MINOR_VERSION=5
-MICRO_VERSION=5
+MINOR_VERSION=6
+MICRO_VERSION=0
 INTERFACE_AGE=0
 BINARY_AGE=0
-EXTRA_VERSION=10
+EXTRA_VERSION=38
 EXTRA_RELEASE=
 EXTRA_GTK2_VERSION=
 
@@ -164,7 +164,7 @@ LIBS=$syl_save_LIBS
 
 dnl for gettext
 ALL_LINGUAS="bg ca cs de el en_GB es fi fr hr hu it ja ko nb nl pl pt_BR ru sk sr sv zh_CN zh_TW"
-GETTEXT_PACKAGE=sylpheed-claws
+GETTEXT_PACKAGE=claws-mail
 AC_SUBST(GETTEXT_PACKAGE)
 AC_DEFINE_UNQUOTED(GETTEXT_PACKAGE,"$GETTEXT_PACKAGE", [Define text domain.])
 
@@ -387,10 +387,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-claws)],
-             ac_cv_with_config_dir="$withval", ac_cv_with_config_dir=".sylpheed-claws")
+AC_ARG_WITH(config-dir,    [  --with-config-dir=RCDIR      Local configuration dir (default: .claws-mail)],
+             ac_cv_with_config_dir="$withval", ac_cv_with_config_dir=".claws-mail")
 if test x"$ac_cv_with_config_dir" = x""; then
-       ac_cv_with_config_dir=".sylpheed-claws"
+       ac_cv_with_config_dir=".claws-mail"
 fi 
 AC_DEFINE_UNQUOTED(CFG_RC_DIR, "$ac_cv_with_config_dir", Configuration directory)
 
@@ -578,11 +578,11 @@ AC_ARG_ENABLE(jpilot,
 AC_MSG_CHECKING([whether to use JPilot])
 if test "$ac_cv_enable_jpilot" = yes; then
        AC_MSG_RESULT(yes)
-       AC_CHECK_HEADERS(pi-args.h pi-appinfo.h pi-address.h,
+       AC_CHECK_HEADERS(pi-args.h pi-appinfo.h pi-address.h pi-version.h,
                         [ AC_DEFINE(USE_JPILOT, 1, Define if you want JPilot support in addressbook.) ],
                         [ ac_cv_enable_jpilot=no ])
        if test "$ac_cv_enable_jpilot" = no; then
-               AC_CHECK_HEADERS(libpisock/pi-args.h libpisock/pi-appinfo.h libpisock/pi-address.h,
+               AC_CHECK_HEADERS(libpisock/pi-args.h libpisock/pi-appinfo.h libpisock/pi-address.h libpisock/pi-version.h,
                                 [ ac_cv_enable_jpilot=yes
                                   AC_DEFINE(USE_JPILOT, 1, Define if you want JPilot support in addressbook.) ])
        fi
@@ -792,18 +792,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 "046"; then
-               AC_MSG_RESULT([*** Sylpheed requires libetpan 0.46 or newer. See http://www.etpan.org/])
+          if test "$LIBETPAN_VERSION" -lt "048"; then
+               AC_MSG_RESULT([*** Sylpheed requires libetpan 0.48 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.46 not found])
+                AC_MSG_ERROR([libetpan 0.48 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_RESULT([*** Sylpheed requires libetpan 0.46 or newer. See http://www.etpan.org/ ])
+          AC_MSG_RESULT([*** Sylpheed requires libetpan 0.48 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.46 not found])
+           AC_MSG_ERROR([libetpan 0.48 not found])
        fi
 else
        AC_MSG_RESULT(no)
@@ -886,7 +886,7 @@ manual/es/dist/pdf/Makefile
 manual/es/dist/ps/Makefile
 manual/es/dist/html/Makefile
 manual/es/dist/txt/Makefile
-sylpheed-claws.pc
+claws-mail.pc
 ])
 
 dnl Output the configuration summary