2008-08-29 [iwkse] 3.5.0cvs84

[claws.git] / configure.ac

diff --git a/configure.ac b/configure.ac
index 919943c065859d7ee39f8832e14d997083a1a1c2..80fd4b8f084873f0a568d00ee8d94be2b433c33d 100644 (file)
--- a/configure.ac
+++ b/configure.ac
@@ -11,7 +11,7 @@ MINOR_VERSION=5
 MICRO_VERSION=0
 INTERFACE_AGE=0
 BINARY_AGE=0
-EXTRA_VERSION=49
+EXTRA_VERSION=84
 EXTRA_RELEASE=
 EXTRA_GTK2_VERSION=
 
@@ -142,19 +142,11 @@ then
 fi
 
 CFLAGS="$CFLAGS -Wall"
-<<<<<<< configure.ac
 
 if test $USE_MAINTAINER_MODE = yes; then
-       CFLAGS="$CFLAGS -DGTK_DISABLE_DEPRECATED -DGDK_DISABLE_DEPRECATED"
+       CFLAGS="$CFLAGS -DGTK_DISABLE_DEPRECATED -DGDK_DISABLE_DEPRECATED -DG_DISABLE_DEPRECATED"
 fi
 
-=======
-
-if test $USE_MAINTAINER_MODE = yes; then
-       CFLAGS="$CFLAGS -DGTK_DISABLE_DEPRECATED"
-fi
-
->>>>>>> 1.654.2.3521
 pthread_name=
 case "$target" in
 *-darwin*)
@@ -938,18 +930,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 "049"; then
-               AC_MSG_RESULT([*** Claws Mail requires libetpan 0.49 or newer. See http://www.etpan.org/])
+          if test "$LIBETPAN_VERSION" -lt "055"; then
+               AC_MSG_RESULT([*** Claws Mail requires libetpan 0.55 or newer. See http://www.etpan.org/])
                AC_MSG_RESULT([*** You can use --disable-libetpan if you don't need IMAP4 and/or NNTP support.])
-                AC_MSG_ERROR([libetpan 0.49 not found])
+                AC_MSG_ERROR([libetpan 0.55 not found])
           fi
           AC_SUBST(LIBETPAN_FLAGS)
           AC_SUBST(LIBETPAN_LIBS)
           AC_DEFINE(HAVE_LIBETPAN, 1, Define if you want IMAP and/or NNTP support.)
        else
-          AC_MSG_RESULT([*** Claws Mail requires libetpan 0.49 or newer. See http://www.etpan.org/ ])
+          AC_MSG_RESULT([*** Claws Mail requires libetpan 0.55 or newer. See http://www.etpan.org/ ])
           AC_MSG_RESULT([*** You can use --disable-libetpan if you don't need IMAP4 and/or NNTP support.])
-           AC_MSG_ERROR([libetpan 0.49 not found])
+           AC_MSG_ERROR([libetpan 0.55 not found])
        fi
 else
        AC_MSG_RESULT(no)