*** ATLAS/config.c	Mon Dec 22 08:06:32 2003
--- ATLAS_working/config.c	Mon Feb  9 16:26:31 2004
***************
*** 107,110 ****
--- 107,120 ----
  FILE *fpI, *fparch;
  
+ int my_system(const char *string) {
+   int status;
+   fflush(stdout);
+   fflush(stderr);
+   fprintf(stderr,"### %s",string);
+   fflush(stderr);
+   status = system(string);
+   return status;
+ }
+ 
  #include <time.h>
  void GetDate(int *month, int *day, int *year, int *hour, int *min)
***************
*** 336,340 ****
     if (targ) sprintf(ln, "ssh %s \"%s\" > %s 2>&1 \n", targ, cmnd, tnam);
     else sprintf(ln, "%s > %s 2>&1\n", cmnd, tnam);
!    if (!system(ln)) return(tnam);
     else return(NULL);
  }
--- 346,350 ----
     if (targ) sprintf(ln, "ssh %s \"%s\" > %s 2>&1 \n", targ, cmnd, tnam);
     else sprintf(ln, "%s > %s 2>&1\n", cmnd, tnam);
!    if (!my_system(ln)) return(tnam);
     else return(NULL);
  }
***************
*** 507,511 ****
     *files0 = fpp;
     sprintf(ln, "%s %s/ -name \'%s\' 2> /dev/null > %s\n", fnd, dir, fnam, tnam);
!    i = system(ln);
     fp = fopen(tnam, "r");
     if (fp)
--- 517,521 ----
     *files0 = fpp;
     sprintf(ln, "%s %s/ -name \'%s\' 2> /dev/null > %s\n", fnd, dir, fnam, tnam);
!    i = my_system(ln);
     fp = fopen(tnam, "r");
     if (fp)
***************
*** 828,832 ****
  
     sprintf(ln, "cd CONFIG ; make IGetSunVers %s\n", redir);
!    system(ln);
     fp = fopen(tnam, "r");
     fgets(ln, 256, fp);
--- 838,842 ----
  
     sprintf(ln, "cd CONFIG ; make IGetSunVers %s\n", redir);
!    my_system(ln);
     fp = fopen(tnam, "r");
     fgets(ln, 256, fp);
***************
*** 876,880 ****
                F77, F77FLAGS, FLINK, FLFLAGS, CC, CCFLAGS, TOPdir, tnam);
     sprintf(ln, "cd CONFIG ; make IRunName %s %s\n", compdef, redir);
!    F2C_assert(system(ln) == 0);
     fp = fopen(tnam, "r");
     F2C_assert(fp);
--- 886,890 ----
                F77, F77FLAGS, FLINK, FLFLAGS, CC, CCFLAGS, TOPdir, tnam);
     sprintf(ln, "cd CONFIG ; make IRunName %s %s\n", compdef, redir);
!    F2C_assert(my_system(ln) == 0);
     fp = fopen(tnam, "r");
     F2C_assert(fp);
***************
*** 899,903 ****
                TOPdir, tnam);
     sprintf(ln, "cd CONFIG ; make IRunInt %s %s\n", compdef, redir);
!    F2C_assert(system(ln) == 0);
     fp = fopen(tnam, "r");
     F2C_assert(fp);
--- 909,913 ----
                TOPdir, tnam);
     sprintf(ln, "cd CONFIG ; make IRunInt %s %s\n", compdef, redir);
!    F2C_assert(my_system(ln) == 0);
     fp = fopen(tnam, "r");
     F2C_assert(fp);
***************
*** 925,929 ****
                compdef, CCFLAGS, strdef[i], intdef[*f2cint], namdef[*f2cnam],
                redir);
!       if (system(ln) == 0)
        {
           fp = fopen(tnam, "r");
--- 935,939 ----
                compdef, CCFLAGS, strdef[i], intdef[*f2cint], namdef[*f2cnam],
                redir);
!       if (my_system(ln) == 0)
        {
           fp = fopen(tnam, "r");
***************
*** 958,962 ****
        "cd CONFIG ; make IBlasLink F77=\"%s\" F77FLAGS=\"%s\" BLASlib=\"%s\" %s\n",
                F77, F77FLAGS, BLASlib, redir);
