2006-11-30 [paul] 2.6.0cvs70

[claws.git] / configure.ac

diff --git a/configure.ac b/configure.ac
index fc7746d328eaf82b2f9464edc2d50678525e2e2e..edf92e1281cf0c0081e212f5ea0f3935c4a24cf1 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=6
+MINOR_VERSION=6
+MICRO_VERSION=0
 INTERFACE_AGE=0
 BINARY_AGE=0
-EXTRA_VERSION=7
+EXTRA_VERSION=70
 EXTRA_RELEASE=
 EXTRA_GTK2_VERSION=
 
@@ -47,11 +47,11 @@ if test "$GNOME_CONFIG" != no; then
        fi
        AC_SUBST(gnomedatadir)
 fi
-AM_CONDITIONAL(SYLPHEED_GNOME, test -n "$gnomedatadir")
+AM_CONDITIONAL(CLAWS_GNOME, test -n "$gnomedatadir")
 
 dnl GNOME 2.x installed?
 PKG_CHECK_MODULES(GNOME2, libgnome-2.0 >= 2.0, ac_enable_gnome2=yes, ac_enable_gnome2=no)
-AM_CONDITIONAL(SYLPHEED_GNOME2, test x"$ac_enable_gnome2" = x"yes")
+AM_CONDITIONAL(CLAWS_GNOME2, test x"$ac_enable_gnome2" = x"yes")
 
 dnl Claws version
 AC_DEFINE(CLAWS, 1, Compiling Claws branch of sylpheed)
@@ -87,7 +87,7 @@ AC_LIBTOOL_WIN32_DLL
 AC_LIBTOOL_RC
 AC_PROG_LIBTOOL
 
-SYLPHEED_ACLOCAL_INCLUDE(m4)
+CLAWS_ACLOCAL_INCLUDE(m4)
   
 dnl ******************************
 dnl Checks for host
@@ -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.])
 
@@ -284,7 +284,7 @@ AC_STRUCT_TM
 dnl AC_CHECK_TYPE(wint_t, unsigned int) does not work because wint_t
 dnl may be defined only in wchar.h (this happens with gcc-2.96).
 dnl So we need to use this extended macro.
-SYLPHEED_CHECK_TYPE(wint_t, unsigned int,
+CLAWS_CHECK_TYPE(wint_t, unsigned int,
 [
 #if HAVE_WCHAR_H
 #include <wchar.h>
@@ -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,23 +792,23 @@ 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 "047"; then
-               AC_MSG_RESULT([*** Sylpheed requires libetpan 0.47 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.47 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.47 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.47 not found])
+           AC_MSG_ERROR([libetpan 0.48 not found])
        fi
 else
        AC_MSG_RESULT(no)
 fi
-AM_CONDITIONAL(SYLPHEED_LIBETPAN, test "x$libetpan_result" = "xyes")
+AM_CONDITIONAL(CLAWS_LIBETPAN, test "x$libetpan_result" = "xyes")
 
 
 dnl Libgnomeprint
@@ -830,7 +830,7 @@ if test x$ac_cv_enable_gnomeprint = xyes; then
 else
        AC_MSG_RESULT(no)
 fi
-AM_CONDITIONAL(SYLPHEED_GNOMEPRINT, test x"$ac_cv_enable_gnomeprint" = x"yes")
+AM_CONDITIONAL(CLAWS_GNOMEPRINT, test x"$ac_cv_enable_gnomeprint" = x"yes")
 
 dnl ****************************
 dnl ** Final configure output **
@@ -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