X-Git-Url: https://vcs.maemo.org/git/?a=blobdiff_plain;f=configure.ac;h=7dabfa229b6832a9e1fcc0496e14fcb2ea2d0574;hb=f7fe1ad2bf6bc3f2b2041eaf1716d72024b3b14f;hp=9acba212c8ba96c3214457577f67bc6732b9ac28;hpb=d7691907059df3989b2c401edb263315c988cbd3;p=hildon diff --git a/configure.ac b/configure.ac index 9acba21..7dabfa2 100644 --- a/configure.ac +++ b/configure.ac @@ -1,8 +1,8 @@ -AC_INIT([Hildon gtk widgets], [2.1.62], [hildon@projects.maemo.org], [hildon]) +AC_INIT([Hildon gtk widgets], [2.1.92], [hildon@projects.maemo.org], [hildon]) AC_CANONICAL_SYSTEM AM_CONFIG_HEADER(config.h) -AC_CONFIG_SRCDIR([src/hildon-window.h]) +AC_CONFIG_SRCDIR([hildon/hildon-window.h]) AC_CONFIG_MACRO_DIR([m4]) AM_MAINTAINER_MODE @@ -36,7 +36,7 @@ AC_PROG_AWK AC_HEADER_STDC -GTK_VERSION=2.12.12 +GTK_VERSION=2.14.3 PKG_CHECK_MODULES(GTK, gtk+-2.0 >= $GTK_VERSION) AC_SUBST(GTK_LIBS) @@ -192,14 +192,14 @@ CFLAGS="$CFLAGS $MAEMO_CHANGES $MAEMO_GTK" # default vars for the examples # includes all the low-level flags # FIXME Add esd and gconf flags -HILDON_OBJ_CFLAGS="\$(CFLAGS) \$(GTK_CFLAGS) \$(CHECK_CFLAGS) \$(GCONF_CFLAGS) -I\$(top_builddir)/src/" -HILDON_OBJ_LIBS="\$(top_builddir)/src/libhildon-\$(API_VERSION_MAJOR).la \$(GTK_LIBS) \$(GCONF_LIBS) \$(CHECK_LIBS) `pkg-config --libs gthread-2.0`" +HILDON_OBJ_CFLAGS="\$(CFLAGS) \$(GTK_CFLAGS) \$(CHECK_CFLAGS) \$(GCONF_CFLAGS) -I\$(top_builddir)/hildon/" +HILDON_OBJ_LIBS="\$(top_builddir)/hildon/libhildon-\$(API_VERSION_MAJOR).la \$(GTK_LIBS) \$(GCONF_LIBS) \$(CHECK_LIBS) `pkg-config --libs gthread-2.0`" AC_SUBST(HILDON_OBJ_CFLAGS) AC_SUBST(HILDON_OBJ_LIBS) AC_CONFIG_FILES([Makefile \ - src/Makefile \ - src/hildon-version.h \ + hildon/Makefile \ + hildon/hildon-version.h \ pkgconfig/Makefile \ examples/Makefile \ pkgconfig/hildon.pc \