diff options
author | Thomas White <taw@physics.org> | 2017-06-26 15:58:21 +0200 |
---|---|---|
committer | Thomas White <taw@physics.org> | 2017-07-04 15:14:57 +0200 |
commit | 696da1488e09147ec89a26dd77a117ce35eea925 (patch) | |
tree | bef17ab4bd78e5ceaef27bf869b08587d7161757 | |
parent | 8672f2857f18841576dc54b9a64e25837730cddd (diff) |
Check for CBF headers, even if they're somewhere weird
-rw-r--r-- | configure.ac | 10 |
1 files changed, 7 insertions, 3 deletions
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]) ]) |