2008-08-21 [colin] 3.5.0cvs67

[claws.git] / configure.ac

diff --git a/configure.ac b/configure.ac
index 919943c065859d7ee39f8832e14d997083a1a1c2..5f5e75b2bf1f6aa4019af8df8840925def1c7714 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=67
 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*)