[Pkg-telepathy-commits] [SCM] Empathy packaging branch, debian, updated. debian/3.1.4-1-8-gcbb6cd6

[Laurent Bigonville]

The following commit has been merged in the debian branch:
commit c40552edf84b8e8db0f5af742a7e84816e47540d
Author: Laurent Bigonville <bigon at bigon.be>
Date:   Fri Aug 19 16:14:32 2011 +0200

    debian/patches/0001-Fix-call-event.h-detection.patch: Fix call-event.h detection

diff --git a/debian/changelog b/debian/changelog
index 0118e9f..0e323a3 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -8,8 +8,10 @@ empathy (3.1.5-1) UNRELEASED; urgency=low
   * debian/rules:
     - Only enable gudev support on linux architectures
     - Enable build-time geoclue support on Hurd
+  * debian/patches/0001-Fix-call-event.h-detection.patch: Fix call-event.h
+    detection
 
- -- Laurent Bigonville <bigon at debian.org>  Fri, 19 Aug 2011 05:35:30 +0200
+ -- Laurent Bigonville <bigon at debian.org>  Fri, 19 Aug 2011 16:14:12 +0200
 
 empathy (3.1.4-1) experimental; urgency=low
 
diff --git a/debian/patches/0001-Fix-call-event.h-detection.patch b/debian/patches/0001-Fix-call-event.h-detection.patch
new file mode 100644
index 0000000..687a0f1
--- /dev/null
+++ b/debian/patches/0001-Fix-call-event.h-detection.patch
@@ -0,0 +1,56 @@
+From 2bc1a19aa4f11448eed3bacc38642b5da8d8b0f5 Mon Sep 17 00:00:00 2001
+From: Laurent Bigonville <bigon at bigon.be>
+Date: Fri, 19 Aug 2011 14:55:25 +0200
+Subject: [PATCH] Fix call-event.h detection
+
+Correctly set the LDFLAGS from EMPATHY_LDFLAGS so AC_CHECK_HEADER can
+find call-event.h
+---
+ configure.ac |    3 +++
+ 1 files changed, 3 insertions(+), 0 deletions(-)
+
+--- a/configure.ac
++++ b/configure.ac
+@@ -226,14 +226,17 @@
+ if test "x$enable_call_logs" != "xno" ; then
+    SAVE_CFLAGS=$CFLAGS
+    SAVE_CPPFLAGS=$CPPFLAGS
++   SAVE_LDFLAGS=$LDFLAGS
+    CFLAGS="$CFLAGS $EMPATHY_CFLAGS"
+    CPPFLAGS="$CPPFLAGS $EMPATHY_CFLAGS"
++   LDFLAGS="$LDFLAGS $EMPATHY_LDFLAGS"
+ 
+    AC_CHECK_HEADER(telepathy-logger/call-event.h,
+       have_call_logs="yes", have_call_logs="no")
+ 
+    CFLAGS=$SAVE_CFLAGS
+    CPPFLAGS=$SAVE_CPPFLAGS
++   LDFLAGS=$SAVE_LDFLAGS
+ 
+    if test "x$have_call_logs" = "xyes"; then
+       AC_DEFINE(HAVE_CALL_LOGS, 1, [Define if you have call log support])
+--- a/configure
++++ b/configure
+@@ -15093,11 +15101,13 @@
+ if test "x$enable_call_logs" != "xno" ; then
+    SAVE_CFLAGS=$CFLAGS
+    SAVE_CPPFLAGS=$CPPFLAGS
++   SAVE_LDFLAGS=$LDFLAGS
+    CFLAGS="$CFLAGS $EMPATHY_CFLAGS"
+    CPPFLAGS="$CPPFLAGS $EMPATHY_CFLAGS"
++   LDFLAGS="$LDFLAGS $EMPATHY_LDFLAGS"
+ 
+    ac_fn_c_check_header_mongrel "$LINENO" "telepathy-logger/call-event.h" "ac_cv_header_telepathy_logger_call_event_h" "$ac_includes_default"
+-if test "x$ac_cv_header_telepathy_logger_call_event_h" = x""yes; then :
++if test "x$ac_cv_header_telepathy_logger_call_event_h" = xyes; then :
+   have_call_logs="yes"
+ else
+   have_call_logs="no"
+@@ -15107,6 +15117,7 @@
+ 
+    CFLAGS=$SAVE_CFLAGS
+    CPPFLAGS=$SAVE_CPPFLAGS
++   LDFLAGS=$SAVE_LDFLAGS
+ 
+    if test "x$have_call_logs" = "xyes"; then
+ 
diff --git a/debian/patches/series b/debian/patches/series
index 2497acb..76217d0 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -1 +1,2 @@
+0001-Fix-call-event.h-detection.patch
 99_ltmain_as-needed.patch

-- 
Empathy packaging