Import argp-standalone 1.3.

2021-02-10 16:18:23 -03:00 · 2021-02-10 16:18:23 -03:00 · 92bd24de26
commit 92bd24de26
parent ede863a979
19 changed files with 3828 additions and 1826 deletions
--- a/23
+++ b/23
@ -1,3 +1,26 @@
 2004-02-23  Niels Möller  <niels@s3.kth.se>
 	* configure.ac: Bumped version to standalone-1.3.
 	Portability to Mac OS X (fixes by Akim Demaille)
        * argp/Makefile.am (libargp_a_SOURCES): Remove the duplicate
        inclusion of argp-eexst.c.
        * argp/argp-ba.c, argp/argp-pv.c, argp/argp-pvh.c: Initialize the
        variables, otherwise on Darwin linking fails if the user does not
        define these variables.
 2003-04-28  Niels Möller  <nisse@cuckoo.hack.org>
 	* argp-parse.c: Use standard alloca blurb from the autoconf
 	manual. 
 	* argp-help.c: Updated alloca blurb to use the same as
 	argp-parse.c. 
 2003-04-24  Niels Möller  <niels@s3.kth.se>
 	* argp.h: Added workaround for __restrict.
 2003-03-13  Niels Möller  <nisse@cuckoo.hack.org>
 	* Released argp-standalone-1.2.
--- a/Makefile.am
+++ b/Makefile.am
@ -1,6 +1,6 @@
 # From glibc
-# Copyright (C) 1997, 2003 Free Software Foundation, Inc.
+# Copyright (C) 1997, 2003, 2004 Free Software Foundation, Inc.
 # This file is part of the GNU C Library.
 # The GNU C Library is free software; you can redistribute it and/or
@ -32,7 +32,7 @@ EXTRA_DIST = mempcpy.c strchrnul.c strndup.c Versions
 # Leaves out argp-fs-xinl.c and argp-xinl.c 
 libargp_a_SOURCES = argp-ba.c argp-eexst.c argp-fmtstream.c \
 		    argp-help.c argp-parse.c argp-pv.c \
-		    argp-pvh.c  argp-eexst.c
+		    argp-pvh.c
 libargp_a_LIBADD = $(LIBOBJS)
--- a/Makefile.in
+++ b/Makefile.in
@ -1,8 +1,8 @@
-# Makefile.in generated by automake 1.7.3 from Makefile.am.
+# Makefile.in generated by automake 1.8.2 from Makefile.am.
 # @configure_input@
-# Copyright 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, 2003
+# Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
-# Free Software Foundation, Inc.
+# 2003, 2004  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.
@ -16,7 +16,7 @@
 # From glibc
-# Copyright (C) 1997, 2003 Free Software Foundation, Inc.
+# Copyright (C) 1997, 2003, 2004 Free Software Foundation, Inc.
 # This file is part of the GNU C Library.
 # The GNU C Library is free software; you can redistribute it and/or
@ -34,6 +34,10 @@
 # not, write to the Free Software Foundation, Inc.,
 # 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
 SOURCES = $(libargp_a_SOURCES) argp-test.c
 srcdir = @srcdir@
 top_srcdir = @top_srcdir@
 VPATH = @srcdir@
@ -41,7 +45,6 @@ pkgdatadir = $(datadir)/@PACKAGE@
 pkglibdir = $(libdir)/@PACKAGE@
 pkgincludedir = $(includedir)/@PACKAGE@
 top_builddir = .
 am__cd = CDPATH="$${ZSH_VERSION+.}$(PATH_SEPARATOR)" && cd
 INSTALL = @INSTALL@
 install_sh_DATA = $(install_sh) -c -m 644
@ -55,6 +58,74 @@ POST_INSTALL = :
 NORMAL_UNINSTALL = :
 PRE_UNINSTALL = :
 POST_UNINSTALL = :
 noinst_PROGRAMS = argp-test$(EXEEXT)
 subdir = .
 DIST_COMMON = $(am__configure_deps) $(noinst_HEADERS) \
 	$(srcdir)/Makefile.am $(srcdir)/Makefile.in \
 	$(srcdir)/config.h.in $(top_srcdir)/configure ChangeLog TODO \
 	depcomp install-sh mempcpy.c missing mkinstalldirs strchrnul.c \
 	strndup.c
 ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
 am__aclocal_m4_deps = $(top_srcdir)/acinclude.m4 \
 	$(top_srcdir)/configure.ac
 am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \
 	$(ACLOCAL_M4)
 am__CONFIG_DISTCLEAN_FILES = config.status config.cache config.log \
 configure.lineno configure.status.lineno
 mkinstalldirs = $(SHELL) $(top_srcdir)/mkinstalldirs
 CONFIG_HEADER = config.h
 CONFIG_CLEAN_FILES =
 AR = ar
 ARFLAGS = cru
 LIBRARIES = $(noinst_LIBRARIES)
 libargp_a_AR = $(AR) $(ARFLAGS)
 am__DEPENDENCIES_1 = @LIBOBJS@
 libargp_a_DEPENDENCIES = $(am__DEPENDENCIES_1)
 am_libargp_a_OBJECTS = argp-ba.$(OBJEXT) argp-eexst.$(OBJEXT) \
 	argp-fmtstream.$(OBJEXT) argp-help.$(OBJEXT) \
 	argp-parse.$(OBJEXT) argp-pv.$(OBJEXT) argp-pvh.$(OBJEXT)
 libargp_a_OBJECTS = $(am_libargp_a_OBJECTS)
 PROGRAMS = $(noinst_PROGRAMS)
 argp_test_SOURCES = argp-test.c
 argp_test_OBJECTS = argp-test.$(OBJEXT)
 argp_test_DEPENDENCIES = libargp.a
 DEFAULT_INCLUDES = -I. -I$(srcdir) -I.
 depcomp = $(SHELL) $(top_srcdir)/depcomp
 am__depfiles_maybe = depfiles
@AMDEP_TRUE@DEP_FILES = $(DEPDIR)/mempcpy.Po $(DEPDIR)/strchrnul.Po \
@AMDEP_TRUE@	$(DEPDIR)/strndup.Po ./$(DEPDIR)/argp-ba.Po \
@AMDEP_TRUE@	./$(DEPDIR)/argp-eexst.Po \
@AMDEP_TRUE@	./$(DEPDIR)/argp-fmtstream.Po \
@AMDEP_TRUE@	./$(DEPDIR)/argp-help.Po ./$(DEPDIR)/argp-parse.Po \
@AMDEP_TRUE@	./$(DEPDIR)/argp-pv.Po ./$(DEPDIR)/argp-pvh.Po \
@AMDEP_TRUE@	./$(DEPDIR)/argp-test.Po
 COMPILE = $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) \
 	$(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS)
 CCLD = $(CC)
 LINK = $(CCLD) $(AM_CFLAGS) $(CFLAGS) $(AM_LDFLAGS) $(LDFLAGS) -o $@
 SOURCES = $(libargp_a_SOURCES) argp-test.c
 DIST_SOURCES = $(libargp_a_SOURCES) argp-test.c
 RECURSIVE_TARGETS = all-recursive check-recursive dvi-recursive \
 	html-recursive info-recursive install-data-recursive \
 	install-exec-recursive install-info-recursive \
 	install-recursive installcheck-recursive installdirs-recursive \
 	pdf-recursive ps-recursive uninstall-info-recursive \
 	uninstall-recursive
 HEADERS = $(noinst_HEADERS)
 ETAGS = etags
 CTAGS = ctags
 DIST_SUBDIRS = $(SUBDIRS)
 DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST)
 distdir = $(PACKAGE)-$(VERSION)
 top_distdir = $(distdir)
 am__remove_distdir = \
  { test ! -d $(distdir) \
    || { find $(distdir) -type d ! -perm -200 -exec chmod u+w {} ';' \
         && rm -fr $(distdir); }; }
 DIST_ARCHIVES = $(distdir).tar.gz
 GZIP_ENV = --best
 distuninstallcheck_listfiles = find . -type f -print
 distcleancheck_listfiles = find . -type f -print
 ACLOCAL = @ACLOCAL@
 ALLOCA = @ALLOCA@
 AMDEP_FALSE = @AMDEP_FALSE@
@ -82,7 +153,6 @@ INSTALL_PROGRAM = @INSTALL_PROGRAM@
 INSTALL_SCRIPT = @INSTALL_SCRIPT@
 INSTALL_STRIP_PROGRAM = @INSTALL_STRIP_PROGRAM@
 LDFLAGS = @LDFLAGS@
 LIBOBJS = @LIBOBJS@
 LIBS = @LIBS@
 LTLIBOBJS = @LTLIBOBJS@
@ -120,6 +190,7 @@ libdir = @libdir@
 libexecdir = @libexecdir@
 localstatedir = @localstatedir@
 mandir = @mandir@
 mkdir_p = @mkdir_p@
 oldincludedir = @oldincludedir@
 prefix = @prefix@
 program_transform_name = @program_transform_name@
@ -127,97 +198,56 @@ sbindir = @sbindir@
 sharedstatedir = @sharedstatedir@
 sysconfdir = @sysconfdir@
 target_alias = @target_alias@
 AUTOMAKE_OPTIONS = foreign
 SUBDIRS = . testsuite
 noinst_LIBRARIES = libargp.a
 noinst_PROGRAMS = argp-test
 noinst_HEADERS = argp.h argp-fmtstream.h argp-namefrob.h # argp-comp.h
 EXTRA_DIST = mempcpy.c strchrnul.c strndup.c Versions
 # Leaves out argp-fs-xinl.c and argp-xinl.c 
 libargp_a_SOURCES = argp-ba.c argp-eexst.c argp-fmtstream.c \
 		    argp-help.c argp-parse.c argp-pv.c \
-		    argp-pvh.c  argp-eexst.c
+		    argp-pvh.c
 libargp_a_LIBADD = $(LIBOBJS)
 argp_test_LDADD = libargp.a
 subdir = .
 ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
 mkinstalldirs = $(SHELL) $(top_srcdir)/mkinstalldirs
 CONFIG_HEADER = config.h
 CONFIG_CLEAN_FILES =
 LIBRARIES = $(noinst_LIBRARIES)
 libargp_a_AR = $(AR) cru
 libargp_a_DEPENDENCIES = @LIBOBJS@
 am_libargp_a_OBJECTS = argp-ba.$(OBJEXT) argp-eexst.$(OBJEXT) \
 	argp-fmtstream.$(OBJEXT) argp-help.$(OBJEXT) \
 	argp-parse.$(OBJEXT) argp-pv.$(OBJEXT) argp-pvh.$(OBJEXT) \
 	argp-eexst.$(OBJEXT)
 libargp_a_OBJECTS = $(am_libargp_a_OBJECTS)
 noinst_PROGRAMS = argp-test$(EXEEXT)
 PROGRAMS = $(noinst_PROGRAMS)
 argp_test_SOURCES = argp-test.c
 argp_test_OBJECTS = argp-test.$(OBJEXT)
 argp_test_DEPENDENCIES = libargp.a
 argp_test_LDFLAGS =
 DEFAULT_INCLUDES =  -I. -I$(srcdir) -I.
 depcomp = $(SHELL) $(top_srcdir)/depcomp
 am__depfiles_maybe = depfiles
@AMDEP_TRUE@DEP_FILES = $(DEPDIR)/mempcpy.Po $(DEPDIR)/strchrnul.Po \
@AMDEP_TRUE@	$(DEPDIR)/strndup.Po ./$(DEPDIR)/argp-ba.Po \
@AMDEP_TRUE@	./$(DEPDIR)/argp-eexst.Po \
@AMDEP_TRUE@	./$(DEPDIR)/argp-fmtstream.Po \
@AMDEP_TRUE@	./$(DEPDIR)/argp-help.Po ./$(DEPDIR)/argp-parse.Po \
@AMDEP_TRUE@	./$(DEPDIR)/argp-pv.Po ./$(DEPDIR)/argp-pvh.Po \
@AMDEP_TRUE@	./$(DEPDIR)/argp-test.Po
 COMPILE = $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) \
 	$(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS)
 CCLD = $(CC)
 LINK = $(CCLD) $(AM_CFLAGS) $(CFLAGS) $(AM_LDFLAGS) $(LDFLAGS) -o $@
 DIST_SOURCES = $(libargp_a_SOURCES) argp-test.c
 HEADERS = $(noinst_HEADERS)
 RECURSIVE_TARGETS = info-recursive dvi-recursive pdf-recursive \
 	ps-recursive install-info-recursive uninstall-info-recursive \
 	all-recursive install-data-recursive install-exec-recursive \
 	installdirs-recursive install-recursive uninstall-recursive \
 	check-recursive installcheck-recursive
 DIST_COMMON = $(noinst_HEADERS) ChangeLog Makefile.am Makefile.in TODO \
 	acinclude.m4 aclocal.m4 config.h.in configure configure.ac \
 	depcomp install-sh mempcpy.c missing mkinstalldirs strchrnul.c \
 	strndup.c
 DIST_SUBDIRS = $(SUBDIRS)
 SOURCES = $(libargp_a_SOURCES) argp-test.c
 all: config.h
 	$(MAKE) $(AM_MAKEFLAGS) all-recursive
 .SUFFIXES:
 .SUFFIXES: .c .o .obj
-
+am--refresh:
-am__CONFIG_DISTCLEAN_FILES = config.status config.cache config.log \
+	@:
- configure.lineno
+$(srcdir)/Makefile.in:  $(srcdir)/Makefile.am  $(am__configure_deps)
-$(srcdir)/Makefile.in:  Makefile.am  $(top_srcdir)/configure.ac $(ACLOCAL_M4)
+	@for dep in $?; do \
 	  case '$(am__configure_deps)' in \
 	    *$$dep*) \
 	      echo ' cd $(srcdir) && $(AUTOMAKE) --foreign '; \
 	      cd $(srcdir) && $(AUTOMAKE) --foreign  \
 		&& exit 0; \
 	      exit 1;; \
 	  esac; \
 	done; \
 	echo ' cd $(top_srcdir) && $(AUTOMAKE) --foreign  Makefile'; \
 	cd $(top_srcdir) && \
 	  $(AUTOMAKE) --foreign  Makefile
 .PRECIOUS: Makefile
 Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status
-	cd $(top_builddir) && $(SHELL) ./config.status $@ $(am__depfiles_maybe)
+	@case '$?' in \
 	  *config.status*) \
 	    echo ' $(SHELL) ./config.status'; \
 	    $(SHELL) ./config.status;; \
 	  *) \
 	    echo ' cd $(top_builddir) && $(SHELL) ./config.status $@ $(am__depfiles_maybe)'; \
 	    cd $(top_builddir) && $(SHELL) ./config.status $@ $(am__depfiles_maybe);; \
 	esac;
