X-Git-Url: http://git.maemo.org/git/?a=blobdiff_plain;f=configure.ac;h=396a60db60bec0575e9fcd9d42445aa87b40dc8b;hb=5684ea57fada5d9a9f025f9acd5a5d2dbba55123;hp=c30f42b4caad3567ec3c4d76faa5292784ac2e25;hpb=5fc3c13fde4f3644cf031b74f16a5fc335687927;p=hildon

diff --git a/configure.ac b/configure.ac
index c30f42b..396a60d 100644
--- a/configure.ac
+++ b/configure.ac
@@ -1,8 +1,8 @@
-AC_INIT([Hildon gtk widgets], [2.1.56], [hildon@projects.maemo.org], [hildon])
+AC_INIT([Hildon gtk widgets], [2.1.96], [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)
@@ -49,10 +49,6 @@ PKG_CHECK_MODULES(CANBERRA, libcanberra)
 AC_SUBST(CANBERRA_LIBS)
 AC_SUBST(CANBERRA_CFLAGS)
 
-PKG_CHECK_MODULES(CANBERRAGTK, libcanberra-gtk)
-AC_SUBST(CANBERRAGTK_LIBS)
-AC_SUBST(CANBERRAGTK_CFLAGS)
-
 PKG_CHECK_MODULES(GCONF, gconf-2.0 >= 2.6)
 AC_SUBST(GCONF_CFLAGS)
 AC_SUBST(GCONF_LIBS)
@@ -196,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    \