From 5fc085a23ed4af63c9bd463685bcf2d97406ecdb Mon Sep 17 00:00:00 2001
From: conrad <conrad@localhost.localdomain>
Date: Thu, 1 Dec 2022 18:30:15 +1000
Subject: [PATCH] simplification since ARMA_HDF5_INCLUDE_DIR is no longer used

---
 include/armadillo_bits/include_hdf5.hpp | 43 +++++++------------------
 1 file changed, 11 insertions(+), 32 deletions(-)

diff --git a/include/armadillo_bits/include_hdf5.hpp b/include/armadillo_bits/include_hdf5.hpp
index 9e19555a..a639f78a 100644
--- a/include/armadillo_bits/include_hdf5.hpp
+++ b/include/armadillo_bits/include_hdf5.hpp
@@ -21,41 +21,15 @@
   #undef  H5_USE_110_API
   #define H5_USE_110_API
   
-  #if !defined(ARMA_HDF5_INCLUDE_DIR)
-    #if defined(__has_include)
-      #if __has_include(<hdf5.h>)
-        #include <hdf5.h>
-      #else
-        #undef ARMA_USE_HDF5
-        #pragma message ("WARNING: use of HDF5 disabled; hdf5.h header not found")
-      #endif
-    #else
+  #if defined(__has_include)
+    #if __has_include(<hdf5.h>)
       #include <hdf5.h>
+    #else
+      #undef ARMA_USE_HDF5
+      #pragma message ("WARNING: use of HDF5 disabled; hdf5.h header not found")
     #endif
   #else
-    #undef ARMA_STR1
-    #undef ARMA_STR2
-    #undef ARMA_HDF5_HEADER
-    
-    #define ARMA_STR1(x) x
-    #define ARMA_STR2(x) ARMA_STR1(x)
-    
-    #define ARMA_HDF5_HEADER ARMA_STR2(ARMA_HDF5_INCLUDE_DIR)ARMA_STR2(hdf5.h)
-    
-    #if defined(__has_include)
-      #if __has_include(ARMA_INCFILE_WRAP(ARMA_HDF5_HEADER))
-        #include ARMA_INCFILE_WRAP(ARMA_HDF5_HEADER)
-      #else
-        #undef ARMA_USE_HDF5
-        #pragma message ("WARNING: use of HDF5 disabled; hdf5.h header not found")
-      #endif
-    #else
-      #include ARMA_INCFILE_WRAP(ARMA_HDF5_HEADER)
-    #endif
-    
-    #undef ARMA_STR1
-    #undef ARMA_STR2
-    #undef ARMA_HDF5_HEADER
+    #include <hdf5.h>
   #endif
   
   #if defined(H5_USE_16_API) || defined(H5_USE_16_API_DEFAULT)
@@ -63,4 +37,9 @@
     #undef ARMA_USE_HDF5
   #endif
   
+  // // TODO
+  // #if defined(H5_USE_18_API) || defined(H5_USE_18_API_DEFAULT)
+  //   #pragma message ("WARNING: detected possibly incompatible configuration of HDF5: H5_USE_18_API or H5_USE_18_API_DEFAULT")
+  // #endif
+  
 #endif