From 07e3dfc0f80ee1a6538b4e0f6531b9807dea10b7 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?S=C3=A9bastien=20Villemot?= <sebastien@dynare.org>
Date: Thu, 22 Nov 2012 11:17:03 +0100
Subject: [PATCH] Improve matio workaround for RHEL 6

Previous workaround was crashing the Windows snapshot
(cherry picked from commit 44e3bf5947b9c397c33664230b5ade4b471a6964)
---
 m4/ax_matio.m4 | 6 ++++--
 1 file changed, 4 insertions(+), 2 deletions(-)

diff --git a/m4/ax_matio.m4 b/m4/ax_matio.m4
index 08451681c..7b74d271d 100644
--- a/m4/ax_matio.m4
+++ b/m4/ax_matio.m4
@@ -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"
-- 
GitLab