--- configure.in~	2008-09-22 13:42:40 +0000

+++ configure.in	2009-12-21 14:12:21 +0000

@@ -81,55 +81,13 @@

   HTML_DIR=$with_html_dir

 fi

 AC_SUBST(HTML_DIR)

-

-AC_CHECK_PROG(GTKDOC, gtkdoc-mkdb, true, false)

-gtk_doc_min_version=0.9

-if $GTKDOC ; then

-    gtk_doc_version=`gtkdoc-mkdb --version`

-    AC_MSG_CHECKING([gtk-doc version ($gtk_doc_version) >= $gtk_doc_min_version])

-

-    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

-      AC_MSG_RESULT(no)

-    fi

-fi

-

+GTK_DOC_CHECK([1.3])

 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=yes)

-

-if test x$enable_gtk_doc = xyes ; then

-  if test x$GTKDOC = xtrue ; then

-    enable_gtk_doc=yes

-  else

-    enable_gtk_doc=no 

-  fi

-fi

-

-dnl NOTE: We need to use a separate automake conditional for this

-dnl       to make this work with the tarballs.

-AM_CONDITIONAL(ENABLE_GTK_DOC, test x$enable_gtk_doc = xyes)

-dnl ==========================================

-dnl END: Checks for gtk-doc and docbook-tools

-dnl ==========================================

-

 dnl =================

 dnl pkg-config checks

 dnl =================