Update autotooling.

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 '}' \
+-e 's/^\(-Wl\)/-XCClinker \1/;s/^\(-Wc,\)/-Xcompiler \1/' \
+-e 's/^\(-Wc=.*\)/-Xcompiler \1 -XCClinker \1/' -e '}' \
    | tr '\n' ' ' | sed -e 's/ $//'`])])
 AC_DEFUN([_ACX_LT_FORT_FLAGS_MANGLE],
   [_AC_FORTRAN_ASSERT
@@ -50,7 +51,7 @@ AC_DEFUN([_ACX_LT_FORT_FLAGS_MANGLE],
      [AS_VAR_PUSHDEF([acx_FC],[F77])dnl
       AS_VAR_PUSHDEF([acx_FCFLAGS],[FFLAGS])dnl
       AS_VAR_PUSHDEF([acx_LDFLAGS],[F77LDFLAGS])])
-   acx_temp=`$acx_FC -V 2>&1 | sed 5q`
+   acx_temp=`$acx_FC -V 2>&1 | sed -n 1,5p`
 dnl fix problems from NAG compiler
    AS_CASE(["$acx_temp"],
      [*NAG\ Fortran\ Compiler\ Release*],
@@ -75,17 +76,19 @@ AC_DEFUN([ACX_USE_LIBTOOL_CONFIGURATION],
 dnl add some monkey patching for older libtool versions that don't handle
 dnl newer PGI or NAG configurations particularly well
    m4_if(m4_cmp(m4_version_compare(LT_PACKAGE_VERSION,[2.4.6]),1),-1,
-     [m4_pushdef([_LT_COMPILER_PIC],m4_bpatsubst(m4_dquote(m4_defn([_LT_COMPILER_PIC])),[;;
+     [m4_pushdef([_LT_COMPILER_PIC],m4_bpatsubst(m4_dquote(m4_bpatsubst(m4_dquote(m4_defn([_LT_COMPILER_PIC])),[;;
 	\*Portland\\ ],[;; @%:@(
 	*NAG\\ Fortran\\ Compiler*)
 	  _LT_TAGVAR(lt_prog_compiler_wl, $][1)='-Wl,-Wl,,'
 	  _LT_TAGVAR(lt_prog_compiler_pic, $][1)='-PIC'
 	  _LT_TAGVAR(lt_prog_compiler_static, $][1)='-Bstatic'
 	  ;;
-	*PGI\\ Compilers\\ and\\ Tools*|*Port][land\\ ]))dnl
+	*PGI\\ Compilers\\ and\\ Tools*|*NVIDIA\\ Compilers\\ and\\ Tools*|*Port][land\\ ])),[sed 5q`],[sed -n 1,5p`]))dnl
+      m4_pushdef([_LT_LANG_CXX_CONFIG],m4_bpatsubst(m4_dquote(m4_defn([_LT_LANG_CXX_CONFIG])),
+        [sed 5q`],[sed -n 1,5p`]))dnl
       m4_pushdef([_LT_LINKER_SHLIBS],m4_bpatsubst(m4_dquote(
         m4_bpatsubst(m4_dquote(m4_bpatsubst(m4_dquote(
-          m4_bpatsubst(m4_dquote(m4_defn(
+        m4_bpatsubst(m4_dquote(m4_bpatsubst(m4_dquote(m4_defn(
           [_LT_LINKER_SHLIBS])),[tmp_sharedflag='-shared'],
           [tmp_sharedflag='-shared'
 	tmp_compiler_flags='$compiler_flags'])),
@@ -99,7 +102,7 @@ dnl newer PGI or NAG configurations particularly well
 ],[\&	*NAG\\ Fortran\\ Compiler*\1
 	  tmp_sharedflag='-Wl,-shared'
 	  tmp_compiler_flags='`echo \$compiler_flags | sed -e '"'"'s/ -W@<:@cl@:>@,-no-pie\\b//g'"'"'`' ;;
-]))dnl
+])),[sed 5q`],[sed -n 1,5p`]))dnl
       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"],
@@ -129,9 +132,19 @@ dnl newer PGI or NAG configurations particularly well
    dnl _KPSE_USE_LIBTOOL ensures libtool is also used for configure-time tests,
    dnl which deduces dependent libraries automatically
    _KPSE_USE_LIBTOOL
-   AC_LANG_PUSH([C])
-   _KPSE_CHECK_LIBTOOL
-   AC_LANG_POP([C])
+dnl substitute -shared-intel if present
+   AS_FOR([acx_flag_var],[acx_flag_var_],[CFLAGS CXXFLAGS FCFLAGS F77FLAGS LDFLAGS FCLDFLAGS],
+     [AS_IF([eval test x\$\{acx_flag_var+set\} = xset],
+        [eval acx_temp="\" \$$acx_flag_var_ \""
+         AS_CASE([$acx_temp],[*\ -shared-intel\ *|*\ -static-intel\ *],
+           [acx_temp=`echo "$acx_temp" | sed -e 's/ \(-\(shared\|static\)-intel\)\b/ -Xcompiler \1 -XCClinker \1/'`])
+dnl take care of ifort/icc/icpc two-part options
+         eval acx_flag_var=\"`echo "$acx_temp" | sed -e 's/ -\(align\|allow\|assume\|ccdefault\|check\|convert\|debug\|debug-parameters\|diag-type\|diag-enable\|diag-disable\|double-size\|dynamic-linker\|dyncom\|export-dir\|extend-source\|fp-model\|fpscomp\|gen-interfaces\|heap-arrays\|imacros\|integer-size\|iprefix\|iquote\|iwithprefixbefore\|module\|names\|opt-report\|opt-streaming-stores\|pch-dir\|pch-use\|prof-dir\|prof-file\|real-size\|reentrancy\|stand\|tcollect-filter\|tune\|warn\|watch\) \(@<:@^-@:>@@<:@^ @:>@*\)\b/ -Xcompiler -\1 -Xcompiler \2/g' -e 's/^ //;s/ $//'`\"])])
+   AC_PROVIDE_IFELSE([AC_PROG_CC],
+     [AS_IF([test -n "$CC" -a X"$CC" != Xno],
+        [AC_LANG_PUSH([C])
+         _KPSE_CHECK_LIBTOOL
+         AC_LANG_POP([C])])])
    AC_PROVIDE_IFELSE([AC_PROG_FC],
      [AS_IF([test -n "$FC" -a X"$FC" != Xno],
         [AC_LANG_PUSH([Fortran])
@@ -144,14 +157,11 @@ dnl newer PGI or NAG configurations particularly well
          _ACX_LT_FORT_FLAGS_MANGLE
          _KPSE_CHECK_LIBTOOL
          AC_LANG_POP([Fortran 77])])])
-dnl substitute -shared-intel if present
-   AS_FOR([acx_flag_var],[acx_flag_var_],[CFLAGS CXXFLAGS FCFLAGS F77FLAGS LDFLAGS FCLDFLAGS],
-     [AS_IF([eval test x\$\{acx_flag_var+set\} = xset],
-        [eval acx_temp="\" \$$acx_flag_var_ \""
-         AS_CASE([$acx_temp],[*\ -shared-intel\ *|*\ -static-intel\ *],
-           [acx_temp=`echo "$acx_temp" | sed -e 's/ \(-\(shared\|static\)-intel\)\b/ -Xcompiler \1 -XCClinker \1/'`])
-dnl take care of ifort/icc/icpc two-part options
-         eval acx_flag_var=\"`echo "$acx_temp" | sed -E -e 's/ -(align|allow|assume|ccdefault|check|convert|debug|debug-parameters|diag-type|diag-enable|diag-disable|double-size|dynamic-linker|dyncom|export-dir|extend-source|fp-model|fpscomp|gen-interfaces|heap-arrays|imacros|integer-size|iprefix|iquote|iwithprefixbefore|module|names|opt-report|opt-streaming-stores|pch-dir|pch-use|prof-dir|prof-file|real-size|reentrancy|stand|tcollect-filter|tune|warn|watch) (@<:@^-@:>@@<:@^ @:>@*)\b/ -Xcompiler -\1 -Xcompiler \2/g' -e 's/^ //;s/ $//'`\"])])])dnl
+   AC_PROVIDE_IFELSE([AC_PROG_CXX],
+     [AS_IF([test -n "$CXX" -a X"$CXX" != Xno],
+        [AC_LANG_PUSH([C++])
+         _KPSE_CHECK_LIBTOOL
+         AC_LANG_POP([C++])])])])dnl
 dnl
 dnl Local Variables:
 dnl mode: autoconf