diff options
| author | Ross Burton <ross.burton@intel.com> | 2013-01-07 12:49:27 +0000 |
|---|---|---|
| committer | Ross Burton <ross.burton@intel.com> | 2013-01-10 15:00:32 +0000 |
| commit | 53083ea7b423482b203372f02d097edbef894a7d (patch) | |
| tree | 22f50ca9e5d090c879c65283b1ec4f52a7f18f07 /configure.ac | |
| parent | befde1f7de4eda9e9998eb15826a0d8286bfb138 (diff) | |
| download | gtk+-53083ea7b423482b203372f02d097edbef894a7d.tar.gz | |
build: support cross-compilation by natively building gtk-update-icon-cache
When cross-compiling, instead of depending on a natively built GTK+ (which means
building Glib, ATK, Pango, gdk-pixbuf, libX11...) for gtk-update-icon-cache,
find the host compiler and gdk-pixbuf, and build another gtk-update-icon-cache
with that.
This uses AX_PROG_CC_FOR_BUILD from autostars to find the host compiler, and
assumes that you'd set PKG_CONFIG_FOR_BUILD to a host pkg-config binary.
https://bugzilla.gnome.org/show_bug.cgi?id=691301
Diffstat (limited to 'configure.ac')
| -rw-r--r-- | configure.ac | 39 |
1 files changed, 30 insertions, 9 deletions
diff --git a/configure.ac b/configure.ac index 88e8130733..f7b3ab8d3d 100644 --- a/configure.ac +++ b/configure.ac @@ -29,6 +29,9 @@ AC_CONFIG_SRCDIR([gdk/gdktypes.h]) AC_CONFIG_MACRO_DIR([m4]) AC_CONFIG_AUX_DIR([build-aux]) +AC_CANONICAL_HOST +AC_CANONICAL_TARGET + # Define a string for the earliest version that this release has # backwards binary compatibility with for all interfaces a module # might. Unless we add module-only API with lower stability @@ -123,6 +126,7 @@ AC_SUBST([GAIL_LT_CURRENT_MINUS_AGE],[gail_lt_current_minus_age]) # Checks for programs. AC_PROG_CC +AX_PROG_CC_FOR_BUILD AC_PROG_CC_C_O AC_PROG_MKDIR_P AC_PROG_INSTALL @@ -134,8 +138,6 @@ AC_SUBST(GETTEXT_PACKAGE) AC_DEFINE_UNQUOTED(GETTEXT_PACKAGE, "$GETTEXT_PACKAGE", [The prefix for our gettext translation domains.]) -AC_CANONICAL_HOST - MATH_LIB=-lm AC_MSG_CHECKING([for native Win32]) LIB_EXE_MACHINE_FLAG=X86 @@ -905,14 +907,32 @@ dnl Look for a host system's gdk-pixbuf-csource if we are cross-compiling AM_CONDITIONAL(CROSS_COMPILING, test $cross_compiling = yes) -if test "x$cross_compiling" = xyes || test "x$enable_gtk2_dependency" = xyes; then - AC_PATH_PROG(GTK_UPDATE_ICON_CACHE, gtk-update-icon-cache, no) - if test x$GTK_UPDATE_ICON_CACHE = xno; then - REBUILD_PNGS=# - fi -fi +AS_IF([test "x$enable_gtk2_dependency" = xyes], + [AC_PATH_PROG(GTK_UPDATE_ICON_CACHE, gtk-update-icon-cache, no) + if test x$GTK_UPDATE_ICON_CACHE = xno; then + REBUILD_PNGS=# + fi], + + [test "x$cross_compiling" = xyes], + [# If no GTK+2 dependency and cross compiling, we need to find a host gdk-pixbuf. + # pkg.m4 blocks all variable starting with PKG, so allow this one + m4_pattern_allow([PKG_CONFIG_FOR_BUILD]) + + AS_IF([test x$PKG_CONFIG_FOR_BUILD = x], + [AC_MSG_ERROR([You must define PKG_CONFIG_FOR_BUILD when cross compiling])]) + + AC_MSG_CHECKING([for native gdk-pixbuf]) + AS_IF([AC_RUN_LOG([$PKG_CONFIG_FOR_BUILD --exists --print-errors gdk-pixbuf-2.0])], + [AC_MSG_RESULT([yes])], + [AC_MSG_ERROR([native gdk-pixbuf not found])]) + + NATIVE_GDKPIXBUF_CFLAGS=`$PKG_CONFIG_FOR_BUILD --cflags gdk-pixbuf-2.0` + NATIVE_GDKPIXBUF_LIBS=`$PKG_CONFIG_FOR_BUILD --libs gdk-pixbuf-2.0` + AC_SUBST(NATIVE_GDKPIXBUF_CFLAGS) + AC_SUBST(NATIVE_GDKPIXBUF_LIBS)] +) -AM_CONDITIONAL(USE_EXTERNAL_ICON_CACHE, [test "x$cross_compiling" = xyes || test "x$enable_gtk2_dependency" = xyes]) +AM_CONDITIONAL(USE_EXTERNAL_ICON_CACHE, [test "x$enable_gtk2_dependency" = xyes]) AC_PATH_PROG(GDK_PIXBUF_CSOURCE, gdk-pixbuf-csource, no) @@ -1787,6 +1807,7 @@ gtk/makefile.msc gtk/gtkversion.h gtk/gtk-win32.rc gtk/a11y/Makefile +gtk/native/Makefile gtk/tests/Makefile libgail-util/Makefile modules/Makefile |