2006-11-01 [colin] 2.5.6cvs18

[claws.git] / configure.ac

diff --git a/configure.ac b/configure.ac
index b8253b14fbf758c10fb60e55d7c5a4ab61885441..02b3559a29339d5a1f41751919fc1b276ff634cb 100644 (file)
--- a/configure.ac
+++ b/configure.ac
@@ -8,10 +8,10 @@ PACKAGE=sylpheed-claws
 dnl version number
 MAJOR_VERSION=2
 MINOR_VERSION=5
-MICRO_VERSION=3
+MICRO_VERSION=6
 INTERFACE_AGE=0
 BINARY_AGE=0
-EXTRA_VERSION=7
+EXTRA_VERSION=18
 EXTRA_RELEASE=
 EXTRA_GTK2_VERSION=
 
@@ -302,6 +302,8 @@ AC_CHECK_FUNCS(gethostname mkdir mktime socket strstr strchr \
               uname flock lockf inet_aton inet_addr \
               fchmod mkstemp truncate getuid regcomp)
 
+AC_CHECK_FUNCS(fgets_unlocked fwrite_unlocked)
+
 dnl *****************
 dnl ** common code **
 dnl *****************
@@ -576,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
@@ -790,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)