*** nist/src/lib/sp/exit.c  1996-06-06 22:09:46.000000000 +0200
--- nist/src/lib/sp/exit.c      2007-09-17 11:54:35.000000000 +0200
***************
*** 25,30 ****
--- 25,31 ----
  /* Changed by Jon Fiscus */
  # include <util/fob.h>
  # include <sp/shorten/shorten.h>
+ # include <errno.h>
  
  /* From: fred@masterd.fdn.org (Frederic SAVOIR) */
  #ifdef __WATCOMC__
***************
*** 32,39 ****
  #else
  extern int errno;
  #endif
! 
  extern char *sys_errlist[];
  extern char *argv0;
  extern char *filenameo;
  extern FILE *fileo;
--- 33,41 ----
  #else
  extern int errno;
  #endif
! #ifndef linux
  extern char *sys_errlist[];
+ #endif
  extern char *argv0;
  extern char *filenameo;
  extern FILE *fileo;
***************
*** 82,88 ****
    else {
      (void) vsprintf(exitmessage, fmt, args);
      strcat(exitmessage, ": ");
!     strcat(exitmessage, sys_errlist[errno]);
      strcat(exitmessage, "\n");
    }
  
--- 84,90 ----
    else {
      (void) vsprintf(exitmessage, fmt, args);
      strcat(exitmessage, ": ");
!     strcat(exitmessage, strerror(errno));
      strcat(exitmessage, "\n");
    }
  
*** nist/src/lib/sp/spread.c	Thu Jun  6 13:09:43 1996
--- nist/src/lib/sp/spread.c	Wed Mar 26 22:48:46 2003
***************
*** 1031,1038 ****
      /**** End SRI bugfix. ****/
      
      if (! decomp_into_memory) { 
! 	/* Close the original file pointer to the SPHERE file */
! 	fclose(fob_in->fp);
      }
      fob_destroy(fob_in);	    
      
--- 1031,1042 ----
      /**** End SRI bugfix. ****/
      
      if (! decomp_into_memory) { 
! 	/* fob_in->fp was copied from spifr->waveform->sp_fp, which may */
! 	/* now be closed in the code marked "SRI bugfix" above.         */
! 	if (spifr->waveform->sp_fp != FPNULL) {
! 	    /* Close the original file pointer to the SPHERE file */
! 	    fclose(fob_in->fp);
! 	}
      }
      fob_destroy(fob_in);	    
      
*** nist/src/scripts/install.sh	Mon Aug 26 12:32:00 1996
--- nist/src/scripts/install.sh	Wed Aug  7 01:19:35 2002
***************
*** 51,57 ****
  
  format="ID,OS,Compiler_Command,Compiler_Flags,Install_Command,Archive_Sorting_Command,Archive_Update_Command,Architecture"
  defs=`echo '1:Sun OS-4.1.[12]:gcc -ansi::install -c -s -m 755:ranlib:ar ru:SUN
! 2:Sun Solaris:gcc::cp:echo:ar ru:SUN
  3:Next OS:cc::install -c -s -m 755:ranlib -s:ar ru:NEXT
  4:Dec OSF/1 (with gcc):gcc -ansi::cp:ranlib:ar ru:OSF1
  5:Dec OSF/1 (with cc):cc:-std1 -Olimit 700 -O -g3:cp -p:ranlib:ar ru:OSF1
--- 51,57 ----
  
  format="ID,OS,Compiler_Command,Compiler_Flags,Install_Command,Archive_Sorting_Command,Archive_Update_Command,Architecture"
  defs=`echo '1:Sun OS-4.1.[12]:gcc -ansi::install -c -s -m 755:ranlib:ar ru:SUN
! 2:Sun Solaris:gcc:-O2:cp:echo:ar ru:SUN
  3:Next OS:cc::install -c -s -m 755:ranlib -s:ar ru:NEXT
  4:Dec OSF/1 (with gcc):gcc -ansi::cp:ranlib:ar ru:OSF1
  5:Dec OSF/1 (with cc):cc:-std1 -Olimit 700 -O -g3:cp -p:ranlib:ar ru:OSF1
***************
*** 59,66 ****
  7:HP Unix (with gcc):gcc -ansi::cp:ar -rs:ar -ru:HP
  8:HP Unix (with cc):cc -Aa::cp:ar -rs:ar -ru:HP
  9:IBM AIX:cc:-g:cp:ranlib:ar ru:AIX
! 10:Custom:cc:-g:install -s -m 755:ranlib:ar ru:SUN' | tr '\012' ','`
! Custom=10
  
  #get_field(){
  #    # $1 the definition string
--- 59,67 ----
  7:HP Unix (with gcc):gcc -ansi::cp:ar -rs:ar -ru:HP
  8:HP Unix (with cc):cc -Aa::cp:ar -rs:ar -ru:HP
  9:IBM AIX:cc:-g:cp:ranlib:ar ru:AIX
! 10:Linux Ubuntu:gcc:-O2 -mtune=generic -Wall -fPIC:install -s -m 755:ranlib:ar ru:LINUX
! 11:Custom:cc:-g:install -s -m 755:ranlib:ar ru:SUN' | tr '\012' ','`
! Custom=11
  
  #get_field(){
  #    # $1 the definition string