2006-12-27 [wwp] 2.6.1cvs80

[claws.git] / configure.ac

diff --git a/configure.ac b/configure.ac
index 833b509d45348fd7fe8c3266cb1de83dcc33cc14..b770c41ccc7af4ee9b9f7ea2ef44daf723a66673 100644 (file)
--- a/configure.ac
+++ b/configure.ac
@@ -8,10 +8,10 @@ PACKAGE=claws-mail
 dnl version number
 MAJOR_VERSION=2
 MINOR_VERSION=6
-MICRO_VERSION=0
+MICRO_VERSION=1
 INTERFACE_AGE=0
 BINARY_AGE=0
-EXTRA_VERSION=63
+EXTRA_VERSION=80
 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
@@ -171,7 +171,7 @@ AC_DEFINE_UNQUOTED(GETTEXT_PACKAGE,"$GETTEXT_PACKAGE", [Define text domain.])
 AM_GNU_GETTEXT_VERSION([0.15])
 AM_GNU_GETTEXT([external])
 
-manualdir='${datarootdir}/${PACKAGE}/manual'
+manualdir='${docdir}/manual'
 AC_ARG_WITH(manualdir,
        [  --with-manualdir=DIR    Manual directory],
        [manualdir="$withval"])
@@ -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>
@@ -793,7 +793,7 @@ if test x"$ac_cv_enable_libetpan" = xyes; then
           LIBETPAN_LIBS="`$libetpanconfig --libs`"
           LIBETPAN_VERSION=`$libetpanconfig --version | sed "s/\.//g" | sed "s/-.*$//"`
           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([*** Claws Mail 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.48 not found])
           fi
@@ -801,14 +801,14 @@ if test x"$ac_cv_enable_libetpan" = xyes; then
           AC_SUBST(LIBETPAN_LIBS)
           AC_DEFINE(HAVE_LIBETPAN, 1, Define if you want IMAP support.)
        else
-          AC_MSG_RESULT([*** Sylpheed requires libetpan 0.48 or newer. See http://www.etpan.org/ ])
+          AC_MSG_RESULT([*** Claws Mail 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.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 **