From 80c6061730c2a6a02b9eea77140026ff6b822856 Mon Sep 17 00:00:00 2001
From: Thomas White <taw@physics.org>
Date: Fri, 23 Jun 2017 11:05:18 +0200
Subject: Accept either cbf/cbf.h or cbflib/cbf.h

You get cbflib/cbf.h if you install CBFlib from source, and cbf/cbf.h if
using the package manager in Fedora, probably other systems as well.

We definitely don't want to include the cbf or cbflib folder in the
include path, because CBFlib may bring its own HDF5 headers, which we
don't want to touch with a bargepole.
---
 libcrystfel/src/image.c | 7 +++++++
 1 file changed, 7 insertions(+)

(limited to 'libcrystfel/src')

diff --git a/libcrystfel/src/image.c b/libcrystfel/src/image.c
index 1baa33bc..aad5017c 100644
--- a/libcrystfel/src/image.c
+++ b/libcrystfel/src/image.c
@@ -27,6 +27,8 @@
  *
  */
 
+#include <config.h>
+
 #include <stdlib.h>
 #include <assert.h>
 #include <math.h>
@@ -34,8 +36,13 @@
 #include <hdf5.h>
 
 #ifdef HAVE_CBFLIB
+#ifdef HAVE_CBFLIB_CBF_H
 #include <cbflib/cbf.h>
 #endif
+#ifdef HAVE_CBF_CBF_H
+#include <cbf/cbf.h>
+#endif
+#endif
 
 #include "image.h"
 #include "utils.h"
-- 
cgit v1.2.3