Use _NET_WM_WINDOW_TYPE_SPLASH, not TYPE_SPLASHSCREEN. (#99482, Gregory

[~andy/gtk] / configure.in

diff --git a/configure.in b/configure.in
index 1ae6aa6b2cd0bd485966ac9a126f8a53c8f84104..e204ed5ebb6ec0f40a59de7b0f7554394da4b886 100644 (file)
--- a/configure.in
+++ b/configure.in
@@ -32,9 +32,9 @@ GLIB_AC_DIVERT_BEFORE_HELP([
 #
 GTK_MAJOR_VERSION=2
 GTK_MINOR_VERSION=1
-GTK_MICRO_VERSION=1
+GTK_MICRO_VERSION=2
 GTK_INTERFACE_AGE=0
-GTK_BINARY_AGE=101
+GTK_BINARY_AGE=102
 GTK_VERSION=$GTK_MAJOR_VERSION.$GTK_MINOR_VERSION.$GTK_MICRO_VERSION
 dnl This is the X.Y used in -lgtk-FOO-X.Y
 GTK_API_VERSION=2.0
@@ -88,7 +88,7 @@ AC_SUBST(GDK_PIXBUF_MICRO)
 AC_SUBST(GDK_PIXBUF_VERSION)
 
 ## Versions of dependencies
-GLIB_REQUIRED_VERSION=2.0.1
+GLIB_REQUIRED_VERSION=2.1.3
 PANGO_REQUIRED_VERSION=1.0.1
 ATK_REQUIRED_VERSION=1.0.1
 
@@ -468,7 +468,6 @@ LIBS=$gtk_save_LIBS
 AC_CHECK_HEADERS(pwd.h, AC_DEFINE(HAVE_PWD_H))
 AC_CHECK_HEADERS(sys/time.h, AC_DEFINE(HAVE_SYS_TIME_H))
 AC_CHECK_HEADERS(unistd.h, AC_DEFINE(HAVE_UNISTD_H))
-AC_CHECK_HEADERS(winsock.h, AC_DEFINE(HAVE_WINSOCK_H))
 
 if test "${with_ie55+set}" = set && test $with_ie55 != no; then
   AC_MSG_CHECKING([for dimm.h])
@@ -616,11 +615,24 @@ AC_MSG_RESULT($gdk_working_wctype)
 AC_SUBST(GDK_WLIBS)
 
 
-
 ##################################################
 # Checks for gdk-pixbuf
 ##################################################
 
+dnl ********************************************************
+dnl * See whether we need to load our modules as .la files *
+dnl ********************************************************
+
+use_la_modules=false
+case $host in
+  *-aix*) use_la_modules=true
+esac
+
+if $use_la_modules ; then
+   AC_DEFINE(USE_LA_MODULES, 1, [Whether to load modules via .la files rather than directly])
+fi
+
+
 AC_MSG_CHECKING(whether to build gmodulized gdk-pixbuf)
 
 AC_ARG_ENABLE(modules, [  --disable-modules       disable dynamic module loading],[
@@ -1428,19 +1440,27 @@ AC_SUBST(HTML_DIR)
 
 AC_CHECK_PROG(GTKDOC, gtkdoc-mkdb, true, false)
 
-gtk_doc_min_version=0.9
-if $GTKDOC ; then 
+gtk_doc_min_version=0.10
+if $GTKDOC ; then
     gtk_doc_version=`gtkdoc-mkdb --version`
     AC_MSG_CHECKING([gtk-doc version ($gtk_doc_version) >= $gtk_doc_min_version])
-    if perl <<EOF ; then
-      exit (("$gtk_doc_version" =~ /^[[0-9]]+\.[[0-9]]+$/) &&
-            ("$gtk_doc_version" >= "$gtk_doc_min_version") ? 0 : 1);
-EOF
+
+    IFS="${IFS=        }"; gtk_save_IFS="$IFS"; IFS="."
+    set $gtk_doc_version
+    for min in $gtk_doc_min_version ; do
+        cur=$1; shift
+        if test -z $min ; then break; fi
+        if test -z $cur ; then GTKDOC=false; break; fi
+        if test $cur -gt $min ; then break ; fi
+        if test $cur -lt $min ; then GTKDOC=false; break ; fi
+    done
+    IFS="$gtk_save_IFS"
+
+    if $GTKDOC ; then
       AC_MSG_RESULT(yes)
-   else
+    else
       AC_MSG_RESULT(no)
-      GTKDOC=false
-   fi
+    fi
 fi
 
 AC_CHECK_PROG(DB2HTML, db2html, true, false)
@@ -1576,8 +1596,11 @@ tests/Makefile
 docs/Makefile
 docs/reference/Makefile
 docs/reference/gdk-pixbuf/Makefile
+docs/reference/gdk-pixbuf/version.xml
 docs/reference/gdk/Makefile
+docs/reference/gdk/version.xml
 docs/reference/gtk/Makefile
+docs/reference/gtk/version.xml
 docs/faq/Makefile
 docs/tutorial/Makefile
 gdk-pixbuf/Makefile