-$(top_builddir)/config.status: $(srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
+$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
 	$(SHELL) ./config.status --recheck
 $(srcdir)/configure:  $(srcdir)/configure.ac $(ACLOCAL_M4) $(CONFIGURE_DEPENDENCIES)
 	cd $(srcdir) && $(AUTOCONF)
-$(ACLOCAL_M4):  configure.ac acinclude.m4
+$(top_srcdir)/configure:  $(am__configure_deps)
 	cd $(srcdir) && $(AUTOCONF)
 $(ACLOCAL_M4):  $(am__aclocal_m4_deps)
 	cd $(srcdir) && $(ACLOCAL) $(ACLOCAL_AMFLAGS)
 config.h: stamp-h1
@ -229,16 +259,14 @@ config.h: stamp-h1
 stamp-h1: $(srcdir)/config.h.in $(top_builddir)/config.status
 	@rm -f stamp-h1
 	cd $(top_builddir) && $(SHELL) ./config.status config.h
-
+$(srcdir)/config.h.in:  $(am__configure_deps) 
 $(srcdir)/config.h.in:  $(top_srcdir)/configure.ac $(ACLOCAL_M4) 
 	cd $(top_srcdir) && $(AUTOHEADER)
-	touch $(srcdir)/config.h.in
+	rm -f stamp-h1
 	touch $@
 distclean-hdr:
 	-rm -f config.h stamp-h1
 AR = ar
 clean-noinstLIBRARIES:
 	-test -z "$(noinst_LIBRARIES)" || rm -f $(noinst_LIBRARIES)
 libargp.a: $(libargp_a_OBJECTS) $(libargp_a_DEPENDENCIES) 
@ -253,7 +281,7 @@ argp-test$(EXEEXT): $(argp_test_OBJECTS) $(argp_test_DEPENDENCIES)
 	$(LINK) $(argp_test_LDFLAGS) $(argp_test_OBJECTS) $(argp_test_LDADD) $(LIBS)
 mostlyclean-compile:
-	-rm -f *.$(OBJEXT) core *.core
+	-rm -f *.$(OBJEXT)
 distclean-compile:
 	-rm -f *.tab.c
@ -270,30 +298,21 @@ distclean-compile:
@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/argp-pvh.Po@am__quote@
@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/argp-test.Po@am__quote@
 distclean-depend:
 	-rm -rf $(DEPDIR) ./$(DEPDIR)
 .c.o:
-@am__fastdepCC_TRUE@	if $(COMPILE) -MT $@ -MD -MP -MF "$(DEPDIR)/$*.Tpo" \
+@am__fastdepCC_TRUE@	if $(COMPILE) -MT $@ -MD -MP -MF "$(DEPDIR)/$*.Tpo" -c -o $@ $<; \
-@am__fastdepCC_TRUE@	  -c -o $@ `test -f '$<' || echo '$(srcdir)/'`$<; \
+@am__fastdepCC_TRUE@	then mv -f "$(DEPDIR)/$*.Tpo" "$(DEPDIR)/$*.Po"; else rm -f "$(DEPDIR)/$*.Tpo"; exit 1; fi
@am__fastdepCC_TRUE@	then mv "$(DEPDIR)/$*.Tpo" "$(DEPDIR)/$*.Po"; \
@am__fastdepCC_TRUE@	else rm -f "$(DEPDIR)/$*.Tpo"; exit 1; \
@am__fastdepCC_TRUE@	fi
@AMDEP_TRUE@@am__fastdepCC_FALSE@	source='$<' object='$@' libtool=no @AMDEPBACKSLASH@
@AMDEP_TRUE@@am__fastdepCC_FALSE@	depfile='$(DEPDIR)/$*.Po' tmpdepfile='$(DEPDIR)/$*.TPo' @AMDEPBACKSLASH@
@AMDEP_TRUE@@am__fastdepCC_FALSE@	$(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-@am__fastdepCC_FALSE@	$(COMPILE) -c `test -f '$<' || echo '$(srcdir)/'`$<
+@am__fastdepCC_FALSE@	$(COMPILE) -c $<
 .c.obj:
-@am__fastdepCC_TRUE@	if $(COMPILE) -MT $@ -MD -MP -MF "$(DEPDIR)/$*.Tpo" \
+@am__fastdepCC_TRUE@	if $(COMPILE) -MT $@ -MD -MP -MF "$(DEPDIR)/$*.Tpo" -c -o $@ `$(CYGPATH_W) '$<'`; \
-@am__fastdepCC_TRUE@	  -c -o $@ `if test -f '$<'; then $(CYGPATH_W) '$<'; else $(CYGPATH_W) '$(srcdir)/$<'; fi`; \
+@am__fastdepCC_TRUE@	then mv -f "$(DEPDIR)/$*.Tpo" "$(DEPDIR)/$*.Po"; else rm -f "$(DEPDIR)/$*.Tpo"; exit 1; fi
@am__fastdepCC_TRUE@	then mv "$(DEPDIR)/$*.Tpo" "$(DEPDIR)/$*.Po"; \
@am__fastdepCC_TRUE@	else rm -f "$(DEPDIR)/$*.Tpo"; exit 1; \
@am__fastdepCC_TRUE@	fi
@AMDEP_TRUE@@am__fastdepCC_FALSE@	source='$<' object='$@' libtool=no @AMDEPBACKSLASH@
@AMDEP_TRUE@@am__fastdepCC_FALSE@	depfile='$(DEPDIR)/$*.Po' tmpdepfile='$(DEPDIR)/$*.TPo' @AMDEPBACKSLASH@
@AMDEP_TRUE@@am__fastdepCC_FALSE@	$(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-@am__fastdepCC_FALSE@	$(COMPILE) -c `if test -f '$<'; then $(CYGPATH_W) '$<'; else $(CYGPATH_W) '$(srcdir)/$<'; fi`
+@am__fastdepCC_FALSE@	$(COMPILE) -c `$(CYGPATH_W) '$<'`
 uninstall-info-am:
 # This directory's subdirectories are mostly independent; you can cd
@ -355,14 +374,6 @@ ctags-recursive:
 	  test "$$subdir" = . || (cd $$subdir && $(MAKE) $(AM_MAKEFLAGS) ctags); \
 	done
 ETAGS = etags
 ETAGSFLAGS =
 CTAGS = ctags
 CTAGSFLAGS =
 tags: TAGS
 ID: $(HEADERS) $(SOURCES) $(LISP) $(TAGS_FILES)
 	list='$(SOURCES) $(HEADERS) $(LISP) $(TAGS_FILES)'; \
 	unique=`for i in $$list; do \
@ -371,14 +382,21 @@ ID: $(HEADERS) $(SOURCES) $(LISP) $(TAGS_FILES)
 	  $(AWK) '    { files[$$0] = 1; } \
 	       END { for (i in files) print i; }'`; \
 	mkid -fID $$unique
 tags: TAGS
 TAGS: tags-recursive $(HEADERS) $(SOURCES) config.h.in $(TAGS_DEPENDENCIES) \
 		$(TAGS_FILES) $(LISP)
 	tags=; \
 	here=`pwd`; \
 	if (etags --etags-include --version) >/dev/null 2>&1; then \
 	  include_option=--etags-include; \
 	else \
 	  include_option=--include; \
 	fi; \
 	list='$(SUBDIRS)'; for subdir in $$list; do \
 	  if test "$$subdir" = .; then :; else \
-	    test -f $$subdir/TAGS && tags="$$tags -i $$here/$$subdir/TAGS"; \
+	    test -f $$subdir/TAGS && \
 	      tags="$$tags $$include_option=$$here/$$subdir/TAGS"; \
 	  fi; \
 	done; \
 	list='$(SOURCES) $(HEADERS) config.h.in $(LISP) $(TAGS_FILES)'; \
@ -390,7 +408,6 @@ TAGS: tags-recursive $(HEADERS) $(SOURCES) config.h.in $(TAGS_DEPENDENCIES) \
 	test -z "$(ETAGS_ARGS)$$tags$$unique" \
 	  || $(ETAGS) $(ETAGSFLAGS) $(AM_ETAGSFLAGS) $(ETAGS_ARGS) \
 	     $$tags $$unique
 ctags: CTAGS
 CTAGS: ctags-recursive $(HEADERS) $(SOURCES) config.h.in $(TAGS_DEPENDENCIES) \
 		$(TAGS_FILES) $(LISP)
@ -413,19 +430,6 @@ GTAGS:
 distclean-tags:
 	-rm -f TAGS ID GTAGS GRTAGS GSYMS GPATH tags
 DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST)
 top_distdir = .
 distdir = $(PACKAGE)-$(VERSION)
 am__remove_distdir = \
  { test ! -d $(distdir) \
    || { find $(distdir) -type d ! -perm -200 -exec chmod u+w {} ';' \
         && rm -fr $(distdir); }; }
 GZIP_ENV = --best
 distuninstallcheck_listfiles = find . -type f -print
 distcleancheck_listfiles = find . -type f -print
 distdir: $(DISTFILES)
 	$(am__remove_distdir)
@ -441,7 +445,7 @@ distdir: $(DISTFILES)
 	  dir=`echo "$$file" | sed -e 's,/[^/]*$$,,'`; \
 	  if test "$$dir" != "$$file" && test "$$dir" != "."; then \
 	    dir="/$$dir"; \
-	    $(mkinstalldirs) "$(distdir)$$dir"; \
+	    $(mkdir_p) "$(distdir)$$dir"; \
 	  else \
 	    dir=''; \
 	  fi; \
@ -458,13 +462,13 @@ distdir: $(DISTFILES)
 	done
 	list='$(SUBDIRS)'; for subdir in $$list; do \
 	  if test "$$subdir" = .; then :; else \
-	    test -d $(distdir)/$$subdir \
+	    test -d "$(distdir)/$$subdir" \
-	    || mkdir $(distdir)/$$subdir \
+	    || mkdir "$(distdir)/$$subdir" \
 	    || exit 1; \
 	    (cd $$subdir && \
 	      $(MAKE) $(AM_MAKEFLAGS) \
-	        top_distdir="$(top_distdir)" \
+	        top_distdir="../$(top_distdir)" \
-	        distdir=../$(distdir)/$$subdir \
+	        distdir="../$(distdir)/$$subdir" \
 	        distdir) \
 	      || exit 1; \
 	  fi; \
@ -478,6 +482,23 @@ dist-gzip: distdir
 	$(AMTAR) chof - $(distdir) | GZIP=$(GZIP_ENV) gzip -c >$(distdir).tar.gz
 	$(am__remove_distdir)
 dist-bzip2: distdir
 	$(AMTAR) chof - $(distdir) | bzip2 -9 -c >$(distdir).tar.bz2
 	$(am__remove_distdir)
 dist-tarZ: distdir
 	$(AMTAR) chof - $(distdir) | compress -c >$(distdir).tar.Z
 	$(am__remove_distdir)
 dist-shar: distdir
 	shar $(distdir) | GZIP=$(GZIP_ENV) gzip -c >$(distdir).shar.gz
 	$(am__remove_distdir)
 dist-zip: distdir
 	-rm -f $(distdir).zip
 	zip -rq $(distdir).zip $(distdir)
 	$(am__remove_distdir)
 dist dist-all: distdir
 	$(AMTAR) chof - $(distdir) | GZIP=$(GZIP_ENV) gzip -c >$(distdir).tar.gz
 	$(am__remove_distdir)
@ -486,8 +507,18 @@ dist dist-all: distdir
 # it guarantees that the distribution is self-contained by making another
 # tarfile.
 distcheck: dist
-	$(am__remove_distdir)
+	case '$(DIST_ARCHIVES)' in \
-	GZIP=$(GZIP_ENV) gunzip -c $(distdir).tar.gz | $(AMTAR) xf -
+	*.tar.gz*) \
 	  GZIP=$(GZIP_ENV) gunzip -c $(distdir).tar.gz | $(AMTAR) xf - ;;\
 	*.tar.bz2*) \
 	  bunzip2 -c $(distdir).tar.bz2 | $(AMTAR) xf - ;;\
 	*.tar.Z*) \
 	  uncompress -c $(distdir).tar.Z | $(AMTAR) xf - ;;\
 	*.shar.gz*) \
 	  GZIP=$(GZIP_ENV) gunzip -c $(distdir).tar.gz | unshar ;;\
 	*.zip*) \
 	  unzip $(distdir).zip ;;\
 	esac
 	chmod -R a-w $(distdir); chmod a+w $(distdir)
 	mkdir $(distdir)/_build
 	mkdir $(distdir)/_inst
@ -507,21 +538,22 @@ distcheck: dist
 	        distuninstallcheck \
 	  && chmod -R a-w "$$dc_install_base" \
 	  && ({ \
-	       (cd ../.. && $(mkinstalldirs) "$$dc_destdir") \
+	       (cd ../.. && $(mkdir_p) "$$dc_destdir") \
 	       && $(MAKE) $(AM_MAKEFLAGS) DESTDIR="$$dc_destdir" install \
 	       && $(MAKE) $(AM_MAKEFLAGS) DESTDIR="$$dc_destdir" uninstall \
 	       && $(MAKE) $(AM_MAKEFLAGS) DESTDIR="$$dc_destdir" \
 	            distuninstallcheck_dir="$$dc_destdir" distuninstallcheck; \
 	      } || { rm -rf "$$dc_destdir"; exit 1; }) \
 	  && rm -rf "$$dc_destdir" \
-	  && $(MAKE) $(AM_MAKEFLAGS) dist-gzip \
+	  && $(MAKE) $(AM_MAKEFLAGS) dist \
-	  && rm -f $(distdir).tar.gz \
+	  && rm -rf $(DIST_ARCHIVES) \
 	  && $(MAKE) $(AM_MAKEFLAGS) distcleancheck
 	$(am__remove_distdir)
-	@echo "$(distdir).tar.gz is ready for distribution" | \
+	@(echo "$(distdir) archives ready for distribution: "; \
-	  sed 'h;s/./=/g;p;x;p;x'
+	  list='$(DIST_ARCHIVES)'; for i in $$list; do echo $$i; done) | \
 	  sed -e '1{h;s/./=/g;p;x;}' -e '$${p;x;}'
 distuninstallcheck:
-	cd $(distuninstallcheck_dir) \
+	@cd $(distuninstallcheck_dir) \
 	&& test `$(distuninstallcheck_listfiles) | wc -l` -le 1 \
 	   || { echo "ERROR: files left after uninstall:" ; \
 	        if test -n "$(DESTDIR)"; then \
@ -530,11 +562,11 @@ distuninstallcheck:
 	        $(distuninstallcheck_listfiles) ; \
 	        exit 1; } >&2
 distcleancheck: distclean
-	if test '$(srcdir)' = . ; then \
+	@if test '$(srcdir)' = . ; then \
 	  echo "ERROR: distcleancheck can only run from a VPATH build" ; \
 	  exit 1 ; \
 	fi
-	test `$(distcleancheck_listfiles) | wc -l` -eq 0 \
+	@test `$(distcleancheck_listfiles) | wc -l` -eq 0 \
 	  || { echo "ERROR: files left in build directory after distclean:" ; \
 	       $(distcleancheck_listfiles) ; \
 	       exit 1; } >&2
@ -543,7 +575,6 @@ check: check-recursive
 all-am: Makefile $(LIBRARIES) $(PROGRAMS) $(HEADERS) config.h
 installdirs: installdirs-recursive
 installdirs-am:
 install: install-recursive
 install-exec: install-exec-recursive
 install-data: install-data-recursive
@ -555,7 +586,7 @@ install-am: all-am
 installcheck: installcheck-recursive
 install-strip:
 	$(MAKE) $(AM_MAKEFLAGS) INSTALL_PROGRAM="$(INSTALL_STRIP_PROGRAM)" \
-	  INSTALL_STRIP_FLAG=-s \
+	  install_sh_PROGRAM="$(INSTALL_STRIP_PROGRAM)" INSTALL_STRIP_FLAG=-s \
 	  `test -z '$(STRIP)' || \
 	    echo "INSTALL_PROGRAM_ENV=STRIPPROG='$(STRIP)'"` install
 mostlyclean-generic:
@ -563,7 +594,7 @@ mostlyclean-generic:
 clean-generic:
 distclean-generic:
-	-rm -f Makefile $(CONFIG_CLEAN_FILES)
+	-rm -f $(CONFIG_CLEAN_FILES)
 maintainer-clean-generic:
 	@echo "This command is intended for maintainers to use"
@ -575,13 +606,17 @@ clean-am: clean-generic clean-noinstLIBRARIES clean-noinstPROGRAMS \
 distclean: distclean-recursive
 	-rm -f $(am__CONFIG_DISTCLEAN_FILES)
-distclean-am: clean-am distclean-compile distclean-depend \
+	-rm -rf $(DEPDIR) ./$(DEPDIR)
-	distclean-generic distclean-hdr distclean-tags
+	-rm -f Makefile
 distclean-am: clean-am distclean-compile distclean-generic \
 	distclean-hdr distclean-tags
 dvi: dvi-recursive
 dvi-am:
 html: html-recursive
 info: info-recursive
 info-am:
