From 39a9ae2daeb193f99dc9b2e6b05828fc89d513bf Mon Sep 17 00:00:00 2001
From: Thomas White <taw@physics.org>
Date: Mon, 23 Oct 2017 15:10:45 +0200
Subject: configure.ac: Improve HDF5 detection

---
 configure.ac | 42 +++++++++++++++++++++++++++++-------------
 1 file changed, 29 insertions(+), 13 deletions(-)

(limited to 'configure.ac')

diff --git a/configure.ac b/configure.ac
index 62358b61..07add2cc 100644
--- a/configure.ac
+++ b/configure.ac
@@ -23,11 +23,36 @@ AC_FUNC_MALLOC
 gl_INIT
 
 
+dnl Find HDF5
 AC_ARG_WITH(hdf5,
-[AS_HELP_STRING([--with-hdf5], [specify location of HDF5 library])],
-[HDF5_CFLAGS="-I$withval/include"
- HDF5_LIBS="-L$withval/lib -lhdf5"],
-[HDF5_LIBS="-lhdf5"])
+[AS_HELP_STRING([--with-hdf5],
+                [specify location of HDF5 (instead of trying pkg-config)])],
+[
+    AC_MSG_NOTICE([Using your specified location for HDF5])
+    HDF5_CFLAGS="-I$withval/include"
+    HDF5_LIBS="-L$withval/lib -lhdf5"
+],
+[
+    AC_MSG_NOTICE([checking for HDF5 using pkg-config])
+    PKG_CHECK_MODULES([HDF5], [hdf5],
+    [
+        AC_MSG_NOTICE([Found HDF5 using pkg-config])
+    ],
+    [
+        AC_MSG_NOTICE([Did not find HDF5 using pkg-config.  Assuming default location.])
+        HDF5_CFLAGS=""
+        HDF5_LIBS="-lhdf5"
+    ])
+])
+
+dnl Check that HDF5 *actually* works...
+LIBS_SAVE=$LIBS
+LIBS=$HDF5_LIBS
+AC_CHECK_LIB([hdf5], [H5Fcreate], [],
+[
+   AC_MSG_ERROR([HDF5 not found!])
+])
+LIBS=$LIBS_SAVE
 
 
 AC_ARG_WITH(gsl,
@@ -291,15 +316,6 @@ AC_CHECK_LIB([pthread], [sched_setaffinity], [
 ])
 
 
-LIBS_SAVE=$LIBS
-LIBS=$HDF5_LIBS
-AC_CHECK_LIB([hdf5], [H5Fcreate], [],
-[
-   AC_MSG_ERROR([HDF5 not found!])
-])
-LIBS=$LIBS_SAVE
-
-
 AC_CHECK_LIB([rt], [clock_gettime],
 [
    AC_DEFINE([HAVE_CLOCK_GETTIME], [1],
-- 
cgit v1.2.3