-PKG_CHECK_MODULES([TEST], [gtk+-2.0 >= 2.8])
-AC_SUBST(TEST_CFLAGS)
-AC_SUBST(TEST_LIBS)
-
-##################################################
-# Check for gtk-doc.
-##################################################
-AC_ARG_WITH(html-dir, [ --with-html-dir=PATH path to installed docs ])
-if test "x$with_html_dir" = "x" ; then
- HTML_DIR='${datadir}/gtk-doc/html'
-else
- HTML_DIR=$with_html_dir
-fi
-AC_SUBST(HTML_DIR)
-
-gtk_doc_min_version=1.0
-AC_MSG_CHECKING([gtk-doc version >= $gtk_doc_min_version])
-if pkg-config --atleast-version=$gtk_doc_min_version gtk-doc; then
- AC_MSG_RESULT(yes)
- GTKDOC=true
-else
- AC_MSG_RESULT(no)
- GTKDOC=false
-fi
-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)
-if test x$enable_gtk_doc = xauto ; then
- if test x$GTKDOC = xtrue ; then
- enable_gtk_doc=yes
- else
- enable_gtk_doc=no
- fi
-fi
-AM_CONDITIONAL(ENABLE_GTK_DOC, test x$enable_gtk_doc = xyes)
-
-AC_OUTPUT([
+# Libraries needed to build test programs
+PKG_CHECK_MODULES([TEST], [
+ gtk+-2.0 >= $GTK_REQUIRED_VERSION
+ gmodule-2.0
+])
+
+### GTK-DOC ###################################################################
+
+# Allow gtkdocize to automatically copy the macro definition for
+# GTK_DOC_CHECK to the project.
+# AC_CONFIG_MACRO_DIR(m4)
+
+### OUTPUT ####################################################################
+
+# Output platform-specific definitions to config.h
+AC_CONFIG_HEADERS([config.h])
+# List of other files for Autoconf to output
+AC_CONFIG_FILES([