summaryrefslogtreecommitdiffstats
path: root/scilab/configure
diff options
context:
space:
mode:
authorVincent COUVERT <vincent.couvert@scilab-enterprises.com>2015-03-24 10:23:24 +0100
committerVincent COUVERT <vincent.couvert@scilab-enterprises.com>2015-03-24 10:26:06 +0100
commit1cfbafc6f1ada8974ee4a52f1696bc4d07ef62fd (patch)
tree1df85df2892eccd1197959dbcedc63f56f810bf8 /scilab/configure
parente032bc01d52785bfd9952f21ef937cbf1315926e (diff)
parent910def15f887b80dfad3bd4bdeec348d8a95d1bc (diff)
downloadscilab-1cfbafc6f1ada8974ee4a52f1696bc4d07ef62fd.zip
scilab-1cfbafc6f1ada8974ee4a52f1696bc4d07ef62fd.tar.gz
Merge remote-tracking branch 'origin/5.5'
Change-Id: Iaed8be569aa25735867a884f84c737e1cc2a945f
Diffstat (limited to 'scilab/configure')
-rwxr-xr-xscilab/configure8
1 files changed, 4 insertions, 4 deletions
diff --git a/scilab/configure b/scilab/configure
index f77cd40..f76297a 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
@@ -10390,7 +10390,7 @@ if ${ac_cv_lib_hdf5_H5Fopen+:} false; then :
10390 $as_echo_n "(cached) " >&6 10390 $as_echo_n "(cached) " >&6
10391else 10391else
10392 ac_check_lib_save_LIBS=$LIBS 10392 ac_check_lib_save_LIBS=$LIBS
10393LIBS="-lhdf5 -lsz -lz 10393LIBS="-lhdf5 -lz
10394 $LIBS" 10394 $LIBS"
10395cat confdefs.h - <<_ACEOF >conftest.$ac_ext 10395cat confdefs.h - <<_ACEOF >conftest.$ac_ext
10396/* end confdefs.h. */ 10396/* end confdefs.h. */
@@ -10496,7 +10496,7 @@ if ${ac_cv_lib_hdf5_H5Fopen+:} false; then :
10496 $as_echo_n "(cached) " >&6 10496 $as_echo_n "(cached) " >&6
10497else 10497else
10498 ac_check_lib_save_LIBS=$LIBS 10498 ac_check_lib_save_LIBS=$LIBS
10499LIBS="-lhdf5 -lsz -lz 10499LIBS="-lhdf5 -lz
10500 $LIBS" 10500 $LIBS"
10501cat confdefs.h - <<_ACEOF >conftest.$ac_ext 10501cat confdefs.h - <<_ACEOF >conftest.$ac_ext
10502/* end confdefs.h. */ 10502/* end confdefs.h. */