| Patrick Williams | d8c66bc | 2016-06-20 12:57:21 -0500 | [diff] [blame] | 1 | From 5e5350d730f85957a42c6d846d347d080e7dd996 Mon Sep 17 00:00:00 2001 |
| 2 | From: Alexander Kanavin <alex.kanavin@gmail.com> |
| 3 | Date: Fri, 23 Oct 2015 12:40:34 +0300 |
| 4 | Subject: [PATCH] configure.ac: add sysroot path to GI_DATADIR; don't set |
| 5 | introspection scanner and compiler paths |
| 6 | |
| 7 | Upstream-Status: Pending [review on oe-core maillist] |
| 8 | Signed-off-by: Alexander Kanavin <alex.kanavin@gmail.com> |
| 9 | --- |
| 10 | configure.ac | 8 +------- |
| 11 | 1 file changed, 1 insertion(+), 7 deletions(-) |
| 12 | |
| 13 | diff --git a/configure.ac b/configure.ac |
| 14 | index 2c0cfbd..cfcb3bf 100644 |
| 15 | --- a/configure.ac |
| 16 | +++ b/configure.ac |
| 17 | @@ -194,7 +194,7 @@ PKG_CHECK_MODULES(GI, |
| 18 | gobject-introspection-1.0 >= introspection_required_version |
| 19 | ) |
| 20 | |
| 21 | -GI_DATADIR=$($PKG_CONFIG --variable=gidatadir gobject-introspection-1.0) |
| 22 | +GI_DATADIR=$PKG_CONFIG_SYSROOT_DIR$($PKG_CONFIG --variable=gidatadir gobject-introspection-1.0) |
| 23 | AC_SUBST(GI_DATADIR) |
| 24 | |
| 25 | if test "$enable_cairo" != no; then |
| 26 | @@ -219,12 +219,6 @@ AC_ARG_WITH(common, |
| 27 | with_common=yes) |
| 28 | AM_CONDITIONAL(WITH_COMMON, test "$with_common" = "yes") |
| 29 | |
| 30 | -INTROSPECTION_SCANNER=`$PKG_CONFIG --variable=g_ir_scanner gobject-introspection-1.0` |
| 31 | -INTROSPECTION_COMPILER=`$PKG_CONFIG --variable=g_ir_compiler gobject-introspection-1.0` |
| 32 | - |
| 33 | -AC_SUBST(INTROSPECTION_SCANNER) |
| 34 | -AC_SUBST(INTROSPECTION_COMPILER) |
| 35 | - |
| 36 | # compiler warnings, errors, required cflags, and code coverage support |
| 37 | GNOME_COMPILE_WARNINGS([maximum]) |
| 38 | AC_MSG_CHECKING(for Gnome code coverage support) |
| 39 | -- |
| 40 | 2.1.4 |
| 41 | |