Update to 1.9.1:

Bugs fixed in 1.9.1:

This release fixes three longstanding bugs.

* Adjust #line directives in `parser.h' (when ylwrap is not used).
  (PR/432)

* Fix definition of YLWRAP when ylwrap is installed in a default
  aux directory found in a parent package.

* Properly recognize AC_CANONICAL_BUILD and AC_CANONICAL_TARGET.

New in 1.9:

* Makefile.in bloat reduction:

  - Inference rules are used to compile sources in subdirectories when
    the `subdir-objects' option is used and no per-target flags are
    used.  This should reduce the size of some projects a lot, because
    Automake used to output an explicit rule for each such object in
    the past.

  - Automake no longer outputs three rules (.o, .obj, .lo) for each
    object that must be built with explicit rules.  It just outputs
    the rules required to build the kind of object considered: either
    the two .o and .obj rules for usual objects, or the .lo rule for
    libtool objects.

* Change to Libtool support:

  - Libtool tags are used with libtool versions that support them.
    (I.e., with Libtool 1.5 or greater.)

  - Automake is now able to handle setups where a libtool library is
    conditionally installed in different directories, as in

      if COND
        lib_LTLIBRARIES = liba.la
      else
        pkglib_LTLIBRARIES = liba.la
      endif
      liba_la_SOURCES = ...

* Changes to aclocal:

  - aclocal now ensures that AC_DEFUNs and AU_DEFUNs it discovers are
    really evaluated, before it decides to include them in aclocal.m4.
    This solves nasty problems with conditional redefinitions of
    Autoconf macros in /usr/share/aclocal/*.m4 files causing extraneous
    *.m4 files to be included in any project using these macros.
    (Calls to AC_PROG_EGREP causing libtool.m4 to be included is the
    most famous instance of this bug.)

  - Do not complain about missing conditionally AC_REQUIREd macros
    that are not actually used.  In 1.8.x aclocal would correctly
    determine which of these macros were really needed (and include
    only these in the package); unfortunately it would also require
    all of them to be present in order to run.  This created
    situations were aclocal would not work on a tarball distributing
    all the macros it uses.  For instance running aclocal on a project
    containing only the subset of the Gettext macros in use by the
    project did not work, because gettext conditionally requires other
    macros.

* Portability improvements:

  - Tar format can be chosen with the new options tar-v7, tar-ustar, and
    tar-pax.  The new option filename-length-max=99 helps diagnosing
    filenames that are too long for tar-v7.  (PR/414)

  - Variables aumented with `+=' are now automatically flattened (i.e.,
    trailing backslashes removed) and then wrapped around 80 colummns
    (adding trailing backslashes).  In previous versions, a long series
    of
      VAR += value1
      VAR += value2
      VAR += value3
      ...
    would result in a single-line definition of VAR that could possibly
    exceed the maximum line length of some make implementations.

    Non-augmented variables are still output as they are defined in
    the Makefile.am.

* Miscellaneous:

  - Support Fortran 90/95 with the new "fc" and "ppfc" languages.
    Works the same as the old Fortran 77 implementation; just replace
    F77 with FC everywhere (exception: FFLAGS becomes FCFLAGS).
    Requires a version of autoconf which provides AC_PROG_FC (>=2.59).

  - Support for conditional _LISP.

  - Support for conditional -hook and -local rules (PR/428).

  - Diagnose AC_CONFIG_AUX_DIR calls following AM_INIT_AUTOMAKE. (PR/49)

  - Automake will not write any Makefile.ins after the first error it
    encounters.  The previous Makefile.ins (if any) will be left in
    place.  (Warnings will not prevent output, but remember they can
    be turned into errors with -Werror.)

  - The restriction that SUBDIRS must contain direct children is gone.
    Do not abuse.

  - The manual tells more about SUBDIRS vs. DIST_SUBDIRS.
    It also gives an example of nested packages using AC_CONFIG_SUBDIRS.

3 files changed, 9 insertions, 7 deletions

diff --git a/devel/automake/Makefile b/devel/automake/Makefile
index 9b5db2f09c3..c79f265c725 100644
--- a/devel/automake/Makefile
+++ b/devel/automake/Makefile
@@ -1,7 +1,7 @@
-# $NetBSD: Makefile,v 1.54 2004/07/27 16:42:41 wiz Exp $
+# $NetBSD: Makefile,v 1.55 2004/08/13 13:27:06 wiz Exp $
 #
 
-DISTNAME=	automake-1.8.5
+DISTNAME=	automake-1.9.1
 CATEGORIES=	devel
 MASTER_SITES=	${MASTER_SITE_GNU:=automake/} \
 		ftp://sources.redhat.com/pub/automake/
@@ -15,7 +15,7 @@ DEPENDS=	autoconf>=2.58:../../devel/autoconf
 
 #PKG_INSTALLATION_TYPES=	overwrite pkgviews
 
-PLIST_SUBST+=		PKG_DIR_VERSION=1.8
+PLIST_SUBST+=		PKG_DIR_VERSION=1.9
 USE_BUILDLINK3=		YES
 GNU_CONFIGURE=		YES
 CONFIGURE_ENV=		PERL=${PERL5}
diff --git a/devel/automake/PLIST b/devel/automake/PLIST
index 5eb84b55ddf..94cab583639 100644
--- a/devel/automake/PLIST
+++ b/devel/automake/PLIST
@@ -1,4 +1,4 @@
-@comment $NetBSD: PLIST,v 1.9 2004/02/13 08:26:03 seb Exp $
+@comment $NetBSD: PLIST,v 1.10 2004/08/13 13:27:06 wiz Exp $
 bin/aclocal
 bin/aclocal-${PKG_DIR_VERSION}
 bin/automake
@@ -34,6 +34,7 @@ share/aclocal-${PKG_DIR_VERSION}/regex.m4
 share/aclocal-${PKG_DIR_VERSION}/runlog.m4
 share/aclocal-${PKG_DIR_VERSION}/sanity.m4
 share/aclocal-${PKG_DIR_VERSION}/strip.m4
+share/aclocal-${PKG_DIR_VERSION}/tar.m4
 share/automake-${PKG_DIR_VERSION}/Automake/ChannelDefs.pm
 share/automake-${PKG_DIR_VERSION}/Automake/Channels.pm
 share/automake-${PKG_DIR_VERSION}/Automake/Condition.pm
@@ -71,6 +72,7 @@ share/automake-${PKG_DIR_VERSION}/am/distdir.am
 share/automake-${PKG_DIR_VERSION}/am/footer.am
 share/automake-${PKG_DIR_VERSION}/am/header-vars.am
 share/automake-${PKG_DIR_VERSION}/am/header.am
+share/automake-${PKG_DIR_VERSION}/am/inst-vars.am
 share/automake-${PKG_DIR_VERSION}/am/install.am
 share/automake-${PKG_DIR_VERSION}/am/java.am
 share/automake-${PKG_DIR_VERSION}/am/lang-compile.am
diff --git a/devel/automake/distinfo b/devel/automake/distinfo
index c89d1ba15f1..f4532842a8d 100644
--- a/devel/automake/distinfo
+++ b/devel/automake/distinfo
@@ -1,4 +1,4 @@
-$NetBSD: distinfo,v 1.19 2004/07/27 16:42:41 wiz Exp $
+$NetBSD: distinfo,v 1.20 2004/08/13 13:27:06 wiz Exp $
 
-SHA1 (automake-1.8.5.tar.bz2) = b639ff48033e9ac7347a6f938b015107754fdf3a
-Size (automake-1.8.5.tar.bz2) = 663182 bytes
+SHA1 (automake-1.9.1.tar.bz2) = faf275ff5b01c8a24f4b53a91f3c8e26669466da
+Size (automake-1.9.1.tar.bz2) = 697785 bytes