| Patrick Williams | b48b7b4 | 2016-08-17 15:04:38 -0500 | [diff] [blame^] | 1 | From 2c73b588b9018cb59c666eae3a15fa1af42c56be Mon Sep 17 00:00:00 2001 |
| 2 | From: Martin Jansa <Martin.Jansa@gmail.com> |
| 3 | Date: Sun, 4 Aug 2013 10:57:08 +0200 |
| 4 | Subject: [PATCH 4/5] configure: Fix libical pkg-config trying to use host |
| 5 | paths |
| 6 | |
| 7 | Signed-off-by: Martin Jansa <Martin.Jansa@gmail.com> |
| 8 | --- |
| 9 | calendar/libecal/libecal.pc.in | 2 +- |
| 10 | configure.ac | 3 ++- |
| 11 | 2 files changed, 3 insertions(+), 2 deletions(-) |
| 12 | |
| 13 | diff --git a/calendar/libecal/libecal.pc.in b/calendar/libecal/libecal.pc.in |
| 14 | index fc6b359..d3435bb 100644 |
| 15 | --- a/calendar/libecal/libecal.pc.in |
| 16 | +++ b/calendar/libecal/libecal.pc.in |
| 17 | @@ -12,4 +12,4 @@ Description: Client library for evolution calendars |
| 18 | Version: @VERSION@ |
| 19 | Requires: libical >= @LIBICAL_REQUIRED@ libedataserver-1.2 gio-2.0 |
| 20 | Libs: -L${libdir} -lecal-1.2 |
| 21 | -Cflags: -I${privincludedir} @LIBICAL_EXTRA_CFLAGS@ |
| 22 | +Cflags: -I${privincludedir} |
| 23 | diff --git a/configure.ac b/configure.ac |
| 24 | index 1c802ff..f1d4ce8 100644 |
| 25 | --- a/configure.ac |
| 26 | +++ b/configure.ac |
| 27 | @@ -1351,7 +1351,8 @@ dnl to differentiate between <libical/ical.h> and <ical.h> |
| 28 | dnl We have fixed all our instances to use <libical/ical.h>. Until the .pc from |
| 29 | dnl libical is fixed, we have to work-around the buggy CFlags. |
| 30 | dnl ***** |
| 31 | - LIBICAL_EXTRA_CFLAGS=" -I`$PKG_CONFIG --variable=includedir libical` " |
| 32 | + m4_pattern_allow([^PKG_CONFIG_SYSROOT_DIR$]) |
| 33 | + LIBICAL_EXTRA_CFLAGS=" -I$PKG_CONFIG_SYSROOT_DIR`$PKG_CONFIG --variable=includedir libical` " |
| 34 | LIBICAL_EXTRA_LIBS="" |
| 35 | AC_SUBST(LIBICAL_EXTRA_CFLAGS) |
| 36 | AC_SUBST(LIBICAL_EXTRA_LIBS) |
| 37 | -- |
| 38 | 1.8.3.2 |
| 39 | |