Add dependencies for shared libraries. Don't use - broken mtime.

git-svn-id: https://klish.googlecode.com/svn/trunk@360 0eaa4687-2ee9-07dd-09d9-bcdd2d2dd5fb

Makefile.in

@@ -37,8 +37,7 @@ PRE_UNINSTALL = :
 POST_UNINSTALL = :
 build_triplet = @build@
 host_triplet = @host@
-bin_PROGRAMS = bin/clish$(EXEEXT) bin/konfd$(EXEEXT) bin/konf$(EXEEXT) \
+bin_PROGRAMS = bin/clish$(EXEEXT) bin/konfd$(EXEEXT) bin/konf$(EXEEXT)
-	$(am__EXEEXT_1) $(am__EXEEXT_2)
 DIST_COMMON = README $(am__configure_deps) $(nobase_include_HEADERS) \
 	$(srcdir)/Makefile.am $(srcdir)/Makefile.in \
 	$(srcdir)/config.h.in $(top_srcdir)/bin/module.am \
@@ -85,10 +84,7 @@ DIST_COMMON = README $(am__configure_deps) $(nobase_include_HEADERS) \
 	aux_scripts/config.guess aux_scripts/config.sub \
 	aux_scripts/depcomp aux_scripts/install-sh \
 	aux_scripts/ltmain.sh aux_scripts/missing
-@TCL_TRUE@am__append_1 = bin/tclish@TCL_VERSION@
+@LUBHEAP_TRUE@am__append_1 = lub/heap/cache.c lub/heap/cache.h \
-#    @LUBHEAP_LIBS@
-@LUBHEAP_TRUE@am__append_2 = bin/lubheap
-@LUBHEAP_TRUE@am__append_3 = lub/heap/cache.c lub/heap/cache.h \
 @LUBHEAP_TRUE@	lub/heap/cache_bucket.c lub/heap/context.c \
 @LUBHEAP_TRUE@	lub/heap/context.h lub/heap/heap__get_max_free.c \
 @LUBHEAP_TRUE@	lub/heap/heap__get_stacktrace.c \
@@ -150,10 +146,10 @@ DIST_COMMON = README $(am__configure_deps) $(nobase_include_HEADERS) \
 @LUBHEAP_TRUE@	lub/partition/private.h \
 @LUBHEAP_TRUE@	lub/partition/posix/posix_partition.c \
 @LUBHEAP_TRUE@	lub/partition/posix/private.h
-@LUBHEAP_TRUE@am__append_4 = liblubheap.la
+@LUBHEAP_TRUE@am__append_2 = liblubheap.la
 noinst_PROGRAMS = test/bintree$(EXEEXT) test/string$(EXEEXT) \
-	$(am__EXEEXT_3)
+	$(am__EXEEXT_1)
-@LUBHEAP_TRUE@am__append_5 = \
+@LUBHEAP_TRUE@am__append_3 = \
 @LUBHEAP_TRUE@    test/heap                  \
 @LUBHEAP_TRUE@    test/mallocTest            \
 @LUBHEAP_TRUE@    test/lubMallocTest
@@ -194,7 +190,8 @@ am__installdirs = "$(DESTDIR)$(libdir)" "$(DESTDIR)$(libdir)" \
 	"$(DESTDIR)$(bindir)" "$(DESTDIR)$(includedir)"
 LIBRARIES = $(lib_LIBRARIES)
 LTLIBRARIES = $(lib_LTLIBRARIES)
-libclish_la_LIBADD =
+libclish_la_DEPENDENCIES = liblub.la libtinyrl.la libtinyxml.la \
+	libkonf.la
 am__dirstamp = $(am__leading_dot)dirstamp
 am_libclish_la_OBJECTS = clish/libclish_la-clish_access_callback.lo \
 	clish/libclish_la-clish_script_callback.lo \
@@ -242,7 +239,7 @@ am_libclish_la_OBJECTS = clish/libclish_la-clish_access_callback.lo \
 	clish/nspace/libclish_la-nspace.lo \
 	clish/nspace/libclish_la-nspace_dump.lo
 libclish_la_OBJECTS = $(am_libclish_la_OBJECTS)
-libkonf_la_DEPENDENCIES =
+libkonf_la_DEPENDENCIES = liblub.la
 am_libkonf_la_OBJECTS = konf/tree/tree.lo konf/tree/tree_dump.lo \
 	konf/query/query.lo konf/query/query_dump.lo konf/buf/buf.lo \
 	konf/net/net.lo
@@ -419,7 +416,7 @@ am__liblubheap_la_SOURCES_DIST = lubheap/posix/sysheap.c
 @LUBHEAP_TRUE@am_liblubheap_la_OBJECTS = lubheap/posix/sysheap.lo
 liblubheap_la_OBJECTS = $(am_liblubheap_la_OBJECTS)
 @LUBHEAP_TRUE@am_liblubheap_la_rpath = -rpath $(libdir)
-libtinyrl_la_LIBADD =
+libtinyrl_la_DEPENDENCIES = liblub.la
 am_libtinyrl_la_OBJECTS = tinyrl/tinyrl.lo tinyrl/history/history.lo \
 	tinyrl/history/history_entry.lo tinyrl/vt100/vt100.lo
 libtinyrl_la_OBJECTS = $(am_libtinyrl_la_OBJECTS)
@@ -432,9 +429,7 @@ libtinyxml_la_OBJECTS = $(am_libtinyxml_la_OBJECTS)
 libtinyxml_la_LINK = $(LIBTOOL) --tag=CXX $(AM_LIBTOOLFLAGS) \
 	$(LIBTOOLFLAGS) --mode=link $(CXXLD) $(libtinyxml_la_CXXFLAGS) \
 	$(CXXFLAGS) $(AM_LDFLAGS) $(LDFLAGS) -o $@
-@TCL_TRUE@am__EXEEXT_1 = bin/tclish@TCL_VERSION@$(EXEEXT)
+@LUBHEAP_TRUE@am__EXEEXT_1 = test/heap$(EXEEXT) \
-@LUBHEAP_TRUE@am__EXEEXT_2 = bin/lubheap$(EXEEXT)
-@LUBHEAP_TRUE@am__EXEEXT_3 = test/heap$(EXEEXT) \
 @LUBHEAP_TRUE@	test/mallocTest$(EXEEXT) \
 @LUBHEAP_TRUE@	test/lubMallocTest$(EXEEXT)
 PROGRAMS = $(bin_PROGRAMS) $(noinst_PROGRAMS)
@@ -448,22 +443,6 @@ bin_konf_DEPENDENCIES = libkonf.la liblub.la
 am_bin_konfd_OBJECTS = bin/konfd.$(OBJEXT)
 bin_konfd_OBJECTS = $(am_bin_konfd_OBJECTS)
 bin_konfd_DEPENDENCIES = libkonf.la liblub.la
-am__bin_lubheap_SOURCES_DIST = bin/lubheap.c
-@LUBHEAP_TRUE@am_bin_lubheap_OBJECTS = bin/lubheap.$(OBJEXT)
-bin_lubheap_OBJECTS = $(am_bin_lubheap_OBJECTS)
-@LUBHEAP_TRUE@bin_lubheap_DEPENDENCIES = liblub.la
-am__bin_tclish@TCL_VERSION@_SOURCES_DIST = bin/tclish.cpp \
-	bin/tclish_fini_callback.c bin/tclish_init_callback.c \
-	bin/tclish_script_callback.c bin/tclish_show_result.c
-@TCL_TRUE@am_bin_tclish@TCL_VERSION@_OBJECTS = bin/tclish.$(OBJEXT) \
-@TCL_TRUE@	bin/tclish_fini_callback.$(OBJEXT) \
-@TCL_TRUE@	bin/tclish_init_callback.$(OBJEXT) \
-@TCL_TRUE@	bin/tclish_script_callback.$(OBJEXT) \
-@TCL_TRUE@	bin/tclish_show_result.$(OBJEXT)
-bin_tclish@TCL_VERSION@_OBJECTS =  \
-	$(am_bin_tclish@TCL_VERSION@_OBJECTS)
-@TCL_TRUE@bin_tclish@TCL_VERSION@_DEPENDENCIES = libclish.la \
-@TCL_TRUE@	libkonf.la libtinyrl.la libtinyxml.la liblub.la
 am_test_bintree_OBJECTS = test/bintree.$(OBJEXT)
 test_bintree_OBJECTS = $(am_test_bintree_OBJECTS)
 test_bintree_DEPENDENCIES = liblub.la
@@ -518,7 +497,6 @@ SOURCES = $(libclish_la_SOURCES) $(libkonf_la_SOURCES) \
 	$(liblub_la_SOURCES) $(liblubheap_la_SOURCES) \
 	$(libtinyrl_la_SOURCES) $(libtinyxml_la_SOURCES) \
 	$(bin_clish_SOURCES) $(bin_konf_SOURCES) $(bin_konfd_SOURCES) \
-	$(bin_lubheap_SOURCES) $(bin_tclish@TCL_VERSION@_SOURCES) \
 	$(test_bintree_SOURCES) $(test_heap_SOURCES) \
 	$(test_lubMallocTest_SOURCES) $(test_mallocTest_SOURCES) \
 	$(test_string_SOURCES)
@@ -527,8 +505,6 @@ DIST_SOURCES = $(libclish_la_SOURCES) $(libkonf_la_SOURCES) \
 	$(am__liblubheap_la_SOURCES_DIST) $(libtinyrl_la_SOURCES) \
 	$(libtinyxml_la_SOURCES) $(bin_clish_SOURCES) \
 	$(bin_konf_SOURCES) $(bin_konfd_SOURCES) \
-	$(am__bin_lubheap_SOURCES_DIST) \
-	$(am__bin_tclish@TCL_VERSION@_SOURCES_DIST) \
 	$(test_bintree_SOURCES) $(am__test_heap_SOURCES_DIST) \
 	$(am__test_lubMallocTest_SOURCES_DIST) \
 	$(am__test_mallocTest_SOURCES_DIST) $(test_string_SOURCES)
@@ -689,7 +665,7 @@ AM_LD = $(CXX)
 @DEBUG_TRUE@DEBUG_CFLAGS = -DDEBUG
 AM_CFLAGS = -pedantic -Wall $(DEBUG_CFLAGS)
 AM_CXXFLAGS = -Wall $(DEBUG_CFLAGS)
-lib_LTLIBRARIES = libclish.la liblub.la $(am__append_4) libtinyrl.la \
+lib_LTLIBRARIES = libclish.la liblub.la $(am__append_2) libtinyrl.la \
 	libtinyxml.la libkonf.la
 lib_LIBRARIES = 
 nobase_include_HEADERS = clish/command.h clish/param.h clish/pargv.h \
@@ -737,47 +713,24 @@ EXTRA_DIST = bin/module.am clish/module.am lub/module.am \
 	konf/query/module.am konf/buf/module.am konf/net/module.am
 bin_clish_SOURCES = bin/clish.cpp
 bin_clish_LDADD = \
-    libclish.la    \
+	libclish.la \
-    libkonf.la     \
+	libkonf.la \
-    libtinyrl.la   \
+	libtinyrl.la \
-    libtinyxml.la  \
+	libtinyxml.la \
-    liblub.la      \
+	liblub.la \
-    @PTHREAD_LIBS@ \
+	@PTHREAD_LIBS@ \
-    @BFD_LIBS@
+	@BFD_LIBS@
-
+
-#    @LUBHEAP_LIBS@
+#	@LUBHEAP_LIBS@
 bin_konfd_SOURCES = bin/konfd.c
 bin_konfd_LDADD = \
-    libkonf.la     \
+	libkonf.la \
-    liblub.la
+	liblub.la
 
 bin_konf_SOURCES = bin/konf.c
 bin_konf_LDADD = \
-    libkonf.la    \
+	libkonf.la \
-    liblub.la
+	liblub.la
-
-@TCL_TRUE@bin_tclish@TCL_VERSION@_SOURCES = bin/tclish.cpp \
-@TCL_TRUE@    bin/tclish_fini_callback.c   \
-@TCL_TRUE@    bin/tclish_init_callback.c   \
-@TCL_TRUE@    bin/tclish_script_callback.c \
-@TCL_TRUE@    bin/tclish_show_result.c
-
-@TCL_TRUE@bin_tclish@TCL_VERSION@_LDADD = \
-@TCL_TRUE@    libclish.la                   \
-@TCL_TRUE@    libkonf.la                    \
-@TCL_TRUE@    libtinyrl.la                  \
-@TCL_TRUE@    libtinyxml.la                 \
-@TCL_TRUE@    liblub.la                     \
-@TCL_TRUE@    @TCL_LIBS@                    \
-@TCL_TRUE@    @PTHREAD_LIBS@                \
-@TCL_TRUE@    @BFD_LIBS@
-
-@LUBHEAP_TRUE@bin_lubheap_SOURCES = bin/lubheap.c
-@LUBHEAP_TRUE@bin_lubheap_LDADD = \
-@LUBHEAP_TRUE@    liblub.la         \
-@LUBHEAP_TRUE@    @LUBHEAP_LIBS@    \
-@LUBHEAP_TRUE@    @PTHREAD_LIBS@    \
-@LUBHEAP_TRUE@    @BFD_LIBS@
 
 libclish_la_SOURCES = clish/clish_access_callback.c \
 	clish/clish_script_callback.c clish/clish_config_callback.c \
@@ -814,6 +767,12 @@ libclish_la_SOURCES = clish/clish_access_callback.c \
 	clish/nspace/nspace.c clish/nspace/nspace_dump.c \
 	clish/nspace/private.h
 libclish_la_CFLAGS = @LUB_CFLAGS@ @LUBHEAP_CFLAGS@ $(DEBUG_CFLAGS)
+libclish_la_LIBADD = \
+	liblub.la \
+	libtinyrl.la \
+	libtinyxml.la \
+	libkonf.la
+
 liblub_la_SOURCES = lub/argv/argv__get_arg.c lub/argv/argv__get_argv.c \
 	lub/argv/argv__get_count.c lub/argv/argv__get_offset.c \
 	lub/argv/argv__get_quoted.c lub/argv/argv_delete.c \
@@ -838,7 +797,7 @@ liblub_la_SOURCES = lub/argv/argv__get_arg.c lub/argv/argv__get_argv.c \
 	lub/dblockpool/dblockpool_fini.c \
 	lub/dblockpool/dblockpool_free.c \
 	lub/dblockpool/dblockpool_init.c lub/dblockpool/private.h \
-	lub/dump/dump.c lub/dump/private.h $(am__append_3) \
+	lub/dump/dump.c lub/dump/private.h $(am__append_1) \
 	lub/string/string_cat.c lub/string/string_catn.c \
 	lub/string/string_dup.c lub/string/string_dupn.c \
 	lub/string/string_free.c lub/string/string_nocasecmp.c \
@@ -848,15 +807,16 @@ liblub_la_SOURCES = lub/argv/argv__get_arg.c lub/argv/argv__get_argv.c \
 	lub/system/private.h
 liblub_la_LIBADD = -lpthread
 @LUBHEAP_TRUE@liblubheap_la_SOURCES = lubheap/posix/sysheap.c
+libtinyrl_la_LIBADD = liblub.la
 libtinyrl_la_SOURCES = tinyrl/tinyrl.c tinyrl/private.h \
 	tinyrl/history/history.c tinyrl/history/history_entry.c \
 	tinyrl/history/private.h tinyrl/vt100/vt100.c \
 	tinyrl/vt100/private.h
 libtinyxml_la_SOURCES = \
-    tinyxml/tinyxml.cpp         \
+	tinyxml/tinyxml.cpp \
-    tinyxml/tinyxmlerror.cpp    \
+	tinyxml/tinyxmlerror.cpp \
-    tinyxml/tinyxmlparser.cpp   \
+	tinyxml/tinyxmlparser.cpp \
-    tinyxml/tinystr.cpp
+	tinyxml/tinystr.cpp
 
 libtinyxml_la_CXXFLAGS = @TINYXML_CXXFLAGS@
 test_bintree_SOURCES = \
