From 696da1488e09147ec89a26dd77a117ce35eea925 Mon Sep 17 00:00:00 2001
From: Thomas White <taw@physics.org>
Date: Mon, 26 Jun 2017 15:58:21 +0200
Subject: Check for CBF headers, even if they're somewhere weird

---
 configure.ac | 10 +++++++---
 1 file changed, 7 insertions(+), 3 deletions(-)

(limited to 'configure.ac')

diff --git a/configure.ac b/configure.ac
index f424fdce..781d0159 100644
--- a/configure.ac
+++ b/configure.ac
@@ -51,14 +51,18 @@ AS_IF([test "x$enable_cbf" = "xyes"],
       CBF_CFLAGS="-I${with_cbflib_dir}/include"
       dnl Fortunately no libhdf5.so in this folder
       CBF_LIBS="-lcbf -L${with_cbflib_dir}/lib"
-      have_cbflib=true
    ], [
       AC_CHECK_LIB([cbf], [cbf_make_handle], [
-         have_cbflib=true
          CBF_LIBS="-lcbf"
       ])
    ])
-   AC_CHECK_HEADERS([cbflib/cbf.h cbf/cbf.h])
+   SAVED_CPPFLAGS=$CPPFLAGS
+   CPPFLAGS="$CPPFLAGS $CBF_CFLAGS"
+   AC_CHECK_HEADERS([cbflib/cbf.h cbf/cbf.h],
+   [
+      have_cbflib=true
+   ])
+   CPPFLAGS=$SAVE_CPPFLAGS
 ], [
    AC_MSG_RESULT([no])
 ])
-- 
cgit v1.2.3