Update gtk-doc framework bits 2006-03-13 Tommi Komulainen <tommi.komulainen@nokia...

[hildon] / configure.ac

diff --git a/configure.ac b/configure.ac
index f86f926..a150660 100644 (file)
--- a/configure.ac
+++ b/configure.ac
@@ -1,5 +1,5 @@
 AC_INIT(Makefile.am)
-AM_INIT_AUTOMAKE(hildon-libs, 0.9.50)
+AM_INIT_AUTOMAKE(hildon-libs, 0.12.2)
 AM_CONFIG_HEADER(config.h)
 
 AC_CANONICAL_HOST
@@ -21,7 +21,7 @@ CFLAGS="$CFLAGS -std=c99 -Wall -pedantic -Wmissing-prototypes -Wmissing-declarat
 
 GTK_VERSION=2.6.4
 
-PKG_CHECK_MODULES(GTK, hildon-lgpl >= 0.9.1 hildon-fm >= 0.8.6)
+PKG_CHECK_MODULES(GTK, gtk+-2.0)
 AC_SUBST(GTK_LIBS)
 AC_SUBST(GTK_CFLAGS)
 AC_SUBST(GTK_VERSION)
@@ -41,6 +41,10 @@ PKG_CHECK_MODULES(GCONF, gconf-2.0 >= 2.6)
 AC_SUBST(GCONF_CFLAGS)
 AC_SUBST(GCONF_LIBS)
 
+PKG_CHECK_MODULES(LIBMB, libmb >= 1.3)
+AC_SUBST(LIBMB_CFLAGS)
+AC_SUBST(LIBMB_LIBS)
+
 ALL_LINGUAS="en_GB"
 AC_SUBST(ALL_LINGUAS) 
 AM_GLIB_GNU_GETTEXT
@@ -48,46 +52,7 @@ AM_GLIB_GNU_GETTEXT
 ##################################################
 # 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_CHECK_PROG(GTKDOC, gtkdoc-mkdb, true, false)
-
-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
-      AC_MSG_RESULT(yes)
-   else
-      AC_MSG_RESULT(no)
-      GTKDOC=false
-   fi
-fi
-
-# Let people disable the gtk-doc stuff.
-AC_ARG_ENABLE(gtk-doc, [  --enable-gtk-doc        use gtk-doc to build documenta
-tion [default=yes]], enable_gtk_doc="$enableval", enable_gtk_doc=yes)
-
-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)
+GTK_DOC_CHECK([1.0])
 
 AC_CHECK_PROG(DOXYGEN_FOUND, doxygen, yes, no)
 AM_CONDITIONAL(HAVE_DOXYGEN, [test "$DOXYGEN_FOUND" = "yes"])
@@ -95,22 +60,12 @@ AM_CONDITIONAL(HAVE_DOXYGEN, [test "$DOXYGEN_FOUND" = "yes"])
 localedir=${datadir}/locale
 outomoduledir=${libdir}/outo
 
-AC_ARG_ENABLE(doc-dir, [ --with-doc-dir=PATH path to installed docs ])
-if test "x$with_doc_dir" = "x" ; then
-  docdir='${datadir}/doc'
-else
-  docdir=$with_doc_dir 
-fi
-
-HTML_DIR=${docdir}/html
-
-AC_SUBST(docdir)
 AC_SUBST(localedir)
 AC_SUBST(outomoduledir)
-AC_SUBST(HTML_DIR)
 
 AC_OUTPUT(Makefile \
        hildon-widgets/Makefile \
+        timer/Makefile \
        ut/Makefile \
        po/Makefile \
        po/porules.mk \