remove gtk_window_set_wmclass()

[claws.git] / configure.ac

diff --git a/configure.ac b/configure.ac
index 1a697bd4a264b9c2108efdbe1c1f99feb3554bde..ec0fa7ce9f91af14fed4769ac7816b5008774536 100644 (file)
--- a/configure.ac
+++ b/configure.ac
@@ -8,16 +8,17 @@ PACKAGE=sylpheed-claws
 dnl version number
 MAJOR_VERSION=0
 MINOR_VERSION=9
-MICRO_VERSION=11
+MICRO_VERSION=12
 INTERFACE_AGE=0
 BINARY_AGE=0
-EXTRA_VERSION=17.20
+EXTRA_VERSION=37
 EXTRA_RELEASE=
+EXTRA_GTK2_VERSION=.4
 
 if test \( $EXTRA_VERSION -eq 0 \) -o \( "x$EXTRA_RELEASE" != "x" \); then
-    VERSION=${MAJOR_VERSION}.${MINOR_VERSION}.${MICRO_VERSION}${EXTRA_RELEASE}
+    VERSION=${MAJOR_VERSION}.${MINOR_VERSION}.${MICRO_VERSION}${EXTRA_RELEASE}${EXTRA_GTK2_VERSION}
 else
-    VERSION=${MAJOR_VERSION}.${MINOR_VERSION}.${MICRO_VERSION}cvs${EXTRA_VERSION}
+    VERSION=${MAJOR_VERSION}.${MINOR_VERSION}.${MICRO_VERSION}cvs${EXTRA_VERSION}${EXTRA_GTK2_VERSION}
 fi
 
 dnl set $target
@@ -308,23 +309,6 @@ dnl Checks for GTK
 AM_PATH_GTK_2_0(2.4.0,,
        AC_MSG_ERROR(Test for GTK failed. See the file 'INSTALL' for help.))
 
-dnl check if gdk / gtk was compiled with USE_XIM
-AC_MSG_CHECKING([whether GTK was compiled with XIM support])
-CFLAGS_SAVE="$CFLAGS"
-LDFLAGS_SAVE="$LDFLAGS"
-CFLAGS="$CFLAGS `$GTK_CONFIG --cflags`"
-LDFLAGS="$LDFLAGS `$GTK_CONFIG --libs`"
-AC_CACHE_VAL(ac_cv_use_xim, [
-       AC_TRY_LINK_FUNC([gdk_ic_attr_new],
-                        ac_cv_use_xim=yes, ac_cv_use_xim=no)
-])
-AC_MSG_RESULT($ac_cv_use_xim)
-if test $ac_cv_use_xim = yes; then
-       AC_DEFINE(USE_XIM, 1, Whether GTK was compiled with XIM support or not)
-fi
-CFLAGS="$CFLAGS_SAVE"
-LDFLAGS="$LDFLAGS_SAVE"
-
 dnl GNU/Aspell is used for spell checking
 AC_ARG_ENABLE(aspell,
        [  --enable-aspell         Enable GNU/aspell support [default=no]],