@ -598,7 +633,9 @@ installcheck-am:
 maintainer-clean: maintainer-clean-recursive
 	-rm -f $(am__CONFIG_DISTCLEAN_FILES)
-	-rm -rf autom4te.cache
+	-rm -rf $(top_srcdir)/autom4te.cache
 	-rm -rf $(DEPDIR) ./$(DEPDIR)
 	-rm -f Makefile
 maintainer-clean-am: distclean-am maintainer-clean-generic
 mostlyclean: mostlyclean-recursive
@ -617,24 +654,21 @@ uninstall-am: uninstall-info-am
 uninstall-info: uninstall-info-recursive
-.PHONY: $(RECURSIVE_TARGETS) CTAGS GTAGS all all-am check check-am clean \
+.PHONY: $(RECURSIVE_TARGETS) CTAGS GTAGS all all-am am--refresh check \
-	clean-generic clean-noinstLIBRARIES clean-noinstPROGRAMS \
+	check-am clean clean-generic clean-noinstLIBRARIES \
-	clean-recursive ctags ctags-recursive dist dist-all dist-gzip \
+	clean-noinstPROGRAMS clean-recursive ctags ctags-recursive \
-	distcheck distclean distclean-compile distclean-depend \
+	dist dist-all dist-bzip2 dist-gzip dist-shar dist-tarZ \
 	dist-zip distcheck distclean distclean-compile \
 	distclean-generic distclean-hdr distclean-recursive \
 	distclean-tags distcleancheck distdir distuninstallcheck dvi \
-	dvi-am dvi-recursive info info-am info-recursive install \
+	dvi-am html html-am info info-am install install-am \
-	install-am install-data install-data-am install-data-recursive \
+	install-data install-data-am install-exec install-exec-am \
-	install-exec install-exec-am install-exec-recursive \
+	install-info install-info-am install-man install-strip \
-	install-info install-info-am install-info-recursive install-man \
+	installcheck installcheck-am installdirs installdirs-am \
 	install-recursive install-strip installcheck installcheck-am \
 	installdirs installdirs-am installdirs-recursive \
 	maintainer-clean maintainer-clean-generic \
 	maintainer-clean-recursive mostlyclean mostlyclean-compile \
-	mostlyclean-generic mostlyclean-recursive pdf pdf-am \
+	mostlyclean-generic mostlyclean-recursive pdf pdf-am ps ps-am \
-	pdf-recursive ps ps-am ps-recursive tags tags-recursive \
+	tags tags-recursive uninstall uninstall-am uninstall-info-am
 	uninstall uninstall-am uninstall-info-am \
 	uninstall-info-recursive uninstall-recursive
 # Tell versions [3.59,3.63) of GNU make to not export all variables.
 # Otherwise a system limit (for SysV at least) may be exceeded.
--- a/acinclude.m4
+++ b/acinclude.m4
@ -313,3 +313,656 @@ AH_BOTTOM(
 # define UNUSED
 #endif
 ])])
 AC_DEFUN([LSH_GCC_FUNCTION_NAME],
 [# Check for gcc's __FUNCTION__ variable
 AH_TEMPLATE([HAVE_GCC_FUNCTION],
 	    [Define if the compiler understands __FUNCTION__])
 AH_BOTTOM(
 [#if HAVE_GCC_FUNCTION
 # define FUNCTION_NAME __FUNCTION__
 #else
 # define FUNCTION_NAME "Unknown"
 #endif
 ])
 AC_CACHE_CHECK(for __FUNCTION__,
 	       lsh_cv_c_FUNCTION,
  [ AC_TRY_COMPILE(,
      [ #if __GNUC__ == 3
 	#  error __FUNCTION__ is broken in gcc-3
 	#endif
        void foo(void) { char c = __FUNCTION__[0]; } ],
      lsh_cv_c_FUNCTION=yes,
      lsh_cv_c_FUNCTION=no)])
 if test "x$lsh_cv_c_FUNCTION" = "xyes"; then
  AC_DEFINE(HAVE_GCC_FUNCTION)
 fi
 ])
 # Check for alloca, and include the standard blurb in config.h
 AC_DEFUN([LSH_FUNC_ALLOCA],
 [AC_FUNC_ALLOCA
 AH_BOTTOM(
 [/* AIX requires this to be the first thing in the file.  */
 #ifndef __GNUC__
 # if HAVE_ALLOCA_H
 #  include <alloca.h>
 # else
 #  ifdef _AIX
 #pragma alloca
 #  else
 #   ifndef alloca /* predefined by HP cc +Olibcalls */
 char *alloca ();
 #   endif
 #  endif
 # endif
 #else /* defined __GNUC__ */
 # if HAVE_ALLOCA_H
 #  include <alloca.h>
 # endif
 #endif
 ])])
 AC_DEFUN([LSH_FUNC_STRERROR],
 [AC_CHECK_FUNCS(strerror)
 AH_BOTTOM(
 [#if HAVE_STRERROR
 #define STRERROR strerror
 #else
 #define STRERROR(x) (sys_errlist[x])
 #endif
 ])])
 AC_DEFUN([LSH_FUNC_STRSIGNAL],
 [AC_CHECK_FUNCS(strsignal)
 AC_CHECK_DECLS([sys_siglist, _sys_siglist])
 AH_BOTTOM(
 [#if HAVE_STRSIGNAL
 # define STRSIGNAL strsignal
 #else /* !HAVE_STRSIGNAL */
 # if HAVE_DECL_SYS_SIGLIST
 #  define STRSIGNAL(x) (sys_siglist[x])
 # else
 #  if HAVE_DECL__SYS_SIGLIST
 #   define STRSIGNAL(x) (_sys_siglist[x])
 #  else
 #   define STRSIGNAL(x) "Unknown signal"
 #   if __GNUC__
 #    warning Using dummy STRSIGNAL
 #   endif
 #  endif
 # endif
 #endif /* !HAVE_STRSIGNAL */
 ])])
 dnl @synopsis AX_CREATE_STDINT_H [( HEADER-TO-GENERATE [, HEADERS-TO-CHECK])]
 dnl
 dnl the "ISO C9X: 7.18 Integer types <stdint.h>" section requires the
 dnl existence of an include file <stdint.h> that defines a set of 
 dnl typedefs, especially uint8_t,int32_t,uintptr_t.
 dnl Many older installations will not provide this file, but some will
 dnl have the very same definitions in <inttypes.h>. In other enviroments
 dnl we can use the inet-types in <sys/types.h> which would define the
 dnl typedefs int8_t and u_int8_t respectivly.
 dnl
 dnl This macros will create a local "_stdint.h" or the headerfile given as 
 dnl an argument. In many cases that file will just "#include <stdint.h>" 
 dnl or "#include <inttypes.h>", while in other environments it will provide 
 dnl the set of basic 'stdint's definitions/typedefs: 
 dnl   int8_t,uint8_t,int16_t,uint16_t,int32_t,uint32_t,intptr_t,uintptr_t
 dnl   int_least32_t.. int_fast32_t.. intmax_t
 dnl which may or may not rely on the definitions of other files,
 dnl or using the AC_CHECK_SIZEOF macro to determine the actual
 dnl sizeof each type.
 dnl
 dnl if your header files require the stdint-types you will want to create an
 dnl installable file mylib-int.h that all your other installable header
 dnl may include. So if you have a library package named "mylib", just use
 dnl      AX_CREATE_STDINT_H(mylib-int.h) 
 dnl in configure.ac and go to install that very header file in Makefile.am
 dnl along with the other headers (mylib.h) - and the mylib-specific headers
 dnl can simply use "#include <mylib-int.h>" to obtain the stdint-types.
 dnl
 dnl Remember, if the system already had a valid <stdint.h>, the generated
 dnl file will include it directly. No need for fuzzy HAVE_STDINT_H things...
 dnl
 dnl @, (status: used on new platforms) (see http://ac-archive.sf.net/gstdint/)
 dnl @version $Id: acinclude.m4,v 1.18 2004/02/07 14:21:04 nisse Exp $
 dnl @author  Guido Draheim <guidod@gmx.de> 
 AC_DEFUN([AX_CREATE_STDINT_H],
 [# ------ AX CREATE STDINT H -------------------------------------
 AC_MSG_CHECKING([for stdint types])
 ac_stdint_h=`echo ifelse($1, , _stdint.h, $1)`
 # try to shortcircuit - if the default include path of the compiler
 # can find a "stdint.h" header then we assume that all compilers can.
 AC_CACHE_VAL([ac_cv_header_stdint_t],[
 old_CXXFLAGS="$CXXFLAGS" ; CXXFLAGS=""
 old_CPPFLAGS="$CPPFLAGS" ; CPPFLAGS=""
 old_CFLAGS="$CFLAGS"     ; CFLAGS=""
 AC_TRY_COMPILE([#include <stdint.h>],[int_least32_t v = 0;],
 [ac_cv_stdint_result="(assuming C99 compatible system)"
 ac_cv_header_stdint_t="stdint.h"; ],
 [ac_cv_header_stdint_t=""])
 CXXFLAGS="$old_CXXFLAGS"
 CPPFLAGS="$old_CPPFLAGS"
 CFLAGS="$old_CFLAGS" ])
 v="... $ac_cv_header_stdint_h"
 if test "$ac_stdint_h" = "stdint.h" ; then
 AC_MSG_RESULT([(are you sure you want them in ./stdint.h?)])
 elif test "$ac_stdint_h" = "inttypes.h" ; then
 AC_MSG_RESULT([(are you sure you want them in ./inttypes.h?)])
 elif test "_$ac_cv_header_stdint_t" = "_" ; then
 AC_MSG_RESULT([(putting them into $ac_stdint_h)$v])
 else
 ac_cv_header_stdint="$ac_cv_header_stdint_t"
 AC_MSG_RESULT([$ac_cv_header_stdint (shortcircuit)])
 fi
 if test "_$ac_cv_header_stdint_t" = "_" ; then # can not shortcircuit..
 dnl .....intro message done, now do a few system checks.....
 dnl btw, all CHECK_TYPE macros do automatically "DEFINE" a type, therefore
 dnl we use the autoconf implementation detail _AC CHECK_TYPE_NEW instead
 inttype_headers=`echo $2 | sed -e 's/,/ /g'`
 ac_cv_stdint_result="(no helpful system typedefs seen)"
 AC_CACHE_CHECK([for stdint uintptr_t], [ac_cv_header_stdint_x],[
 ac_cv_header_stdint_x="" # the 1997 typedefs (inttypes.h)
  AC_MSG_RESULT([(..)])
  for i in stdint.h inttypes.h sys/inttypes.h $inttype_headers ; do
   unset ac_cv_type_uintptr_t 
   unset ac_cv_type_uint64_t
   _AC_CHECK_TYPE_NEW(uintptr_t,[ac_cv_header_stdint_x=$i],dnl
     continue,[#include <$i>])
   AC_CHECK_TYPE(uint64_t,[and64="/uint64_t"],[and64=""],[#include<$i>])
   ac_cv_stdint_result="(seen uintptr_t$and64 in $i)"
   break;
  done
  AC_MSG_CHECKING([for stdint uintptr_t])
 ])
 if test "_$ac_cv_header_stdint_x" = "_" ; then
 AC_CACHE_CHECK([for stdint uint32_t], [ac_cv_header_stdint_o],[
 ac_cv_header_stdint_o="" # the 1995 typedefs (sys/inttypes.h)
  AC_MSG_RESULT([(..)])
  for i in inttypes.h sys/inttypes.h stdint.h $inttype_headers ; do
   unset ac_cv_type_uint32_t
   unset ac_cv_type_uint64_t
   AC_CHECK_TYPE(uint32_t,[ac_cv_header_stdint_o=$i],dnl
     continue,[#include <$i>])
   AC_CHECK_TYPE(uint64_t,[and64="/uint64_t"],[and64=""],[#include<$i>])
   ac_cv_stdint_result="(seen uint32_t$and64 in $i)"
   break;
  done
  AC_MSG_CHECKING([for stdint uint32_t])
 ])
 fi
 if test "_$ac_cv_header_stdint_x" = "_" ; then
 if test "_$ac_cv_header_stdint_o" = "_" ; then
 AC_CACHE_CHECK([for stdint u_int32_t], [ac_cv_header_stdint_u],[
 ac_cv_header_stdint_u="" # the BSD typedefs (sys/types.h)
  AC_MSG_RESULT([(..)])
  for i in sys/types.h inttypes.h sys/inttypes.h $inttype_headers ; do
   unset ac_cv_type_u_int32_t
   unset ac_cv_type_u_int64_t
   AC_CHECK_TYPE(u_int32_t,[ac_cv_header_stdint_u=$i],dnl
     continue,[#include <$i>])
   AC_CHECK_TYPE(u_int64_t,[and64="/u_int64_t"],[and64=""],[#include<$i>])
   ac_cv_stdint_result="(seen u_int32_t$and64 in $i)"
   break;
  done
  AC_MSG_CHECKING([for stdint u_int32_t])
 ])
 fi fi
 dnl if there was no good C99 header file, do some typedef checks...
 if test "_$ac_cv_header_stdint_x" = "_" ; then
   AC_MSG_CHECKING([for stdint datatype model])
   AC_MSG_RESULT([(..)])
   AC_CHECK_SIZEOF(char)
   AC_CHECK_SIZEOF(short)
   AC_CHECK_SIZEOF(int)
   AC_CHECK_SIZEOF(long)
   AC_CHECK_SIZEOF(void*)
   ac_cv_stdint_char_model=""
   ac_cv_stdint_char_model="$ac_cv_stdint_char_model$ac_cv_sizeof_char"
   ac_cv_stdint_char_model="$ac_cv_stdint_char_model$ac_cv_sizeof_short"
   ac_cv_stdint_char_model="$ac_cv_stdint_char_model$ac_cv_sizeof_int"
   ac_cv_stdint_long_model=""
   ac_cv_stdint_long_model="$ac_cv_stdint_long_model$ac_cv_sizeof_int"
   ac_cv_stdint_long_model="$ac_cv_stdint_long_model$ac_cv_sizeof_long"
   ac_cv_stdint_long_model="$ac_cv_stdint_long_model$ac_cv_sizeof_voidp"
   name="$ac_cv_stdint_long_model"
   case "$ac_cv_stdint_char_model/$ac_cv_stdint_long_model" in
    122/242)     name="$name,  IP16 (standard 16bit machine)" ;;
    122/244)     name="$name,  LP32 (standard 32bit mac/win)" ;;
    122/*)       name="$name        (unusual int16 model)" ;; 
    124/444)     name="$name, ILP32 (standard 32bit unixish)" ;;
    124/488)     name="$name,  LP64 (standard 64bit unixish)" ;;
    124/448)     name="$name, LLP64 (unusual  64bit unixish)" ;;
    124/*)       name="$name        (unusual int32 model)" ;; 
    128/888)     name="$name, ILP64 (unusual  64bit numeric)" ;;
    128/*)       name="$name        (unusual int64 model)" ;; 
    222/*|444/*) name="$name        (unusual dsptype)" ;;
     *)          name="$name        (very unusal model)" ;;
   esac
   AC_MSG_RESULT([combined for stdint datatype model...  $name])
 fi
 if test "_$ac_cv_header_stdint_x" != "_" ; then
   ac_cv_header_stdint="$ac_cv_header_stdint_x"
 elif  test "_$ac_cv_header_stdint_o" != "_" ; then
   ac_cv_header_stdint="$ac_cv_header_stdint_o"
 elif  test "_$ac_cv_header_stdint_u" != "_" ; then
   ac_cv_header_stdint="$ac_cv_header_stdint_u"
 else
   ac_cv_header_stdint="stddef.h"
 fi
 AC_MSG_CHECKING([for extra inttypes in chosen header])
 AC_MSG_RESULT([($ac_cv_header_stdint)])
 dnl see if int_least and int_fast types are present in _this_ header.
 unset ac_cv_type_int_least32_t
 unset ac_cv_type_int_fast32_t
 AC_CHECK_TYPE(int_least32_t,,,[#include <$ac_cv_header_stdint>])
 AC_CHECK_TYPE(int_fast32_t,,,[#include<$ac_cv_header_stdint>])
 AC_CHECK_TYPE(intmax_t,,,[#include <$ac_cv_header_stdint>])
 fi # shortcircut to system "stdint.h"
 # ------------------ PREPARE VARIABLES ------------------------------
 if test "$GCC" = "yes" ; then
 ac_cv_stdint_message="using gnu compiler "`$CC --version | head -1` 
 else
 ac_cv_stdint_message="using $CC"
 fi
 AC_MSG_RESULT([make use of $ac_cv_header_stdint in $ac_stdint_h dnl
 $ac_cv_stdint_result])
 # ----------------- DONE inttypes.h checks START header -------------
 AC_CONFIG_COMMANDS([$ac_stdint_h],[
 AC_MSG_NOTICE(creating $ac_stdint_h : $_ac_stdint_h)
 ac_stdint=$tmp/_stdint.h
 echo "#ifndef" $_ac_stdint_h >$ac_stdint
 echo "#define" $_ac_stdint_h "1" >>$ac_stdint
 echo "#ifndef" _GENERATED_STDINT_H >>$ac_stdint
 echo "#define" _GENERATED_STDINT_H '"'$PACKAGE $VERSION'"' >>$ac_stdint
 echo "/* generated $ac_cv_stdint_message */" >>$ac_stdint
 if test "_$ac_cv_header_stdint_t" != "_" ; then 
 echo "#define _STDINT_HAVE_STDINT_H" "1" >>$ac_stdint
 fi
 cat >>$ac_stdint <<STDINT_EOF
 /* ................... shortcircuit part ........................... */
 #if defined HAVE_STDINT_H || defined _STDINT_HAVE_STDINT_H
 #include <stdint.h>
 #else
 #include <stddef.h>
 /* .................... configured part ............................ */
 STDINT_EOF
 echo "/* whether we have a C99 compatible stdint header file */" >>$ac_stdint
 if test "_$ac_cv_header_stdint_x" != "_" ; then
  ac_header="$ac_cv_header_stdint_x"
  echo "#define _STDINT_HEADER_INTPTR" '"'"$ac_header"'"' >>$ac_stdint
 else
  echo "/* #undef _STDINT_HEADER_INTPTR */" >>$ac_stdint
 fi
 echo "/* whether we have a C96 compatible inttypes header file */" >>$ac_stdint
 if  test "_$ac_cv_header_stdint_o" != "_" ; then
  ac_header="$ac_cv_header_stdint_o"
  echo "#define _STDINT_HEADER_UINT32" '"'"$ac_header"'"' >>$ac_stdint
 else
  echo "/* #undef _STDINT_HEADER_UINT32 */" >>$ac_stdint
 fi
 echo "/* whether we have a BSD compatible inet types header */" >>$ac_stdint
 if  test "_$ac_cv_header_stdint_u" != "_" ; then
  ac_header="$ac_cv_header_stdint_u"
  echo "#define _STDINT_HEADER_U_INT32" '"'"$ac_header"'"' >>$ac_stdint
 else
  echo "/* #undef _STDINT_HEADER_U_INT32 */" >>$ac_stdint
 fi
 echo "" >>$ac_stdint
 if test "_$ac_header" != "_" ; then if test "$ac_header" != "stddef.h" ; then
  echo "#include <$ac_header>" >>$ac_stdint
  echo "" >>$ac_stdint
 fi fi
 echo "/* which 64bit typedef has been found */" >>$ac_stdint
 if test "$ac_cv_type_uint64_t" = "yes" ; then
 echo "#define   _STDINT_HAVE_UINT64_T" "1"  >>$ac_stdint
 else
 echo "/* #undef _STDINT_HAVE_UINT64_T */" >>$ac_stdint
 fi
 if test "$ac_cv_type_u_int64_t" = "yes" ; then
 echo "#define   _STDINT_HAVE_U_INT64_T" "1"  >>$ac_stdint
 else
 echo "/* #undef _STDINT_HAVE_U_INT64_T */" >>$ac_stdint
 fi
 echo "" >>$ac_stdint
 echo "/* which type model has been detected */" >>$ac_stdint
 if test "_$ac_cv_stdint_char_model" != "_" ; then
 echo "#define   _STDINT_CHAR_MODEL" "$ac_cv_stdint_char_model" >>$ac_stdint
 echo "#define   _STDINT_LONG_MODEL" "$ac_cv_stdint_long_model" >>$ac_stdint
 else
 echo "/* #undef _STDINT_CHAR_MODEL // skipped */" >>$ac_stdint
 echo "/* #undef _STDINT_LONG_MODEL // skipped */" >>$ac_stdint
 fi
 echo "" >>$ac_stdint
 echo "/* whether int_least types were detected */" >>$ac_stdint
 if test "$ac_cv_type_int_least32_t" = "yes"; then
 echo "#define   _STDINT_HAVE_INT_LEAST32_T" "1"  >>$ac_stdint
 else
 echo "/* #undef _STDINT_HAVE_INT_LEAST32_T */" >>$ac_stdint
 fi
 echo "/* whether int_fast types were detected */" >>$ac_stdint
 if test "$ac_cv_type_int_fast32_t" = "yes"; then
 echo "#define   _STDINT_HAVE_INT_FAST32_T" "1" >>$ac_stdint
 else
 echo "/* #undef _STDINT_HAVE_INT_FAST32_T */" >>$ac_stdint
 fi
 echo "/* whether intmax_t type was detected */" >>$ac_stdint
 if test "$ac_cv_type_intmax_t" = "yes"; then
 echo "#define   _STDINT_HAVE_INTMAX_T" "1" >>$ac_stdint
 else
 echo "/* #undef _STDINT_HAVE_INTMAX_T */" >>$ac_stdint
 fi
 echo "" >>$ac_stdint
  cat >>$ac_stdint <<STDINT_EOF
 /* .................... detections part ............................ */
 /* whether we need to define bitspecific types from compiler base types */
 #ifndef _STDINT_HEADER_INTPTR
 #ifndef _STDINT_HEADER_UINT32
 #ifndef _STDINT_HEADER_U_INT32
 #define _STDINT_NEED_INT_MODEL_T
 #else
 #define _STDINT_HAVE_U_INT_TYPES
 #endif
 #endif
 #endif
 #ifdef _STDINT_HAVE_U_INT_TYPES
 #undef _STDINT_NEED_INT_MODEL_T
 #endif
 #ifdef  _STDINT_CHAR_MODEL
 #if     _STDINT_CHAR_MODEL+0 == 122 || _STDINT_CHAR_MODEL+0 == 124
 #ifndef _STDINT_BYTE_MODEL
 #define _STDINT_BYTE_MODEL 12
 #endif
 #endif
 #endif
 #ifndef _STDINT_HAVE_INT_LEAST32_T
 #define _STDINT_NEED_INT_LEAST_T
 #endif
 #ifndef _STDINT_HAVE_INT_FAST32_T
 #define _STDINT_NEED_INT_FAST_T
 #endif
 #ifndef _STDINT_HEADER_INTPTR
 #define _STDINT_NEED_INTPTR_T
 #ifndef _STDINT_HAVE_INTMAX_T
 #define _STDINT_NEED_INTMAX_T
 #endif
 #endif
 /* .................... definition part ............................ */
 /* some system headers have good uint64_t */
 #ifndef _HAVE_UINT64_T
 #if     defined _STDINT_HAVE_UINT64_T  || defined HAVE_UINT64_T
 #define _HAVE_UINT64_T
 #elif   defined _STDINT_HAVE_U_INT64_T || defined HAVE_U_INT64_T
 #define _HAVE_UINT64_T
 typedef u_int64_t uint64_t;
 #endif
 #endif
 #ifndef _HAVE_UINT64_T
 /* .. here are some common heuristics using compiler runtime specifics */
 #if defined __STDC_VERSION__ && defined __STDC_VERSION__ >= 199901L
 #define _HAVE_UINT64_T
 typedef long long int64_t;
 typedef unsigned long long uint64_t;
 #elif !defined __STRICT_ANSI__
 #if defined _MSC_VER || defined __WATCOMC__ || defined __BORLANDC__
 #define _HAVE_UINT64_T
 typedef __int64 int64_t;
 typedef unsigned __int64 uint64_t;
 #elif defined __GNUC__ || defined __MWERKS__ || defined __ELF__
 /* note: all ELF-systems seem to have loff-support which needs 64-bit */
 #if !defined _NO_LONGLONG
 #define _HAVE_UINT64_T
 typedef long long int64_t;
 typedef unsigned long long uint64_t;
 #endif
 #elif defined __alpha || (defined __mips && defined _ABIN32)
 #if !defined _NO_LONGLONG
 typedef long int64_t;
 typedef unsigned long uint64_t;
 #endif
  /* compiler/cpu type to define int64_t */
 #endif
 #endif
 #endif
 #if defined _STDINT_HAVE_U_INT_TYPES
 /* int8_t int16_t int32_t defined by inet code, redeclare the u_intXX types */
 typedef u_int8_t uint8_t;
 typedef u_int16_t uint16_t;
 typedef u_int32_t uint32_t;
 /* glibc compatibility */
 #ifndef __int8_t_defined
 #define __int8_t_defined
 #endif
 #endif
 #ifdef _STDINT_NEED_INT_MODEL_T
 /* we must guess all the basic types. Apart from byte-adressable system, */
 /* there a few 32-bit-only dsp-systems that we guard with BYTE_MODEL 8-} */
 /* (btw, those nibble-addressable systems are way off, or so we assume) */
 dnl   /* have a look at "64bit and data size neutrality" at */
 dnl   /* http://unix.org/version2/whatsnew/login_64bit.html */
 dnl   /* (the shorthand "ILP" types always have a "P" part) */
 #if defined _STDINT_BYTE_MODEL
 #if _STDINT_LONG_MODEL+0 == 242
 /* 2:4:2 =  IP16 = a normal 16-bit system                */
 typedef unsigned char   uint8_t;
 typedef unsigned short  uint16_t;
 typedef unsigned long   uint32_t;
 #ifndef __int8_t_defined
 #define __int8_t_defined
 typedef          char    int8_t;
 typedef          short   int16_t;
 typedef          long    int32_t;
 #endif
 #elif _STDINT_LONG_MODEL+0 == 244 || _STDINT_LONG_MODEL == 444
 /* 2:4:4 =  LP32 = a 32-bit system derived from a 16-bit */
 /* 4:4:4 = ILP32 = a normal 32-bit system                */
 typedef unsigned char   uint8_t;
 typedef unsigned short  uint16_t;
 typedef unsigned int    uint32_t;
 #ifndef __int8_t_defined
 #define __int8_t_defined
 typedef          char    int8_t;
 typedef          short   int16_t;
 typedef          int     int32_t;
 #endif
 #elif _STDINT_LONG_MODEL+0 == 484 || _STDINT_LONG_MODEL+0 == 488
 /* 4:8:4 =  IP32 = a 32-bit system prepared for 64-bit    */
 /* 4:8:8 =  LP64 = a normal 64-bit system                 */
 typedef unsigned char   uint8_t;
 typedef unsigned short  uint16_t;
 typedef unsigned int    uint32_t;
 #ifndef __int8_t_defined
 #define __int8_t_defined
 typedef          char    int8_t;
 typedef          short   int16_t;
 typedef          int     int32_t;
 #endif
 /* this system has a "long" of 64bit */
 #ifndef _HAVE_UINT64_T
 #define _HAVE_UINT64_T
 typedef unsigned long   uint64_t;
 typedef          long    int64_t;
 #endif
 #elif _STDINT_LONG_MODEL+0 == 448
 /*      LLP64   a 64-bit system derived from a 32-bit system */
 typedef unsigned char   uint8_t;
 typedef unsigned short  uint16_t;
 typedef unsigned int    uint32_t;
 #ifndef __int8_t_defined
 #define __int8_t_defined
 typedef          char    int8_t;
 typedef          short   int16_t;
 typedef          int     int32_t;
 #endif
 /* assuming the system has a "long long" */
 #ifndef _HAVE_UINT64_T
 #define _HAVE_UINT64_T
 typedef unsigned long long uint64_t;
 typedef          long long  int64_t;
 #endif
 #else
 #define _STDINT_NO_INT32_T
 #endif
 #else
 #define _STDINT_NO_INT8_T
 #define _STDINT_NO_INT32_T
 #endif
 #endif
 /*
 * quote from SunOS-5.8 sys/inttypes.h:
 * Use at your own risk.  As of February 1996, the committee is squarely
 * behind the fixed sized types; the "least" and "fast" types are still being
 * discussed.  The probability that the "fast" types may be removed before
 * the standard is finalized is high enough that they are not currently
 * implemented.
 */
 #if defined _STDINT_NEED_INT_LEAST_T
 typedef  int8_t    int_least8_t;
 typedef  int16_t   int_least16_t;
 typedef  int32_t   int_least32_t;
 #ifdef _HAVE_UINT64_T
 typedef  int64_t   int_least64_t;
 #endif
 typedef uint8_t   uint_least8_t;
 typedef uint16_t  uint_least16_t;
 typedef uint32_t  uint_least32_t;
 #ifdef _HAVE_UINT64_T
 typedef uint64_t  uint_least64_t;
 #endif
  /* least types */
 #endif
 #if defined _STDINT_NEED_INT_FAST_T
 typedef  int8_t    int_fast8_t; 
 typedef  int       int_fast16_t;
 typedef  int32_t   int_fast32_t;
 #ifdef _HAVE_UINT64_T
 typedef  int64_t   int_fast64_t;
 #endif
 typedef uint8_t   uint_fast8_t; 
 typedef unsigned  uint_fast16_t;
 typedef uint32_t  uint_fast32_t;
 #ifdef _HAVE_UINT64_T
 typedef uint64_t  uint_fast64_t;
 #endif
  /* fast types */
 #endif
 #ifdef _STDINT_NEED_INTMAX_T
 #ifdef _HAVE_UINT64_T
 typedef  int64_t       intmax_t;
 typedef uint64_t      uintmax_t;
 #else
 typedef          long  intmax_t;
 typedef unsigned long uintmax_t;
 #endif
 #endif
 #ifdef _STDINT_NEED_INTPTR_T
 #ifndef __intptr_t_defined
 #define __intptr_t_defined
 /* we encourage using "long" to store pointer values, never use "int" ! */
 #if   _STDINT_LONG_MODEL+0 == 242 || _STDINT_LONG_MODEL+0 == 484
 typedef  unsinged int   uintptr_t;
 typedef           int    intptr_t;
 #elif _STDINT_LONG_MODEL+0 == 244 || _STDINT_LONG_MODEL+0 == 444
 typedef  unsigned long  uintptr_t;
 typedef           long   intptr_t;
 #elif _STDINT_LONG_MODEL+0 == 448 && defined _HAVE_UINT64_T
 typedef        uint64_t uintptr_t;
 typedef         int64_t  intptr_t;
 #else /* matches typical system types ILP32 and LP64 - but not IP16 or LLP64 */
 typedef  unsigned long  uintptr_t;
 typedef           long   intptr_t;
 #endif
 #endif
 #endif
  /* shortcircuit*/
 #endif
  /* once */
 #endif
 #endif
 STDINT_EOF
    if cmp -s $ac_stdint_h $ac_stdint 2>/dev/null; then
      AC_MSG_NOTICE([$ac_stdint_h is unchanged])
    else
      ac_dir=`AS_DIRNAME(["$ac_stdint_h"])`
      AS_MKDIR_P(["$ac_dir"])
      rm -f $ac_stdint_h
      mv $ac_stdint $ac_stdint_h
    fi
 ],[# variables for create stdint.h replacement
 PACKAGE="$PACKAGE"
 VERSION="$VERSION"
 ac_stdint_h="$ac_stdint_h"
 _ac_stdint_h=AS_TR_CPP(_$PACKAGE-$ac_stdint_h)
 ac_cv_stdint_message="$ac_cv_stdint_message"
 ac_cv_header_stdint_t="$ac_cv_header_stdint_t"
 ac_cv_header_stdint_x="$ac_cv_header_stdint_x"
 ac_cv_header_stdint_o="$ac_cv_header_stdint_o"
 ac_cv_header_stdint_u="$ac_cv_header_stdint_u"
 ac_cv_type_uint64_t="$ac_cv_type_uint64_t"
 ac_cv_type_u_int64_t="$ac_cv_type_u_int64_t"
 ac_cv_stdint_char_model="$ac_cv_stdint_char_model"
 ac_cv_stdint_long_model="$ac_cv_stdint_long_model"
 ac_cv_type_int_least32_t="$ac_cv_type_int_least32_t"
 ac_cv_type_int_fast32_t="$ac_cv_type_int_fast32_t"
 ac_cv_type_intmax_t="$ac_cv_type_intmax_t"
 ])
 ])
--- a/aclocal.m4
+++ b/aclocal.m4
--- a/argp-ba.c
+++ b/argp-ba.c
@ -1,5 +1,5 @@
 /* Default definition for ARGP_PROGRAM_BUG_ADDRESS.
-   Copyright (C) 1996, 1997, 1999 Free Software Foundation, Inc.
+   Copyright (C) 1996, 1997, 1999, 2004 Free Software Foundation, Inc.
   This file is part of the GNU C Library.
   Written by Miles Bader <miles@gnu.ai.mit.edu>.
@ -23,4 +23,4 @@
   the ARGP_HELP_BUG_ADDR flag is set (as it is by various standard help
   messages), embedded in a sentence that says something like `Report bugs to
   ADDR.'.  */
-const char *argp_program_bug_address;
+const char *argp_program_bug_address = 0;
--- a/argp-help.c
+++ b/argp-help.c
@ -26,24 +26,20 @@
 #include <config.h>
 #endif
-#ifndef alloca
+/* AIX requires this to be the first thing in the file.  */
-# ifdef __GNUC__
+#ifndef __GNUC__
-#  define alloca __builtin_alloca
+# if HAVE_ALLOCA_H
 #  define HAVE_ALLOCA 1
 # else
 #  if defined HAVE_ALLOCA_H || defined _LIBC
 #  include <alloca.h>
 # else
 #  ifdef _AIX
 #pragma alloca
 #  else
-#    ifndef alloca
+#   ifndef alloca /* predefined by HP cc +Olibcalls */
 char *alloca ();
 #   endif
 #  endif
 # endif
 #endif
 #endif
 #include <stddef.h>
 #include <stdlib.h>
--- a/argp-parse.c
+++ b/argp-parse.c
@ -26,6 +26,21 @@
 #include <config.h>
 #endif
 /* AIX requires this to be the first thing in the file.  */
 #ifndef __GNUC__
 # if HAVE_ALLOCA_H
 #  include <alloca.h>
 # else
 #  ifdef _AIX
 #pragma alloca
 #  else
 #   ifndef alloca /* predefined by HP cc +Olibcalls */
 char *alloca ();
 #   endif
 #  endif
 # endif
 #endif
 #include <stdlib.h>
 #include <string.h>
 #include <unistd.h>
--- a/argp-pv.c
+++ b/argp-pv.c
@ -1,5 +1,5 @@
 /* Default definition for ARGP_PROGRAM_VERSION.
-   Copyright (C) 1996, 1997, 1999 Free Software Foundation, Inc.
+   Copyright (C) 1996, 1997, 1999, 2004 Free Software Foundation, Inc.
   This file is part of the GNU C Library.
   Written by Miles Bader <miles@gnu.ai.mit.edu>.
@ -22,4 +22,4 @@
   --version is added (unless the ARGP_NO_HELP flag is used), which will
   print this this string followed by a newline and exit (unless the
   ARGP_NO_EXIT flag is used).  Overridden by ARGP_PROGRAM_VERSION_HOOK.  */
-const char *argp_program_version;
+const char *argp_program_version = 0;
--- a/argp-pvh.c
+++ b/argp-pvh.c
@ -1,5 +1,5 @@
 /* Default definition for ARGP_PROGRAM_VERSION_HOOK.
-   Copyright (C) 1996, 1997, 1999 Free Software Foundation, Inc.
+   Copyright (C) 1996, 1997, 1999, 2004 Free Software Foundation, Inc.
   This file is part of the GNU C Library.
   Written by Miles Bader <miles@gnu.ai.mit.edu>.
@ -29,4 +29,4 @@
   this function with a stream to print the version to and a pointer to the
   current parsing state, and then exits (unless the ARGP_NO_EXIT flag is
   used).  This variable takes precedent over ARGP_PROGRAM_VERSION.  */
-void (*argp_program_version_hook) (FILE *stream, struct argp_state *state);
+void (*argp_program_version_hook) (FILE *stream, struct argp_state *state) = 0;
--- a/argp.h
+++ b/argp.h
@ -40,6 +40,15 @@ typedef int error_t;
 # define __error_t_defined
 #endif
 /* FIXME: What's the right way to check for __restrict? Sun's cc seems
   not to have it. Perhaps it's easiest to just delete the use of
   __restrict from the prototypes. */
 #ifndef __restrict
 # ifndef __GNUC___
 #  define __restrict
 # endif
 #endif
 /* NOTE: We can't use the autoconf tests, since this is supposed to be
   an installed header file and argp's config.h is of course not
   installed. */
--- a/config.h.in
+++ b/config.h.in
@ -135,9 +135,11 @@
 /* Define to empty if `const' does not conform to ANSI C. */
 #undef const
-/* Define as `__inline' if that's what the C compiler calls it, or to nothing
+/* Define to `__inline__' or `__inline' if that's what the C compiler
-   if it is not supported. */
+   calls it, or to nothing if 'inline' is not supported under any name.  */
 #ifndef __cplusplus
 #undef inline
 #endif
 /* Define to `unsigned' if <sys/types.h> does not define. */
 #undef size_t
--- a/1658
+++ b/1658
--- a/configure.ac
+++ b/configure.ac
@ -3,7 +3,7 @@ dnl Process this file with autoconf to produce a configure script.
 dnl This configure.ac is only for building a standalone argp library.
 AC_PREREQ(2.54)
 AC_INIT(argp-ba.c)
-AM_INIT_AUTOMAKE(argp, standalone-1.2)
+AM_INIT_AUTOMAKE(argp, standalone-1.3)
 AM_CONFIG_HEADER(config.h)
 # GNU libc defaults to supplying the ISO C library functions only. The
--- a/281
+++ b/281
@ -1,7 +1,9 @@
 #! /bin/sh
 # depcomp - compile a program generating dependencies as side-effects
-# Copyright 1999, 2000 Free Software Foundation, Inc.
+
 scriptversion=2003-11-08.23
 # Copyright (C) 1999, 2000, 2003 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
@ -25,13 +27,52 @@
 # Originally written by Alexandre Oliva <oliva@dcc.unicamp.br>.
 case $1 in
  '')
     echo "$0: No command.  Try \`$0 --help' for more information." 1>&2
     exit 1;
     ;;
  -h | --h*)
    cat <<\EOF
 Usage: depcomp [--help] [--version] PROGRAM [ARGS]
 Run PROGRAMS ARGS to compile a file, generating dependencies
 as side-effects.
 Environment variables:
  depmode     Dependency tracking mode.
  source      Source file read by `PROGRAMS ARGS'.
  object      Object file output by `PROGRAMS ARGS'.
  depfile     Dependency file to output.
  tmpdepfile  Temporary file to use when outputing dependencies.
  libtool     Whether libtool is used (yes/no).
 Report bugs to <bug-automake@gnu.org>.
 EOF
    exit 0
    ;;
  -v | --v*)
    echo "depcomp $scriptversion"
    exit 0
    ;;
 esac
 if test -z "$depmode" || test -z "$source" || test -z "$object"; then
  echo "depcomp: Variables source, object and depmode must be set" 1>&2
  exit 1
 fi
 # `libtool' can also be set to `yes' or `no'.
-depfile=${depfile-`echo "$object" | sed 's,\([^/]*\)$,.deps/\1,;s/\.\([^.]*\)$/.P\1/'`}
+if test -z "$depfile"; then
   base=`echo "$object" | sed -e 's,^.*/,,' -e 's,\.\([^.]*\)$,.P\1,'`
   dir=`echo "$object" | sed 's,/.*$,/,'`
   if test "$dir" = "$object"; then
      dir=
   fi
   # FIXME: should be _deps on DOS.
   depfile="$dir.deps/$base"
 fi
 tmpdepfile=${tmpdepfile-`echo "$depfile" | sed 's/\.\([^.]*\)$/.T\1/'`}
 rm -f "$tmpdepfile"
@ -163,19 +204,25 @@ sgi)
 aix)
  # The C for AIX Compiler uses -M and outputs the dependencies
-  # in a .u file.  This file always lives in the current directory.
+  # in a .u file.  In older versions, this file always lives in the
-  # Also, the AIX compiler puts `$object:' at the start of each line;
+  # current directory.  Also, the AIX compiler puts `$object:' at the
-  # $object doesn't have directory information.
+  # start of each line; $object doesn't have directory information.
-  stripped=`echo "$object" | sed -e 's,^.*/,,' -e 's/\(.*\)\..*$/\1/'`
+  # Version 6 uses the directory in both cases.
  stripped=`echo "$object" | sed 's/\(.*\)\..*$/\1/'`
  tmpdepfile="$stripped.u"
  outname="$stripped.o"
  if test "$libtool" = yes; then
    "$@" -Wc,-M
  else
    "$@" -M
  fi
  stat=$?
  if test -f "$tmpdepfile"; then :
  else
    stripped=`echo "$stripped" | sed 's,^.*/,,'`
    tmpdepfile="$stripped.u"
  fi
  if test $stat -eq 0; then :
  else
    rm -f "$tmpdepfile"
@ -183,6 +230,7 @@ aix)
  fi
  if test -f "$tmpdepfile"; then
    outname="$stripped.o"
    # Each line is of the form `foo.o: dependent.h'.
    # Do two passes, one to just change these to
    # `$object: dependent.h' and one to simply `dependent.h:'.
@ -197,18 +245,61 @@ aix)
  rm -f "$tmpdepfile"
  ;;
 icc)
  # Intel's C compiler understands `-MD -MF file'.  However on
  #    icc -MD -MF foo.d -c -o sub/foo.o sub/foo.c
  # ICC 7.0 will fill foo.d with something like
  #    foo.o: sub/foo.c
  #    foo.o: sub/foo.h
  # which is wrong.  We want:
  #    sub/foo.o: sub/foo.c
  #    sub/foo.o: sub/foo.h
  #    sub/foo.c:
  #    sub/foo.h:
  # ICC 7.1 will output
  #    foo.o: sub/foo.c sub/foo.h
  # and will wrap long lines using \ :
  #    foo.o: sub/foo.c ... \
  #     sub/foo.h ... \
  #     ...
  "$@" -MD -MF "$tmpdepfile"
  stat=$?
  if test $stat -eq 0; then :
  else
    rm -f "$tmpdepfile"
    exit $stat
  fi
  rm -f "$depfile"
  # Each line is of the form `foo.o: dependent.h',
  # or `foo.o: dep1.h dep2.h \', or ` dep3.h dep4.h \'.
  # Do two passes, one to just change these to
  # `$object: dependent.h' and one to simply `dependent.h:'.
  sed "s,^[^:]*:,$object :," < "$tmpdepfile" > "$depfile"
  # Some versions of the HPUX 10.20 sed can't process this invocation
  # correctly.  Breaking it into two sed invocations is a workaround.
  sed 's,^[^:]*: \(.*\)$,\1,;s/^\\$//;/^$/d;/:$/d' < "$tmpdepfile" |
    sed -e 's/$/ :/' >> "$depfile"
  rm -f "$tmpdepfile"
  ;;
 tru64)
-   # The Tru64 AIX compiler uses -MD to generate dependencies as a side
+   # The Tru64 compiler uses -MD to generate dependencies as a side
   # effect.  `cc -MD -o foo.o ...' puts the dependencies into `foo.o.d'.
   # At least on Alpha/Redhat 6.1, Compaq CCC V6.2-504 seems to put
   # dependencies in `foo.d' instead, so we check for that too.
   # Subdirectories are respected.
   dir=`echo "$object" | sed -e 's|/[^/]*$|/|'`
   test "x$dir" = "x$object" && dir=
   base=`echo "$object" | sed -e 's|^.*/||' -e 's/\.o$//' -e 's/\.lo$//'`
   tmpdepfile1="$object.d"
   tmpdepfile2=`echo "$object" | sed -e 's/.o$/.d/'` 
   if test "$libtool" = yes; then
      tmpdepfile1="$dir.libs/$base.lo.d"
      tmpdepfile2="$dir.libs/$base.d"
      "$@" -Wc,-MD
   else
      tmpdepfile1="$dir$base.o.d"
      tmpdepfile2="$dir$base.d"
      "$@" -MD
   fi
@ -226,7 +317,7 @@ tru64)
   fi
   if test -f "$tmpdepfile"; then
      sed -e "s,^.*\.[a-z]*:,$object:," < "$tmpdepfile" > "$depfile"
