Add check for db2html

[~andy/gtk] / configure.in

diff --git a/configure.in b/configure.in
index a7db57dccc2516af6177a9f85d250ac01b7a3493..fa7eeca45eeb3f22c4a6eb966dbf248b41ec3ce9 100644 (file)
--- a/configure.in
+++ b/configure.in
@@ -29,7 +29,7 @@ AC_DIVERT_PUSH(AC_DIVERSION_NOTICE)dnl
 #
 GTK_MAJOR_VERSION=1
 GTK_MINOR_VERSION=3
-GTK_MICRO_VERSION=0
+GTK_MICRO_VERSION=1
 GTK_INTERFACE_AGE=0
 GTK_BINARY_AGE=0
 GTK_VERSION=$GTK_MAJOR_VERSION.$GTK_MINOR_VERSION.$GTK_MICRO_VERSION
@@ -53,6 +53,19 @@ AC_SUBST(LT_CURRENT)
 AC_SUBST(LT_REVISION)
 AC_SUBST(LT_AGE)
 
+#
+# gdk-pixbuf gets versioned separately, and for now, using standard
+# libtool versioning, not GTK+-style versioning
+#
+GDK_PIXBUF_MAJOR=0
+GDK_PIXBUF_MINOR=8
+GDK_PIXBUF_MICRO=0
+GDK_PIXBUF_VERSION="${GDK_PIXBUF_MAJOR}.${GDK_PIXBUF_MINOR}.${GDK_PIXBUF_MICRO}"
+AC_SUBST(GDK_PIXBUF_MAJOR)
+AC_SUBST(GDK_PIXBUF_MINOR)
+AC_SUBST(GDK_PIXBUF_MICRO)
+AC_SUBST(GDK_PIXBUF_VERSION)
+
 # For automake.
 VERSION=$GTK_VERSION
 PACKAGE=gtk+
@@ -266,7 +279,7 @@ if test x$with_glib = x ; then
 
   AM_PATH_GLIB(1.3.1,,
     AC_MSG_ERROR([
-*** GLIB 1.3.0 or better is required. The latest version of GLIB
+*** GLIB 1.3.1 or better is required. The latest version of GLIB
 *** is always available from ftp://ftp.gtk.org/.]),
     gobject gmodule gthread)
 
@@ -847,13 +860,16 @@ AM_CONDITIONAL(USE_MMX, test x$use_mmx_asm = xyes)
 
 
 ##################################################
-# Checks for gtk-doc
+# Checks for gtk-doc and docbook-tools
 ##################################################
 
 AC_CHECK_PROG(GTKDOC, gtkdoc-mkdb, true, false)
 AM_CONDITIONAL(HAVE_GTK_DOC, $GTKDOC)
 AC_SUBST(HAVE_GTK_DOC)
 
+AC_CHECK_PROG(DB2HTML, db2html, true, false)
+AM_CONDITIONAL(HAVE_DOCBOOK, $DB2HTML)
+
 dnl Let people disable the gtk-doc stuff.
 AC_ARG_ENABLE(gtk-doc, [  --enable-gtk-doc  Use gtk-doc to build documentation [default=auto]], enable_gtk_doc="$enableval", enable_gtk_doc=auto)
 
@@ -988,7 +1004,6 @@ gdk/win32/Makefile
 gdk/nanox/Makefile
 gdk/linux-fb/Makefile
 gtk/Makefile
-gtk/gtkfeatures.h
 gtk/gtkcompat.h
 modules/Makefile
 modules/linux-fb/Makefile