summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorCalixte DENIZET <calixte.denizet@scilab-enterprises.com>2015-03-23 09:45:38 +0100
committerVincent COUVERT <vincent.couvert@scilab-enterprises.com>2015-03-23 10:13:59 +0100
commit24f3570a7c6dfb25c97c41094c006e7db4a2b224 (patch)
tree79808db40a8b9358ff30fd09b551d2a1b3c3574f
parentb8898440d5b219d216ed274eb1b1688510550c39 (diff)
downloadscilab-24f3570a7c6dfb25c97c41094c006e7db4a2b224.zip
scilab-24f3570a7c6dfb25c97c41094c006e7db4a2b224.tar.gz
Fix header path for hdf5
Change-Id: I8072ea3dc302a53f482fe746b727daebd0accd63
-rwxr-xr-xscilab/configure4
-rw-r--r--scilab/m4/hdf5.m42
2 files changed, 3 insertions, 3 deletions
diff --git a/scilab/configure b/scilab/configure
index 44d1e6f..d231e89 100755
--- a/scilab/configure
+++ b/scilab/configure
@@ -10357,8 +10357,8 @@ else
10357 HDF5_CFLAGS="-I$DEVTOOLS_INCDIR" 10357 HDF5_CFLAGS="-I$DEVTOOLS_INCDIR"
10358 else 10358 else
10359 if test -d /usr/include/hdf5/serial; then # New Debian packaging layout since hdf5-1.8.13 10359 if test -d /usr/include/hdf5/serial; then # New Debian packaging layout since hdf5-1.8.13
10360 ac_fn_c_check_header_mongrel "$LINENO" "hdf5.h" "ac_cv_header_hdf5_h" "$ac_includes_default" 10360 ac_fn_c_check_header_mongrel "$LINENO" "hdf5/serial/hdf5.h" "ac_cv_header_hdf5_serial_hdf5_h" "$ac_includes_default"
10361if test "x$ac_cv_header_hdf5_h" = xyes; then : 10361if test "x$ac_cv_header_hdf5_serial_hdf5_h" = xyes; then :
10362 HDF5_CFLAGS="-I/usr/include/hdf5/serial" 10362 HDF5_CFLAGS="-I/usr/include/hdf5/serial"
10363else 10363else
10364 as_fn_error $? "Cannot find headers (hdf5.h) of the library HDF5. Please install the dev package" "$LINENO" 5 10364 as_fn_error $? "Cannot find headers (hdf5.h) of the library HDF5. Please install the dev package" "$LINENO" 5
diff --git a/scilab/m4/hdf5.m4 b/scilab/m4/hdf5.m4
index f40137a..283163c 100644
--- a/scilab/m4/hdf5.m4
+++ b/scilab/m4/hdf5.m4
@@ -43,7 +43,7 @@ else
43 HDF5_CFLAGS="-I$DEVTOOLS_INCDIR" 43 HDF5_CFLAGS="-I$DEVTOOLS_INCDIR"
44 else 44 else
45 if test -d /usr/include/hdf5/serial; then # New Debian packaging layout since hdf5-1.8.13 45 if test -d /usr/include/hdf5/serial; then # New Debian packaging layout since hdf5-1.8.13
46 AC_CHECK_HEADER([hdf5.h], 46 AC_CHECK_HEADER([hdf5/serial/hdf5.h],
47 [HDF5_CFLAGS="-I/usr/include/hdf5/serial"], 47 [HDF5_CFLAGS="-I/usr/include/hdf5/serial"],
48 [AC_MSG_ERROR([Cannot find headers (hdf5.h) of the library HDF5. Please install the dev package])]) 48 [AC_MSG_ERROR([Cannot find headers (hdf5.h) of the library HDF5. Please install the dev package])])
49 else 49 else