]> git.pld-linux.org Git - packages/automake.git/blame - automake-1.4-19980208.patch
- release 10.
[packages/automake.git] / automake-1.4-19980208.patch
CommitLineData
85212340 1cvs server: Diffing .
2Index: ChangeLog
3===================================================================
4RCS file: /cvs/automake/automake/ChangeLog,v
5retrieving revision 1.676
6retrieving revision 1.688
7diff -u -r1.676 -r1.688
8--- ChangeLog 1999/01/14 22:45:40 1.676
9+++ ChangeLog 1999/02/02 09:51:52 1.688
10@@ -1,3 +1,52 @@
11+1999-02-02 Tom Tromey <tromey@cygnus.com>
12+
13+ * automake.in (handle_merge_targets): Use INSTALL_STRIP_FLAG.
14+ * progs.am (install-@DIR@PROGRAMS): Added INSTALL_STRIP_FLAG.
15+ * header-vars.am (INSTALL_PROGRAM): Removed
16+ AM_INSTALL_PROGRAM_FLAGS.
17+ (INSTALL_STRIP_FLAG): New macro.
18+
19+ * automake.in: Handle `ypp' as C++ yacc source and `lpp' as C++
20+ lex source.
21+ (lang_yacc_finish): Likewise.
22+ (lang_lex_finish): Likewise.
23+
24+1999-02-01 Tom Tromey <tromey@cygnus.com>
25+
26+ * automake.in (handle_dist_worker): Correctly find find in $$d,
27+ not $$. From Bill Davidson.
28+
29+ * automake.in (finish_languages): Use "&", not "do". From Pavel
30+ Roskin.
31+ (handle_single_transform_list): Likewise.
32+
33+1999-01-29 Tom Tromey <tromey@cygnus.com>
34+
35+ * automake.in (handle_configure): Removed unused variable. From
36+ Pavel Roskin.
37+
38+ * ansi2knr.c: New version from L. Peter Deutsch.
39+
40+1999-01-22 Tom Tromey <tromey@cygnus.com>
41+
42+ * automake.in (require_file_internal): Correctly examine return
43+ value of `system'. From Andris Pavenis. Fixes copy.test.
44+
45+ * m4/init.m4 (AM_INIT_AUTOMAKE): Require autoconf 2.13.
46+
47+ * automake.in (lang_ppf77_rewrite): New function. From Jochen
48+ Kuepper. Fixes ppf77.test.
49+ (lang_ratfor_rewrite): New function
50+
51+ * automake.in (handle_configure): Use `&' before sub calls (Perl 4
52+ fix). From Erez Zadok.
53+
54+1999-01-15 Tom Tromey <tromey@cygnus.com>
55+
56+ * configure.in: Version 1.4a (oops).
57+
58+ * configure.in: Updated version to 1.5a.
59+
60 1999-01-14 Tom Tromey <tromey@cygnus.com>
61
62 * automake.in (handle_configure): Compute $header_dir based on
63Index: Makefile.in
64===================================================================
65RCS file: /cvs/automake/automake/Makefile.in,v
66retrieving revision 1.217
67retrieving revision 1.218
68diff -u -r1.217 -r1.218
69--- Makefile.in 1999/01/14 22:47:17 1.217
70+++ Makefile.in 1999/01/14 23:15:58 1.218
71@@ -96,10 +96,10 @@
72 DATA = $(pkgdata_DATA) $(script_DATA)
73
74 DIST_COMMON = README AUTHORS COPYING ChangeLog INSTALL Makefile.am \
75-Makefile.in NEWS THANKS TODO aclocal.in aclocal.m4 ansi2knr.1 \
76-ansi2knr.c automake.in config.guess config.sub configure configure.in \
77-elisp-comp install-sh mdate-sh missing mkinstalldirs stamp-vti \
78-texinfo.tex version.texi ylwrap
79+Makefile.in NEWS README-alpha THANKS TODO aclocal.in aclocal.m4 \
80+ansi2knr.1 ansi2knr.c automake.in config.guess config.sub configure \
81+configure.in elisp-comp install-sh mdate-sh missing mkinstalldirs \
82+stamp-vti texinfo.tex version.texi ylwrap
83
84
85 DISTFILES = $(DIST_COMMON) $(SOURCES) $(HEADERS) $(TEXINFOS) $(EXTRA_DIST)
86Index: THANKS
87===================================================================
88RCS file: /cvs/automake/automake/THANKS,v
89retrieving revision 1.79
90retrieving revision 1.82
91diff -u -r1.79 -r1.82
92--- THANKS 1999/01/10 20:39:25 1.79
93+++ THANKS 1999/02/01 12:03:47 1.82
94@@ -7,10 +7,12 @@
95 Alexandre Oliva oliva@dcc.unicamp.br
96 Andreas Schwab schwab@lamothe.informatik.uni-dortmund.de
97 Andrew Cagney cagney@tpgi.com.au
98+Andris Pavenis pavenis@lanet.lv
99 Anthony Green green@cygnus.com
100 Assar Westerlund assar@sics.se
101 Bernard Urban Bernard.Urban@meteo.fr
102 Bill Currie bcurrie@tssc.co.nz
103+Bill Davidson bill@kayhay.com
104 Bill Fenner fenner@parc.xerox.com
105 Brian Jones cbj@nortel.net
106 Chris Provenzano proven@io.proven.org
107@@ -39,6 +41,7 @@
108 Jeff Garzik jgarzik@pobox.com
109 Jerome Santini santini@chambord.univ-orleans.fr
110 Jim Meyering meyering@na-net.ornl.gov
111+Jochen Kuepper jochen@uni-duesseldorf.de
112 Joel N. Weber II nemo@koa.iolani.honolulu.hi.us
113 Joerg-Martin Schwarz jms@jms.prima.ruhr.de
114 Johan Danielsson joda@pdc.kth.se
115@@ -51,8 +54,8 @@
116 Kevin Dalley kevin@aimnet.com
117 Kevin Street street@iname.com
118 L. Peter Deutsch ghost@aladdin.com
119-Maciej W. Rozycki macro@ds2.pg.gda.pl
120 Maciej Stachowiak mstachow@mit.edu
121+Maciej W. Rozycki macro@ds2.pg.gda.pl
122 Marcus G. Daniels mgd@ute.santafe.edu
123 Marius Vollmer mvo@zagadka.ping.de
124 Mark Eichin eichin@cygnus.com
125Index: TODO
126===================================================================
127RCS file: /cvs/automake/automake/TODO,v
128retrieving revision 1.371
129retrieving revision 1.372
130diff -u -r1.371 -r1.372
131--- TODO 1999/01/14 22:45:42 1.371
132+++ TODO 1999/02/02 09:51:54 1.372
133@@ -2,6 +2,9 @@
134 still won't put the file into the disty. This is wrong.
135 From Mark H Wilkinson <mhw@kremvax.demon.co.uk>
136
137+* using "include" inside a conditional doesn't currently
138+ work properly.
139+
140 * AM_CONFIG_HEADER might generate the wrong stamp file names
141 when given multiple headers. Write a test.
142
143Index: ansi2knr.c
144===================================================================
145RCS file: /cvs/automake/automake/ansi2knr.c,v
146retrieving revision 1.10
147retrieving revision 1.11
148diff -u -r1.10 -r1.11
149--- ansi2knr.c 1998/12/02 12:42:23 1.10
150+++ ansi2knr.c 1999/01/29 14:22:15 1.11
151@@ -1,4 +1,4 @@
152-/* Copyright (C) 1989, 1997, 1998 Aladdin Enterprises. All rights reserved. */
153+/* Copyright (C) 1989, 1997, 1998, 1999 Aladdin Enterprises. All rights reserved. */
154
155 /*$Id$*/
156 /* Convert ANSI C function definitions to K&R ("traditional C") syntax */
157@@ -51,13 +51,18 @@
158 * The following constructs will confuse it:
159 * - Any other construct that starts at the left margin and
160 * follows the above syntax (such as a macro or function call).
161- * - Some macros that tinker with the syntax of the function header.
162+ * - Some macros that tinker with the syntax of function headers.
163 */
164
165 /*
166 * The original and principal author of ansi2knr is L. Peter Deutsch
167 * <ghost@aladdin.com>. Other authors are noted in the change history
168 * that follows (in reverse chronological order):
169+ lpd 1999-01-28 fixed two bugs: a '/' in an argument list caused an
170+ endless loop; quoted strings within an argument list
171+ confused the parser
172+ lpd 1999-01-24 added a check for write errors on the output,
173+ suggested by Jim Meyering <meyering@ascend.com>
174 lpd 1998-11-09 added further hack to recognize identifier(void)
175 as being a procedure
176 lpd 1998-10-23 added hack to recognize lines consisting of
177@@ -178,6 +183,7 @@
178
179 /* Forward references */
180 char *skipspace();
181+char *scanstring();
182 int writeblanks();
183 int test1();
184 int convert1();
185@@ -190,6 +196,8 @@
186 { FILE *in = stdin;
187 FILE *out = stdout;
188 char *filename = 0;
189+ char *program_name = argv[0];
190+ char *output_name = 0;
191 #define bufsize 5000 /* arbitrary size */
192 char *buf;
193 char *line;
194@@ -205,6 +213,7 @@
195 * check for this switch for backward compatibility.
196 */
197 int convert_varargs = 1;
198+ int output_error;
199
200 while ( argc > 1 && argv[1][0] == '-' ) {
201 if ( !strcmp(argv[1], "--varargs") ) {
202@@ -219,7 +228,8 @@
203 argv += 2;
204 continue;
205 }
206- fprintf(stderr, "Unrecognized switch: %s\n", argv[1]);
207+ fprintf(stderr, "%s: Unrecognized switch: %s\n", program_name,
208+ argv[1]);
209 fprintf(stderr, usage);
210 exit(1);
211 }
212@@ -229,16 +239,19 @@
213 fprintf(stderr, usage);
214 exit(0);
215 case 3:
216- out = fopen(argv[2], "w");
217+ output_name = argv[2];
218+ out = fopen(output_name, "w");
219 if ( out == NULL ) {
220- fprintf(stderr, "Cannot open output file %s\n", argv[2]);
221+ fprintf(stderr, "%s: Cannot open output file %s\n",
222+ program_name, output_name);
223 exit(1);
224 }
225 /* falls through */
226 case 2:
227 in = fopen(argv[1], "r");
228 if ( in == NULL ) {
229- fprintf(stderr, "Cannot open input file %s\n", argv[1]);
230+ fprintf(stderr, "%s: Cannot open input file %s\n",
231+ program_name, argv[1]);
232 exit(1);
233 }
234 if ( filename == 0 )
235@@ -300,14 +313,24 @@
236 if ( line != buf )
237 fputs(buf, out);
238 free(buf);
239- if ( out != stdout )
240- fclose(out);
241+ if ( output_name ) {
242+ output_error = ferror(out);
243+ output_error |= fclose(out);
244+ } else { /* out == stdout */
245+ fflush(out);
246+ output_error = ferror(out);
247+ }
248+ if ( output_error ) {
249+ fprintf(stderr, "%s: error writing to %s\n", program_name,
250+ (output_name ? output_name : "stdout"));
251+ exit(1);
252+ }
253 if ( in != stdin )
254 fclose(in);
255 return 0;
256 }
257
258-/* Skip over space and comments, in either direction. */
259+/* Skip over whitespace and comments, in either direction. */
260 char *
261 skipspace(p, dir)
262 register char *p;
263@@ -328,6 +351,17 @@
264 return p;
265 }
266
267+/* Scan over a quoted string, in either direction. */
268+char *
269+scanstring(p, dir)
270+ register char *p;
271+ register int dir;
272+{
273+ for (p += dir; ; p += dir)
274+ if (*p == '"' && p[-dir] != '\\')
275+ return p + dir;
276+}
277+
278 /*
279 * Write blanks over part of a string.
280 * Don't overwrite end-of-line characters.
281@@ -500,8 +534,12 @@
282 else rp = p;
283 break;
284 case '/':
285- p = skipspace(p, 1) - 1;
286+ if (p[1] == '*')
287+ p = skipspace(p, 1) - 1;
288 break;
289+ case '"':
290+ p = scanstring(p, 1) - 1;
291+ break;
292 default:
293 ;
294 }
295@@ -523,9 +561,19 @@
296 while ( level )
297 switch ( *--p )
298 {
299- case ']': case ')': level++; break;
300- case '[': case '(': level--; break;
301- case '/': p = skipspace(p, -1) + 1; break;
302+ case ']': case ')':
303+ level++;
304+ break;
305+ case '[': case '(':
306+ level--;
307+ break;
308+ case '/':
309+ if (p > buf && p[-1] == '*')
310+ p = skipspace(p, -1) + 1;
311+ break;
312+ case '"':
313+ p = scanstring(p, -1) + 1;
314+ break;
315 default: ;
316 }
317 }
318Index: automake.in
319===================================================================
320RCS file: /cvs/automake/automake/automake.in,v
321retrieving revision 1.644
322retrieving revision 1.652
323diff -u -r1.644 -r1.652
324--- automake.in 1999/01/14 22:45:43 1.644
325+++ automake.in 1999/02/02 09:51:56 1.652
326@@ -313,11 +313,11 @@
327 &register_language ('yacc', '', 1,
328 'y');
329 &register_language ('yaccxx', 'CXXLINK', 0,
330- 'y++', 'yy', 'yxx');
331+ 'y++', 'yy', 'yxx', 'ypp');
332 &register_language ('lex', '', 1,
333 'l');
334 &register_language ('lexxx', 'CXXLINK', 0,
335- 'l++', 'll', 'lxx');
336+ 'l++', 'll', 'lxx', 'lpp');
337 &register_language ('asm', '', 0,
338 's', 'S');
339 &register_language ('f77', 'F77LINK', 0,
340@@ -929,7 +929,7 @@
341
342 # Compute the function name of the finisher and then call it.
343 $name = 'lang_' . $lang . '_finish';
344- do $name ();
345+ & $name ();
346 }
347
348 # If the project is entirely C++ or entirely Fortran 77, don't
349@@ -1090,7 +1090,7 @@
350 # Found the language, so see what it says.
351 local ($subr) = 'lang_' . $lang . '_rewrite';
352 # Note: computed subr call.
353- local ($r) = do $subr ($base, $extension);
354+ local ($r) = & $subr ($base, $extension);
355 # Skip this entry if we were asked not to process it.
356 next if ! $r;
357
358@@ -2367,7 +2367,7 @@
359 $output_rules .= "\t d=\$(srcdir); \\\n";
360 }
361 $output_rules .= ("\t if test -d \$\$d/\$\$file; then \\\n"
362- . "\t cp -pr \$\$/\$\$file \$(distdir)/\$\$file; \\\n"
363+ . "\t cp -pr \$\$d/\$\$file \$(distdir)/\$\$file; \\\n"
364 . "\t else \\\n"
365 . "\t test -f \$(distdir)/\$\$file \\\n"
366 . "\t || ln \$\$d/\$\$file \$(distdir)/\$\$file 2> /dev/null \\\n"
367@@ -3050,7 +3050,7 @@
368 }
369 else
370 {
371- local (@rel_out_path, $rel_path);
372+ local (@rel_out_path);
373 # FIXME this chunk of code should be its own sub.
374 # It is used elsewhere.
375 foreach (split (/\//, $relative_dir))
376@@ -3224,7 +3224,7 @@
377 : '')
378 . ' CONFIG_HEADERS= $(SHELL) ./config.status'
379 . "\n");
380- push_dist_common (@inputs);
381+ &push_dist_common (@inputs);
382 push (@actual_other_files, $local);
383
384 # Require all input files.
385@@ -3490,7 +3490,7 @@
386 # Generate the new 'install-strip' target. We can't just set
387 # INSTALL_PROGRAM because that might be a relative path.
388 $output_rules .= ("install-strip:\n\t"
389- . '$(MAKE) $(AM_MAKEFLAGS) AM_INSTALL_PROGRAM_FLAGS=-s install'
390+ . '$(MAKE) $(AM_MAKEFLAGS) INSTALL_STRIP_FLAG=-s install'
391 . "\n");
392 }
393
394@@ -4502,6 +4502,18 @@
395 return 1;
396 }
397
398+# Rewrite a single preprocessed Fortran 77 file.
399+sub lang_ppf77_rewrite
400+{
401+ return 1;
402+}
403+
404+# Rewrite a single ratfor file.
405+sub lang_ratfor_rewrite
406+{
407+ return 1;
408+}
409+
410 # Rewrite a single Objective C file.
411 sub lang_objc_rewrite
412 {
413@@ -4660,7 +4672,7 @@
414 # Now generate rule to make the header file. This should only
415 # be generated if `yacc -d' specified. But right now there is
416 # no way to determine that. FIXME: examine AM_YFLAGS?
417- $file =~ /^(.*)\.(y|yy|y\+\+|yxx)$/;
418+ $file =~ /^(.*)\.(y|yy|y\+\+|yxx|ypp)$/;
419 $base = $1;
420 ($hname = $2) =~ tr/y/h/;
421 ($cname = $2) =~ tr/y/c/;
422@@ -4718,7 +4730,7 @@
423 # statically, and the GNU rules say that yacc/lex output files
424 # should be removed by maintainer-clean. So that's what we
425 # do.
426- $file =~ /^(.*)\.(l|ll|l\+\+|lxx)$/;
427+ $file =~ /^(.*)\.(l|ll|l\+\+|lxx|lpp)$/;
428 ($cname = $2) =~ tr/y/c/;
429 push (@maintainer_clean_files, $1 . $cname);
430 }
431@@ -6907,7 +6919,7 @@
432 $trailer = "; error while making link: $!\n";
433 }
434 }
435- elsif (! system ('cp', $am_dir . '/' . $file, $errfile))
436+ elsif (system ('cp', $am_dir . '/' . $file, $errfile))
437 {
438 $suppress = 0;
439 $trailer = "\n error while copying\n";
440Index: automake.texi
441===================================================================
442RCS file: /cvs/automake/automake/automake.texi,v
443retrieving revision 1.161
444retrieving revision 1.162
445diff -u -r1.161 -r1.162
446--- automake.texi 1999/01/06 13:01:26 1.161
447+++ automake.texi 1999/01/22 13:58:02 1.162
448@@ -20,7 +20,7 @@
449 @ifinfo
450 This file documents GNU automake @value{VERSION}
451
452-Copyright (C) 1995, 96, 97, 98 Free Software Foundation, Inc.
453+Copyright (C) 1995, 96, 97, 98, 99 Free Software Foundation, Inc.
454
455 Permission is granted to make and distribute verbatim copies of
456 this manual provided the copyright notice and this permission notice
457@@ -103,9 +103,9 @@
458 @comment node-name, next, previous, up
459 @top GNU Automake
460
461-This file documents the GNU Automake package for creating GNU
462-Standards-compliant Makefiles from template files. This edition
463-documents version @value{VERSION}.
464+This file documents the GNU Automake package. Automake is a program
465+which creates GNU standards-compliant Makefiles from template files.
466+This edition documents version @value{VERSION}.
467
468 @menu
469 * Introduction:: Automake's purpose
470Index: configure
471===================================================================
472RCS file: /cvs/automake/automake/configure,v
473retrieving revision 1.62
474retrieving revision 1.64
475diff -u -r1.62 -r1.64
476--- configure 1999/01/10 21:01:02 1.62
477+++ configure 1999/01/15 09:43:45 1.64
478@@ -692,7 +692,7 @@
479
480 PACKAGE=automake
481
482-VERSION=1.4
483+VERSION=1.4a
484
485 if test "`cd $srcdir && pwd`" != "`pwd`" && test -f $srcdir/config.status; then
486 { echo "configure: error: source directory already configured; run "make distclean" there first" 1>&2; exit 1; }
487Index: configure.in
488===================================================================
489RCS file: /cvs/automake/automake/configure.in,v
490retrieving revision 1.67
491retrieving revision 1.69
492diff -u -r1.67 -r1.69
493--- configure.in 1999/01/10 21:01:04 1.67
494+++ configure.in 1999/01/15 09:43:46 1.69
495@@ -1,7 +1,7 @@
496 dnl Process this file with autoconf to produce a configure script.
497 AC_INIT(automake.in)
498
499-AM_INIT_AUTOMAKE(automake, 1.4)
500+AM_INIT_AUTOMAKE(automake, 1.4a)
501
502 # Find an appropriate tar for use in "dist" targets. A "best guess"
503 # is good enough -- if we can't find GNU tar, we don't really care.
504Index: header-vars.am
505===================================================================
506RCS file: /cvs/automake/automake/header-vars.am,v
507retrieving revision 1.29
508retrieving revision 1.30
509diff -u -r1.29 -r1.30
510--- header-vars.am 1998/12/11 00:32:34 1.29
511+++ header-vars.am 1999/02/02 09:51:57 1.30
512@@ -1,5 +1,5 @@
513 ## automake - create Makefile.in from Makefile.am
514-## Copyright (C) 1994, 1995, 1996, 1997, 1998 Free Software Foundation, Inc.
515+## Copyright (C) 1994, 1995-98, 1999 Free Software Foundation, Inc.
516
517 ## This program is free software; you can redistribute it and/or modify
518 ## it under the terms of the GNU General Public License as published by
519@@ -52,12 +52,10 @@
520 AUTOHEADER = @AUTOHEADER@
521
522 INSTALL = @INSTALL@
523-## We use AM_INSTALL_PROGRAM_FLAGS so that install-strip can pass -s
524-## easily. We can't just set INSTALL_PROGRAM because that might have
525-## a relative path.
526-INSTALL_PROGRAM = @INSTALL_PROGRAM@ $(AM_INSTALL_PROGRAM_FLAGS)
527+INSTALL_PROGRAM = @INSTALL_PROGRAM@
528 INSTALL_DATA = @INSTALL_DATA@
529 INSTALL_SCRIPT = @INSTALL_SCRIPT@
530+INSTALL_STRIP_FLAG =
531 transform = @program_transform_name@
532
533 ## These are defined because otherwise make on NetBSD V1.1 will print
534Index: progs.am
535===================================================================
536RCS file: /cvs/automake/automake/progs.am,v
537retrieving revision 1.16
538retrieving revision 1.17
539diff -u -r1.16 -r1.17
540--- progs.am 1998/06/23 23:39:29 1.16
541+++ progs.am 1999/02/02 09:51:58 1.17
542@@ -1,5 +1,5 @@
543 ## automake - create Makefile.in from Makefile.am
544-## Copyright (C) 1994, 1995, 1996, 1997, 1998 Free Software Foundation, Inc.
545+## Copyright (C) 1994, 1995-98, 1999 Free Software Foundation, Inc.
546
547 ## This program is free software; you can redistribute it and/or modify
548 ## it under the terms of the GNU General Public License as published by
549@@ -25,8 +25,8 @@
550 ## Note that we explicitly set the libtool mode. This avoids any
551 ## lossage if the install program doesn't have a name that libtool
552 ## expects.
553- echo " @LIBTOOL --mode=install@ $(INSTALL_PROGRAM) $$p $(DESTDIR)$(@DIR@dir)/`echo $$p|sed 's/$(EXEEXT)$$//'|sed '$(transform)'|sed 's/$$/$(EXEEXT)/'`"; \
554- @LIBTOOL --mode=install@ $(INSTALL_PROGRAM) $$p $(DESTDIR)$(@DIR@dir)/`echo $$p|sed 's/$(EXEEXT)$$//'|sed '$(transform)'|sed 's/$$/$(EXEEXT)/'`; \
555+ echo " @LIBTOOL --mode=install@ $(INSTALL_PROGRAM) $(INSTALL_STRIP_FLAG) $$p $(DESTDIR)$(@DIR@dir)/`echo $$p|sed 's/$(EXEEXT)$$//'|sed '$(transform)'|sed 's/$$/$(EXEEXT)/'`"; \
556+ @LIBTOOL --mode=install@ $(INSTALL_PROGRAM) $(INSTALL_STRIP_FLAG) $$p $(DESTDIR)$(@DIR@dir)/`echo $$p|sed 's/$(EXEEXT)$$//'|sed '$(transform)'|sed 's/$$/$(EXEEXT)/'`; \
557 else :; fi; \
558 done
559
560Index: stamp-vti
561===================================================================
562RCS file: /cvs/automake/automake/stamp-vti,v
563retrieving revision 1.68
564retrieving revision 1.71
565diff -u -r1.68 -r1.71
566--- stamp-vti 1999/01/10 21:01:05 1.68
567+++ stamp-vti 1999/01/22 13:58:03 1.71
568@@ -1,3 +1,3 @@
569-@set UPDATED 10 January 1999
570-@set EDITION 1.4
571-@set VERSION 1.4
572+@set UPDATED 22 January 1999
573+@set EDITION 1.4a
574+@set VERSION 1.4a
575Index: version.texi
576===================================================================
577RCS file: /cvs/automake/automake/version.texi,v
578retrieving revision 1.141
579retrieving revision 1.144
580diff -u -r1.141 -r1.144
581--- version.texi 1999/01/10 21:01:06 1.141
582+++ version.texi 1999/01/22 13:58:04 1.144
583@@ -1,3 +1,3 @@
584-@set UPDATED 10 January 1999
585-@set EDITION 1.4
586-@set VERSION 1.4
587+@set UPDATED 22 January 1999
588+@set EDITION 1.4a
589+@set VERSION 1.4a
590cvs server: Diffing m4
591Index: m4/init.m4
592===================================================================
593RCS file: /cvs/automake/automake/m4/init.m4,v
594retrieving revision 1.9
595retrieving revision 1.10
596diff -u -r1.9 -r1.10
597--- m4/init.m4 1998/10/09 11:10:17 1.9
598+++ m4/init.m4 1999/01/22 14:09:37 1.10
599@@ -9,6 +9,8 @@
600
601 AC_DEFUN(AM_INIT_AUTOMAKE,
602 [AC_REQUIRE([AC_PROG_INSTALL])
603+dnl We require 2.13 because we rely on SHELL being computed by configure.
604+AC_PREREQ([2.13])
605 PACKAGE=[$1]
606 AC_SUBST(PACKAGE)
607 VERSION=[$2]
608cvs server: Diffing tests
609Index: tests/ChangeLog
610===================================================================
611RCS file: /cvs/automake/automake/tests/ChangeLog,v
612retrieving revision 1.200
613retrieving revision 1.204
614diff -u -r1.200 -r1.204
615--- tests/ChangeLog 1999/01/14 22:29:33 1.200
616+++ tests/ChangeLog 1999/02/01 11:49:55 1.204
617@@ -1,3 +1,18 @@
618+1999-02-01 Tom Tromey <tromey@cygnus.com>
619+
620+ * installsh.test (AUTOMAKE): Use $PERL. From Pavel Roskin.
621+
622+ * cond5.test: Sleep 15 seconds, not 5. Some people still run the
623+ test on slow machines.
624+
625+1999-01-22 Tom Tromey <tromey@cygnus.com>
626+
627+ * copy.test: New file.
628+ * Makefile.am (TESTS): Added copy.test.
629+
630+ * ppf77.test: New file.
631+ * Makefile.am (TESTS): Added ppf77.test.
632+
633 1999-01-14 Tom Tromey <tromey@cygnus.com>
634
635 * confh3.test: New file.
636Index: tests/Makefile.am
637===================================================================
638RCS file: /cvs/automake/automake/tests/Makefile.am,v
639retrieving revision 1.170
640retrieving revision 1.172
641diff -u -r1.170 -r1.172
642--- tests/Makefile.am 1999/01/14 22:29:34 1.170
643+++ tests/Makefile.am 1999/01/22 14:13:50 1.172
644@@ -13,11 +13,11 @@
645 cond4.test cond5.test cond6.test cond7.test condman.test condman2.test \
646 conf2.test confdist.test confh.test confh2.test confh3.test \
647 config.test confincl.test confsub.test confvar.test confvar2.test \
648-cxxcpp.test cxxlibobj.test cxxlink.test cxxnoc.test cxxo.test \
649-cygwin32.test defun.test defun2.test dejagnu.test depacl.test \
650-depacl2.test depend.test depend2.test depend3.test discover.test \
651-distdir.test dup.test dup2.test else.test empty.test error.test \
652-exdir.test exdir2.test exsource.test extra.test extra3.test \
653+copy.test cxxcpp.test cxxlibobj.test cxxlink.test cxxnoc.test \
654+cxxo.test cygwin32.test defun.test defun2.test dejagnu.test \
655+depacl.test depacl2.test depend.test depend2.test depend3.test \
656+discover.test distdir.test dup.test dup2.test else.test empty.test \
657+error.test exdir.test exdir2.test exsource.test extra.test extra3.test \
658 extra4.test flibs.test fnoc.test fo.test fonly.test fpinst2.test \
659 fpinstall.test gnits.test implicit.test include.test info.test \
660 insh.test insh2.test install.test installsh.test instdata.test \
661@@ -30,16 +30,16 @@
662 mkinstall.test noinst.test number.test objc.test obsolete.test \
663 order.test outdir.test output.test output2.test output3.test \
664 output4.test output5.test package.test parse.test pluseq.test \
665-pluseq2.test pluseq3.test pluseq4.test pluseq5.test prefix.test \
666-primary.test primary2.test proginst.test ranlib.test recurs.test \
667-recurs2.test remake.test remake2.test req.test rulepat.test \
668-scripts.test seenc.test sinclude.test spell.test spell2.test \
669-spell3.test spelling.test stamph.test stdlib.test subdir.test \
670-subdir2.test subst.test symlink.test syntax.test tags.test tagsub.test \
671-target.test texinfo.test texinfo2.test texinfo3.test texinfo4.test \
672-texinfo5.test texinfo6.test texinfo7.test unused.test version.test \
673-version2.test version3.test vpath.test vtexi.test vtexi2.test \
674-whoami.test xsource.test yacc.test yaccpp.test
675+pluseq2.test pluseq3.test pluseq4.test pluseq5.test ppf77.test \
676+prefix.test primary.test primary2.test proginst.test ranlib.test \
677+recurs.test recurs2.test remake.test remake2.test req.test \
678+rulepat.test scripts.test seenc.test sinclude.test spell.test \
679+spell2.test spell3.test spelling.test stamph.test stdlib.test \
680+subdir.test subdir2.test subst.test symlink.test syntax.test tags.test \
681+tagsub.test target.test texinfo.test texinfo2.test texinfo3.test \
682+texinfo4.test texinfo5.test texinfo6.test texinfo7.test unused.test \
683+version.test version2.test version3.test vpath.test vtexi.test \
684+vtexi2.test whoami.test xsource.test yacc.test yaccpp.test
685
686 EXTRA_DIST = defs $(TESTS)
687
688Index: tests/Makefile.in
689===================================================================
690RCS file: /cvs/automake/automake/tests/Makefile.in,v
691retrieving revision 1.225
692retrieving revision 1.227
693diff -u -r1.225 -r1.227
694--- tests/Makefile.in 1999/01/14 22:47:20 1.225
695+++ tests/Makefile.in 1999/01/22 14:13:51 1.227
696@@ -65,7 +65,7 @@
697
698 AUTOMAKE_OPTIONS = gnits
699
700-TESTS = acinclude.test aclocal.test aclocali.test aclocalii.test acoutnoq.test acoutput.test acoutqnl.test acouttbs.test acsilent.test all.test alpha.test ammissing.test ansi.test ansi2.test ansi3.test auxdir.test backsl.test badline.test badprog.test block.test canon.test canon2.test canon3.test canon4.test checkall.test clean.test colneq.test colneq2.test colon.test colon2.test colon3.test colon4.test colon5.test colon6.test colon7.test comment.test comment2.test compile_f_c_cxx.test cond.test cond2.test cond3.test cond4.test cond5.test cond6.test cond7.test condman.test condman2.test conf2.test confdist.test confh.test confh2.test confh3.test config.test confincl.test confsub.test confvar.test confvar2.test cxxcpp.test cxxlibobj.test cxxlink.test cxxnoc.test cxxo.test cygwin32.test defun.test defun2.test dejagnu.test depacl.test depacl2.test depend.test depend2.test depend3.test discover.test distdir.test dup.test dup2.test else.test empty.test error.test exdir.test exdir2.test exsource.test extra.test extra3.test extra4.test flibs.test fnoc.test fo.test fonly.test fpinst2.test fpinstall.test gnits.test implicit.test include.test info.test insh.test insh2.test install.test installsh.test instdata.test instexec.test insthook.test instman.test interp.test interp2.test java.test javaprim.test javasubst.test ldadd.test lex.test lex2.test libobj.test libobj2.test libobj3.test libobj4.test libobj5.test libobj6.test libobj7.test libobj8.test library.test link_c_cxx.test link_f_c.test link_f_c_cxx.test link_f_cxx.test link_f_only.test lisp.test mdate.test mdate2.test mdate3.test mkinst2.test mkinstall.test noinst.test number.test objc.test obsolete.test order.test outdir.test output.test output2.test output3.test output4.test output5.test package.test parse.test pluseq.test pluseq2.test pluseq3.test pluseq4.test pluseq5.test prefix.test primary.test primary2.test proginst.test ranlib.test recurs.test recurs2.test remake.test remake2.test req.test rulepat.test scripts.test seenc.test sinclude.test spell.test spell2.test spell3.test spelling.test stamph.test stdlib.test subdir.test subdir2.test subst.test symlink.test syntax.test tags.test tagsub.test target.test texinfo.test texinfo2.test texinfo3.test texinfo4.test texinfo5.test texinfo6.test texinfo7.test unused.test version.test version2.test version3.test vpath.test vtexi.test vtexi2.test whoami.test xsource.test yacc.test yaccpp.test
701+TESTS = acinclude.test aclocal.test aclocali.test aclocalii.test acoutnoq.test acoutput.test acoutqnl.test acouttbs.test acsilent.test all.test alpha.test ammissing.test ansi.test ansi2.test ansi3.test auxdir.test backsl.test badline.test badprog.test block.test canon.test canon2.test canon3.test canon4.test checkall.test clean.test colneq.test colneq2.test colon.test colon2.test colon3.test colon4.test colon5.test colon6.test colon7.test comment.test comment2.test compile_f_c_cxx.test cond.test cond2.test cond3.test cond4.test cond5.test cond6.test cond7.test condman.test condman2.test conf2.test confdist.test confh.test confh2.test confh3.test config.test confincl.test confsub.test confvar.test confvar2.test copy.test cxxcpp.test cxxlibobj.test cxxlink.test cxxnoc.test cxxo.test cygwin32.test defun.test defun2.test dejagnu.test depacl.test depacl2.test depend.test depend2.test depend3.test discover.test distdir.test dup.test dup2.test else.test empty.test error.test exdir.test exdir2.test exsource.test extra.test extra3.test extra4.test flibs.test fnoc.test fo.test fonly.test fpinst2.test fpinstall.test gnits.test implicit.test include.test info.test insh.test insh2.test install.test installsh.test instdata.test instexec.test insthook.test instman.test interp.test interp2.test java.test javaprim.test javasubst.test ldadd.test lex.test lex2.test libobj.test libobj2.test libobj3.test libobj4.test libobj5.test libobj6.test libobj7.test libobj8.test library.test link_c_cxx.test link_f_c.test link_f_c_cxx.test link_f_cxx.test link_f_only.test lisp.test mdate.test mdate2.test mdate3.test mkinst2.test mkinstall.test noinst.test number.test objc.test obsolete.test order.test outdir.test output.test output2.test output3.test output4.test output5.test package.test parse.test pluseq.test pluseq2.test pluseq3.test pluseq4.test pluseq5.test ppf77.test prefix.test primary.test primary2.test proginst.test ranlib.test recurs.test recurs2.test remake.test remake2.test req.test rulepat.test scripts.test seenc.test sinclude.test spell.test spell2.test spell3.test spelling.test stamph.test stdlib.test subdir.test subdir2.test subst.test symlink.test syntax.test tags.test tagsub.test target.test texinfo.test texinfo2.test texinfo3.test texinfo4.test texinfo5.test texinfo6.test texinfo7.test unused.test version.test version2.test version3.test vpath.test vtexi.test vtexi2.test whoami.test xsource.test yacc.test yaccpp.test
702
703
704 EXTRA_DIST = defs $(TESTS)
705Index: tests/cond5.test
706===================================================================
707RCS file: /cvs/automake/automake/tests/cond5.test,v
708retrieving revision 1.1
709retrieving revision 1.2
710diff -u -r1.1 -r1.2
711--- tests/cond5.test 1998/07/18 06:37:24 1.1
712+++ tests/cond5.test 1999/02/01 11:40:21 1.2
713@@ -31,7 +31,7 @@
714 $AUTOMAKE &
715 pid=$!
716
717-sleep 5
718+sleep 15
719 kill -0 $pid && {
720 kill $pid
721 exit 1
722cvs server: tag Release-1-4 is not in file tests/copy.test
723Index: tests/installsh.test
724===================================================================
725RCS file: /cvs/automake/automake/tests/installsh.test,v
726retrieving revision 1.1
727retrieving revision 1.2
728diff -u -r1.1 -r1.2
729--- tests/installsh.test 1996/03/16 01:40:57 1.1
730+++ tests/installsh.test 1999/02/01 11:49:56 1.2
731@@ -25,7 +25,7 @@
732 ;;
733 esac
734
735-AUTOMAKE="../../../automake --amdir=$srcdir/.. --foreign"
736+AUTOMAKE="$PERL ../../../automake --amdir=$srcdir/.. --foreign"
737
738 # Now we proceed with the test
739 $AUTOMAKE --add-missing > output 2>&1 \
740cvs server: tag Release-1-4 is not in file tests/ppf77.test
This page took 0.109963 seconds and 4 git commands to generate.