| 0 | |
From 2bc1a19aa4f11448eed3bacc38642b5da8d8b0f5 Mon Sep 17 00:00:00 2001
|
| 1 | |
From: Laurent Bigonville <bigon@bigon.be>
|
| 2 | |
Date: Fri, 19 Aug 2011 14:55:25 +0200
|
| 3 | |
Subject: [PATCH] Fix call-event.h detection
|
| 4 | |
|
| 5 | |
Correctly set the LDFLAGS from EMPATHY_LDFLAGS so AC_CHECK_HEADER can
|
| 6 | |
find call-event.h
|
| 7 | |
---
|
| 8 | |
configure.ac | 3 +++
|
| 9 | |
1 files changed, 3 insertions(+), 0 deletions(-)
|
| 10 | |
|
| 11 | |
--- a/configure.ac
|
| 12 | |
+++ b/configure.ac
|
| 13 | |
@@ -226,14 +226,17 @@
|
| 14 | |
if test "x$enable_call_logs" != "xno" ; then
|
| 15 | |
SAVE_CFLAGS=$CFLAGS
|
| 16 | |
SAVE_CPPFLAGS=$CPPFLAGS
|
| 17 | |
+ SAVE_LDFLAGS=$LDFLAGS
|
| 18 | |
CFLAGS="$CFLAGS $EMPATHY_CFLAGS"
|
| 19 | |
CPPFLAGS="$CPPFLAGS $EMPATHY_CFLAGS"
|
| 20 | |
+ LDFLAGS="$LDFLAGS $EMPATHY_LDFLAGS"
|
| 21 | |
|
| 22 | |
AC_CHECK_HEADER(telepathy-logger/call-event.h,
|
| 23 | |
have_call_logs="yes", have_call_logs="no")
|
| 24 | |
|
| 25 | |
CFLAGS=$SAVE_CFLAGS
|
| 26 | |
CPPFLAGS=$SAVE_CPPFLAGS
|
| 27 | |
+ LDFLAGS=$SAVE_LDFLAGS
|
| 28 | |
|
| 29 | |
if test "x$have_call_logs" = "xyes"; then
|
| 30 | |
AC_DEFINE(HAVE_CALL_LOGS, 1, [Define if you have call log support])
|
| 31 | |
--- a/configure
|
| 32 | |
+++ b/configure
|
| 33 | |
@@ -15093,11 +15101,13 @@
|
| 34 | |
if test "x$enable_call_logs" != "xno" ; then
|
| 35 | |
SAVE_CFLAGS=$CFLAGS
|
| 36 | |
SAVE_CPPFLAGS=$CPPFLAGS
|
| 37 | |
+ SAVE_LDFLAGS=$LDFLAGS
|
| 38 | |
CFLAGS="$CFLAGS $EMPATHY_CFLAGS"
|
| 39 | |
CPPFLAGS="$CPPFLAGS $EMPATHY_CFLAGS"
|
| 40 | |
+ LDFLAGS="$LDFLAGS $EMPATHY_LDFLAGS"
|
| 41 | |
|
| 42 | |
ac_fn_c_check_header_mongrel "$LINENO" "telepathy-logger/call-event.h" "ac_cv_header_telepathy_logger_call_event_h" "$ac_includes_default"
|
| 43 | |
-if test "x$ac_cv_header_telepathy_logger_call_event_h" = x""yes; then :
|
| 44 | |
+if test "x$ac_cv_header_telepathy_logger_call_event_h" = xyes; then :
|
| 45 | |
have_call_logs="yes"
|
| 46 | |
else
|
| 47 | |
have_call_logs="no"
|
| 48 | |
@@ -15107,6 +15117,7 @@
|
| 49 | |
|
| 50 | |
CFLAGS=$SAVE_CFLAGS
|
| 51 | |
CPPFLAGS=$SAVE_CPPFLAGS
|
| 52 | |
+ LDFLAGS=$SAVE_LDFLAGS
|
| 53 | |
|
| 54 | |
if test "x$have_call_logs" = "xyes"; then
|
| 55 | |
|