35 lines
1.2 KiB
Diff
35 lines
1.2 KiB
Diff
Description: Don't query immodules for the local tree when cross-compiling or
|
|
when --disable-shared was given
|
|
Bug: http://bugzilla.gnome.org/show_bug.cgi?id=346531
|
|
|
|
Index: gtk+3.0-2.90.5/configure.ac
|
|
===================================================================
|
|
--- gtk+3.0-2.90.5.orig/configure.ac 2010-07-10 03:00:32.000000000 +0200
|
|
+++ gtk+3.0-2.90.5/configure.ac 2010-07-30 12:46:09.735086524 +0200
|
|
@@ -188,6 +188,8 @@
|
|
# Create libtool early, because it's used in configure
|
|
LT_OUTPUT
|
|
|
|
+AM_CONDITIONAL([ENABLE_STATIC], [test "$enable_static" = yes])
|
|
+
|
|
# Make sure we use 64-bit versions of various file stuff.
|
|
AC_SYS_LARGEFILE
|
|
|
|
Index: gtk+3.0-2.90.5/modules/input/Makefile.am
|
|
===================================================================
|
|
--- gtk+3.0-2.90.5.orig/modules/input/Makefile.am 2010-06-30 13:37:21.000000000 +0200
|
|
+++ gtk+3.0-2.90.5/modules/input/Makefile.am 2010-07-30 12:45:30.532083145 +0200
|
|
@@ -176,8 +176,12 @@
|
|
if CROSS_COMPILING
|
|
RUN_QUERY_IMMODULES_TEST=false
|
|
else
|
|
+if ENABLE_STATIC
|
|
+RUN_QUERY_IMMODULES_TEST=false
|
|
+else
|
|
RUN_QUERY_IMMODULES_TEST=test -z "$(DESTDIR)"
|
|
endif
|
|
+endif
|
|
|
|
# Running this if cross compiling or if DESTDIR is set is going to
|
|
# not work at all, so skip it.
|