Index: automake/ChangeLog diff -c automake/ChangeLog:1.676.4.30 automake/ChangeLog:1.676.4.47 *** automake/ChangeLog:1.676.4.30 Sun Jun 10 03:32:49 2001 --- automake/ChangeLog Sun Jul 15 10:17:51 2001 *************** *** 1,5 **** --- 1,94 ---- + 2001-07-15 Gary V. Vaughan + + Automake 1.4-p5 was released. + + * NEWS: Updated. + * config.guess, config.sub, texinfo.tex: Updated from master + copies at GNU. + * configure.in (AM_INIT_AUTOMAKE): Set the fork identifier to + patch level 5, 1.4-p5. + * stamp-vti: Regenerated. + * version.texi: Ditto. + * configure: Ditto. + * Makefile.in: Ditto. + * m4/Makefile.in: Ditto. + * tests/Makefile.in: Ditto. + + automake.in (scan_one_configure_file): AM_PROG_LIBTOOL is + still used regularly. + + * lib/missing: Updated. Added comment explaining configure.ac + oddity. + + From Bruno Haible : + (install-@DIR@LISP): Handle case where lispdir is not defined. + (uninstall-@DIR@LISP): Likewise. + + From Bruno Haible : + * lispdir.am (uninstall-@DIR@LISP): DESTDIR was missing. + + From Bruno Haible : + * subdirs.am (distclean-recursive): Work around a bug in + /bin/sh on FreeBSD which breaks the loop prematurely. + * Makefile.in: Regenerated. + + From Marius Vollmer : + * automake.in (handle_texinfo): Version.texi files might be + needed in more than one directory. + + * remake.am (config.status): Depends on configure, not + configure.in. + * Makefile.in: Regenerated. + * m4/Makefile.in: Ditto. + * tests/Makefile.in: Ditto. + Reported by Nicolas Joly + + * automake.in (usage): List distributed files correctly. + Reported by Tim Mooney + + * aclocal.in: Update copyright messages to include 2001. + * automake.in: Ditto. + * missing: Ditto. + * texinfos.am: Ditto. + Reported by Tim Mooney + + 2001-07-15 Tim Mooney + + * aclocal.in (scan_configure, add_file): Handle the full + macro name even if it contains numbers, such as I18N. + + 2001-07-14 Akim Demaille + + * automake.in ($obsolete_rx): Stop at word boundaries. + (&scan_one_configure_file): Skip VERSION=$2. + * aclocal.in ($obsolete_rx): Stop at word boundaries. + + 2001-07-02 Gary V. Vaughan + + * automake.in (scan_one_configure_file): Diagnose use of + autoconf-2.50's AC_CONFIG_HEADERS macro as an error. + + 2001-06-24 Gary V. Vaughan + + From Martin Dickopp : + * missing: replace hard coded configure.in with $configure_ac, + set appropriately according to file presence. + + 2001-06-23 Akim Demaille + + * m4/ccstdc.m4, m4/cond.m4, m4/dmalloc.m4, m4/error.m4, + * m4/header.m4, m4/init.m4, m4/lex.m4, m4/lispdir.m4, + * m4/maintainer.m4, m4/missing.m4, m4/mktime.m4, m4/multi.m4, + * m4/obstack.m4, m4/protos.m4, m4/ptrdiff.m4, m4/regex.m4, + * m4/sanity.m4, m4/strtod.m4, m4/termios.m4, m4/winsz.m4: + Quote the name being defined. + * tests/depacl.test: Adjust. + 2001-06-10 Gary V. Vaughan + * configure.in (AM_INIT_AUTOMAKE): Bumped the version number to + 1.4-p4a. + Automake 1.4-p4 was released. * NEWS: Updated. *************** *** 196,202 **** 1999-01-11 Marcus G. Daniels * automake.in (PATH_PATTERN): New variable: ! (INCLUDE_PATTERN): Use it. Ignore all include commands using symbols besides $(top_srcdir) and $(srcdir). 1999-01-11 Alexandre Oliva --- 285,291 ---- 1999-01-11 Marcus G. Daniels * automake.in (PATH_PATTERN): New variable: ! (INCLUDE_PATTERN): Use it. Ignore all include commands using symbols besides $(top_srcdir) and $(srcdir). 1999-01-11 Alexandre Oliva *************** *** 366,372 **** 1998-12-20 Thomas Tanner * automake.in (handle_libraries, handle_ltlibraries): relax the ! name checking to not enforce `^lib.*' for the sake of building libtool modules. 1998-12-21 Tom Tromey --- 455,461 ---- 1998-12-20 Thomas Tanner * automake.in (handle_libraries, handle_ltlibraries): relax the ! name checking to not enforce `^lib.*' for the sake of building libtool modules. 1998-12-21 Tom Tromey *************** *** 545,551 **** * automake.in: Registered the ppf77 language (`.F' extension) for preprocessed Fortran 77. ! * automake.in: Registered the ratfor language (`.r' extension). * automake.in: Registered Fortran 77 header files with the "header --- 634,640 ---- * automake.in: Registered the ppf77 language (`.F' extension) for preprocessed Fortran 77. ! * automake.in: Registered the ratfor language (`.r' extension). * automake.in: Registered Fortran 77 header files with the "header *************** *** 769,775 **** * automake.in: New pattern: INCLUDE_PATTERN. (read_am_file): Make AM_FILE a local filehandle. ! For INCLUDE_PATTERN, store included paths on @include_stack and call read_am_file with argument. (handle_configure): When printing the dependencies for Makefile.in, print the items on include_stack (if any) as --- 858,864 ---- * automake.in: New pattern: INCLUDE_PATTERN. (read_am_file): Make AM_FILE a local filehandle. ! For INCLUDE_PATTERN, store included paths on @include_stack and call read_am_file with argument. (handle_configure): When printing the dependencies for Makefile.in, print the items on include_stack (if any) as *************** *** 777,783 **** * automake.texi: Make a command index `cm' that goes into the concept index. Put if, endif, else, and include in the command index. ! (Include): Show usage of include directive. Mon Sep 28 00:03:45 1998 Tom Tromey --- 866,872 ---- * automake.texi: Make a command index `cm' that goes into the concept index. Put if, endif, else, and include in the command index. ! (Include): Show usage of include directive. Mon Sep 28 00:03:45 1998 Tom Tromey *************** *** 1090,1096 **** * automake.in (handle_configure): Fix setting of colon_infile in case where multiple files are used to build Makefile. [ Test colon5.test ] ! Fri Apr 3 13:07:58 1998 Tom Tromey * ansi2knr.c, texinfo.tex: New versions from respective --- 1179,1185 ---- * automake.in (handle_configure): Fix setting of colon_infile in case where multiple files are used to build Makefile. [ Test colon5.test ] ! Fri Apr 3 13:07:58 1998 Tom Tromey * ansi2knr.c, texinfo.tex: New versions from respective *************** *** 2735,2741 **** * tags.am (tags-recursive): Removed. (TAGS): Depend on @DIRS@, @CONFIG@. Use @CONFIG@ in rule. (ID): From tags-subd.am. ! * aclocal.in (obsolete_macros): Include AM_FUNC_FNMATCH. * automake.in (scan_configure): Recognize AC_FUNC_FNMATCH. * m4/fnmatch.m4: Removed (now in autoconf). --- 2824,2830 ---- * tags.am (tags-recursive): Removed. (TAGS): Depend on @DIRS@, @CONFIG@. Use @CONFIG@ in rule. (ID): From tags-subd.am. ! * aclocal.in (obsolete_macros): Include AM_FUNC_FNMATCH. * automake.in (scan_configure): Recognize AC_FUNC_FNMATCH. * m4/fnmatch.m4: Removed (now in autoconf). *************** *** 3740,3746 **** * automake.in (handle_tests): Don't directly generate site.exp. Sun Jun 16 22:21:16 1996 Harlan Stenn ! * automake.in: Treat an initial `#' on a word in AUTOMAKE_OPTIONS as a comment start. Add support for a dist-tarZ target. --- 3829,3835 ---- * automake.in (handle_tests): Don't directly generate site.exp. Sun Jun 16 22:21:16 1996 Harlan Stenn ! * automake.in: Treat an initial `#' on a word in AUTOMAKE_OPTIONS as a comment start. Add support for a dist-tarZ target. *************** *** 4554,4560 **** Give error if appropriate install macro not seen. (handle_subdirs): Ensure $seen_gettext before requiring gettext-specific files. ! (handle_configure): Automatically rebuild From Jim Meyering: * automake.in (handle_source_transform): Use \W when quoting --- 4643,4649 ---- Give error if appropriate install macro not seen. (handle_subdirs): Ensure $seen_gettext before requiring gettext-specific files. ! (handle_configure): Automatically rebuild From Jim Meyering: * automake.in (handle_source_transform): Use \W when quoting *************** *** 6104,6107 **** * mans.am, libraries.am, texinfos.am, library.am, compile.am, program.am, programs.am, clean.am, subdirs.am, remake-subd.am, remake.am, remake-hdr.am, dist.am, dist-subd.am, header.am, automake.in: Initial revision - --- 6193,6195 ---- Index: automake/Makefile.in diff -c automake/Makefile.in:1.217.4.7 automake/Makefile.in:1.217.4.11 *** automake/Makefile.in:1.217.4.7 Sat Jun 9 06:04:23 2001 --- automake/Makefile.in Sun Jul 15 10:17:51 2001 *************** *** 1,6 **** ! # Makefile.in generated automatically by automake 1.4-p2 from Makefile.am ! # Copyright (C) 1994, 1995-8, 1999 Free Software Foundation, Inc. # This Makefile.in is free software; the Free Software Foundation # gives unlimited permission to copy and/or distribute it, # with or without modifications, as long as this notice is preserved. --- 1,6 ---- ! # Makefile.in generated automatically by automake 1.4-p5 from Makefile.am ! # Copyright (C) 1994, 1995-8, 1999, 2001 Free Software Foundation, Inc. # This Makefile.in is free software; the Free Software Foundation # gives unlimited permission to copy and/or distribute it, # with or without modifications, as long as this notice is preserved. *************** *** 109,115 **** .SUFFIXES: .SUFFIXES: .dvi .info .ps .texi .texinfo .txi $(srcdir)/Makefile.in: Makefile.am $(top_srcdir)/configure.in $(ACLOCAL_M4) ! cd $(top_srcdir) && $(AUTOMAKE) --gnits Makefile Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status $(BUILT_SOURCES) cd $(top_builddir) \ --- 109,115 ---- .SUFFIXES: .SUFFIXES: .dvi .info .ps .texi .texinfo .txi $(srcdir)/Makefile.in: Makefile.am $(top_srcdir)/configure.in $(ACLOCAL_M4) ! cd $(top_srcdir) && $(AUTOMAKE) --gnu Makefile Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status $(BUILT_SOURCES) cd $(top_builddir) \ *************** *** 361,367 **** dot_seen=no; \ rev=''; list='$(SUBDIRS)'; for subdir in $$list; do \ rev="$$subdir $$rev"; \ ! test "$$subdir" = "." && dot_seen=yes; \ done; \ test "$$dot_seen" = "no" && rev=". $$rev"; \ target=`echo $@ | sed s/-recursive//`; \ --- 361,367 ---- dot_seen=no; \ rev=''; list='$(SUBDIRS)'; for subdir in $$list; do \ rev="$$subdir $$rev"; \ ! test "$$subdir" != "." || dot_seen=yes; \ done; \ test "$$dot_seen" = "no" && rev=". $$rev"; \ target=`echo $@ | sed s/-recursive//`; \ *************** *** 449,458 **** GZIP=$(GZIP_ENV) $(TAR) chozf $(distdir).tar.gz $(distdir) -rm -rf $(distdir) distdir: $(DISTFILES) - @if sed 15q $(srcdir)/NEWS | fgrep -e "$(VERSION)" > /dev/null; then :; else \ - echo "NEWS not updated; not releasing" 1>&2; \ - exit 1; \ - fi -rm -rf $(distdir) mkdir $(distdir) -chmod 777 $(distdir) --- 449,454 ---- *************** *** 460,466 **** top_distdir=`cd $(distdir) && pwd`; \ distdir=`cd $(distdir) && pwd`; \ cd $(top_srcdir) \ ! && $(AUTOMAKE) --include-deps --build-dir=$$here --srcdir-name=$(top_srcdir) --output-dir=$$top_distdir --gnits Makefile @for file in $(DISTFILES); do \ d=$(srcdir); \ if test -d $$d/$$file; then \ --- 456,462 ---- top_distdir=`cd $(distdir) && pwd`; \ distdir=`cd $(distdir) && pwd`; \ cd $(top_srcdir) \ ! && $(AUTOMAKE) --include-deps --build-dir=$$here --srcdir-name=$(top_srcdir) --output-dir=$$top_distdir --gnu Makefile @for file in $(DISTFILES); do \ d=$(srcdir); \ if test -d $$d/$$file; then \ Index: automake/NEWS diff -c automake/NEWS:1.130.4.4 automake/NEWS:1.130.4.5 *** automake/NEWS:1.130.4.4 Sun Jun 10 03:32:50 2001 --- automake/NEWS Sun Jul 15 10:17:51 2001 *************** *** 1,3 **** --- 1,10 ---- + New in 1.4-p5: + * Allow AM_PROG_LIBTOOL again. + * Diagnose AC_CONFIG_HEADERS the same as AC_CONFIG_HEADER. + * Display distributed file list correctly in usage message. + * Allow numbers in macro names. + * Bugfixes. + New in 1.4-p4: * Deal with configure.ac as well as configure.in -- this time for real! * The version numbering system now allows three point version numbers, Index: automake/aclocal.in diff -c automake/aclocal.in:1.40.4.1 automake/aclocal.in:1.40.4.4 *** automake/aclocal.in:1.40.4.1 Thu Jun 7 12:31:07 2001 --- automake/aclocal.in Sun Jul 15 04:06:17 2001 *************** *** 3,9 **** # @configure_input@ # aclocal - create aclocal.m4 by scanning configure.ac ! # Copyright (C) 1996, 1997, 1998, 1999 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 --- 3,9 ---- # @configure_input@ # aclocal - create aclocal.m4 by scanning configure.ac ! # Copyright (C) 1996, 1997, 1998, 1999, 2001 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 *************** *** 95,101 **** # 'ud_WITH_NLS' ); ! $obsolete_rx = '(' . join ('|', @obsolete_macros) . ')'; # Matches a macro definition. $ac_defun_rx = "AC_DEFUN\\(\\[?([^],)\n]+)\\]?"; --- 95,101 ---- # 'ud_WITH_NLS' ); ! $obsolete_rx = '\b(' . join ('|', @obsolete_macros) . ')\b'; # Matches a macro definition. $ac_defun_rx = "AC_DEFUN\\(\\[?([^],)\n]+)\\]?"; *************** *** 171,177 **** elsif ($arglist[0] eq '--version') { print "aclocal (GNU $PACKAGE) $VERSION\n\n"; ! print "Copyright (C) 1999 Free Software Foundation, Inc.\n"; print "This is free software; see the source for copying conditions. There is NO\n"; print "warranty; not even for MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.\n\n"; print "Written by Tom Tromey \n"; --- 171,177 ---- elsif ($arglist[0] eq '--version') { print "aclocal (GNU $PACKAGE) $VERSION\n\n"; ! print "Copyright (C) 1999, 2001 Free Software Foundation, Inc.\n"; print "This is free software; see the source for copying conditions. There is NO\n"; print "warranty; not even for MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.\n\n"; print "Written by Tom Tromey \n"; *************** *** 237,243 **** # Search for things we know about. The "search" sub is # constructed dynamically by scan_m4_files. ! if (! &search && /(^|\s+)(AM_[A-Z_]+)/) { # Macro not found, but AM_ prefix found. warn "aclocal: $configure_ac: $.: macro \`$2' not found in library\n"; --- 237,243 ---- # Search for things we know about. The "search" sub is # constructed dynamically by scan_m4_files. ! if (! &search && /(^|\s+)(AM_[A-Z0-9_]+)/) { # Macro not found, but AM_ prefix found. warn "aclocal: $configure_ac: $.: macro \`$2' not found in library\n"; *************** *** 360,366 **** } # This function constructed dynamically. ! if (! &search && /(^|\s+)(AM_[A-Z_]+)/) { # Macro not found, but AM_ prefix found. warn "aclocal: $configure_ac: $.: macro \`$2' not found in library\n"; --- 360,366 ---- } # This function constructed dynamically. ! if (! &search && /(^|\s+)(AM_[A-Z0-9_]+)/) { # Macro not found, but AM_ prefix found. warn "aclocal: $configure_ac: $.: macro \`$2' not found in library\n"; *************** *** 423,429 **** || die "aclocal: couldn't open \`$output_file' for writing: $!\n"; print ACLOCAL "dnl $output_file generated automatically by aclocal $VERSION\n"; print ACLOCAL "\ ! dnl Copyright (C) 1994, 1995-8, 1999 Free Software Foundation, Inc. dnl This file is free software; the Free Software Foundation dnl gives unlimited permission to copy and/or distribute it, dnl with or without modifications, as long as this notice is preserved. --- 423,429 ---- || die "aclocal: couldn't open \`$output_file' for writing: $!\n"; print ACLOCAL "dnl $output_file generated automatically by aclocal $VERSION\n"; print ACLOCAL "\ ! dnl Copyright (C) 1994, 1995-8, 1999, 2001 Free Software Foundation, Inc. dnl This file is free software; the Free Software Foundation dnl gives unlimited permission to copy and/or distribute it, dnl with or without modifications, as long as this notice is preserved. Index: automake/aclocal.m4 diff -c automake/aclocal.m4:1.40.4.2 automake/aclocal.m4:1.40.4.4 *** automake/aclocal.m4:1.40.4.2 Thu Jun 7 12:31:07 2001 --- automake/aclocal.m4 Sun Jul 15 10:17:51 2001 *************** *** 1,6 **** ! dnl aclocal.m4 generated automatically by aclocal 1.4-p2 ! dnl Copyright (C) 1994, 1995-8, 1999 Free Software Foundation, Inc. dnl This file is free software; the Free Software Foundation dnl gives unlimited permission to copy and/or distribute it, dnl with or without modifications, as long as this notice is preserved. --- 1,6 ---- ! dnl aclocal.m4 generated automatically by aclocal 1.4-p5 ! dnl Copyright (C) 1994, 1995-8, 1999, 2001 Free Software Foundation, Inc. dnl This file is free software; the Free Software Foundation dnl gives unlimited permission to copy and/or distribute it, dnl with or without modifications, as long as this notice is preserved. *************** *** 19,25 **** dnl Usage: dnl AM_INIT_AUTOMAKE(package,version, [no-define]) ! AC_DEFUN(AM_INIT_AUTOMAKE, [AC_REQUIRE([AC_PROG_INSTALL]) PACKAGE=[$1] AC_SUBST(PACKAGE) --- 19,25 ---- dnl Usage: dnl AM_INIT_AUTOMAKE(package,version, [no-define]) ! AC_DEFUN([AM_INIT_AUTOMAKE], [AC_REQUIRE([AC_PROG_INSTALL]) PACKAGE=[$1] AC_SUBST(PACKAGE) *************** *** 47,53 **** # Check to make sure that the build environment is sane. # ! AC_DEFUN(AM_SANITY_CHECK, [AC_MSG_CHECKING([whether build environment is sane]) # Just in case sleep 1 --- 47,53 ---- # Check to make sure that the build environment is sane. # ! AC_DEFUN([AM_SANITY_CHECK], [AC_MSG_CHECKING([whether build environment is sane]) # Just in case sleep 1 *************** *** 88,94 **** dnl AM_MISSING_PROG(NAME, PROGRAM, DIRECTORY) dnl The program must properly implement --version. ! AC_DEFUN(AM_MISSING_PROG, [AC_MSG_CHECKING(for working $2) # Run test in a subshell; some versions of sh will print an error if # an executable is not found, even if stderr is redirected. --- 88,94 ---- dnl AM_MISSING_PROG(NAME, PROGRAM, DIRECTORY) dnl The program must properly implement --version. ! AC_DEFUN([AM_MISSING_PROG], [AC_MSG_CHECKING(for working $2) # Run test in a subshell; some versions of sh will print an error if # an executable is not found, even if stderr is redirected. Index: automake/automake.in diff -c automake/automake.in:1.644.4.12 automake/automake.in:1.644.4.18 *** automake/automake.in:1.644.4.12 Sun Jun 10 03:19:35 2001 --- automake/automake.in Sun Jul 15 09:49:04 2001 *************** *** 297,303 **** ); # Regexp to match the above macros. ! $obsolete_rx = '(' . join ('|', keys %obsolete_macros) . ')'; # This maps extensions onto language names. %extension_map = (); --- 297,303 ---- ); # Regexp to match the above macros. ! $obsolete_rx = '\b(' . join ('|', keys %obsolete_macros) . ')\b'; # This maps extensions onto language names. %extension_map = (); *************** *** 1160,1166 **** $object = $base . $nonansi_obj; } } ! elsif ($extension =~ /^$source_suffix_pattern$/) { # We just rewrite it. Maybe we should do more. $object = $base . '.' . $suffix_rules{$extension}; --- 1160,1166 ---- $object = $base . $nonansi_obj; } } ! elsif ($extension =~ /^$source_suffix_pattern$/) { # We just rewrite it. Maybe we should do more. $object = $base . '.' . $suffix_rules{$extension}; *************** *** 1732,1738 **** # Check that the library fits the standard naming convention. $libname_rx = "^lib.*\.la"; ! if (&variable_value ($xlib . '_LDFLAGS') =~ /-module/) { # Relax name checking for libtool modules. $libname_rx = "\.la"; --- 1732,1738 ---- # Check that the library fits the standard naming convention. $libname_rx = "^lib.*\.la"; ! if (&variable_value ($xlib . '_LDFLAGS') =~ /-module/) { # Relax name checking for libtool modules. $libname_rx = "\.la"; *************** *** 2003,2010 **** . 's/\@VTEXI\@/' . $vtexi . '/g;' . 's,\@MDDIR\@,' . $conf_pat . ',g;' . 's,\@CONFIGURE_AC\@,' . $configure_ac . ',g;', ! 'texi-vers') ! unless $done > 1; &push_phony_cleaners ($vti); } --- 2003,2009 ---- . 's/\@VTEXI\@/' . $vtexi . '/g;' . 's,\@MDDIR\@,' . $conf_pat . ',g;' . 's,\@CONFIGURE_AC\@,' . $configure_ac . ',g;', ! 'texi-vers'); &push_phony_cleaners ($vti); } *************** *** 2463,2469 **** # thing. If we're in the topmost directory, then we use # `distdir' instead of `top_distdir'; this lets us work # correctly with an enclosing package. ! $output_rules .= ("\t" . 'for subdir in $(' . $dist_subdir_name . '); do ' . "\\\n" . "\t" . ' if test "$$subdir" = .; then :; else ' . "\\\n" . "\t" . ' test -d $(distdir)/$$subdir ' . "\\\n" --- 2462,2468 ---- # thing. If we're in the topmost directory, then we use # `distdir' instead of `top_distdir'; this lets us work # correctly with an enclosing package. ! $output_rules .= ("\t" . 'for subdir in $(' . $dist_subdir_name . '); do ' . "\\\n" . "\t" . ' if test "$$subdir" = .; then :; else ' . "\\\n" . "\t" . ' test -d $(distdir)/$$subdir ' . "\\\n" *************** *** 3168,3174 **** $xform .= 's,\@CONFIG_HEADER_FULL\@,' . "${one_fullname}" . ',;'; $xform .= 's,\@STAMP\@,' . "${stamp_dir}${stamp_name}" . ',;'; $xform .= 's,\@CONFIGURE_AC\@,' . "${configure_ac}" . ',;'; ! $output_rules .= &file_contents_with_transform ($xform, 'remake-hdr'); --- 3167,3173 ---- $xform .= 's,\@CONFIG_HEADER_FULL\@,' . "${one_fullname}" . ',;'; $xform .= 's,\@STAMP\@,' . "${stamp_dir}${stamp_name}" . ',;'; $xform .= 's,\@CONFIGURE_AC\@,' . "${configure_ac}" . ',;'; ! $output_rules .= &file_contents_with_transform ($xform, 'remake-hdr'); *************** *** 4200,4206 **** # Handle configuration headers. A config header of `[$1]' # means we are actually scanning AM_CONFIG_HEADER from # aclocal.m4. ! if (/A([CM])_CONFIG_HEADER\s*\((.*)\)/ && $2 ne '[$1]') { &am_conf_line_error --- 4199,4205 ---- # Handle configuration headers. A config header of `[$1]' # means we are actually scanning AM_CONFIG_HEADER from # aclocal.m4. ! if (/A([CM])_CONFIG_HEADERS?\s*\((.*)\)/ && $2 ne '[$1]') { &am_conf_line_error *************** *** 4317,4323 **** $seen_package = 1 if /PACKAGE=/; # Skip VERSION of [$2]; that is from AM_INIT_AUTOMAKE. ! if (/\bVERSION=(\S+)/ && $1 ne '[$2]') { $seen_version = 1; $package_version = $1; --- 4316,4322 ---- $seen_package = 1 if /PACKAGE=/; # Skip VERSION of [$2]; that is from AM_INIT_AUTOMAKE. ! if (/\bVERSION=(\S+)/ && $1 ne '$2' && $1 ne '[$2]') { $seen_version = 1; $package_version = $1; *************** *** 4331,4339 **** $seen_prog_install = 1 if /AC_PROG_INSTALL/; $seen_lispdir = 1 if /AM_PATH_LISPDIR/; ! if (/AM_PROG_LIBTOOL/) { ! $seen_libtool = 1; $libtool_line = $.; $configure_vars{'LIBTOOL'} = $filename . ':' . $.; $configure_vars{'RANLIB'} = $filename . ':' . $.; --- 4330,4348 ---- $seen_prog_install = 1 if /AC_PROG_INSTALL/; $seen_lispdir = 1 if /AM_PATH_LISPDIR/; ! if (/A(C|M)_PROG_LIBTOOL/) { ! # We're not ready for this yet. People still use a ! # libtool with no AC_PROG_LIBTOOL. Once that is the ! # dominant version we can reenable this code -- but next ! # time by mentioning the macro in %obsolete_macros, both ! # here and in aclocal.in. ! ! # if (/AM_PROG_LIBTOOL/) ! # { ! # &am_conf_line_warning ($filename, $., "`AM_PROG_LIBTOOL' is obsolete, use `AC_PROG_LIBTOOL' instead"); ! # } ! $seen_libtool = 1; $libtool_line = $.; $configure_vars{'LIBTOOL'} = $filename . ':' . $.; $configure_vars{'RANLIB'} = $filename . ':' . $.; *************** *** 4986,4995 **** &define_variable ('LTOBJCCOMPILE', $ltcompile . '$(OBJC) $(DEFS) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_OBJCFLAGS) $(OBJCFLAGS)') if ($seen_libtool); ! &define_variable ('OBJCLD', '$(OBJC)'); &define_variable ('OBJCLINK', $ltlink . '$(OBJCLD) $(AM_OBJCFLAGS) $(OBJCFLAGS) $(LDFLAGS) -o $@'); ! $output_rules .= (".m.o:\n" . "\t\$(OBJCCOMPILE) -c \$<\n"); # FIXME: Using cygpath should be somehow conditional. --- 4995,5004 ---- &define_variable ('LTOBJCCOMPILE', $ltcompile . '$(OBJC) $(DEFS) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_OBJCFLAGS) $(OBJCFLAGS)') if ($seen_libtool); ! &define_variable ('OBJCLD', '$(OBJC)'); &define_variable ('OBJCLINK', $ltlink . '$(OBJCLD) $(AM_OBJCFLAGS) $(OBJCFLAGS) $(LDFLAGS) -o $@'); ! $output_rules .= (".m.o:\n" . "\t\$(OBJCCOMPILE) -c \$<\n"); # FIXME: Using cygpath should be somehow conditional. *************** *** 4999,5005 **** $output_rules .= (".m.lo:\n" . "\t\$(LTOBJCCOMPILE) -c \$<\n") if ($seen_libtool); ! if (! defined $configure_vars{'OBJC'}) { &am_error ("Objective C source seen but \`OBJC' not defined in \`$configure_ac'"); --- 5008,5014 ---- $output_rules .= (".m.lo:\n" . "\t\$(LTOBJCCOMPILE) -c \$<\n") if ($seen_libtool); ! if (! defined $configure_vars{'OBJC'}) { &am_error ("Objective C source seen but \`OBJC' not defined in \`$configure_ac'"); *************** *** 5988,5994 **** local ($source_suffix); local ($object_suffix); ! if (($source_suffix, $object_suffix) = ($1 =~ $SUFFIX_RULE_PATTERN)) { $suffix_rules{$source_suffix} = $object_suffix; print "Sources ending in .$source_suffix become .$object_suffix\n" if $verbose; --- 5997,6003 ---- local ($source_suffix); local ($object_suffix); ! if (($source_suffix, $object_suffix) = ($1 =~ $SUFFIX_RULE_PATTERN)) { $suffix_rules{$source_suffix} = $object_suffix; print "Sources ending in .$source_suffix become .$object_suffix\n" if $verbose; *************** *** 6313,6319 **** # Copyright on generated Makefile.ins. $gen_copyright = "\ ! # Copyright (C) 1994, 1995-8, 1999 Free Software Foundation, Inc. # This Makefile.in is free software; the Free Software Foundation # gives unlimited permission to copy and/or distribute it, # with or without modifications, as long as this notice is preserved. --- 6322,6328 ---- # Copyright on generated Makefile.ins. $gen_copyright = "\ ! # Copyright (C) 1994, 1995-8, 1999, 2001 Free Software Foundation, Inc. # This Makefile.in is free software; the Free Software Foundation # gives unlimited permission to copy and/or distribute it, # with or without modifications, as long as this notice is preserved. *************** *** 7285,7293 **** for ($i = 0; $i < $max; ++$i) { $one = $lcomm[$i]; ! $two = $lcomm[$max + $i]; ! $three = $lcomm[2 * $max + $i]; ! $four = $lcomm[3 * $max + $i]; write; } --- 7294,7302 ---- for ($i = 0; $i < $max; ++$i) { $one = $lcomm[$i]; ! $two = $lcomm[$max + $i + 1]; ! $three = $lcomm[2 * $max + $i + 1]; ! $four = $lcomm[3 * $max + $i + 1]; write; } Index: automake/config.guess diff -c automake/config.guess:1.12.8.2 automake/config.guess:1.12.8.3 *** automake/config.guess:1.12.8.2 Thu Jun 7 12:48:51 2001 --- automake/config.guess Sun Jul 15 10:17:51 2001 *************** *** 3,9 **** # Copyright (C) 1992, 1993, 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001 # Free Software Foundation, Inc. ! timestamp='2001-06-05' # This file is free software; you can redistribute it and/or modify it # under the terms of the GNU General Public License as published by --- 3,9 ---- # Copyright (C) 1992, 1993, 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001 # Free Software Foundation, Inc. ! timestamp='2001-07-12' # This file is free software; you can redistribute it and/or modify it # under the terms of the GNU General Public License as published by *************** *** 95,119 **** # Historically, `CC_FOR_BUILD' used to be named `HOST_CC'. We still # use `HOST_CC' if defined, but it is deprecated. ! case $CC_FOR_BUILD,$HOST_CC,$CC in ! ,,) echo "int dummy(){}" > $dummy.c for c in cc gcc c89 ; do ! ($c $dummy.c -c -o $dummy.o) >/dev/null 2>&1 if test $? = 0 ; then ! CC_FOR_BUILD="$c"; break ! fi ! done ! rm -f $dummy.c $dummy.o $dummy.rel if test x"$CC_FOR_BUILD" = x ; then ! CC_FOR_BUILD=no_compiler_found fi ;; ,,*) CC_FOR_BUILD=$CC ;; ,*,*) CC_FOR_BUILD=$HOST_CC ;; ! esac # This is needed to find uname on a Pyramid OSx when run in the BSD universe. ! # (ghazi@noc.rutgers.edu 8/24/94.) if (test -f /.attbin/uname) >/dev/null 2>&1 ; then PATH=$PATH:/.attbin ; export PATH fi --- 95,119 ---- # Historically, `CC_FOR_BUILD' used to be named `HOST_CC'. We still # use `HOST_CC' if defined, but it is deprecated. ! set_cc_for_build='case $CC_FOR_BUILD,$HOST_CC,$CC in ! ,,) echo "int dummy(){}" > $dummy.c ; for c in cc gcc c89 ; do ! ($c $dummy.c -c -o $dummy.o) >/dev/null 2>&1 ; if test $? = 0 ; then ! CC_FOR_BUILD="$c"; break ; ! fi ; ! done ; ! rm -f $dummy.c $dummy.o $dummy.rel ; if test x"$CC_FOR_BUILD" = x ; then ! CC_FOR_BUILD=no_compiler_found ; fi ;; ,,*) CC_FOR_BUILD=$CC ;; ,*,*) CC_FOR_BUILD=$HOST_CC ;; ! esac' # This is needed to find uname on a Pyramid OSx when run in the BSD universe. ! # (ghazi@noc.rutgers.edu 1994-08-24) if (test -f /.attbin/uname) >/dev/null 2>&1 ; then PATH=$PATH:/.attbin ; export PATH fi *************** *** 150,155 **** --- 150,156 ---- # to ELF recently, or will in the future. case "${UNAME_MACHINE}" in i386|sparc|amiga|arm*|hp300|mvme68k|vax|atari|luna68k|mac68k|news68k|next68k|pc532|sun3*|x68k) + eval $set_cc_for_build if echo __ELF__ | $CC_FOR_BUILD -E - 2>/dev/null \ | grep __ELF__ >/dev/null then *************** *** 204,209 **** --- 205,211 ---- jsr \$26,exit .end main EOF + eval $set_cc_for_build $CC_FOR_BUILD $dummy.s -o $dummy 2>/dev/null if test "$?" = 0 ; then case `./$dummy` in *************** *** 406,411 **** --- 408,414 ---- exit (-1); } EOF + eval $set_cc_for_build $CC_FOR_BUILD $dummy.c -o $dummy \ && ./$dummy `echo "${UNAME_RELEASE}" | sed -n 's/\([0-9]*\).*/\1/p'` \ && rm -f $dummy.c $dummy && exit 0 *************** *** 486,491 **** --- 489,495 ---- exit(0); } EOF + eval $set_cc_for_build $CC_FOR_BUILD $dummy.c -o $dummy && ./$dummy && rm -f $dummy.c $dummy && exit 0 rm -f $dummy.c $dummy echo rs6000-ibm-aix3.2.5 *************** *** 586,591 **** --- 590,596 ---- exit (0); } EOF + eval $set_cc_for_build (CCOPTS= $CC_FOR_BUILD $dummy.c -o $dummy 2>/dev/null ) && HP_ARCH=`./$dummy` if test -z "$HP_ARCH"; then HP_ARCH=hppa; fi rm -f $dummy.c $dummy *************** *** 623,628 **** --- 628,634 ---- exit (0); } EOF + eval $set_cc_for_build $CC_FOR_BUILD $dummy.c -o $dummy && ./$dummy && rm -f $dummy.c $dummy && exit 0 rm -f $dummy.c $dummy echo unknown-hitachi-hiuxwe2 *************** *** 633,639 **** 9000/8??:4.3bsd:*:*) echo hppa1.0-hp-bsd exit 0 ;; ! *9??*:MPE/iX:*:*) echo hppa1.0-hp-mpeix exit 0 ;; hp7??:OSF1:*:* | hp8?[79]:OSF1:*:* ) --- 639,645 ---- 9000/8??:4.3bsd:*:*) echo hppa1.0-hp-bsd exit 0 ;; ! *9??*:MPE/iX:*:* | *3000*:MPE/iX:*:*) echo hppa1.0-hp-mpeix exit 0 ;; hp7??:OSF1:*:* | hp8?[79]:OSF1:*:* ) *************** *** 677,688 **** echo xmp-cray-unicos exit 0 ;; CRAY*Y-MP:*:*:*) ! echo ymp-cray-unicos${UNAME_RELEASE} exit 0 ;; CRAY*[A-Z]90:*:*:*) echo ${UNAME_MACHINE}-cray-unicos${UNAME_RELEASE} \ | sed -e 's/CRAY.*\([A-Z]90\)/\1/' \ ! -e y/ABCDEFGHIJKLMNOPQRSTUVWXYZ/abcdefghijklmnopqrstuvwxyz/ exit 0 ;; CRAY*TS:*:*:*) echo t90-cray-unicos${UNAME_RELEASE} | sed -e 's/\.[^.]*$/.X/' --- 683,695 ---- echo xmp-cray-unicos exit 0 ;; CRAY*Y-MP:*:*:*) ! echo ymp-cray-unicos${UNAME_RELEASE} | sed -e 's/\.[^.]*$/.X/' exit 0 ;; CRAY*[A-Z]90:*:*:*) echo ${UNAME_MACHINE}-cray-unicos${UNAME_RELEASE} \ | sed -e 's/CRAY.*\([A-Z]90\)/\1/' \ ! -e y/ABCDEFGHIJKLMNOPQRSTUVWXYZ/abcdefghijklmnopqrstuvwxyz/ \ ! -e 's/\.[^.]*$/.X/' exit 0 ;; CRAY*TS:*:*:*) echo t90-cray-unicos${UNAME_RELEASE} | sed -e 's/\.[^.]*$/.X/' *************** *** 763,859 **** echo ${UNAME_MACHINE}-unknown-linux-gnu exit 0 ;; mips:Linux:*:*) ! cat >$dummy.c < /* for printf() prototype */ ! int main (int argc, char *argv[]) { ! #else ! int main (argc, argv) int argc; char *argv[]; { ! #endif ! #ifdef __MIPSEB__ ! printf ("%s-unknown-linux-gnu\n", argv[1]); ! #endif ! #ifdef __MIPSEL__ ! printf ("%sel-unknown-linux-gnu\n", argv[1]); ! #endif ! return 0; ! } ! EOF ! $CC_FOR_BUILD $dummy.c -o $dummy 2>/dev/null && ./$dummy "${UNAME_MACHINE}" && rm -f $dummy.c $dummy && exit 0 ! rm -f $dummy.c $dummy ;; ppc:Linux:*:*) ! # Determine Lib Version ! cat >$dummy.c < ! #if defined(__GLIBC__) ! extern char __libc_version[]; ! extern char __libc_release[]; ! #endif ! main(argc, argv) ! int argc; ! char *argv[]; ! { ! #if defined(__GLIBC__) ! printf("%s %s\n", __libc_version, __libc_release); ! #else ! printf("unknown\n"); ! #endif ! return 0; ! } ! EOF ! LIBC="" ! $CC_FOR_BUILD $dummy.c -o $dummy 2>/dev/null ! if test "$?" = 0 ; then ! ./$dummy | grep 1\.99 > /dev/null ! if test "$?" = 0 ; then LIBC="libc1" ; fi ! fi ! rm -f $dummy.c $dummy ! echo powerpc-unknown-linux-gnu${LIBC} exit 0 ;; alpha:Linux:*:*) ! cat <$dummy.s ! .data ! \$Lformat: ! .byte 37,100,45,37,120,10,0 # "%d-%x\n" ! .text ! .globl main ! .align 4 ! .ent main ! main: ! .frame \$30,16,\$26,0 ! ldgp \$29,0(\$27) ! .prologue 1 ! .long 0x47e03d80 # implver \$0 ! lda \$2,-1 ! .long 0x47e20c21 # amask \$2,\$1 ! lda \$16,\$Lformat ! mov \$0,\$17 ! not \$1,\$18 ! jsr \$26,printf ! ldgp \$29,0(\$26) ! mov 0,\$16 ! jsr \$26,exit ! .end main ! EOF ! LIBC="" ! $CC_FOR_BUILD $dummy.s -o $dummy 2>/dev/null ! if test "$?" = 0 ; then ! case `./$dummy` in ! 0-0) UNAME_MACHINE="alpha" ;; ! 1-0) UNAME_MACHINE="alphaev5" ;; ! 1-1) UNAME_MACHINE="alphaev56" ;; ! 1-101) UNAME_MACHINE="alphapca56" ;; ! 2-303) UNAME_MACHINE="alphaev6" ;; ! 2-307) UNAME_MACHINE="alphaev67" ;; ! esac ! objdump --private-headers $dummy | \ ! grep ld.so.1 > /dev/null ! if test "$?" = 0 ; then ! LIBC="libc1" ! fi ! fi ! rm -f $dummy.s $dummy echo ${UNAME_MACHINE}-unknown-linux-gnu${LIBC} exit 0 ;; parisc:Linux:*:* | hppa:Linux:*:*) --- 770,795 ---- echo ${UNAME_MACHINE}-unknown-linux-gnu exit 0 ;; mips:Linux:*:*) ! case `sed -n '/^byte/s/^.*: \(.*\) endian/\1/p' < /proc/cpuinfo` in ! big) echo mips-unknown-linux-gnu && exit 0 ;; ! little) echo mipsel-unknown-linux-gnu && exit 0 ;; ! esac ;; ppc:Linux:*:*) ! echo powerpc-unknown-linux-gnu exit 0 ;; alpha:Linux:*:*) ! case `sed -n '/^cpu model/s/^.*: \(.*\)/\1/p' < /proc/cpuinfo` in ! EV5) UNAME_MACHINE=alphaev5 ;; ! EV56) UNAME_MACHINE=alphaev56 ;; ! PCA56) UNAME_MACHINE=alphapca56 ;; ! PCA57) UNAME_MACHINE=alphapca56 ;; ! EV6) UNAME_MACHINE=alphaev6 ;; ! EV67) UNAME_MACHINE=alphaev67 ;; ! EV68*) UNAME_MACHINE=alphaev67 ;; ! esac ! objdump --private-headers /bin/sh | grep ld.so.1 >/dev/null ! if test "$?" = 0 ; then LIBC="libc1" ; else LIBC="" ; fi echo ${UNAME_MACHINE}-unknown-linux-gnu${LIBC} exit 0 ;; parisc:Linux:*:* | hppa:Linux:*:*) *************** *** 930,942 **** return 0; } EOF $CC_FOR_BUILD $dummy.c -o $dummy 2>/dev/null && ./$dummy "${UNAME_MACHINE}" && rm -f $dummy.c $dummy && exit 0 rm -f $dummy.c $dummy test x"${TENTATIVE}" != x && echo "${TENTATIVE}" && exit 0 ;; - # ptx 4.0 does uname -s correctly, with DYNIX/ptx in there. earlier versions - # are messed up and put the nodename in both sysname and nodename. i*86:DYNIX/ptx:4*:*) echo i386-sequent-sysv4 exit 0 ;; i*86:UNIX_SV:4.2MP:2.*) --- 866,880 ---- return 0; } EOF + eval $set_cc_for_build $CC_FOR_BUILD $dummy.c -o $dummy 2>/dev/null && ./$dummy "${UNAME_MACHINE}" && rm -f $dummy.c $dummy && exit 0 rm -f $dummy.c $dummy test x"${TENTATIVE}" != x && echo "${TENTATIVE}" && exit 0 ;; i*86:DYNIX/ptx:4*:*) + # ptx 4.0 does uname -s correctly, with DYNIX/ptx in there. + # earlier versions are messed up and put the nodename in both + # sysname and nodename. echo i386-sequent-sysv4 exit 0 ;; i*86:UNIX_SV:4.2MP:2.*) *************** *** 955,968 **** echo ${UNAME_MACHINE}-pc-sysv${UNAME_REL} fi exit 0 ;; ! i*86:*:5:7*) ! # Fixed at (any) Pentium or better ! UNAME_MACHINE=i586 ! if [ ${UNAME_SYSTEM} = "UnixWare" ] ; then ! echo ${UNAME_MACHINE}-sco-sysv${UNAME_RELEASE}uw${UNAME_VERSION} ! else ! echo ${UNAME_MACHINE}-pc-sysv${UNAME_RELEASE} ! fi exit 0 ;; i*86:*:3.2:*) if test -f /usr/options/cb.name; then --- 893,905 ---- echo ${UNAME_MACHINE}-pc-sysv${UNAME_REL} fi exit 0 ;; ! i*86:*:5:[78]*) ! case `/bin/uname -X | grep "^Machine"` in ! *486*) UNAME_MACHINE=i486 ;; ! *Pentium) UNAME_MACHINE=i586 ;; ! *Pent*|*Celeron) UNAME_MACHINE=i686 ;; ! esac ! echo ${UNAME_MACHINE}-unknown-sysv${UNAME_RELEASE}${UNAME_SYSTEM}${UNAME_VERSION} exit 0 ;; i*86:*:3.2:*) if test -f /usr/options/cb.name; then *************** *** 1280,1285 **** --- 1217,1223 ---- } EOF + eval $set_cc_for_build $CC_FOR_BUILD $dummy.c -o $dummy 2>/dev/null && ./$dummy && rm -f $dummy.c $dummy && exit 0 rm -f $dummy.c $dummy Index: automake/config.sub diff -c automake/config.sub:1.149.8.4 automake/config.sub:1.149.8.5 *** automake/config.sub:1.149.8.4 Sun Jun 10 03:32:50 2001 --- automake/config.sub Sun Jul 15 10:17:51 2001 *************** *** 238,244 **** | mips16 | mips64 | mipsel | mips64el \ | mips64orion | mips64orionel | mipstx39 | mipstx39el \ | mips64vr4300 | mips64vr4300el | mips64vr4100 | mips64vr4100el \ ! | mips64vr5000 | miprs64vr5000el | mcore | s390 | s390x \ | sparc | sparclet | sparclite | sparc64 | sparcv9 | sparcv9b \ | v850 | c4x \ | thumb | d10v | d30v | fr30 | avr | openrisc | tic80 \ --- 238,244 ---- | mips16 | mips64 | mipsel | mips64el \ | mips64orion | mips64orionel | mipstx39 | mipstx39el \ | mips64vr4300 | mips64vr4300el | mips64vr4100 | mips64vr4100el \ ! | mips64vr5000 | mips64vr5000el | mcore | s390 | s390x \ | sparc | sparclet | sparclite | sparc64 | sparcv9 | sparcv9b \ | v850 | c4x \ | thumb | d10v | d30v | fr30 | avr | openrisc | tic80 \ Index: automake/configure diff -c automake/configure:1.62.4.8 automake/configure:1.62.4.10 *** automake/configure:1.62.4.8 Sun Jun 10 03:32:50 2001 --- automake/configure Sun Jul 15 10:17:51 2001 *************** *** 692,698 **** PACKAGE=automake ! VERSION=1.4-p4 if test "`cd $srcdir && pwd`" != "`pwd`" && test -f $srcdir/config.status; then { echo "configure: error: source directory already configured; run "make distclean" there first" 1>&2; exit 1; } --- 692,698 ---- PACKAGE=automake ! VERSION=1.4-p5 if test "`cd $srcdir && pwd`" != "`pwd`" && test -f $srcdir/config.status; then { echo "configure: error: source directory already configured; run "make distclean" there first" 1>&2; exit 1; } Index: automake/configure.in diff -c automake/configure.in:1.67.4.8 automake/configure.in:1.67.4.10 *** automake/configure.in:1.67.4.8 Sun Jun 10 03:32:50 2001 --- automake/configure.in Sun Jul 15 10:17:51 2001 *************** *** 1,7 **** dnl Process this file with autoconf to produce a configure script. AC_INIT(automake.in) ! AM_INIT_AUTOMAKE(automake, 1.4-p4) # Find an appropriate tar for use in "dist" targets. A "best guess" # is good enough -- if we can't find GNU tar, we don't really care. --- 1,7 ---- dnl Process this file with autoconf to produce a configure script. AC_INIT(automake.in) ! AM_INIT_AUTOMAKE(automake, 1.4-p5) # Find an appropriate tar for use in "dist" targets. A "best guess" # is good enough -- if we can't find GNU tar, we don't really care. Index: automake/lisp.am diff -c automake/lisp.am:1.11 automake/lisp.am:1.11.4.2 *** automake/lisp.am:1.11 Wed Mar 25 14:25:26 1998 --- automake/lisp.am Sun Jul 15 09:24:17 2001 *************** *** 17,39 **** ## 02111-1307, USA. install-@DIR@LISP: $(@DIR@_LISP) $(ELCFILES) @$(NORMAL_INSTALL) ! $(mkinstalldirs) $(DESTDIR)$(@DIR@dir) ## Funny invocation because Makefile variable can be empty, leading to ## a syntax error in sh. ! @list='$(@DIR@_LISP)'; for p in $$list; do \ ## A header file can be in the source directory or the build directory. ! if test -f "$$p"; then d= ; else d="$(srcdir)/"; fi; \ ! echo " $(INSTALL_DATA) $$d$$p $(DESTDIR)$(@DIR@dir)/$$p"; \ ! $(INSTALL_DATA) $$d$$p $(DESTDIR)$(@DIR@dir)/$$p; \ ## Only install .elc file if it exists. ! if test -f $${p}c; then \ ! echo " $(INSTALL_DATA) $${p}c $(DESTDIR)$(@DIR@dir)/$${p}c"; \ ! $(INSTALL_DATA) $${p}c $(DESTDIR)$(@DIR@dir)/$${p}c; \ ! else : ; fi; \ ! done uninstall-@DIR@LISP: @$(NORMAL_UNINSTALL) ! list='$(@DIR@_LISP)'; for p in $$list; do \ ! rm -f $(@DIR@dir)/$$p $(DESTDIR)$(@DIR@dir)/$${p}c; \ ! done --- 17,43 ---- ## 02111-1307, USA. install-@DIR@LISP: $(@DIR@_LISP) $(ELCFILES) @$(NORMAL_INSTALL) ! @if test -n "$(lispdir)"; then \ ! $(mkinstalldirs) $(DESTDIR)$(@DIR@dir); \ ## Funny invocation because Makefile variable can be empty, leading to ## a syntax error in sh. ! @list='$(@DIR@_LISP)'; for p in $$list; do \ ## A header file can be in the source directory or the build directory. ! if test -f "$$p"; then d= ; else d="$(srcdir)/"; fi; \ ! echo " $(INSTALL_DATA) $$d$$p $(DESTDIR)$(@DIR@dir)/$$p"; \ ! $(INSTALL_DATA) $$d$$p $(DESTDIR)$(@DIR@dir)/$$p; \ ## Only install .elc file if it exists. ! if test -f $${p}c; then \ ! echo " $(INSTALL_DATA) $${p}c $(DESTDIR)$(@DIR@dir)/$${p}c"; \ ! $(INSTALL_DATA) $${p}c $(DESTDIR)$(@DIR@dir)/$${p}c; \ ! else : ; fi; \ ! done; \ ! else : ; fi uninstall-@DIR@LISP: @$(NORMAL_UNINSTALL) ! @if test -n "$(lispdir)"; then \ ! list='$(@DIR@_LISP)'; for p in $$list; do \ ! rm -f $(DESTDIR)$(@DIR@dir)/$$p $(DESTDIR)$(@DIR@dir)/$${p}c; \ ! done; \ ! else : ; fi Index: automake/missing diff -c automake/missing:1.7 automake/missing:1.7.6.3 *** automake/missing:1.7 Mon Jan 11 05:53:30 1999 --- automake/missing Sun Jul 15 09:39:57 2001 *************** *** 1,6 **** #! /bin/sh # Common stub for a few missing GNU programs while installing. ! # Copyright (C) 1996, 1997 Free Software Foundation, Inc. # Franc,ois Pinard , 1996. # This program is free software; you can redistribute it and/or modify --- 1,6 ---- #! /bin/sh # Common stub for a few missing GNU programs while installing. ! # Copyright (C) 1996, 1997, 2001 Free Software Foundation, Inc. # Franc,ois Pinard , 1996. # This program is free software; you can redistribute it and/or modify *************** *** 23,28 **** --- 23,36 ---- exit 1 fi + # In the cases where this matters, `missing' is being run in the + # srcdir already. + if test -f configure.in; then + configure_ac=configure.ac + else + configure_ac=configure.in + fi + case "$1" in -h|--h|--he|--hel|--help) *************** *** 61,67 **** aclocal) echo 1>&2 "\ WARNING: \`$1' is missing on your system. You should only need it if ! you modified \`acinclude.m4' or \`configure.in'. You might want to install the \`Automake' and \`Perl' packages. Grab them from any GNU archive site." touch aclocal.m4 --- 69,75 ---- aclocal) echo 1>&2 "\ WARNING: \`$1' is missing on your system. You should only need it if ! you modified \`acinclude.m4' or \`$configure_ac'. You might want to install the \`Automake' and \`Perl' packages. Grab them from any GNU archive site." touch aclocal.m4 *************** *** 70,76 **** autoconf) echo 1>&2 "\ WARNING: \`$1' is missing on your system. You should only need it if ! you modified \`configure.in'. You might want to install the \`Autoconf' and \`GNU m4' packages. Grab them from any GNU archive site." touch configure --- 78,84 ---- autoconf) echo 1>&2 "\ WARNING: \`$1' is missing on your system. You should only need it if ! you modified \`$configure_ac'. You might want to install the \`Autoconf' and \`GNU m4' packages. Grab them from any GNU archive site." touch configure *************** *** 79,88 **** autoheader) echo 1>&2 "\ WARNING: \`$1' is missing on your system. You should only need it if ! you modified \`acconfig.h' or \`configure.in'. You might want to install the \`Autoconf' and \`GNU m4' packages. Grab them from any GNU archive site." ! files=`sed -n 's/^[ ]*A[CM]_CONFIG_HEADER(\([^)]*\)).*/\1/p' configure.in` test -z "$files" && files="config.h" touch_files= for f in $files; do --- 87,96 ---- autoheader) echo 1>&2 "\ WARNING: \`$1' is missing on your system. You should only need it if ! you modified \`acconfig.h' or \`$configure_ac'. You might want to install the \`Autoconf' and \`GNU m4' packages. Grab them from any GNU archive site." ! files=`sed -n 's/^[ ]*A[CM]_CONFIG_HEADER(\([^)]*\)).*/\1/p' $configure_ac` test -z "$files" && files="config.h" touch_files= for f in $files; do *************** *** 98,104 **** automake) echo 1>&2 "\ WARNING: \`$1' is missing on your system. You should only need it if ! you modified \`Makefile.am', \`acinclude.m4' or \`configure.in'. You might want to install the \`Automake' and \`Perl' packages. Grab them from any GNU archive site." find . -type f -name Makefile.am -print | --- 106,112 ---- automake) echo 1>&2 "\ WARNING: \`$1' is missing on your system. You should only need it if ! you modified \`Makefile.am', \`acinclude.m4' or \`$configure_ac'. You might want to install the \`Automake' and \`Perl' packages. Grab them from any GNU archive site." find . -type f -name Makefile.am -print | Index: automake/remake.am diff -c automake/remake.am:1.23.8.1 automake/remake.am:1.23.8.2 *** automake/remake.am:1.23.8.1 Sun Jun 10 03:19:37 2001 --- automake/remake.am Sun Jul 15 07:51:22 2001 *************** *** 17,23 **** ## 02111-1307, USA. ## Explicitly look in srcdir for benefit of non-GNU makes. ! config.status: $(srcdir)/@CONFIGURE_AC@ $(CONFIG_STATUS_DEPENDENCIES) $(SHELL) ./config.status --recheck ## Explicitly look in srcdir for benefit of non-GNU makes. $(srcdir)/configure: @MAINTAINER_MODE_TRUE@$(srcdir)/@CONFIGURE_AC@ $(ACLOCAL_M4) $(CONFIGURE_DEPENDENCIES) --- 17,23 ---- ## 02111-1307, USA. ## Explicitly look in srcdir for benefit of non-GNU makes. ! config.status: $(srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES) $(SHELL) ./config.status --recheck ## Explicitly look in srcdir for benefit of non-GNU makes. $(srcdir)/configure: @MAINTAINER_MODE_TRUE@$(srcdir)/@CONFIGURE_AC@ $(ACLOCAL_M4) $(CONFIGURE_DEPENDENCIES) Index: automake/stamp-vti diff -c automake/stamp-vti:1.68.4.8 automake/stamp-vti:1.68.4.10 *** automake/stamp-vti:1.68.4.8 Sun Jun 10 03:32:50 2001 --- automake/stamp-vti Sun Jul 15 10:17:51 2001 *************** *** 1,3 **** @set UPDATED 6 January 1999 ! @set EDITION 1.4-p4 ! @set VERSION 1.4-p4 --- 1,3 ---- @set UPDATED 6 January 1999 ! @set EDITION 1.4-p5 ! @set VERSION 1.4-p5 Index: automake/subdirs.am diff -c automake/subdirs.am:1.39 automake/subdirs.am:1.39.4.1 *** automake/subdirs.am:1.39 Wed Sep 30 17:23:38 1998 --- automake/subdirs.am Sun Jul 15 09:00:29 2001 *************** *** 59,65 **** dot_seen=no; \ rev=''; list='$(SUBDIRS)'; for subdir in $$list; do \ rev="$$subdir $$rev"; \ ! test "$$subdir" = "." && dot_seen=yes; \ done; \ ## If we haven't seen `.', then add it at the beginning. test "$$dot_seen" = "no" && rev=". $$rev"; \ --- 59,65 ---- dot_seen=no; \ rev=''; list='$(SUBDIRS)'; for subdir in $$list; do \ rev="$$subdir $$rev"; \ ! test "$$subdir" != "." || dot_seen=yes; \ done; \ ## If we haven't seen `.', then add it at the beginning. test "$$dot_seen" = "no" && rev=". $$rev"; \ Index: automake/texinfo.tex diff -c automake/texinfo.tex:1.14.8.1 automake/texinfo.tex:1.14.8.2 *** automake/texinfo.tex:1.14.8.1 Thu Jun 7 12:53:52 2001 --- automake/texinfo.tex Sun Jul 15 10:17:52 2001 *************** *** 3,9 **** % Load plain if necessary, i.e., if running under initex. \expandafter\ifx\csname fmtname\endcsname\relax\input plain\fi % ! \def\texinfoversion{2001-05-24.08} % % Copyright (C) 1985, 86, 88, 90, 91, 92, 93, 94, 95, 96, 97, 98, 99, % 2000, 01 Free Software Foundation, Inc. --- 3,9 ---- % Load plain if necessary, i.e., if running under initex. \expandafter\ifx\csname fmtname\endcsname\relax\input plain\fi % ! \def\texinfoversion{2001-06-21.10} % % Copyright (C) 1985, 86, 88, 90, 91, 92, 93, 94, 95, 96, 97, 98, 99, % 2000, 01 Free Software Foundation, Inc. *************** *** 441,447 **** % environments. --karl, 6may93 %{\advance \baselineskip by -\singlespaceskip %\kern \baselineskip}% ! \setleading \singlespaceskip } %% Simple single-character @ commands --- 441,447 ---- % environments. --karl, 6may93 %{\advance \baselineskip by -\singlespaceskip %\kern \baselineskip}% ! \setleading\singlespaceskip } %% Simple single-character @ commands *************** *** 942,948 **** \ifnum\pdftexversion < 14 \else \pdfrefximage \pdflastximage \fi} ! \def\pdfmkdest#1{\pdfdest name{#1} xyz} \def\pdfmkpgn#1{#1@} \let\linkcolor = \Blue % was Cyan, but that seems light? \def\endlink{\Black\pdfendlink} --- 942,948 ---- \ifnum\pdftexversion < 14 \else \pdfrefximage \pdflastximage \fi} ! \def\pdfmkdest#1{{\normalturnoffactive \pdfdest name{#1} xyz}} \def\pdfmkpgn#1{#1@} \let\linkcolor = \Blue % was Cyan, but that seems light? \def\endlink{\Black\pdfendlink} *************** *** 1068,1076 **** \def\makelink{\addtokens{\toksB}% {\noexpand\pdflink{\the\toksC}}\toksC={}\global\countA=0} \def\pdflink#1{% ! \startlink attr{/Border [0 0 0]} goto name{\mkpgn{#1}} \linkcolor #1\endlink} - \def\mkpgn#1{#1@} \def\done{\edef\st{\global\noexpand\toksA={\the\toksB}}\st} \fi % \ifx\pdfoutput --- 1068,1075 ---- \def\makelink{\addtokens{\toksB}% {\noexpand\pdflink{\the\toksC}}\toksC={}\global\countA=0} \def\pdflink#1{% ! \startlink attr{/Border [0 0 0]} goto name{\pdfmkpgn{#1}} \linkcolor #1\endlink} \def\done{\edef\st{\global\noexpand\toksA={\the\toksB}}\st} \fi % \ifx\pdfoutput *************** *** 1087,1095 **** % We don't need math for this one. \def\ttsl{\tenttsl} % Use Computer Modern fonts at \magstephalf (11pt). ! \newcount\mainmagstep ! \mainmagstep=\magstephalf % Set the font macro #1 to the font named #2, adding on the % specified font prefix (normally `cm'). --- 1086,1114 ---- % We don't need math for this one. \def\ttsl{\tenttsl} + % Default leading. + \newdimen\textleading \textleading = 13.2pt + + % Set the baselineskip to #1, and the lineskip and strut size + % correspondingly. There is no deep meaning behind these magic numbers + % used as factors; they just match (closely enough) what Knuth defined. + % + \def\lineskipfactor{.08333} + \def\strutheightpercent{.70833} + \def\strutdepthpercent {.29167} + % + \def\setleading#1{% + \normalbaselineskip = #1\relax + \normallineskip = \lineskipfactor\normalbaselineskip + \normalbaselines + \setbox\strutbox =\hbox{% + \vrule width0pt height\strutheightpercent\baselineskip + depth \strutdepthpercent \baselineskip + }% + } + % Use Computer Modern fonts at \magstephalf (11pt). ! \newcount\mainmagstep \mainmagstep=\magstephalf % Set the font macro #1 to the font named #2, adding on the % specified font prefix (normally `cm'). *************** *** 1156,1161 **** --- 1175,1192 ---- \font\smalli=cmmi9 \font\smallsy=cmsy9 + % Fonts for small examples (8pt). + \setfont\smallerrm\rmshape{8}{1000} + \setfont\smallertt\ttshape{8}{1000} + \setfont\smallerbf\bfshape{10}{800} + \setfont\smallerit\itshape{8}{1000} + \setfont\smallersl\slshape{8}{1000} + \setfont\smallersf\sfshape{8}{1000} + \setfont\smallersc\scshape{10}{800} + \setfont\smallerttsl\ttslshape{10}{800} + \font\smalleri=cmmi8 + \font\smallersy=cmsy8 + % Fonts for title page: \setfont\titlerm\rmbshape{12}{\magstep3} \setfont\titleit\itbshape{10}{\magstep4} *************** *** 1244,1250 **** \let\tenrm=\textrm \let\tenit=\textit \let\tensl=\textsl \let\tenbf=\textbf \let\tentt=\texttt \let\smallcaps=\textsc \let\tensf=\textsf \let\teni=\texti \let\tensy=\textsy \let\tenttsl=\textttsl ! \resetmathfonts} \def\titlefonts{% \let\tenrm=\titlerm \let\tenit=\titleit \let\tensl=\titlesl \let\tenbf=\titlebf \let\tentt=\titlett \let\smallcaps=\titlesc --- 1275,1281 ---- \let\tenrm=\textrm \let\tenit=\textit \let\tensl=\textsl \let\tenbf=\textbf \let\tentt=\texttt \let\smallcaps=\textsc \let\tensf=\textsf \let\teni=\texti \let\tensy=\textsy \let\tenttsl=\textttsl ! \resetmathfonts \setleading{\textleading}} \def\titlefonts{% \let\tenrm=\titlerm \let\tenit=\titleit \let\tensl=\titlesl \let\tenbf=\titlebf \let\tentt=\titlett \let\smallcaps=\titlesc *************** *** 1273,1279 **** \let\tenbf=\smallbf \let\tentt=\smalltt \let\smallcaps=\smallsc \let\tensf=\smallsf \let\teni=\smalli \let\tensy=\smallsy \let\tenttsl=\smallttsl ! \resetmathfonts \setleading{11pt}} % Set up the default fonts, so we can use them for creating boxes. % --- 1304,1317 ---- \let\tenbf=\smallbf \let\tentt=\smalltt \let\smallcaps=\smallsc \let\tensf=\smallsf \let\teni=\smalli \let\tensy=\smallsy \let\tenttsl=\smallttsl ! \resetmathfonts \setleading{10.5pt}} ! \def\smallerfonts{% ! \let\tenrm=\smallerrm \let\tenit=\smallerit \let\tensl=\smallersl ! \let\tenbf=\smallerbf \let\tentt=\smallertt \let\smallcaps=\smallersc ! \let\tensf=\smallersf \let\teni=\smalleri \let\tensy=\smallersy ! \let\tenttsl=\smallerttsl ! \resetmathfonts \setleading{9.5pt}} ! \let\smallexamplefonts = \smallerfonts % Set up the default fonts, so we can use them for creating boxes. % *************** *** 2467,2476 **** \let\tenrm=\nullfont \let\tenit=\nullfont \let\tensl=\nullfont \let\tenbf=\nullfont \let\tentt=\nullfont \let\smallcaps=\nullfont \let\tensf=\nullfont ! % Similarly for index fonts (mostly for their use in smallexample). \let\smallrm=\nullfont \let\smallit=\nullfont \let\smallsl=\nullfont \let\smallbf=\nullfont \let\smalltt=\nullfont \let\smallsc=\nullfont \let\smallsf=\nullfont % % Don't complain when characters are missing from the fonts. \tracinglostchars = 0 --- 2505,2518 ---- \let\tenrm=\nullfont \let\tenit=\nullfont \let\tensl=\nullfont \let\tenbf=\nullfont \let\tentt=\nullfont \let\smallcaps=\nullfont \let\tensf=\nullfont ! % Similarly for index fonts. \let\smallrm=\nullfont \let\smallit=\nullfont \let\smallsl=\nullfont \let\smallbf=\nullfont \let\smalltt=\nullfont \let\smallsc=\nullfont \let\smallsf=\nullfont + % Similarly for smallexample fonts. + \let\smallerrm=\nullfont \let\smallerit=\nullfont \let\smallersl=\nullfont + \let\smallerbf=\nullfont \let\smallertt=\nullfont \let\smallersc=\nullfont + \let\smallersf=\nullfont % % Don't complain when characters are missing from the fonts. \tracinglostchars = 0 *************** *** 4299,4305 **** \def\smalllispx{\begingroup \def\Esmalllisp{\nonfillfinish\endgroup}% \def\Esmallexample{\nonfillfinish\endgroup}% ! \smallfonts \lisp } --- 4341,4347 ---- \def\smalllispx{\begingroup \def\Esmalllisp{\nonfillfinish\endgroup}% \def\Esmallexample{\nonfillfinish\endgroup}% ! \smallexamplefonts \lisp } *************** *** 4310,4321 **** \let\Edisplay = \nonfillfinish \gobble } ! % @smalldisplay (when @smallbook): @display plus smaller fonts. % \def\smalldisplayx{\begingroup \def\Esmalldisplay{\nonfillfinish\endgroup}% ! \smallfonts \rm \display } --- 4352,4363 ---- \let\Edisplay = \nonfillfinish \gobble } ! % % @smalldisplay (when @smallbook): @display plus smaller fonts. % \def\smalldisplayx{\begingroup \def\Esmalldisplay{\nonfillfinish\endgroup}% ! \smallexamplefonts \rm \display } *************** *** 4327,4338 **** \let\Eformat = \nonfillfinish \gobble } ! % @smallformat (when @smallbook): @format plus smaller fonts. % \def\smallformatx{\begingroup \def\Esmallformat{\nonfillfinish\endgroup}% ! \smallfonts \rm \format } --- 4369,4380 ---- \let\Eformat = \nonfillfinish \gobble } ! % % @smallformat (when @smallbook): @format plus smaller fonts. % \def\smallformatx{\begingroup \def\Esmallformat{\nonfillfinish\endgroup}% ! \smallexamplefonts \rm \format } *************** *** 5483,5495 **** \ifpdf \leavevmode \getfilename{#4}% ! \ifnum\filenamelength>0 ! \startlink attr{/Border [0 0 0]}% ! goto file{\the\filename.pdf} name{#1@}% ! \else ! \startlink attr{/Border [0 0 0]}% ! goto name{#1@}% ! \fi \linkcolor \fi % --- 5525,5539 ---- \ifpdf \leavevmode \getfilename{#4}% ! {\normalturnoffactive ! \ifnum\filenamelength>0 ! \startlink attr{/Border [0 0 0]}% ! goto file{\the\filename.pdf} name{#1}% ! \else ! \startlink attr{/Border [0 0 0]}% ! goto name{#1}% ! \fi ! }% \linkcolor \fi % *************** *** 5769,5792 **** }%end \catcode `\@=11 - % Set the baselineskip to #1, and the lineskip and strut size - % correspondingly. There is no deep meaning behind these magic numbers - % used as factors; they just match (closely enough) what Knuth defined. - % - \def\lineskipfactor{.08333} - \def\strutheightpercent{.70833} - \def\strutdepthpercent {.29167} - % - \def\setleading#1{% - \normalbaselineskip = #1\relax - \normallineskip = \lineskipfactor\normalbaselineskip - \normalbaselines - \setbox\strutbox =\hbox{% - \vrule width0pt height\strutheightpercent\baselineskip - depth \strutdepthpercent \baselineskip - }% - } - % @| inserts a changebar to the left of the current line. It should % surround any changed text. This approach does *not* work if the % change spans more than two lines of output. To handle that, we would --- 5813,5818 ---- *************** *** 5858,5865 **** % Arguments to @image: % #1 is (mandatory) image filename; we tack on .eps extension. % #2 is (optional) width, #3 is (optional) height. ! % #4 is just the usual extra ignored arg for parsing this stuff. ! \def\imagexxx#1,#2,#3,#4\finish{% \ifpdf \centerline{\dopdfimage{#1}{#2}{#3}}% \else --- 5884,5893 ---- % Arguments to @image: % #1 is (mandatory) image filename; we tack on .eps extension. % #2 is (optional) width, #3 is (optional) height. ! % #4 is (ignored optional) html alt text. ! % #5 is (ignored optional) extension. ! % #6 is just the usual extra ignored arg for parsing this stuff. ! \def\imagexxx#1,#2,#3,#4,#5,#6\finish{% \ifpdf \centerline{\dopdfimage{#1}{#2}{#3}}% \else *************** *** 5954,5961 **** } % Parameters in order: 1) textheight; 2) textwidth; 3) voffset; ! % 4) hoffset; 5) binding offset; 6) topskip. Then whoever calls us can ! % set \parskip and call \setleading for \baselineskip. % \def\internalpagesizes#1#2#3#4#5#6{% \voffset = #3\relax --- 5982,5990 ---- } % Parameters in order: 1) textheight; 2) textwidth; 3) voffset; ! % 4) hoffset; 5) binding offset; 6) topskip. We also call ! % \setleading{\textleading}, so the caller should define \textleading. ! % The caller should also set \parskip. % \def\internalpagesizes#1#2#3#4#5#6{% \voffset = #3\relax *************** *** 5976,5981 **** --- 6005,6012 ---- \normaloffset = #4\relax \bindingoffset = #5\relax % + \setleading{\textleading} + % \parindent = \defaultparindent \setemergencystretch } *************** *** 5992,5998 **** % @letterpaper (the default). \def\letterpaper{{\globaldefs = 1 \parskip = 3pt plus 2pt minus 1pt ! \setleading{13.2pt}% % % If page is nothing but text, make it come out even. \internalpagesizes{46\baselineskip}{6in}{\voffset}{.25in}{\bindingoffset}{36pt}% --- 6023,6029 ---- % @letterpaper (the default). \def\letterpaper{{\globaldefs = 1 \parskip = 3pt plus 2pt minus 1pt ! \textleading = 13.2pt % % If page is nothing but text, make it come out even. \internalpagesizes{46\baselineskip}{6in}{\voffset}{.25in}{\bindingoffset}{36pt}% *************** *** 6001,6007 **** % Use @smallbook to reset parameters for 7x9.5 (or so) format. \def\smallbook{{\globaldefs = 1 \parskip = 2pt plus 1pt ! \setleading{12pt}% % \internalpagesizes{7.5in}{5.in}{\voffset}{.25in}{\bindingoffset}{16pt}% % --- 6032,6038 ---- % Use @smallbook to reset parameters for 7x9.5 (or so) format. \def\smallbook{{\globaldefs = 1 \parskip = 2pt plus 1pt ! \textleading = 12pt % \internalpagesizes{7.5in}{5.in}{\voffset}{.25in}{\bindingoffset}{16pt}% % *************** *** 6016,6023 **** % Use @afourpaper to print on European A4 paper. \def\afourpaper{{\globaldefs = 1 - \setleading{12pt}% \parskip = 3pt plus 2pt minus 1pt % \internalpagesizes{53\baselineskip}{160mm}{\voffset}{4mm}{\bindingoffset}{44pt}% % --- 6047,6054 ---- % Use @afourpaper to print on European A4 paper. \def\afourpaper{{\globaldefs = 1 \parskip = 3pt plus 2pt minus 1pt + \textleading = 12pt % \internalpagesizes{53\baselineskip}{160mm}{\voffset}{4mm}{\bindingoffset}{44pt}% % *************** *** 6029,6036 **** % From romildo@urano.iceb.ufop.br, 2 July 2000. % He also recommends making @example and @lisp be small. \def\afivepaper{{\globaldefs = 1 - \setleading{12.5pt}% \parskip = 2pt plus 1pt minus 0.1pt % \internalpagesizes{166mm}{120mm}{\voffset}{-8mm}{\bindingoffset}{8pt}% % --- 6060,6067 ---- % From romildo@urano.iceb.ufop.br, 2 July 2000. % He also recommends making @example and @lisp be small. \def\afivepaper{{\globaldefs = 1 \parskip = 2pt plus 1pt minus 0.1pt + \textleading = 12.5pt % \internalpagesizes{166mm}{120mm}{\voffset}{-8mm}{\bindingoffset}{8pt}% % *************** *** 6048,6067 **** % A specific text layout, 24x15cm overall, intended for A4 paper. Top margin % 29mm, hence bottom margin 28mm, nominal side margin 3cm. \def\afourlatex{{\globaldefs = 1 ! \setleading{13.6pt}% % \afourpaper \internalpagesizes{237mm}{150mm}{3.6mm}{3.6mm}{3mm}{7mm}% - % - \globaldefs = 0 }} % Use @afourwide to print on European A4 paper in wide format. \def\afourwide{% \afourpaper \internalpagesizes{6.5in}{9.5in}{\hoffset}{\normaloffset}{\bindingoffset}{7mm}% - % - \globaldefs = 0 } % @pagesizes TEXTHEIGHT[,TEXTWIDTH] --- 6079,6094 ---- % A specific text layout, 24x15cm overall, intended for A4 paper. Top margin % 29mm, hence bottom margin 28mm, nominal side margin 3cm. \def\afourlatex{{\globaldefs = 1 ! \textleading = 13.6pt % \afourpaper \internalpagesizes{237mm}{150mm}{3.6mm}{3.6mm}{3mm}{7mm}% }} % Use @afourwide to print on European A4 paper in wide format. \def\afourwide{% \afourpaper \internalpagesizes{6.5in}{9.5in}{\hoffset}{\normaloffset}{\bindingoffset}{7mm}% } % @pagesizes TEXTHEIGHT[,TEXTWIDTH] *************** *** 6075,6081 **** \globaldefs = 1 % \parskip = 3pt plus 2pt minus 1pt ! \setleading{13.2pt}% % \internalpagesizes{#1}{\hsize}{\voffset}{\normaloffset}{\bindingoffset}{44pt}% }} --- 6102,6108 ---- \globaldefs = 1 % \parskip = 3pt plus 2pt minus 1pt ! \setleading{\textleading}% % \internalpagesizes{#1}{\hsize}{\voffset}{\normaloffset}{\bindingoffset}{44pt}% }} Index: automake/texinfos.am diff -c automake/texinfos.am:1.63.4.1 automake/texinfos.am:1.63.4.2 *** automake/texinfos.am:1.63.4.1 Tue May 8 12:06:06 2001 --- automake/texinfos.am Sun Jul 15 04:06:19 2001 *************** *** 1,5 **** ## automake - create Makefile.in from Makefile.am ! ## Copyright (C) 1994, 1995, 1996, 1997, 1998 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 --- 1,6 ---- ## automake - create Makefile.in from Makefile.am ! ## Copyright (C) 1994, 1995, 1996, 1997, 1998, 2001 ! ## 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 Index: automake/version.texi diff -c automake/version.texi:1.141.4.8 automake/version.texi:1.141.4.10 *** automake/version.texi:1.141.4.8 Sun Jun 10 03:32:50 2001 --- automake/version.texi Sun Jul 15 10:17:52 2001 *************** *** 1,3 **** @set UPDATED 6 January 1999 ! @set EDITION 1.4-p4 ! @set VERSION 1.4-p4 --- 1,3 ---- @set UPDATED 6 January 1999 ! @set EDITION 1.4-p5 ! @set VERSION 1.4-p5 Index: automake/m4/Makefile.in diff -c automake/m4/Makefile.in:1.85.4.3 automake/m4/Makefile.in:1.85.4.6 *** automake/m4/Makefile.in:1.85.4.3 Sat Jun 9 06:04:24 2001 --- automake/m4/Makefile.in Sun Jul 15 10:17:52 2001 *************** *** 1,6 **** ! # Makefile.in generated automatically by automake 1.4-p2 from Makefile.am ! # Copyright (C) 1994, 1995-8, 1999 Free Software Foundation, Inc. # This Makefile.in is free software; the Free Software Foundation # gives unlimited permission to copy and/or distribute it, # with or without modifications, as long as this notice is preserved. --- 1,6 ---- ! # Makefile.in generated automatically by automake 1.4-p5 from Makefile.am ! # Copyright (C) 1994, 1995-8, 1999, 2001 Free Software Foundation, Inc. # This Makefile.in is free software; the Free Software Foundation # gives unlimited permission to copy and/or distribute it, # with or without modifications, as long as this notice is preserved. *************** *** 83,89 **** all: all-redirect .SUFFIXES: $(srcdir)/Makefile.in: Makefile.am $(top_srcdir)/configure.in $(ACLOCAL_M4) ! cd $(top_srcdir) && $(AUTOMAKE) --gnits m4/Makefile Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status $(BUILT_SOURCES) cd $(top_builddir) \ --- 83,89 ---- all: all-redirect .SUFFIXES: $(srcdir)/Makefile.in: Makefile.am $(top_srcdir)/configure.in $(ACLOCAL_M4) ! cd $(top_srcdir) && $(AUTOMAKE) --gnu m4/Makefile Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status $(BUILT_SOURCES) cd $(top_builddir) \ *************** *** 121,127 **** top_distdir=`cd $(top_distdir) && pwd`; \ distdir=`cd $(distdir) && pwd`; \ cd $(top_srcdir) \ ! && $(AUTOMAKE) --include-deps --build-dir=$$here --srcdir-name=$(top_srcdir) --output-dir=$$top_distdir --gnits m4/Makefile @for file in $(DISTFILES); do \ d=$(srcdir); \ if test -d $$d/$$file; then \ --- 121,127 ---- top_distdir=`cd $(top_distdir) && pwd`; \ distdir=`cd $(distdir) && pwd`; \ cd $(top_srcdir) \ ! && $(AUTOMAKE) --include-deps --build-dir=$$here --srcdir-name=$(top_srcdir) --output-dir=$$top_distdir --gnu m4/Makefile @for file in $(DISTFILES); do \ d=$(srcdir); \ if test -d $$d/$$file; then \ Index: automake/m4/ccstdc.m4 diff -c automake/m4/ccstdc.m4:1.6 automake/m4/ccstdc.m4:1.6.4.1 *** automake/m4/ccstdc.m4:1.6 Wed Nov 26 13:41:40 1997 --- automake/m4/ccstdc.m4 Sat Jun 23 05:15:34 2001 *************** *** 20,26 **** # program @code{ansi2knr}, which comes with Ghostscript. # @end defmac ! AC_DEFUN(AM_PROG_CC_STDC, [AC_REQUIRE([AC_PROG_CC]) AC_BEFORE([$0], [AC_C_INLINE]) AC_BEFORE([$0], [AC_C_CONST]) --- 20,26 ---- # program @code{ansi2knr}, which comes with Ghostscript. # @end defmac ! AC_DEFUN([AM_PROG_CC_STDC], [AC_REQUIRE([AC_PROG_CC]) AC_BEFORE([$0], [AC_C_INLINE]) AC_BEFORE([$0], [AC_C_CONST]) Index: automake/m4/cond.m4 diff -c automake/m4/cond.m4:1.1 automake/m4/cond.m4:1.1.8.1 *** automake/m4/cond.m4:1.1 Sun Apr 27 22:59:43 1997 --- automake/m4/cond.m4 Sat Jun 23 05:15:34 2001 *************** *** 1,6 **** # Define a conditional. ! AC_DEFUN(AM_CONDITIONAL, [AC_SUBST($1_TRUE) AC_SUBST($1_FALSE) if $2; then --- 1,6 ---- # Define a conditional. ! AC_DEFUN([AM_CONDITIONAL], [AC_SUBST($1_TRUE) AC_SUBST($1_FALSE) if $2; then Index: automake/m4/dmalloc.m4 diff -c automake/m4/dmalloc.m4:1.2 automake/m4/dmalloc.m4:1.2.8.1 *** automake/m4/dmalloc.m4:1.2 Fri Oct 9 04:10:16 1998 --- automake/m4/dmalloc.m4 Sat Jun 23 05:15:34 2001 *************** *** 5,11 **** # serial 1 ! AC_DEFUN(AM_WITH_DMALLOC, [AC_MSG_CHECKING(if malloc debugging is wanted) AC_ARG_WITH(dmalloc, [ --with-dmalloc use dmalloc, as in --- 5,11 ---- # serial 1 ! AC_DEFUN([AM_WITH_DMALLOC], [AC_MSG_CHECKING(if malloc debugging is wanted) AC_ARG_WITH(dmalloc, [ --with-dmalloc use dmalloc, as in Index: automake/m4/error.m4 diff -c automake/m4/error.m4:1.1 automake/m4/error.m4:1.1.4.1 *** automake/m4/error.m4:1.1 Sat Oct 5 20:55:49 1996 --- automake/m4/error.m4 Sat Jun 23 05:15:34 2001 *************** *** 1,7 **** dnl From Jim Meyering. Use this if you use the GNU error.[ch]. dnl FIXME: Migrate into libit ! AC_DEFUN(AM_FUNC_ERROR_AT_LINE, [AC_CACHE_CHECK([for error_at_line], am_cv_lib_error_at_line, [AC_TRY_LINK([],[error_at_line(0, 0, "", 0, "");], am_cv_lib_error_at_line=yes, --- 1,7 ---- dnl From Jim Meyering. Use this if you use the GNU error.[ch]. dnl FIXME: Migrate into libit ! AC_DEFUN([AM_FUNC_ERROR_AT_LINE], [AC_CACHE_CHECK([for error_at_line], am_cv_lib_error_at_line, [AC_TRY_LINK([],[error_at_line(0, 0, "", 0, "");], am_cv_lib_error_at_line=yes, Index: automake/m4/header.m4 diff -c automake/m4/header.m4:1.5 automake/m4/header.m4:1.5.8.1 *** automake/m4/header.m4:1.5 Fri Apr 25 11:31:56 1997 --- automake/m4/header.m4 Sat Jun 23 05:15:34 2001 *************** *** 1,6 **** # Like AC_CONFIG_HEADER, but automatically create stamp file. ! AC_DEFUN(AM_CONFIG_HEADER, [AC_PREREQ([2.12]) AC_CONFIG_HEADER([$1]) dnl When config.status generates a header, we must update the stamp-h file. --- 1,6 ---- # Like AC_CONFIG_HEADER, but automatically create stamp file. ! AC_DEFUN([AM_CONFIG_HEADER], [AC_PREREQ([2.12]) AC_CONFIG_HEADER([$1]) dnl When config.status generates a header, we must update the stamp-h file. Index: automake/m4/init.m4 diff -c automake/m4/init.m4:1.9 automake/m4/init.m4:1.9.4.1 *** automake/m4/init.m4:1.9 Fri Oct 9 04:10:17 1998 --- automake/m4/init.m4 Sat Jun 23 05:15:34 2001 *************** *** 7,13 **** dnl Usage: dnl AM_INIT_AUTOMAKE(package,version, [no-define]) ! AC_DEFUN(AM_INIT_AUTOMAKE, [AC_REQUIRE([AC_PROG_INSTALL]) PACKAGE=[$1] AC_SUBST(PACKAGE) --- 7,13 ---- dnl Usage: dnl AM_INIT_AUTOMAKE(package,version, [no-define]) ! AC_DEFUN([AM_INIT_AUTOMAKE], [AC_REQUIRE([AC_PROG_INSTALL]) PACKAGE=[$1] AC_SUBST(PACKAGE) Index: automake/m4/lex.m4 diff -c automake/m4/lex.m4:1.2 automake/m4/lex.m4:1.2.8.1 *** automake/m4/lex.m4:1.2 Sun Apr 5 12:59:03 1998 --- automake/m4/lex.m4 Sat Jun 23 05:15:34 2001 *************** *** 3,9 **** dnl AM_PROG_LEX dnl Look for flex, lex or missing, then run AC_PROG_LEX and AC_DECL_YYTEXT ! AC_DEFUN(AM_PROG_LEX, [missing_dir=ifelse([$1],,`cd $ac_aux_dir && pwd`,$1) AC_CHECK_PROGS(LEX, flex lex, "$missing_dir/missing flex") AC_PROG_LEX --- 3,9 ---- dnl AM_PROG_LEX dnl Look for flex, lex or missing, then run AC_PROG_LEX and AC_DECL_YYTEXT ! AC_DEFUN([AM_PROG_LEX], [missing_dir=ifelse([$1],,`cd $ac_aux_dir && pwd`,$1) AC_CHECK_PROGS(LEX, flex lex, "$missing_dir/missing flex") AC_PROG_LEX Index: automake/m4/lispdir.m4 diff -c automake/m4/lispdir.m4:1.7 automake/m4/lispdir.m4:1.7.8.1 *** automake/m4/lispdir.m4:1.7 Sat Oct 24 08:20:31 1998 --- automake/m4/lispdir.m4 Sat Jun 23 05:15:35 2001 *************** *** 5,11 **** # serial 1 ! AC_DEFUN(AM_PATH_LISPDIR, [# If set to t, that means we are running in a shell under Emacs. # If you have an Emacs named "t", then use the full path. test "$EMACS" = t && EMACS= --- 5,11 ---- # serial 1 ! AC_DEFUN([AM_PATH_LISPDIR], [# If set to t, that means we are running in a shell under Emacs. # If you have an Emacs named "t", then use the full path. test "$EMACS" = t && EMACS= Index: automake/m4/maintainer.m4 diff -c automake/m4/maintainer.m4:1.3 automake/m4/maintainer.m4:1.3.8.1 *** automake/m4/maintainer.m4:1.3 Sat Oct 3 11:26:55 1998 --- automake/m4/maintainer.m4 Sat Jun 23 05:15:35 2001 *************** *** 3,9 **** # serial 1 ! AC_DEFUN(AM_MAINTAINER_MODE, [AC_MSG_CHECKING([whether to enable maintainer-specific portions of Makefiles]) dnl maintainer-mode is disabled by default AC_ARG_ENABLE(maintainer-mode, --- 3,9 ---- # serial 1 ! AC_DEFUN([AM_MAINTAINER_MODE], [AC_MSG_CHECKING([whether to enable maintainer-specific portions of Makefiles]) dnl maintainer-mode is disabled by default AC_ARG_ENABLE(maintainer-mode, Index: automake/m4/missing.m4 diff -c automake/m4/missing.m4:1.4 automake/m4/missing.m4:1.4.6.1 *** automake/m4/missing.m4:1.4 Fri Apr 25 22:07:53 1997 --- automake/m4/missing.m4 Sat Jun 23 05:15:35 2001 *************** *** 3,9 **** ## --------------------------------------------------------- ## dnl AM_MISSING_PROG(NAME, PROGRAM, DIRECTORY) dnl The program must properly implement --version. ! AC_DEFUN(AM_MISSING_PROG, [AC_MSG_CHECKING(for working $2) # Run test in a subshell; some versions of sh will print an error if # an executable is not found, even if stderr is redirected. --- 3,9 ---- ## --------------------------------------------------------- ## dnl AM_MISSING_PROG(NAME, PROGRAM, DIRECTORY) dnl The program must properly implement --version. ! AC_DEFUN([AM_MISSING_PROG], [AC_MSG_CHECKING(for working $2) # Run test in a subshell; some versions of sh will print an error if # an executable is not found, even if stderr is redirected. Index: automake/m4/mktime.m4 diff -c automake/m4/mktime.m4:1.6 automake/m4/mktime.m4:1.6.2.1 *** automake/m4/mktime.m4:1.6 Fri Oct 16 03:43:44 1998 --- automake/m4/mktime.m4 Sat Jun 23 05:15:35 2001 *************** *** 3,9 **** dnl From Jim Meyering. dnl FIXME: this should migrate into libit. ! AC_DEFUN(AM_FUNC_MKTIME, [AC_REQUIRE([AC_HEADER_TIME])dnl AC_CHECK_HEADERS(sys/time.h unistd.h) AC_CHECK_FUNCS(alarm) --- 3,9 ---- dnl From Jim Meyering. dnl FIXME: this should migrate into libit. ! AC_DEFUN([AM_FUNC_MKTIME], [AC_REQUIRE([AC_HEADER_TIME])dnl AC_CHECK_HEADERS(sys/time.h unistd.h) AC_CHECK_FUNCS(alarm) Index: automake/m4/multi.m4 diff -c automake/m4/multi.m4:1.1 automake/m4/multi.m4:1.1.8.1 *** automake/m4/multi.m4:1.1 Sun Oct 11 06:07:31 1998 --- automake/m4/multi.m4 Sat Jun 23 05:15:35 2001 *************** *** 1,7 **** dnl Add --enable-multilib to configure. dnl Usage: AM_ENABLE_MULTILIB([makefile, [rel-to-top-srcdir]]) ! AC_DEFUN(AM_ENABLE_MULTILIB, [ dnl Default to --enable-multilib AC_ARG_ENABLE(multilib, [ --enable-multilib build many library versions (default)], --- 1,7 ---- dnl Add --enable-multilib to configure. dnl Usage: AM_ENABLE_MULTILIB([makefile, [rel-to-top-srcdir]]) ! AC_DEFUN([AM_ENABLE_MULTILIB], [ dnl Default to --enable-multilib AC_ARG_ENABLE(multilib, [ --enable-multilib build many library versions (default)], Index: automake/m4/obstack.m4 diff -c automake/m4/obstack.m4:1.2 automake/m4/obstack.m4:1.2.4.1 *** automake/m4/obstack.m4:1.2 Fri Oct 9 04:10:19 1998 --- automake/m4/obstack.m4 Sat Jun 23 05:15:35 2001 *************** *** 1,7 **** dnl From Jim Meyering. dnl FIXME: migrate into libit. ! AC_DEFUN(AM_FUNC_OBSTACK, [AC_CACHE_CHECK([for obstacks], am_cv_func_obstack, [AC_TRY_LINK([#include "obstack.h"], [struct obstack *mem;obstack_free(mem,(char *) 0)], --- 1,7 ---- dnl From Jim Meyering. dnl FIXME: migrate into libit. ! AC_DEFUN([AM_FUNC_OBSTACK], [AC_CACHE_CHECK([for obstacks], am_cv_func_obstack, [AC_TRY_LINK([#include "obstack.h"], [struct obstack *mem;obstack_free(mem,(char *) 0)], Index: automake/m4/protos.m4 diff -c automake/m4/protos.m4:1.4 automake/m4/protos.m4:1.4.8.1 *** automake/m4/protos.m4:1.4 Fri Oct 9 04:10:20 1998 --- automake/m4/protos.m4 Sat Jun 23 05:15:35 2001 *************** *** 5,11 **** # serial 1 ! AC_DEFUN(AM_C_PROTOTYPES, [AC_REQUIRE([AM_PROG_CC_STDC]) AC_REQUIRE([AC_PROG_CPP]) AC_MSG_CHECKING([for function prototypes]) --- 5,11 ---- # serial 1 ! AC_DEFUN([AM_C_PROTOTYPES], [AC_REQUIRE([AM_PROG_CC_STDC]) AC_REQUIRE([AC_PROG_CPP]) AC_MSG_CHECKING([for function prototypes]) Index: automake/m4/ptrdiff.m4 diff -c automake/m4/ptrdiff.m4:1.2 automake/m4/ptrdiff.m4:1.2.8.1 *** automake/m4/ptrdiff.m4:1.2 Fri Oct 9 04:10:21 1998 --- automake/m4/ptrdiff.m4 Sat Jun 23 05:15:35 2001 *************** *** 2,8 **** # serial 1 ! AC_DEFUN(AM_TYPE_PTRDIFF_T, [AC_CACHE_CHECK([for ptrdiff_t], am_cv_type_ptrdiff_t, [AC_TRY_COMPILE([#include ], [ptrdiff_t p], am_cv_type_ptrdiff_t=yes, am_cv_type_ptrdiff_t=no)]) --- 2,8 ---- # serial 1 ! AC_DEFUN([AM_TYPE_PTRDIFF_T], [AC_CACHE_CHECK([for ptrdiff_t], am_cv_type_ptrdiff_t, [AC_TRY_COMPILE([#include ], [ptrdiff_t p], am_cv_type_ptrdiff_t=yes, am_cv_type_ptrdiff_t=no)]) Index: automake/m4/regex.m4 diff -c automake/m4/regex.m4:1.3 automake/m4/regex.m4:1.3.4.1 *** automake/m4/regex.m4:1.3 Fri Oct 9 04:10:22 1998 --- automake/m4/regex.m4 Sat Jun 23 05:15:35 2001 *************** *** 14,20 **** # If found, the package will use the system's rx which, on Linux at least, # will result in a smaller executable file. ! AC_DEFUN(AM_WITH_REGEX, [AC_MSG_CHECKING(which of GNU rx or gawk's regex is wanted) AC_ARG_WITH(regex, [ --without-regex use GNU rx in lieu of gawk's regex for matching], --- 14,20 ---- # If found, the package will use the system's rx which, on Linux at least, # will result in a smaller executable file. ! AC_DEFUN([AM_WITH_REGEX], [AC_MSG_CHECKING(which of GNU rx or gawk's regex is wanted) AC_ARG_WITH(regex, [ --without-regex use GNU rx in lieu of gawk's regex for matching], Index: automake/m4/sanity.m4 diff -c automake/m4/sanity.m4:1.8 automake/m4/sanity.m4:1.8.8.1 *** automake/m4/sanity.m4:1.8 Mon Oct 20 23:41:53 1997 --- automake/m4/sanity.m4 Sat Jun 23 05:15:35 2001 *************** *** 2,8 **** # Check to make sure that the build environment is sane. # ! AC_DEFUN(AM_SANITY_CHECK, [AC_MSG_CHECKING([whether build environment is sane]) # Just in case sleep 1 --- 2,8 ---- # Check to make sure that the build environment is sane. # ! AC_DEFUN([AM_SANITY_CHECK], [AC_MSG_CHECKING([whether build environment is sane]) # Just in case sleep 1 Index: automake/m4/strtod.m4 diff -c automake/m4/strtod.m4:1.2 automake/m4/strtod.m4:1.2.4.1 *** automake/m4/strtod.m4:1.2 Sun Oct 20 11:14:04 1996 --- automake/m4/strtod.m4 Sat Jun 23 05:15:35 2001 *************** *** 27,33 **** ## variable @code{LIBOBJS}. ## @end defmac ! AC_DEFUN(AM_FUNC_STRTOD, [AC_CACHE_CHECK(for working strtod, am_cv_func_strtod, [AC_TRY_RUN([ double strtod (); --- 27,33 ---- ## variable @code{LIBOBJS}. ## @end defmac ! AC_DEFUN([AM_FUNC_STRTOD], [AC_CACHE_CHECK(for working strtod, am_cv_func_strtod, [AC_TRY_RUN([ double strtod (); Index: automake/m4/termios.m4 diff -c automake/m4/termios.m4:1.1 automake/m4/termios.m4:1.1.8.1 *** automake/m4/termios.m4:1.1 Sat Oct 5 20:55:51 1996 --- automake/m4/termios.m4 Sat Jun 23 05:15:35 2001 *************** *** 2,8 **** # serial 1 ! AC_DEFUN(AM_SYS_POSIX_TERMIOS, [AC_CACHE_CHECK([POSIX termios], am_cv_sys_posix_termios, [AC_TRY_LINK([#include #include --- 2,8 ---- # serial 1 ! AC_DEFUN([AM_SYS_POSIX_TERMIOS], [AC_CACHE_CHECK([POSIX termios], am_cv_sys_posix_termios, [AC_TRY_LINK([#include #include Index: automake/m4/winsz.m4 diff -c automake/m4/winsz.m4:1.2 automake/m4/winsz.m4:1.2.8.1 *** automake/m4/winsz.m4:1.2 Fri Oct 9 04:10:23 1998 --- automake/m4/winsz.m4 Sat Jun 23 05:15:35 2001 *************** *** 2,8 **** # serial 1 ! AC_DEFUN(AM_HEADER_TIOCGWINSZ_NEEDS_SYS_IOCTL, [AC_REQUIRE([AM_SYS_POSIX_TERMIOS]) AC_CACHE_CHECK([whether use of TIOCGWINSZ requires sys/ioctl.h], am_cv_sys_tiocgwinsz_needs_sys_ioctl_h, --- 2,8 ---- # serial 1 ! AC_DEFUN([AM_HEADER_TIOCGWINSZ_NEEDS_SYS_IOCTL], [AC_REQUIRE([AM_SYS_POSIX_TERMIOS]) AC_CACHE_CHECK([whether use of TIOCGWINSZ requires sys/ioctl.h], am_cv_sys_tiocgwinsz_needs_sys_ioctl_h, Index: automake/tests/ChangeLog diff -c automake/tests/ChangeLog:1.200 automake/tests/ChangeLog:1.200.4.1 *** automake/tests/ChangeLog:1.200 Thu Jan 14 14:29:33 1999 --- automake/tests/ChangeLog Sat Jun 23 05:15:35 2001 *************** *** 847,850 **** * mdate.test, vtexi.test, acoutput.test: New files. * Started. - --- 847,849 ---- Index: automake/tests/Makefile.in diff -c automake/tests/Makefile.in:1.225.4.3 automake/tests/Makefile.in:1.225.4.6 *** automake/tests/Makefile.in:1.225.4.3 Sat Jun 9 06:04:24 2001 --- automake/tests/Makefile.in Sun Jul 15 10:17:52 2001 *************** *** 1,6 **** ! # Makefile.in generated automatically by automake 1.4-p2 from Makefile.am ! # Copyright (C) 1994, 1995-8, 1999 Free Software Foundation, Inc. # This Makefile.in is free software; the Free Software Foundation # gives unlimited permission to copy and/or distribute it, # with or without modifications, as long as this notice is preserved. --- 1,6 ---- ! # Makefile.in generated automatically by automake 1.4-p5 from Makefile.am ! # Copyright (C) 1994, 1995-8, 1999, 2001 Free Software Foundation, Inc. # This Makefile.in is free software; the Free Software Foundation # gives unlimited permission to copy and/or distribute it, # with or without modifications, as long as this notice is preserved. *************** *** 78,84 **** all: all-redirect .SUFFIXES: $(srcdir)/Makefile.in: Makefile.am $(top_srcdir)/configure.in $(ACLOCAL_M4) ! cd $(top_srcdir) && $(AUTOMAKE) --gnits tests/Makefile Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status $(BUILT_SOURCES) cd $(top_builddir) \ --- 78,84 ---- all: all-redirect .SUFFIXES: $(srcdir)/Makefile.in: Makefile.am $(top_srcdir)/configure.in $(ACLOCAL_M4) ! cd $(top_srcdir) && $(AUTOMAKE) --gnu tests/Makefile Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status $(BUILT_SOURCES) cd $(top_builddir) \ *************** *** 97,103 **** top_distdir=`cd $(top_distdir) && pwd`; \ distdir=`cd $(distdir) && pwd`; \ cd $(top_srcdir) \ ! && $(AUTOMAKE) --include-deps --build-dir=$$here --srcdir-name=$(top_srcdir) --output-dir=$$top_distdir --gnits tests/Makefile @for file in $(DISTFILES); do \ d=$(srcdir); \ if test -d $$d/$$file; then \ --- 97,103 ---- top_distdir=`cd $(top_distdir) && pwd`; \ distdir=`cd $(distdir) && pwd`; \ cd $(top_srcdir) \ ! && $(AUTOMAKE) --include-deps --build-dir=$$here --srcdir-name=$(top_srcdir) --output-dir=$$top_distdir --gnu tests/Makefile @for file in $(DISTFILES); do \ d=$(srcdir); \ if test -d $$d/$$file; then \ Index: automake/tests/depacl.test diff -c automake/tests/depacl.test:1.1 automake/tests/depacl.test:1.1.8.1 *** automake/tests/depacl.test:1.1 Sun Jul 28 10:54:08 1996 --- automake/tests/depacl.test Sat Jun 23 05:15:35 2001 *************** *** 10,13 **** $ACLOCAL || exit 1 ! grep '^AC_DEFUN.AM_PROG_CC_STDC,$' aclocal.m4 --- 10,13 ---- $ACLOCAL || exit 1 ! grep '^AC_DEFUN.*AM_PROG_CC_STDC' aclocal.m4