2011-11-20 [pawel] 3.7.10cvs96

[claws.git] / configure.ac

diff --git a/configure.ac b/configure.ac
index 78a6fcf94b338d8d19029ac21c1285dc8fcde469..516b55447f7d1ce94a1600801ef1eff75c62eab5 100644 (file)
--- a/configure.ac
+++ b/configure.ac
@@ -12,7 +12,7 @@ MINOR_VERSION=7
 MICRO_VERSION=10
 INTERFACE_AGE=0
 BINARY_AGE=0
-EXTRA_VERSION=21
+EXTRA_VERSION=96
 EXTRA_RELEASE=
 EXTRA_GTK2_VERSION=
 
@@ -157,7 +157,7 @@ fi
 CFLAGS="$CFLAGS -Wall"
 
 #if test $USE_MAINTAINER_MODE = yes; then
-#      CFLAGS="-g -Wall -Wno-pointer-sign -DGTK_DISABLE_DEPRECATED -DGDK_DISABLE_DEPRECATED -DG_DISABLE_DEPRECATED -DGTK_DISABLE_SINGLE_INCLUDESi -DGDK_PIXBUF_DISABLE_DEPRECATED -DGSEAL_ENABLE"
+#      CFLAGS="-g -Wall -Wno-pointer-sign -DGTK_DISABLE_DEPRECATED -DGDK_DISABLE_DEPRECATED -DG_DISABLE_DEPRECATED -DGTK_DISABLE_SINGLE_INCLUDES -DGDK_PIXBUF_DISABLE_DEPRECATED -DGSEAL_ENABLE"
 #fi
 
 pthread_name=
@@ -182,6 +182,9 @@ esac
 dnl Checks for iconv
 AM_ICONV
 
+dnl floor and ceil are  in -lm
+LIBS="$LIBS -lm"
+
 dnl
 dnl Check for bind_textdomain_codeset, including -lintl if GLib brings it in.
 dnl
@@ -466,20 +469,21 @@ dnl ************************
 dnl Checks for GTK
 AC_ARG_ENABLE(gtk3,
        AS_HELP_STRING([--enable-gtk3],
-               [Determines whether to use Gtk+ 3.0 vclplug on platforms where Gtk+ 3.0 is available.]),
+               [Determines whether to use Gtk+ 3.0.]),
                [ac_cv_enable_gtk3=$enableval],[ac_cv_enable_gtk3=no])
+AM_CONDITIONAL(GTK3, false)
+AM_CONDITIONAL(GTK2, true)
 if test x"$ac_cv_enable_gtk3" = x"yes"; then
        PKG_CHECK_MODULES(GTK, gtk+-3.0 >= 3.0 cairo)
-       AC_SUBST(GTK3, 1)
+       AM_CONDITIONAL(GTK3, true)
+       AM_CONDITIONAL(GTK2, false)
 else
-       PKG_CHECK_MODULES(GTK, gtk+-2.0 >= 2.10)
-       AC_SUBST(GTK2, 1)
+       PKG_CHECK_MODULES(GTK, gtk+-2.0 >= 2.16)
 
-dnl --disable-deprecated switch for GTK2 purification
-AC_ARG_ENABLE(deprecated, [  --disable-deprecated  disable deprecated GTK functions. ],
+       dnl --disable-deprecated switch for GTK2 purification
+       AC_ARG_ENABLE(deprecated, [  --disable-deprecated  disable deprecated GTK functions. ],
                          [GTK_CFLAGS="$GTK_CFLAGS -DG_DISABLE_DEPRECATED -DGTK_DISABLE_DEPRECATED"], [])
 fi
-
 AC_SUBST(GTK_CFLAGS)
 AC_SUBST(GTK_LIBS)