-      # That's a space and a tab in the [].
+      # That's a tab and a space in the [].
      sed -e 's,^.*\.[a-z]*:[	 ]*,,' -e 's,$,:,' < "$tmpdepfile" >> "$depfile"
   else
      echo "#dummy" > "$depfile"
@ -240,34 +331,42 @@ tru64)
 dashmstdout)
  # Important note: in order to support this mode, a compiler *must*
-  # always write the proprocessed file to stdout, regardless of -o,
+  # always write the preprocessed file to stdout, regardless of -o.
-  # because we must use -o when running libtool.
+  "$@" || exit $?
-  test -z "$dashmflag" && dashmflag=-M
+
-  ( IFS=" "
+  # Remove the call to Libtool.
-    case " $* " in
+  if test "$libtool" = yes; then
-    *" --mode=compile "*) # this is libtool, let us make it quiet
+    while test $1 != '--mode=compile'; do
      shift
    done
    shift
  fi
  # Remove `-o $object'.
  IFS=" "
  for arg
-      do # cycle over the arguments
+  do
-        case "$arg" in
+    case $arg in
-	"--mode=compile")
+    -o)
-	  # insert --quiet before "--mode=compile"
+      shift
 	  set fnord "$@" --quiet
 	  shift # fnord
      ;;
-	esac
+    $object)
      shift
      ;;
    *)
      set fnord "$@" "$arg"
      shift # fnord
-	shift # "$arg"
+      shift # $arg
      done
      ;;
    esac
-    "$@" $dashmflag | sed 's:^[^:]*\:[ 	]*:'"$object"'\: :' > "$tmpdepfile"
+  done
-  ) &
+
-  proc=$!
+  test -z "$dashmflag" && dashmflag=-M
-  "$@"
+  # Require at least two characters before searching for `:'
-  stat=$?
+  # in the target name.  This is to cope with DOS-style filenames:
-  wait "$proc"
+  # a dependency such as `c:/foo/bar' could be seen as target `c' otherwise.
-  if test "$stat" != 0; then exit $stat; fi
+  "$@" $dashmflag |
    sed 's:^[  ]*[^: ][^:][^:]*\:[    ]*:'"$object"'\: :' > "$tmpdepfile"
  rm -f "$depfile"
  cat < "$tmpdepfile" > "$depfile"
  tr ' ' '
