diff -purN gtk+-2.20.1.orig/configure gtk+-2.20.1/configure --- gtk+-2.20.1.orig/configure 2010-10-29 09:33:42.000000000 +0200 +++ gtk+-2.20.1/configure 2010-10-29 12:03:19.000000000 +0200 @@ -22817,8 +22817,14 @@ fi GDK_PIXBUF_PACKAGES="gmodule-no-export-2.0 gobject-2.0 gio-2.0" GDK_PIXBUF_EXTRA_LIBS="$STATIC_LIB_DEPS $MATH_LIB $MEDIA_LIB" GDK_PIXBUF_EXTRA_CFLAGS= -GDK_PIXBUF_DEP_LIBS="`$PKG_CONFIG --libs $GDK_PIXBUF_PACKAGES` $GDK_PIXBUF_EXTRA_LIBS" -GDK_PIXBUF_DEP_CFLAGS="`$PKG_CONFIG --cflags gthread-2.0 $GDK_PIXBUF_PACKAGES $PNG_DEP_CFLAGS_PACKAGES` $GDK_PIXBUF_EXTRA_CFLAGS" + +if test "$cross_compiling" = "yes"; then + GDK_PIXBUF_DEP_LIBS=$GDK_PIXBUF_DEP_LIBS + GDK_PIXBUF_DEP_CFLAGS=$GDK_PIXBUF_DEP_CFLAGS +else + GDK_PIXBUF_DEP_LIBS="`$PKG_CONFIG --libs $GDK_PIXBUF_PACKAGES` $GDK_PIXBUF_EXTRA_LIBS" + GDK_PIXBUF_DEP_CFLAGS="`$PKG_CONFIG --cflags gthread-2.0 $GDK_PIXBUF_PACKAGES $PNG_DEP_CFLAGS_PACKAGES` $GDK_PIXBUF_EXTRA_CFLAGS" +fi ######################################## # Windowing system checks @@ -22842,15 +22848,27 @@ if test "x$gdktarget" = "xx11"; then # We use fontconfig very peripherally when decoding the default # settings. # - if $PKG_CONFIG --exists fontconfig; then : ; else - as_fn_error " + if test "$cross_compiling" != "yes"; then + if $PKG_CONFIG --exists fontconfig; then : ; else + as_fn_error " *** fontconfig (http://www.fontconfig.org) is required by the X11 backend." "$LINENO" 5 + fi fi # # Check for basic X packages; we use pkg-config if available # - if $PKG_CONFIG --exists x11 xext xrender; then + + # on crosscompiling we assumed x11, xext and xrender installed + if test "$cross_compiling" = "yes"; then + have_base_x_pc=true + X_PACKAGES="$X_PACKAGES x11 xext xrender" # X_PACKAGES="fontconfig x11 xext xrender" + x_libs="$X_LIBS" + X_CFLAGS="$X_CFLAGS" + x_libs_for_checks="$x_libs_for_checks $x_libs" + GDK_PIXBUF_XLIB_PACKAGES="x11" + GDK_PACKAGES_FOR_X="x11" + elif $PKG_CONFIG --exists x11 xext xrender; then have_base_x_pc=true X_PACKAGES="$X_PACKAGES x11 xext xrender" x_libs="`$PKG_CONFIG --libs x11 xext xrender`" @@ -23992,7 +24010,6 @@ $as_echo "no" >&6; } $as_echo "#define XINPUT_XFREE 1" >>confdefs.h - if $PKG_CONFIG --exists xi ; then X_PACKAGES="$X_PACKAGES xi" else @@ -24016,6 +24033,14 @@ else XINPUT_XFREE_FALSE= fi +# on crosscompilation we assumed xrandr, xcursor, xfixes installed +if test "$cross_compiling" = "yes"; then + X_PACKAGES="$X_PACKAGES xrandr xcursor xfixes" + GTK_PACKAGES_FOR_X="$GTK_PACKAGES_FOR_X xrandr xcursor xfixes" + $as_echo "#define HAVE_RANDR 1" >>confdefs.h + $as_echo "#define HAVE_XCURSOR 1" >>confdefs.h + $as_echo "#define HAVE_XFIXES 1" >>confdefs.h +else # Check for the RANDR extension if $PKG_CONFIG --exists "xrandr >= 1.2.99" ; then @@ -24069,6 +24094,8 @@ $as_echo "#define HAVE_XDAMAGE 1" >>conf GTK_PACKAGES_FOR_X="$GTK_PACKAGES_FOR_X xdamage" fi +fi + if $have_base_x_pc ; then GDK_EXTRA_LIBS="$x_extra_libs" else @@ -24157,9 +24184,13 @@ fi fi -GDK_PIXBUF_XLIB_DEP_LIBS="`$PKG_CONFIG --libs $GDK_PIXBUF_PACKAGES $GDK_PIXBUF_XLIB_PACKAGES` $GDK_PIXBUF_XLIB_EXTRA_LIBS $GDK_PIXBUF_EXTRA_LIBS" -GDK_PIXBUF_XLIB_DEP_CFLAGS="`$PKG_CONFIG --cflags gthread-2.0 $GDK_PIXBUF_PACKAGES $GDK_PIXBUF_XLIB_PACKAGES` $GDK_PIXBUF_EXTRA_CFLAGS $GDK_PIXBUF_XLIB_EXTRA_CFLAGS" - +if test "$cross_compiling" = "yes"; then + GDK_PIXBUF_XLIB_DEP_LIBS="$GDK_PIXBUF_XLIB_DEP_LIBS" + GDK_PIXBUF_XLIB_DEP_CFLAGS="$GDK_PIXBUF_XLIB_DEP_CFLAGS" +else + GDK_PIXBUF_XLIB_DEP_LIBS="`$PKG_CONFIG --libs $GDK_PIXBUF_PACKAGES $GDK_PIXBUF_XLIB_PACKAGES` $GDK_PIXBUF_XLIB_EXTRA_LIBS $GDK_PIXBUF_EXTRA_LIBS" + GDK_PIXBUF_XLIB_DEP_CFLAGS="`$PKG_CONFIG --cflags gthread-2.0 $GDK_PIXBUF_PACKAGES $GDK_PIXBUF_XLIB_PACKAGES` $GDK_PIXBUF_EXTRA_CFLAGS $GDK_PIXBUF_XLIB_EXTRA_CFLAGS" +fi @@ -24287,7 +24318,14 @@ fi { $as_echo "$as_me:${as_lineno-$LINENO}: checking Pango flags" >&5 $as_echo_n "checking Pango flags... " >&6; } -if $PKG_CONFIG --exists $PANGO_PACKAGES ; then +if test "$cross_compiling" = "yes"; then + PANGO_CFLAGS="$PANGO_CFLAGS" + PANGO_LIBS="$PANGO_LIBS" + + { $as_echo "$as_me:${as_lineno-$LINENO}: result: $PANGO_CFLAGS $PANGO_LIBS" >&5 +$as_echo "$PANGO_CFLAGS $PANGO_LIBS" >&6; } + +elif $PKG_CONFIG --exists $PANGO_PACKAGES ; then PANGO_CFLAGS=`$PKG_CONFIG --cflags $PANGO_PACKAGES` PANGO_LIBS=`$PKG_CONFIG --libs $PANGO_PACKAGES` @@ -24302,8 +24340,10 @@ fi CFLAGS="$CFLAGS $PANGO_CFLAGS" -if $PKG_CONFIG --uninstalled $PANGO_PACKAGES; then - : +if test "$cross_compiling" = "yes"; then + : +elif $PKG_CONFIG --uninstalled $PANGO_PACKAGES; then + : else gtk_save_LIBS="$LIBS" LIBS="$PANGO_LIBS $LIBS" @@ -24347,8 +24387,13 @@ else GDK_PACKAGES="$PANGO_PACKAGES $X_PACKAGES cairo-$cairo_backend" fi -GDK_DEP_LIBS="$GDK_EXTRA_LIBS `$PKG_CONFIG --libs $GDK_PIXBUF_PACKAGES $GDK_PACKAGES` $GDK_PIXBUF_EXTRA_LIBS" -GDK_DEP_CFLAGS="`$PKG_CONFIG --cflags gthread-2.0 $GDK_PIXBUF_PACKAGES $GDK_PACKAGES` $GDK_PIXBUF_EXTRA_CFLAGS $GDK_EXTRA_CFLAGS" +if test "$cross_compiling" = "yes"; then + GDK_DEP_LIBS="$GDK_DEP_LIBS" + GDK_DEP_CFLAGS="$GDK_DEP_CFLAGS" +else + GDK_DEP_LIBS="$GDK_EXTRA_LIBS `$PKG_CONFIG --libs $GDK_PIXBUF_PACKAGES $GDK_PACKAGES` $GDK_PIXBUF_EXTRA_LIBS" + GDK_DEP_CFLAGS="`$PKG_CONFIG --cflags gthread-2.0 $GDK_PIXBUF_PACKAGES $GDK_PACKAGES` $GDK_PIXBUF_EXTRA_CFLAGS $GDK_EXTRA_CFLAGS" +fi # # If we aren't writing explicit dependencies, then don't put the extra libraries we need # into the pkg-config files @@ -24372,7 +24417,10 @@ fi ATK_PACKAGES=atk { $as_echo "$as_me:${as_lineno-$LINENO}: checking ATK flags" >&5 $as_echo_n "checking ATK flags... " >&6; } -if $PKG_CONFIG --exists $ATK_PACKAGES ; then +if test "$cross_compiling" = "yes"; then + ATK_CFLAGS="$ATK_CFLAGS" + ATK_LIBS="$ATK_LIBS" +elif $PKG_CONFIG --exists $ATK_PACKAGES ; then ATK_CFLAGS=`$PKG_CONFIG --cflags $ATK_PACKAGES` ATK_LIBS=`$PKG_CONFIG --libs $ATK_PACKAGES` @@ -24385,8 +24433,10 @@ else " "$LINENO" 5 fi -if $PKG_CONFIG --uninstalled $ATK_PACKAGES; then - : +if test "$cross_compiling" = "yes"; then + : +elif $PKG_CONFIG --uninstalled $ATK_PACKAGES; then + : else gtk_save_LIBS="$LIBS" LIBS="$ATK_LIBS $LIBS" @@ -24426,17 +24476,30 @@ if test "x$gdktarget" = "xx11"; then fi GTK_EXTRA_LIBS= GTK_EXTRA_CFLAGS= -GTK_DEP_LIBS="$GDK_EXTRA_LIBS $GTK_DEP_LIBS_FOR_X `$PKG_CONFIG --libs $GDK_PIXBUF_PACKAGES $PANGO_PACKAGES $GTK_PACKAGES_FOR_X $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" + +if test "$cross_compiling" = "yes"; then + GTK_DEP_LIBS="$GDK_EXTRA_LIBS $GTK_DEP_LIBS_FOR_X $GDK_LIBS" + GTK_DEP_CFLAGS="$GTK_DEP_CFLAGS" +else + GTK_DEP_LIBS="$GDK_EXTRA_LIBS $GTK_DEP_LIBS_FOR_X `$PKG_CONFIG --libs $GDK_PIXBUF_PACKAGES $PANGO_PACKAGES $GTK_PACKAGES_FOR_X $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" +fi if test x"$os_win32" = xyes; then GTK_EXTRA_CFLAGS="$msnative_struct" fi -GLIB_PREFIX="`$PKG_CONFIG --variable=prefix glib-2.0`" -ATK_PREFIX="`$PKG_CONFIG --variable=prefix atk`" -PANGO_PREFIX="`$PKG_CONFIG --variable=prefix pango`" -CAIRO_PREFIX="`pkg-config --variable=prefix cairo`" +if test "$cross_compiling" = "yes"; then + GLIB_PREFIX="$GLIB_PREFIX" + ATK_PREFIX="$ATK_PREFIX" + PANGO_PREFIX="$PANGO_PREFIX" + CAIRO_PREFIX="$CAIRO_PREFIX" +else + GLIB_PREFIX="`$PKG_CONFIG --variable=prefix glib-2.0`" + ATK_PREFIX="`$PKG_CONFIG --variable=prefix atk`" + PANGO_PREFIX="`$PKG_CONFIG --variable=prefix pango`" + CAIRO_PREFIX="`pkg-config --variable=prefix cairo`" +fi if test $enable_explicit_deps != yes ; then GDK_PIXBUF_EXTRA_LIBS=