@@ -903,7 +863,7 @@ libkonf_la_SOURCES = konf/tree/tree.c konf/tree/tree_dump.c \
 	konf/tree/private.h konf/query/query.c konf/query/query_dump.c \
 	konf/query/private.h konf/buf/buf.c konf/buf/private.h \
 	konf/net/net.c konf/net/private.h
-libkonf_la_LIBADD = 
+libkonf_la_LIBADD = liblub.la
 all: config.h
 	$(MAKE) $(AM_MAKEFLAGS) all-am
 
@@ -1660,24 +1620,6 @@ bin/konfd.$(OBJEXT): bin/$(am__dirstamp) bin/$(DEPDIR)/$(am__dirstamp)
 bin/konfd$(EXEEXT): $(bin_konfd_OBJECTS) $(bin_konfd_DEPENDENCIES) bin/$(am__dirstamp)
 	@rm -f bin/konfd$(EXEEXT)
 	$(LINK) $(bin_konfd_OBJECTS) $(bin_konfd_LDADD) $(LIBS)
-bin/lubheap.$(OBJEXT): bin/$(am__dirstamp) \
-	bin/$(DEPDIR)/$(am__dirstamp)
-bin/lubheap$(EXEEXT): $(bin_lubheap_OBJECTS) $(bin_lubheap_DEPENDENCIES) bin/$(am__dirstamp)
-	@rm -f bin/lubheap$(EXEEXT)
-	$(LINK) $(bin_lubheap_OBJECTS) $(bin_lubheap_LDADD) $(LIBS)
-bin/tclish.$(OBJEXT): bin/$(am__dirstamp) \
-	bin/$(DEPDIR)/$(am__dirstamp)
-bin/tclish_fini_callback.$(OBJEXT): bin/$(am__dirstamp) \
-	bin/$(DEPDIR)/$(am__dirstamp)
-bin/tclish_init_callback.$(OBJEXT): bin/$(am__dirstamp) \
-	bin/$(DEPDIR)/$(am__dirstamp)
-bin/tclish_script_callback.$(OBJEXT): bin/$(am__dirstamp) \
-	bin/$(DEPDIR)/$(am__dirstamp)
-bin/tclish_show_result.$(OBJEXT): bin/$(am__dirstamp) \
-	bin/$(DEPDIR)/$(am__dirstamp)
-bin/tclish@TCL_VERSION@$(EXEEXT): $(bin_tclish@TCL_VERSION@_OBJECTS) $(bin_tclish@TCL_VERSION@_DEPENDENCIES) bin/$(am__dirstamp)
-	@rm -f bin/tclish@TCL_VERSION@$(EXEEXT)
-	$(CXXLINK) $(bin_tclish@TCL_VERSION@_OBJECTS) $(bin_tclish@TCL_VERSION@_LDADD) $(LIBS)
 test/$(am__dirstamp):
 	@$(MKDIR_P) test
 	@: > test/$(am__dirstamp)
@@ -1715,12 +1657,6 @@ mostlyclean-compile:
 	-rm -f bin/clish.$(OBJEXT)
 	-rm -f bin/konf.$(OBJEXT)
 	-rm -f bin/konfd.$(OBJEXT)
-	-rm -f bin/lubheap.$(OBJEXT)
-	-rm -f bin/tclish.$(OBJEXT)
-	-rm -f bin/tclish_fini_callback.$(OBJEXT)
-	-rm -f bin/tclish_init_callback.$(OBJEXT)
-	-rm -f bin/tclish_script_callback.$(OBJEXT)
-	-rm -f bin/tclish_show_result.$(OBJEXT)
 	-rm -f clish/command/libclish_la-command.$(OBJEXT)
 	-rm -f clish/command/libclish_la-command.lo
 	-rm -f clish/command/libclish_la-command_dump.$(OBJEXT)
@@ -2075,12 +2011,6 @@ distclean-compile:
 @AMDEP_TRUE@@am__include@ @am__quote@bin/$(DEPDIR)/clish.Po@am__quote@
 @AMDEP_TRUE@@am__include@ @am__quote@bin/$(DEPDIR)/konf.Po@am__quote@
 @AMDEP_TRUE@@am__include@ @am__quote@bin/$(DEPDIR)/konfd.Po@am__quote@
-@AMDEP_TRUE@@am__include@ @am__quote@bin/$(DEPDIR)/lubheap.Po@am__quote@
-@AMDEP_TRUE@@am__include@ @am__quote@bin/$(DEPDIR)/tclish.Po@am__quote@
-@AMDEP_TRUE@@am__include@ @am__quote@bin/$(DEPDIR)/tclish_fini_callback.Po@am__quote@
-@AMDEP_TRUE@@am__include@ @am__quote@bin/$(DEPDIR)/tclish_init_callback.Po@am__quote@
-@AMDEP_TRUE@@am__include@ @am__quote@bin/$(DEPDIR)/tclish_script_callback.Po@am__quote@
-@AMDEP_TRUE@@am__include@ @am__quote@bin/$(DEPDIR)/tclish_show_result.Po@am__quote@
 @AMDEP_TRUE@@am__include@ @am__quote@clish/$(DEPDIR)/libclish_la-clish_access_callback.Plo@am__quote@
 @AMDEP_TRUE@@am__include@ @am__quote@clish/$(DEPDIR)/libclish_la-clish_config_callback.Plo@am__quote@
 @AMDEP_TRUE@@am__include@ @am__quote@clish/$(DEPDIR)/libclish_la-clish_script_callback.Plo@am__quote@
@@ -3136,6 +3066,33 @@ uninstall-am: uninstall-binPROGRAMS uninstall-libLIBRARIES \
 	uninstall-nobase_includeHEADERS
 
 
+@TCL_TRUE@	bin_PROGRAMS += bin/tclish@TCL_VERSION@
+
+@TCL_TRUE@	bin_tclish@TCL_VERSION@_SOURCES = bin/tclish.cpp \
+@TCL_TRUE@		bin/tclish_fini_callback.c \
+@TCL_TRUE@		bin/tclish_init_callback.c \
+@TCL_TRUE@		bin/tclish_script_callback.c \
+@TCL_TRUE@		bin/tclish_show_result.c
+
+@TCL_TRUE@	bin_tclish@TCL_VERSION@_LDADD = \
+@TCL_TRUE@		libclish.la \
+@TCL_TRUE@		libkonf.la \
+@TCL_TRUE@		libtinyrl.la \
+@TCL_TRUE@		libtinyxml.la \
+@TCL_TRUE@		liblub.la \
+@TCL_TRUE@		@TCL_LIBS@ \
+@TCL_TRUE@		@PTHREAD_LIBS@ \
+@TCL_TRUE@		@BFD_LIBS@
+#		@LUBHEAP_LIBS@
+
+@LUBHEAP_TRUE@	bin_PROGRAMS += bin/lubheap
+@LUBHEAP_TRUE@	bin_lubheap_SOURCES = bin/lubheap.c
+@LUBHEAP_TRUE@	bin_lubheap_LDADD = \
+@LUBHEAP_TRUE@		liblub.la \
+@LUBHEAP_TRUE@		@LUBHEAP_LIBS@ \
+@LUBHEAP_TRUE@		@PTHREAD_LIBS@ \
+@LUBHEAP_TRUE@		@BFD_LIBS@
+
 #EXTRA_DIST  +=                                  	\
 #                xml-examples/clock.xml 	\
 #                xml-examples/debug-commands.xml 	\
@@ -3153,3 +3110,4 @@ uninstall-am: uninstall-binPROGRAMS uninstall-libLIBRARIES \
 # 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.
 .NOEXPORT:
+

aclocal.m4

@@ -9433,3 +9433,4 @@ AC_SUBST([am__tar])
 AC_SUBST([am__untar])
 ]) # _AM_PROG_TAR
 
+

aux_scripts/compile

@@ -1,9 +1,10 @@
 #! /bin/sh
 # Wrapper for compilers which do not understand `-c -o'.
 
-scriptversion=2003-11-09.00
+scriptversion=2009-10-06.20; # UTC
 
-# Copyright (C) 1999, 2000, 2003 Free Software Foundation, Inc.
+# Copyright (C) 1999, 2000, 2003, 2004, 2005, 2009  Free Software
+# Foundation, Inc.
 # Written by Tom Tromey <tromey@cygnus.com>.
 #
 # This program is free software; you can redistribute it and/or modify
@@ -17,8 +18,7 @@ scriptversion=2003-11-09.00
 # GNU General Public License for more details.
 #
 # You should have received a copy of the GNU General Public License
-# along with this program; if not, write to the Free Software
+# along with this program.  If not, see <http://www.gnu.org/licenses/>.
-# Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
 
 # As a special exception to the GNU General Public License, if you
 # distribute this file as part of a program that contains a
@@ -47,45 +47,49 @@ right script to run: please start by reading the file `INSTALL'.
 
 Report bugs to <bug-automake@gnu.org>.
 EOF
-    exit 0
+    exit $?
     ;;
   -v | --v*)
     echo "compile $scriptversion"
-    exit 0
+    exit $?
     ;;
 esac
 
-
-prog=$1
-shift
-
 ofile=
 cfile=
-args=
+eat=
-while test $# -gt 0; do
+
-  case "$1" in
+for arg
-    -o)
+do
-      # configure might choose to run compile as `compile cc -o foo foo.c'.
+  if test -n "$eat"; then
-      # So we do something ugly here.
+    eat=
-      ofile=$2
+  else
-      shift
+    case $1 in
-      case "$ofile" in
+      -o)
-	*.o | *.obj)
+	# configure might choose to run compile as `compile cc -o foo foo.c'.
-	  ;;
+	# So we strip `-o arg' only if arg is an object.
-	*)
+	eat=1
-	  args="$args -o $ofile"
+	case $2 in
-	  ofile=
+	  *.o | *.obj)
-	  ;;
+	    ofile=$2
-      esac
+	    ;;
-       ;;
+	  *)
-    *.c)
+	    set x "$@" -o "$2"
-      cfile=$1
+	    shift
-      args="$args $1"
+	    ;;
-      ;;
+	esac
-    *)
+	;;
-      args="$args $1"
+      *.c)
-      ;;
+	cfile=$1
-  esac
+	set x "$@" "$1"
+	shift
+	;;
+      *)
+	set x "$@" "$1"
+	shift
+	;;
+    esac
+  fi
   shift
 done
 
@@ -95,36 +99,38 @@ if test -z "$ofile" || test -z "$cfile"; then
   # normal compilation that the losing compiler can handle.  If no
   # `.c' file was seen then we are probably linking.  That is also
   # ok.
-  exec "$prog" $args
+  exec "$@"
 fi
 
 # Name of file we expect compiler to create.
-cofile=`echo $cfile | sed -e 's|^.*/||' -e 's/\.c$/.o/'`
+cofile=`echo "$cfile" | sed 's|^.*[\\/]||; s|^[a-zA-Z]:||; s/\.c$/.o/'`
 
 # Create the lock directory.
-# Note: use `[/.-]' here to ensure that we don't use the same name
+# Note: use `[/\\:.-]' here to ensure that we don't use the same name
 # that we are using for the .o file.  Also, base the name on the expected
 # object file name, since that is what matters with a parallel build.
-lockdir=`echo $cofile | sed -e 's|[/.-]|_|g'`.d
+lockdir=`echo "$cofile" | sed -e 's|[/\\:.-]|_|g'`.d
 while true; do
-  if mkdir $lockdir > /dev/null 2>&1; then
+  if mkdir "$lockdir" >/dev/null 2>&1; then
     break
   fi
   sleep 1
 done
 # FIXME: race condition here if user kills between mkdir and trap.
-trap "rmdir $lockdir; exit 1" 1 2 15
+trap "rmdir '$lockdir'; exit 1" 1 2 15
 
 # Run the compile.
-"$prog" $args
+"$@"
-status=$?
+ret=$?
 
 if test -f "$cofile"; then
-  mv "$cofile" "$ofile"
+  test "$cofile" = "$ofile" || mv "$cofile" "$ofile"
+elif test -f "${cofile}bj"; then
+  test "${cofile}bj" = "$ofile" || mv "${cofile}bj" "$ofile"
 fi
 
-rmdir $lockdir
+rmdir "$lockdir"
-exit $status
+exit $ret
 
 # Local Variables:
 # mode: shell-script
@@ -132,5 +138,6 @@ exit $status
 # eval: (add-hook 'write-file-hooks 'time-stamp)
 # time-stamp-start: "scriptversion="
 # time-stamp-format: "%:y-%02m-%02d.%02H"
-# time-stamp-end: "$"
+# time-stamp-time-zone: "UTC"
+# time-stamp-end: "; # UTC"
 # End:

aux_scripts/config.guess

@@ -1,10 +1,10 @@
 #! /bin/sh
 # Attempt to guess a canonical system name.
 #   Copyright (C) 1992, 1993, 1994, 1995, 1996, 1997, 1998, 1999,
-#   2000, 2001, 2002, 2003, 2004, 2005, 2006, 2007, 2008
+#   2000, 2001, 2002, 2003, 2004, 2005, 2006, 2007, 2008, 2009
 #   Free Software Foundation, Inc.
 
-timestamp='2008-01-23'
+timestamp='2009-11-20'
 
 # This file is free software; you can redistribute it and/or modify it
 # under the terms of the GNU General Public License as published by
@@ -27,16 +27,16 @@ timestamp='2008-01-23'
 # the same distribution terms that you use for the rest of that program.
 
 
-# Originally written by Per Bothner <per@bothner.com>.
+# Originally written by Per Bothner.  Please send patches (context
-# Please send patches to <config-patches@gnu.org>.  Submit a context
+# diff format) to <config-patches@gnu.org> and include a ChangeLog
-# diff and a properly formatted ChangeLog entry.
+# entry.
 #
 # This script attempts to guess a canonical system name similar to
 # config.sub.  If it succeeds, it prints the system name on stdout, and
 # exits with 0.  Otherwise, it exits with 1.
 #
-# The plan is that this can be called by configure scripts if you
+# You can get the latest version of this script from:
-# don't specify an explicit build system type.
+# http://git.savannah.gnu.org/gitweb/?p=config.git;a=blob_plain;f=config.guess;hb=HEAD
 
 me=`echo "$0" | sed -e 's,.*/,,'`
 
@@ -170,7 +170,7 @@ case "${UNAME_MACHINE}:${UNAME_SYSTEM}:${UNAME_RELEASE}:${UNAME_VERSION}" in
 	    arm*|i386|m68k|ns32k|sh3*|sparc|vax)
 		eval $set_cc_for_build
 		if echo __ELF__ | $CC_FOR_BUILD -E - 2>/dev/null \
-			| grep __ELF__ >/dev/null
+			| grep -q __ELF__
 		then
 		    # Once all utilities can be ECOFF (netbsdecoff) or a.out (netbsdaout).
 		    # Return netbsd for either.  FIX?
@@ -324,14 +324,33 @@ case "${UNAME_MACHINE}:${UNAME_SYSTEM}:${UNAME_RELEASE}:${UNAME_VERSION}" in
 	case `/usr/bin/uname -p` in
 	    sparc) echo sparc-icl-nx7; exit ;;
 	esac ;;
+    s390x:SunOS:*:*)
+	echo ${UNAME_MACHINE}-ibm-solaris2`echo ${UNAME_RELEASE}|sed -e 's/[^.]*//'`
+	exit ;;
     sun4H:SunOS:5.*:*)
 	echo sparc-hal-solaris2`echo ${UNAME_RELEASE}|sed -e 's/[^.]*//'`
 	exit ;;
     sun4*:SunOS:5.*:* | tadpole*:SunOS:5.*:*)
 	echo sparc-sun-solaris2`echo ${UNAME_RELEASE}|sed -e 's/[^.]*//'`
 	exit ;;
+    i86pc:AuroraUX:5.*:* | i86xen:AuroraUX:5.*:*)
+	echo i386-pc-auroraux${UNAME_RELEASE}
+	exit ;;
     i86pc:SunOS:5.*:* | i86xen:SunOS:5.*:*)
