--- a/Makefile.in	Thu Nov 15 08:18:21 2007 +0000
+++ b/Makefile.in	Sat Nov 17 01:30:01 2007 +0000
@@ -39,10 +39,19 @@
 AMDEP_FALSE = @AMDEP_FALSE@
 AMDEP_TRUE = @AMDEP_TRUE@
 AMTAR = @AMTAR@
+ARMCC = @ARMCC@
+ARMLD = @ARMLD@
+ARMOBJCOPY = @ARMOBJCOPY@
 AUTOCONF = @AUTOCONF@
 AUTOHEADER = @AUTOHEADER@
 AUTOMAKE = @AUTOMAKE@
 AWK = @AWK@
+BUILD_ARMTEST_FALSE = @BUILD_ARMTEST_FALSE@
+BUILD_ARMTEST_TRUE = @BUILD_ARMTEST_TRUE@
+BUILD_SH4X86_FALSE = @BUILD_SH4X86_FALSE@
+BUILD_SH4X86_TRUE = @BUILD_SH4X86_TRUE@
+BUILD_SYSTEST_FALSE = @BUILD_SYSTEST_FALSE@
+BUILD_SYSTEST_TRUE = @BUILD_SYSTEST_TRUE@
 CATALOGS = @CATALOGS@
 CATOBJEXT = @CATOBJEXT@
 CC = @CC@
@@ -97,7 +106,10 @@
 PO_IN_DATADIR_FALSE = @PO_IN_DATADIR_FALSE@
 PO_IN_DATADIR_TRUE = @PO_IN_DATADIR_TRUE@
 SET_MAKE = @SET_MAKE@
+SHCC = @SHCC@
 SHELL = @SHELL@
+SHLD = @SHLD@
+SHOBJCOPY = @SHOBJCOPY@
 STRIP = @STRIP@
 USE_NLS = @USE_NLS@
 VERSION = @VERSION@
@@ -109,7 +121,11 @@
 am__leading_dot = @am__leading_dot@
 am__quote = @am__quote@
 bindir = @bindir@
+build = @build@
 build_alias = @build_alias@
+build_cpu = @build_cpu@
+build_os = @build_os@
+build_vendor = @build_vendor@
 datadir = @datadir@
 datarootdir = @datarootdir@
 docdir = @docdir@
@@ -135,14 +151,15 @@
 sysconfdir = @sysconfdir@
 target_alias = @target_alias@
 
-SUBDIRS = src po test
+@BUILD_SYSTEST_TRUE@TEST_SUBDIR = test
+SUBDIRS = src po $(TEST_SUBDIR)
 
 EXTRA_DIST = autogen.sh
 subdir = .
 ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
 mkinstalldirs = $(SHELL) $(top_srcdir)/mkinstalldirs
 CONFIG_HEADER = config.h
-CONFIG_CLEAN_FILES =
+CONFIG_CLEAN_FILES = test/Makefile
 DIST_SOURCES =
 
 RECURSIVE_TARGETS = info-recursive dvi-recursive pdf-recursive \
@@ -154,7 +171,7 @@
 	COPYING ChangeLog INSTALL Makefile.am NEWS acconfig.h \
 	aclocal.m4 config.guess config.h.in config.sub configure \
 	configure.in depcomp install-sh missing mkinstalldirs
-DIST_SUBDIRS = $(SUBDIRS)
+DIST_SUBDIRS = src po test
 all: config.h
 	$(MAKE) $(AM_MAKEFLAGS) all-recursive
 
@@ -192,6 +209,8 @@
 
 distclean-hdr:
 	-rm -f config.h stamp-h1
+test/Makefile: $(top_builddir)/config.status $(top_srcdir)/test/Makefile.in
+	cd $(top_builddir) && $(SHELL) ./config.status $@
 uninstall-info-am:
 
 # This directory's subdirectories are mostly independent; you can cd
@@ -334,7 +353,7 @@
 distdir: $(DISTFILES)
 	$(am__remove_distdir)
 	mkdir $(distdir)
-	$(mkinstalldirs) $(distdir)/po
+	$(mkinstalldirs) $(distdir)/po $(distdir)/test
 	@srcdirstrip=`echo "$(srcdir)" | sed 's|.|.|g'`; \
 	topsrcdirstrip=`echo "$(top_srcdir)" | sed 's|.|.|g'`; \
 	list='$(DISTFILES)'; for file in $$list; do \
@@ -361,7 +380,7 @@
 	    || exit 1; \
 	  fi; \
 	done
-	list='$(SUBDIRS)'; for subdir in $$list; do \
+	list='$(DIST_SUBDIRS)'; for subdir in $$list; do \
 	  if test "$$subdir" = .; then :; else \
 	    test -d $(distdir)/$$subdir \
 	    || mkdir $(distdir)/$$subdir \