X-Git-Url: https://vcs.maemo.org/git/?a=blobdiff_plain;f=configure.ac;h=1ddc780a52c74ee9e1e6fce30a0a276ea0b72d34;hb=b4622db080bb1dba5de61ece8bbcf8c7b992b218;hp=8ee63b9254fe66af87af9faf258a5c38c0b890b7;hpb=f855508f0cfee1caf0b5e00eace0f025f6fc28a1;p=hildon

diff --git a/configure.ac b/configure.ac
index 8ee63b9..1ddc780 100644
--- a/configure.ac
+++ b/configure.ac
@@ -1,8 +1,8 @@
-AC_INIT([Hildon gtk widgets], [2.1.17], [hildon@projects.maemo.org], [hildon])
+AC_INIT([Hildon gtk widgets], [2.1.87], [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
 
@@ -25,17 +25,18 @@ AC_SUBST(API_VERSION_MAJOR)
 #    increment current, and set revision to 0.
 # 5. If any interfaces have been added since the last public release, then increment age.
 # 6. If any interfaces have been removed since the last public release, then set age to 0.  
-AS_LIBTOOL(HILDON, 18, 1, 18)
+AS_LIBTOOL(HILDON, 18, 7, 18)
 AM_INIT_AUTOMAKE
 
 AC_PROG_CC
+AM_PROG_CC_C_O
 AM_PROG_LIBTOOL
 AC_PROG_INSTALL
 AC_PROG_AWK
 
 AC_HEADER_STDC
 
-GTK_VERSION=2.12.9
+GTK_VERSION=2.14.3
 
 PKG_CHECK_MODULES(GTK, gtk+-2.0 >= $GTK_VERSION)
 AC_SUBST(GTK_LIBS)
@@ -113,7 +114,8 @@ AM_CONDITIONAL(USE_MAEMO_GTK, test "x$USE_MAEMO_GTK" = "xyes")
 # just print out our status
 if test x$USE_MAEMO_GTK = xyes; then
     AC_MSG_NOTICE(Will use Maemo GTK+ specific API)
-    AC_DEFINE(MAEMO_GTK, [], [Whether to use Maemo GTK+ specific API])
+    MAEMO_GTK="-DMAEMO_GTK"
+    AC_SUBST(MAEMO_GTK)
     MAEMO_CHANGES="-DMAEMO_CHANGES"
     AC_SUBST(MAEMO_CHANGES)
 else
@@ -170,6 +172,8 @@ if test x$enable_deprecated = xno; then
     DISABLE_DEPRECATED="-DHILDON_DISABLE_DEPRECATED"
 fi
 
+AM_CONDITIONAL([HILDON_DISABLE_DEPRECATED], test "x$enable_deprecated" = "xno")
+
 # Check support (c unit test)
 PKG_CHECK_MODULES(CHECK, check , [BUILD_TESTS="yes"], [BUILD_TESTS="no"])
 AM_CONDITIONAL(BUILD_TESTS, test "x$BUILD_TESTS" = "xyes")
@@ -178,23 +182,24 @@ CFLAGS="$CFLAGS ${ASSERT_CFLAGS} -Wall -Wmissing-prototypes -Wmissing-declaratio
 # -Wno-format due to way translation string are done
 
 ### disable deprecated symbols
-CFLAGS="$CFLAGS $DISABLE_DEPRECATED"
+EXTRA_CFLAGS="$DISABLE_DEPRECATED"
+AC_SUBST(EXTRA_CFLAGS)
 
 ### enable MAEMO platform extensions
-CFLAGS="$CFLAGS $MAEMO_CHANGES"
+CFLAGS="$CFLAGS $MAEMO_CHANGES $MAEMO_GTK"
 
 # HILDON_OBJ_*
 # 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    \