From fe0fdf2ccb3fd41762b7baba9f9ecee8b2f8a9da Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?S=C3=A9bastien=20Villemot?= Date: Tue, 3 Dec 2019 18:27:50 +0100 Subject: [PATCH] Fix Fortran flags under MEX for MATLAB There was a typo in fedeeaad9fc5e057367ce606ebcf004a973794e1. By the way, use the modern Fortran compiler when trying to detect slicot. --- m4/ax_slicot.m4 | 4 ++-- mex/build/matlab/configure.ac | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/m4/ax_slicot.m4 b/m4/ax_slicot.m4 index 6fa6e95c5..921bc0945 100644 --- a/m4/ax_slicot.m4 +++ b/m4/ax_slicot.m4 @@ -5,7 +5,7 @@ dnl dnl AX_SLICOT([matlab]) dnl AX_SLICOT([octave]) dnl -dnl Copyright © 2012 Dynare Team +dnl Copyright © 2012-2019 Dynare Team dnl dnl This file is part of Dynare. dnl @@ -40,7 +40,7 @@ AC_DEFUN([AX_SLICOT], ac_save_LDFLAGS="$LDFLAGS" LDFLAGS_SAVED="$LDFLAGS" - AC_F77_FUNC(sb02od) + AC_FC_FUNC(sb02od) if test "$1" = matlab; then LDFLAGS="$MATLAB_LDFLAGS_NOMAP $LDFLAGS_SLICOT" diff --git a/mex/build/matlab/configure.ac b/mex/build/matlab/configure.ac index 95dc31b59..eeee28163 100644 --- a/mex/build/matlab/configure.ac +++ b/mex/build/matlab/configure.ac @@ -46,7 +46,7 @@ case ${host_os} in esac CFLAGS="$MATLAB_CFLAGS -Wall -Wno-parentheses" -FCLAGS="$MATLAB_FCFLAGS -Wall" +FCFLAGS="$MATLAB_FCFLAGS -Wall" CXXFLAGS="$MATLAB_CXXFLAGS -Wall -Wno-parentheses -Wold-style-cast" AC_PROG_FC