!       if (system(ln) == 0)
        {
           ATL_mprintf(2, fplog, fpout, "BLASlib set to %s.\n", BLASlib);
--- 968,972 ----
        "cd CONFIG ; make IBlasLink F77=\"%s\" F77FLAGS=\"%s\" BLASlib=\"%s\" %s\n",
                F77, F77FLAGS, BLASlib, redir);
!       if (my_system(ln) == 0)
        {
           ATL_mprintf(2, fplog, fpout, "BLASlib set to %s.\n", BLASlib);
***************
*** 976,980 ****
        "cd CONFIG ; make IBlasLink F77=\"%s\" F77FLAGS=\"%s\" BLASlib=\"%s\" %s\n",
                      F77, F77FLAGS, files[i], redir);
!             if (system(ln) == 0)
              {
                 strcpy(BLASlib, files[i]);
--- 986,990 ----
        "cd CONFIG ; make IBlasLink F77=\"%s\" F77FLAGS=\"%s\" BLASlib=\"%s\" %s\n",
                      F77, F77FLAGS, files[i], redir);
!             if (my_system(ln) == 0)
              {
                 strcpy(BLASlib, files[i]);
***************
*** 1074,1078 ****
           sprintf(ln, "cd CONFIG ; make %cTryComp COMP=\"%s\" FLAGS=\"%s\" %s\n",
                   lang, ln2, flags, redir);
!          if (system(ln) == 0) return(ln2);
           ATL_mprintf(2, fplog, fpout, "   %s %s rejected\n", ln2, flags);
        }
--- 1084,1088 ----
           sprintf(ln, "cd CONFIG ; make %cTryComp COMP=\"%s\" FLAGS=\"%s\" %s\n",
                   lang, ln2, flags, redir);
!          if (my_system(ln) == 0) return(ln2);
           ATL_mprintf(2, fplog, fpout, "   %s %s rejected\n", ln2, flags);
        }
***************
*** 1092,1096 ****
                      "cd CONFIG ; make %cTryComp COMP=\"%s\" FLAGS=\"%s\" %s\n",
                      lang, matches[i], flags, redir);
!             if (system(ln) == 0) return(matches[i]);
              ATL_mprintf(2, fplog, fpout, "   %s rejected\n", matches[i]);
           }
--- 1102,1106 ----
                      "cd CONFIG ; make %cTryComp COMP=\"%s\" FLAGS=\"%s\" %s\n",
                      lang, matches[i], flags, redir);
!             if (my_system(ln) == 0) return(matches[i]);
              ATL_mprintf(2, fplog, fpout, "   %s rejected\n", matches[i]);
           }
***************
*** 1102,1106 ****
     sprintf(ln, "cd CONFIG ; make %cTryComp COMP=\"%s\" FLAGS=\"%s\" %s\n",
             lang, comp, flags, redir);
!    if (system(ln) == 0) return(comp);
     ATL_mprintf(2, fplog, fpout, "   %s %s rejected\n", comp, flags);
  
--- 1112,1116 ----
     sprintf(ln, "cd CONFIG ; make %cTryComp COMP=\"%s\" FLAGS=\"%s\" %s\n",
             lang, comp, flags, redir);
!    if (my_system(ln) == 0) return(comp);
     ATL_mprintf(2, fplog, fpout, "   %s %s rejected\n", comp, flags);
  
***************
*** 1121,1125 ****
  "cd CONFIG; make win%s wcname=/usr/local/bin/ATLwin_%s wcexe='-DDEFDF=\"%s\"'",
             WCIsF77(wc) ? "f77" : "cc", wcnam[wc], ln);
!    return(system(ln2));
  }
  
--- 1131,1135 ----
  "cd CONFIG; make win%s wcname=/usr/local/bin/ATLwin_%s wcexe='-DDEFDF=\"%s\"'",
             WCIsF77(wc) ? "f77" : "cc", wcnam[wc], ln);
!    return(my_system(ln2));
  }
  