-	echo i386-pc-solaris2`echo ${UNAME_RELEASE}|sed -e 's/[^.]*//'`
+	eval $set_cc_for_build
+	SUN_ARCH="i386"
+	# If there is a compiler, see if it is configured for 64-bit objects.
+	# Note that the Sun cc does not turn __LP64__ into 1 like gcc does.
+	# This test works for both compilers.
+	if [ "$CC_FOR_BUILD" != 'no_compiler_found' ]; then
+	    if (echo '#ifdef __amd64'; echo IS_64BIT_ARCH; echo '#endif') | \
+		(CCOPTS= $CC_FOR_BUILD -E - 2>/dev/null) | \
+		grep IS_64BIT_ARCH >/dev/null
+	    then
+		SUN_ARCH="x86_64"
+	    fi
+	fi
+	echo ${SUN_ARCH}-pc-solaris2`echo ${UNAME_RELEASE}|sed -e 's/[^.]*//'`
 	exit ;;
     sun4*:SunOS:6*:*)
 	# According to config.sub, this is the proper way to canonicalize
@@ -640,7 +659,7 @@ EOF
 	    # => hppa64-hp-hpux11.23
 
 	    if echo __LP64__ | (CCOPTS= $CC_FOR_BUILD -E - 2>/dev/null) |
-		grep __LP64__ >/dev/null
+		grep -q __LP64__
 	    then
 		HP_ARCH="hppa2.0w"
 	    else
@@ -791,12 +810,12 @@ EOF
     i*:PW*:*)
 	echo ${UNAME_MACHINE}-pc-pw32
 	exit ;;
-    *:Interix*:[3456]*)
+    *:Interix*:*)
     	case ${UNAME_MACHINE} in
 	    x86)
 		echo i586-pc-interix${UNAME_RELEASE}
 		exit ;;
-	    EM64T | authenticamd)
+	    authenticamd | genuineintel | EM64T)
 		echo x86_64-unknown-interix${UNAME_RELEASE}
 		exit ;;
 	    IA64)
@@ -806,6 +825,9 @@ EOF
     [345]86:Windows_95:* | [345]86:Windows_98:* | [345]86:Windows_NT:*)
 	echo i${UNAME_MACHINE}-pc-mks
 	exit ;;
+    8664:Windows_NT:*)
+	echo x86_64-pc-mks
+	exit ;;
     i*:Windows_NT*:* | Pentium*:Windows_NT*:*)
 	# How do we know it's Interix rather than the generic POSIX subsystem?
 	# It also conflicts with pre-2.0 versions of AT&T UWIN. Should we
@@ -835,6 +857,20 @@ EOF
     i*86:Minix:*:*)
 	echo ${UNAME_MACHINE}-pc-minix
 	exit ;;
+    alpha:Linux:*:*)
+	case `sed -n '/^cpu model/s/^.*: \(.*\)/\1/p' < /proc/cpuinfo` in
+	  EV5)   UNAME_MACHINE=alphaev5 ;;
+	  EV56)  UNAME_MACHINE=alphaev56 ;;
+	  PCA56) UNAME_MACHINE=alphapca56 ;;
+	  PCA57) UNAME_MACHINE=alphapca56 ;;
+	  EV6)   UNAME_MACHINE=alphaev6 ;;
+	  EV67)  UNAME_MACHINE=alphaev67 ;;
+	  EV68*) UNAME_MACHINE=alphaev68 ;;
+        esac
+	objdump --private-headers /bin/sh | grep -q ld.so.1
+	if test "$?" = 0 ; then LIBC="libc1" ; else LIBC="" ; fi
+	echo ${UNAME_MACHINE}-unknown-linux-gnu${LIBC}
+	exit ;;
     arm*:Linux:*:*)
 	eval $set_cc_for_build
 	if echo __ARM_EABI__ | $CC_FOR_BUILD -E - 2>/dev/null \
@@ -857,6 +893,17 @@ EOF
     frv:Linux:*:*)
     	echo frv-unknown-linux-gnu
 	exit ;;
+    i*86:Linux:*:*)
+	LIBC=gnu
+	eval $set_cc_for_build
+	sed 's/^	//' << EOF >$dummy.c
+	#ifdef __dietlibc__
+	LIBC=dietlibc
+	#endif
+EOF
+	eval `$CC_FOR_BUILD -E $dummy.c 2>/dev/null | grep '^LIBC'`
+	echo "${UNAME_MACHINE}-pc-linux-${LIBC}"
+	exit ;;
     ia64:Linux:*:*)
 	echo ${UNAME_MACHINE}-unknown-linux-gnu
 	exit ;;
@@ -866,74 +913,33 @@ EOF
     m68*:Linux:*:*)
 	echo ${UNAME_MACHINE}-unknown-linux-gnu
 	exit ;;
-    mips:Linux:*:*)
+    mips:Linux:*:* | mips64:Linux:*:*)
-	eval $set_cc_for_build
-	sed 's/^	//' << EOF >$dummy.c
-	#undef CPU
-	#undef mips
-	#undef mipsel
-	#if defined(__MIPSEL__) || defined(__MIPSEL) || defined(_MIPSEL) || defined(MIPSEL)
-	CPU=mipsel
-	#else
-	#if defined(__MIPSEB__) || defined(__MIPSEB) || defined(_MIPSEB) || defined(MIPSEB)
-	CPU=mips
-	#else
-	CPU=
-	#endif
-	#endif
-EOF
-	eval "`$CC_FOR_BUILD -E $dummy.c 2>/dev/null | sed -n '
-	    /^CPU/{
-		s: ::g
-		p
-	    }'`"
-	test x"${CPU}" != x && { echo "${CPU}-unknown-linux-gnu"; exit; }
-	;;
-    mips64:Linux:*:*)
 	eval $set_cc_for_build
 	sed 's/^	//' << EOF >$dummy.c
 	#undef CPU
-	#undef mips64
+	#undef ${UNAME_MACHINE}
-	#undef mips64el
+	#undef ${UNAME_MACHINE}el
 	#if defined(__MIPSEL__) || defined(__MIPSEL) || defined(_MIPSEL) || defined(MIPSEL)
-	CPU=mips64el
+	CPU=${UNAME_MACHINE}el
 	#else
 	#if defined(__MIPSEB__) || defined(__MIPSEB) || defined(_MIPSEB) || defined(MIPSEB)
-	CPU=mips64
+	CPU=${UNAME_MACHINE}
 	#else
 	CPU=
 	#endif
 	#endif
 EOF
-	eval "`$CC_FOR_BUILD -E $dummy.c 2>/dev/null | sed -n '
+	eval `$CC_FOR_BUILD -E $dummy.c 2>/dev/null | grep '^CPU'`
-	    /^CPU/{
-		s: ::g
-		p
-	    }'`"
 	test x"${CPU}" != x && { echo "${CPU}-unknown-linux-gnu"; exit; }
 	;;
     or32:Linux:*:*)
 	echo or32-unknown-linux-gnu
 	exit ;;
-    ppc:Linux:*:*)
+    padre:Linux:*:*)
-	echo powerpc-unknown-linux-gnu
+	echo sparc-unknown-linux-gnu
-	exit ;;
-    ppc64:Linux:*:*)
-	echo powerpc64-unknown-linux-gnu
 	exit ;;
-    alpha:Linux:*:*)
+    parisc64:Linux:*:* | hppa64:Linux:*:*)
-	case `sed -n '/^cpu model/s/^.*: \(.*\)/\1/p' < /proc/cpuinfo` in
+	echo hppa64-unknown-linux-gnu
-	  EV5)   UNAME_MACHINE=alphaev5 ;;
-	  EV56)  UNAME_MACHINE=alphaev56 ;;
-	  PCA56) UNAME_MACHINE=alphapca56 ;;
-	  PCA57) UNAME_MACHINE=alphapca56 ;;
-	  EV6)   UNAME_MACHINE=alphaev6 ;;
-	  EV67)  UNAME_MACHINE=alphaev67 ;;
-	  EV68*) UNAME_MACHINE=alphaev68 ;;
-        esac
-	objdump --private-headers /bin/sh | grep ld.so.1 >/dev/null
-	if test "$?" = 0 ; then LIBC="libc1" ; else LIBC="" ; fi
-	echo ${UNAME_MACHINE}-unknown-linux-gnu${LIBC}
 	exit ;;
     parisc:Linux:*:* | hppa:Linux:*:*)
 	# Look for CPU level
@@ -943,8 +949,11 @@ EOF
 	  *)    echo hppa-unknown-linux-gnu ;;
 	esac
 	exit ;;
-    parisc64:Linux:*:* | hppa64:Linux:*:*)
+    ppc64:Linux:*:*)
-	echo hppa64-unknown-linux-gnu
+	echo powerpc64-unknown-linux-gnu
+	exit ;;
+    ppc:Linux:*:*)
+	echo powerpc-unknown-linux-gnu
 	exit ;;
     s390:Linux:*:* | s390x:Linux:*:*)
 	echo ${UNAME_MACHINE}-ibm-linux
@@ -967,69 +976,6 @@ EOF
     xtensa*:Linux:*:*)
     	echo ${UNAME_MACHINE}-unknown-linux-gnu
 	exit ;;
-    i*86:Linux:*:*)
-	# The BFD linker knows what the default object file format is, so
-	# first see if it will tell us. cd to the root directory to prevent
-	# problems with other programs or directories called `ld' in the path.
-	# Set LC_ALL=C to ensure ld outputs messages in English.
-	ld_supported_targets=`cd /; LC_ALL=C ld --help 2>&1 \
-			 | sed -ne '/supported targets:/!d
-				    s/[ 	][ 	]*/ /g
-				    s/.*supported targets: *//
-				    s/ .*//
-				    p'`
-        case "$ld_supported_targets" in
-	  elf32-i386)
-		TENTATIVE="${UNAME_MACHINE}-pc-linux-gnu"
-		;;
-	  a.out-i386-linux)
-		echo "${UNAME_MACHINE}-pc-linux-gnuaout"
-		exit ;;
-	  coff-i386)
-		echo "${UNAME_MACHINE}-pc-linux-gnucoff"
-		exit ;;
-	  "")
-		# Either a pre-BFD a.out linker (linux-gnuoldld) or
-		# one that does not give us useful --help.
-		echo "${UNAME_MACHINE}-pc-linux-gnuoldld"
-		exit ;;
-	esac
-	# Determine whether the default compiler is a.out or elf
-	eval $set_cc_for_build
-	sed 's/^	//' << EOF >$dummy.c
-	#include <features.h>
-	#ifdef __ELF__
-	# ifdef __GLIBC__
-	#  if __GLIBC__ >= 2
-	LIBC=gnu
-	#  else
-	LIBC=gnulibc1
-	#  endif
-	# else
-	LIBC=gnulibc1
-	# endif
-	#else
-	#if defined(__INTEL_COMPILER) || defined(__PGI) || defined(__SUNPRO_C) || defined(__SUNPRO_CC)
-	LIBC=gnu
-	#else
-	LIBC=gnuaout
-	#endif
-	#endif
-	#ifdef __dietlibc__
-	LIBC=dietlibc
-	#endif
-EOF
-	eval "`$CC_FOR_BUILD -E $dummy.c 2>/dev/null | sed -n '
-	    /^LIBC/{
-		s: ::g
-		p
-	    }'`"
-	test x"${LIBC}" != x && {
-		echo "${UNAME_MACHINE}-pc-linux-${LIBC}"
-		exit
-	}
-	test x"${TENTATIVE}" != x && { echo "${TENTATIVE}"; exit; }
-	;;
     i*86:DYNIX/ptx:4*:*)
 	# ptx 4.0 does uname -s correctly, with DYNIX/ptx in there.
 	# earlier versions are messed up and put the nodename in both
@@ -1058,7 +1004,7 @@ EOF
     i*86:syllable:*:*)
 	echo ${UNAME_MACHINE}-pc-syllable
 	exit ;;
-    i*86:LynxOS:2.*:* | i*86:LynxOS:3.[01]*:* | i*86:LynxOS:4.0*:*)
+    i*86:LynxOS:2.*:* | i*86:LynxOS:3.[01]*:* | i*86:LynxOS:4.[02]*:*)
 	echo i386-unknown-lynxos${UNAME_RELEASE}
 	exit ;;
     i*86:*DOS:*:*)
@@ -1102,8 +1048,11 @@ EOF
     pc:*:*:*)
 	# Left here for compatibility:
         # uname -m prints for DJGPP always 'pc', but it prints nothing about
-        # the processor, so we play safe by assuming i386.
+        # the processor, so we play safe by assuming i586.
-	echo i386-pc-msdosdjgpp
+	# Note: whatever this is, it MUST be the same as what config.sub
+	# prints for the "djgpp" host, or else GDB configury will decide that
+	# this is a cross-build.
+	echo i586-pc-msdosdjgpp
         exit ;;
     Intel:Mach:3*:*)
 	echo i386-pc-mach3
@@ -1141,6 +1090,16 @@ EOF
     3[34]??:*:4.0:* | 3[34]??,*:*:4.0:*)
         /bin/uname -p 2>/dev/null | grep 86 >/dev/null \
           && { echo i486-ncr-sysv4; exit; } ;;
+    NCR*:*:4.2:* | MPRAS*:*:4.2:*)
+	OS_REL='.3'
+	test -r /etc/.relid \
+	    && OS_REL=.`sed -n 's/[^ ]* [^ ]* \([0-9][0-9]\).*/\1/p' < /etc/.relid`
+	/bin/uname -p 2>/dev/null | grep 86 >/dev/null \
+	    && { echo i486-ncr-sysv4.3${OS_REL}; exit; }
+	/bin/uname -p 2>/dev/null | /bin/grep entium >/dev/null \
+	    && { echo i586-ncr-sysv4.3${OS_REL}; exit; }
+	/bin/uname -p 2>/dev/null | /bin/grep pteron >/dev/null \
+	    && { echo i586-ncr-sysv4.3${OS_REL}; exit; } ;;
     m68*:LynxOS:2.*:* | m68*:LynxOS:3.0*:*)
 	echo m68k-unknown-lynxos${UNAME_RELEASE}
 	exit ;;
@@ -1153,7 +1112,7 @@ EOF
     rs6000:LynxOS:2.*:*)
 	echo rs6000-unknown-lynxos${UNAME_RELEASE}
 	exit ;;
-    PowerPC:LynxOS:2.*:* | PowerPC:LynxOS:3.[01]*:* | PowerPC:LynxOS:4.0*:*)
+    PowerPC:LynxOS:2.*:* | PowerPC:LynxOS:3.[01]*:* | PowerPC:LynxOS:4.[02]*:*)
 	echo powerpc-unknown-lynxos${UNAME_RELEASE}
 	exit ;;
     SM[BE]S:UNIX_SV:*:*)
@@ -1216,6 +1175,9 @@ EOF
     BePC:BeOS:*:*)	# BeOS running on Intel PC compatible.
 	echo i586-pc-beos
 	exit ;;
+    BePC:Haiku:*:*)	# Haiku running on Intel PC compatible.
+	echo i586-pc-haiku
+	exit ;;
     SX-4:SUPER-UX:*:*)
 	echo sx4-nec-superux${UNAME_RELEASE}
 	exit ;;
@@ -1243,6 +1205,16 @@ EOF
     *:Darwin:*:*)
 	UNAME_PROCESSOR=`uname -p` || UNAME_PROCESSOR=unknown
 	case $UNAME_PROCESSOR in
+	    i386)
+		eval $set_cc_for_build
+		if [ "$CC_FOR_BUILD" != 'no_compiler_found' ]; then
+		  if (echo '#ifdef __LP64__'; echo IS_64BIT_ARCH; echo '#endif') | \
+		      (CCOPTS= $CC_FOR_BUILD -E - 2>/dev/null) | \
+		      grep IS_64BIT_ARCH >/dev/null
+		  then
+		      UNAME_PROCESSOR="x86_64"
+		  fi
+		fi ;;
 	    unknown) UNAME_PROCESSOR=powerpc ;;
 	esac
 	echo ${UNAME_PROCESSOR}-apple-darwin${UNAME_RELEASE}
