projects
/
hildon
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Set the window menu flag for application-common menus
[hildon]
/
configure.ac
diff --git
a/configure.ac
b/configure.ac
index
8726b90
..
bd497e9
100644
(file)
--- a/
configure.ac
+++ b/
configure.ac
@@
-1,8
+1,8
@@
-AC_INIT([Hildon gtk widgets], [2.1.50], [hildon@projects.maemo.org], [hildon])
+AC_INIT([Hildon gtk widgets], [2.2.0], [hildon@projects.maemo.org], [hildon])
AC_CANONICAL_SYSTEM
AM_CONFIG_HEADER(config.h)
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
AC_CONFIG_MACRO_DIR([m4])
AM_MAINTAINER_MODE
@@
-36,7
+36,7
@@
AC_PROG_AWK
AC_HEADER_STDC
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)
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
# 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 \
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 \
pkgconfig/Makefile \
examples/Makefile \
pkgconfig/hildon.pc \