***************
*** 1132,1136 ****
     sprintf(ln, "cd CONFIG ; make %cTryComp COMP=\"ATLwin_%s\" FLAGS=\"\"",
             WCIsF77(wc) ? 'f' : 'c', wcnam[wc]);
!    return(system(ln));
  }
  
--- 1142,1146 ----
     sprintf(ln, "cd CONFIG ; make %cTryComp COMP=\"ATLwin_%s\" FLAGS=\"\"",
             WCIsF77(wc) ? 'f' : 'c', wcnam[wc]);
!    return(my_system(ln));
  }
  
***************
*** 1168,1172 ****
           ierr = GetIntRange(1, 0, 1, "", "0 skips, 1 to reenter/try again");
           sprintf(ln, "rm -f /usr/local/bin/ATLwin_%s.exe", wcnam[wc]);
!          system(ln);
        }
        else FAIL = 0;
--- 1178,1182 ----
           ierr = GetIntRange(1, 0, 1, "", "0 skips, 1 to reenter/try again");
           sprintf(ln, "rm -f /usr/local/bin/ATLwin_%s.exe", wcnam[wc]);
!          my_system(ln);
        }
        else FAIL = 0;
***************
*** 3332,3336 ****
           fprintf(stdout, "\n\nTRYING TO ssh %s\n", targnam);
           sprintf(ln, "ssh %s \"ls\"", targnam);
!          ierr = system(ln);
           if (ierr) DisplayFile("CONFIG/xcomp-err.txt", stdout, NLINES);
           else fprintf(stdout, "\n\nssh successful!\n\n");
--- 3342,3346 ----
           fprintf(stdout, "\n\nTRYING TO ssh %s\n", targnam);
           sprintf(ln, "ssh %s \"ls\"", targnam);
!          ierr = my_system(ln);
           if (ierr) DisplayFile("CONFIG/xcomp-err.txt", stdout, NLINES);
           else fprintf(stdout, "\n\nssh successful!\n\n");
***************
*** 3458,3461 ****
--- 3468,3472 ----
  #endif
     if (targ) XCOMP = 1;