@ -285,19 +384,29 @@ dashXmstdout)
  ;;
 makedepend)
  "$@" || exit $?
  # Remove any Libtool call
  if test "$libtool" = yes; then
    while test $1 != '--mode=compile'; do
      shift
    done
    shift
  fi
  # X makedepend
  (
  shift
  cleared=no
  for arg in "$@"; do
-      case $cleared in no)
+    case $cleared in
    no)
      set ""; shift
-	cleared=yes
+      cleared=yes ;;
    esac
    case "$arg" in
    -D*|-I*)
      set fnord "$@" "$arg"; shift ;;
-	-*)
+    # Strip any option that makedepend may not understand.  Remove
    # the object too, otherwise makedepend will parse it as a source file.
    -*|$object)
      ;;
    *)
      set fnord "$@" "$arg"; shift ;;
@ -305,16 +414,10 @@ makedepend)
  done
  obj_suffix="`echo $object | sed 's/^.*\././'`"
  touch "$tmpdepfile"
-    ${MAKEDEPEND-makedepend} 2>/dev/null -o"$obj_suffix" -f"$tmpdepfile" "$@"
+  ${MAKEDEPEND-makedepend} -o"$obj_suffix" -f"$tmpdepfile" "$@"
  ) &
  proc=$!
  "$@"
  stat=$?
  wait "$proc"
  if test "$stat" != 0; then exit $stat; fi
  rm -f "$depfile"
  cat < "$tmpdepfile" > "$depfile"
-  tail +3 "$tmpdepfile" | tr ' ' '
+  sed '1,2d' "$tmpdepfile" | tr ' ' '
 ' | \
 ## Some versions of the HPUX 10.20 sed can't process this invocation
 ## correctly.  Breaking it into two sed invocations is a workaround.
@ -324,35 +427,39 @@ makedepend)
 cpp)
  # Important note: in order to support this mode, a compiler *must*
-  # always write the proprocessed file to stdout, regardless of -o,
+  # always write the preprocessed file to stdout.
-  # because we must use -o when running libtool.
+  "$@" || exit $?
-  ( IFS=" "
+
-    case " $* " in
+  # Remove the call to Libtool.
-    *" --mode=compile "*)
+  if test "$libtool" = yes; then
    while test $1 != '--mode=compile'; do
      shift
    done
    shift
  fi
  # Remove `-o $object'.
  IFS=" "
  for arg
-      do # cycle over the arguments
+  do
    case $arg in
-	"--mode=compile")
+    -o)
-	  # insert --quiet before "--mode=compile"
+      shift
 	  set fnord "$@" --quiet
 	  shift # fnord
      ;;
-	esac
+    $object)
      shift
      ;;
    *)
      set fnord "$@" "$arg"
      shift # fnord
-	shift # "$arg"
+      shift # $arg
      done
      ;;
    esac
  done
  "$@" -E |
    sed -n '/^# [0-9][0-9]* "\([^"]*\)".*/ s:: \1 \\:p' |
    sed '$ s: \\$::' > "$tmpdepfile"
  ) &
  proc=$!
  "$@"
  stat=$?
  wait "$proc"
  if test "$stat" != 0; then exit $stat; fi
  rm -f "$depfile"
  echo "$object : \\" > "$depfile"
  cat < "$tmpdepfile" >> "$depfile"
@ -362,34 +469,27 @@ cpp)
 msvisualcpp)
  # Important note: in order to support this mode, a compiler *must*
-  # always write the proprocessed file to stdout, regardless of -o,
+  # always write the preprocessed file to stdout, regardless of -o,
  # because we must use -o when running libtool.
-  ( IFS=" "
+  "$@" || exit $?
-    case " $* " in
+  IFS=" "
    *" --mode=compile "*)
  for arg
-      do # cycle over the arguments
+  do
-        case $arg in
+    case "$arg" in
-	"--mode=compile")
+    "-Gm"|"/Gm"|"-Gi"|"/Gi"|"-ZI"|"/ZI")
-	  # insert --quiet before "--mode=compile"
+	set fnord "$@"
-	  set fnord "$@" --quiet
+	shift
-	  shift # fnord
+	shift
 	;;
-	esac
+    *)
 	set fnord "$@" "$arg"
-	shift # fnord
+	shift
-	shift # "$arg"
+	shift
      done
 	;;
    esac
  done
  "$@" -E |
  sed -n '/^#line [0-9][0-9]* "\([^"]*\)"/ s::echo "`cygpath -u \\"\1\\"`":p' | sort | uniq > "$tmpdepfile"
  ) &
  proc=$!
  "$@"
  stat=$?
  wait "$proc"
  if test "$stat" != 0; then exit $stat; fi
  rm -f "$depfile"
  echo "$object : \\" > "$depfile"
  . "$tmpdepfile" | sed 's% %\\ %g' | sed -n '/^\(.*\)$/ s::	\1 \\:p' >> "$depfile"
@ -409,3 +509,12 @@ none)
 esac
 exit 0
 # Local Variables:
 # mode: shell-script
 # sh-indentation: 2
 # eval: (add-hook 'write-file-hooks 'time-stamp)
 # time-stamp-start: "scriptversion="
 # time-stamp-format: "%:y-%02m-%02d.%02H"
 # time-stamp-end: "$"
 # End:
--- a/319
+++ b/319
@ -1,25 +1,52 @@
 #!/bin/sh
 #
 # $Id: install-sh,v 1.1 1999/01/17 15:53:42 nisse Exp $
 #
 # install - install a program, script, or datafile
-# This comes from X11R5.
+
 scriptversion=2004-01-12.10
 # This originates from X11R5 (mit/util/scripts/install.sh), which was
 # later released in X11R6 (xc/config/util/install.sh) with the
 # following copyright and license.
 #
 # Copyright (C) 1994 X Consortium
 #
 # Permission is hereby granted, free of charge, to any person obtaining a copy
 # of this software and associated documentation files (the "Software"), to
 # deal in the Software without restriction, including without limitation the
 # rights to use, copy, modify, merge, publish, distribute, sublicense, and/or
 # sell copies of the Software, and to permit persons to whom the Software is
 # furnished to do so, subject to the following conditions:
 #
 # The above copyright notice and this permission notice shall be included in
 # all copies or substantial portions of the Software.
 #
 # THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
 # IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
 # FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT.  IN NO EVENT SHALL THE
 # X CONSORTIUM BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN
 # AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNEC-
 # TION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
 #
 # Except as contained in this notice, the name of the X Consortium shall not
 # be used in advertising or otherwise to promote the sale, use or other deal-
 # ings in this Software without prior written authorization from the X Consor-
 # tium.
 #
 #
 # FSF changes to this file are in the public domain.
 #
 # Calling this script install-sh is preferred over install.sh, to prevent
 # `make' implicit rules from creating a file called install from it
 # when there is no Makefile.
 #
 # This script is compatible with the BSD install script, but was written
-# from scratch.
+# from scratch.  It can only install one file at a time, a restriction
-#
+# shared with many OS's install programs.
 # set DOITPROG to echo to test this script
 # Don't use :- since 4.3BSD and earlier shells don't like it.
 doit="${DOITPROG-}"
 # put in absolute paths if you don't have them in your path; or use env. vars.
 mvprog="${MVPROG-mv}"
@ -31,22 +58,49 @@ stripprog="${STRIPPROG-strip}"
 rmprog="${RMPROG-rm}"
 mkdirprog="${MKDIRPROG-mkdir}"
-transformbasename=""
+transformbasename=
-transform_arg=""
+transform_arg=
 instcmd="$mvprog"
 chmodcmd="$chmodprog 0755"
-chowncmd=""
+chowncmd=
-chgrpcmd=""
+chgrpcmd=
-stripcmd=""
+stripcmd=
 rmcmd="$rmprog -f"
 mvcmd="$mvprog"
-src=""
+src=
-dst=""
+dst=
-dir_arg=""
+dir_arg=
-while [ x"$1" != x ]; do
+usage="Usage: $0 [OPTION]... SRCFILE DSTFILE
   or: $0 [OPTION]... SRCFILES... DIRECTORY
   or: $0 -d DIRECTORIES...
 In the first form, install SRCFILE to DSTFILE, removing SRCFILE by default.
 In the second, create the directory path DIR.
 Options:
 -b=TRANSFORMBASENAME
 -c         copy source (using $cpprog) instead of moving (using $mvprog).
 -d         create directories instead of installing files.
 -g GROUP   $chgrp installed files to GROUP.
 -m MODE    $chmod installed files to MODE.
 -o USER    $chown installed files to USER.
 -s         strip installed files (using $stripprog).
 -t=TRANSFORM
 --help     display this help and exit.
 --version  display version info and exit.
 Environment variables override the default commands:
  CHGRPPROG CHMODPROG CHOWNPROG CPPROG MKDIRPROG MVPROG RMPROG STRIPPROG
 "
 while test -n "$1"; do
  case $1 in
-	-c) instcmd="$cpprog"
+    -b=*) transformbasename=`echo $1 | sed 's/-b=//'`
        shift
        continue;;
    -c) instcmd=$cpprog
        shift
        continue;;
@ -54,6 +108,13 @@ while [ x"$1" != x ]; do
        shift
        continue;;
    -g) chgrpcmd="$chgrpprog $2"
        shift
        shift
        continue;;
    --help) echo "$usage"; exit 0;;
    -m) chmodcmd="$chmodprog $2"
        shift
        shift
@ -64,12 +125,7 @@ while [ x"$1" != x ]; do
        shift
        continue;;
-	-g) chgrpcmd="$chgrpprog $2"
+    -s) stripcmd=$stripprog
 	    shift
 	    shift
 	    continue;;
 	-s) stripcmd="$stripprog"
        shift
        continue;;
@ -77,165 +133,178 @@ while [ x"$1" != x ]; do
        shift
        continue;;
-	-b=*) transformbasename=`echo $1 | sed 's/-b=//'`
+    --version) echo "$0 $scriptversion"; exit 0;;
 	    shift
 	    continue;;
-	*)  if [ x"$src" = x ]
+    *)  # When -d is used, all remaining arguments are directories to create.
-	    then
+	test -n "$dir_arg" && break
-		src=$1
+        # Otherwise, the last argument is the destination.  Remove it from $@.
-	    else
+	for arg
-		# this colon is to work around a 386BSD /bin/sh bug
+	do
-		:
+          if test -n "$dstarg"; then
-		dst=$1
+	    # $@ is not empty: it contains at least $arg.
 	    set fnord "$@" "$dstarg"
 	    shift # fnord
 	  fi
-	    shift
+	  shift # arg
-	    continue;;
+	  dstarg=$arg
 	done
 	break;;
  esac
 done
-if [ x"$src" = x ]
+if test -z "$1"; then
-then
+  if test -z "$dir_arg"; then
-	echo "install:	no input file specified"
+    echo "$0: no input file specified." >&2
    exit 1
-else
+  fi
-	true
+  # It's OK to call `install-sh -d' without argument.
  # This can happen when creating conditional directories.
  exit 0
 fi
-if [ x"$dir_arg" != x ]; then
+for src
 do
  # Protect names starting with `-'.
  case $src in
    -*) src=./$src ;;
  esac
  if test -n "$dir_arg"; then
    dst=$src
-	src=""
+    src=
-	if [ -d $dst ]; then
+    if test -d "$dst"; then
      instcmd=:
      chmodcmd=
    else
-		instcmd=mkdir
+      instcmd=$mkdirprog
    fi
  else
    # Waiting for this to be detected by the "$instcmd $src $dsttmp" command
    # might cause directories to be created, which would be especially bad
    # if $src (and thus $dsttmp) contains '*'.
-
+    if test ! -f "$src" && test ! -d "$src"; then
-	if [ -f $src -o -d $src ]
+      echo "$0: $src does not exist." >&2
 	then
 		true
 	else
 		echo "install:  $src does not exist"
      exit 1
    fi
-	if [ x"$dst" = x ]
+    if test -z "$dstarg"; then
-	then
+      echo "$0: no destination specified." >&2
 		echo "install:	no destination specified"
      exit 1
 	else
 		true
    fi
-# If destination is a directory, append the input filename; if your system
+    dst=$dstarg
-# does not like double slashes in filenames, you may need to add some logic
+    # Protect names starting with `-'.
    case $dst in
      -*) dst=./$dst ;;
    esac
-	if [ -d $dst ]
+    # If destination is a directory, append the input filename; won't work
-	then
+    # if double slashes aren't ignored.
-		dst="$dst"/`basename $src`
+    if test -d "$dst"; then
-	else
+      dst=$dst/`basename "$src"`
 		true
    fi
  fi
-## this sed command emulates the dirname command
+  # This sed command emulates the dirname command.
-dstdir=`echo $dst | sed -e 's,[^/]*$,,;s,/$,,;s,^$,.,'`
+  dstdir=`echo "$dst" | sed -e 's,[^/]*$,,;s,/$,,;s,^$,.,'`
  # Make sure that the destination directory exists.
 #  this part is taken from Noah Friedman's mkinstalldirs script
  # Skip lots of stat calls in the usual case.
-if [ ! -d "$dstdir" ]; then
+  if test ! -d "$dstdir"; then
    defaultIFS='
  	'
-IFS="${IFS-${defaultIFS}}"
+    IFS="${IFS-$defaultIFS}"
-oIFS="${IFS}"
+    oIFS=$IFS
    # Some sh's can't handle IFS=/ for some reason.
    IFS='%'
