From 906f5328280f74974a3d1e4e4e4c8624ae7f80e3 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?S=C3=A9bastien=20Villemot?= <sebastien@dynare.org>
Date: Mon, 1 Oct 2012 15:06:17 +0200
Subject: [PATCH] Fix detection of SLICOT for Octave+Windows
---
m4/ax_slicot.m4 | 5 +++--
1 file changed, 3 insertions(+), 2 deletions(-)
diff --git a/m4/ax_slicot.m4 b/m4/ax_slicot.m4
index 64ad721e9..cedbfdab0 100755
--- a/m4/ax_slicot.m4
+++ b/m4/ax_slicot.m4
@@ -60,11 +60,12 @@ AC_DEFUN([AX_SLICOT],
AC_CHECK_LIB([slicot_pic], [$sb02od], [LIBADD_SLICOT="-lslicot_pic"], [has_slicot=no], [$MATLAB_LIBS])
fi
else
- LDFLAGS="$LDFLAGS $LDFLAGS_SLICOT"
+ LDFLAGS="$LDFLAGS `$MKOCTFILE -p LFLAGS` $LDFLAGS_SLICOT"
+ # Fallback on libslicot_pic if dynamic libslicot not found
AC_CHECK_LIB([slicot], [$sb02od], [LIBADD_SLICOT="-lslicot"],
[
AC_CHECK_LIB([slicot_pic], [$sb02od], [LIBADD_SLICOT="-lslicot_pic"], [has_slicot=no], [`$MKOCTFILE -p BLAS_LIBS` `$MKOCTFILE -p LAPACK_LIBS`])
- ], # Fallback on libslicot_pic if dynamic libslicot not found
+ ],
[`$MKOCTFILE -p BLAS_LIBS` `$MKOCTFILE -p LAPACK_LIBS`])
fi
--
GitLab