+    CmndOneLine(targ, "env", ln);
  /*
   * Set up some good defaults
***************
*** 3712,3716 ****
        }
        sprintf(ln, "%s -c CONFIG/tst.f %s\n", F77, redir);
!       ierr = system(ln);
        if (ierr)
        {
--- 3723,3727 ----
        }
        sprintf(ln, "%s -c CONFIG/tst.f %s\n", F77, redir);
!       ierr = my_system(ln);
        if (ierr)
        {
***************
*** 3744,3748 ****
        }
        sprintf(ln, "%s %s -c CONFIG/tst.c %s\n", CC, CCFLAGS, redir);
!       ierr = system(ln);
        if (ierr)
        {
--- 3755,3759 ----
        }
        sprintf(ln, "%s %s -c CONFIG/tst.c %s\n", CC, CCFLAGS, redir);
!       ierr = my_system(ln);
        if (ierr)
        {
***************
*** 3773,3777 ****
        Wstrfndsub("$(CDEFS)", "", ln, cflg);
        sprintf(ln, "%s %s -c CONFIG/tst.c %s\n", comp, cflg, redir);
!       ierr = system(ln);
        if (ierr)
        {
--- 3784,3788 ----
        Wstrfndsub("$(CDEFS)", "", ln, cflg);
        sprintf(ln, "%s %s -c CONFIG/tst.c %s\n", comp, cflg, redir);
!       ierr = my_system(ln);
        if (ierr)
        {
***************
*** 3810,3814 ****
           Wstrfndsub("$(CDEFS)", "", ln, cflg);
           sprintf(ln, "%s %s -c CONFIG/tst.c %s\n", comp, cflg, redir);
!          ierr = system(ln);
           if (ierr)
           {
--- 3821,3825 ----
           Wstrfndsub("$(CDEFS)", "", ln, cflg);
           sprintf(ln, "%s %s -c CONFIG/tst.c %s\n", comp, cflg, redir);
!          ierr = my_system(ln);
           if (ierr)
           {
***************
*** 3926,3930 ****
              sprintf(ln, "cd CONFIG/ARCHS ; %s -c %s.tgz | %s xf - %s\n",
                      GUNZIP, sp, TAR, redir);
!             system(ln);
              ATL_mprintf(2, fplog, stdout, "done.\n");
              GetArchDef(OS, mach, sp, CC, CCFLAGS, MCC, MMFLAGS, mmdef, archdef);
--- 3937,3941 ----
              sprintf(ln, "cd CONFIG/ARCHS ; %s -c %s.tgz | %s xf - %s\n",
                      GUNZIP, sp, TAR, redir);
!             my_system(ln);
              ATL_mprintf(2, fplog, stdout, "done.\n");
              GetArchDef(OS, mach, sp, CC, CCFLAGS, MCC, MMFLAGS, mmdef, archdef);
***************
*** 4186,4190 ****
        fclose(fpout);
        sprintf(ln, "chmod a+rx CONFIG/ATLrun.%s\n", ARCH);
!       assert(system(ln) == 0);
     }
  
--- 4197,4201 ----
        fclose(fpout);
        sprintf(ln, "chmod a+rx CONFIG/ATLrun.%s\n", ARCH);
!       assert(my_system(ln) == 0);
     }
  
***************
*** 4196,4200 ****
        sprintf(ln, "cd bin/%s %s", ARCH, redir);
        i = 1;
!       if (system(ln) == 0)
        {
           fprintf(stdout, "...... found!\n");
--- 4207,4211 ----
        sprintf(ln, "cd bin/%s %s", ARCH, redir);
        i = 1;
!       if (my_system(ln) == 0)
        {
           fprintf(stdout, "...... found!\n");
***************
*** 4205,4211 ****
        {
           sprintf(ln, "make killall arch=%s %s\n", ARCH, redir);
!          system(ln);
           sprintf(ln, "make startup arch=%s %s\n", ARCH, redir);
!          if (system(ln))
           {
              fps[0] = stderr;
--- 4216,4222 ----
        {
           sprintf(ln, "make killall arch=%s %s\n", ARCH, redir);
!          my_system(ln);
           sprintf(ln, "make startup arch=%s %s\n", ARCH, redir);
!          if (my_system(ln))
           {
              fps[0] = stderr;
***************
*** 4227,4231 ****
              }
              sprintf(ln, "make killall arch=%s %s\n", ARCH, redir);
!             system(ln);
              fclose(fplog);
              exit(-1);
--- 4238,4242 ----
              }
              sprintf(ln, "make killall arch=%s %s\n", ARCH, redir);
!             my_system(ln);
              fclose(fplog);
              exit(-1);
***************
*** 4240,4244 ****
        sprintf(ln, "make -f Make.top ISetL1 arch=%s L1Size=%d %s\n",
                ARCH, L1SIZE, redir);
!       if (system(ln))
        {
           ATL_mprintf(2, fplog, stderr,
--- 4251,4255 ----
        sprintf(ln, "make -f Make.top ISetL1 arch=%s L1Size=%d %s\n",
                ARCH, L1SIZE, redir);
!       if (my_system(ln))
        {
           ATL_mprintf(2, fplog, stderr,
***************
*** 4256,4262 ****
                lognam, dmpnam, ARCH);
        sprintf(ln, "mv -f %s bin/%s/INSTALL_LOG/.\n", lognam, ARCH);
!       system(ln);
        sprintf(ln, "mv -f %s bin/%s/INSTALL_LOG/.\n", dmpnam, ARCH);
!       system(ln);
     }
     fprintf(stdout, "\n\nConfiguration completed successfully.  You may want to examine the make include \n");
--- 4267,4273 ----
                lognam, dmpnam, ARCH);
        sprintf(ln, "mv -f %s bin/%s/INSTALL_LOG/.\n", lognam, ARCH);
!       my_system(ln);
        sprintf(ln, "mv -f %s bin/%s/INSTALL_LOG/.\n", dmpnam, ARCH);
!       my_system(ln);
     }
     fprintf(stdout, "\n\nConfiguration completed successfully.  You may want to examine the make include \n");