This file contains diffs from version 3.69 of GNU Make to version 3.70. Changes in files that are generated by etags and TeX have been omitted. diff -ruN make-3.69/ChangeLog make-3.70/ChangeLog --- make-3.69/ChangeLog Sun Nov 7 08:07:45 1993 +++ make-3.70/ChangeLog Mon Jan 3 17:50:34 1994 @@ -1,3 +1,102 @@ +Mon Jan 3 17:50:25 1994 Roland McGrath (roland@churchy.gnu.ai.mit.edu) + + * Version 3.70 released. + +Thu Dec 23 14:46:54 1993 Roland McGrath (roland@churchy.gnu.ai.mit.edu) + + * Version 3.69.3. + + * read.c (parse_file_seq): Inside multi-word archive ref + translation loop, check NEW1==0 at end and break out of the loop. + + * GNUmakefile (make-$(version).tar): Distribute install.sh. + * install.sh: New file. + + * configure.in (SCCS_GET_MINUS_G check): Put redirection for admin + cmds outside subshell parens, to avoid "command not found" msgs + from the shell. + +Wed Dec 22 17:00:43 1993 Roland McGrath (roland@churchy.gnu.ai.mit.edu) + + * configure.in (SCCS_GET_MINUS_G check): Put -G flag last in get cmd. + Redirect output & error from get to /dev/null. + Fix reversed sense of test. + +Fri Dec 17 15:31:36 1993 Roland McGrath (roland@churchy.gnu.ai.mit.edu) + + * configure.in (SCCS_GET_MINUS_G check): Use parens instead of + braces inside if condition command; some shells lose. + +Thu Dec 16 15:10:23 1993 Roland McGrath (roland@churchy.gnu.ai.mit.edu) + + * Version 3.69.2. + + * arscan.c [M_UNIX]: Move #undef M_XENIX for PORTAR stuff. + (PORTAR) [M_XENIX]: Define to 0 instead of 1. + + * main.c (define_makeflags): Only export MAKEFLAGS if !ALL. + +Wed Dec 15 17:47:48 1993 Roland McGrath (roland@churchy.gnu.ai.mit.edu) + + * main.c (main): Cast result of pointer arith to unsigned int + before passing to define_variable for envars. Matters when + sizeof(unsigned)!=sizeof(ptrdiff_t). + +Tue Dec 14 14:21:16 1993 Roland McGrath (roland@churchy.gnu.ai.mit.edu) + + * configure.in: Add new check for SCCS_GET_MINUS_G. + * config.h.in: Add #undef SCCS_GET_MINUS_G. + * default.c (default_terminal_rules): Use `$(SCCS_OUTPUT_OPTION)' in + place of `-G $@' in SCCS commands. + (default_variables) [SCCS_GET_MINUS_G]: Define SCCS_OUTPUT_OPTION + to "-G$@". + + * configure.in (AC_OUTPUT): Put touch stamp-config in second arg + (so it goes in config.status), rather than afterward. + + * ar.c (ar_member_date): Don't call enter_file on the archive file + if it doesn't exist (by file_exists_p). + + * compatMakefile ($(infodir)/make.info): Replace `$$d/foo.info' + with `$$dir/make.info' in install-info invocation (oops). + + * vpath.c (construct_vpath_list): Only set LASTPATH set PATH when + we do not unlink and free PATH. + + * file.c (print_file_data_base): Fix inverted calculation for + average files per hash bucket. + + * read.c (readline): When we see a NUL, give only a warning and + synthesize a newline to terminate the building line (used to + fatal). Move fgets call into the loop condition, and after the + loop test ferror (used to test !feof in the loop). + +Fri Dec 3 16:40:31 1993 Roland McGrath (roland@churchy.gnu.ai.mit.edu) + + * configure.in: Check for strerror in AC_HAVE_FUNCS. + +Thu Dec 2 15:37:50 1993 Roland McGrath (roland@churchy.gnu.ai.mit.edu) + + Differentiate different flavors of missing makefile error msgs, + removing gratuitous `fopen: ' and giving caller for included makefiles. + * misc.c [! HAVE_STRERROR]: Define our own strerror here. + (perror_with_name, pfatal_with_name): Use strerror instead of + replicating its functionality. + * read.c (read_makefile): Return int instead of void. + (read_all_makefiles, read_makefile): Change callers to notice zero + return and give error msg. + +Thu Nov 11 11:47:36 1993 Roland McGrath (roland@churchy.gnu.ai.mit.edu) + + * Version 3.69.1. + + * default.c: Put `-G $@' before $< in SCCS cmds. + +Wed Nov 10 06:06:14 1993 Roland McGrath (roland@churchy.gnu.ai.mit.edu) + + * read.c (read_makefile): After trying a variable defn, notice if + the line begins with a tab, and diagnose an error. + Sun Nov 7 08:07:37 1993 Roland McGrath (roland@churchy.gnu.ai.mit.edu) * Version 3.69. diff -ruN make-3.69/Makefile.in make-3.70/Makefile.in --- make-3.69/Makefile.in Sun Nov 7 08:09:57 1993 +++ make-3.70/Makefile.in Mon Jan 3 18:03:41 1994 @@ -219,7 +219,7 @@ # We use `$(SHELL) -c' because some shells do not # fail gracefully when there is an unknown command. if $(SHELL) -c 'install-info --version' >/dev/null 2>&1; then \ - install-info --infodir=$(infodir) $$d/foo.info; \ + install-info --infodir=$(infodir) $$dir/make.info; \ else true; fi $(mandir)/$(instname).$(manext): make.man @@ -274,19 +274,20 @@ # Automatically generated dependencies will be put at the end of the file. # Automatically generated dependencies. -commands.o : commands.c make.h dep.h commands.h file.h variable.h job.h -job.o : job.c make.h commands.h job.h file.h variable.h +commands.o : commands.c make.h config.h dep.h commands.h file.h variable.h job.h +job.o : job.c make.h config.h commands.h job.h file.h variable.h dir.o : dir.c make.h config.h -file.o : file.c make.h commands.h dep.h file.h variable.h +file.o : file.c make.h config.h commands.h dep.h file.h variable.h misc.o : misc.c make.h config.h dep.h -read.o : read.c make.h commands.h dep.h file.h variable.h glob/glob.h -remake.o : remake.c make.h commands.h job.h dep.h file.h -rule.o : rule.c make.h commands.h dep.h file.h variable.h rule.h -implicit.o : implicit.c make.h rule.h dep.h file.h -default.o : default.c make.h rule.h dep.h file.h commands.h variable.h -variable.o : variable.c make.h commands.h variable.h dep.h file.h -expand.o : expand.c make.h commands.h file.h variable.h -function.o : function.c make.h variable.h dep.h commands.h job.h +main.o : main.c make.h config.h commands.h dep.h file.h variable.h job.h getopt.h +read.o : read.c make.h config.h commands.h dep.h file.h variable.h glob/glob.h +remake.o : remake.c make.h config.h commands.h job.h dep.h file.h +rule.o : rule.c make.h config.h commands.h dep.h file.h variable.h rule.h +implicit.o : implicit.c make.h config.h rule.h dep.h file.h +default.o : default.c make.h config.h rule.h dep.h file.h commands.h variable.h +variable.o : variable.c make.h config.h commands.h variable.h dep.h file.h +expand.o : expand.c make.h config.h commands.h file.h variable.h +function.o : function.c make.h config.h variable.h dep.h commands.h job.h vpath.o : vpath.c make.h config.h file.h variable.h version.o : version.c ar.o : ar.c make.h config.h file.h dep.h diff -ruN make-3.69/NEWS make-3.70/NEWS --- make-3.69/NEWS Wed Nov 3 07:46:19 1993 +++ make-3.70/NEWS Tue Dec 14 19:26:32 1993 @@ -1,4 +1,4 @@ -GNU make NEWS -- history of user-visible changes. 3 November 1993 +GNU make NEWS -- history of user-visible changes. 14 December 1993 Copyright (C) 1992, 1993 Free Software Foundation, Inc. See the end for copying conditions. @@ -5,6 +5,17 @@ Please send GNU make bug reports to bug-gnu-utils@prep.ai.mit.edu. +Version 3.70 + +* It is no longer a fatal error to have a NUL character in a makefile. + You should never put a NUL in a makefile because it can have strange + results, but otherwise empty lines full of NULs (such as produced by + the `xmkmf' program) will always work fine. + +* The error messages for nonexistent included makefiles now refer to the + makefile name and line number where the `include' appeared, so Emacs's + C-x ` command takes you there (in case it's a typo you need to fix). + Version 3.69 * Implicit rule search for archive member references is now done in the @@ -457,9 +468,11 @@ makefiles are read. * A double-colon rule with no dependencies will always have its commands run. -(This is how both the BSD and System V versions Make do it.) +(This is how both the BSD and System V versions of Make do it.) Version 3.05 + +(Changes from versions 1 through 3.05 were never recorded. Sorry.) ---------------------------------------------------------------------- Copyright information: diff -ruN make-3.69/README make-3.70/README --- make-3.69/README Sun Nov 7 08:09:49 1993 +++ make-3.70/README Mon Jan 3 17:52:33 1994 @@ -1,4 +1,4 @@ -This directory contains the 3.69 test release of GNU Make. +This directory contains the 3.70 test release of GNU Make. All bugs reported for previous test releases have been fixed. Some bugs surely remain. diff -ruN make-3.69/acconfig.h make-3.70/acconfig.h --- make-3.69/acconfig.h Thu Apr 15 20:51:27 1993 +++ make-3.70/acconfig.h Tue Dec 14 16:50:51 1993 @@ -1,2 +1,5 @@ /* Define to the name of the SCCS `get' command. */ #undef SCCS_GET + +/* Define this if the SCCS `get' command understands the `-G' option. */ +#undef SCCS_GET_MINUS_G diff -ruN make-3.69/ar.c make-3.70/ar.c --- make-3.69/ar.c Thu Jun 10 18:13:54 1993 +++ make-3.70/ar.c Tue Dec 14 16:06:33 1993 @@ -83,19 +83,24 @@ ar_parse_name (name, &arname, &memname); - /* Make sure we know the modtime of the archive itself because - we are likely to be called just before commands to remake a - member are run, and they will change the archive itself. */ + /* Make sure we know the modtime of the archive itself because we are + likely to be called just before commands to remake a member are run, + and they will change the archive itself. + + But we must be careful not to enter_file the archive itself if it does + not exist, because pattern_search assumes that files found in the data + base exist or can be made. */ { struct file *arfile; arfile = lookup_file (arname); - if (arfile == 0) + if (arfile == 0 && file_exists_p (arname)) { arfile = enter_file (arname); arname_used = 1; } - (void) f_mtime (arfile, 0); + if (arfile != 0) + (void) f_mtime (arfile, 0); } val = ar_scan (arname, ar_member_date_1, (long int) memname); diff -ruN make-3.69/arscan.c make-3.70/arscan.c --- make-3.69/arscan.c Wed May 12 17:05:03 1993 +++ make-3.70/arscan.c Thu Dec 16 18:24:39 1993 @@ -25,6 +25,11 @@ #ifndef NO_ARCHIVES +/* SCO Unix's compiler defines both of these. */ +#ifdef M_UNIX +#undef M_XENIX +#endif + /* On the sun386i and in System V rel 3, ar.h defines two different archive formats depending upon whether you have defined PORTAR (normal) or PORT5AR (System V Release 1). There is no default, one or the other must be defined @@ -32,8 +37,15 @@ #if (!defined (PORTAR) || PORTAR == 0) && (!defined (PORT5AR) || PORT5AR == 0) #undef PORTAR +#ifdef M_XENIX +/* According to Jim Sievert , for SCO XENIX defining + PORTAR to 1 gets the wrong archive format, and defining it to 0 gets the + right one. */ +#define PORTAR 0 +#else #define PORTAR 1 #endif +#endif #include @@ -40,11 +52,6 @@ /* Cray's apparently defines this. */ #ifndef AR_HDR_SIZE #define AR_HDR_SIZE (sizeof (struct ar_hdr)) -#endif - -/* SCO Unix's compiler defines both of these. */ -#ifdef M_UNIX -#undef M_XENIX #endif /* Takes three arguments ARCHIVE, FUNCTION and ARG. diff -ruN make-3.69/config.h.in make-3.70/config.h.in --- make-3.69/config.h.in Sun Nov 7 08:10:24 1993 +++ make-3.70/config.h.in Thu Dec 23 18:47:37 1993 @@ -127,6 +127,9 @@ /* Define to the name of the SCCS `get' command. */ #undef SCCS_GET +/* Define this if the SCCS `get' command understands the `-G' option. */ +#undef SCCS_GET_MINUS_G + /* Define if you have _sys_siglist. */ #undef HAVE__SYS_SIGLIST @@ -156,6 +159,9 @@ /* Define if you have sigsetmask. */ #undef HAVE_SIGSETMASK + +/* Define if you have strerror. */ +#undef HAVE_STRERROR /* Define if you have sys_siglist. */ #undef HAVE_SYS_SIGLIST diff -ruN make-3.69/configure make-3.70/configure --- make-3.69/configure Sun Nov 7 08:04:01 1993 +++ make-3.70/configure Thu Dec 23 18:46:30 1993 @@ -1,17 +1,17 @@ #!/bin/sh # Guess values for system-dependent variables and create Makefiles. -# Generated automatically using autoconf. +# Generated automatically using autoconf version 1.7.1 # Copyright (C) 1991, 1992, 1993 Free Software Foundation, Inc. -# This program is free software; you can redistribute it and/or modify -# it under the terms of the GNU General Public License as published by -# the Free Software Foundation; either version 2, or (at your option) +# This configure script is free software; you can redistribute it and/or +# modify it under the terms of the GNU General Public License as published +# by the Free Software Foundation; either version 2, or (at your option) # any later version. -# This program is distributed in the hope that it will be useful, -# but WITHOUT ANY WARRANTY; without even the implied warranty of -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -# GNU General Public License for more details. +# This script is distributed in the hope that it will be useful, but +# WITHOUT ANY WARRANTY; without even the implied warranty of +# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU General +# Public License for more details. # You should have received a copy of the GNU General Public License # along with this program; if not, write to the Free Software @@ -79,8 +79,8 @@ fi done -trap 'rm -fr conftest* confdefs* core; exit 1' 1 3 15 -trap 'rm -f confdefs*' 0 +trap 'rm -fr conftest* confdefs* core $ac_clean_files; exit 1' 1 3 15 +trap 'rm -f confdefs* $ac_clean_files' 0 # NLS nuisances. # These must not be set unconditionally because not all systems understand @@ -88,7 +88,7 @@ if test "${LC_ALL+set}" = 'set' ; then LC_ALL=C; export LC_ALL; fi if test "${LANG+set}" = 'set' ; then LANG=C; export LANG; fi -rm -f conftest* confdefs.h +rm -rf conftest* confdefs.h # AIX cpp loses on an empty file, so make sure it contains at least a newline. echo > confdefs.h compile='${CC-cc} $CFLAGS conftest.c -o conftest $LIBS >/dev/null 2>&1' @@ -173,9 +173,9 @@ echo checking for install IFS="${IFS= }"; saveifs="$IFS"; IFS="${IFS}:" for dir in $PATH; do - test -z "$dir" && dir=. - case $dir in - /etc|/usr/sbin|/usr/etc|/usr/afsws/bin|/usr/ucb) ;; + #test -z "$dir" && dir=. + case "$dir" in + ''|.|/etc|/usr/sbin|/usr/etc|/usr/afsws/bin|/usr/ucb) ;; *) if test -f $dir/installbsd; then INSTALL="$dir/installbsd -c" # OSF1 @@ -198,7 +198,17 @@ done IFS="$saveifs" fi -INSTALL=${INSTALL-cp} +if test -z "$INSTALL"; then + if test -f ${srcdir}/install.sh; then + # As a last resort, use the slow shell script. + # We want the top-level source directory, not the subdir's srcdir, + # so expand srcdir now rather than in the Makefile. + INSTALL="${srcdir}/install.sh -c" + else + echo "warning: ${srcdir}/install.sh not found; using cp" + INSTALL=cp + fi +fi test -n "$verbose" && echo " setting INSTALL to $INSTALL" INSTALL_PROGRAM=${INSTALL_PROGRAM-'$(INSTALL)'} test -n "$verbose" && echo " setting INSTALL_PROGRAM to $INSTALL_PROGRAM" @@ -238,10 +248,23 @@ : else rm -rf conftest* + CPP="${CC-cc} -E -traditional-cpp" + cat > conftest.c < +Syntax Error +EOF +err=`eval "($CPP conftest.c >/dev/null) 2>&1"` +if test -z "$err"; then + : +else + rm -rf conftest* CPP=/lib/cpp fi rm -f conftest* fi +rm -f conftest* +fi test ".${verbose}" != "." && echo " setting CPP to $CPP" echo checking for AIX cat > conftest.c <> confdefs.h +echo "#define _ALL_SOURCE 1" >> confdefs.h DEFS="$DEFS -D_ALL_SOURCE=1" SEDDEFS="${SEDDEFS}\${SEDdA}_ALL_SOURCE\${SEDdB}_ALL_SOURCE\${SEDdC}1\${SEDdD} \${SEDuA}_ALL_SOURCE\${SEDuB}_ALL_SOURCE\${SEDuC}1\${SEDuD} @@ -280,7 +303,7 @@ { test -n "$verbose" && \ echo " defining _POSIX_SOURCE" -echo "#define" _POSIX_SOURCE 1 >> confdefs.h +echo "#define _POSIX_SOURCE 1" >> confdefs.h DEFS="$DEFS -D_POSIX_SOURCE=1" SEDDEFS="${SEDDEFS}\${SEDdA}_POSIX_SOURCE\${SEDdB}_POSIX_SOURCE\${SEDdC}1\${SEDdD} \${SEDuA}_POSIX_SOURCE\${SEDuB}_POSIX_SOURCE\${SEDuC}1\${SEDuD} @@ -314,7 +337,7 @@ { test -n "$verbose" && \ echo " defining _POSIX_SOURCE" -echo "#define" _POSIX_SOURCE 1 >> confdefs.h +echo "#define _POSIX_SOURCE 1" >> confdefs.h DEFS="$DEFS -D_POSIX_SOURCE=1" SEDDEFS="${SEDDEFS}\${SEDdA}_POSIX_SOURCE\${SEDdB}_POSIX_SOURCE\${SEDdC}1\${SEDdD} \${SEDuA}_POSIX_SOURCE\${SEDuB}_POSIX_SOURCE\${SEDuC}1\${SEDuD} @@ -325,8 +348,8 @@ { test -n "$verbose" && \ -echo " defining" _POSIX_1_SOURCE to be 2 -echo "#define" _POSIX_1_SOURCE 2 >> confdefs.h +echo " defining _POSIX_1_SOURCE to be 2" +echo "#define _POSIX_1_SOURCE 2" >> confdefs.h DEFS="$DEFS -D_POSIX_1_SOURCE=2" SEDDEFS="${SEDDEFS}\${SEDdA}_POSIX_1_SOURCE\${SEDdB}_POSIX_1_SOURCE\${SEDdC}2\${SEDdD} \${SEDuA}_POSIX_1_SOURCE\${SEDuB}_POSIX_1_SOURCE\${SEDuC}2\${SEDuD} @@ -338,7 +361,7 @@ { test -n "$verbose" && \ echo " defining _MINIX" -echo "#define" _MINIX 1 >> confdefs.h +echo "#define _MINIX 1" >> confdefs.h DEFS="$DEFS -D_MINIX=1" SEDDEFS="${SEDDEFS}\${SEDdA}_MINIX\${SEDdB}_MINIX\${SEDdC}1\${SEDdD} \${SEDuA}_MINIX\${SEDuB}_MINIX\${SEDuC}1\${SEDuD} @@ -379,11 +402,17 @@ EOF eval $compile if test -s conftest && (./conftest; exit) 2>/dev/null; then + # ISC 2.0.2 stdlib.h does not declare free, contrary to ANSI. +echo '#include "confdefs.h" +#include ' > conftest.c +eval "$CPP conftest.c > conftest.out 2>&1" +if egrep "free" conftest.out >/dev/null 2>&1; then + rm -rf conftest* { test -n "$verbose" && \ echo " defining STDC_HEADERS" -echo "#define" STDC_HEADERS 1 >> confdefs.h +echo "#define STDC_HEADERS 1" >> confdefs.h DEFS="$DEFS -DSTDC_HEADERS=1" SEDDEFS="${SEDDEFS}\${SEDdA}STDC_HEADERS\${SEDdB}STDC_HEADERS\${SEDdC}1\${SEDdD} \${SEDuA}STDC_HEADERS\${SEDuB}STDC_HEADERS\${SEDuC}1\${SEDuD} @@ -393,6 +422,10 @@ fi +rm -f conftest* + + +fi rm -fr conftest* fi @@ -419,7 +452,7 @@ { test -n "$verbose" && \ echo " defining DIRENT" -echo "#define" DIRENT 1 >> confdefs.h +echo "#define DIRENT 1" >> confdefs.h DEFS="$DEFS -DDIRENT=1" SEDDEFS="${SEDDEFS}\${SEDdA}DIRENT\${SEDdB}DIRENT\${SEDdC}1\${SEDdD} \${SEDuA}DIRENT\${SEDuB}DIRENT\${SEDuC}1\${SEDuD} @@ -446,7 +479,7 @@ { test -n "$verbose" && \ echo " defining SYSNDIR" -echo "#define" SYSNDIR 1 >> confdefs.h +echo "#define SYSNDIR 1" >> confdefs.h DEFS="$DEFS -DSYSNDIR=1" SEDDEFS="${SEDDEFS}\${SEDdA}SYSNDIR\${SEDdB}SYSNDIR\${SEDdC}1\${SEDdD} \${SEDuA}SYSNDIR\${SEDuB}SYSNDIR\${SEDuC}1\${SEDuD} @@ -473,7 +506,7 @@ { test -n "$verbose" && \ echo " defining SYSDIR" -echo "#define" SYSDIR 1 >> confdefs.h +echo "#define SYSDIR 1" >> confdefs.h DEFS="$DEFS -DSYSDIR=1" SEDDEFS="${SEDDEFS}\${SEDdA}SYSDIR\${SEDdB}SYSDIR\${SEDdC}1\${SEDdD} \${SEDuA}SYSDIR\${SEDuB}SYSDIR\${SEDuC}1\${SEDuD} @@ -500,7 +533,7 @@ { test -n "$verbose" && \ echo " defining NDIR" -echo "#define" NDIR 1 >> confdefs.h +echo "#define NDIR 1" >> confdefs.h DEFS="$DEFS -DNDIR=1" SEDDEFS="${SEDDEFS}\${SEDdA}NDIR\${SEDdB}NDIR\${SEDdC}1\${SEDdD} \${SEDuA}NDIR\${SEDuB}NDIR\${SEDuC}1\${SEDuD} @@ -528,7 +561,7 @@ { test -n "$verbose" && \ echo " defining VOID_CLOSEDIR" -echo "#define" VOID_CLOSEDIR 1 >> confdefs.h +echo "#define VOID_CLOSEDIR 1" >> confdefs.h DEFS="$DEFS -DVOID_CLOSEDIR=1" SEDDEFS="${SEDDEFS}\${SEDdA}VOID_CLOSEDIR\${SEDdB}VOID_CLOSEDIR\${SEDdC}1\${SEDdD} \${SEDuA}VOID_CLOSEDIR\${SEDuB}VOID_CLOSEDIR\${SEDuC}1\${SEDuD} @@ -550,8 +583,8 @@ { test -n "$verbose" && \ -echo " defining" uid_t to be int -echo "#define" uid_t int >> confdefs.h +echo " defining uid_t to be int" +echo "#define uid_t int" >> confdefs.h DEFS="$DEFS -Duid_t=int" SEDDEFS="${SEDDEFS}\${SEDdA}uid_t\${SEDdB}uid_t\${SEDdC}int\${SEDdD} \${SEDuA}uid_t\${SEDuB}uid_t\${SEDuC}int\${SEDuD} @@ -561,8 +594,8 @@ { test -n "$verbose" && \ -echo " defining" gid_t to be int -echo "#define" gid_t int >> confdefs.h +echo " defining gid_t to be int" +echo "#define gid_t int" >> confdefs.h DEFS="$DEFS -Dgid_t=int" SEDDEFS="${SEDDEFS}\${SEDdA}gid_t\${SEDdB}gid_t\${SEDdC}int\${SEDdD} \${SEDuA}gid_t\${SEDuB}gid_t\${SEDuC}int\${SEDuD} @@ -602,8 +635,8 @@ { test -n "$verbose" && \ -echo " defining" GETGROUPS_T to be gid_t -echo "#define" GETGROUPS_T gid_t >> confdefs.h +echo " defining GETGROUPS_T to be gid_t" +echo "#define GETGROUPS_T gid_t" >> confdefs.h DEFS="$DEFS -DGETGROUPS_T=gid_t" SEDDEFS="${SEDDEFS}\${SEDdA}GETGROUPS_T\${SEDdB}GETGROUPS_T\${SEDdC}gid_t\${SEDdD} \${SEDuA}GETGROUPS_T\${SEDuB}GETGROUPS_T\${SEDuC}gid_t\${SEDuD} @@ -616,8 +649,8 @@ { test -n "$verbose" && \ -echo " defining" GETGROUPS_T to be int -echo "#define" GETGROUPS_T int >> confdefs.h +echo " defining GETGROUPS_T to be int" +echo "#define GETGROUPS_T int" >> confdefs.h DEFS="$DEFS -DGETGROUPS_T=int" SEDDEFS="${SEDDEFS}\${SEDdA}GETGROUPS_T\${SEDdB}GETGROUPS_T\${SEDdC}int\${SEDdD} \${SEDuA}GETGROUPS_T\${SEDuB}GETGROUPS_T\${SEDuC}int\${SEDuD} @@ -639,8 +672,8 @@ { test -n "$verbose" && \ -echo " defining" pid_t to be int -echo "#define" pid_t int >> confdefs.h +echo " defining pid_t to be int" +echo "#define pid_t int" >> confdefs.h DEFS="$DEFS -Dpid_t=int" SEDDEFS="${SEDDEFS}\${SEDdA}pid_t\${SEDdB}pid_t\${SEDdC}int\${SEDdD} \${SEDuA}pid_t\${SEDuB}pid_t\${SEDuC}int\${SEDuD} @@ -668,8 +701,8 @@ { test -n "$verbose" && \ -echo " defining" RETSIGTYPE to be void -echo "#define" RETSIGTYPE void >> confdefs.h +echo " defining RETSIGTYPE to be void" +echo "#define RETSIGTYPE void" >> confdefs.h DEFS="$DEFS -DRETSIGTYPE=void" SEDDEFS="${SEDDEFS}\${SEDdA}RETSIGTYPE\${SEDdB}RETSIGTYPE\${SEDdC}void\${SEDdD} \${SEDuA}RETSIGTYPE\${SEDuB}RETSIGTYPE\${SEDuC}void\${SEDuD} @@ -683,8 +716,8 @@ { test -n "$verbose" && \ -echo " defining" RETSIGTYPE to be int -echo "#define" RETSIGTYPE int >> confdefs.h +echo " defining RETSIGTYPE to be int" +echo "#define RETSIGTYPE int" >> confdefs.h DEFS="$DEFS -DRETSIGTYPE=int" SEDDEFS="${SEDDEFS}\${SEDdA}RETSIGTYPE\${SEDdB}RETSIGTYPE\${SEDdC}int\${SEDdD} \${SEDuA}RETSIGTYPE\${SEDuB}RETSIGTYPE\${SEDuC}int\${SEDuD} @@ -712,7 +745,7 @@ { test -n "$verbose" && \ echo " defining ${trhdr}" -echo "#define" ${trhdr} 1 >> confdefs.h +echo "#define ${trhdr} 1" >> confdefs.h DEFS="$DEFS -D${trhdr}=1" SEDDEFS="${SEDDEFS}\${SEDdA}${trhdr}\${SEDdB}${trhdr}\${SEDdC}1\${SEDdD} \${SEDuA}${trhdr}\${SEDuB}${trhdr}\${SEDuC}1\${SEDuD} @@ -745,7 +778,7 @@ { test -n "$verbose" && \ echo " defining NO_MINUS_C_MINUS_O" -echo "#define" NO_MINUS_C_MINUS_O 1 >> confdefs.h +echo "#define NO_MINUS_C_MINUS_O 1" >> confdefs.h DEFS="$DEFS -DNO_MINUS_C_MINUS_O=1" SEDDEFS="${SEDDEFS}\${SEDdA}NO_MINUS_C_MINUS_O\${SEDdB}NO_MINUS_C_MINUS_O\${SEDdC}1\${SEDdD} \${SEDuA}NO_MINUS_C_MINUS_O\${SEDuB}NO_MINUS_C_MINUS_O\${SEDuC}1\${SEDuD} @@ -760,7 +793,7 @@ { test -n "$verbose" && \ echo " defining NO_MINUS_C_MINUS_O" -echo "#define" NO_MINUS_C_MINUS_O 1 >> confdefs.h +echo "#define NO_MINUS_C_MINUS_O 1" >> confdefs.h DEFS="$DEFS -DNO_MINUS_C_MINUS_O=1" SEDDEFS="${SEDDEFS}\${SEDdA}NO_MINUS_C_MINUS_O\${SEDdB}NO_MINUS_C_MINUS_O\${SEDdC}1\${SEDdD} \${SEDuA}NO_MINUS_C_MINUS_O\${SEDuB}NO_MINUS_C_MINUS_O\${SEDuC}1\${SEDuD} @@ -823,8 +856,8 @@ { test -n "$verbose" && \ -echo " defining" const to be empty -echo "#define" const >> confdefs.h +echo " defining const to be empty" +echo "#define const " >> confdefs.h DEFS="$DEFS -Dconst=" SEDDEFS="${SEDDEFS}\${SEDdA}const\${SEDdB}const\${SEDdC}\${SEDdD} \${SEDuA}const\${SEDuB}const\${SEDuC}\${SEDuD} @@ -868,7 +901,7 @@ { test -n "$verbose" && \ echo " defining STAT_MACROS_BROKEN" -echo "#define" STAT_MACROS_BROKEN 1 >> confdefs.h +echo "#define STAT_MACROS_BROKEN 1" >> confdefs.h DEFS="$DEFS -DSTAT_MACROS_BROKEN=1" SEDDEFS="${SEDDEFS}\${SEDdA}STAT_MACROS_BROKEN\${SEDdB}STAT_MACROS_BROKEN\${SEDdC}1\${SEDdD} \${SEDuA}STAT_MACROS_BROKEN\${SEDuB}STAT_MACROS_BROKEN\${SEDuC}1\${SEDuD} @@ -885,7 +918,7 @@ for func in getdtablesize sys_siglist _sys_siglist psignal \ dup2 getcwd sigsetmask getgroups setlinebuf \ - setreuid setregid + setreuid setregid strerror do trfunc=HAVE_`echo $func | tr '[a-z]' '[A-Z]'` echo checking for ${func} @@ -910,7 +943,7 @@ { test -n "$verbose" && \ echo " defining ${trfunc}" -echo "#define" ${trfunc} 1 >> confdefs.h +echo "#define ${trfunc} 1" >> confdefs.h DEFS="$DEFS -D${trfunc}=1" SEDDEFS="${SEDDEFS}\${SEDdA}${trfunc}\${SEDdB}${trfunc}\${SEDdC}1\${SEDdD} \${SEDuA}${trfunc}\${SEDuB}${trfunc}\${SEDuC}1\${SEDuD} @@ -938,7 +971,7 @@ { test -n "$verbose" && \ echo " defining HAVE_ALLOCA_H" -echo "#define" HAVE_ALLOCA_H 1 >> confdefs.h +echo "#define HAVE_ALLOCA_H 1" >> confdefs.h DEFS="$DEFS -DHAVE_ALLOCA_H=1" SEDDEFS="${SEDDEFS}\${SEDdA}HAVE_ALLOCA_H\${SEDdB}HAVE_ALLOCA_H\${SEDdC}1\${SEDdD} \${SEDuA}HAVE_ALLOCA_H\${SEDuB}HAVE_ALLOCA_H\${SEDuC}1\${SEDuD} @@ -972,7 +1005,20 @@ int t() { char *p = (char *) alloca(1); } EOF if eval $compile; then - : + rm -rf conftest* + +{ +test -n "$verbose" && \ +echo " defining HAVE_ALLOCA" +echo "#define HAVE_ALLOCA 1" >> confdefs.h +DEFS="$DEFS -DHAVE_ALLOCA=1" +SEDDEFS="${SEDDEFS}\${SEDdA}HAVE_ALLOCA\${SEDdB}HAVE_ALLOCA\${SEDdC}1\${SEDdD} +\${SEDuA}HAVE_ALLOCA\${SEDuB}HAVE_ALLOCA\${SEDuC}1\${SEDuD} +\${SEDeA}HAVE_ALLOCA\${SEDeB}HAVE_ALLOCA\${SEDeC}1\${SEDeD} +" +} + + else rm -rf conftest* alloca_missing=1 @@ -1010,8 +1056,8 @@ rm -rf conftest* { test -n "$verbose" && \ -echo " defining" CRAY_STACKSEG_END to be _getb67 -echo "#define" CRAY_STACKSEG_END _getb67 >> confdefs.h +echo " defining CRAY_STACKSEG_END to be _getb67" +echo "#define CRAY_STACKSEG_END _getb67" >> confdefs.h DEFS="$DEFS -DCRAY_STACKSEG_END=_getb67" SEDDEFS="${SEDDEFS}\${SEDdA}CRAY_STACKSEG_END\${SEDdB}CRAY_STACKSEG_END\${SEDdC}_getb67\${SEDdD} \${SEDuA}CRAY_STACKSEG_END\${SEDuB}CRAY_STACKSEG_END\${SEDuC}_getb67\${SEDuD} @@ -1043,8 +1089,8 @@ rm -rf conftest* { test -n "$verbose" && \ -echo " defining" CRAY_STACKSEG_END to be GETB67 -echo "#define" CRAY_STACKSEG_END GETB67 >> confdefs.h +echo " defining CRAY_STACKSEG_END to be GETB67" +echo "#define CRAY_STACKSEG_END GETB67" >> confdefs.h DEFS="$DEFS -DCRAY_STACKSEG_END=GETB67" SEDDEFS="${SEDDEFS}\${SEDdA}CRAY_STACKSEG_END\${SEDdB}CRAY_STACKSEG_END\${SEDdC}GETB67\${SEDdD} \${SEDuA}CRAY_STACKSEG_END\${SEDuB}CRAY_STACKSEG_END\${SEDuC}GETB67\${SEDuD} @@ -1076,8 +1122,8 @@ rm -rf conftest* { test -n "$verbose" && \ -echo " defining" CRAY_STACKSEG_END to be getb67 -echo "#define" CRAY_STACKSEG_END getb67 >> confdefs.h +echo " defining CRAY_STACKSEG_END to be getb67" +echo "#define CRAY_STACKSEG_END getb67" >> confdefs.h DEFS="$DEFS -DCRAY_STACKSEG_END=getb67" SEDDEFS="${SEDDEFS}\${SEDdA}CRAY_STACKSEG_END\${SEDdB}CRAY_STACKSEG_END\${SEDdC}getb67\${SEDdD} \${SEDuA}CRAY_STACKSEG_END\${SEDuB}CRAY_STACKSEG_END\${SEDuC}getb67\${SEDuD} @@ -1113,7 +1159,7 @@ { test -n "$verbose" && \ echo " defining C_ALLOCA" -echo "#define" C_ALLOCA 1 >> confdefs.h +echo "#define C_ALLOCA 1" >> confdefs.h DEFS="$DEFS -DC_ALLOCA=1" SEDDEFS="${SEDDEFS}\${SEDdA}C_ALLOCA\${SEDdB}C_ALLOCA\${SEDdC}1\${SEDdD} \${SEDuA}C_ALLOCA\${SEDuB}C_ALLOCA\${SEDuC}1\${SEDuD} @@ -1142,8 +1188,8 @@ { test -n "$verbose" && \ -echo " defining" STACK_DIRECTION to be 0 -echo "#define" STACK_DIRECTION 0 >> confdefs.h +echo " defining STACK_DIRECTION to be 0" +echo "#define STACK_DIRECTION 0" >> confdefs.h DEFS="$DEFS -DSTACK_DIRECTION=0" SEDDEFS="${SEDDEFS}\${SEDdA}STACK_DIRECTION\${SEDdB}STACK_DIRECTION\${SEDdC}0\${SEDdD} \${SEDuA}STACK_DIRECTION\${SEDuB}STACK_DIRECTION\${SEDuC}0\${SEDuD} @@ -1176,8 +1222,8 @@ { test -n "$verbose" && \ -echo " defining" STACK_DIRECTION to be 1 -echo "#define" STACK_DIRECTION 1 >> confdefs.h +echo " defining STACK_DIRECTION to be 1" +echo "#define STACK_DIRECTION 1" >> confdefs.h DEFS="$DEFS -DSTACK_DIRECTION=1" SEDDEFS="${SEDDEFS}\${SEDdA}STACK_DIRECTION\${SEDdB}STACK_DIRECTION\${SEDdC}1\${SEDdD} \${SEDuA}STACK_DIRECTION\${SEDuB}STACK_DIRECTION\${SEDuC}1\${SEDuD} @@ -1190,8 +1236,8 @@ { test -n "$verbose" && \ -echo " defining" STACK_DIRECTION to be -1 -echo "#define" STACK_DIRECTION -1 >> confdefs.h +echo " defining STACK_DIRECTION to be -1" +echo "#define STACK_DIRECTION -1" >> confdefs.h DEFS="$DEFS -DSTACK_DIRECTION=-1" SEDDEFS="${SEDDEFS}\${SEDdA}STACK_DIRECTION\${SEDdB}STACK_DIRECTION\${SEDdC}-1\${SEDdD} \${SEDuA}STACK_DIRECTION\${SEDuB}STACK_DIRECTION\${SEDuC}-1\${SEDuD} @@ -1216,7 +1262,7 @@ { test -n "$verbose" && \ echo " defining HAVE_VFORK_H" -echo "#define" HAVE_VFORK_H 1 >> confdefs.h +echo "#define HAVE_VFORK_H 1" >> confdefs.h DEFS="$DEFS -DHAVE_VFORK_H=1" SEDDEFS="${SEDDEFS}\${SEDdA}HAVE_VFORK_H\${SEDdB}HAVE_VFORK_H\${SEDdC}1\${SEDdD} \${SEDuA}HAVE_VFORK_H\${SEDuB}HAVE_VFORK_H\${SEDuC}1\${SEDuD} @@ -1321,8 +1367,8 @@ { test -n "$verbose" && \ -echo " defining" vfork to be fork -echo "#define" vfork fork >> confdefs.h +echo " defining vfork to be fork" +echo "#define vfork fork" >> confdefs.h DEFS="$DEFS -Dvfork=fork" SEDDEFS="${SEDDEFS}\${SEDdA}vfork\${SEDdB}vfork\${SEDdC}fork\${SEDdD} \${SEDuA}vfork\${SEDuB}vfork\${SEDuC}fork\${SEDuD} @@ -1353,7 +1399,7 @@ { test -n "$verbose" && \ echo " defining SETVBUF_REVERSED" -echo "#define" SETVBUF_REVERSED 1 >> confdefs.h +echo "#define SETVBUF_REVERSED 1" >> confdefs.h DEFS="$DEFS -DSETVBUF_REVERSED=1" SEDDEFS="${SEDDEFS}\${SEDdA}SETVBUF_REVERSED\${SEDdB}SETVBUF_REVERSED\${SEDdC}1\${SEDdD} \${SEDuA}SETVBUF_REVERSED\${SEDuB}SETVBUF_REVERSED\${SEDuC}1\${SEDuD} @@ -1494,7 +1540,7 @@ { test -n "$verbose" && \ echo " defining DGUX" -echo "#define" DGUX 1 >> confdefs.h +echo "#define DGUX 1" >> confdefs.h DEFS="$DEFS -DDGUX=1" SEDDEFS="${SEDDEFS}\${SEDdA}DGUX\${SEDdB}DGUX\${SEDdC}1\${SEDdD} \${SEDuA}DGUX\${SEDuB}DGUX\${SEDuC}1\${SEDuD} @@ -1525,7 +1571,7 @@ { test -n "$verbose" && \ echo " defining HAVE_LIBDGC" -echo "#define" HAVE_LIBDGC 1 >> confdefs.h +echo "#define HAVE_LIBDGC 1" >> confdefs.h DEFS="$DEFS -DHAVE_LIBDGC=1" SEDDEFS="${SEDDEFS}\${SEDdA}HAVE_LIBDGC\${SEDdB}HAVE_LIBDGC\${SEDdC}1\${SEDdD} \${SEDuA}HAVE_LIBDGC\${SEDuB}HAVE_LIBDGC\${SEDuC}1\${SEDuD} @@ -1566,7 +1612,7 @@ { test -n "$verbose" && \ echo " defining SVR4" -echo "#define" SVR4 1 >> confdefs.h +echo "#define SVR4 1" >> confdefs.h DEFS="$DEFS -DSVR4=1" SEDDEFS="${SEDDEFS}\${SEDdA}SVR4\${SEDdB}SVR4\${SEDdC}1\${SEDdD} \${SEDuA}SVR4\${SEDuB}SVR4\${SEDuC}1\${SEDuD} @@ -1615,7 +1661,7 @@ { test -n "$verbose" && \ echo " defining UMAX4_3" -echo "#define" UMAX4_3 1 >> confdefs.h +echo "#define UMAX4_3 1" >> confdefs.h DEFS="$DEFS -DUMAX4_3=1" SEDDEFS="${SEDDEFS}\${SEDdA}UMAX4_3\${SEDdB}UMAX4_3\${SEDdC}1\${SEDdD} \${SEDuA}UMAX4_3\${SEDuB}UMAX4_3\${SEDuC}1\${SEDuD} @@ -1626,7 +1672,7 @@ { test -n "$verbose" && \ echo " defining UMAX" -echo "#define" UMAX 1 >> confdefs.h +echo "#define UMAX 1" >> confdefs.h DEFS="$DEFS -DUMAX=1" SEDDEFS="${SEDDEFS}\${SEDdA}UMAX\${SEDdB}UMAX\${SEDdC}1\${SEDdD} \${SEDuA}UMAX\${SEDuB}UMAX\${SEDuC}1\${SEDuD} @@ -1653,7 +1699,7 @@ { test -n "$verbose" && \ echo " defining UMAX" -echo "#define" UMAX 1 >> confdefs.h +echo "#define UMAX 1" >> confdefs.h DEFS="$DEFS -DUMAX=1" SEDDEFS="${SEDDEFS}\${SEDdA}UMAX\${SEDdB}UMAX\${SEDdC}1\${SEDdD} \${SEDuA}UMAX\${SEDuB}UMAX\${SEDuC}1\${SEDuD} @@ -1682,7 +1728,7 @@ { test -n "$verbose" && \ echo " defining ${trhdr}" -echo "#define" ${trhdr} 1 >> confdefs.h +echo "#define ${trhdr} 1" >> confdefs.h DEFS="$DEFS -D${trhdr}=1" SEDDEFS="${SEDDEFS}\${SEDdA}${trhdr}\${SEDdB}${trhdr}\${SEDdC}1\${SEDdD} \${SEDuA}${trhdr}\${SEDuB}${trhdr}\${SEDuC}1\${SEDuD} @@ -1709,7 +1755,7 @@ { test -n "$verbose" && \ echo " defining NLIST_STRUCT" -echo "#define" NLIST_STRUCT 1 >> confdefs.h +echo "#define NLIST_STRUCT 1" >> confdefs.h DEFS="$DEFS -DNLIST_STRUCT=1" SEDDEFS="${SEDDEFS}\${SEDdA}NLIST_STRUCT\${SEDdB}NLIST_STRUCT\${SEDdC}1\${SEDdD} \${SEDuA}NLIST_STRUCT\${SEDuB}NLIST_STRUCT\${SEDuC}1\${SEDuD} @@ -1730,7 +1776,7 @@ { test -n "$verbose" && \ echo " defining NLIST_NAME_UNION" -echo "#define" NLIST_NAME_UNION 1 >> confdefs.h +echo "#define NLIST_NAME_UNION 1" >> confdefs.h DEFS="$DEFS -DNLIST_NAME_UNION=1" SEDDEFS="${SEDDEFS}\${SEDdA}NLIST_NAME_UNION\${SEDdB}NLIST_NAME_UNION\${SEDdC}1\${SEDdD} \${SEDuA}NLIST_NAME_UNION\${SEDuB}NLIST_NAME_UNION\${SEDuC}1\${SEDuD} @@ -1762,7 +1808,7 @@ { test -n "$verbose" && \ echo " defining GETLOADAVG_PRIVILEGED" -echo "#define" GETLOADAVG_PRIVILEGED 1 >> confdefs.h +echo "#define GETLOADAVG_PRIVILEGED 1" >> confdefs.h DEFS="$DEFS -DGETLOADAVG_PRIVILEGED=1" SEDDEFS="${SEDDEFS}\${SEDdA}GETLOADAVG_PRIVILEGED\${SEDdB}GETLOADAVG_PRIVILEGED\${SEDdC}1\${SEDdD} \${SEDuA}GETLOADAVG_PRIVILEGED\${SEDuB}GETLOADAVG_PRIVILEGED\${SEDuC}1\${SEDuD} @@ -1779,7 +1825,7 @@ { test -n "$verbose" && \ echo " defining HAVE_GETLOADAVG" -echo "#define" HAVE_GETLOADAVG 1 >> confdefs.h +echo "#define HAVE_GETLOADAVG 1" >> confdefs.h DEFS="$DEFS -DHAVE_GETLOADAVG=1" SEDDEFS="${SEDDEFS}\${SEDdA}HAVE_GETLOADAVG\${SEDdB}HAVE_GETLOADAVG\${SEDdC}1\${SEDdD} \${SEDuA}HAVE_GETLOADAVG\${SEDuB}HAVE_GETLOADAVG\${SEDuC}1\${SEDuD} @@ -1819,7 +1865,7 @@ { test -n "$verbose" && \ echo " defining HAVE_STRCOLL" -echo "#define" HAVE_STRCOLL 1 >> confdefs.h +echo "#define HAVE_STRCOLL 1" >> confdefs.h DEFS="$DEFS -DHAVE_STRCOLL=1" SEDDEFS="${SEDDEFS}\${SEDdA}HAVE_STRCOLL\${SEDdB}HAVE_STRCOLL\${SEDdC}1\${SEDdD} \${SEDuA}HAVE_STRCOLL\${SEDuB}HAVE_STRCOLL\${SEDuC}1\${SEDuD} @@ -1846,7 +1892,7 @@ { test -n "$verbose" && \ echo " defining ${trhdr}" -echo "#define" ${trhdr} 1 >> confdefs.h +echo "#define ${trhdr} 1" >> confdefs.h DEFS="$DEFS -D${trhdr}=1" SEDDEFS="${SEDDEFS}\${SEDdA}${trhdr}\${SEDdB}${trhdr}\${SEDdC}1\${SEDdD} \${SEDuA}${trhdr}\${SEDuB}${trhdr}\${SEDuC}1\${SEDuD} @@ -1883,7 +1929,7 @@ { test -n "$verbose" && \ echo " defining ${trfunc}" -echo "#define" ${trfunc} 1 >> confdefs.h +echo "#define ${trfunc} 1" >> confdefs.h DEFS="$DEFS -D${trfunc}=1" SEDDEFS="${SEDDEFS}\${SEDdA}${trfunc}\${SEDdB}${trfunc}\${SEDdC}1\${SEDdD} \${SEDuA}${trfunc}\${SEDuB}${trfunc}\${SEDuC}1\${SEDuD} @@ -1921,7 +1967,7 @@ { test -n "$verbose" && \ echo " defining HAVE_UNION_WAIT" -echo "#define" HAVE_UNION_WAIT 1 >> confdefs.h +echo "#define HAVE_UNION_WAIT 1" >> confdefs.h DEFS="$DEFS -DHAVE_UNION_WAIT=1" SEDDEFS="${SEDDEFS}\${SEDdA}HAVE_UNION_WAIT\${SEDdB}HAVE_UNION_WAIT\${SEDdC}1\${SEDdD} \${SEDuA}HAVE_UNION_WAIT\${SEDuB}HAVE_UNION_WAIT\${SEDuC}1\${SEDuD} @@ -1951,7 +1997,7 @@ { test -n "$verbose" && \ echo " defining SYS_SIGLIST_DECLARED" -echo "#define" SYS_SIGLIST_DECLARED 1 >> confdefs.h +echo "#define SYS_SIGLIST_DECLARED 1" >> confdefs.h DEFS="$DEFS -DSYS_SIGLIST_DECLARED=1" SEDDEFS="${SEDDEFS}\${SEDdA}SYS_SIGLIST_DECLARED\${SEDdB}SYS_SIGLIST_DECLARED\${SEDdC}1\${SEDdD} \${SEDuA}SYS_SIGLIST_DECLARED\${SEDuB}SYS_SIGLIST_DECLARED\${SEDuC}1\${SEDuD} @@ -2050,11 +2096,12 @@ echo checking for location of SCCS get command if test -f /usr/sccs/get; then + SCCS_GET=/usr/sccs/get { test -n "$verbose" && \ -echo " defining" SCCS_GET to be \"/usr/sccs/get\" -echo "#define" SCCS_GET \"/usr/sccs/get\" >> confdefs.h +echo " defining SCCS_GET to be \"/usr/sccs/get\"" +echo "#define SCCS_GET \"/usr/sccs/get\"" >> confdefs.h DEFS="$DEFS -DSCCS_GET=\"/usr/sccs/get\"" SEDDEFS="${SEDDEFS}\${SEDdA}SCCS_GET\${SEDdB}SCCS_GET\${SEDdC}\"/usr/sccs/get\"\${SEDdD} \${SEDuA}SCCS_GET\${SEDuB}SCCS_GET\${SEDuC}\"/usr/sccs/get\"\${SEDuD} @@ -2063,11 +2110,12 @@ } else + SCCS_GET=get { test -n "$verbose" && \ -echo " defining" SCCS_GET to be \"get\" -echo "#define" SCCS_GET \"get\" >> confdefs.h +echo " defining SCCS_GET to be \"get\"" +echo "#define SCCS_GET \"get\"" >> confdefs.h DEFS="$DEFS -DSCCS_GET=\"get\"" SEDDEFS="${SEDDEFS}\${SEDdA}SCCS_GET\${SEDdB}SCCS_GET\${SEDdC}\"get\"\${SEDdD} \${SEDuA}SCCS_GET\${SEDuB}SCCS_GET\${SEDuC}\"get\"\${SEDuD} @@ -2076,10 +2124,32 @@ } fi +ac_clean_files="$ac_clean_files s.conftest conftoast" # Remove these later. +if ( /usr/sccs/admin -n s.conftest || admin -n s.conftest ) >/dev/null 2>&1 && + test -f s.conftest; then + # We successfully created an SCCS file. + echo checking if SCCS get command understands -G + if $SCCS_GET s.conftest -Gconftoast >/dev/null 2>&1 && + test -f conftoast; then + +{ +test -n "$verbose" && \ +echo " defining SCCS_GET_MINUS_G" +echo "#define SCCS_GET_MINUS_G 1" >> confdefs.h +DEFS="$DEFS -DSCCS_GET_MINUS_G=1" +SEDDEFS="${SEDDEFS}\${SEDdA}SCCS_GET_MINUS_G\${SEDdB}SCCS_GET_MINUS_G\${SEDdC}1\${SEDdD} +\${SEDuA}SCCS_GET_MINUS_G\${SEDuB}SCCS_GET_MINUS_G\${SEDuC}1\${SEDuD} +\${SEDeA}SCCS_GET_MINUS_G\${SEDeB}SCCS_GET_MINUS_G\${SEDeC}1\${SEDeD} +" +} + + fi +fi +rm -f s.conftest conftoast # Set default prefixes. -if test -n "$prefix"; then - test -z "$exec_prefix" && exec_prefix='${prefix}' +if test "z$prefix" != 'z' ; then + test "z$exec_prefix" = 'z' && exec_prefix='${prefix}' prsub="s%^prefix\\([ ]*\\)=\\([ ]*\\).*$%prefix\\1=\\2$prefix%" fi if test -n "$exec_prefix"; then @@ -2149,11 +2219,15 @@ dir=`echo $file|sed 's%/[^/][^/]*$%%'` if test "$dir" != "$file"; then test "$top_srcdir" != . && srcdir=$top_srcdir/$dir - test ! -d $dir && mkdir $dir + test ! -d "$dir" && mkdir "$dir" fi - echo creating $file - rm -f $file - echo "# Generated automatically from `echo $file|sed 's|.*/||'`.in by configure." > $file + echo creating "$file" + rm -f "$file" + comment_str="Generated automatically from `echo $file|sed 's|.*/||'`.in by configure." + case "$file" in + *.c | *.h | *.C | *.cc | *.m ) echo "/* $comment_str */" > "$file" ;; + * ) echo "# $comment_str" > "$file" ;; + esac sed -e " $prsub $extrasub @@ -2184,22 +2258,24 @@ # They are passed to sed as "A NAME B NAME C VALUE D", where NAME # is the cpp macro being defined and VALUE is the value it is being given. # Each defining turns into a single global substitution command. +# Hopefully no one uses "!" as a variable value. +# Other candidates for the sed separators, like , and @, do get used. # # SEDd sets the value in "#define NAME VALUE" lines. -SEDdA='s@^\([ ]*\)#\([ ]*define[ ][ ]*\)' -SEDdB='\([ ][ ]*\)[^ ]*@\1#\2' +SEDdA='s!^\([ ]*\)#\([ ]*define[ ][ ]*\)' +SEDdB='\([ ][ ]*\)[^ ]*!\1#\2' SEDdC='\3' -SEDdD='@g' +SEDdD='!g' # SEDu turns "#undef NAME" with trailing blanks into "#define NAME VALUE". -SEDuA='s@^\([ ]*\)#\([ ]*\)undef\([ ][ ]*\)' -SEDuB='\([ ]\)@\1#\2define\3' +SEDuA='s!^\([ ]*\)#\([ ]*\)undef\([ ][ ]*\)' +SEDuB='\([ ]\)!\1#\2define\3' SEDuC=' ' -SEDuD='\4@g' +SEDuD='\4!g' # SEDe turns "#undef NAME" without trailing blanks into "#define NAME VALUE". -SEDeA='s@^\([ ]*\)#\([ ]*\)undef\([ ][ ]*\)' -SEDeB='$@\1#\2define\3' +SEDeA='s!^\([ ]*\)#\([ ]*\)undef\([ ][ ]*\)' +SEDeB='$!\1#\2define\3' SEDeC=' ' -SEDeD='@g' +SEDeD='!g' rm -f conftest.sed EOF # Turn off quoting long enough to insert the sed commands. @@ -2272,12 +2348,12 @@ +# Makefile uses this timestamp file to know when to remake Makefile, +# build.sh, and glob/Makefile. +touch stamp-config exit 0 EOF chmod +x config.status ${CONFIG_SHELL-/bin/sh} config.status -# Makefile uses this timestamp file to know when to remake Makefile, -# build.sh, and glob/Makefile. -touch stamp-config diff -ruN make-3.69/configure.in make-3.70/configure.in --- make-3.69/configure.in Fri Oct 22 02:56:46 1993 +++ make-3.70/configure.in Thu Dec 23 14:46:50 1993 @@ -29,7 +29,7 @@ AC_HAVE_FUNCS(getdtablesize sys_siglist _sys_siglist psignal \ dup2 getcwd sigsetmask getgroups setlinebuf \ - setreuid setregid) + setreuid setregid strerror) AC_ALLOCA AC_VFORK AC_SETVBUF_REVERSED @@ -74,15 +74,28 @@ echo checking for location of SCCS get command if test -f /usr/sccs/get; then + SCCS_GET=/usr/sccs/get AC_DEFINE(SCCS_GET, "/usr/sccs/get") else + SCCS_GET=get AC_DEFINE(SCCS_GET, "get") fi +ac_clean_files="$ac_clean_files s.conftest conftoast" # Remove these later. +if ( /usr/sccs/admin -n s.conftest || admin -n s.conftest ) >/dev/null 2>&1 && + test -f s.conftest; then + # We successfully created an SCCS file. + echo checking if SCCS get command understands -G + if $SCCS_GET s.conftest -Gconftoast >/dev/null 2>&1 && + test -f conftoast; then + AC_DEFINE(SCCS_GET_MINUS_G) + fi +fi +rm -f s.conftest conftoast -AC_OUTPUT(Makefile build.sh glob/Makefile) +AC_OUTPUT(Makefile build.sh glob/Makefile, [ # Makefile uses this timestamp file to know when to remake Makefile, # build.sh, and glob/Makefile. -touch stamp-config +touch stamp-config]) dnl Local Variables: dnl comment-start: "dnl " diff -ruN make-3.69/default.c make-3.70/default.c --- make-3.69/default.c Thu Oct 14 18:25:17 1993 +++ make-3.70/default.c Tue Dec 14 16:59:57 1993 @@ -63,9 +63,9 @@ /* SCCS. */ { "%", "s.%", - "$(GET) $(GFLAGS) $< -G $@" }, + "$(GET) $(GFLAGS) $< $(SCCS_OUTPUT_OPTION)" }, { "%", "SCCS/s.%", - "$(GET) $(GFLAGS) $< -G $@" }, + "$(GET) $(GFLAGS) $< $(SCCS_OUTPUT_OPTION)" }, { 0, 0, 0 } }; @@ -293,6 +293,10 @@ #else /* Xenix. */ "OUTPUT_OPTION", "-Fo$@", #endif /* Not Xenix. */ +#endif + +#ifdef SCCS_GET_MINUS_G + "SCCS_OUTPUT_OPTION", "-G$@", #endif 0, 0 diff -ruN make-3.69/file.c make-3.70/file.c --- make-3.69/file.c Mon Oct 18 07:01:37 1993 +++ make-3.70/file.c Tue Dec 14 14:36:43 1993 @@ -506,7 +506,7 @@ printf ("\n# %u files in %u hash buckets.\n", nfiles, FILE_BUCKETS); #ifndef NO_FLOAT printf ("# average %.1f files per bucket, max %u files in one bucket.\n", - ((double) FILE_BUCKETS) / ((double) nfiles) * 100.0, per_bucket); + ((double) nfiles) / ((double) FILE_BUCKETS) * 100.0, per_bucket); #endif } } diff -ruN make-3.69/getopt.c make-3.70/getopt.c --- make-3.69/getopt.c Mon Sep 20 16:03:23 1993 +++ make-3.70/getopt.c Fri Dec 24 19:42:52 1993 @@ -20,6 +20,14 @@ along with this program; if not, write to the Free Software Foundation, 675 Mass Ave, Cambridge, MA 02139, USA. */ +/* + * This tells Alpha OSF/1 not to define a getopt prototype in . + * Ditto for AIX 3.2 and . + */ +#ifndef _NO_PROTO +#define _NO_PROTO +#endif + #ifdef HAVE_CONFIG_H #if defined (emacs) || defined (CONFIG_BROKETS) /* We use instead of "config.h" so that a compilation @@ -37,11 +45,6 @@ #ifndef const #define const #endif -#endif - -/* This tells Alpha OSF/1 not to define a getopt prototype in . */ -#ifndef _NO_PROTO -#define _NO_PROTO #endif #include diff -ruN make-3.69/glob/fnmatch.h make-3.70/glob/fnmatch.h --- make-3.69/glob/fnmatch.h Sun Apr 11 18:54:32 1993 +++ make-3.70/glob/fnmatch.h Tue Dec 14 15:02:10 1993 @@ -34,6 +34,13 @@ non-ANSI C where `const' is problematical. */ #endif /* C++ or ANSI C. */ + +/* We #undef these before defining them because some losing systems + (HP-UX A.08.07 for example) define these in . */ +#undef FNM_PATHNAME +#undef FNM_NOESCAPE +#undef FNM_PERIOD + /* Bits set in the FLAGS argument to `fnmatch'. */ #define FNM_PATHNAME (1 << 0) /* No wildcard can ever match `/'. */ #define FNM_NOESCAPE (1 << 1) /* Backslashes don't quote special chars. */ diff -ruN make-3.69/install.sh make-3.70/install.sh --- make-3.69/install.sh +++ make-3.70/install.sh Mon Oct 26 22:42:49 1992 @@ -0,0 +1,119 @@ +#!/bin/sh + +# +# install - install a program, script, or datafile +# This comes from X11R5; it is not part of GNU. +# +# $XConsortium: install.sh,v 1.2 89/12/18 14:47:22 jim Exp $ +# +# This script is compatible with the BSD install script, but was written +# from scratch. +# + + +# set DOITPROG to echo to test this script + +# Don't use :- since 4.3BSD and earlier shells don't like it. +doit="${DOITPROG-}" + + +# put in absolute paths if you don't have them in your path; or use env. vars. + +mvprog="${MVPROG-mv}" +cpprog="${CPPROG-cp}" +chmodprog="${CHMODPROG-chmod}" +chownprog="${CHOWNPROG-chown}" +chgrpprog="${CHGRPPROG-chgrp}" +stripprog="${STRIPPROG-strip}" +rmprog="${RMPROG-rm}" + +instcmd="$mvprog" +chmodcmd="" +chowncmd="" +chgrpcmd="" +stripcmd="" +rmcmd="$rmprog -f" +mvcmd="$mvprog" +src="" +dst="" + +while [ x"$1" != x ]; do + case $1 in + -c) instcmd="$cpprog" + shift + continue;; + + -m) chmodcmd="$chmodprog $2" + shift + shift + continue;; + + -o) chowncmd="$chownprog $2" + shift + shift + continue;; + + -g) chgrpcmd="$chgrpprog $2" + shift + shift + continue;; + + -s) stripcmd="$stripprog" + shift + continue;; + + *) if [ x"$src" = x ] + then + src=$1 + else + dst=$1 + fi + shift + continue;; + esac +done + +if [ x"$src" = x ] +then + echo "install: no input file specified" + exit 1 +fi + +if [ x"$dst" = x ] +then + echo "install: no destination specified" + exit 1 +fi + + +# If destination is a directory, append the input filename; if your system +# does not like double slashes in filenames, you may need to add some logic + +if [ -d $dst ] +then + dst="$dst"/`basename $src` +fi + +# Make a temp file name in the proper directory. + +dstdir=`dirname $dst` +dsttmp=$dstdir/#inst.$$# + +# Move or copy the file name to the temp name + +$doit $instcmd $src $dsttmp + +# and set any options; do chmod last to preserve setuid bits + +if [ x"$chowncmd" != x ]; then $doit $chowncmd $dsttmp; fi +if [ x"$chgrpcmd" != x ]; then $doit $chgrpcmd $dsttmp; fi +if [ x"$stripcmd" != x ]; then $doit $stripcmd $dsttmp; fi +if [ x"$chmodcmd" != x ]; then $doit $chmodcmd $dsttmp; fi + +# Now rename the file to the real destination. + +$doit $rmcmd $dst +$doit $mvcmd $dsttmp $dst + + +exit 0 diff -ruN make-3.69/main.c make-3.70/main.c --- make-3.69/main.c Wed Oct 27 18:14:41 1993 +++ make-3.70/main.c Thu Dec 16 15:10:36 1993 @@ -497,7 +497,11 @@ register char *ep = envp[i]; while (*ep != '=') ++ep; - define_variable (envp[i], ep - envp[i], ep + 1, o_env, 1) + /* The result of pointer arithmetic is cast to unsigned int for + machines where ptrdiff_t is a different size that doesn't widen + the same. */ + define_variable (envp[i], (unsigned int) (ep - envp[i]), + ep + 1, o_env, 1) /* Force exportation of every variable culled from the environment. We used to rely on target_environment's v_default code to do this. But that does not work for the case where an environment variable @@ -1489,6 +1493,7 @@ { register const struct command_switch *cs; char *flagstring; + struct variable *v; /* We will construct a linked list of `struct flag's describing all the flags which need to go in MAKEFLAGS. Then, once we @@ -1658,22 +1663,25 @@ *p = '\0'; } - define_variable ("MAKEFLAGS", 9, - /* On Sun, the value of MFLAGS starts with a `-' but - the value of MAKEFLAGS lacks the `-'. - Be compatible with this unless FLAGSTRING starts - with a long option `--foo', since removing the - first dash would result in the bogus `-foo'. */ - flagstring[1] == '-' ? flagstring : &flagstring[1], - /* This used to use o_env, but that lost when a - makefile defined MAKEFLAGS. Makefiles set - MAKEFLAGS to add switches, but we still want - to redefine its value with the full set of - switches. Of course, an override or command - definition will still take precedence. */ - o_file, 0) - /* Always export MAKEFLAGS. */ - ->export = v_export; + v = define_variable ("MAKEFLAGS", 9, + /* On Sun, the value of MFLAGS starts with a `-' but + the value of MAKEFLAGS lacks the `-'. + Be compatible with this unless FLAGSTRING starts + with a long option `--foo', since removing the + first dash would result in the bogus `-foo'. */ + flagstring[1] == '-' ? flagstring : &flagstring[1], + /* This used to use o_env, but that lost when a + makefile defined MAKEFLAGS. Makefiles set + MAKEFLAGS to add switches, but we still want + to redefine its value with the full set of + switches. Of course, an override or command + definition will still take precedence. */ + o_file, 0); + if (! all) + /* The first time we are called, set MAKEFLAGS to always be exported. + We should not do this again on the second call, because that is + after reading makefiles which might have done `unexport MAKEFLAGS'. */ + v->export = v_export; /* Since MFLAGS is not parsed for flags, there is no reason to override any makefile redefinition. */ (void) define_variable ("MFLAGS", 6, flagstring, o_env, 0); diff -ruN make-3.69/make.texinfo make-3.70/make.texinfo --- make-3.69/make.texinfo Wed Nov 3 07:21:47 1993 +++ make-3.70/make.texinfo Tue Dec 14 19:33:30 1993 @@ -7,10 +7,10 @@ @c FSF publishers: format makebook.texi instead of using this file directly. -@set EDITION 0.44 -@set VERSION 3.69 Beta -@set UPDATED 3 November 1993 -@set UPDATE-MONTH November 1993 +@set EDITION 0.45 +@set VERSION 3.70 Beta +@set UPDATED 14 December 1993 +@set UPDATE-MONTH December 1993 @c finalout @@ -3764,21 +3764,40 @@ (@pxref{Functions, ,Functions for Transforming Text}). @cindex spaces, in variable values +@cindex whitespace, in variable values @cindex variables, spaces in values -You can also use them to introduce controlled leading or trailing spaces -into variable values. Such spaces are discarded from your input before -substitution of variable references and function calls; this means you can -include leading or trailing spaces in a variable value by protecting them -with variable references, like this: +You can also use them to introduce controlled leading whitespace into +variable values. Leading whitespace characters are discarded from your +input before substitution of variable references and function calls; +this means you can include leading spaces in a variable value by +protecting them with variable references, like this: @example nullstring := -space := $(nullstring) $(nullstring) +space := $(nullstring) # end of the line @end example @noindent -Here the value of the variable @code{space} is precisely one space. +Here the value of the variable @code{space} is precisely one space. The +comment @w{@samp{# end of the line}} is included here just for clarity. +Since trailing space characters are @emph{not} stripped from variable +values, just a space at the end of the line would have the same effect +(but be rather hard to read). If you put whitespace at the end of a +variable value, it is a good idea to put a comment like that at the end +of the line to make your intent clear. Conversely, if you do @emph{not} +want any whitespace characters at the end of your variable value, you +must remember not to put a random comment on the end of the line after +some whitespace, such as this: +@example +dir := /foo/bar # directory to put the frobs in +@end example + +@noindent +Here the value of the variable @code{dir} is @w{@samp{/foo/bar }} +(with four trailing spaces), which was probably not the intention. +(Imagine something like @w{@samp{$(dir)/file}} with this definition!) + @node Advanced, Values, Flavors, Using Variables @section Advanced Features for Reference to Variables @cindex reference to variables @@ -5571,8 +5590,9 @@ Targets, ,Empty Target Files to Record Events}). Many makefiles contain a phony target named @file{clean} which deletes everything except source files. Naturally, this is done only if you request it explicitly with -@w{@samp{make clean}}. Here is a list of typical phony and empty target -names:@refill +@w{@samp{make clean}}. Following is a list of typical phony and empty +target names. @xref{Standard Targets}, for a detailed list of all the +standard target names which GNU software packages use. @table @file @item all @@ -5596,11 +5616,10 @@ @cindex @code{realclean} @r{(standard target)} @itemx clobber @cindex @code{clobber} @r{(standard target)} -Any of these three might be defined to delete everything that would -not be part of a standard distribution. For example, this would -delete configuration files or links that you would normally create as -preparation for compilation, even if the makefile itself cannot create -these files. +Any of these targets might be defined to delete @emph{more} files than +@samp{clean} does. For example, this would delete configuration files +or links that you would normally create as preparation for compilation, +even if the makefile itself cannot create these files. @item install @cindex @code{install} @r{(standard target)} diff -ruN make-3.69/misc.c make-3.70/misc.c --- make-3.69/misc.c Sun Aug 1 16:03:45 1993 +++ make-3.70/misc.c Thu Dec 2 15:37:46 1993 @@ -267,6 +267,23 @@ die (1); } +#ifndef HAVE_STRERROR +char * +strerror (errnum) + int errnum; +{ + extern int errno, sys_nerr; + extern char *sys_errlist[]; + static char buf[] = "Unknown error 12345678901234567890"; + + if (errno < sys_nerr) + return sys_errlist[errnum]; + + sprintf ("Unknown error %d", buf, errnum); + return buf; +} +#endif + /* Print an error message from errno. */ void @@ -273,13 +290,7 @@ perror_with_name (str, name) char *str, *name; { - extern int errno, sys_nerr; - extern char *sys_errlist[]; - - if (errno < sys_nerr) - error ("%s%s: %s", str, name, sys_errlist[errno]); - else - error ("%s%s: Unknown error %d", str, name, errno); + error ("%s%s: %s", str, name, strerror (errno)); } /* Print an error message from errno and exit. */ @@ -288,13 +299,7 @@ pfatal_with_name (name) char *name; { - extern int errno, sys_nerr; - extern char *sys_errlist[]; - - if (errno < sys_nerr) - fatal ("%s: %s", name, sys_errlist[errno]); - else - fatal ("%s: Unknown error %d", name, errno); + fatal ("%s: %s", name, strerror (errno)); /* NOTREACHED */ } diff -ruN make-3.69/read.c make-3.70/read.c --- make-3.69/read.c Mon Oct 25 15:25:17 1993 +++ make-3.70/read.c Thu Dec 23 17:56:05 1993 @@ -33,7 +33,7 @@ struct passwd *getpwnam (); -static void read_makefile (); +static int read_makefile (); static unsigned int readline (), do_define (); static int conditional_line (); static void record_files (); @@ -143,7 +143,8 @@ { if (*p != '\0') *p++ = '\0'; - read_makefile (name, RM_NO_DEFAULT_GOAL | RM_INCLUDED | RM_DONTCARE); + (void) read_makefile (name, + RM_NO_DEFAULT_GOAL | RM_INCLUDED | RM_DONTCARE); } free (value); @@ -157,7 +158,8 @@ struct dep *tail = read_makefiles; register struct dep *d; - read_makefile (*makefiles, 0); + if (! read_makefile (*makefiles, 0)) + perror_with_name ("", *makefiles); /* Find the right element of read_makefiles. */ d = read_makefiles; @@ -181,7 +183,10 @@ ++p; if (*p != 0) - read_makefile (*p, 0); + { + if (! read_makefile (*p, 0)) + perror_with_name ("", *p); + } else { /* No default makefile was found. Add the default makefiles to the @@ -214,9 +219,11 @@ FLAGS contains bits as above. - FILENAME is added to the `read_makefiles' chain. */ + FILENAME is added to the `read_makefiles' chain. -static void + Returns 1 if a file was found and read, 0 if not. */ + +static int read_makefile (filename, flags) char *filename; int flags; @@ -314,19 +321,15 @@ deps->changed = flags; deps = 0; - /* If the makefile can't be found at all, - either ignore it or give up entirely. */ + /* If the makefile can't be found at all, give up entirely. */ if (infile == 0) { - if (! (flags & RM_DONTCARE)) - { - /* If we did some searching, errno has the error - from the last attempt, rather from FILENAME itself. */ - errno = makefile_errno; - perror_with_name ("fopen: ", filename); - } - return; + /* If we did some searching, errno has the error from the last + attempt, rather from FILENAME itself. Restore it in case the + caller wants to use it in a message. */ + errno = makefile_errno; + return 0; } reading_filename = filename; @@ -548,8 +551,10 @@ free (files); files = next; - read_makefile (name, (RM_INCLUDED | RM_NO_TILDE - | (noerror ? RM_DONTCARE : 0))); + if (! read_makefile (name, (RM_INCLUDED | RM_NO_TILDE + | (noerror ? RM_DONTCARE : 0)))) + makefile_error (filename, lineno, + "%s: %s", name, strerror (errno)); } /* Free any space allocated by conditional_line. */ @@ -587,6 +592,13 @@ else if (try_variable_definition (filename, lineno, p, o_file)) /* This line has been dealt with. */ ; + else if (lb.buffer[0] == '\t') + /* This line starts with a tab but was not caught above + because there was no preceding target, and the line + might have been usable as a variable definition. + But now it is definitely lossage. */ + makefile_fatal (filename, lineno, + "commands commence before first target"); else { /* This line describes some target files. */ @@ -730,6 +742,8 @@ reading_filename = 0; reading_lineno_ptr = 0; + + return 1; } /* Execute a `define' directive. @@ -1603,6 +1617,11 @@ new1->name = name; new1 = new1->next; } + + if (new1 == 0) + /* We might have slurped up the whole list, + and continuing the loop would dereference NEW1. */ + break; } } @@ -1634,18 +1653,21 @@ *p = '\0'; - while (1) + while (fgets (p, end - p, stream) != 0) { - if (fgets (p, end - p, stream) == 0) - if (feof (stream)) - break; - else - pfatal_with_name (filename); - len = strlen (p); if (len == 0) - /* This only happens when the first thing on the line is a '\0'. */ - makefile_fatal (filename, lineno, "NUL not allowed in makefile"); + { + /* This only happens when the first thing on the line is a '\0'. + It is a pretty hopeless case, but (wonder of wonders) Athena + lossage strikes again! (xmkmf puts NULs in its makefiles.) + There is nothing really to be done; we synthesize a newline so + the following line doesn't appear to be part of this line. */ + makefile_error (filename, lineno, + "warning: NUL character seen; rest of line ignored"); + p[0] = '\n'; + len = 1; + } p += len; if (p[-1] != '\n') @@ -1700,6 +1722,9 @@ linebuffer->buffer = buffer; } } + + if (ferror (stream)) + pfatal_with_name (filename); return nlines; } diff -ruN make-3.69/texinfo.tex make-3.70/texinfo.tex --- make-3.69/texinfo.tex Tue Sep 28 16:01:07 1993 +++ make-3.70/texinfo.tex Sat Dec 25 22:32:06 1993 @@ -22,7 +22,7 @@ %You are forbidden to forbid anyone else to use, share and improve %what you give them. Help stamp out software-hoarding! -\def\texinfoversion{2.115} +\def\texinfoversion{2.118} \message{Loading texinfo package [Version \texinfoversion]:} % Print the version number if in a .fmt file. @@ -460,7 +460,7 @@ % @dots{} output some dots -\def\dots{$\ldots$} +\def\dots{.$\,$.$\,$.\:} % @page forces the start of a new page @@ -1504,7 +1504,7 @@ \def\itemize{\parsearg\itemizezzz} \def\itemizezzz #1{% - \begingroup % ended by the @end itemsize + \begingroup % ended by the @end itemize \itemizey {#1}{\Eitemize} } @@ -1985,7 +1985,7 @@ % Like \dotfill except takes at least 1 em. \def\indexdotfill{\cleaders - \hbox{$\mathsurround=0pt \mkern1.5mu . \mkern1.5mu$}\hskip 1em plus 1fill} + \hbox{$\mathsurround=0pt \mkern1.5mu ${\it .}$ \mkern1.5mu$}\hskip 1em plus 1fill} \def\primary #1{\line{#1\hfil}} @@ -3281,7 +3281,7 @@ % Expand, preventing hyphenation at `-' chars. % Note that groups don't affect changes in \hyphenchar. \functionparens -\code{#1}% +\tclose{#1}% avoid \code because of side effects on active chars \interlinepenalty=10000 \advance\rightskip by 0pt plus 1fil \endgraf\penalty 10000\vskip -\parskip\penalty 10000% diff -ruN make-3.69/version.c make-3.70/version.c --- make-3.69/version.c Sun Nov 7 08:07:36 1993 +++ make-3.70/version.c Mon Jan 3 17:50:25 1994 @@ -1,4 +1,4 @@ -char *version_string = "3.69"; +char *version_string = "3.70"; /* Local variables: diff -ruN make-3.69/vpath.c make-3.70/vpath.c --- make-3.69/vpath.c Thu Jul 8 21:30:13 1993 +++ make-3.70/vpath.c Wed Dec 22 23:42:29 1993 @@ -158,8 +158,9 @@ free ((char *) path->searchpath); free ((char *) path); } + else + lastpath = path; - lastpath = path; path = next; } @@ -369,10 +370,24 @@ else bcopy (filename, n, flen + 1); - if (not_target) - /* Since *FILE is not a target, if the file is - mentioned in a makefile, we consider it existent. */ - exists = lookup_file (name) != 0; + /* Check if the file is mentioned in a makefile. If *FILE is not + a target, that is enough for us to decide this file exists. + If *FILE is a target, then the file must be mentioned in the + makefile also as a target to be chosen. + + The restriction that *FILE must not be a target for a + makefile-mentioned file to be chosen was added by an + inadequately commented change in July 1990; I am not sure off + hand what problem it fixes. + + In December 1993 I loosened of this restriction to allow a file + to be chosen if it is mentioned as a target in a makefile. This + seem logical. */ + { + struct file *f = lookup_file (name); + if (f != 0) + exists = not_target || f->is_target; + } if (!exists) {