2006-11-21 Tomas Junnonen <tomas.junnonen@nokia.com>

[hildon] / configure.ac

diff --git a/configure.ac b/configure.ac
index ffb5cb2..aceb3bf 100644 (file)
--- a/configure.ac
+++ b/configure.ac
@@ -1,5 +1,5 @@
 AC_INIT(Makefile.am)
-AM_INIT_AUTOMAKE(hildon-libs, 0.12.10)
+AM_INIT_AUTOMAKE(hildon-libs, 0.14.8)
 AM_CONFIG_HEADER(config.h)
 
 AC_CANONICAL_HOST
@@ -34,11 +34,6 @@ PKG_CHECK_MODULES(ESD, esound)
 AC_SUBST(ESD_LIBS)
 AC_SUBST(ESD_CFLAGS)
 
-# Needed to demonstrate how mime-types can be handled with gnome-vfs
-PKG_CHECK_MODULES(GNOME_VFS, gnome-vfs-2.0 >= 2.6 gnome-vfs-module-2.0 >= 2.6)
-AC_SUBST(GNOME_VFS_CFLAGS)
-AC_SUBST(GNOME_VFS_LIBS)
-
 PKG_CHECK_MODULES(GCONF, gconf-2.0 >= 2.6)
 AC_SUBST(GCONF_CFLAGS)
 AC_SUBST(GCONF_LIBS)
@@ -54,16 +49,18 @@ AM_GLIB_GNU_GETTEXT
 ##################################################
 # Check for gtk-doc.
 ##################################################
+#ifdef(GTK_DOC_CHECK, GTK_DOC_CHECK([1.0]))
 GTK_DOC_CHECK([1.0])
 
 AC_CHECK_PROG(DOXYGEN_FOUND, doxygen, yes, no)
 AM_CONDITIONAL(HAVE_DOXYGEN, [test "$DOXYGEN_FOUND" = "yes"])
 
 localedir=${datadir}/locale
-outomoduledir=${libdir}/outo
+#outomoduledir=${libdir}/outo
 
 AC_SUBST(localedir)
-AC_SUBST(outomoduledir)
+
+#AC_SUBST(outomoduledir)
 
 
 # Disable rebuild of glib-mkenum -generated source code:
@@ -84,9 +81,21 @@ AC_SUBST(REBUILD)
 
 AC_OUTPUT(Makefile \
        hildon-widgets/Makefile \
-        timer/Makefile \
-       ut/Makefile \
+       hildon-widgets-plugins/Makefile \
+       timer/Makefile \
        po/Makefile \
        po/porules.mk \
        doc/Makefile \
        hildon-libs.pc)
+
+
+echo "
+######################################
+Configuration:
+
+- Version............: ${VERSION}
+- Compiler...........: ${CC}
+- gtk-doc support....: ${enable_gtk_doc}
+
+######################################
+"