From 2f0b65f81645d8a0a2afc388fb9b7922a9b5caf2 Mon Sep 17 00:00:00 2001
From: Andreas Suter <andreas.suter@psi.ch>
Date: Mon, 15 Aug 2016 16:53:12 +0200
Subject: [PATCH] some fine tuning needed to make sure that the NeXus library
 is indeed found.

---
 configure.ac | 12 +++++++++++-
 1 file changed, 11 insertions(+), 1 deletion(-)

diff --git a/configure.ac b/configure.ac
index 8b921802..c596e046 100644
--- a/configure.ac
+++ b/configure.ac
@@ -586,7 +586,17 @@ AC_ARG_ENABLE([NeXus], [AS_HELP_STRING([--enable-NeXus],[build optional NeXus su
     )
     AC_SUBST(NEXUS_PREFIX)
     if test "${NEXUS_FOUND}" != "1"; then
-      NEXUS_LIBS="-L${NEXUS_PREFIX}/lib64 -lNeXus"
+      if test -r ${NEXUS_PREFIX}/lib/libNeXus.so; then
+        NEXUS_LIB_DIR="lib"
+      elif test -r ${NEXUS_PREFIX}/lib64/libNeXus.so; then
+        NEXUS_LIB_DIR="lib64"
+      else
+        AC_MSG_ERROR(
+         [Couldn't find the NeXus library.]
+        )
+      fi
+
+      NEXUS_LIBS="-L${NEXUS_PREFIX}/${NEXUS_LIB_DIR} -lNeXus"
       NEXUS_CFLAGS="-I${NEXUS_PREFIX}/include/nexus"
     fi
     AC_SUBST(NEXUS_LIBS)