Fix Fortran build

As reported by #51

Author: tbeu

.github/workflows/autotools.yml

@@ -19,11 +19,16 @@ jobs:
       matrix:
         toolchain:
           - linux-gcc
+          - linux-gcc-fortran
           - macos-clang
         include:
           - toolchain: linux-gcc
             os: ubuntu-latest
             compiler: gcc
+          - toolchain: linux-gcc-fortran
+            os: ubuntu-latest
+            compiler: gcc
+            fortran: true
           - toolchain: macos-clang
             os: macos-latest
             compiler: clang
@@ -40,6 +45,9 @@ jobs:
           else
             pip install --user cpp-coveralls
           fi
+          if [ "${{ matrix.fortran }}" == "true" ]; then
+            sudo apt-get install -y gfortran
+          fi
       - name: Install hdf5
         timeout-minutes: 5
         run: |
@@ -52,7 +60,11 @@ jobs:
       - name: Configure
         run: |
           ./autogen.sh
-          ./configure --quiet --enable-shared --enable-coverage --enable-debug --enable-mat73 --enable-extended-sparse --with-pic --with-hdf5=${GITHUB_WORKSPACE}/hdf5
+          FORTRAN_FLAG=""
+          if [ "${{ matrix.fortran }}" == "true" ]; then
+            FORTRAN_FLAG="--enable-fortran"
+          fi
+          ./configure --quiet --enable-shared --enable-coverage --enable-debug --enable-mat73 --enable-extended-sparse --with-pic --with-hdf5=${GITHUB_WORKSPACE}/hdf5 $FORTRAN_FLAG
       - name: Build with ${{ matrix.compiler }}
         run: make -j8
       - name: Test

configure.ac

@@ -12,7 +12,7 @@ AC_INIT([MATIO],[1.5.30],[t-beu@users.sourceforge.net],[],[https://sourceforge.n
 AC_CONFIG_SRCDIR([src/matio.h])
 AC_CONFIG_AUX_DIR([config])
 AC_CONFIG_MACRO_DIR([config])
-AM_INIT_AUTOMAKE([foreign 1.8 no-dependencies])
+AM_INIT_AUTOMAKE([foreign 1.8 no-dependencies subdir-objects])
 m4_ifdef([AM_SILENT_RULES], [AM_SILENT_RULES])
 AM_MAINTAINER_MODE
 AC_PREREQ([2.60])
@@ -26,16 +26,45 @@ PACKAGE_RELEASE_DATE="6 January 2026"
 AC_DEFINE_UNQUOTED([MATIO_VERSION_STR],"1.5.30",[Matio version number])
 AC_SUBST(PACKAGE_RELEASE_DATE)
 
-AC_ARG_VAR([FCLDFLAGS],[Fortran compiler-specific flags at link time])
 AC_ARG_VAR([LT_CFLAGS],[C compiler flags passed to libtool in compile mode])
 AC_ARG_VAR([LT_LDFLAGS],[Flags passed to libtool in link mode])
 
+dnl
+# Enable fortran interface
+AC_ARG_ENABLE(fortran,
+[  --enable-fortran            enable fortran interface to mat library],
+  [if test "$enableval" = "no" ; then
+    enable_fortran=no
+  else
+    enable_fortran=yes
+  fi],
+  enable_fortran=no)
+
 dnl
 dnl  Build programs, C compiler, F77 compiler, make, install, etc.
 dnl
 AC_PROG_CC([pgcc icc gcc cc])
 AC_USE_SYSTEM_EXTENSIONS
 
+if test "$enable_fortran" = "yes"
+then
+    AC_PROG_FC([pgf95 pgf90 ifort gfortran g95])
+    AC_FC_WRAPPERS
+    AC_FC_LIBRARY_LDFLAGS
+    AC_CONFIG_FILES([src/fortran/matio_t.inc])
+    dnl gfortran >= 10 requires -fallow-argument-mismatch for legacy interfaces
+    AC_MSG_CHECKING([whether $FC needs -fallow-argument-mismatch])
+    case "$FC" in
+    *gfortran*)
+        FCFLAGS="$FCFLAGS -fallow-argument-mismatch"
+        AC_MSG_RESULT([yes])
+        ;;
+    *)
+        AC_MSG_RESULT([no])
+        ;;
+    esac
+fi
+
 AC_ARG_ENABLE(coverage,
 [  --enable-coverage       Enable coverage testing],
 [CFLAGS="$CFLAGS -fprofile-arcs -ftest-coverage"])
@@ -105,6 +134,10 @@ then
     FCFLAGS="$PROFILE_FCFLAGS $FCFLAGS"
 fi
 
+dnl
+dnl Try to avoid having libtool search for a fortran compiler
+dnl
+F77=$FC
 AC_ENABLE_SHARED
 AC_ENABLE_STATIC
 LT_INIT
@@ -368,6 +401,18 @@ esac
 AM_CONDITIONAL([LINUX], [test "x$linux" = "xyes"])
 AM_CONDITIONAL([WINNT], [test "x$winnt" = "xyes"])
 AM_CONDITIONAL([SUN],   [test "x$sun"   = "xyes"])
+AM_CONDITIONAL([ENABLE_FORTRAN], [test "x$enable_fortran" = "xyes"])
+
+dnl
+dnl Without this, the linker line is incorrect on platforms without a fortran
+dnl compiler even if we are not using fortran sources
+dnl
+if test "x$enable_fortran" != "xyes"; then
+  FCLINK='$(LINK)'
+else
+  FCLINK='$(LIBTOOL) $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=link $(FCLD) $(AM_FCFLAGS) $(FCFLAGS) $(AM_LDFLAGS) $(LDFLAGS) -o $@'
+fi
+AC_SUBST(FCLINK)
 
 winnt="no"
 case "${host_os}" in
@@ -396,9 +441,13 @@ AC_MSG_RESULT([])
 AC_MSG_RESULT([   MATIO Configuration Summary       ])
 AC_MSG_RESULT([==============================================================])
 AC_MSG_RESULT([           C Compiler: $CC])
+AC_MSG_RESULT([     Fortran Compiler: $FC])
 AC_MSG_RESULT([               CFLAGS: $CFLAGS])
+AC_MSG_RESULT([              FCFLAGS: $FCFLAGS])
+AC_MSG_RESULT([              FCLIBS: $FCLIBS])
 AC_MSG_RESULT([     Shared Libraries: $enable_shared])
 AC_MSG_RESULT([     Static Libraries: $enable_static])
+AC_MSG_RESULT([    Fortran Interface: $enable_fortran])
 AC_MSG_RESULT([  default MAT version: $file_ver])
 AC_MSG_RESULT([])
 AC_MSG_RESULT([Features --------------------------------------------])

src/Makefile.am

@@ -31,14 +31,30 @@ libmatio_la_SOURCES    = endian.c io.c $(ZLIB_SRC) read_data.c \
                          mat5.c mat4.c mat.c matvar_cell.c matvar_struct.c \
                          mcos.c
 libmatio_la_LIBADD     = $(HDF5_LIBS) $(ZLIB_LIBS) $(SNPRINTF_LIBS)
-libmatio_la_LDFLAGS    = -no-undefined -export-symbols @srcdir@/matio.sym $(AM_LDFLAGS)
 
 if MAT73
     libmatio_la_SOURCES += mat73.c
 endif
 
 EXTRA_DIST = matio.sym
 
+if ENABLE_FORTRAN
+    AM_FCFLAGS              = -I. -I$(top_builddir)/src/fortran
+    noinst_LTLIBRARIES      = libfmatio.la
+    libfmatio_la_SOURCES    = fortran/matio_internal.c fortran/matio.f90
+    libfmatio_la_CFLAGS     = $(AM_CFLAGS)
+    libfmatio_la_LDFLAGS    =
+    libmatio_la_LIBADD     += libfmatio.la $(FCLIBS)
+    libmatio_la_LDFLAGS     = -no-undefined $(AM_LDFLAGS)
+    nodist_include_HEADERS += matio.mod
+    noinst_HEADERS         += fortran/create.f90 fortran/read_data.f90 \
+                              fortran/write_data.f90 fortran/write.f90
+else
+    libmatio_la_LDFLAGS     = -no-undefined -export-symbols @srcdir@/matio.sym $(AM_LDFLAGS)
+endif
+
+matio.mod: libfmatio.la
+
 dosubst = sed -e 's,[@]PACKAGE[@],$(PACKAGE),g' \
               -e 's,[@]VERSION[@],$(VERSION),g' \
               -e 's,\/,\\,g'

src/fortran/matio_internal.c

@@ -6,14 +6,12 @@
  * SPDX-License-Identifier: BSD-2-Clause
  */
 
+#include "matio_private.h"
 #include <stdlib.h>
-#include <stdio.h>
 #include <string.h>
 #if defined(HAVE_STRINGS_H)
 #include <strings.h>
 #endif
-#include "matio.h"
-#include "matio_private.h"
 
 #define fmat_loginit_c \
             FC_FUNC_(fmat_loginit_c,FMAT_LOGINIT_C)

src/fortran/matio_t.inc.in

@@ -3,7 +3,7 @@
 ! Copyright (c) 2008-2014, Christopher C. Hulbert
 ! All rights reserved.
 !
-| SPDX-License-Identifier: BSD-2-Clause
+! SPDX-License-Identifier: BSD-2-Clause
 !
 
 INTEGER,PARAMETER :: mat_ptr = @SIZEOF_VOID_P@

test/Makefile.am

@@ -783,6 +783,16 @@ TEST_LFLAGS = -L$(top_builddir)/src
 
 noinst_PROGRAMS = test_mat test_snprintf
 
+if ENABLE_FORTRAN
+noinst_PROGRAMS += test_matf
+
+test_matf_SOURCES = test_matf.f90
+test_matf_CFLAGS  = -I$(top_builddir)/src -I$(top_builddir)/src/fortran
+test_matf_FCFLAGS = -I$(top_builddir)/src -I$(top_builddir)/src/fortran
+test_matf_LDFLAGS = -L$(top_builddir)/src -L$(top_builddir)/src/fortran
+test_matf_LDADD   = $(TEST_LIBS)
+endif
+
 test_mat_SOURCES = test_mat.c
 test_mat_LDADD   = $(TEST_LIBS)
 test_mat_LDFLAGS = $(TEST_LFLAGS)