| Patrick Williams | b48b7b4 | 2016-08-17 15:04:38 -0500 | [diff] [blame^] | 1 | From 8e158c16cd15fff08b42ed86edc55816d3387837 Mon Sep 17 00:00:00 2001 |
| 2 | From: Alexander Kanavin <alex.kanavin@gmail.com> |
| 3 | Date: Fri, 19 Feb 2016 16:04:24 +0200 |
| 4 | Subject: [PATCH] configure.ac: fix paths to introspection tools |
| 5 | |
| 6 | They need to be prefixed with $PKG_CONFIG_SYSROOT_DIR |
| 7 | |
| 8 | Signed-off-by: Alexander Kanavin <alex.kanavin@gmail.com> |
| 9 | --- |
| 10 | configure.ac | 8 ++++---- |
| 11 | 1 file changed, 4 insertions(+), 4 deletions(-) |
| 12 | |
| 13 | diff --git a/configure.ac b/configure.ac |
| 14 | index 6d2b747..3b28463 100644 |
| 15 | --- a/configure.ac |
| 16 | +++ b/configure.ac |
| 17 | @@ -706,9 +706,9 @@ if test "x$found_introspection" = "xyes"; then |
| 18 | dnl python where to find libgoffice, so you might also need to set |
| 19 | dnl LD_LIBRARY_PATH. |
| 20 | |
| 21 | - INTROSPECTION_SCANNER=`$PKG_CONFIG --variable=g_ir_scanner gobject-introspection-1.0` |
| 22 | - INTROSPECTION_COMPILER=`$PKG_CONFIG --variable=g_ir_compiler gobject-introspection-1.0` |
| 23 | - INTROSPECTION_GENERATE=`$PKG_CONFIG --variable=g_ir_generate gobject-introspection-1.0` |
| 24 | + INTROSPECTION_SCANNER=$PKG_CONFIG_SYSROOT_DIR`$PKG_CONFIG --variable=g_ir_scanner gobject-introspection-1.0` |
| 25 | + INTROSPECTION_COMPILER=$PKG_CONFIG_SYSROOT_DIR`$PKG_CONFIG --variable=g_ir_compiler gobject-introspection-1.0` |
| 26 | + INTROSPECTION_GENERATE=$PKG_CONFIG_SYSROOT_DIR`$PKG_CONFIG --variable=g_ir_generate gobject-introspection-1.0` |
| 27 | if test "x$INTROSPECTION_GIRDIR" = x; then |
| 28 | INTROSPECTION_GIRDIR=`$PKG_CONFIG --variable=girdir gobject-introspection-1.0` |
| 29 | fi |
| 30 | @@ -717,7 +717,7 @@ if test "x$found_introspection" = "xyes"; then |
| 31 | fi |
| 32 | INTROSPECTION_CFLAGS=`$PKG_CONFIG --cflags gobject-introspection-1.0` |
| 33 | INTROSPECTION_LIBS=`$PKG_CONFIG --libs gobject-introspection-1.0` |
| 34 | - INTROSPECTION_MAKEFILE=`$PKG_CONFIG --variable=datadir gobject-introspection-1.0`/gobject-introspection-1.0/Makefile.introspection |
| 35 | + INTROSPECTION_MAKEFILE=$PKG_CONFIG_SYSROOT_DIR`$PKG_CONFIG --variable=datadir gobject-introspection-1.0`/gobject-introspection-1.0/Makefile.introspection |
| 36 | else |
| 37 | INTROSPECTION_SCANNER= |
| 38 | INTROSPECTION_COMPILER= |
| 39 | -- |
| 40 | 2.7.0 |
| 41 | |