diff -r -c3 1.11/share/aclocal-1.11/init.m4 1.11-modified/share/aclocal-1.11/init.m4
*** 1.11/share/aclocal-1.11/init.m4	2009-05-19 00:35:06.000000000 +0200
--- 1.11-modified/share/aclocal-1.11/init.m4	2009-05-31 12:04:17.000000000 +0200
***************
*** 9,14 ****
--- 9,30 ----
  
  # serial 16
  
+ # AM_INIT_VERSION(VERSION, [SET-VERSION])
+ # VERSION and SET-VERSION are shell statements, for use in Makefile.
+ # I.e. $(var) and ${var} refer to Makefile variables, whereas $$var
+ # refers to a shell variable.
+ AC_DEFUN([AM_INIT_VERSION],
+ [
+   m4_if([$2], ,
+     [AC_SUBST([VERSION], [$1])
+      AC_SUBST([SET_VERSION], [])
+      AC_SUBST([SET_VERSION_ESCAPED], [])],
+     [AC_SUBST([VERSION], ['$1'])
+      AC_SUBST([SET_VERSION], ['$2;'])
+      AC_SUBST([SET_VERSION_ESCAPED], ['AS_ESCAPE([$2]);'])])
+   m4_define([AM_INIT_VERSION_invoked])
+ ])
+ 
  # This macro actually does too much.  Some checks are only needed if
  # your package does certain things.  But this isn't really a big deal.
  
***************
*** 53,71 ****
  # Define the identity of the package.
  dnl Distinguish between old-style and new-style calls.
  m4_ifval([$2],
! [m4_ifval([$3], [_AM_SET_OPTION([no-define])])dnl
   AC_SUBST([PACKAGE], [$1])dnl
!  AC_SUBST([VERSION], [$2])],
! [_AM_SET_OPTIONS([$1])dnl
! dnl Diagnose old-style AC_INIT with new-style AM_AUTOMAKE_INIT.
! m4_if(m4_ifdef([AC_PACKAGE_NAME], 1)m4_ifdef([AC_PACKAGE_VERSION], 1), 11,,
!   [m4_fatal([AC_INIT should be called with package and version arguments])])dnl
   AC_SUBST([PACKAGE], ['AC_PACKAGE_TARNAME'])dnl
!  AC_SUBST([VERSION], ['AC_PACKAGE_VERSION'])])dnl
! 
  _AM_IF_OPTION([no-define],,
! [AC_DEFINE_UNQUOTED(PACKAGE, "$PACKAGE", [Name of package])
!  AC_DEFINE_UNQUOTED(VERSION, "$VERSION", [Version number of package])])dnl
  
  # Some tools Automake needs.
  AC_REQUIRE([AM_SANITY_CHECK])dnl
--- 69,95 ----
  # Define the identity of the package.
  dnl Distinguish between old-style and new-style calls.
  m4_ifval([$2],
! [
!  m4_ifval([$3], [_AM_SET_OPTION([no-define])])dnl
   AC_SUBST([PACKAGE], [$1])dnl
!  AC_SUBST([VERSION], [$2])
! ],
! [
!  _AM_SET_OPTIONS([$1])dnl
!  dnl Diagnose old-style AC_INIT with new-style AM_AUTOMAKE_INIT.
!  m4_if(m4_ifdef([AC_PACKAGE_TARNAME], 1), 1,,
!    [m4_fatal([AC_INIT should be called with package argument])])dnl
   AC_SUBST([PACKAGE], ['AC_PACKAGE_TARNAME'])dnl
!  m4_ifdef([AM_INIT_VERSION_invoked], , [
!   AC_SUBST([VERSION], ['m4_ifdef([AC_PACKAGE_VERSION], [AC_PACKAGE_VERSION])'])
!   _AM_IF_OPTION([no-define],,
!     [AC_DEFINE_UNQUOTED(VERSION, "$VERSION", [Version number of package])])dnl
!  ])
! ])
  _AM_IF_OPTION([no-define],,
! [
!  AC_DEFINE_UNQUOTED(PACKAGE, "$PACKAGE", [Name of package])
! ])
  
  # Some tools Automake needs.
  AC_REQUIRE([AM_SANITY_CHECK])dnl
diff -r -c3 1.11/share/automake-1.11/am/distdir.am 1.11-modified/share/automake-1.11/am/distdir.am
*** 1.11/share/automake-1.11/am/distdir.am	2009-05-19 00:35:05.000000000 +0200
--- 1.11-modified/share/automake-1.11/am/distdir.am	2009-05-31 11:20:24.000000000 +0200
***************
*** 337,382 ****
  ?GZIP?DIST_ARCHIVES += $(distdir).tar.gz
  GZIP_ENV = --best
  .PHONY: dist-gzip
! dist-gzip: distdir
! 	tardir=$(distdir) && $(am__tar) | GZIP=$(GZIP_ENV) gzip -c >$(distdir).tar.gz
! 	$(am__remove_distdir)
  
  ?BZIP2?DIST_ARCHIVES += $(distdir).tar.bz2
  .PHONY: dist-bzip2
! dist-bzip2: distdir
! 	tardir=$(distdir) && $(am__tar) | bzip2 -9 -c >$(distdir).tar.bz2
! 	$(am__remove_distdir)
  
  ?LZMA?DIST_ARCHIVES += $(distdir).tar.lzma
  .PHONY: dist-lzma
! dist-lzma: distdir
! 	tardir=$(distdir) && $(am__tar) | lzma -9 -c >$(distdir).tar.lzma
! 	$(am__remove_distdir)
  
  ?XZ?DIST_ARCHIVES += $(distdir).tar.xz
  .PHONY: dist-xz
! dist-xz: distdir
! 	tardir=$(distdir) && $(am__tar) | xz -c >$(distdir).tar.xz
! 	$(am__remove_distdir)
  
  ?COMPRESS?DIST_ARCHIVES += $(distdir).tar.Z
  .PHONY: dist-tarZ
! dist-tarZ: distdir
! 	tardir=$(distdir) && $(am__tar) | compress -c >$(distdir).tar.Z
! 	$(am__remove_distdir)
  
  ?SHAR?DIST_ARCHIVES += $(distdir).shar.gz
  .PHONY: dist-shar
! dist-shar: distdir
! 	shar $(distdir) | GZIP=$(GZIP_ENV) gzip -c >$(distdir).shar.gz
! 	$(am__remove_distdir)
  
  ?ZIP?DIST_ARCHIVES += $(distdir).zip
  .PHONY: dist-zip
! dist-zip: distdir
! 	-rm -f $(distdir).zip
! 	zip -rq $(distdir).zip $(distdir)
! 	$(am__remove_distdir)
  
  endif %?TOPDIR_P%
  
--- 337,395 ----
  ?GZIP?DIST_ARCHIVES += $(distdir).tar.gz
  GZIP_ENV = --best
  .PHONY: dist-gzip
! dist-gzip:
! 	$(SET_VERSION)distdir=$(PACKAGE)-$(VERSION); \
! 	$(MAKE) $(AM_MAKEFLAGS) distdir="$$distdir" distdir \
! 	&& { tardir="$$distdir" && $(am__tar) | GZIP=$(GZIP_ENV) gzip -c >"$$distdir.tar.gz"; } \
! 	&& $(am__remove_distdir)
  
  ?BZIP2?DIST_ARCHIVES += $(distdir).tar.bz2
  .PHONY: dist-bzip2
! dist-bzip2:
! 	$(SET_VERSION)distdir=$(PACKAGE)-$(VERSION); \
! 	$(MAKE) $(AM_MAKEFLAGS) distdir="$$distdir" distdir \
! 	&& { tardir="$$distdir" && $(am__tar) | bzip2 -9 -c >"$$distdir.tar.bz2"; } \
! 	&& $(am__remove_distdir)
  
  ?LZMA?DIST_ARCHIVES += $(distdir).tar.lzma
  .PHONY: dist-lzma
! dist-lzma:
! 	$(SET_VERSION)distdir=$(PACKAGE)-$(VERSION); \
! 	$(MAKE) $(AM_MAKEFLAGS) distdir="$$distdir" distdir \
! 	&& { tardir="$$distdir" && $(am__tar) | lzma -9 -c >"$$distdir.tar.lzma"; } \
! 	&& $(am__remove_distdir)
  
  ?XZ?DIST_ARCHIVES += $(distdir).tar.xz
  .PHONY: dist-xz
! dist-xz:
! 	$(SET_VERSION)distdir=$(PACKAGE)-$(VERSION); \
! 	$(MAKE) $(AM_MAKEFLAGS) distdir="$$distdir" distdir \
! 	&& { tardir="$$distdir" && $(am__tar) | xz -c >"$$distdir.tar.xz"; } \
! 	&& $(am__remove_distdir)
  
  ?COMPRESS?DIST_ARCHIVES += $(distdir).tar.Z
  .PHONY: dist-tarZ
! dist-tarZ:
! 	$(SET_VERSION)distdir=$(PACKAGE)-$(VERSION); \
! 	$(MAKE) $(AM_MAKEFLAGS) distdir="$$distdir" distdir \
! 	&& { tardir="$$distdir" && $(am__tar) | compress -c >"$$distdir.tar.Z"; } \
! 	&& $(am__remove_distdir)
  
  ?SHAR?DIST_ARCHIVES += $(distdir).shar.gz
  .PHONY: dist-shar
! dist-shar:
! 	$(SET_VERSION)distdir=$(PACKAGE)-$(VERSION); \
! 	$(MAKE) $(AM_MAKEFLAGS) distdir="$$distdir" distdir \
! 	&& { shar "$$distdir" | GZIP=$(GZIP_ENV) gzip -c >"$$distdir.shar.gz"; } \
! 	&& $(am__remove_distdir)
  
  ?ZIP?DIST_ARCHIVES += $(distdir).zip
  .PHONY: dist-zip
! dist-zip:
! 	$(SET_VERSION)distdir=$(PACKAGE)-$(VERSION); \
! 	$(MAKE) $(AM_MAKEFLAGS) distdir="$$distdir" distdir \
! 	&& { rm -f "$$distdir.zip"; zip -rq "$$distdir.zip" "$$distdir"; } \
! 	&& $(am__remove_distdir)
  
  endif %?TOPDIR_P%
  
***************
*** 396,411 ****
  AM_RECURSIVE_TARGETS += dist dist-all
  endif %?SUBDIRS%
  
! dist dist-all: distdir
! ?GZIP?	tardir=$(distdir) && $(am__tar) | GZIP=$(GZIP_ENV) gzip -c >$(distdir).tar.gz
! ?BZIP2?	tardir=$(distdir) && $(am__tar) | bzip2 -9 -c >$(distdir).tar.bz2
! ?LZMA?	tardir=$(distdir) && $(am__tar) | lzma -9 -c >$(distdir).tar.lzma
! ?XZ?	tardir=$(distdir) && $(am__tar) | xz -c >$(distdir).tar.xz
! ?COMPRESS?	tardir=$(distdir) && $(am__tar) | compress -c >$(distdir).tar.Z
! ?SHAR?	shar $(distdir) | GZIP=$(GZIP_ENV) gzip -c >$(distdir).shar.gz
! ?ZIP?	-rm -f $(distdir).zip
! ?ZIP?	zip -rq $(distdir).zip $(distdir)
! 	$(am__remove_distdir)
  
  endif %?TOPDIR_P%
  
--- 409,425 ----
  AM_RECURSIVE_TARGETS += dist dist-all
  endif %?SUBDIRS%
  
! dist dist-all:
! 	$(SET_VERSION)distdir=$(PACKAGE)-$(VERSION); \
! 	$(MAKE) $(AM_MAKEFLAGS) distdir="$$distdir" distdir \
! ?GZIP?	&& { tardir="$$distdir" && $(am__tar) | GZIP=$(GZIP_ENV) gzip -c >$(distdir).tar.gz; } \
! ?BZIP2?	&& { tardir="$$distdir" && $(am__tar) | bzip2 -9 -c >$(distdir).tar.bz2; } \
! ?LZMA?	&& { tardir="$$distdir" && $(am__tar) | lzma -9 -c >$(distdir).tar.lzma; } \
! ?XZ?	&& { tardir="$$distdir" && $(am__tar) | xz -c >$(distdir).tar.xz; } \
! ?COMPRESS?	&& { tardir="$$distdir" && $(am__tar) | compress -c >$(distdir).tar.Z; } \
! ?SHAR?	&& { shar "$$distdir" | GZIP=$(GZIP_ENV) gzip -c >$(distdir).shar.gz; } \
! ?ZIP?	&& { rm -f $(distdir).zip; zip -rq $(distdir).zip $(distdir); } \
! 	&& $(am__remove_distdir)
  
  endif %?TOPDIR_P%