build system: Autotools file update from PPM.

m4/acx_prog_fc_check_fpp.m4

@@ -62,7 +62,7 @@ AC_DEFUN([ACX_PROG_FC_CHECK_FPP],dnl
 Please consult your compiler documentation for a flag to make $FC
 preprocess files with .$ac_ext suffix and add it to ]acx_flags_var[.
 Also please consider reporting the flag/compiler combination to Thomas Jahns <jahns@dkrz.de>])])])])
-   FC_FPP_FLAG=AS_VAR_GET([fpp_flag])
+   AS_VAR_COPY([FC_FPP_FLAG],[fpp_flag])
    m4_popdef([acx_flags_var])dnl
    AC_SUBST([FC_FPP_FLAG])
    AS_VAR_POPDEF([fpp_flag])dnl

m4/starlink_fpp.m4

@@ -304,7 +304,7 @@ AC_DEFUN([_ACX_SL_PROG_FPP],
            "$FC -F -fpp -o - -Wp,-w,-P" \
            "$ac_fpp"/util/sunf95preproc-wrapper \
            "$ac_fpp"/util/crayftnpreproc-wrapper \
-           "$FC -F" "$FC -F -fpp" "$FC -E" "$FC -E -cpp" \
+           "$FC -F" "$FC -F -fpp" "$FC -E -cpp" "$FC -E" \
            "$FC $FCFLAGS -F" "$FC $FCFLAGS -E" "$FC $FCFLAGS -E" \
            "$FC $FCFLAGS -E -cpp" "$FC $FCFLAGS -x f95-cpp-input -E -P"],
            [_ACX_SL_TEST_FPP([$ac_fpp],[$acx_sl_fpp_srcext],
@@ -365,13 +365,16 @@ fi
 # with preprocessor flags
 m4_define([_ACX_FPP_COMPILE_IFELSE],
   [m4_if([$2],[direct],
-     [cp conftest.$acx_sl_fpp_srcext conftest.${ac_ext}.tmp
-      FCFLAGS="$FPPFLAGS $1 $ac_save_FCFLAGS"],
+     [FCFLAGS="$FPPFLAGS $1 $ac_save_FCFLAGS"
+      cp conftest.$acx_sl_fpp_srcext conftest.${ac_ext}.tmp
+      ac_status=$?],
      [_AC_RUN_LOG([$FPP $FPPFLAGS m4_ifval([$1],[$1 ])conftest.$acx_sl_fpp_srcext \
         >conftest.${ac_ext}.tmp],
         [echo Running preprocessor $FPP $FPPFLAGS m4_ifval([$1],[$1 ])conftest.$acx_sl_fpp_srcext])])
-   mv conftest.${ac_ext}.tmp conftest.${ac_ext}
-   AC_COMPILE_IFELSE(,[$3],[$4])])
+   AS_IF([test $ac_status = 0],
+     [mv conftest.${ac_ext}.tmp conftest.${ac_ext}
+      AC_COMPILE_IFELSE(,[$3],[$4])],
+     [$4])])
 
 # ACX_SL_PROG_FC_FPP_FEATURES(FEATURES,METHOD,[SUFFIX],
 #  [ACTION-IF-SUCCESS],[ACTION-IF-FAILURE])

scripts/makef90depends

@@ -464,7 +464,8 @@ sub parseSource($$$;$)
                                            [$sigil eq '<' ? $headerSpec : () ],
                                            [$sigil eq '"' ? $headerSpec : () ],
                                            @$incDirs);
-            parseSource($incfile, $defines, $incDirs, $preprocOutFh);
+            parseSource($incfile, $defines, $incDirs, $preprocOutFh)
+                if (defined($incfile));
             print(STDERR 'Unsupported preprocessor include "',
                   $headerSpec,
                   '" found while writing preprocessor output!')
@@ -709,6 +710,29 @@ sub buildNameSubst(\@)
    }
 }
 
+sub createTmpDir()
+{
+   my $tmpdir = (defined($ENV{'XDG_RUNTIME_DIR'})
+                 && -w $ENV{'XDG_RUNTIME_DIR'})
+       ? $ENV{'XDG_RUNTIME_DIR'}
+       : File::Spec->catfile(File::Spec->tmpdir(), $>);
+   if (mkdir($tmpdir, 0700))
+   {
+      if ($!{EEXIST})
+      {
+         my (undef,undef,$mode,undef,$uid) = stat($tmpdir);
+         return $tmpdir
+             if ($uid == $>
+                 and ($mode & 0222) == 0200);
+      }
+   }
+   else
+   {
+      return $tmpdir;
+   }
+   return '';
+}
+
 
 {
    # choose defaults for LP64
@@ -742,6 +766,7 @@ sub buildNameSubst(\@)
           map { ($_, undef) }
               qw(_LMFILES_ __LMFILES__
                  _LMFILES__modshare
+                 _
                  ALLINEA_LICENCE_DIR ALLINEA_NO_TREESERVER_KILL_TARGET
                  ALTERNATE_EDITOR COLORTERM
                  DBUS_SESSION_BUS_ADDRESS DEBUG DESKTOP_SESSION DISPLAY
@@ -783,7 +808,7 @@ sub buildNameSubst(\@)
                  SSH_TTY TERM TEST_LOGS TESTS TESTSUITEFLAGS
                  TMPDIR TMUX TMUX_PANE
                  USERNAME
-                 VBOX_CROGL_FORCE_SUPPORTED
+                 V VBOX_CROGL_FORCE_SUPPORTED
                  VGL_COMPRESS VGL_DISPLAY VGL_ISACTIVE VGL_WM VNCDESKTOP VISUAL
                  WINDOWID WINDOWPATH
                  WINDOW_MANAGER XAUTHORITY
@@ -958,6 +983,7 @@ sub buildNameSubst(\@)
       # tie cache of parsed files to database if available
       if (defined($parseCacheDB))
       {
+         my $parseCacheEmpty = ! -e $parseCacheDB || -z $parseCacheDB;
          @AnyDBM_File::ISA = qw(DB_File GDBM_File);
          eval {
             no warnings 'all';
@@ -1032,14 +1058,17 @@ sub buildNameSubst(\@)
                          if ($optArgs_serialized ne $savedOptArgs_serialized);
                   }
                };
-               if (defined ($ENVdiff)) {
+               if (defined ($ENVdiff) && !$parseCacheEmpty) {
                   my $ENVdiffFP;
                   if ($debug) {
                      print(STDERR $ENVdiff, "\n");
                   }
-                  if (open($ENVdiffFP, '>>',
-                           File::Spec->catfile(File::Spec->tmpdir(),
-                                               'makef90depends-envdiff.txt'))) {
+                  my $tmpdir = createTmpDir();
+                  if ($tmpdir
+                      && open($ENVdiffFP, '>>',
+                              File::Spec->catfile($tmpdir,
+                                                  'makef90depends-envdiff.txt')
+                             )) {
                      print($ENVdiffFP $ENVdiff, "\n");
                   }
                }