@@ -1324,6 +1296,9 @@ EOF
     i*86:rdos:*:*)
 	echo ${UNAME_MACHINE}-pc-rdos
 	exit ;;
+    i*86:AROS:*:*)
+	echo ${UNAME_MACHINE}-pc-aros
+	exit ;;
 esac
 
 #echo '(No uname command or uname output not recognized.)' 1>&2

aux_scripts/config.sub

@@ -1,10 +1,10 @@
 #! /bin/sh
 # Configuration validation subroutine script.
 #   Copyright (C) 1992, 1993, 1994, 1995, 1996, 1997, 1998, 1999,
-#   2000, 2001, 2002, 2003, 2004, 2005, 2006, 2007, 2008
+#   2000, 2001, 2002, 2003, 2004, 2005, 2006, 2007, 2008, 2009
 #   Free Software Foundation, Inc.
 
-timestamp='2008-01-16'
+timestamp='2009-11-20'
 
 # This file is (in principle) common to ALL GNU software.
 # The presence of a machine in this file suggests that SOME GNU software
@@ -32,13 +32,16 @@ timestamp='2008-01-16'
 
 
 # Please send patches to <config-patches@gnu.org>.  Submit a context
-# diff and a properly formatted ChangeLog entry.
+# diff and a properly formatted GNU ChangeLog entry.
 #
 # Configuration subroutine to validate and canonicalize a configuration type.
 # Supply the specified configuration type as an argument.
 # If it is invalid, we print an error message on stderr and exit with code 1.
 # Otherwise, we print the canonical config type on stdout and succeed.
 
+# You can get the latest version of this script from:
+# http://git.savannah.gnu.org/gitweb/?p=config.git;a=blob_plain;f=config.sub;hb=HEAD
+
 # This file is supposed to be the same for all GNU packages
 # and recognize all the CPU types, system types and aliases
 # that are meaningful with *any* GNU software.
@@ -122,6 +125,7 @@ maybe_os=`echo $1 | sed 's/^\(.*\)-\([^-]*-[^-]*\)$/\2/'`
 case $maybe_os in
   nto-qnx* | linux-gnu* | linux-dietlibc | linux-newlib* | linux-uclibc* | \
   uclinux-uclibc* | uclinux-gnu* | kfreebsd*-gnu* | knetbsd*-gnu* | netbsd*-gnu* | \
+  kopensolaris*-gnu* | \
   storm-chaos* | os2-emx* | rtmk-nova*)
     os=-$maybe_os
     basic_machine=`echo $1 | sed 's/^\(.*\)-\([^-]*-[^-]*\)$/\1/'`
@@ -148,10 +152,13 @@ case $os in
 	-convergent* | -ncr* | -news | -32* | -3600* | -3100* | -hitachi* |\
 	-c[123]* | -convex* | -sun | -crds | -omron* | -dg | -ultra | -tti* | \
 	-harris | -dolphin | -highlevel | -gould | -cbm | -ns | -masscomp | \
-	-apple | -axis | -knuth | -cray)
+	-apple | -axis | -knuth | -cray | -microblaze)
 		os=
 		basic_machine=$1
 		;;
+        -bluegene*)
+	        os=-cnk
+		;;
 	-sim | -cisco | -oki | -wec | -winbond)
 		os=
 		basic_machine=$1
@@ -249,13 +256,16 @@ case $basic_machine in
 	| h8300 | h8500 | hppa | hppa1.[01] | hppa2.0 | hppa2.0[nw] | hppa64 \
 	| i370 | i860 | i960 | ia64 \
 	| ip2k | iq2000 \
+	| lm32 \
 	| m32c | m32r | m32rle | m68000 | m68k | m88k \
-	| maxq | mb | microblaze | mcore | mep \
+	| maxq | mb | microblaze | mcore | mep | metag \
 	| mips | mipsbe | mipseb | mipsel | mipsle \
 	| mips16 \
 	| mips64 | mips64el \
-	| mips64vr | mips64vrel \
+	| mips64octeon | mips64octeonel \
 	| mips64orion | mips64orionel \
+	| mips64r5900 | mips64r5900el \
+	| mips64vr | mips64vrel \
 	| mips64vr4100 | mips64vr4100el \
 	| mips64vr4300 | mips64vr4300el \
 	| mips64vr5000 | mips64vr5000el \
@@ -268,6 +278,7 @@ case $basic_machine in
 	| mipsisa64sr71k | mipsisa64sr71kel \
 	| mipstx39 | mipstx39el \
 	| mn10200 | mn10300 \
+	| moxie \
 	| mt \
 	| msp430 \
 	| nios | nios2 \
@@ -276,20 +287,22 @@ case $basic_machine in
 	| pdp10 | pdp11 | pj | pjl \
 	| powerpc | powerpc64 | powerpc64le | powerpcle | ppcbe \
 	| pyramid \
+	| rx \
 	| score \
-	| sh | sh[1234] | sh[24]a | sh[23]e | sh[34]eb | sheb | shbe | shle | sh[1234]le | sh3ele \
+	| sh | sh[1234] | sh[24]a | sh[24]aeb | sh[23]e | sh[34]eb | sheb | shbe | shle | sh[1234]le | sh3ele \
 	| sh64 | sh64le \
 	| sparc | sparc64 | sparc64b | sparc64v | sparc86x | sparclet | sparclite \
 	| sparcv8 | sparcv9 | sparcv9b | sparcv9v \
 	| spu | strongarm \
 	| tahoe | thumb | tic4x | tic80 | tron \
+	| ubicom32 \
 	| v850 | v850e \
 	| we32k \
 	| x86 | xc16x | xscale | xscalee[bl] | xstormy16 | xtensa \
-	| z8k)
+	| z8k | z80)
 		basic_machine=$basic_machine-unknown
 		;;
-	m6811 | m68hc11 | m6812 | m68hc12)
+	m6811 | m68hc11 | m6812 | m68hc12 | picochip)
 		# Motorola 68HC11/12.
 		basic_machine=$basic_machine-unknown
 		os=-none
@@ -329,14 +342,17 @@ case $basic_machine in
 	| hppa-* | hppa1.[01]-* | hppa2.0-* | hppa2.0[nw]-* | hppa64-* \
 	| i*86-* | i860-* | i960-* | ia64-* \
 	| ip2k-* | iq2000-* \
+	| lm32-* \
 	| m32c-* | m32r-* | m32rle-* \
 	| m68000-* | m680[012346]0-* | m68360-* | m683?2-* | m68k-* \
-	| m88110-* | m88k-* | maxq-* | mcore-* \
+	| m88110-* | m88k-* | maxq-* | mcore-* | metag-* | microblaze-* \
 	| mips-* | mipsbe-* | mipseb-* | mipsel-* | mipsle-* \
 	| mips16-* \
 	| mips64-* | mips64el-* \
-	| mips64vr-* | mips64vrel-* \
+	| mips64octeon-* | mips64octeonel-* \
 	| mips64orion-* | mips64orionel-* \
+	| mips64r5900-* | mips64r5900el-* \
+	| mips64vr-* | mips64vrel-* \
 	| mips64vr4100-* | mips64vr4100el-* \
 	| mips64vr4300-* | mips64vr4300el-* \
 	| mips64vr5000-* | mips64vr5000el-* \
@@ -357,21 +373,22 @@ case $basic_machine in
 	| pdp10-* | pdp11-* | pj-* | pjl-* | pn-* | power-* \
 	| powerpc-* | powerpc64-* | powerpc64le-* | powerpcle-* | ppcbe-* \
 	| pyramid-* \
-	| romp-* | rs6000-* \
+	| romp-* | rs6000-* | rx-* \
-	| sh-* | sh[1234]-* | sh[24]a-* | sh[23]e-* | sh[34]eb-* | sheb-* | shbe-* \
+	| sh-* | sh[1234]-* | sh[24]a-* | sh[24]aeb-* | sh[23]e-* | sh[34]eb-* | sheb-* | shbe-* \
 	| shle-* | sh[1234]le-* | sh3ele-* | sh64-* | sh64le-* \
 	| sparc-* | sparc64-* | sparc64b-* | sparc64v-* | sparc86x-* | sparclet-* \
 	| sparclite-* \
 	| sparcv8-* | sparcv9-* | sparcv9b-* | sparcv9v-* | strongarm-* | sv1-* | sx?-* \
 	| tahoe-* | thumb-* \
-	| tic30-* | tic4x-* | tic54x-* | tic55x-* | tic6x-* | tic80-* \
+	| tic30-* | tic4x-* | tic54x-* | tic55x-* | tic6x-* | tic80-* | tile-* \
 	| tron-* \
+	| ubicom32-* \
 	| v850-* | v850e-* | vax-* \
 	| we32k-* \
 	| x86-* | x86_64-* | xc16x-* | xps100-* | xscale-* | xscalee[bl]-* \
 	| xstormy16-* | xtensa*-* \
 	| ymp-* \
-	| z8k-*)
+	| z8k-* | z80-*)
 		;;
 	# Recognize the basic CPU types without company name, with glob match.
 	xtensa*)
@@ -439,6 +456,10 @@ case $basic_machine in
 		basic_machine=m68k-apollo
 		os=-bsd
 		;;
+	aros)
+		basic_machine=i386-pc
+		os=-aros
+		;;
 	aux)
 		basic_machine=m68k-apple
 		os=-aux
@@ -455,10 +476,18 @@ case $basic_machine in
 		basic_machine=bfin-`echo $basic_machine | sed 's/^[^-]*-//'`
 		os=-linux
 		;;
+	bluegene*)
+		basic_machine=powerpc-ibm
+		os=-cnk
+		;;
 	c90)
 		basic_machine=c90-cray
 		os=-unicos
 		;;
+        cegcc)
+		basic_machine=arm-unknown
+		os=-cegcc
+		;;
 	convex-c1)
 		basic_machine=c1-convex
 		os=-bsd
@@ -526,6 +555,10 @@ case $basic_machine in
 		basic_machine=m88k-motorola
 		os=-sysv3
 		;;
+	dicos)
+		basic_machine=i686-pc
+		os=-dicos
+		;;
 	djgpp)
 		basic_machine=i586-pc
 		os=-msdosdjgpp
@@ -699,6 +732,9 @@ case $basic_machine in
 		basic_machine=ns32k-utek
 		os=-sysv
 		;;
+        microblaze)
+		basic_machine=microblaze-xilinx
+		;;
 	mingw32)
 		basic_machine=i386-pc
 		os=-mingw32
@@ -1128,6 +1164,10 @@ case $basic_machine in
 		basic_machine=z8k-unknown
 		os=-sim
 		;;
+	z80-*-coff)
+		basic_machine=z80-unknown
+		os=-sim
+		;;
 	none)
 		basic_machine=none-none
 		os=-none
@@ -1166,7 +1206,7 @@ case $basic_machine in
 	we32k)
 		basic_machine=we32k-att
 		;;
-	sh[1234] | sh[24]a | sh[34]eb | sh[1234]le | sh[23]ele)
+	sh[1234] | sh[24]a | sh[24]aeb | sh[34]eb | sh[1234]le | sh[23]ele)
 		basic_machine=sh-unknown
 		;;
 	sparc | sparcv8 | sparcv9 | sparcv9b | sparcv9v)
@@ -1216,6 +1256,9 @@ case $os in
         # First match some system type aliases
         # that might get confused with valid system types.
 	# -solaris* is a basic system type, with this one exception.
+        -auroraux)
+	        os=-auroraux
+		;;
 	-solaris1 | -solaris1.*)
 		os=`echo $os | sed -e 's|solaris1|sunos4|'`
 		;;
@@ -1236,10 +1279,11 @@ case $os in
 	# Each alternative MUST END IN A *, to match a version number.
 	# -sysv* is not here because it comes later, after sysvr4.
 	-gnu* | -bsd* | -mach* | -minix* | -genix* | -ultrix* | -irix* \
-	      | -*vms* | -sco* | -esix* | -isc* | -aix* | -sunos | -sunos[34]*\
+	      | -*vms* | -sco* | -esix* | -isc* | -aix* | -cnk* | -sunos | -sunos[34]*\
-	      | -hpux* | -unos* | -osf* | -luna* | -dgux* | -solaris* | -sym* \
+	      | -hpux* | -unos* | -osf* | -luna* | -dgux* | -auroraux* | -solaris* \
+	      | -sym* | -kopensolaris* \
 	      | -amigaos* | -amigados* | -msdos* | -newsos* | -unicos* | -aof* \
-	      | -aos* \
+	      | -aos* | -aros* \
 	      | -nindy* | -vxsim* | -vxworks* | -ebmon* | -hms* | -mvs* \
 	      | -clix* | -riscos* | -uniplus* | -iris* | -rtu* | -xenix* \
 	      | -hiux* | -386bsd* | -knetbsd* | -mirbsd* | -netbsd* \
@@ -1248,7 +1292,7 @@ case $os in
 	      | -bosx* | -nextstep* | -cxux* | -aout* | -elf* | -oabi* \
 	      | -ptx* | -coff* | -ecoff* | -winnt* | -domain* | -vsta* \
 	      | -udi* | -eabi* | -lites* | -ieee* | -go32* | -aux* \
-	      | -chorusos* | -chorusrdb* \
+	      | -chorusos* | -chorusrdb* | -cegcc* \
 	      | -cygwin* | -pe* | -psos* | -moss* | -proelf* | -rtems* \
 	      | -mingw32* | -linux-gnu* | -linux-newlib* | -linux-uclibc* \
 	      | -uxpv* | -beos* | -mpeix* | -udk* \
@@ -1258,7 +1302,7 @@ case $os in
 	      | -os2* | -vos* | -palmos* | -uclinux* | -nucleus* \
 	      | -morphos* | -superux* | -rtmk* | -rtmk-nova* | -windiss* \
 	      | -powermax* | -dnix* | -nx6 | -nx7 | -sei* | -dragonfly* \
-	      | -skyos* | -haiku* | -rdos* | -toppers* | -drops*)
+	      | -skyos* | -haiku* | -rdos* | -toppers* | -drops* | -es*)
 	# Remember, each alternative MUST END IN *, to match a version number.
 		;;
 	-qnx*)
@@ -1388,6 +1432,9 @@ case $os in
 	-zvmoe)
 		os=-zvmoe
 		;;
+	-dicos*)
+		os=-dicos
+		;;
 	-none)
 		;;
 	*)
@@ -1585,7 +1632,7 @@ case $basic_machine in
 			-sunos*)
 				vendor=sun
 				;;
-			-aix*)
+			-cnk*|-aix*)
 				vendor=ibm
 				;;
 			-beos*)

aux_scripts/depcomp

@@ -1,9 +1,10 @@
 #! /bin/sh
 # depcomp - compile a program generating dependencies as side-effects
 
-scriptversion=2004-05-31.23
+scriptversion=2009-04-28.21; # UTC
 
-# Copyright (C) 1999, 2000, 2003, 2004 Free Software Foundation, Inc.
+# Copyright (C) 1999, 2000, 2003, 2004, 2005, 2006, 2007, 2009 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
@@ -16,9 +17,7 @@ scriptversion=2004-05-31.23
 # GNU General Public License for more details.
 
 # You should have received a copy of the GNU General Public License
-# along with this program; if not, write to the Free Software
+# along with this program.  If not, see <http://www.gnu.org/licenses/>.
-# Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA
-# 02111-1307, USA.
 
 # As a special exception to the GNU General Public License, if you
 # distribute this file as part of a program that contains a
@@ -50,11 +49,11 @@ Environment variables:
 
 Report bugs to <bug-automake@gnu.org>.
 EOF
-    exit 0
+    exit $?
     ;;
   -v | --v*)
     echo "depcomp $scriptversion"
-    exit 0
+    exit $?
     ;;
 esac
 
@@ -86,12 +85,34 @@ if test "$depmode" = dashXmstdout; then
    depmode=dashmstdout
 fi
 
+cygpath_u="cygpath -u -f -"
+if test "$depmode" = msvcmsys; then
+   # This is just like msvisualcpp but w/o cygpath translation.
+   # Just convert the backslash-escaped backslashes to single forward
+   # slashes to satisfy depend.m4
+   cygpath_u="sed s,\\\\\\\\,/,g"
+   depmode=msvisualcpp
+fi
+
 case "$depmode" in
 gcc3)
 ## gcc 3 implements dependency tracking that does exactly what
 ## we want.  Yay!  Note: for some reason libtool 1.4 doesn't like
 ## it if -MD -MP comes after the -MF stuff.  Hmm.
-  "$@" -MT "$object" -MD -MP -MF "$tmpdepfile"
+## Unfortunately, FreeBSD c89 acceptance of flags depends upon
+## the command line argument order; so add the flags where they
+## appear in depend2.am.  Note that the slowdown incurred here
+## affects only configure: in makefiles, %FASTDEP% shortcuts this.
+  for arg
+  do
+    case $arg in
+    -c) set fnord "$@" -MT "$object" -MD -MP -MF "$tmpdepfile" "$arg" ;;
+    *)  set fnord "$@" "$arg" ;;
+    esac
+    shift # fnord
+    shift # $arg
+  done
+  "$@"
   stat=$?
   if test $stat -eq 0; then :
   else
@@ -178,14 +199,14 @@ sgi)
 ' < "$tmpdepfile" \
     | sed -e 's/^.*\.o://' -e 's/#.*$//' -e '/^$/ d' | \
     tr '
-' ' ' >> $depfile
+' ' ' >> "$depfile"
-    echo >> $depfile
+    echo >> "$depfile"
 
     # The second pass generates a dummy entry for each header file.
     tr ' ' '
 ' < "$tmpdepfile" \
    | sed -e 's/^.*\.o://' -e 's/#.*$//' -e '/^$/ d' -e 's/$/:/' \
-   >> $depfile
+   >> "$depfile"
   else
     # The sourcefile does not contain any dependencies, so just
     # store a dummy comment line, to avoid errors with the Makefile
@@ -201,34 +222,39 @@ aix)
   # current directory.  Also, the AIX compiler puts `$object:' at the
   # start of each line; $object doesn't have directory information.
   # Version 6 uses the directory in both cases.
-  stripped=`echo "$object" | sed 's/\(.*\)\..*$/\1/'`
+  dir=`echo "$object" | sed -e 's|/[^/]*$|/|'`
-  tmpdepfile="$stripped.u"
+  test "x$dir" = "x$object" && dir=
+  base=`echo "$object" | sed -e 's|^.*/||' -e 's/\.o$//' -e 's/\.lo$//'`
   if test "$libtool" = yes; then
+    tmpdepfile1=$dir$base.u
+    tmpdepfile2=$base.u
+    tmpdepfile3=$dir.libs/$base.u
     "$@" -Wc,-M
   else
+    tmpdepfile1=$dir$base.u
+    tmpdepfile2=$dir$base.u
+    tmpdepfile3=$dir$base.u
     "$@" -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"
+    rm -f "$tmpdepfile1" "$tmpdepfile2" "$tmpdepfile3"
     exit $stat
   fi
 
+  for tmpdepfile in "$tmpdepfile1" "$tmpdepfile2" "$tmpdepfile3"
+  do
+    test -f "$tmpdepfile" && break
+  done
   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:'.
-    sed -e "s,^$outname:,$object :," < "$tmpdepfile" > "$depfile"
+    sed -e "s,^.*\.[a-z]*:,$object:," < "$tmpdepfile" > "$depfile"
-    sed -e "s,^$outname: \(.*\)$,\1:," < "$tmpdepfile" >> "$depfile"
+    # That's a tab and a space in the [].
+    sed -e 's,^.*\.[a-z]*:[	 ]*,,' -e 's,$,:,' < "$tmpdepfile" >> "$depfile"
   else
     # The sourcefile does not contain any dependencies, so just
     # store a dummy comment line, to avoid errors with the Makefile
@@ -276,6 +302,51 @@ icc)
   rm -f "$tmpdepfile"
   ;;
 
+hp2)
+  # The "hp" stanza above does not work with aCC (C++) and HP's ia64
+  # compilers, which have integrated preprocessors.  The correct option
+  # to use with these is +Maked; it writes dependencies to a file named
+  # 'foo.d', which lands next to the object file, wherever that
+  # happens to be.
+  # Much of this is similar to the tru64 case; see comments there.
+  dir=`echo "$object" | sed -e 's|/[^/]*$|/|'`
+  test "x$dir" = "x$object" && dir=
+  base=`echo "$object" | sed -e 's|^.*/||' -e 's/\.o$//' -e 's/\.lo$//'`
+  if test "$libtool" = yes; then
+    tmpdepfile1=$dir$base.d
+    tmpdepfile2=$dir.libs/$base.d
+    "$@" -Wc,+Maked
+  else
+    tmpdepfile1=$dir$base.d
+    tmpdepfile2=$dir$base.d
+    "$@" +Maked
+  fi
+  stat=$?
+  if test $stat -eq 0; then :
+  else
+     rm -f "$tmpdepfile1" "$tmpdepfile2"
+     exit $stat
+  fi
+
+  for tmpdepfile in "$tmpdepfile1" "$tmpdepfile2"
+  do
+    test -f "$tmpdepfile" && break
+  done
+  if test -f "$tmpdepfile"; then
+    sed -e "s,^.*\.[a-z]*:,$object:," "$tmpdepfile" > "$depfile"
+    # Add `dependent.h:' lines.
+    sed -ne '2,${
+	       s/^ *//
+	       s/ \\*$//
+	       s/$/:/
+	       p
+	     }' "$tmpdepfile" >> "$depfile"
+  else
+    echo "#dummy" > "$depfile"
+  fi
+  rm -f "$tmpdepfile" "$tmpdepfile2"
+  ;;
+
 tru64)
    # The Tru64 compiler uses -MD to generate dependencies as a side
    # effect.  `cc -MD -o foo.o ...' puts the dependencies into `foo.o.d'.
@@ -287,36 +358,43 @@ tru64)
    base=`echo "$object" | sed -e 's|^.*/||' -e 's/\.o$//' -e 's/\.lo$//'`
 
    if test "$libtool" = yes; then
-      # Dependencies are output in .lo.d with libtool 1.4.
+      # With Tru64 cc, shared objects can also be used to make a
-      # With libtool 1.5 they are output both in $dir.libs/$base.o.d
+      # static library.  This mechanism is used in libtool 1.4 series to
-      # and in $dir.libs/$base.o.d and $dir$base.o.d.  We process the
+      # handle both shared and static libraries in a single compilation.
-      # latter, because the former will be cleaned when $dir.libs is
+      # With libtool 1.4, dependencies were output in $dir.libs/$base.lo.d.
-      # erased.
+      #
-      tmpdepfile1="$dir.libs/$base.lo.d"
+      # With libtool 1.5 this exception was removed, and libtool now
-      tmpdepfile2="$dir$base.o.d"
+      # generates 2 separate objects for the 2 libraries.  These two
-      tmpdepfile3="$dir.libs/$base.d"
+      # compilations output dependencies in $dir.libs/$base.o.d and
+      # in $dir$base.o.d.  We have to check for both files, because
+      # one of the two compilations can be disabled.  We should prefer
+      # $dir$base.o.d over $dir.libs/$base.o.d because the latter is
+      # automatically cleaned when .libs/ is deleted, while ignoring
+      # the former would cause a distcleancheck panic.
+      tmpdepfile1=$dir.libs/$base.lo.d   # libtool 1.4
+      tmpdepfile2=$dir$base.o.d          # libtool 1.5
+      tmpdepfile3=$dir.libs/$base.o.d    # libtool 1.5
+      tmpdepfile4=$dir.libs/$base.d      # Compaq CCC V6.2-504
       "$@" -Wc,-MD
    else
-      tmpdepfile1="$dir$base.o.d"
+      tmpdepfile1=$dir$base.o.d
-      tmpdepfile2="$dir$base.d"
+      tmpdepfile2=$dir$base.d
-      tmpdepfile3="$dir$base.d"
+      tmpdepfile3=$dir$base.d
+      tmpdepfile4=$dir$base.d
       "$@" -MD
    fi
 
    stat=$?
    if test $stat -eq 0; then :
    else
-      rm -f "$tmpdepfile1" "$tmpdepfile2" "$tmpdepfile3"
+      rm -f "$tmpdepfile1" "$tmpdepfile2" "$tmpdepfile3" "$tmpdepfile4"
       exit $stat
    fi
 
-   if test -f "$tmpdepfile1"; then
+   for tmpdepfile in "$tmpdepfile1" "$tmpdepfile2" "$tmpdepfile3" "$tmpdepfile4"
-      tmpdepfile="$tmpdepfile1"
+   do
-   elif test -f "$tmpdepfile2"; then
+     test -f "$tmpdepfile" && break
-      tmpdepfile="$tmpdepfile2"
+   done
-   else
-      tmpdepfile="$tmpdepfile3"
-   fi
    if test -f "$tmpdepfile"; then
       sed -e "s,^.*\.[a-z]*:,$object:," < "$tmpdepfile" > "$depfile"
       # That's a tab and a space in the [].
@@ -338,7 +416,7 @@ dashmstdout)
 
   # Remove the call to Libtool.
   if test "$libtool" = yes; then
-    while test $1 != '--mode=compile'; do
+    while test "X$1" != 'X--mode=compile'; do
       shift
     done
     shift
@@ -389,32 +467,39 @@ makedepend)
   "$@" || exit $?
   # Remove any Libtool call
   if test "$libtool" = yes; then
-    while test $1 != '--mode=compile'; do
+    while test "X$1" != 'X--mode=compile'; do
       shift
     done
     shift
   fi
   # X makedepend
   shift
-  cleared=no
+  cleared=no eat=no
-  for arg in "$@"; do
+  for arg
+  do
     case $cleared in
     no)
       set ""; shift
       cleared=yes ;;
     esac
+    if test $eat = yes; then
+      eat=no
+      continue
+    fi
     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.
+    -arch)
+      eat=yes ;;
     -*|$object)
       ;;
     *)
       set fnord "$@" "$arg"; shift ;;
     esac
   done
-  obj_suffix="`echo $object | sed 's/^.*\././'`"
+  obj_suffix=`echo "$object" | sed 's/^.*\././'`
   touch "$tmpdepfile"
   ${MAKEDEPEND-makedepend} -o"$obj_suffix" -f"$tmpdepfile" "$@"
   rm -f "$depfile"
@@ -434,7 +519,7 @@ cpp)
 
   # Remove the call to Libtool.
   if test "$libtool" = yes; then
-    while test $1 != '--mode=compile'; do
+    while test "X$1" != 'X--mode=compile'; do
       shift
     done
     shift
@@ -460,7 +545,8 @@ cpp)
   done
 
   "$@" -E |
-    sed -n '/^# [0-9][0-9]* "\([^"]*\)".*/ s:: \1 \\:p' |
+    sed -n -e '/^# [0-9][0-9]* "\([^"]*\)".*/ s:: \1 \\:p' \
+       -e '/^#line [0-9][0-9]* "\([^"]*\)".*/ s:: \1 \\:p' |
     sed '$ s: \\$::' > "$tmpdepfile"
   rm -f "$depfile"
   echo "$object : \\" > "$depfile"
@@ -471,13 +557,27 @@ cpp)
 
 msvisualcpp)
   # Important note: in order to support this mode, a compiler *must*
-  # always write the preprocessed file to stdout, regardless of -o,
+  # always write the preprocessed file to stdout.
-  # because we must use -o when running libtool.
   "$@" || exit $?
+
+  # Remove the call to Libtool.
+  if test "$libtool" = yes; then
+    while test "X$1" != 'X--mode=compile'; do
+      shift
+    done
+    shift
+  fi
+
   IFS=" "
   for arg
   do
     case "$arg" in
+    -o)
+      shift
+      ;;
+    $object)
+      shift
+      ;;
     "-Gm"|"/Gm"|"-Gi"|"/Gi"|"-ZI"|"/ZI")
 	set fnord "$@"
 	shift
@@ -490,16 +590,23 @@ msvisualcpp)
 	;;
     esac
   done
-  "$@" -E |
+  "$@" -E 2>/dev/null |
-  sed -n '/^#line [0-9][0-9]* "\([^"]*\)"/ s::echo "`cygpath -u \\"\1\\"`":p' | sort | uniq > "$tmpdepfile"
+  sed -n '/^#line [0-9][0-9]* "\([^"]*\)"/ s::\1:p' | $cygpath_u | sort -u > "$tmpdepfile"
   rm -f "$depfile"
   echo "$object : \\" > "$depfile"
-  . "$tmpdepfile" | sed 's% %\\ %g' | sed -n '/^\(.*\)$/ s::	\1 \\:p' >> "$depfile"
+  sed < "$tmpdepfile" -n -e 's% %\\ %g' -e '/^\(.*\)$/ s::	\1 \\:p' >> "$depfile"
   echo "	" >> "$depfile"
-  . "$tmpdepfile" | sed 's% %\\ %g' | sed -n '/^\(.*\)$/ s::\1\::p' >> "$depfile"
+  sed < "$tmpdepfile" -n -e 's% %\\ %g' -e '/^\(.*\)$/ s::\1\::p' >> "$depfile"
   rm -f "$tmpdepfile"
   ;;
 
+msvcmsys)
+  # This case exists only to let depend.m4 do its work.  It works by
+  # looking at the text of this script.  This case will never be run,
+  # since it is checked for above.
+  exit 1
+  ;;
+
 none)
   exec "$@"
   ;;
@@ -518,5 +625,6 @@ exit 0
 # eval: (add-hook 'write-file-hooks 'time-stamp)
 # time-stamp-start: "scriptversion="
 # time-stamp-format: "%:y-%02m-%02d.%02H"
-# time-stamp-end: "$"
+# time-stamp-time-zone: "UTC"
+# time-stamp-end: "; # UTC"
 # End:

aux_scripts/install-sh

@@ -1,7 +1,7 @@
 #!/bin/sh
 # install - install a program, script, or datafile
 
-scriptversion=2004-07-05.00
+scriptversion=2009-04-28.21; # UTC
 
 # This originates from X11R5 (mit/util/scripts/install.sh), which was
 # later released in X11R6 (xc/config/util/install.sh) with the
@@ -39,38 +39,68 @@ scriptversion=2004-07-05.00
 # when there is no Makefile.
 #
 # This script is compatible with the BSD install script, but was written
-# from scratch.  It can only install one file at a time, a restriction
+# from scratch.
-# shared with many OS's install programs.
+
+nl='
+'
+IFS=" ""	$nl"
 
 # set DOITPROG to echo to test this script
 
 # Don't use :- since 4.3BSD and earlier shells don't like it.
-doit="${DOITPROG-}"
+doit=${DOITPROG-}
+if test -z "$doit"; then
+  doit_exec=exec
+else
+  doit_exec=$doit
+fi
+
+# Put in absolute file names if you don't have them in your path;
+# or use environment vars.
+
+chgrpprog=${CHGRPPROG-chgrp}
+chmodprog=${CHMODPROG-chmod}
+chownprog=${CHOWNPROG-chown}
+cmpprog=${CMPPROG-cmp}
+cpprog=${CPPROG-cp}
+mkdirprog=${MKDIRPROG-mkdir}
+mvprog=${MVPROG-mv}
+rmprog=${RMPROG-rm}
+stripprog=${STRIPPROG-strip}
+
+posix_glob='?'
+initialize_posix_glob='
+  test "$posix_glob" != "?" || {
+    if (set -f) 2>/dev/null; then
+      posix_glob=
+    else
+      posix_glob=:
+    fi
+  }
+'
 
-# put in absolute paths if you don't have them in your path; or use env. vars.
+posix_mkdir=
 
-mvprog="${MVPROG-mv}"
+# Desired mode of installed file.
-cpprog="${CPPROG-cp}"
+mode=0755
-chmodprog="${CHMODPROG-chmod}"
-chownprog="${CHOWNPROG-chown}"
-chgrpprog="${CHGRPPROG-chgrp}"
-stripprog="${STRIPPROG-strip}"
-rmprog="${RMPROG-rm}"
-mkdirprog="${MKDIRPROG-mkdir}"
 
-chmodcmd="$chmodprog 0755"
-chowncmd=
 chgrpcmd=
-stripcmd=
+chmodcmd=$chmodprog
+chowncmd=
+mvcmd=$mvprog
 rmcmd="$rmprog -f"
-mvcmd="$mvprog"
+stripcmd=
+
 src=
 dst=
 dir_arg=
-dstarg=
+dst_arg=
+
+copy_on_change=false
 no_target_directory=
 
-usage="Usage: $0 [OPTION]... [-T] SRCFILE DSTFILE
+usage="\
+Usage: $0 [OPTION]... [-T] SRCFILE DSTFILE
    or: $0 [OPTION]... SRCFILES... DIRECTORY
    or: $0 [OPTION]... -t DIRECTORY SRCFILES...
    or: $0 [OPTION]... -d DIRECTORIES...
@@ -80,81 +110,86 @@ In the 2nd and 3rd, copy all SRCFILES to DIRECTORY.
 In the 4th, create DIRECTORIES.
 
 Options:
--c         (ignored)
+     --help     display this help and exit.
--d         create directories instead of installing files.
+     --version  display version info and exit.
--g GROUP   $chgrpprog installed files to GROUP.
+
--m MODE    $chmodprog installed files to MODE.
+  -c            (ignored)
--o USER    $chownprog installed files to USER.
+  -C            install only if different (preserve the last data modification time)
--s         $stripprog installed files.
+  -d            create directories instead of installing files.
--t DIRECTORY  install into DIRECTORY.
+  -g GROUP      $chgrpprog installed files to GROUP.
--T         report an error if DSTFILE is a directory.
+  -m MODE       $chmodprog installed files to MODE.
---help     display this help and exit.
+  -o USER       $chownprog installed files to USER.
---version  display version info and exit.
+  -s            $stripprog installed files.
+  -t DIRECTORY  install into DIRECTORY.
+  -T            report an error if DSTFILE is a directory.
 
 Environment variables override the default commands:
-  CHGRPPROG CHMODPROG CHOWNPROG CPPROG MKDIRPROG MVPROG RMPROG STRIPPROG
+  CHGRPPROG CHMODPROG CHOWNPROG CMPPROG CPPROG MKDIRPROG MVPROG
+  RMPROG STRIPPROG
 "
 
-while test -n "$1"; do
+while test $# -ne 0; do
   case $1 in
-    -c) shift
+    -c) ;;
-        continue;;
 
-    -d) dir_arg=true
+    -C) copy_on_change=true;;
-        shift
+
-        continue;;
+    -d) dir_arg=true;;
 
     -g) chgrpcmd="$chgrpprog $2"
-        shift
+	shift;;
-        shift
-        continue;;
 
-    --help) echo "$usage"; exit 0;;
+    --help) echo "$usage"; exit $?;;
 
-    -m) chmodcmd="$chmodprog $2"
+    -m) mode=$2
-        shift
+	case $mode in
-        shift
+	  *' '* | *'	'* | *'
-        continue;;
+'*	  | *'*'* | *'?'* | *'['*)
+	    echo "$0: invalid mode: $mode" >&2
+	    exit 1;;
+	esac
+	shift;;
 
     -o) chowncmd="$chownprog $2"
-        shift
+	shift;;
-        shift
+
-        continue;;
+    -s) stripcmd=$stripprog;;
-
+
-    -s) stripcmd=$stripprog
+    -t) dst_arg=$2
-        shift
+	shift;;
-        continue;;
+
-
+    -T) no_target_directory=true;;
-    -t) dstarg=$2
+
-	shift
+    --version) echo "$0 $scriptversion"; exit $?;;
-	shift
+
-	continue;;
+    --)	shift
-
-    -T) no_target_directory=true
-	shift
-	continue;;
-
-    --version) echo "$0 $scriptversion"; exit 0;;
-
-    *)  # When -d is used, all remaining arguments are directories to create.
-	# When -t is used, the destination is already specified.
-	test -n "$dir_arg$dstarg" && break
-        # Otherwise, the last argument is the destination.  Remove it from $@.
-	for arg
-	do
-          if test -n "$dstarg"; then
-	    # $@ is not empty: it contains at least $arg.
-	    set fnord "$@" "$dstarg"
-	    shift # fnord
-	  fi
-	  shift # arg
-	  dstarg=$arg
-	done
 	break;;
+
+    -*)	echo "$0: invalid option: $1" >&2
+	exit 1;;
+
+    *)  break;;
   esac
+  shift
 done
 
-if test -z "$1"; then
+if test $# -ne 0 && test -z "$dir_arg$dst_arg"; then
+  # When -d is used, all remaining arguments are directories to create.
+  # When -t is used, the destination is already specified.
+  # Otherwise, the last argument is the destination.  Remove it from $@.
+  for arg
+  do
+    if test -n "$dst_arg"; then
+      # $@ is not empty: it contains at least $arg.
+      set fnord "$@" "$dst_arg"
+      shift # fnord
+    fi
+    shift # arg
+    dst_arg=$arg
+  done
+fi
+
+if test $# -eq 0; then
   if test -z "$dir_arg"; then
     echo "$0: no input file specified." >&2
     exit 1
@@ -164,24 +199,47 @@ if test -z "$1"; then
   exit 0
 fi
 
+if test -z "$dir_arg"; then
+  trap '(exit $?); exit' 1 2 13 15
+
+  # Set umask so as not to create temps with too-generous modes.
+  # However, 'strip' requires both read and write access to temps.
+  case $mode in
+    # Optimize common cases.
+    *644) cp_umask=133;;
+    *755) cp_umask=22;;
+
+    *[0-7])
+      if test -z "$stripcmd"; then
+	u_plus_rw=
+      else
+	u_plus_rw='% 200'
+      fi
+      cp_umask=`expr '(' 777 - $mode % 1000 ')' $u_plus_rw`;;
+    *)
+      if test -z "$stripcmd"; then
+	u_plus_rw=
+      else
+	u_plus_rw=,u+rw
+      fi
+      cp_umask=$mode$u_plus_rw;;
+  esac
+fi
+
 for src
 do
   # Protect names starting with `-'.
   case $src in
-    -*) src=./$src ;;
+    -*) src=./$src;;
   esac
 
   if test -n "$dir_arg"; then
     dst=$src
-    src=
+    dstdir=$dst
-
+    test -d "$dstdir"
-    if test -d "$dst"; then
+    dstdir_status=$?
-      mkdircmd=:
-      chmodcmd=
-    else
-      mkdircmd=$mkdirprog
-    fi
   else
+
     # Waiting for this to be detected by the "$cpprog $src $dsttmp" command
     # might cause directories to be created, which would be especially bad
     # if $src (and thus $dsttmp) contains '*'.
@@ -190,81 +248,209 @@ do
       exit 1
     fi
 
-    if test -z "$dstarg"; then
+    if test -z "$dst_arg"; then
       echo "$0: no destination specified." >&2
       exit 1
     fi
 
-    dst=$dstarg
+    dst=$dst_arg
     # Protect names starting with `-'.
     case $dst in
-      -*) dst=./$dst ;;
+      -*) dst=./$dst;;
     esac
 
     # If destination is a directory, append the input filename; won't work
     # if double slashes aren't ignored.
     if test -d "$dst"; then
       if test -n "$no_target_directory"; then
-	echo "$0: $dstarg: Is a directory" >&2
+	echo "$0: $dst_arg: Is a directory" >&2
 	exit 1
       fi
-      dst=$dst/`basename "$src"`
+      dstdir=$dst
+      dst=$dstdir/`basename "$src"`
+      dstdir_status=0
+    else
+      # Prefer dirname, but fall back on a substitute if dirname fails.
+      dstdir=`
+	(dirname "$dst") 2>/dev/null ||
+	expr X"$dst" : 'X\(.*[^/]\)//*[^/][^/]*/*$' \| \
+	     X"$dst" : 'X\(//\)[^/]' \| \
+	     X"$dst" : 'X\(//\)$' \| \
+	     X"$dst" : 'X\(/\)' \| . 2>/dev/null ||
+	echo X"$dst" |
+	    sed '/^X\(.*[^/]\)\/\/*[^/][^/]*\/*$/{
+		   s//\1/
+		   q
+		 }
+		 /^X\(\/\/\)[^/].*/{
+		   s//\1/
+		   q
+		 }
+		 /^X\(\/\/\)$/{
+		   s//\1/
+		   q
+		 }
+		 /^X\(\/\).*/{
+		   s//\1/
+		   q
+		 }
+		 s/.*/./; q'
+      `
+
+      test -d "$dstdir"
+      dstdir_status=$?
     fi
   fi
 
-  # This sed command emulates the dirname command.
+  obsolete_mkdir_used=false
-  dstdir=`echo "$dst" | sed -e 's,[^/]*$,,;s,/$,,;s,^$,.,'`
+
+  if test $dstdir_status != 0; then
+    case $posix_mkdir in
+      '')
+	# Create intermediate dirs using mode 755 as modified by the umask.
+	# This is like FreeBSD 'install' as of 1997-10-28.
+	umask=`umask`
+	case $stripcmd.$umask in
+	  # Optimize common cases.
+	  *[2367][2367]) mkdir_umask=$umask;;
+	  .*0[02][02] | .[02][02] | .[02]) mkdir_umask=22;;
+
+	  *[0-7])
+	    mkdir_umask=`expr $umask + 22 \
+	      - $umask % 100 % 40 + $umask % 20 \
+	      - $umask % 10 % 4 + $umask % 2
+	    `;;
+	  *) mkdir_umask=$umask,go-w;;
+	esac
+
+	# With -d, create the new directory with the user-specified mode.
+	# Otherwise, rely on $mkdir_umask.
+	if test -n "$dir_arg"; then
+	  mkdir_mode=-m$mode
+	else
+	  mkdir_mode=
+	fi
+
+	posix_mkdir=false
+	case $umask in
+	  *[123567][0-7][0-7])
+	    # POSIX mkdir -p sets u+wx bits regardless of umask, which
+	    # is incompatible with FreeBSD 'install' when (umask & 300) != 0.
+	    ;;
+	  *)
+	    tmpdir=${TMPDIR-/tmp}/ins$RANDOM-$$
+	    trap 'ret=$?; rmdir "$tmpdir/d" "$tmpdir" 2>/dev/null; exit $ret' 0
+
+	    if (umask $mkdir_umask &&
+		exec $mkdirprog $mkdir_mode -p -- "$tmpdir/d") >/dev/null 2>&1
+	    then
+	      if test -z "$dir_arg" || {
+		   # Check for POSIX incompatibilities with -m.
+		   # HP-UX 11.23 and IRIX 6.5 mkdir -m -p sets group- or
+		   # other-writeable bit of parent directory when it shouldn't.
+		   # FreeBSD 6.1 mkdir -m -p sets mode of existing directory.
+		   ls_ld_tmpdir=`ls -ld "$tmpdir"`
+		   case $ls_ld_tmpdir in
+		     d????-?r-*) different_mode=700;;
+		     d????-?--*) different_mode=755;;
+		     *) false;;
+		   esac &&
+		   $mkdirprog -m$different_mode -p -- "$tmpdir" && {
+		     ls_ld_tmpdir_1=`ls -ld "$tmpdir"`
+		     test "$ls_ld_tmpdir" = "$ls_ld_tmpdir_1"
+		   }
+		 }
+	      then posix_mkdir=:
+	      fi
+	      rmdir "$tmpdir/d" "$tmpdir"
+	    else
+	      # Remove any dirs left behind by ancient mkdir implementations.
+	      rmdir ./$mkdir_mode ./-p ./-- 2>/dev/null
+	    fi
+	    trap '' 0;;
+	esac;;
+    esac
 
-  # Make sure that the destination directory exists.
+    if
+      $posix_mkdir && (
+	umask $mkdir_umask &&
+	$doit_exec $mkdirprog $mkdir_mode -p -- "$dstdir"
+      )
+    then :
+    else
 
-  # Skip lots of stat calls in the usual case.
+      # The umask is ridiculous, or mkdir does not conform to POSIX,
-  if test ! -d "$dstdir"; then
+      # or it failed possibly due to a race condition.  Create the
-    defaultIFS='
+      # directory the slow way, step by step, checking for races as we go.
-	 '
-    IFS="${IFS-$defaultIFS}"
 
-    oIFS=$IFS
+      case $dstdir in
-    # Some sh's can't handle IFS=/ for some reason.
+	/*) prefix='/';;
-    IFS='%'
+	-*) prefix='./';;
-    set - `echo "$dstdir" | sed -e 's@/@%@g' -e 's@^%@/@'`
+	*)  prefix='';;
-    IFS=$oIFS
+      esac
 
-    pathcomp=
+      eval "$initialize_posix_glob"
 
-    while test $# -ne 0 ; do
+      oIFS=$IFS
-      pathcomp=$pathcomp$1
+      IFS=/
+      $posix_glob set -f
+      set fnord $dstdir
       shift
-      if test ! -d "$pathcomp"; then
+      $posix_glob set +f
-        $mkdirprog "$pathcomp"
+      IFS=$oIFS
-	# mkdir can fail with a `File exist' error in case several
+
-	# install-sh are creating the directory concurrently.  This
+      prefixes=
-	# is OK.
+
-	test -d "$pathcomp" || exit
+      for d
+      do
+	test -z "$d" && continue
+
+	prefix=$prefix$d
+	if test -d "$prefix"; then
+	  prefixes=
+	else
+	  if $posix_mkdir; then
+	    (umask=$mkdir_umask &&
+	     $doit_exec $mkdirprog $mkdir_mode -p -- "$dstdir") && break
+	    # Don't fail if two instances are running concurrently.
+	    test -d "$prefix" || exit 1
+	  else
+	    case $prefix in
+	      *\'*) qprefix=`echo "$prefix" | sed "s/'/'\\\\\\\\''/g"`;;
+	      *) qprefix=$prefix;;
+	    esac
+	    prefixes="$prefixes '$qprefix'"
+	  fi
+	fi
+	prefix=$prefix/
+      done
+
+      if test -n "$prefixes"; then
+	# Don't fail if two instances are running concurrently.
+	(umask $mkdir_umask &&
+	 eval "\$doit_exec \$mkdirprog $prefixes") ||
+	  test -d "$dstdir" || exit 1
+	obsolete_mkdir_used=true
       fi
-      pathcomp=$pathcomp/
+    fi
-    done
   fi
 
   if test -n "$dir_arg"; then
-    $doit $mkdircmd "$dst" \
+    { test -z "$chowncmd" || $doit $chowncmd "$dst"; } &&
-      && { test -z "$chowncmd" || $doit $chowncmd "$dst"; } \
+    { test -z "$chgrpcmd" || $doit $chgrpcmd "$dst"; } &&
-      && { test -z "$chgrpcmd" || $doit $chgrpcmd "$dst"; } \
+    { test "$obsolete_mkdir_used$chowncmd$chgrpcmd" = false ||
-      && { test -z "$stripcmd" || $doit $stripcmd "$dst"; } \
+      test -z "$chmodcmd" || $doit $chmodcmd $mode "$dst"; } || exit 1
-      && { test -z "$chmodcmd" || $doit $chmodcmd "$dst"; }
-
   else
-    dstfile=`basename "$dst"`
 
     # Make a couple of temp file names in the proper directory.
     dsttmp=$dstdir/_inst.$$_
     rmtmp=$dstdir/_rm.$$_
 
     # Trap to clean up those temp files at exit.
-    trap 'status=$?; rm -f "$dsttmp" "$rmtmp" && exit $status' 0
+    trap 'ret=$?; rm -f "$dsttmp" "$rmtmp" && exit $ret' 0
-    trap '(exit $?); exit' 1 2 13 15
 
     # Copy the file name to the temp name.
-    $doit $cpprog "$src" "$dsttmp" &&
+    (umask $cp_umask && $doit_exec $cpprog "$src" "$dsttmp") &&
 
     # and set any options; do chmod last to preserve setuid bits.
     #
@@ -272,51 +458,63 @@ do
     # ignore errors from any of these, just make sure not to ignore
     # errors from the above "$doit $cpprog $src $dsttmp" command.
     #
-    { test -z "$chowncmd" || $doit $chowncmd "$dsttmp"; } \
+    { test -z "$chowncmd" || $doit $chowncmd "$dsttmp"; } &&
-      && { test -z "$chgrpcmd" || $doit $chgrpcmd "$dsttmp"; } \
+    { test -z "$chgrpcmd" || $doit $chgrpcmd "$dsttmp"; } &&
-      && { test -z "$stripcmd" || $doit $stripcmd "$dsttmp"; } \
+    { test -z "$stripcmd" || $doit $stripcmd "$dsttmp"; } &&
-      && { test -z "$chmodcmd" || $doit $chmodcmd "$dsttmp"; } &&
+    { test -z "$chmodcmd" || $doit $chmodcmd $mode "$dsttmp"; } &&
-
+
-    # Now rename the file to the real destination.
+    # If -C, don't bother to copy if it wouldn't change the file.
-    { $doit $mvcmd -f "$dsttmp" "$dstdir/$dstfile" 2>/dev/null \
+    if $copy_on_change &&
-      || {
+       old=`LC_ALL=C ls -dlL "$dst"	2>/dev/null` &&
-	   # The rename failed, perhaps because mv can't rename something else
+       new=`LC_ALL=C ls -dlL "$dsttmp"	2>/dev/null` &&
-	   # to itself, or perhaps because mv is so ancient that it does not
+
-	   # support -f.
+       eval "$initialize_posix_glob" &&
-
+       $posix_glob set -f &&
-	   # Now remove or move aside any old file at destination location.
+       set X $old && old=:$2:$4:$5:$6 &&
-	   # We try this two ways since rm can't unlink itself on some
+       set X $new && new=:$2:$4:$5:$6 &&
-	   # systems and the destination file might be busy for other
+       $posix_glob set +f &&
-	   # reasons.  In this case, the final cleanup might fail but the new
+
-	   # file should still install successfully.
+       test "$old" = "$new" &&
-	   {
+       $cmpprog "$dst" "$dsttmp" >/dev/null 2>&1
-	     if test -f "$dstdir/$dstfile"; then
+    then
-	       $doit $rmcmd -f "$dstdir/$dstfile" 2>/dev/null \
+      rm -f "$dsttmp"
-	       || $doit $mvcmd -f "$dstdir/$dstfile" "$rmtmp" 2>/dev/null \
+    else
-	       || {
+      # Rename the file to the real destination.
-		 echo "$0: cannot unlink or rename $dstdir/$dstfile" >&2
+      $doit $mvcmd -f "$dsttmp" "$dst" 2>/dev/null ||
-		 (exit 1); exit
+
-	       }
+      # The rename failed, perhaps because mv can't rename something else
-	     else
+      # to itself, or perhaps because mv is so ancient that it does not
-	       :
+      # support -f.
-	     fi
+      {
-	   } &&
+	# Now remove or move aside any old file at destination location.
-
+	# We try this two ways since rm can't unlink itself on some
-	   # Now rename the file to the real destination.
+	# systems and the destination file might be busy for other
-	   $doit $mvcmd "$dsttmp" "$dstdir/$dstfile"
+	# reasons.  In this case, the final cleanup might fail but the new
-	 }
+	# file should still install successfully.
-    }
+	{
-  fi || { (exit 1); exit; }
+	  test ! -f "$dst" ||
+	  $doit $rmcmd -f "$dst" 2>/dev/null ||
+	  { $doit $mvcmd -f "$dst" "$rmtmp" 2>/dev/null &&
+	    { $doit $rmcmd -f "$rmtmp" 2>/dev/null; :; }
+	  } ||
+	  { echo "$0: cannot unlink or rename $dst" >&2
+	    (exit 1); exit 1
+	  }
+	} &&
+
+	# Now rename the file to the real destination.
+	$doit $mvcmd "$dsttmp" "$dst"
+      }
+    fi || exit 1
+
+    trap '' 0
+  fi
 done
 
-# The final little trick to "correctly" pass the exit status to the exit trap.
-{
-  (exit 0); exit
-}
-
 # Local variables:
 # eval: (add-hook 'write-file-hooks 'time-stamp)
 # time-stamp-start: "scriptversion="
 # time-stamp-format: "%:y-%02m-%02d.%02H"
-# time-stamp-end: "$"
+# time-stamp-time-zone: "UTC"
+# time-stamp-end: "; # UTC"
 # End:

aux_scripts/missing

@@ -1,10 +1,10 @@
 #! /bin/sh
 # Common stub for a few missing GNU programs while installing.
 
-scriptversion=2005-06-08.21
+scriptversion=2009-04-28.21; # UTC
 
-# Copyright (C) 1996, 1997, 1999, 2000, 2002, 2003, 2004, 2005
+# Copyright (C) 1996, 1997, 1999, 2000, 2002, 2003, 2004, 2005, 2006,
-#   Free Software Foundation, Inc.
+# 2008, 2009 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
@@ -18,9 +18,7 @@ scriptversion=2005-06-08.21
 # GNU General Public License for more details.
 
 # You should have received a copy of the GNU General Public License
-# along with this program; if not, write to the Free Software
+# along with this program.  If not, see <http://www.gnu.org/licenses/>.
-# Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA
-# 02110-1301, USA.
 
 # As a special exception to the GNU General Public License, if you
 # distribute this file as part of a program that contains a
@@ -33,6 +31,8 @@ if test $# -eq 0; then
 fi
 
 run=:
+sed_output='s/.* --output[ =]\([^ ]*\).*/\1/p'
+sed_minuso='s/.* -o \([^ ]*\).*/\1/p'
 
 # In the cases where this matters, `missing' is being run in the
 # srcdir already.
@@ -44,7 +44,7 @@ fi
 
 msg="missing on your system"
 
-case "$1" in
+case $1 in
 --run)
   # Try to run requested program, and just exit if it succeeds.
   run=
@@ -77,6 +77,7 @@ Supported PROGRAM values:
   aclocal      touch file \`aclocal.m4'
   autoconf     touch file \`configure'
   autoheader   touch file \`config.h.in'
+  autom4te     touch the output file, or create a stub one
   automake     touch all \`Makefile.in' files
   bison        create \`y.tab.[ch]', if possible, from existing .[ch]
   flex         create \`lex.yy.c', if possible, from existing .c
@@ -86,6 +87,9 @@ Supported PROGRAM values:
   tar          try tar, gnutar, gtar, then tar without non-portable flags
   yacc         create \`y.tab.[ch]', if possible, from existing .[ch]
 
+Version suffixes to PROGRAM as well as the prefixes \`gnu-', \`gnu', and
+\`g' are ignored when checking the name.
+
 Send bug reports to <bug-automake@gnu.org>."
     exit $?
     ;;
@@ -103,15 +107,22 @@ Send bug reports to <bug-automake@gnu.org>."
 
 esac
 
+# normalize program name to check for.
+program=`echo "$1" | sed '
+  s/^gnu-//; t
+  s/^gnu//; t
+  s/^g//; t'`
+
 # Now exit if we have it, but it failed.  Also exit now if we
 # don't have it and --version was passed (most likely to detect
-# the program).
+# the program).  This is about non-GNU programs, so use $1 not
-case "$1" in
+# $program.
-  lex|yacc)
+case $1 in
+  lex*|yacc*)
     # Not GNU programs, they don't have --version.
     ;;
 
-  tar)
+  tar*)
     if test -n "$run"; then
        echo 1>&2 "ERROR: \`tar' requires --run"
        exit 1
@@ -135,7 +146,7 @@ esac
 
 # If it does not exist, or fails to run (possibly an outdated version),
 # try to emulate it.
-case "$1" in
+case $program in
   aclocal*)
     echo 1>&2 "\
 WARNING: \`$1' is $msg.  You should only need it if
@@ -145,7 +156,7 @@ WARNING: \`$1' is $msg.  You should only need it if
     touch aclocal.m4
     ;;
 
-  autoconf)
+  autoconf*)
     echo 1>&2 "\
 WARNING: \`$1' is $msg.  You should only need it if
          you modified \`${configure_ac}'.  You might want to install the
@@ -154,7 +165,7 @@ WARNING: \`$1' is $msg.  You should only need it if
     touch configure
     ;;
 
-  autoheader)
+  autoheader*)
     echo 1>&2 "\
 WARNING: \`$1' is $msg.  You should only need it if
          you modified \`acconfig.h' or \`${configure_ac}'.  You might want
@@ -164,7 +175,7 @@ WARNING: \`$1' is $msg.  You should only need it if
     test -z "$files" && files="config.h"
     touch_files=
     for f in $files; do
-      case "$f" in
+      case $f in
       *:*) touch_files="$touch_files "`echo "$f" |
 				       sed -e 's/^[^:]*://' -e 's/:.*//'`;;
       *) touch_files="$touch_files $f.in";;
@@ -184,7 +195,7 @@ WARNING: \`$1' is $msg.  You should only need it if
 	   while read f; do touch "$f"; done
     ;;
 
-  autom4te)
+  autom4te*)
     echo 1>&2 "\
 WARNING: \`$1' is needed, but is $msg.
          You might have modified some files without having the
@@ -192,8 +203,8 @@ WARNING: \`$1' is needed, but is $msg.
          You can get \`$1' as part of \`Autoconf' from any GNU
          archive site."
 
-    file=`echo "$*" | sed -n 's/.*--output[ =]*\([^ ]*\).*/\1/p'`
+    file=`echo "$*" | sed -n "$sed_output"`
-    test -z "$file" && file=`echo "$*" | sed -n 's/.*-o[ ]*\([^ ]*\).*/\1/p'`
+    test -z "$file" && file=`echo "$*" | sed -n "$sed_minuso"`
     if test -f "$file"; then
 	touch $file
     else
@@ -207,80 +218,78 @@ WARNING: \`$1' is needed, but is $msg.
     fi
     ;;
 
-  bison|yacc)
+  bison*|yacc*)
     echo 1>&2 "\
 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."
     rm -f y.tab.c y.tab.h
-    if [ $# -ne 1 ]; then
+    if test $# -ne 1; then
         eval LASTARG="\${$#}"
-	case "$LASTARG" in
+	case $LASTARG in
 	*.y)
 	    SRCFILE=`echo "$LASTARG" | sed 's/y$/c/'`
-	    if [ -f "$SRCFILE" ]; then
+	    if test -f "$SRCFILE"; then
 	         cp "$SRCFILE" y.tab.c
 	    fi
 	    SRCFILE=`echo "$LASTARG" | sed 's/y$/h/'`
-	    if [ -f "$SRCFILE" ]; then
+	    if test -f "$SRCFILE"; then
 	         cp "$SRCFILE" y.tab.h
 	    fi
 	  ;;
 	esac
     fi
-    if [ ! -f y.tab.h ]; then
+    if test ! -f y.tab.h; then
 	echo >y.tab.h
     fi
-    if [ ! -f y.tab.c ]; then
+    if test ! -f y.tab.c; then
 	echo 'main() { return 0; }' >y.tab.c
     fi
     ;;
 
-  lex|flex)
+  lex*|flex*)
     echo 1>&2 "\
 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."
     rm -f lex.yy.c
-    if [ $# -ne 1 ]; then
+    if test $# -ne 1; then
         eval LASTARG="\${$#}"
-	case "$LASTARG" in
+	case $LASTARG in
 	*.l)
 	    SRCFILE=`echo "$LASTARG" | sed 's/l$/c/'`
-	    if [ -f "$SRCFILE" ]; then
+	    if test -f "$SRCFILE"; then
 	         cp "$SRCFILE" lex.yy.c
 	    fi
 	  ;;
 	esac
     fi
-    if [ ! -f lex.yy.c ]; then
+    if test ! -f lex.yy.c; then
 	echo 'main() { return 0; }' >lex.yy.c
     fi
     ;;
 
-  help2man)
+  help2man*)
     echo 1>&2 "\
 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."
 
-    file=`echo "$*" | sed -n 's/.*-o \([^ ]*\).*/\1/p'`
+    file=`echo "$*" | sed -n "$sed_output"`
-    if test -z "$file"; then
+    test -z "$file" && file=`echo "$*" | sed -n "$sed_minuso"`
-	file=`echo "$*" | sed -n 's/.*--output=\([^ ]*\).*/\1/p'`
+    if test -f "$file"; then
-    fi
-    if [ -f "$file" ]; then
 	touch $file
     else
 	test -z "$file" || exec >$file
 	echo ".ab help2man is required to generate this page"
-	exit 1
+	exit $?
     fi
     ;;
 
-  makeinfo)
+  makeinfo*)
     echo 1>&2 "\
 WARNING: \`$1' is $msg.  You should only need it if
          you modified a \`.texi' or \`.texinfo' file, or any other file
@@ -289,11 +298,17 @@ WARNING: \`$1' is $msg.  You should only need it if
          DU, IRIX).  You might want to install the \`Texinfo' package or
          the \`GNU make' package.  Grab either from any GNU archive site."
     # The file to touch is that specified with -o ...
-    file=`echo "$*" | sed -n 's/.*-o \([^ ]*\).*/\1/p'`
+    file=`echo "$*" | sed -n "$sed_output"`
+    test -z "$file" && file=`echo "$*" | sed -n "$sed_minuso"`
     if test -z "$file"; then
       # ... or it is the one specified with @setfilename ...
       infile=`echo "$*" | sed 's/.* \([^ ]*\) *$/\1/'`
-      file=`sed -n '/^@setfilename/ { s/.* \([^ ]*\) *$/\1/; p; q; }' $infile`
+      file=`sed -n '
+	/^@setfilename/{
+	  s/.* \([^ ]*\) *$/\1/
+	  p
+	  q
+	}' $infile`
       # ... or it is derived from the source name (dir/f.texi becomes f.info)
       test -z "$file" && file=`echo "$infile" | sed 's,.*/,,;s,.[^.]*$,,'`.info
     fi
@@ -303,7 +318,7 @@ WARNING: \`$1' is $msg.  You should only need it if
     touch $file
     ;;
 
-  tar)
+  tar*)
     shift
 
     # We have already tried tar in the generic part.
@@ -317,13 +332,13 @@ WARNING: \`$1' is $msg.  You should only need it if
     fi
     firstarg="$1"
     if shift; then
-	case "$firstarg" in
+	case $firstarg in
 	*o*)
 	    firstarg=`echo "$firstarg" | sed s/o//`
 	    tar "$firstarg" "$@" && exit 0
 	    ;;
 	esac
-	case "$firstarg" in
+	case $firstarg in
 	*h*)
 	    firstarg=`echo "$firstarg" | sed s/h//`
 	    tar "$firstarg" "$@" && exit 0
@@ -356,5 +371,6 @@ exit 0
 # eval: (add-hook 'write-file-hooks 'time-stamp)
 # time-stamp-start: "scriptversion="
 # time-stamp-format: "%:y-%02m-%02d.%02H"
-# time-stamp-end: "$"
+# time-stamp-time-zone: "UTC"
+# time-stamp-end: "; # UTC"
 # End:

bin/module.am

@@ -1,56 +1,58 @@
 ## Process this file with automake to produce Makefile.in
-bin_PROGRAMS += bin/clish bin/konfd bin/konf
+bin_PROGRAMS += \
+	bin/clish \
+	bin/konfd \
+	bin/konf
 
 bin_clish_SOURCES = bin/clish.cpp
-bin_clish_LDADD  = \
+bin_clish_LDADD = \
-    libclish.la    \
+	libclish.la \
-    libkonf.la     \
+	libkonf.la \
-    libtinyrl.la   \
+	libtinyrl.la \
-    libtinyxml.la  \
+	libtinyxml.la \
-    liblub.la      \
+	liblub.la \
-    @PTHREAD_LIBS@ \
+	@PTHREAD_LIBS@ \
-    @BFD_LIBS@
+	@BFD_LIBS@
-#    @LUBHEAP_LIBS@
+#	@LUBHEAP_LIBS@
 
 bin_konfd_SOURCES = bin/konfd.c
-bin_konfd_LDADD  = \
+bin_konfd_LDADD = \
-    libkonf.la     \
+	libkonf.la \
-    liblub.la
+	liblub.la
 
 bin_konf_SOURCES = bin/konf.c
-bin_konf_LDADD  = \
+bin_konf_LDADD = \
-    libkonf.la    \
+	libkonf.la \
-    liblub.la
+	liblub.la
 
 ## If TCL is enabled
 if TCL
-  bin_PROGRAMS += bin/tclish@TCL_VERSION@
+	bin_PROGRAMS += bin/tclish@TCL_VERSION@
-
+
-  bin_tclish@TCL_VERSION@_SOURCES = bin/tclish.cpp \
+	bin_tclish@TCL_VERSION@_SOURCES = bin/tclish.cpp \
-    bin/tclish_fini_callback.c   \
+		bin/tclish_fini_callback.c \
-    bin/tclish_init_callback.c   \
+		bin/tclish_init_callback.c \
-    bin/tclish_script_callback.c \
+		bin/tclish_script_callback.c \
-    bin/tclish_show_result.c
+		bin/tclish_show_result.c
-
+
-  bin_tclish@TCL_VERSION@_LDADD = \
+	bin_tclish@TCL_VERSION@_LDADD = \
-    libclish.la                   \
+		libclish.la \
-    libkonf.la                    \
+		libkonf.la \
-    libtinyrl.la                  \
+		libtinyrl.la \
-    libtinyxml.la                 \
+		libtinyxml.la \
-    liblub.la                     \
+		liblub.la \
-    @TCL_LIBS@                    \
+		@TCL_LIBS@ \
-    @PTHREAD_LIBS@                \
+		@PTHREAD_LIBS@ \
-    @BFD_LIBS@
+		@BFD_LIBS@
-#    @LUBHEAP_LIBS@
+#		@LUBHEAP_LIBS@
-
 endif
 
 if LUBHEAP
-  bin_PROGRAMS += bin/lubheap
+	bin_PROGRAMS += bin/lubheap
-  bin_lubheap_SOURCES = bin/lubheap.c
+	bin_lubheap_SOURCES = bin/lubheap.c
-  bin_lubheap_LDADD = \
+	bin_lubheap_LDADD = \
-    liblub.la         \
+		liblub.la \
-    @LUBHEAP_LIBS@    \
+		@LUBHEAP_LIBS@ \
-    @PTHREAD_LIBS@    \
+		@PTHREAD_LIBS@ \
-    @BFD_LIBS@
+		@BFD_LIBS@
 endif

clish/command/module.am

@@ -1,4 +1,4 @@
-libclish_la_SOURCES +=              \
+libclish_la_SOURCES += \
-	clish/command/command.c		    \
+	clish/command/command.c \
-	clish/command/command_dump.c	\
+	clish/command/command_dump.c \
 	clish/command/private.h

clish/module.am

@@ -1,36 +1,40 @@
 ## Process this file with automake to produce Makefile.in
-                                
+lib_LTLIBRARIES += libclish.la
-libclish_la_SOURCES              = \
+
-    clish/clish_access_callback.c  \
+libclish_la_SOURCES = \
-    clish/clish_script_callback.c  \
+    clish/clish_access_callback.c \
-    clish/clish_config_callback.c  \
+    clish/clish_script_callback.c \
+    clish/clish_config_callback.c \
     clish/private.h
 
 libclish_la_CFLAGS = @LUB_CFLAGS@ @LUBHEAP_CFLAGS@ $(DEBUG_CFLAGS)
+libclish_la_LIBADD = \
+	liblub.la \
+	libtinyrl.la \
+	libtinyxml.la \
+	libkonf.la
 
-lib_LTLIBRARIES += libclish.la
+nobase_include_HEADERS += \
-
+	clish/command.h \
-nobase_include_HEADERS  +=      \
+	clish/param.h \
-    clish/command.h             \
+	clish/pargv.h \
-    clish/param.h               \
+	clish/ptype.h \
-    clish/pargv.h               \
+	clish/shell.h \
-    clish/ptype.h               \
+	clish/variable.h \
-    clish/shell.h               \
+	clish/view.h \
-    clish/variable.h            \
+	clish/nspace.h \
-    clish/view.h                \
+	clish/internal.h
-    clish/nspace.h              \
-    clish/internal.h
 
-EXTRA_DIST                 += \
+EXTRA_DIST += \
-    clish/command/module.am   \
+	clish/command/module.am \
-    clish/param/module.am     \
+	clish/param/module.am \
-    clish/pargv/module.am     \
+	clish/pargv/module.am \
-    clish/ptype/module.am     \
+	clish/ptype/module.am \
-    clish/shell/module.am     \
+	clish/shell/module.am \
-    clish/variable/module.am  \
+	clish/variable/module.am \
-    clish/view/module.am      \
+	clish/view/module.am \
-    clish/nspace/module.am    \
+	clish/nspace/module.am \
-    clish/README
+	clish/README
 
 include $(top_srcdir)/clish/command/module.am
 include $(top_srcdir)/clish/param/module.am

clish/nspace/module.am

@@ -1,3 +1,4 @@
-libclish_la_SOURCES +=	clish/nspace/nspace.c		\
+libclish_la_SOURCES += \
-			clish/nspace/nspace_dump.c	\
+	clish/nspace/nspace.c \
-			clish/nspace/private.h
+	clish/nspace/nspace_dump.c \
+	clish/nspace/private.h

clish/param/module.am

@@ -1,3 +1,4 @@
-libclish_la_SOURCES +=	clish/param/param.c		\
+libclish_la_SOURCES += \
-			clish/param/param_dump.c	\
+	clish/param/param.c \
-			clish/param/private.h
+	clish/param/param_dump.c \
+	clish/param/private.h

clish/pargv/module.am

@@ -1,3 +1,4 @@
-libclish_la_SOURCES +=	clish/pargv/pargv.c		\
+libclish_la_SOURCES += \
-			clish/pargv/pargv_dump.c	\
+	clish/pargv/pargv.c \
-			clish/pargv/private.h
+	clish/pargv/pargv_dump.c \
+	clish/pargv/private.h

clish/ptype/module.am

@@ -1,4 +1,4 @@
-libclish_la_SOURCES +=	    \
+libclish_la_SOURCES += \
-            		clish/ptype/ptype.c		\
+	clish/ptype/ptype.c \
-			clish/ptype/ptype_dump.c	\
+	clish/ptype/ptype_dump.c \
-			clish/ptype/private.h
+	clish/ptype/private.h

clish/shell/module.am

@@ -1,31 +1,31 @@
-libclish_la_SOURCES +=	\
+libclish_la_SOURCES += \
-            clish/shell/shell__get_view.c           \
+	clish/shell/shell__get_view.c \
-            clish/shell/shell__get_viewid.c         \
+	clish/shell/shell__get_viewid.c \
-            clish/shell/shell__get_client_cookie.c  \
+	clish/shell/shell__get_client_cookie.c \
-            clish/shell/shell__get_tinyrl.c         \
+	clish/shell/shell__get_tinyrl.c \
-            clish/shell/shell_command_generator.c   \
+	clish/shell/shell_command_generator.c \
-            clish/shell/shell_delete.c              \
+	clish/shell/shell_delete.c \
-            clish/shell/shell_dump.c                \
+	clish/shell/shell_dump.c \
-            clish/shell/shell_execute.c             \
+	clish/shell/shell_execute.c \
-            clish/shell/shell_find_create_ptype.c   \
+	clish/shell/shell_find_create_ptype.c \
-            clish/shell/shell_find_create_view.c    \
+	clish/shell/shell_find_create_view.c \
-            clish/shell/shell_find_view.c           \
+	clish/shell/shell_find_view.c \
-            clish/shell/shell_getfirst_command.c    \
+	clish/shell/shell_getfirst_command.c \
-            clish/shell/shell_getnext_command.c     \
+	clish/shell/shell_getnext_command.c \
-            clish/shell/shell_help.c                \
+	clish/shell/shell_help.c \
-            clish/shell/shell_insert_ptype.c        \
+	clish/shell/shell_insert_ptype.c \
-            clish/shell/shell_insert_view.c         \
+	clish/shell/shell_insert_view.c \
-            clish/shell/shell_new.c                 \
+	clish/shell/shell_new.c \
-            clish/shell/shell_parse.c               \
+	clish/shell/shell_parse.c \
-            clish/shell/shell_pop_file.c            \
+	clish/shell/shell_pop_file.c \
-            clish/shell/shell_push_file.c           \
+	clish/shell/shell_push_file.c \
-            clish/shell/shell_resolve_command.c     \
+	clish/shell/shell_resolve_command.c \
-            clish/shell/shell_resolve_prefix.c      \
+	clish/shell/shell_resolve_prefix.c \
-            clish/shell/shell_set_context.c         \
+	clish/shell/shell_set_context.c \
-            clish/shell/shell_spawn.c               \
+	clish/shell/shell_spawn.c \
-            clish/shell/shell_startup.c             \
+	clish/shell/shell_startup.c \
-            clish/shell/shell_pwd.c                 \
+	clish/shell/shell_pwd.c \
-            clish/shell/shell_tinyrl.c              \
+	clish/shell/shell_tinyrl.c \
-            clish/shell/shell_tinyxml_read.cpp      \
+	clish/shell/shell_tinyxml_read.cpp \
-            clish/shell/shell_expand.c              \
+	clish/shell/shell_expand.c \
-            clish/shell/private.h
+	clish/shell/private.h

clish/variable/module.am

@@ -1,2 +1,3 @@
-libclish_la_SOURCES +=	clish/variable/variable_expand.c		\
+libclish_la_SOURCES += \
-			clish/variable/private.h
+	clish/variable/variable_expand.c \
+	clish/variable/private.h

clish/view/module.am

@@ -1,3 +1,4 @@
-libclish_la_SOURCES +=	clish/view/view.c		\
+libclish_la_SOURCES += \
-			clish/view/view_dump.c	\
+	clish/view/view.c \
-			clish/view/private.h
+	clish/view/view_dump.c \
+	clish/view/private.h

config.h.in

@@ -105,3 +105,4 @@
 
 /* Version number of package */
 #undef VERSION
+

configure

@@ -18859,3 +18859,4 @@ if test -n "$ac_unrecognized_opts" && test "$enable_option_checking" != no; then
 $as_echo "$as_me: WARNING: unrecognized options: $ac_unrecognized_opts" >&2;}
 fi
 
+

konf/buf/module.am

@@ -1,2 +1,3 @@
-libkonf_la_SOURCES +=	konf/buf/buf.c	\
+libkonf_la_SOURCES += \
-			konf/buf/private.h
+	konf/buf/buf.c \
+	konf/buf/private.h

konf/module.am

@@ -1,19 +1,19 @@
 ## Process this file with automake to generate Makefile.in
-lib_LTLIBRARIES         += libkonf.la
+lib_LTLIBRARIES += libkonf.la
-libkonf_la_SOURCES        =
+libkonf_la_SOURCES =
-libkonf_la_LIBADD         =
+libkonf_la_LIBADD = liblub.la
 
-nobase_include_HEADERS  += \
+nobase_include_HEADERS += \
-    konf/tree.h            \
+	konf/tree.h \
-    konf/query.h           \
+	konf/query.h \
-    konf/buf.h             \
+	konf/buf.h \
-    konf/net.h
+	konf/net.h
 
-EXTRA_DIST             += \
+EXTRA_DIST += \
-    konf/tree/module.am   \
+	konf/tree/module.am \
-    konf/query/module.am  \
+	konf/query/module.am \
-    konf/buf/module.am    \
+	konf/buf/module.am \
-    konf/net/module.am
+	konf/net/module.am
 
 include $(top_srcdir)/konf/tree/module.am
 include $(top_srcdir)/konf/query/module.am

konf/net/module.am

@@ -1,2 +1,3 @@
-libkonf_la_SOURCES +=	konf/net/net.c	\
+libkonf_la_SOURCES += \
-			konf/net/private.h
+	konf/net/net.c \
+	konf/net/private.h

konf/tree/module.am

@@ -1,3 +1,4 @@
-libkonf_la_SOURCES +=	konf/tree/tree.c	\
+libkonf_la_SOURCES += \
-			konf/tree/tree_dump.c	\
+	konf/tree/tree.c \
-			konf/tree/private.h
+	konf/tree/tree_dump.c \
+	konf/tree/private.h

tinyrl/module.am

@@ -1,19 +1,20 @@
 ## Process this file with automake to generate Makefile.in
-lib_LTLIBRARIES		   += libtinyrl.la
+lib_LTLIBRARIES += libtinyrl.la
+libtinyrl_la_LIBADD = liblub.la
 
-libtinyrl_la_SOURCES    =       \
+libtinyrl_la_SOURCES = \
-    tinyrl/tinyrl.c             \
+	tinyrl/tinyrl.c \
-    tinyrl/private.h
+	tinyrl/private.h
+
+nobase_include_HEADERS += \
+	tinyrl/tinyrl.h \
+	tinyrl/history.h \
+	tinyrl/vt100.h
+
+EXTRA_DIST += \
+	tinyrl/history/module.am \
+	tinyrl/vt100/module.am \
+	tinyrl/README
 
-nobase_include_HEADERS  +=      \
-    tinyrl/tinyrl.h             \
-    tinyrl/history.h            \
-    tinyrl/vt100.h
-                            
-EXTRA_DIST		        +=      \
-	tinyrl/history/module.am	\
-    tinyrl/vt100/module.am      \
-    tinyrl/README
-				
 include $(top_srcdir)/tinyrl/history/module.am
 include $(top_srcdir)/tinyrl/vt100/module.am

tinyrl/vt100/module.am

@@ -1,4 +1,4 @@
 ## Process this file with automake to produce Makefile.in
-libtinyrl_la_SOURCES      +=                            \
+libtinyrl_la_SOURCES += \
-                            tinyrl/vt100/vt100.c    \
+	tinyrl/vt100/vt100.c \
-                            tinyrl/vt100/private.h
+	tinyrl/vt100/private.h

tinyxml/module.am

@@ -1,19 +1,19 @@
 ## Process this file with automake to generate Makefile.in
-lib_LTLIBRARIES		    += libtinyxml.la
+lib_LTLIBRARIES += libtinyxml.la
 
-nobase_include_HEADERS  +=      \
+nobase_include_HEADERS += \
-    tinyxml/tinystr.h           \
+	tinyxml/tinystr.h \
-    tinyxml/tinyxml.h
+	tinyxml/tinyxml.h
 
-EXTRA_DIST              +=      \
+EXTRA_DIST += \
-    tinyxml/changes.txt         \
+	tinyxml/changes.txt \
-    tinyxml/readme.txt		\
+	tinyxml/readme.txt \
-    tinyxml/README
+	tinyxml/README
-            
+
-libtinyxml_la_SOURCES    =      \
+libtinyxml_la_SOURCES = \
-    tinyxml/tinyxml.cpp         \
+	tinyxml/tinyxml.cpp \
-    tinyxml/tinyxmlerror.cpp    \
+	tinyxml/tinyxmlerror.cpp \
-    tinyxml/tinyxmlparser.cpp   \
+	tinyxml/tinyxmlparser.cpp \
-    tinyxml/tinystr.cpp
+	tinyxml/tinystr.cpp
 
 libtinyxml_la_CXXFLAGS = @TINYXML_CXXFLAGS@