[Debian-ha-commits] [pacemaker] 09/69: Use result of PKG_CHECK_MODULES for libqb check

[Christoph Berg]

This is an automated email from the git hooks/post-receive script.

myon pushed a commit to branch debian/master
in repository pacemaker.

commit 0fe7a4ddf73abe45fdc2146b5cf138ec7b64475b
Author: Ruben Kerkhof <ruben at rubenkerkhof.com>
Date:   Tue Dec 15 12:52:55 2015 +0100

    Use result of PKG_CHECK_MODULES for libqb check
    
    If libqb was installed outside of the library search path,
    for instance in /opt, we didn't pick it up, even though pkg-config
    knew where it was.
---
 configure.ac | 6 ++++++
 1 file changed, 6 insertions(+)

diff --git a/configure.ac b/configure.ac
index a2fbb90..9813aad 100644
--- a/configure.ac
+++ b/configure.ac
@@ -1028,9 +1028,15 @@ if test x${enable_no_stack} = xyes; then
     SUPPORT_CS=no
 fi
 
+SAVE_CPPFLAGS="$CPPFLAGS"
+SAVE_LIBS="$LIBS"
 PKG_CHECK_MODULES(libqb, libqb >= 0.13, HAVE_libqb=1, HAVE_libqb=0)
+CPPFLAGS="$CPPFLAGS $libqb_CFLAGS"
+LIBS="$LIBS $libqb_LIBS"
 AC_CHECK_HEADERS(qb/qbipc_common.h)
 AC_CHECK_LIB(qb, qb_ipcs_connection_auth_set)
+CPPFLAGS="$SAVE_CPPFLAGS"
+LIBS="$SAVE_LIBS"
 
 LIBQB_LOG=1
 PCMK_FEATURES="$PCMK_FEATURES libqb-logging libqb-ipc"

-- 
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/debian-ha/pacemaker.git