2006-09-21 Tommi Komulainen <tommi.komulainen@nokia.com>

[hildon] / configure.ac

diff --git a/configure.ac b/configure.ac
index 39c0605..fcb8d6e 100644 (file)
--- a/configure.ac
+++ b/configure.ac
@@ -1,5 +1,5 @@
 AC_INIT(Makefile.am)
-AM_INIT_AUTOMAKE(hildon-libs, 0.12.9)
+AM_INIT_AUTOMAKE(hildon-libs, 0.14.3)
 AM_CONFIG_HEADER(config.h)
 
 AC_CANONICAL_HOST
@@ -11,15 +11,17 @@ AC_PROG_AWK
 AC_PROG_LIBTOOL
 
 AC_HEADER_STDC
-PKG_CHECK_MODULES(OUTO, outo >= 0.1.1)
-AC_SUBST(OUTO_CFLAGS)
+
+
+#PKG_CHECK_MODULES(OUTO, outo >= 0.1.1)
+#AC_SUBST(OUTO_CFLAGS)
 
 CFLAGS="$CFLAGS -std=c99 -Wall -pedantic -Wmissing-prototypes -Wmissing-declarations"
 # -Werror disabled due to the flaw in glib-2.0
 # See http://bugzilla.gnome.org/show_bug.cgi?id=310175 and
 # http://bugzilla.gnome.org/show_bug.cgi?id=310216
 
-GTK_VERSION=2.6.4
+GTK_VERSION=2.6.10
 
 PKG_CHECK_MODULES(GTK, gtk+-2.0)
 AC_SUBST(GTK_LIBS)
@@ -32,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)
@@ -52,22 +49,53 @@ 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:
+AC_ARG_ENABLE(rebuilds, [  --disable-rebuilds      disable all source autogeneration rules],,enable_rebuilds=yes)
+
+# define a MAINT-like variable REBUILD which is set if Perl
+# is found, so autogenerated sources can be rebuilt
+AC_CHECK_PROGS(PERL, perl5 perl)
+
+REBUILD=\#
+if test "x$enable_rebuilds" = "xyes" && \
+     test -n "$PERL" && \
+     $PERL -e 'exit !($] >= 5.002)' > /dev/null 2>&1 ; then
+  REBUILD=
+fi
+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}
+
+######################################
+"