From 87d366355f604410f889cf3cea5a9992a15b117f Mon Sep 17 00:00:00 2001
From: "Bastian M. Wojek" <basti@kth.se>
Date: Sat, 7 May 2011 11:14:26 +0000
Subject: [PATCH] Changed the default search paths for HDF4, HDF5, and NeXus to
 find libraries installed through Fink or MacPorts on OS X

---
 configure.ac | 24 ++++++++++++------------
 1 file changed, 12 insertions(+), 12 deletions(-)

diff --git a/configure.ac b/configure.ac
index 2ff6d795..a9eda71b 100644
--- a/configure.ac
+++ b/configure.ac
@@ -393,11 +393,11 @@ AC_ARG_ENABLE([NeXus], [AC_HELP_STRING([--enable-NeXus], [build optional NeXus s
          elif test -r /usr/include/hdf/hdf.h; then
            HDF4_PREFIX="/usr/include/"
            AC_MSG_RESULT([${HDF4_PREFIX}])
-         elif test -r /sw/hdf/include/hdf.h; then
-           HDF4_PREFIX="/sw/hdf"
+         elif test -r /sw/include/hdf.h; then
+           HDF4_PREFIX="/sw"
            AC_MSG_RESULT([${HDF4_PREFIX}])
-         elif test -r /opt/hdf/include/hdf.h; then
-           HDF4_PREFIX="/opt/hdf"
+         elif test -r /opt/local/include/hdf.h; then
+           HDF4_PREFIX="/opt/local"
            AC_MSG_RESULT([${HDF4_PREFIX}])
          else
            AC_MSG_RESULT([no])
@@ -430,11 +430,11 @@ AC_ARG_ENABLE([NeXus], [AC_HELP_STRING([--enable-NeXus], [build optional NeXus s
          elif test -r /usr/include/hdf5.h; then
            HDF5_PREFIX="/usr"
            AC_MSG_RESULT([${HDF5_PREFIX}])
-         elif test -r /sw/hdf5/include/hdf5.h; then
-           HDF5_PREFIX="/sw/hdf5"
+         elif test -r /sw/include/hdf5.h; then
+           HDF5_PREFIX="/sw"
            AC_MSG_RESULT([${HDF5_PREFIX}])
-         elif test -r /opt/hdf5/include/hdf5.h; then
-           HDF5_PREFIX="/opt/hdf5"
+         elif test -r /opt/local/include/hdf5.h; then
+           HDF5_PREFIX="/opt/local"
            AC_MSG_RESULT([${HDF5_PREFIX}])
          else
            AC_MSG_RESULT([no])
@@ -469,11 +469,11 @@ AC_ARG_ENABLE([NeXus], [AC_HELP_STRING([--enable-NeXus], [build optional NeXus s
          elif test -r /usr/include/napi.h; then
            NEXUS_PREFIX="/usr"
            AC_MSG_RESULT([${NEXUS_PREFIX}])
-         elif test -r /sw/nexus/include/napi.h; then
-           NEXUS_PREFIX="/sw/nexus"
+         elif test -r /sw/include/napi.h; then
+           NEXUS_PREFIX="/sw"
            AC_MSG_RESULT([${NEXUS_PREFIX}])
-         elif test -r /opt/local/nexus/include/napi.h; then
-           NEXUS_PREFIX="/opt/local/nexus"
+         elif test -r /opt/local/include/napi.h; then
+           NEXUS_PREFIX="/opt/local"
            AC_MSG_RESULT([${NEXUS_PREFIX}])
          else
            AC_MSG_RESULT([no])