Autotools macro update.

m4/acx_cfortran_flags.m4

@@ -36,7 +36,7 @@ dnl LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING
 dnl NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
 dnl SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 dnl
-dnl ACX_FC_XLF_QEXTNAME_ADD_APPENDUS
+dnl ACX_FC_XLF_QEXTNAME_ADD_APPENDUS([ACTION-IF-FAILURE = FAILURE])
 dnl Test if compiler is xlf and if -qextname is in use.
 dnl Add -Dappendus to CPPFLAGS if the above applies.
 dnl
@@ -61,7 +61,11 @@ AC_DEFUN([ACX_XLF_QEXTNAME_ADD_APPENDUS],
               [acx_temp_qextname_fcflags=$acx_temp_qextname_f77flags])])
          AS_CASE([x"$acx_temp_qextname_fcflags$acx_temp_qextname_f77flags"],
            [x-qextname],
-           [AC_MSG_ERROR([Option -qextname must be provided consistently to F77 and FC])],
+           [AC_MSG_RESULT([error])
+            acx_failure_msg="option -qextname must be provided consistently to F77 and FC"
+            m4_default(
+              [$1],
+              [AC_MSG_ERROR([$acx_failure_msg])])],
            [x-qextname-qextname],
            [AC_MSG_RESULT([yes])
             CPPFLAGS="${CPPFLAGS+$CPPFLAGS }-Dappendus"],
@@ -96,7 +100,7 @@ dnl check if compiling with f2c bindings or with default bindings
               [AS_VAR_SET([acx_cf_flag],[-DgFortran])])])],
         [echo $acx_temp | grep '^G95' >/dev/null],
         [AS_VAR_SET([acx_cf_flag],[-DNAGf90Fortran])],
-        [$acx_FC -v 2>&1 | sed 5q | grep '^f2c'],
+        [$acx_FC -v 2>&1 | sed 5q | grep '^f2c' >/dev/null],
         [AS_VAR_SET([acx_cf_flag],[-Df2cFortran])])],
      [powerpc64-*-linux-*|powerpc-*-linux-*],
      [AS_IF([$acx_FC -qversion 2>&1 | sed 5q | grep '^IBM XL Fortran' >/dev/null],
@@ -128,8 +132,9 @@ p'`
          AS_IF([test x"$acx_temp" != x],
            [AS_IF([test x"$acx_cv_cf_flag" = x],
               [acx_cv_cf_flag="$acx_temp (user-specified)"],
-              [echo ; echo '"'"$acx_cv_cf_flag $acx_temp"'"'
-               AC_MSG_ERROR([Multiple specification of cfortran.h flags])])])])
+              [acx_failure_msg="multiple specification of cfortran.h flags: "`echo "$acx_cv_cf_flag" | sed 's/ (user-specified)$//'`" $acx_temp"
+               acx_cv_cf_flag='error'
+               break])])])
 dnl find automatically from machine/compiler
       AS_IF([test x"$acx_cv_cf_flag" = x],
         [AC_PROVIDE_IFELSE([AC_PROG_FC],
@@ -156,15 +161,16 @@ dnl check f77 flag matches fc flag
                  [acx_cv_cf_flag="$acx_cv_f77_cf_flag (probed)"],
                  [AS_IF([test x"$acx_cv_f77_cf_flag" = x"$acx_cv_fc_cf_flag"],
                     [acx_cv_cf_flag="$acx_cv_f77_cf_flag (probed)"],
-                    [AC_MSG_ERROR([cfortran.h flag for $F77 does not match the flag for $FC.
-Have you configured compatible compilers?])])])
-              ])],[acx_cv_cf_flag="$acx_cv_fc_cf_flag (probed)"])
-        ])
-     ])
+                    [acx_failure_msg="cfortran.h flag for $F77 does not match the flag for $FC.
+Did you configure compatible compilers?"
+                     acx_cv_cf_flag='error'])])])],
+           [acx_cv_cf_flag="$acx_cv_fc_cf_flag (probed)"])])])
+   AS_IF([test x"$acx_cv_cf_flag" = xerror],
+     [m4_default([$1],
+        [AC_MSG_ERROR([$acx_failure_msg])])])
 dnl now that flag is established, add (probed) defines to CPPFLAGS
    AS_IF([echo "$acx_cv_cf_flag" | grep ' (probed)$' >/dev/null],
-     [acx_temp=`echo "$acx_cv_cf_flag" | sed 's/ (probed)$//'`
-      CPPFLAGS="${CPPFLAGS+$CPPFLAGS }$acx_temp"])
+     [CPPFLAGS="${CPPFLAGS+$CPPFLAGS }"`echo "$acx_cv_cf_flag" | sed 's/ (probed)$//'`])
   ])
 dnl
 dnl Local Variables:

m4/acx_fortran_package.m4

@@ -102,7 +102,6 @@ AC_DEFUN([ACX_F90_PACKAGE],
    AC_REQUIRE([_ASX_TR_ARG_PREPARE])dnl
    AC_SUBST(acx_pkg_root)dnl
    AS_VAR_SET([acx_pkg_bindings],[yes])
-   AC_SUBST(acx_pkg_root)dnl
    AC_ARG_WITH(ASX_TR_ARG([$1-root]),
      [AS_HELP_STRING([--with-]ASX_TR_ARG([$1])[-root],
         [set directory to search for $1 headers and library]m4_ifval([$11],[, @<:@default=$11@:>@]))],

m4/acx_sl_mod_suffix.m4

@@ -86,7 +86,7 @@ dnl in the directory with the object file, therefore we try to delete everything
 dnl
    AC_MSG_CHECKING([for suffix of module files])
    ac_fc_mod_uppercase=no
-   AS_CASE(["$acx_cv_fc_mod_name"],
+   AS_CASE([$acx_cv_fc_mod_name],
      [conftest_module.$FCMODEXT], [:],
      [CONFTEST_MODULE.$FCMODEXT], [ac_fc_mod_uppercase=yes],
      [conftest_module.mod], [FCMODEXT=mod],

m4/acx_use_libtool_configuration.m4

@@ -38,7 +38,8 @@ dnl _ACX_LT_FLAGS_MANGLE
 m4_define([nag_filter_flag_var],
   [AS_IF([test x${$1+set} = xset],
      [$1=`echo "$][$1" | tr ' ' '\n' | sed -e '/^-W@<:@lc@:>@/{' \
--e 's/^\(-Wl\)/-XCClinker \1/;s/^\(-Wc\)/-Xcompiler \1/' -e '}'     | tr '\n' ' '`])])
+-e 's/^\(-Wl\)/-XCClinker \1/;s/^\(-Wc\)/-Xcompiler \1/' -e '}' \
+   | tr '\n' ' ' | sed -e 's/ $//'`])])
 AC_DEFUN([_ACX_LT_FORT_FLAGS_MANGLE],
   [_AC_FORTRAN_ASSERT
    AC_LANG_CASE([Fortran],
@@ -64,7 +65,7 @@ dnl fix conflicting use of -module by libtool and ifort
    AS_VAR_POPDEF([acx_FCFLAGS])dnl
    AS_VAR_POPDEF([acx_LDFLAGS])])
 dnl
-dnl ACX_USE_LIBTOOL_CONFIGURATION
+dnl ACX_USE_LIBTOOL_CONFIGURATION([ARGS-TO-LT_INIT])
 dnl Switch compiler to libtool wrapper and prevent occurrence of
 dnl problematic setups
 AC_DEFUN([ACX_USE_LIBTOOL_CONFIGURATION],
@@ -99,8 +100,8 @@ dnl newer PGI or NAG configurations particularly well
 	  tmp_sharedflag='-Wl,-shared'
 	  tmp_compiler_flags='`echo \$compiler_flags | sed -e '"'"'s/ -W@<:@cl@:>@,-no-pie\\b//g'"'"'`' ;;
 ]))dnl
-      m4_pushdef([_LT_SYS_HIDDEN_LIBDEPS],m4_bpatsubst(m4_dquote(
-        m4_bpatsubst(m4_dquote(
+      m4_pushdef([_LT_SYS_HIDDEN_LIBDEPS],[AS_UNSET([output_verbose_link_cmd])]
+        m4_bpatsubst(m4_dquote(m4_bpatsubst(m4_dquote(
           m4_defn([_LT_SYS_HIDDEN_LIBDEPS])),[test x-\([LR]\) = "\$p"],
             [test x-\1 = x"$p"])),
           [test x-R = x"\$p"],[\& ||
@@ -118,9 +119,10 @@ dnl newer PGI or NAG configurations particularly well
     AC_MSG_RESULT([$_lt_result])
     _LT_TAGVAR([acx_is_nagfor], $][1)=$_lt_result
     \&]))])dnl
-   LT_INIT
+   LT_INIT([$1])
    m4_popdef([_LT_LANG_F77_CONFIG])dnl
    m4_popdef([_LT_LANG_FC_CONFIG])dnl
+   m4_popdef([_LT_LANG_C_CONFIG])dnl
    m4_if(m4_cmp(m4_version_compare(LT_PACKAGE_VERSION,[2.4.6]),1),-1,
      [m4_popdef([_LT_COMPILER_PIC])m4_popdef([_LT_LINKER_SHLIBS])dnl
       m4_popdef([_LT_SYS_HIDDEN_LIBDEPS])])dnl

scripts/makef90depends

@@ -736,8 +736,9 @@ sub buildNameSubst(\@)
                  GNUSTEP_USER_ROOT GPG_AGENT_INFO
                  GTK_RC_FILES HISTCONTROL HISTFILESIZE HISTSIZE
                  ICAROOT INDEXSTYLE LESS LESSCLOSE LESSOPEN LOADEDMODULES
-                 LOADEDMODULES_modshare LS_COLORS MAKEFLAGS MAKELEVEL
-                 MAKEOVERRIDES MANPATH MANPATH_modshare MFLAGS
+                 LOADEDMODULES_modshare LS_COLORS
+                 MAKEFLAGS MAKELEVEL MAKEOVERRIDES MAKE_TERMERR MAKE_TERMOUT
+                 MANPATH MANPATH_modshare MFLAGS
                  MODULEPATH_modshare MUTT_XTITLES
                  PAGER PATH_modshare PROFILEREAD RSYNC_RSH SESSION_MANAGER
                  SHLVL SSH_AGENT_PID SSH_AUTH_SOCK SSH_CLIENT SSH_CONNECTION
@@ -746,10 +747,13 @@ sub buildNameSubst(\@)
                  WINDOW_MANAGER XAUTHORITY
                  XDG_CURRENT_DESKTOP XDG_DATA_DIRS XDG_MENU_PREFIX
                  XDG_RUNTIME_DIR XDG_SEAT XDG_SESSION_DESKTOP XDG_SESSION_ID
-                 XDG_VTNR XDG_SESSION_COOKIE XDG_SESSION_ID);
+                 XDG_VTNR XDG_SESSION_COOKIE XDG_SESSION_ID
+                 XKL_XMODMAP_DISABLE);
       $ENVdigest = join("\0",
                         (map { "$_=$ENV{$_}" }
-                         (sort grep { !exists($mostlyHarmless{$_}) } keys(%ENV))));
+                             (sort grep { !exists($mostlyHarmless{$_})
+                                          && rindex($_,'BASH_FUNC_',0) }
+                              keys(%ENV))));
       my $optionParser = new Getopt::Long::Parser;
       # This program should accept the full set of preprocessor flags,
       # but might not implement all of them. Therefore abbreviation and