Fix header path for hdf5 09/16209/2
Calixte DENIZET [Mon, 23 Mar 2015 08:45:38 +0000 (09:45 +0100)]
Change-Id: I8072ea3dc302a53f482fe746b727daebd0accd63

scilab/configure
scilab/m4/hdf5.m4

index 44d1e6f..d231e89 100755 (executable)
@@ -10357,8 +10357,8 @@ else
         HDF5_CFLAGS="-I$DEVTOOLS_INCDIR"
     else
         if test -d /usr/include/hdf5/serial; then # New Debian packaging layout since hdf5-1.8.13
-            ac_fn_c_check_header_mongrel "$LINENO" "hdf5.h" "ac_cv_header_hdf5_h" "$ac_includes_default"
-if test "x$ac_cv_header_hdf5_h" = xyes; then :
+            ac_fn_c_check_header_mongrel "$LINENO" "hdf5/serial/hdf5.h" "ac_cv_header_hdf5_serial_hdf5_h" "$ac_includes_default"
+if test "x$ac_cv_header_hdf5_serial_hdf5_h" = xyes; then :
   HDF5_CFLAGS="-I/usr/include/hdf5/serial"
 else
   as_fn_error $? "Cannot find headers (hdf5.h) of the library HDF5. Please install the dev package" "$LINENO" 5
index f40137a..283163c 100644 (file)
@@ -43,7 +43,7 @@ else
         HDF5_CFLAGS="-I$DEVTOOLS_INCDIR"
     else
         if test -d /usr/include/hdf5/serial; then # New Debian packaging layout since hdf5-1.8.13
-            AC_CHECK_HEADER([hdf5.h],
+            AC_CHECK_HEADER([hdf5/serial/hdf5.h],
                 [HDF5_CFLAGS="-I/usr/include/hdf5/serial"],
                 [AC_MSG_ERROR([Cannot find headers (hdf5.h) of the library HDF5. Please install the dev package])])
         else