From 846e7c960ea5f12e233c585e032b39cea09af3f8 Mon Sep 17 00:00:00 2001
From: Thorsten Liebig <Thorsten.Liebig@gmx.de>
Date: Mon, 4 May 2015 20:02:21 +0200
Subject: [PATCH] fix/improve hdf5 usage for octave

Signed-off-by: Thorsten Liebig <Thorsten.Liebig@gmx.de>
---
 matlab/h5readatt_octave.cc | 2 +-
 matlab/setup.m             | 9 ++++++++-
 2 files changed, 9 insertions(+), 2 deletions(-)

diff --git a/matlab/h5readatt_octave.cc b/matlab/h5readatt_octave.cc
index 0621109..8bd58d0 100755
--- a/matlab/h5readatt_octave.cc
+++ b/matlab/h5readatt_octave.cc
@@ -30,7 +30,7 @@ DEFUN_DLD (h5readatt_octave, args, nargout, "h5readatt_octave(<File_Name>,<DataS
 	}
 
 	//suppress hdf5 error output
-	H5Eset_auto(NULL, NULL);
+	H5Eset_auto1(NULL, NULL);
 
 	hid_t file = H5Fopen( args(0).string_value().c_str(), H5F_ACC_RDONLY, H5P_DEFAULT );
 	if (file==-1)
diff --git a/matlab/setup.m b/matlab/setup.m
index edc24b4..df56b25 100644
--- a/matlab/setup.m
+++ b/matlab/setup.m
@@ -18,7 +18,14 @@ if isOctave()
     disp('compiling oct files')
     fflush(stdout)
     if isunix
-        mkoctfile -lhdf5 -DH5_USE_16_API h5readatt_octave.cc
+        [res, fn] = unix('find /usr/lib -name libhdf5.so');
+        if length(fn)>0
+            [hdf5lib_dir, hdf5lib_fn] = fileparts(fn);
+            disp(["HDF5 library path found at: " hdf5lib_dir])
+            mkoctfile(["-L" hdf5lib_dir ],"-lhdf5 -DH5_USE_16_API", "h5readatt_octave.cc")
+        else
+            mkoctfile -lhdf5 -DH5_USE_16_API h5readatt_octave.cc
+        end
     else
         mkoctfile -lhdf5 -DH5_USE_16_API h5readatt_octave.cc
     end