-set - `echo ${dstdir} | sed -e 's@/@%@g' -e 's@^%@/@'`
+    set - `echo "$dstdir" | sed -e 's@/@%@g' -e 's@^%@/@'`
-IFS="${oIFS}"
+    IFS=$oIFS
-pathcomp=''
+    pathcomp=
-while [ $# -ne 0 ] ; do
+    while test $# -ne 0 ; do
-	pathcomp="${pathcomp}${1}"
+      pathcomp=$pathcomp$1
      shift
-
+      test -d "$pathcomp" || $mkdirprog "$pathcomp"
-	if [ ! -d "${pathcomp}" ] ;
+      pathcomp=$pathcomp/
        then
 		$mkdirprog "${pathcomp}"
 	else
 		true
 	fi
 	pathcomp="${pathcomp}/"
    done
  fi
-if [ x"$dir_arg" != x ]
+  if test -n "$dir_arg"; then
-then
+    $doit $instcmd "$dst" \
-	$doit $instcmd $dst &&
+      && { test -z "$chowncmd" || $doit $chowncmd "$dst"; } \
      && { test -z "$chgrpcmd" || $doit $chgrpcmd "$dst"; } \
      && { test -z "$stripcmd" || $doit $stripcmd "$dst"; } \
      && { test -z "$chmodcmd" || $doit $chmodcmd "$dst"; }
 	if [ x"$chowncmd" != x ]; then $doit $chowncmd $dst; else true ; fi &&
 	if [ x"$chgrpcmd" != x ]; then $doit $chgrpcmd $dst; else true ; fi &&
 	if [ x"$stripcmd" != x ]; then $doit $stripcmd $dst; else true ; fi &&
 	if [ x"$chmodcmd" != x ]; then $doit $chmodcmd $dst; else true ; fi
  else
    # If we're going to rename the final executable, determine the name now.
-
+    if test -z "$transformarg"; then
-	if [ x"$transformarg" = x ] 
+      dstfile=`basename "$dst"`
 	then
 		dstfile=`basename $dst`
    else
-		dstfile=`basename $dst $transformbasename | 
+      dstfile=`basename "$dst" $transformbasename \
-			sed $transformarg`$transformbasename
+               | sed $transformarg`$transformbasename
    fi
-# don't allow the sed command to completely eliminate the filename
+    # don't allow the sed command to completely eliminate the filename.
    test -z "$dstfile" && dstfile=`basename "$dst"`
-	if [ x"$dstfile" = x ] 
+    # Make a couple of temp file names in the proper directory.
-	then
+    dsttmp=$dstdir/_inst.$$_
-		dstfile=`basename $dst`
+    rmtmp=$dstdir/_rm.$$_
 	else
 		true
 	fi
-# Make a temp file name in the proper directory.
+    # Trap to clean up those temp files at exit.
-
+    trap 'status=$?; rm -f "$dsttmp" "$rmtmp" && exit $status' 0
-	dsttmp=$dstdir/#inst.$$#
+    trap '(exit $?); exit' 1 2 13 15
    # Move or copy the file name to the temp name
    $doit $instcmd "$src" "$dsttmp" &&
-	$doit $instcmd $src $dsttmp &&
+    # and set any options; do chmod last to preserve setuid bits.
-
+    #
 	trap "rm -f ${dsttmp}" 0 &&
 # and set any options; do chmod last to preserve setuid bits
    # If any of these fail, we abort the whole thing.  If we want to
    # ignore errors from any of these, just make sure not to ignore
    # errors from the above "$doit $instcmd $src $dsttmp" command.
    #
    { test -z "$chowncmd" || $doit $chowncmd "$dsttmp"; } \
      && { test -z "$chgrpcmd" || $doit $chgrpcmd "$dsttmp"; } \
      && { test -z "$stripcmd" || $doit $stripcmd "$dsttmp"; } \
      && { test -z "$chmodcmd" || $doit $chmodcmd "$dsttmp"; } &&
-	if [ x"$chowncmd" != x ]; then $doit $chowncmd $dsttmp; else true;fi &&
+    # Now remove or move aside any old file at destination location.  We
-	if [ x"$chgrpcmd" != x ]; then $doit $chgrpcmd $dsttmp; else true;fi &&
+    # try this two ways since rm can't unlink itself on some systems and
-	if [ x"$stripcmd" != x ]; then $doit $stripcmd $dsttmp; else true;fi &&
+    # the destination file might be busy for other reasons.  In this case,
-	if [ x"$chmodcmd" != x ]; then $doit $chmodcmd $dsttmp; else true;fi &&
+    # the final cleanup might fail but the new file should still install
    # successfully.
    {
      if test -f "$dstdir/$dstfile"; then
        $doit $rmcmd -f "$dstdir/$dstfile" 2>/dev/null \
        || $doit $mvcmd -f "$dstdir/$dstfile" "$rmtmp" 2>/dev/null \
        || {
  	  echo "$0: cannot unlink or rename $dstdir/$dstfile" >&2
  	  (exit 1); exit
        }
      else
        :
      fi
    } &&
    # Now rename the file to the real destination.
    $doit $mvcmd "$dsttmp" "$dstdir/$dstfile"
  fi || { (exit 1); exit; }
 done
-	$doit $rmcmd -f $dstdir/$dstfile &&
+# The final little trick to "correctly" pass the exit status to the exit trap.
-	$doit $mvcmd $dsttmp $dstdir/$dstfile 
+{
-
+  (exit 0); exit
-fi &&
+}
 exit 0
 # Local variables:
 # eval: (add-hook 'write-file-hooks 'time-stamp)
 # time-stamp-start: "scriptversion="
 # time-stamp-format: "%:y-%02m-%02d.%02H"
 # time-stamp-end: "$"
 # End:
--- a/117
+++ b/117
@ -1,6 +1,10 @@
 #! /bin/sh
 # Common stub for a few missing GNU programs while installing.
-# Copyright 1996, 1997, 1999, 2000 Free Software Foundation, Inc.
+
 scriptversion=2003-09-02.23
 # Copyright (C) 1996, 1997, 1999, 2000, 2002, 2003 
 #   Free Software Foundation, Inc.
 # Originally by Fran,cois Pinard <pinard@iro.umontreal.ca>, 1996.
 # This program is free software; you can redistribute it and/or modify
@ -38,12 +42,23 @@ else
  configure_ac=configure.in
 fi
 msg="missing on your system"
 case "$1" in
 --run)
  # Try to run requested program, and just exit if it succeeds.
  run=
  shift
  "$@" && exit 0
  # Exit code 63 means version mismatch.  This often happens
  # when the user try to use an ancient version of a tool on
  # a file that requires a minimum version.  In this case we
  # we should proceed has if the program had been absent, or
  # if --run hadn't been passed.
  if test $? = 63; then
    run=:
    msg="probably too old"
  fi
  ;;
 esac
@ -74,11 +89,13 @@ Supported PROGRAM values:
  lex          create \`lex.yy.c', if possible, from existing .c
  makeinfo     touch the output file
  tar          try tar, gnutar, gtar, then tar without non-portable flags
-  yacc         create \`y.tab.[ch]', if possible, from existing .[ch]"
+  yacc         create \`y.tab.[ch]', if possible, from existing .[ch]
 Send bug reports to <bug-automake@gnu.org>."
    ;;
  -v|--v|--ve|--ver|--vers|--versi|--versio|--version)
-    echo "missing 0.3 - GNU automake"
+    echo "missing $scriptversion (GNU Automake)"
    ;;
  -*)
@ -87,9 +104,14 @@ Supported PROGRAM values:
    exit 1
    ;;
-  aclocal)
+  aclocal*)
    if test -z "$run" && ($1 --version) > /dev/null 2>&1; then
       # We have it, but it failed.
       exit 1
    fi
    echo 1>&2 "\
-WARNING: \`$1' is missing on your system.  You should only need it if
+WARNING: \`$1' is $msg.  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."
@ -97,8 +119,13 @@ WARNING: \`$1' is missing on your system.  You should only need it if
    ;;
  autoconf)
    if test -z "$run" && ($1 --version) > /dev/null 2>&1; then
       # We have it, but it failed.
       exit 1
    fi
    echo 1>&2 "\
-WARNING: \`$1' is missing on your system.  You should only need it if
+WARNING: \`$1' is $msg.  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."
@ -106,8 +133,13 @@ WARNING: \`$1' is missing on your system.  You should only need it if
    ;;
  autoheader)
    if test -z "$run" && ($1 --version) > /dev/null 2>&1; then
       # We have it, but it failed.
       exit 1
    fi
    echo 1>&2 "\
-WARNING: \`$1' is missing on your system.  You should only need it if
+WARNING: \`$1' is $msg.  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."
@ -124,9 +156,14 @@ WARNING: \`$1' is missing on your system.  You should only need it if
    touch $touch_files
    ;;
-  automake)
+  automake*)
    if test -z "$run" && ($1 --version) > /dev/null 2>&1; then
       # We have it, but it failed.
       exit 1
    fi
    echo 1>&2 "\
-WARNING: \`$1' is missing on your system.  You should only need it if
+WARNING: \`$1' is $msg.  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."
@ -135,9 +172,37 @@ WARNING: \`$1' is missing on your system.  You should only need it if
 	   while read f; do touch "$f"; done
    ;;
  autom4te)
    if test -z "$run" && ($1 --version) > /dev/null 2>&1; then
       # We have it, but it failed.
       exit 1
    fi
    echo 1>&2 "\
 WARNING: \`$1' is needed, but is $msg.
         You might have modified some files without having the
         proper tools for further handling them.
         You can get \`$1' as part of \`Autoconf' from any GNU
         archive site."
    file=`echo "$*" | sed -n 's/.*--output[ =]*\([^ ]*\).*/\1/p'`
    test -z "$file" && file=`echo "$*" | sed -n 's/.*-o[ ]*\([^ ]*\).*/\1/p'`
    if test -f "$file"; then
 	touch $file
    else
 	test -z "$file" || exec >$file
 	echo "#! /bin/sh"
 	echo "# Created by GNU Automake missing as a replacement of"
 	echo "#  $ $@"
 	echo "exit 0"
 	chmod +x $file
 	exit 1
    fi
    ;;
  bison|yacc)
    echo 1>&2 "\
-WARNING: \`$1' is missing on your system.  You should only need it if
+WARNING: \`$1' $msg.  You should only need it if
         you modified a \`.y' file.  You may need the \`Bison' package
         in order for those modifications to take effect.  You can get
         \`Bison' from any GNU archive site."
@ -167,7 +232,7 @@ WARNING: \`$1' is missing on your system.  You should only need it if
  lex|flex)
    echo 1>&2 "\
-WARNING: \`$1' is missing on your system.  You should only need it if
+WARNING: \`$1' is $msg.  You should only need it if
         you modified a \`.l' file.  You may need the \`Flex' package
         in order for those modifications to take effect.  You can get
         \`Flex' from any GNU archive site."
@ -189,8 +254,13 @@ WARNING: \`$1' is missing on your system.  You should only need it if
    ;;
  help2man)
    if test -z "$run" && ($1 --version) > /dev/null 2>&1; then
       # We have it, but it failed.
       exit 1
    fi
    echo 1>&2 "\
-WARNING: \`$1' is missing on your system.  You should only need it if
+WARNING: \`$1' is $msg.  You should only need it if
 	 you modified a dependency of a manual page.  You may need the
 	 \`Help2man' package in order for those modifications to take
 	 effect.  You can get \`Help2man' from any GNU archive site."
@ -215,7 +285,7 @@ WARNING: \`$1' is missing on your system.  You should only need it if
    fi
    echo 1>&2 "\
-WARNING: \`$1' is missing on your system.  You should only need it if
+WARNING: \`$1' is $msg.  You should only need it if
         you modified a \`.texi' or \`.texinfo' file, or any other file
         indirectly affecting the aspect of the manual.  The spurious
         call might also be the consequence of using a buggy \`make' (AIX,
@ -240,23 +310,23 @@ WARNING: \`$1' is missing on your system.  You should only need it if
    # Look for gnutar/gtar before invocation to avoid ugly error
    # messages.
    if (gnutar --version > /dev/null 2>&1); then
-       gnutar ${1+"$@"} && exit 0
+       gnutar "$@" && exit 0
    fi
    if (gtar --version > /dev/null 2>&1); then
-       gtar ${1+"$@"} && exit 0
+       gtar "$@" && exit 0
    fi
    firstarg="$1"
    if shift; then
 	case "$firstarg" in
 	*o*)
 	    firstarg=`echo "$firstarg" | sed s/o//`
-	    tar "$firstarg" ${1+"$@"} && exit 0
+	    tar "$firstarg" "$@" && exit 0
 	    ;;
 	esac
 	case "$firstarg" in
 	*h*)
 	    firstarg=`echo "$firstarg" | sed s/h//`
-	    tar "$firstarg" ${1+"$@"} && exit 0
+	    tar "$firstarg" "$@" && exit 0
 	    ;;
 	esac
    fi
@ -270,10 +340,10 @@ WARNING: I can't seem to be able to run \`tar' with the given arguments.
  *)
    echo 1>&2 "\
-WARNING: \`$1' is needed, and you do not seem to have it handy on your
+WARNING: \`$1' is needed, and is $msg.
-         system.  You might have modified some files without having the
+         You might have modified some files without having the
         proper tools for further handling them.  Check the \`README' file,
-         it often tells you about the needed prerequirements for installing
+         it often tells you about the needed prerequisites for installing
         this package.  You may also peek at any GNU archive site, in case
         some other package would contain this missing \`$1' program."
    exit 1
@ -281,3 +351,10 @@ WARNING: \`$1' is needed, and you do not seem to have it handy on your
 esac
 exit 0
 # Local variables:
 # eval: (add-hook 'write-file-hooks 'time-stamp)
 # time-stamp-start: "scriptversion="
 # time-stamp-format: "%:y-%02m-%02d.%02H"
 # time-stamp-end: "$"
 # End:
--- a/115
+++ b/115
@ -1,12 +1,98 @@
 #! /bin/sh
 # mkinstalldirs --- make directory hierarchy
 # Author: Noah Friedman <friedman@prep.ai.mit.edu>
 # Created: 1993-05-16
 # Public domain
-# $Id: mkinstalldirs,v 1.13 1999/01/05 03:18:55 bje Exp $
+scriptversion=2003-11-08.23
 # Original author: Noah Friedman <friedman@prep.ai.mit.edu>
 # Created: 1993-05-16
 # Public domain.
 #
 # This file is maintained in Automake, please report
 # bugs to <bug-automake@gnu.org> or send patches to
 # <automake-patches@gnu.org>.
 errstatus=0
 dirmode=""
 usage="\
 Usage: mkinstalldirs [-h] [--help] [--version] [-m MODE] DIR ...
 Create each directory DIR (with mode MODE, if specified), including all
 leading file name components.
 Report bugs to <bug-automake@gnu.org>."
 # process command line arguments
 while test $# -gt 0 ; do
  case $1 in
    -h | --help | --h*)         # -h for help
      echo "$usage"
      exit 0
      ;;
    -m)                         # -m PERM arg
      shift
      test $# -eq 0 && { echo "$usage" 1>&2; exit 1; }
      dirmode=$1
      shift
      ;;
    --version)
      echo "$0 $scriptversion"
      exit 0
      ;;
    --)                         # stop option processing
      shift
      break
      ;;
    -*)                         # unknown option
      echo "$usage" 1>&2
      exit 1
      ;;
    *)                          # first non-opt arg
      break
      ;;
  esac
 done
 for file
 do
  if test -d "$file"; then
    shift
  else
    break
  fi
 done
 case $# in
  0) exit 0 ;;
 esac
 case $dirmode in
  '')
    if mkdir -p -- . 2>/dev/null; then
      echo "mkdir -p -- $*"
      exec mkdir -p -- "$@"
    else
      # On NextStep and OpenStep, the `mkdir' command does not
      # recognize any option.  It will interpret all options as
      # directories to create, and then abort because `.' already
      # exists.
      test -d ./-p && rmdir ./-p
      test -d ./-- && rmdir ./--
    fi
    ;;
  *)
    if mkdir -m "$dirmode" -p -- . 2>/dev/null; then
      echo "mkdir -m $dirmode -p -- $*"
      exec mkdir -m "$dirmode" -p -- "$@"
    else
      # Clean up after NextStep and OpenStep mkdir.
      for d in ./-m ./-p ./-- "./$dirmode";
      do
        test -d $d && rmdir $d
      done
    fi
    ;;
 esac
 for file
 do
@ -17,7 +103,7 @@ do
  for d
  do
    pathcomp="$pathcomp$d"
-     case "$pathcomp" in
+    case $pathcomp in
      -*) pathcomp=./$pathcomp ;;
    esac
@ -28,6 +114,16 @@ do
      if test ! -d "$pathcomp"; then
 	errstatus=$lasterr
      else
 	if test ! -z "$dirmode"; then
 	  echo "chmod $dirmode $pathcomp"
 	  lasterr=""
 	  chmod "$dirmode" "$pathcomp" || lasterr=$?
 	  if test ! -z "$lasterr"; then
 	    errstatus=$lasterr
 	  fi
 	fi
      fi
    fi
@ -37,4 +133,11 @@ done
 exit $errstatus
-# mkinstalldirs ends here
+# Local Variables:
 # mode: shell-script
 # sh-indentation: 2
 # eval: (add-hook 'write-file-hooks 'time-stamp)
 # time-stamp-start: "scriptversion="
 # time-stamp-format: "%:y-%02m-%02d.%02H"
 # time-stamp-end: "$"
 # End:
--- a/testsuite/Makefile.in
+++ b/testsuite/Makefile.in
@ -1,8 +1,8 @@
-# Makefile.in generated by automake 1.7.3 from Makefile.am.
+# Makefile.in generated by automake 1.8.2 from Makefile.am.
 # @configure_input@
-# Copyright 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, 2003
+# Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
-# Free Software Foundation, Inc.
+# 2003, 2004  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.
@ -14,6 +14,8 @@
@SET_MAKE@
 SOURCES = ex1.c ex3.c ex4.c
 srcdir = @srcdir@
 top_srcdir = @top_srcdir@
 VPATH = @srcdir@
@ -21,7 +23,6 @@ pkgdatadir = $(datadir)/@PACKAGE@
 pkglibdir = $(libdir)/@PACKAGE@
 pkgincludedir = $(includedir)/@PACKAGE@
 top_builddir = ..
 am__cd = CDPATH="$${ZSH_VERSION+.}$(PATH_SEPARATOR)" && cd
 INSTALL = @INSTALL@
 install_sh_DATA = $(install_sh) -c -m 644
