From a28081d271c5a05d91855cf1092a8dffa09412b2 Mon Sep 17 00:00:00 2001 From: Sergey Kosukhin <sergey.kosukhin@mpimet.mpg.de> Date: Thu, 16 Jan 2025 10:23:28 +0100 Subject: [PATCH] autotools: no more __FILE__ macros --- configure.ac | 2 - m4/acx_fc_line_length.m4 | 90 ---------------------------------------- 2 files changed, 92 deletions(-) delete mode 100644 m4/acx_fc_line_length.m4 diff --git a/configure.ac b/configure.ac index 0e8d03ed..55a3ba90 100644 --- a/configure.ac +++ b/configure.ac @@ -60,8 +60,6 @@ dnl expand to ACX_FC_PP_SRCEXT: m4_pushdef([AC_FC_SRCEXT], [ACX_FC_PP_SRCEXT($@)]) AC_FC_SRCEXT([f90]) m4_popdef([AC_FC_SRCEXT]) -dnl Handle possibly long expansions of the preprocessor macro __FILE__: -ACX_FC_LINE_LENGTH([unlimited]) ACX_FC_MODULE_NAMING([AC_SUBST([FCMODEXT], ["$acx_cv_fc_module_naming_ext"])]) AM_CONDITIONAL([FCMODUC], [test x"$acx_cv_fc_module_naming_upper" = xyes]) ACX_FC_MODULE_IN_FLAG([AC_SUBST([FCMODINC], ["$acx_cv_fc_module_in_flag"])]) diff --git a/m4/acx_fc_line_length.m4 b/m4/acx_fc_line_length.m4 deleted file mode 100644 index 573268fa..00000000 --- a/m4/acx_fc_line_length.m4 +++ /dev/null @@ -1,90 +0,0 @@ -# Copyright (c) 2018-2024, MPI-M -# -# Author: Sergey Kosukhin <sergey.kosukhin@mpimet.mpg.de> -# -# SPDX-License-Identifier: BSD-3-Clause -# -# Redistribution and use in source and binary forms, with or without -# modification, are permitted provided that the following conditions are met: -# -# 1. Redistributions of source code must retain the above copyright notice, -# this list of conditions and the following disclaimer. -# 2. Redistributions in binary form must reproduce the above copyright -# notice, this list of conditions and the following disclaimer in the -# documentation and/or other materials provided with the distribution. -# 3. Neither the name of the copyright holder nor the names of its -# contributors may be used to endorse or promote products derived from -# this software without specific prior written permission. -# -# THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" -# AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE -# IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE -# ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER OR CONTRIBUTORS BE -# LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR -# CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF -# SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS -# INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN -# CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) -# ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE -# POSSIBILITY OF SUCH DAMAGE. - -# ACX_FC_LINE_LENGTH([LENGTH = 132], -# [ACTION-IF-SUCCESS = APPEND-FCFLAGS], -# [ACTION-IF-FAILURE = FAILURE]) -# ----------------------------------------------------------------------------- -# Finds the Fortran compiler flag needed to accept lines of length LENGTH, -# where LENGTH may be 80, 132 (default), or 'unlimited' for longer lines. The -# result is either "unknown", or the actual compiler flag required to to accept -# lines of length LENGTH. -# -# If successful, runs ACTION-IF-SUCCESS (defaults to appending the result to -# FCFLAGS), otherwise runs ACTION-IF-FAILURE (defaults to failing with an error -# message). -# -# The flag is cached in the acx_cv_fc_line_length_[]LENGTH. -# -# The implementation patches the standard Autoconf macro AC_FC_LINE_LENGTH to -# reduce the number of LANG switches and to avoid false negative results with -# the GFortran '-fimplicit-none' flag. -# -AC_DEFUN([ACX_FC_LINE_LENGTH], - [AC_LANG_ASSERT([Fortran])dnl -dnl Fail instead of warning: - m4_bmatch(m4_default([$1], [132]), - [unlimited\|132\|80], [], - [m4_fatal([Invalid LENGTH argument for $0: '$1'])])dnl -dnl Monkey-patch AC_FC_LINE_LENGTH: - m4_pushdef([acx_cache_var], [acx_cv_fc_line_length_$1])dnl - m4_pushdef([ac_cv_fc_line_length], [acx_cache_var])dnl - m4_pushdef([acx_orig_macro], - m4_bpatsubsts(m4_dquote(m4_defn([AC_FC_LINE_LENGTH])), - [\$ac_fc_line_length_test$], [\& - implicit integer (a)], - [AC_LANG_P\(OP\|USH\)(\[?Fortran\]?)], [dn][l ]))dnl -dnl This macro does not have a special meaning for the value 'none' -dnl but AC_FC_LINE_LENGTH does. To account for the difference, we need to know -dnl whether 'none' came from the cache variable and set the cache variable to -dnl 'none' if it is set to an empty string: - acx_fc_line_length_none_in_cache=no - AS_VAR_SET_IF([acx_cache_var], - [AS_CASE([$acx_cache_var], - [none], [acx_fc_line_length_none_in_cache=yes], - [''], [acx_cache_var=none])]) -dnl AC_FC_LINE_LENGTH changes the FCFLAGS, which we do not want: - acx_save_FCFLAGS=$FCFLAGS - m4_quote(acx_orig_macro([$1], [], [:])) - FCFLAGS=$acx_save_FCFLAGS - m4_popdef([acx_orig_macro])dnl - m4_popdef([ac_cv_fc_line_length])dnl -dnl Set the cache variable to an empty string if the value 'none' was set by -dnl AC_FC_LINE_LENGTH but not if the variable had it before the expansion: - AS_IF([test "x$acx_cache_var$acx_fc_line_length_none_in_cache" = xnoneno], - [acx_cache_var=]) - AS_VAR_IF([acx_cache_var], [unknown], - [m4_default([$3], - [AC_MSG_FAILURE([unable to detect Fortran compiler flag needed to dnl -accept m4_default([$1], [132]) column source lines])])], - [m4_default([$2], - [AS_IF([test -n "$acx_cache_var"], - [AS_VAR_APPEND([FCFLAGS], [" $acx_cache_var"])])])]) - m4_popdef([acx_cache_var])]) -- GitLab