diff options
| author | Richard Purdie <richard@openedhand.com> | 2005-09-02 11:50:01 +0000 |
|---|---|---|
| committer | Richard Purdie <richard@openedhand.com> | 2005-09-02 11:50:01 +0000 |
| commit | 95efeafc86f47592b37c44f2f7314324cc04250d (patch) | |
| tree | e60fe38e88d8e6cf42cf1311c5ada752b79a59c7 /openembedded/packages/gtk+/gtk+-2.6.4-1.osso7/configure.in.diff | |
| parent | 7755d9d194b42ea859096f805f2e22ae5b6e6281 (diff) | |
| download | openembedded-core-95efeafc86f47592b37c44f2f7314324cc04250d.tar.gz openembedded-core-95efeafc86f47592b37c44f2f7314324cc04250d.tar.bz2 openembedded-core-95efeafc86f47592b37c44f2f7314324cc04250d.tar.xz openembedded-core-95efeafc86f47592b37c44f2f7314324cc04250d.zip | |
Add gtk+, avahi, dbus-0.34 (.36 coming soon) and dependencies. Fix x11-common breakage.
git-svn-id: https://svn.o-hand.com/repos/poky@13 311d38ba-8fff-0310-9ca6-ca027cbcb966
Diffstat (limited to 'openembedded/packages/gtk+/gtk+-2.6.4-1.osso7/configure.in.diff')
| -rw-r--r-- | openembedded/packages/gtk+/gtk+-2.6.4-1.osso7/configure.in.diff | 53 |
1 files changed, 53 insertions, 0 deletions
diff --git a/openembedded/packages/gtk+/gtk+-2.6.4-1.osso7/configure.in.diff b/openembedded/packages/gtk+/gtk+-2.6.4-1.osso7/configure.in.diff new file mode 100644 index 000000000..8573b1173 --- /dev/null +++ b/openembedded/packages/gtk+/gtk+-2.6.4-1.osso7/configure.in.diff @@ -0,0 +1,53 @@ +--- gtk+-2.6.4/configure.in 2005-03-30 15:05:06.000000000 +0300 ++++ gtk+-2.6.4/configure.in 2005-03-30 15:07:36.000000000 +0300 +@@ -202,6 +202,15 @@ + [AC_HELP_STRING([--disable-visibility], + [don't use ELF visibility attributes])],, + [enable_visibility=yes]) ++# modification for Device to disable keyboard shortcuts ++AC_ARG_ENABLE(shortcuts, ++ [AC_HELP_STRING([--disable-shortcuts], ++ [disable keyboard shortcuts])],, ++ [enable_shortcuts=yes]) ++ ++if test "x$enable_shortcuts" = "xno"; then ++ GTK_EXTRA_CFLAGS="$GTK_EXTRA_CFLAGS -DDISABLE_KEYBOARD_SHORTCUTS" ++fi; + + AC_ARG_WITH(xinput, + [AC_HELP_STRING([--with-xinput=@<:@no/yes@:>@], [support XInput])]) +@@ -418,7 +427,7 @@ + # sure that both po/ and po-properties/ have .po files that correspond + # to your language. If you only add one to po/, the build will break + # in po-properties/. +-ALL_LINGUAS="af am ar az az_IR be bg bn br bs ca cs cy da de el en_CA en_GB es et eu fa fi fr ga gl gu he hi hr hu ia id is it ja ko li lt lv mi mk ml mn mr ms nb ne nl nn no nso pa pl pt pt_BR ro ru rw sk sl sq sr sr@ije sr@Latn sv ta th tk tr uk uz uz@Latn vi wa xh yi zh_CN zh_TW" ++ALL_LINGUAS="" + AM_GLIB_GNU_GETTEXT + LIBS="$LIBS $INTLLIBS" + AC_OUTPUT_COMMANDS([case "$CONFIG_FILES" in *po-properties/Makefile.in*) +@@ -1283,6 +1292,17 @@ + GDK_EXTRA_CFLAGS="`$PKG_CONFIG --cflags xfixes` $GDK_EXTRA_CFLAGS" + GDK_EXTRA_LIBS="`$PKG_CONFIG --libs xfixes` $GDK_EXTRA_LIBS" + fi ++ ++ # Checks for XFixes extension ++ ++ have_xfixes=false ++ PKG_CHECK_MODULES(XFIXES, xfixes, have_xfixes=true, :) ++ ++ if $have_xfixes ; then ++ AC_DEFINE(HAVE_XFIXES, 1, Have the XFIXES X extension) ++ GDK_EXTRA_CFLAGS="`$PKG_CONFIG --cflags xfixes` $GDK_EXTRA_CFLAGS" ++ GDK_EXTRA_LIBS="`$PKG_CONFIG --libs xfixes` $GDK_EXTRA_LIBS" ++ fi + + # Xshm checks + +@@ -1492,7 +1512,6 @@ + + GTK_PACKAGES=atk + GTK_EXTRA_LIBS= +-GTK_EXTRA_CFLAGS= + GTK_DEP_LIBS="$GDK_EXTRA_LIBS $GTK_DEP_LIBS_FOR_X `$PKG_CONFIG --libs $GDK_PIXBUF_PACKAGES $GDK_PACKAGES $GTK_PACKAGES` $GTK_EXTRA_LIBS $GDK_PIXBUF_EXTRA_LIBS" + GTK_DEP_CFLAGS="`$PKG_CONFIG --cflags gthread-2.0 $GDK_PIXBUF_PACKAGES $GDK_PACKAGES $GTK_PACKAGES` $GDK_PIXBUF_EXTRA_CFLAGS $GDK_EXTRA_CFLAGS $GTK_EXTRA_CFLAGS" + |