@ -35,6 +36,46 @@ POST_INSTALL = :
 NORMAL_UNINSTALL = :
 PRE_UNINSTALL = :
 POST_UNINSTALL = :
 noinst_PROGRAMS = $(am__EXEEXT_1) ex1$(EXEEXT) ex3$(EXEEXT) \
 	ex4$(EXEEXT)
 subdir = testsuite
 DIST_COMMON = $(srcdir)/Makefile.am $(srcdir)/Makefile.in
 ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
 am__aclocal_m4_deps = $(top_srcdir)/acinclude.m4 \
 	$(top_srcdir)/configure.ac
 am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \
 	$(ACLOCAL_M4)
 mkinstalldirs = $(SHELL) $(top_srcdir)/mkinstalldirs
 CONFIG_HEADER = $(top_builddir)/config.h
 CONFIG_CLEAN_FILES =
 am__EXEEXT_1 =
 PROGRAMS = $(noinst_PROGRAMS)
 ex1_SOURCES = ex1.c
 ex1_OBJECTS = ex1.$(OBJEXT)
 ex1_LDADD = $(LDADD)
 ex1_DEPENDENCIES = ../libargp.a
 ex3_SOURCES = ex3.c
 ex3_OBJECTS = ex3.$(OBJEXT)
 ex3_LDADD = $(LDADD)
 ex3_DEPENDENCIES = ../libargp.a
 ex4_SOURCES = ex4.c
 ex4_OBJECTS = ex4.$(OBJEXT)
 ex4_LDADD = $(LDADD)
 ex4_DEPENDENCIES = ../libargp.a
 DEFAULT_INCLUDES = -I. -I$(srcdir) -I$(top_builddir)
 depcomp = $(SHELL) $(top_srcdir)/depcomp
 am__depfiles_maybe = depfiles
@AMDEP_TRUE@DEP_FILES = ./$(DEPDIR)/ex1.Po ./$(DEPDIR)/ex3.Po \
@AMDEP_TRUE@	./$(DEPDIR)/ex4.Po
 COMPILE = $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) \
 	$(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS)
 CCLD = $(CC)
 LINK = $(CCLD) $(AM_CFLAGS) $(CFLAGS) $(AM_LDFLAGS) $(LDFLAGS) -o $@
 SOURCES = ex1.c ex3.c ex4.c
 DIST_SOURCES = ex1.c ex3.c ex4.c
 ETAGS = etags
 CTAGS = ctags
 DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST)
 ACLOCAL = @ACLOCAL@
 ALLOCA = @ALLOCA@
 AMDEP_FALSE = @AMDEP_FALSE@
@ -99,6 +140,7 @@ libdir = @libdir@
 libexecdir = @libexecdir@
 localstatedir = @localstatedir@
 mandir = @mandir@
 mkdir_p = @mkdir_p@
 oldincludedir = @oldincludedir@
 prefix = @prefix@
 program_transform_name = @program_transform_name@
@ -108,60 +150,43 @@ sysconfdir = @sysconfdir@
 target_alias = @target_alias@
 TS_SH = ex1-test permute-test
 TS_PROGS = 
 TS_ALL = $(TS_PROGS) $(TS_SH)
 noinst_PROGRAMS = $(TS_PROGS) ex1 ex3 ex4
 LDADD = ../libargp.a
 EXTRA_DIST = $(TS_SH) run-tests
 CLEANFILES = test.out
 subdir = testsuite
 mkinstalldirs = $(SHELL) $(top_srcdir)/mkinstalldirs
 CONFIG_HEADER = $(top_builddir)/config.h
 CONFIG_CLEAN_FILES =
 noinst_PROGRAMS = ex1$(EXEEXT) ex3$(EXEEXT) ex4$(EXEEXT)
 PROGRAMS = $(noinst_PROGRAMS)
 ex1_SOURCES = ex1.c
 ex1_OBJECTS = ex1.$(OBJEXT)
 ex1_LDADD = $(LDADD)
 ex1_DEPENDENCIES = ../libargp.a
 ex1_LDFLAGS =
 ex3_SOURCES = ex3.c
 ex3_OBJECTS = ex3.$(OBJEXT)
 ex3_LDADD = $(LDADD)
 ex3_DEPENDENCIES = ../libargp.a
 ex3_LDFLAGS =
 ex4_SOURCES = ex4.c
 ex4_OBJECTS = ex4.$(OBJEXT)
 ex4_LDADD = $(LDADD)
 ex4_DEPENDENCIES = ../libargp.a
 ex4_LDFLAGS =
 DEFAULT_INCLUDES =  -I. -I$(srcdir) -I$(top_builddir)
 depcomp = $(SHELL) $(top_srcdir)/depcomp
 am__depfiles_maybe = depfiles
@AMDEP_TRUE@DEP_FILES = ./$(DEPDIR)/ex1.Po ./$(DEPDIR)/ex3.Po \
@AMDEP_TRUE@	./$(DEPDIR)/ex4.Po
 COMPILE = $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) \
 	$(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS)
 CCLD = $(CC)
 LINK = $(CCLD) $(AM_CFLAGS) $(CFLAGS) $(AM_LDFLAGS) $(LDFLAGS) -o $@
 DIST_SOURCES = ex1.c ex3.c ex4.c
 DIST_COMMON = Makefile.am Makefile.in
 SOURCES = ex1.c ex3.c ex4.c
 all: all-am
 .SUFFIXES:
 .SUFFIXES: .c .o .obj
-$(srcdir)/Makefile.in:  Makefile.am  $(top_srcdir)/configure.ac $(ACLOCAL_M4)
+$(srcdir)/Makefile.in:  $(srcdir)/Makefile.am  $(am__configure_deps)
 	@for dep in $?; do \
 	  case '$(am__configure_deps)' in \
 	    *$$dep*) \
 	      cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh \
 		&& exit 0; \
 	      exit 1;; \
 	  esac; \
 	done; \
 	echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu  testsuite/Makefile'; \
 	cd $(top_srcdir) && \
 	  $(AUTOMAKE) --gnu  testsuite/Makefile
 .PRECIOUS: Makefile
 Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status
-	cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe)
+	@case '$?' in \
 	  *config.status*) \
 	    cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh;; \
 	  *) \
 	    echo ' cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe)'; \
 	    cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe);; \
 	esac;
 $(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
 	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
 $(top_srcdir)/configure:  $(am__configure_deps)
 	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
 $(ACLOCAL_M4):  $(am__aclocal_m4_deps)
 	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
 clean-noinstPROGRAMS:
 	-test -z "$(noinst_PROGRAMS)" || rm -f $(noinst_PROGRAMS)
@ -176,7 +201,7 @@ ex4$(EXEEXT): $(ex4_OBJECTS) $(ex4_DEPENDENCIES)
 	$(LINK) $(ex4_LDFLAGS) $(ex4_OBJECTS) $(ex4_LDADD) $(LIBS)
 mostlyclean-compile:
-	-rm -f *.$(OBJEXT) core *.core
+	-rm -f *.$(OBJEXT)
 distclean-compile:
 	-rm -f *.tab.c
@ -185,40 +210,23 @@ distclean-compile:
@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/ex3.Po@am__quote@
@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/ex4.Po@am__quote@
 distclean-depend:
 	-rm -rf ./$(DEPDIR)
 .c.o:
-@am__fastdepCC_TRUE@	if $(COMPILE) -MT $@ -MD -MP -MF "$(DEPDIR)/$*.Tpo" \
+@am__fastdepCC_TRUE@	if $(COMPILE) -MT $@ -MD -MP -MF "$(DEPDIR)/$*.Tpo" -c -o $@ $<; \
-@am__fastdepCC_TRUE@	  -c -o $@ `test -f '$<' || echo '$(srcdir)/'`$<; \
+@am__fastdepCC_TRUE@	then mv -f "$(DEPDIR)/$*.Tpo" "$(DEPDIR)/$*.Po"; else rm -f "$(DEPDIR)/$*.Tpo"; exit 1; fi
@am__fastdepCC_TRUE@	then mv "$(DEPDIR)/$*.Tpo" "$(DEPDIR)/$*.Po"; \
@am__fastdepCC_TRUE@	else rm -f "$(DEPDIR)/$*.Tpo"; exit 1; \
@am__fastdepCC_TRUE@	fi
@AMDEP_TRUE@@am__fastdepCC_FALSE@	source='$<' object='$@' libtool=no @AMDEPBACKSLASH@
@AMDEP_TRUE@@am__fastdepCC_FALSE@	depfile='$(DEPDIR)/$*.Po' tmpdepfile='$(DEPDIR)/$*.TPo' @AMDEPBACKSLASH@
@AMDEP_TRUE@@am__fastdepCC_FALSE@	$(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-@am__fastdepCC_FALSE@	$(COMPILE) -c `test -f '$<' || echo '$(srcdir)/'`$<
+@am__fastdepCC_FALSE@	$(COMPILE) -c $<
 .c.obj:
-@am__fastdepCC_TRUE@	if $(COMPILE) -MT $@ -MD -MP -MF "$(DEPDIR)/$*.Tpo" \
+@am__fastdepCC_TRUE@	if $(COMPILE) -MT $@ -MD -MP -MF "$(DEPDIR)/$*.Tpo" -c -o $@ `$(CYGPATH_W) '$<'`; \
-@am__fastdepCC_TRUE@	  -c -o $@ `if test -f '$<'; then $(CYGPATH_W) '$<'; else $(CYGPATH_W) '$(srcdir)/$<'; fi`; \
+@am__fastdepCC_TRUE@	then mv -f "$(DEPDIR)/$*.Tpo" "$(DEPDIR)/$*.Po"; else rm -f "$(DEPDIR)/$*.Tpo"; exit 1; fi
@am__fastdepCC_TRUE@	then mv "$(DEPDIR)/$*.Tpo" "$(DEPDIR)/$*.Po"; \
@am__fastdepCC_TRUE@	else rm -f "$(DEPDIR)/$*.Tpo"; exit 1; \
@am__fastdepCC_TRUE@	fi
@AMDEP_TRUE@@am__fastdepCC_FALSE@	source='$<' object='$@' libtool=no @AMDEPBACKSLASH@
@AMDEP_TRUE@@am__fastdepCC_FALSE@	depfile='$(DEPDIR)/$*.Po' tmpdepfile='$(DEPDIR)/$*.TPo' @AMDEPBACKSLASH@
@AMDEP_TRUE@@am__fastdepCC_FALSE@	$(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-@am__fastdepCC_FALSE@	$(COMPILE) -c `if test -f '$<'; then $(CYGPATH_W) '$<'; else $(CYGPATH_W) '$(srcdir)/$<'; fi`
+@am__fastdepCC_FALSE@	$(COMPILE) -c `$(CYGPATH_W) '$<'`
 uninstall-info-am:
 ETAGS = etags
 ETAGSFLAGS =
 CTAGS = ctags
 CTAGSFLAGS =
 tags: TAGS
 ID: $(HEADERS) $(SOURCES) $(LISP) $(TAGS_FILES)
 	list='$(SOURCES) $(HEADERS) $(LISP) $(TAGS_FILES)'; \
 	unique=`for i in $$list; do \
@ -227,6 +235,7 @@ ID: $(HEADERS) $(SOURCES) $(LISP) $(TAGS_FILES)
 	  $(AWK) '    { files[$$0] = 1; } \
 	       END { for (i in files) print i; }'`; \
 	mkid -fID $$unique
 tags: TAGS
 TAGS:  $(HEADERS) $(SOURCES)  $(TAGS_DEPENDENCIES) \
 		$(TAGS_FILES) $(LISP)
@ -241,7 +250,6 @@ TAGS:  $(HEADERS) $(SOURCES)  $(TAGS_DEPENDENCIES) \
 	test -z "$(ETAGS_ARGS)$$tags$$unique" \
 	  || $(ETAGS) $(ETAGSFLAGS) $(AM_ETAGSFLAGS) $(ETAGS_ARGS) \
 	     $$tags $$unique
 ctags: CTAGS
 CTAGS:  $(HEADERS) $(SOURCES)  $(TAGS_DEPENDENCIES) \
 		$(TAGS_FILES) $(LISP)
@ -264,10 +272,6 @@ GTAGS:
 distclean-tags:
 	-rm -f TAGS ID GTAGS GRTAGS GSYMS GPATH tags
 DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST)
 top_distdir = ..
 distdir = $(top_distdir)/$(PACKAGE)-$(VERSION)
 distdir: $(DISTFILES)
 	@srcdirstrip=`echo "$(srcdir)" | sed 's|.|.|g'`; \
@ -281,7 +285,7 @@ distdir: $(DISTFILES)
 	  dir=`echo "$$file" | sed -e 's,/[^/]*$$,,'`; \
 	  if test "$$dir" != "$$file" && test "$$dir" != "."; then \
 	    dir="/$$dir"; \
-	    $(mkinstalldirs) "$(distdir)$$dir"; \
+	    $(mkdir_p) "$(distdir)$$dir"; \
 	  else \
 	    dir=''; \
 	  fi; \
@ -299,9 +303,7 @@ distdir: $(DISTFILES)
 check-am: all-am
 check: check-am
 all-am: Makefile $(PROGRAMS)
 installdirs:
 install: install-am
 install-exec: install-exec-am
 install-data: install-data-am
@ -313,7 +315,7 @@ install-am: all-am
 installcheck: installcheck-am
 install-strip:
 	$(MAKE) $(AM_MAKEFLAGS) INSTALL_PROGRAM="$(INSTALL_STRIP_PROGRAM)" \
-	  INSTALL_STRIP_FLAG=-s \
+	  install_sh_PROGRAM="$(INSTALL_STRIP_PROGRAM)" INSTALL_STRIP_FLAG=-s \
 	  `test -z '$(STRIP)' || \
 	    echo "INSTALL_PROGRAM_ENV=STRIPPROG='$(STRIP)'"` install
 mostlyclean-generic:
@ -322,7 +324,7 @@ clean-generic:
 	-test -z "$(CLEANFILES)" || rm -f $(CLEANFILES)
 distclean-generic:
-	-rm -f Makefile $(CONFIG_CLEAN_FILES)
+	-rm -f $(CONFIG_CLEAN_FILES)
 maintainer-clean-generic:
 	@echo "This command is intended for maintainers to use"
@ -332,14 +334,17 @@ clean: clean-am
 clean-am: clean-generic clean-noinstPROGRAMS mostlyclean-am
 distclean: distclean-am
-
+	-rm -rf ./$(DEPDIR)
-distclean-am: clean-am distclean-compile distclean-depend \
+	-rm -f Makefile
-	distclean-generic distclean-tags
+distclean-am: clean-am distclean-compile distclean-generic \
 	distclean-tags
 dvi: dvi-am
 dvi-am:
 html: html-am
 info: info-am
 info-am:
@ -355,7 +360,8 @@ install-man:
 installcheck-am:
 maintainer-clean: maintainer-clean-am
-
+	-rm -rf ./$(DEPDIR)
 	-rm -f Makefile
 maintainer-clean-am: distclean-am maintainer-clean-generic
 mostlyclean: mostlyclean-am
@ -374,8 +380,8 @@ uninstall-am: uninstall-info-am
 .PHONY: CTAGS GTAGS all all-am check check-am clean clean-generic \
 	clean-noinstPROGRAMS ctags distclean distclean-compile \
-	distclean-depend distclean-generic distclean-tags distdir dvi \
+	distclean-generic distclean-tags distdir dvi dvi-am html \
-	dvi-am info info-am install install-am install-data \
+	html-am info info-am install install-am install-data \
 	install-data-am install-exec install-exec-am install-info \
 	install-info-am install-man install-strip installcheck \
 	installcheck-am installdirs maintainer-clean \