Commit 44e3bf59 authored by Sébastien Villemot's avatar Sébastien Villemot
Browse files

Improve matio workaround for RHEL 6

Previous workaround was crashing the Windows snapshot
parent ebae08a5
......@@ -41,8 +41,10 @@ AC_ARG_WITH(matio, AC_HELP_STRING([--with-matio=DIR], [prefix to MATIO installat
LDFLAGS="$LDFLAGS_MATIO $LDFLAGS"
AC_CHECK_HEADER([matio.h], [], [has_matio=no])
dnl libz is explicitly added, as a workaround for the matio from EPEL 6 (used with RHEL 6)
AC_CHECK_LIB([matio], [Mat_Open], [LIBADD_MATIO="-lmatio -lz"], [has_matio=no], [-lz])
AC_CHECK_LIB([matio], [Mat_Open], [LIBADD_MATIO="-lmatio"], [
dnl Retest with libz explicitly added, as a workaround for the matio from RHEL 6 + EPEL 6
AC_CHECK_LIB([matio], [Mat_Open], [LIBADD_MATIO="-lmatio -lz"], [has_matio=no], [-lz])
])
CPPFLAGS="$ac_save_CPPFLAGS"
LDFLAGS="$ac_save_LDFLAGS"
......
Supports Markdown
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment