1.1 --- a/Makefile.in	Wed Apr 16 10:12:12 2008 +0000
     1.2 +++ b/Makefile.in	Wed Apr 16 12:43:52 2008 +0000
     1.3 @@ -1,8 +1,8 @@
     1.4 -# Makefile.in generated by automake 1.7.9 from Makefile.am.
     1.5 +# Makefile.in generated by automake 1.9.6 from Makefile.am.
     1.6  # @configure_input@
     1.7  
     1.8 -# Copyright 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, 2003
     1.9 -# Free Software Foundation, Inc.
    1.10 +# Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
    1.11 +# 2003, 2004, 2005  Free Software Foundation, Inc.
    1.12  # This Makefile.in is free software; the Free Software Foundation
    1.13  # gives unlimited permission to copy and/or distribute it,
    1.14  # with or without modifications, as long as this notice is preserved.
    1.15 @@ -13,7 +13,6 @@
    1.16  # PARTICULAR PURPOSE.
    1.17  
    1.18  @SET_MAKE@
    1.19 -
    1.20  srcdir = @srcdir@
    1.21  top_srcdir = @top_srcdir@
    1.22  VPATH = @srcdir@
    1.23 @@ -21,7 +20,6 @@
    1.24  pkglibdir = $(libdir)/@PACKAGE@
    1.25  pkgincludedir = $(includedir)/@PACKAGE@
    1.26  top_builddir = .
    1.27 -
    1.28  am__cd = CDPATH="$${ZSH_VERSION+.}$(PATH_SEPARATOR)" && cd
    1.29  INSTALL = @INSTALL@
    1.30  install_sh_DATA = $(install_sh) -c -m 644
    1.31 @@ -35,7 +33,45 @@
    1.32  NORMAL_UNINSTALL = :
    1.33  PRE_UNINSTALL = :
    1.34  POST_UNINSTALL = :
    1.35 +build_triplet = @build@
    1.36  host_triplet = @host@
    1.37 +DIST_COMMON = README $(am__configure_deps) $(srcdir)/Makefile.am \
    1.38 +	$(srcdir)/Makefile.in $(srcdir)/config.h.in \
    1.39 +	$(top_srcdir)/configure $(top_srcdir)/test/Makefile.in AUTHORS \
    1.40 +	COPYING ChangeLog INSTALL NEWS acconfig.h config.guess \
    1.41 +	config.sub depcomp install-sh missing mkinstalldirs
    1.42 +subdir = .
    1.43 +ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
    1.44 +am__aclocal_m4_deps = $(top_srcdir)/configure.in
    1.45 +am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \
    1.46 +	$(ACLOCAL_M4)
    1.47 +am__CONFIG_DISTCLEAN_FILES = config.status config.cache config.log \
    1.48 + configure.lineno configure.status.lineno
    1.49 +mkinstalldirs = $(SHELL) $(top_srcdir)/mkinstalldirs
    1.50 +CONFIG_HEADER = config.h
    1.51 +CONFIG_CLEAN_FILES = test/Makefile
    1.52 +SOURCES =
    1.53 +DIST_SOURCES =
    1.54 +RECURSIVE_TARGETS = all-recursive check-recursive dvi-recursive \
    1.55 +	html-recursive info-recursive install-data-recursive \
    1.56 +	install-exec-recursive install-info-recursive \
    1.57 +	install-recursive installcheck-recursive installdirs-recursive \
    1.58 +	pdf-recursive ps-recursive uninstall-info-recursive \
    1.59 +	uninstall-recursive
    1.60 +ETAGS = etags
    1.61 +CTAGS = ctags
    1.62 +DIST_SUBDIRS = src po test
    1.63 +DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST)
    1.64 +distdir = $(PACKAGE)-$(VERSION)
    1.65 +top_distdir = $(distdir)
    1.66 +am__remove_distdir = \
    1.67 +  { test ! -d $(distdir) \
    1.68 +    || { find $(distdir) -type d ! -perm -200 -exec chmod u+w {} ';' \
    1.69 +         && rm -fr $(distdir); }; }
    1.70 +DIST_ARCHIVES = $(distdir).tar.gz
    1.71 +GZIP_ENV = --best
    1.72 +distuninstallcheck_listfiles = find . -type f -print
    1.73 +distcleancheck_listfiles = find . -type f -print
    1.74  ACLOCAL = @ACLOCAL@
    1.75  ALSA_CFLAGS = @ALSA_CFLAGS@
    1.76  ALSA_LIBS = @ALSA_LIBS@
    1.77 @@ -117,8 +153,6 @@
    1.78  MSGFMT = @MSGFMT@
    1.79  MSGFMT_OPTS = @MSGFMT_OPTS@
    1.80  OBJEXT = @OBJEXT@
    1.81 -OSMESA_DRIVER_FALSE = @OSMESA_DRIVER_FALSE@
    1.82 -OSMESA_DRIVER_TRUE = @OSMESA_DRIVER_TRUE@
    1.83  PACKAGE = @PACKAGE@
    1.84  PACKAGE_BUGREPORT = @PACKAGE_BUGREPORT@
    1.85  PACKAGE_NAME = @PACKAGE_NAME@
    1.86 @@ -141,6 +175,12 @@
    1.87  STRIP = @STRIP@
    1.88  USE_NLS = @USE_NLS@
    1.89  VERSION = @VERSION@
    1.90 +VIDEO_GLX_FALSE = @VIDEO_GLX_FALSE@
    1.91 +VIDEO_GLX_TRUE = @VIDEO_GLX_TRUE@
    1.92 +VIDEO_NSGL_FALSE = @VIDEO_NSGL_FALSE@
    1.93 +VIDEO_NSGL_TRUE = @VIDEO_NSGL_TRUE@
    1.94 +VIDEO_OSMESA_FALSE = @VIDEO_OSMESA_FALSE@
    1.95 +VIDEO_OSMESA_TRUE = @VIDEO_OSMESA_TRUE@
    1.96  XGETTEXT = @XGETTEXT@
    1.97  ac_ct_CC = @ac_ct_CC@
    1.98  am__fastdepCC_FALSE = @am__fastdepCC_FALSE@
    1.99 @@ -148,6 +188,8 @@
   1.100  am__include = @am__include@
   1.101  am__leading_dot = @am__leading_dot@
   1.102  am__quote = @am__quote@
   1.103 +am__tar = @am__tar@
   1.104 +am__untar = @am__untar@
   1.105  bindir = @bindir@
   1.106  build = @build@
   1.107  build_alias = @build_alias@
   1.108 @@ -173,6 +215,7 @@
   1.109  localedir = @localedir@
   1.110  localstatedir = @localstatedir@
   1.111  mandir = @mandir@
   1.112 +mkdir_p = @mkdir_p@
   1.113  oldincludedir = @oldincludedir@
   1.114  pdfdir = @pdfdir@
   1.115  prefix = @prefix@
   1.116 @@ -182,47 +225,45 @@
   1.117  sharedstatedir = @sharedstatedir@
   1.118  sysconfdir = @sysconfdir@
   1.119  target_alias = @target_alias@
   1.120 -
   1.121  @BUILD_SYSTEST_TRUE@TEST_SUBDIR = test
   1.122  SUBDIRS = src po $(TEST_SUBDIR)
   1.123 -
   1.124  EXTRA_DIST = autogen.sh
   1.125 -subdir = .
   1.126 -ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
   1.127 -mkinstalldirs = $(SHELL) $(top_srcdir)/mkinstalldirs
   1.128 -CONFIG_HEADER = config.h
   1.129 -CONFIG_CLEAN_FILES = test/Makefile
   1.130 -DIST_SOURCES =
   1.131 -
   1.132 -RECURSIVE_TARGETS = info-recursive dvi-recursive pdf-recursive \
   1.133 -	ps-recursive install-info-recursive uninstall-info-recursive \
   1.134 -	all-recursive install-data-recursive install-exec-recursive \
   1.135 -	installdirs-recursive install-recursive uninstall-recursive \
   1.136 -	check-recursive installcheck-recursive
   1.137 -DIST_COMMON = README $(srcdir)/Makefile.in $(srcdir)/configure AUTHORS \
   1.138 -	COPYING ChangeLog INSTALL Makefile.am NEWS acconfig.h \
   1.139 -	aclocal.m4 config.guess config.h.in config.sub configure \
   1.140 -	configure.in depcomp install-sh missing mkinstalldirs
   1.141 -DIST_SUBDIRS = src po test
   1.142  all: config.h
   1.143  	$(MAKE) $(AM_MAKEFLAGS) all-recursive
   1.144  
   1.145  .SUFFIXES:
   1.146 -
   1.147 -am__CONFIG_DISTCLEAN_FILES = config.status config.cache config.log \
   1.148 - configure.lineno
   1.149 -$(srcdir)/Makefile.in: @MAINTAINER_MODE_TRUE@ Makefile.am  $(top_srcdir)/configure.in $(ACLOCAL_M4)
   1.150 +am--refresh:
   1.151 +	@:
   1.152 +$(srcdir)/Makefile.in: @MAINTAINER_MODE_TRUE@ $(srcdir)/Makefile.am  $(am__configure_deps)
   1.153 +	@for dep in $?; do \
   1.154 +	  case '$(am__configure_deps)' in \
   1.155 +	    *$$dep*) \
   1.156 +	      echo ' cd $(srcdir) && $(AUTOMAKE) --gnu '; \
   1.157 +	      cd $(srcdir) && $(AUTOMAKE) --gnu  \
   1.158 +		&& exit 0; \
   1.159 +	      exit 1;; \
   1.160 +	  esac; \
   1.161 +	done; \
   1.162 +	echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu  Makefile'; \
   1.163  	cd $(top_srcdir) && \
   1.164  	  $(AUTOMAKE) --gnu  Makefile
   1.165 -Makefile: @MAINTAINER_MODE_TRUE@ $(srcdir)/Makefile.in  $(top_builddir)/config.status
   1.166 -	cd $(top_builddir) && $(SHELL) ./config.status $@ $(am__depfiles_maybe)
   1.167 +.PRECIOUS: Makefile
   1.168 +Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status
   1.169 +	@case '$?' in \
   1.170 +	  *config.status*) \
   1.171 +	    echo ' $(SHELL) ./config.status'; \
   1.172 +	    $(SHELL) ./config.status;; \
   1.173 +	  *) \
   1.174 +	    echo ' cd $(top_builddir) && $(SHELL) ./config.status $@ $(am__depfiles_maybe)'; \
   1.175 +	    cd $(top_builddir) && $(SHELL) ./config.status $@ $(am__depfiles_maybe);; \
   1.176 +	esac;
   1.177  
   1.178 -$(top_builddir)/config.status: $(srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
   1.179 +$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
   1.180  	$(SHELL) ./config.status --recheck
   1.181 -$(srcdir)/configure: @MAINTAINER_MODE_TRUE@ $(srcdir)/configure.in $(ACLOCAL_M4) $(CONFIGURE_DEPENDENCIES)
   1.182 +
   1.183 +$(top_srcdir)/configure: @MAINTAINER_MODE_TRUE@ $(am__configure_deps)
   1.184  	cd $(srcdir) && $(AUTOCONF)
   1.185 -
   1.186 -$(ACLOCAL_M4): @MAINTAINER_MODE_TRUE@ configure.in 
   1.187 +$(ACLOCAL_M4): @MAINTAINER_MODE_TRUE@ $(am__aclocal_m4_deps)
   1.188  	cd $(srcdir) && $(ACLOCAL) $(ACLOCAL_AMFLAGS)
   1.189  
   1.190  config.h: stamp-h1
   1.191 @@ -234,10 +275,10 @@
   1.192  stamp-h1: $(srcdir)/config.h.in $(top_builddir)/config.status
   1.193  	@rm -f stamp-h1
   1.194  	cd $(top_builddir) && $(SHELL) ./config.status config.h
   1.195 -
   1.196 -$(srcdir)/config.h.in: @MAINTAINER_MODE_TRUE@ $(top_srcdir)/configure.in $(ACLOCAL_M4) $(top_srcdir)/acconfig.h
   1.197 +$(srcdir)/config.h.in: @MAINTAINER_MODE_TRUE@ $(am__configure_deps) $(top_srcdir)/acconfig.h
   1.198  	cd $(top_srcdir) && $(AUTOHEADER)
   1.199 -	touch $(srcdir)/config.h.in
   1.200 +	rm -f stamp-h1
   1.201 +	touch $@
   1.202  
   1.203  distclean-hdr:
   1.204  	-rm -f config.h stamp-h1
   1.205 @@ -252,7 +293,13 @@
   1.206  #     (which will cause the Makefiles to be regenerated when you run `make');
   1.207  # (2) otherwise, pass the desired values on the `make' command line.
   1.208  $(RECURSIVE_TARGETS):
   1.209 -	@set fnord $$MAKEFLAGS; amf=$$2; \
   1.210 +	@failcom='exit 1'; \
   1.211 +	for f in x $$MAKEFLAGS; do \
   1.212 +	  case $$f in \
   1.213 +	    *=* | --[!k]*);; \
   1.214 +	    *k*) failcom='fail=yes';; \
   1.215 +	  esac; \
   1.216 +	done; \
   1.217  	dot_seen=no; \
   1.218  	target=`echo $@ | sed s/-recursive//`; \
   1.219  	list='$(SUBDIRS)'; for subdir in $$list; do \
   1.220 @@ -264,7 +311,7 @@
   1.221  	    local_target="$$target"; \
   1.222  	  fi; \
   1.223  	  (cd $$subdir && $(MAKE) $(AM_MAKEFLAGS) $$local_target) \
   1.224 -	   || case "$$amf" in *=*) exit 1;; *k*) fail=yes;; *) exit 1;; esac; \
   1.225 +	  || eval $$failcom; \
   1.226  	done; \
   1.227  	if test "$$dot_seen" = "no"; then \
   1.228  	  $(MAKE) $(AM_MAKEFLAGS) "$$target-am" || exit 1; \
   1.229 @@ -272,7 +319,13 @@
   1.230  
   1.231  mostlyclean-recursive clean-recursive distclean-recursive \
   1.232  maintainer-clean-recursive:
   1.233 -	@set fnord $$MAKEFLAGS; amf=$$2; \
   1.234 +	@failcom='exit 1'; \
   1.235 +	for f in x $$MAKEFLAGS; do \
   1.236 +	  case $$f in \
   1.237 +	    *=* | --[!k]*);; \
   1.238 +	    *k*) failcom='fail=yes';; \
   1.239 +	  esac; \
   1.240 +	done; \
   1.241  	dot_seen=no; \
   1.242  	case "$@" in \
   1.243  	  distclean-* | maintainer-clean-*) list='$(DIST_SUBDIRS)' ;; \
   1.244 @@ -293,7 +346,7 @@
   1.245  	    local_target="$$target"; \
   1.246  	  fi; \
   1.247  	  (cd $$subdir && $(MAKE) $(AM_MAKEFLAGS) $$local_target) \
   1.248 -	   || case "$$amf" in *=*) exit 1;; *k*) fail=yes;; *) exit 1;; esac; \
   1.249 +	  || eval $$failcom; \
   1.250  	done && test -z "$$fail"
   1.251  tags-recursive:
   1.252  	list='$(SUBDIRS)'; for subdir in $$list; do \
   1.253 @@ -304,14 +357,6 @@
   1.254  	  test "$$subdir" = . || (cd $$subdir && $(MAKE) $(AM_MAKEFLAGS) ctags); \
   1.255  	done
   1.256  
   1.257 -ETAGS = etags
   1.258 -ETAGSFLAGS =
   1.259 -
   1.260 -CTAGS = ctags
   1.261 -CTAGSFLAGS =
   1.262 -
   1.263 -tags: TAGS
   1.264 -
   1.265  ID: $(HEADERS) $(SOURCES) $(LISP) $(TAGS_FILES)
   1.266  	list='$(SOURCES) $(HEADERS) $(LISP) $(TAGS_FILES)'; \
   1.267  	unique=`for i in $$list; do \
   1.268 @@ -320,19 +365,22 @@
   1.269  	  $(AWK) '    { files[$$0] = 1; } \
   1.270  	       END { for (i in files) print i; }'`; \
   1.271  	mkid -fID $$unique
   1.272 +tags: TAGS
   1.273  
   1.274  TAGS: tags-recursive $(HEADERS) $(SOURCES) config.h.in $(TAGS_DEPENDENCIES) \
   1.275  		$(TAGS_FILES) $(LISP)
   1.276  	tags=; \
   1.277  	here=`pwd`; \
   1.278 -	if (etags --etags-include --version) >/dev/null 2>&1; then \
   1.279 +	if ($(ETAGS) --etags-include --version) >/dev/null 2>&1; then \
   1.280  	  include_option=--etags-include; \
   1.281 +	  empty_fix=.; \
   1.282  	else \
   1.283  	  include_option=--include; \
   1.284 +	  empty_fix=; \
   1.285  	fi; \
   1.286  	list='$(SUBDIRS)'; for subdir in $$list; do \
   1.287  	  if test "$$subdir" = .; then :; else \
   1.288 -	    test -f $$subdir/TAGS && \
   1.289 +	    test ! -f $$subdir/TAGS || \
   1.290  	      tags="$$tags $$include_option=$$here/$$subdir/TAGS"; \
   1.291  	  fi; \
   1.292  	done; \
   1.293 @@ -342,10 +390,11 @@
   1.294  	  done | \
   1.295  	  $(AWK) '    { files[$$0] = 1; } \
   1.296  	       END { for (i in files) print i; }'`; \
   1.297 -	test -z "$(ETAGS_ARGS)$$tags$$unique" \
   1.298 -	  || $(ETAGS) $(ETAGSFLAGS) $(AM_ETAGSFLAGS) $(ETAGS_ARGS) \
   1.299 -	     $$tags $$unique
   1.300 -
   1.301 +	if test -z "$(ETAGS_ARGS)$$tags$$unique"; then :; else \
   1.302 +	  test -n "$$unique" || unique=$$empty_fix; \
   1.303 +	  $(ETAGS) $(ETAGSFLAGS) $(AM_ETAGSFLAGS) $(ETAGS_ARGS) \
   1.304 +	    $$tags $$unique; \
   1.305 +	fi
   1.306  ctags: CTAGS
   1.307  CTAGS: ctags-recursive $(HEADERS) $(SOURCES) config.h.in $(TAGS_DEPENDENCIES) \
   1.308  		$(TAGS_FILES) $(LISP)
   1.309 @@ -368,24 +417,11 @@
   1.310  
   1.311  distclean-tags:
   1.312  	-rm -f TAGS ID GTAGS GRTAGS GSYMS GPATH tags
   1.313 -DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST)
   1.314 -
   1.315 -top_distdir = .
   1.316 -distdir = $(PACKAGE)-$(VERSION)
   1.317 -
   1.318 -am__remove_distdir = \
   1.319 -  { test ! -d $(distdir) \
   1.320 -    || { find $(distdir) -type d ! -perm -200 -exec chmod u+w {} ';' \
   1.321 -         && rm -fr $(distdir); }; }
   1.322 -
   1.323 -GZIP_ENV = --best
   1.324 -distuninstallcheck_listfiles = find . -type f -print
   1.325 -distcleancheck_listfiles = find . -type f -print
   1.326  
   1.327  distdir: $(DISTFILES)
   1.328  	$(am__remove_distdir)
   1.329  	mkdir $(distdir)
   1.330 -	$(mkinstalldirs) $(distdir)/po $(distdir)/test
   1.331 +	$(mkdir_p) $(distdir)/po $(distdir)/test
   1.332  	@srcdirstrip=`echo "$(srcdir)" | sed 's|.|.|g'`; \
   1.333  	topsrcdirstrip=`echo "$(top_srcdir)" | sed 's|.|.|g'`; \
   1.334  	list='$(DISTFILES)'; for file in $$list; do \
   1.335 @@ -397,7 +433,7 @@
   1.336  	  dir=`echo "$$file" | sed -e 's,/[^/]*$$,,'`; \
   1.337  	  if test "$$dir" != "$$file" && test "$$dir" != "."; then \
   1.338  	    dir="/$$dir"; \
   1.339 -	    $(mkinstalldirs) "$(distdir)$$dir"; \
   1.340 +	    $(mkdir_p) "$(distdir)$$dir"; \
   1.341  	  else \
   1.342  	    dir=''; \
   1.343  	  fi; \
   1.344 @@ -414,13 +450,15 @@
   1.345  	done
   1.346  	list='$(DIST_SUBDIRS)'; for subdir in $$list; do \
   1.347  	  if test "$$subdir" = .; then :; else \
   1.348 -	    test -d $(distdir)/$$subdir \
   1.349 -	    || mkdir $(distdir)/$$subdir \
   1.350 +	    test -d "$(distdir)/$$subdir" \
   1.351 +	    || $(mkdir_p) "$(distdir)/$$subdir" \
   1.352  	    || exit 1; \
   1.353 +	    distdir=`$(am__cd) $(distdir) && pwd`; \
   1.354 +	    top_distdir=`$(am__cd) $(top_distdir) && pwd`; \
   1.355  	    (cd $$subdir && \
   1.356  	      $(MAKE) $(AM_MAKEFLAGS) \
   1.357 -	        top_distdir="$(top_distdir)" \
   1.358 -	        distdir=../$(distdir)/$$subdir \
   1.359 +	        top_distdir="$$top_distdir" \
   1.360 +	        distdir="$$distdir/$$subdir" \
   1.361  	        distdir) \
   1.362  	      || exit 1; \
   1.363  	  fi; \
   1.364 @@ -434,19 +472,46 @@
   1.365  	  ! -type d ! -perm -444 -exec $(SHELL) $(install_sh) -c -m a+r {} {} \; \
   1.366  	|| chmod -R a+r $(distdir)
   1.367  dist-gzip: distdir
   1.368 -	$(AMTAR) chof - $(distdir) | GZIP=$(GZIP_ENV) gzip -c >$(distdir).tar.gz
   1.369 +	tardir=$(distdir) && $(am__tar) | GZIP=$(GZIP_ENV) gzip -c >$(distdir).tar.gz
   1.370 +	$(am__remove_distdir)
   1.371 +
   1.372 +dist-bzip2: distdir
   1.373 +	tardir=$(distdir) && $(am__tar) | bzip2 -9 -c >$(distdir).tar.bz2
   1.374 +	$(am__remove_distdir)
   1.375 +
   1.376 +dist-tarZ: distdir
   1.377 +	tardir=$(distdir) && $(am__tar) | compress -c >$(distdir).tar.Z
   1.378 +	$(am__remove_distdir)
   1.379 +
   1.380 +dist-shar: distdir
   1.381 +	shar $(distdir) | GZIP=$(GZIP_ENV) gzip -c >$(distdir).shar.gz
   1.382 +	$(am__remove_distdir)
   1.383 +
   1.384 +dist-zip: distdir
   1.385 +	-rm -f $(distdir).zip
   1.386 +	zip -rq $(distdir).zip $(distdir)
   1.387  	$(am__remove_distdir)
   1.388  
   1.389  dist dist-all: distdir
   1.390 -	$(AMTAR) chof - $(distdir) | GZIP=$(GZIP_ENV) gzip -c >$(distdir).tar.gz
   1.391 +	tardir=$(distdir) && $(am__tar) | GZIP=$(GZIP_ENV) gzip -c >$(distdir).tar.gz
   1.392  	$(am__remove_distdir)
   1.393  
   1.394  # This target untars the dist file and tries a VPATH configuration.  Then
   1.395  # it guarantees that the distribution is self-contained by making another
   1.396  # tarfile.
   1.397  distcheck: dist
   1.398 -	$(am__remove_distdir)
   1.399 -	GZIP=$(GZIP_ENV) gunzip -c $(distdir).tar.gz | $(AMTAR) xf -
   1.400 +	case '$(DIST_ARCHIVES)' in \
   1.401 +	*.tar.gz*) \
   1.402 +	  GZIP=$(GZIP_ENV) gunzip -c $(distdir).tar.gz | $(am__untar) ;;\
   1.403 +	*.tar.bz2*) \
   1.404 +	  bunzip2 -c $(distdir).tar.bz2 | $(am__untar) ;;\
   1.405 +	*.tar.Z*) \
   1.406 +	  uncompress -c $(distdir).tar.Z | $(am__untar) ;;\
   1.407 +	*.shar.gz*) \
   1.408 +	  GZIP=$(GZIP_ENV) gunzip -c $(distdir).shar.gz | unshar ;;\
   1.409 +	*.zip*) \
   1.410 +	  unzip $(distdir).zip ;;\
   1.411 +	esac
   1.412  	chmod -R a-w $(distdir); chmod a+w $(distdir)
   1.413  	mkdir $(distdir)/_build
   1.414  	mkdir $(distdir)/_inst
   1.415 @@ -466,19 +531,20 @@
   1.416  	        distuninstallcheck \
   1.417  	  && chmod -R a-w "$$dc_install_base" \
   1.418  	  && ({ \
   1.419 -	       (cd ../.. && $(mkinstalldirs) "$$dc_destdir") \
   1.420 +	       (cd ../.. && umask 077 && mkdir "$$dc_destdir") \
   1.421  	       && $(MAKE) $(AM_MAKEFLAGS) DESTDIR="$$dc_destdir" install \
   1.422  	       && $(MAKE) $(AM_MAKEFLAGS) DESTDIR="$$dc_destdir" uninstall \
   1.423  	       && $(MAKE) $(AM_MAKEFLAGS) DESTDIR="$$dc_destdir" \
   1.424  	            distuninstallcheck_dir="$$dc_destdir" distuninstallcheck; \
   1.425  	      } || { rm -rf "$$dc_destdir"; exit 1; }) \
   1.426  	  && rm -rf "$$dc_destdir" \
   1.427 -	  && $(MAKE) $(AM_MAKEFLAGS) dist-gzip \
   1.428 -	  && rm -f $(distdir).tar.gz \
   1.429 +	  && $(MAKE) $(AM_MAKEFLAGS) dist \
   1.430 +	  && rm -rf $(DIST_ARCHIVES) \
   1.431  	  && $(MAKE) $(AM_MAKEFLAGS) distcleancheck
   1.432  	$(am__remove_distdir)
   1.433 -	@echo "$(distdir).tar.gz is ready for distribution" | \
   1.434 -	  sed 'h;s/./=/g;p;x;p;x'
   1.435 +	@(echo "$(distdir) archives ready for distribution: "; \
   1.436 +	  list='$(DIST_ARCHIVES)'; for i in $$list; do echo $$i; done) | \
   1.437 +	  sed -e '1{h;s/./=/g;p;x;}' -e '$${p;x;}'
   1.438  distuninstallcheck:
   1.439  	@cd $(distuninstallcheck_dir) \
   1.440  	&& test `$(distuninstallcheck_listfiles) | wc -l` -le 1 \
   1.441 @@ -502,7 +568,6 @@
   1.442  all-am: Makefile config.h
   1.443  installdirs: installdirs-recursive
   1.444  installdirs-am:
   1.445 -
   1.446  install: install-recursive
   1.447  install-exec: install-exec-recursive
   1.448  install-data: install-data-recursive
   1.449 @@ -522,7 +587,7 @@
   1.450  clean-generic:
   1.451  
   1.452  distclean-generic:
   1.453 -	-rm -f $(CONFIG_CLEAN_FILES)
   1.454 +	-test -z "$(CONFIG_CLEAN_FILES)" || rm -f $(CONFIG_CLEAN_FILES)
   1.455  
   1.456  maintainer-clean-generic:
   1.457  	@echo "This command is intended for maintainers to use"
   1.458 @@ -540,6 +605,8 @@
   1.459  
   1.460  dvi-am:
   1.461  
   1.462 +html: html-recursive
   1.463 +
   1.464  info: info-recursive
   1.465  
   1.466  info-am:
   1.467 @@ -576,22 +643,20 @@
   1.468  
   1.469  uninstall-info: uninstall-info-recursive
   1.470  
   1.471 -.PHONY: $(RECURSIVE_TARGETS) CTAGS GTAGS all all-am check check-am clean \
   1.472 -	clean-generic clean-recursive ctags ctags-recursive dist \
   1.473 -	dist-all dist-gzip distcheck distclean distclean-generic \
   1.474 -	distclean-hdr distclean-recursive distclean-tags distcleancheck \
   1.475 -	distdir distuninstallcheck dvi dvi-am dvi-recursive info \
   1.476 -	info-am info-recursive install install-am install-data \
   1.477 -	install-data-am install-data-local install-data-recursive \
   1.478 -	install-exec install-exec-am install-exec-recursive \
   1.479 -	install-info install-info-am install-info-recursive install-man \
   1.480 -	install-recursive install-strip installcheck installcheck-am \
   1.481 -	installdirs installdirs-am installdirs-recursive \
   1.482 -	maintainer-clean maintainer-clean-generic \
   1.483 +.PHONY: $(RECURSIVE_TARGETS) CTAGS GTAGS all all-am am--refresh check \
   1.484 +	check-am clean clean-generic clean-recursive ctags \
   1.485 +	ctags-recursive dist dist-all dist-bzip2 dist-gzip dist-hook \
   1.486 +	dist-shar dist-tarZ dist-zip distcheck distclean \
   1.487 +	distclean-generic distclean-hdr distclean-recursive \
   1.488 +	distclean-tags distcleancheck distdir distuninstallcheck dvi \
   1.489 +	dvi-am html html-am info info-am install install-am \
   1.490 +	install-data install-data-am install-data-local install-exec \
   1.491 +	install-exec-am install-info install-info-am install-man \
   1.492 +	install-strip installcheck installcheck-am installdirs \
   1.493 +	installdirs-am maintainer-clean maintainer-clean-generic \
   1.494  	maintainer-clean-recursive mostlyclean mostlyclean-generic \
   1.495 -	mostlyclean-recursive pdf pdf-am pdf-recursive ps ps-am \
   1.496 -	ps-recursive tags tags-recursive uninstall uninstall-am \
   1.497 -	uninstall-info-am uninstall-info-recursive uninstall-recursive
   1.498 +	mostlyclean-recursive pdf pdf-am ps ps-am tags tags-recursive \
   1.499 +	uninstall uninstall-am uninstall-info-am
   1.500  
   1.501  
   1.502  install-data-local: