INTEGRATION: CWS dmake43p01 (1.15.2); FILE MERGED

2006/03/31 16:04:35 vq 1.15.2.12: #i63874# Release dmake 4.4
Update version numbers and regenerate autotool files.
2006/02/12 00:47:36 vq 1.15.2.11: #i61940# Enable the alternative use of spawn instead of fork/exec for
dmake. Add the configure option --enable-spawn. Regenerate autotool files.
2006/02/01 23:28:53 vq 1.15.2.10: #i60948# Add -m option family to generate timing information for targets
and/or recipes. (Autotools files were regenerated.)
2006/01/26 02:54:26 vq 1.15.2.9: #i61170# Fix TMD macro and regenerate autotool files.
2006/01/08 22:20:26 vq 1.15.2.8: #i60168# Expand internal configure variable before using it and
regenerate autotool files.
2006/01/08 21:44:43 vq 1.15.2.7: #i60168# Regenerate autotool files.
2005/10/25 17:19:42 vq 1.15.2.6: #i53148# Restore old behaviour for non-*NIX dmake versions.
2005/09/26 00:33:11 vq 1.15.2.5: #i55070# Fix Fred Fishes DBUG macros and add --enable-dbug to enable them
in a configure type build. Also regenerate autotool files.
2005/09/20 00:50:40 vq 1.15.2.4: #i49461# Add testcase and regenerate configure and other autotools files.
2005/06/02 03:41:17 vq 1.15.2.3: #i39248# Add testsuite for dmake (only tor targets using the autotools).
2005/04/22 01:27:17 vq 1.15.2.2: #i47851# Regenerate configure and other autotools files.
2005/04/16 23:05:14 vq 1.15.2.1: #i47578# Regenerate configure and other autotools files.

1 files changed, 254 insertions, 167 deletions

diff --git a/dmake/configure b/dmake/configure
index 7ff4d499350e..2958511afd25 100755
--- a/dmake/configure
+++ b/dmake/configure
@@ -1,6 +1,6 @@
 #! /bin/sh
 # Guess values for system-dependent variables and create Makefiles.
-# Generated by GNU Autoconf 2.59 for dmake 4.3.
+# Generated by GNU Autoconf 2.59 for dmake 4.4.
 #
 # Copyright (C) 2003 Free Software Foundation, Inc.
 # This configure script is free software; the Free Software Foundation
@@ -267,8 +267,8 @@ SHELL=${CONFIG_SHELL-/bin/sh}
 # Identity of this package.
 PACKAGE_NAME='dmake'
 PACKAGE_TARNAME='dmake'
-PACKAGE_VERSION='4.3'
-PACKAGE_STRING='dmake 4.3'
+PACKAGE_VERSION='4.4'
+PACKAGE_STRING='dmake 4.4'
 PACKAGE_BUGREPORT=''
 
 ac_unique_file="man/dmake.tf"
@@ -309,7 +309,7 @@ ac_includes_default="\
 # include <unistd.h>
 #endif"
 
-ac_subst_vars='SHELL PATH_SEPARATOR PACKAGE_NAME PACKAGE_TARNAME PACKAGE_VERSION PACKAGE_STRING PACKAGE_BUGREPORT exec_prefix prefix program_transform_name bindir sbindir libexecdir datadir sysconfdir sharedstatedir localstatedir libdir includedir oldincludedir infodir mandir build_alias host_alias target_alias DEFS ECHO_C ECHO_N ECHO_T LIBS INSTALL_PROGRAM INSTALL_SCRIPT INSTALL_DATA CYGPATH_W PACKAGE VERSION ACLOCAL AUTOCONF AUTOMAKE AUTOHEADER MAKEINFO install_sh STRIP ac_ct_STRIP INSTALL_STRIP_PROGRAM mkdir_p AWK SET_MAKE am__leading_dot AMTAR am__tar am__untar MAINTAINER_MODE_TRUE MAINTAINER_MODE_FALSE MAINT CC CFLAGS LDFLAGS CPPFLAGS ac_ct_CC EXEEXT OBJEXT DEPDIR am__include am__quote AMDEP_TRUE AMDEP_FALSE AMDEPBACKSLASH CCDEPMODE am__fastdepCC_TRUE am__fastdepCC_FALSE CPP LN_S RANLIB ac_ct_RANLIB EGREP LIBOBJS OS_TYPE OS_VERSION OS_SUBDIRS OS_LIBRARY LTLIBOBJS'
+ac_subst_vars='SHELL PATH_SEPARATOR PACKAGE_NAME PACKAGE_TARNAME PACKAGE_VERSION PACKAGE_STRING PACKAGE_BUGREPORT exec_prefix prefix program_transform_name bindir sbindir libexecdir datadir sysconfdir sharedstatedir localstatedir libdir includedir oldincludedir infodir mandir build_alias host_alias target_alias DEFS ECHO_C ECHO_N ECHO_T LIBS build build_cpu build_vendor build_os INSTALL_PROGRAM INSTALL_SCRIPT INSTALL_DATA CYGPATH_W PACKAGE VERSION ACLOCAL AUTOCONF AUTOMAKE AUTOHEADER MAKEINFO install_sh STRIP ac_ct_STRIP INSTALL_STRIP_PROGRAM mkdir_p AWK SET_MAKE am__leading_dot AMTAR am__tar am__untar MAINTAINER_MODE_TRUE MAINTAINER_MODE_FALSE MAINT CC CFLAGS LDFLAGS CPPFLAGS ac_ct_CC EXEEXT OBJEXT DEPDIR am__include am__quote AMDEP_TRUE AMDEP_FALSE AMDEPBACKSLASH CCDEPMODE am__fastdepCC_TRUE am__fastdepCC_FALSE CPP LN_S RANLIB ac_ct_RANLIB OS_TYPE OS_VERSION OS_SUBDIRS OS_LIBRARY DBUG_TRUE DBUG_FALSE DMAKEROOT_H_LINE1 EGREP LIBOBJS LTLIBOBJS'
 ac_subst_files=''
 
 # Initialize some variables set by options.
@@ -778,7 +778,7 @@ if test "$ac_init_help" = "long"; then
   # Omit some internal or obsolete options to make the list less imposing.
   # This message is too long to be a string in the A/UX 3.1 sh.
   cat <<_ACEOF
-\`configure' configures dmake 4.3 to adapt to many kinds of systems.
+\`configure' configures dmake 4.4 to adapt to many kinds of systems.
 
 Usage: $0 [OPTION]... [VAR=VALUE]...
 
@@ -835,12 +835,15 @@ Program names:
   --program-prefix=PREFIX            prepend PREFIX to installed program names
   --program-suffix=SUFFIX            append SUFFIX to installed program names
   --program-transform-name=PROGRAM   run sed PROGRAM on installed program names
+
+System types:
+  --build=BUILD     configure for building on BUILD [guessed]
 _ACEOF
 fi
 
 if test -n "$ac_init_help"; then
   case $ac_init_help in
-     short | recursive ) echo "Configuration of dmake 4.3:";;
+     short | recursive ) echo "Configuration of dmake 4.4:";;
    esac
   cat <<\_ACEOF
 
@@ -849,6 +852,11 @@ Optional Features:
   --enable-FEATURE[=ARG]  include FEATURE [ARG=yes]
   --enable-maintainer-mode  enable make rules and dependencies not useful
 			  (and sometimes confusing) to the casual installer
+  --enable-dbug:          Enable build with dbug macros.
+
+  --enable-spawn:         Enables the use of spawn instead of fork/exec
+                          if it is supported.
+
   --disable-dependency-tracking  speeds up one-time build
   --enable-dependency-tracking   do not reject slow dependency extractors
 
@@ -959,7 +967,7 @@ fi
 test -n "$ac_init_help" && exit 0
 if $ac_init_version; then
   cat <<\_ACEOF
-dmake configure 4.3
+dmake configure 4.4
 generated by GNU Autoconf 2.59
 
 Copyright (C) 2003 Free Software Foundation, Inc.
@@ -973,7 +981,7 @@ cat >&5 <<_ACEOF
 This file contains any messages produced by compilers while
 running configure, to aid debugging if configure makes a mistake.
 
-It was created by dmake $as_me 4.3, which was
+It was created by dmake $as_me 4.4, which was
 generated by GNU Autoconf 2.59.  Invocation command line was
 
   $ $0 $@
@@ -1309,8 +1317,6 @@ ac_compiler_gnu=$ac_cv_c_compiler_gnu
 
 
 
-
-am__api_version="1.9"
 ac_aux_dir=
 for ac_dir in $srcdir $srcdir/.. $srcdir/../..; do
   if test -f $ac_dir/install-sh; then
@@ -1336,6 +1342,42 @@ ac_config_guess="$SHELL $ac_aux_dir/config.guess"
 ac_config_sub="$SHELL $ac_aux_dir/config.sub"
 ac_configure="$SHELL $ac_aux_dir/configure" # This should be Cygnus configure.
 
+# Make sure we can run config.sub.
+$ac_config_sub sun4 >/dev/null 2>&1 ||
+  { { echo "$as_me:$LINENO: error: cannot run $ac_config_sub" >&5
+echo "$as_me: error: cannot run $ac_config_sub" >&2;}
+   { (exit 1); exit 1; }; }
+
+echo "$as_me:$LINENO: checking build system type" >&5
+echo $ECHO_N "checking build system type... $ECHO_C" >&6
+if test "${ac_cv_build+set}" = set; then
+  echo $ECHO_N "(cached) $ECHO_C" >&6
+else
+  ac_cv_build_alias=$build_alias
+test -z "$ac_cv_build_alias" &&
+  ac_cv_build_alias=`$ac_config_guess`
+test -z "$ac_cv_build_alias" &&
+  { { echo "$as_me:$LINENO: error: cannot guess build type; you must specify one" >&5
+echo "$as_me: error: cannot guess build type; you must specify one" >&2;}
+   { (exit 1); exit 1; }; }
+ac_cv_build=`$ac_config_sub $ac_cv_build_alias` ||
+  { { echo "$as_me:$LINENO: error: $ac_config_sub $ac_cv_build_alias failed" >&5
+echo "$as_me: error: $ac_config_sub $ac_cv_build_alias failed" >&2;}
+   { (exit 1); exit 1; }; }
+
+fi
+echo "$as_me:$LINENO: result: $ac_cv_build" >&5
+echo "${ECHO_T}$ac_cv_build" >&6
+build=$ac_cv_build
+build_cpu=`echo $ac_cv_build | sed 's/^\([^-]*\)-\([^-]*\)-\(.*\)$/\1/'`
+build_vendor=`echo $ac_cv_build | sed 's/^\([^-]*\)-\([^-]*\)-\(.*\)$/\2/'`
+build_os=`echo $ac_cv_build | sed 's/^\([^-]*\)-\([^-]*\)-\(.*\)$/\3/'`
+
+
+BUILDINFO="$build"
+
+
+am__api_version="1.9"
 # Find a good install program.  We prefer a C program (faster),
 # so one script is as good as another.  But avoid the broken or
 # incompatible versions:
@@ -1617,7 +1659,7 @@ fi
 
 # Define the identity of the package.
  PACKAGE='dmake'
- VERSION='4.3'
+ VERSION='4.4'
 
 
 cat >>confdefs.h <<_ACEOF
@@ -1773,6 +1815,20 @@ fi
 
 
 
+          ac_config_headers="$ac_config_headers config.h"
+
+
+# Check whether --enable-dbug or --disable-dbug was given.
+if test "${enable_dbug+set}" = set; then
+  enableval="$enable_dbug"
+
+fi;
+
+# Check whether --enable-spawn or --disable-spawn was given.
+if test "${enable_spawn+set}" = set; then
+  enableval="$enable_spawn"
+
+fi;
 ac_ext=c
 ac_cpp='$CPP $CPPFLAGS'
 ac_compile='$CC -c $CFLAGS $CPPFLAGS conftest.$ac_ext >&5'
@@ -3352,9 +3408,166 @@ fi
 done
 
 
+echo "$as_me:$LINENO: checking the operating system" >&5
+echo $ECHO_N "checking the operating system... $ECHO_C" >&6
+
+_os=`uname`
+
+if test `echo $_os | $AWK -F_ '{ print $1 }'` = "CYGWIN"; then
+   if test "$GCC" = "yes"; then
+      if test `$CC -dumpmachine | $AWK -F- '{ print $3 }'` = "mingw32"; then
+         _os="MINGW"
+      else
+         _os="CYGWIN"
+      fi
+   else
+      _os="MSVC6"
+   fi
+fi
+
+
+## At the moment all except mingw builds are OS_TYPE unix
+OS_TYPE=unix
+
+## The following allows like systems to share settings this is not meant to
+## Imply that these OS are the same thing.
+case "$_os" in
+	"SunOS")
+	  OS_VERSION=solaris
+	  ;;
+	"Linux")
+	  OS_VERSION=linux
+	  ;;
+	"CYGWIN")
+	  OS_VERSION=cygwin
+	  ;;
+	"MINGW")
+	  OS_VERSION=mingw
+	  OS_TYPE=winnt
+	  BUILDINFO="Windows / MinGW"
+	  ;;
+	"MSVC6")
+	  OS_VERSION=msvc6
+	  OS_TYPE=winnt
+	  BUILDINFO="Windows / MS Visual C++"
+	  ;;
+	"Darwin")
+	  OS_VERSION=macosx
+	  ;;
+	"FreeBSD")
+	  OS_VERSION=linux
+	  ;;
+	"OSF1")
+	  OS_VERSION=sysvr4
+	  ;;
+	"NetBSD")
+	  OS_VERSION=linux
+	  ;;
+	"IRIX")
+	  OS_VERSION=sysvr4
+	  ;;
+	"IRIX64")
+	  OS_VERSION=sysvr4
+	  ;;
+	"GNU")
+	  OS_VERSION=linux
+	  ;;
+	"AIX")
+	  OS_VERSION=sysvr4
+	  ;;
+   *)
+      { { echo "$as_me:$LINENO: error: $_os operating system is not suitable to build dmake!" >&5
+echo "$as_me: error: $_os operating system is not suitable to build dmake!" >&2;}
+   { (exit 1); exit 1; }; }
+      ;;
+esac
+
+echo "$as_me:$LINENO: result: checked ($_os)" >&5
+echo "${ECHO_T}checked ($_os)" >&6
+
+if test x$OS_TYPE = xunix; then
+  OS_SUBDIRS="unix startup"
+  OS_LIBRARY=unix/libunix.a
+else
+  OS_SUBDIRS="win95 msdos startup"
+  OS_LIBRARY="win95/libwin95.a msdos/libmsdos.a win95/microsft/libmsft.a"
+fi
+
+
+
+
+cat >>confdefs.h <<_ACEOF
+#define BUILDINFO "$BUILDINFO"
+_ACEOF
+
+
+
+
+if test xOS_TYPE != xwinnt; then
+
+cat >>confdefs.h <<\_ACEOF
+#define USE_SANE_EXEC_SHELL_REDIR 1
+_ACEOF
+
+
+cat >>confdefs.h <<\_ACEOF
+#define NO_DRIVE_LETTERS 1
+_ACEOF
+
+fi
+
+echo "$as_me:$LINENO: checking whether to do a build with dbug macros" >&5
+echo $ECHO_N "checking whether to do a build with dbug macros... $ECHO_C" >&6
+if test -n "$enable_dbug" && test "$enable_dbug" != "no"; then
+   DBUG="1"
+   CPPFLAGS="$CPPFLAGS -DDBUG=1 -I\$(top_srcdir)/dbug/dbug"
+   echo "$as_me:$LINENO: result: yes" >&5
+echo "${ECHO_T}yes" >&6
+else
+   DBUG=""
+   echo "$as_me:$LINENO: result: no" >&5
+echo "${ECHO_T}no" >&6
+fi
+
+
+if test -n "$DBUG"; then
+  DBUG_TRUE=
+  DBUG_FALSE='#'
+else
+  DBUG_TRUE='#'
+  DBUG_FALSE=
+fi
+
+
+echo "$as_me:$LINENO: checking if spawn shall be used" >&5
+echo $ECHO_N "checking if spawn shall be used... $ECHO_C" >&6
+if test -n "$enable_spawn" && test "$enable_spawn" != "no"; then
+
+cat >>confdefs.h <<\_ACEOF
+#define ENABLE_SPAWN 1
+_ACEOF
+
+   echo "$as_me:$LINENO: result: yes" >&5
+echo "${ECHO_T}yes" >&6
+else
+   echo "$as_me:$LINENO: result: no" >&5
+echo "${ECHO_T}no" >&6
+fi
+
+eval dmakerootprefix="$datadir"
+# $datadir is ${prefix}/share if not overridden
+test "x$dmakerootprefix" != "x${dmakerootprefix##NONE}" && dmakerootprefix=${ac_default_prefix}/share
+
+if test x$OS_TYPE = xunix; then
+DMAKEROOT_H_LINE1='"DMAKEROOT := '${dmakerootprefix}'/startup",'
+fi
 
-#AM_PROG_LIBTOOL
 
+                                                                                                                                                                                    ac_config_files="$ac_config_files dmakeroot.h Makefile unix/Makefile startup/config.mk startup/Makefile startup/unix/Makefile startup/unix/linux/Makefile startup/unix/solaris/Makefile startup/unix/macosx/Makefile startup/unix/sysvr4/Makefile startup/unix/cygwin/Makefile startup/winnt/Makefile startup/winnt/mingw/Makefile startup/winnt/msvc6/Makefile msdos/Makefile win95/Makefile win95/microsft/Makefile tests/Makefile"
+
+
+
+#AM_PROG_LIBTOOL
 
 
 
@@ -3952,7 +4165,8 @@ done
 
 
 
-for ac_header in fcntl.h limits.h strings.h sys/types.h sys/stat.h unistd.h errno.h utime.h spawn.h wait.h sys/wait.h
+
+for ac_header in fcntl.h limits.h strings.h sys/types.h sys/stat.h unistd.h errno.h utime.h spawn.h wait.h sys/wait.h sys/time.h
 do
 as_ac_Header=`echo "ac_cv_header_$ac_header" | $as_tr_sh`
 if eval "test \"\${$as_ac_Header+set}\" = set"; then
@@ -6467,7 +6681,8 @@ done
 
 
 
-for ac_func in getcwd getwd putenv strcspn strerror strspn strstr setvbuf tzset settz mkstemp tempnam
+
+for ac_func in getcwd getwd putenv strcspn strerror strspn strstr setvbuf tzset settz mkstemp tempnam gettimeofday
 do
 as_ac_var=`echo "ac_cv_func_$ac_func" | $as_tr_sh`
 echo "$as_me:$LINENO: checking for $ac_func" >&5
@@ -6569,113 +6784,6 @@ fi
 done
 
 
-echo "$as_me:$LINENO: checking the operating system" >&5
-echo $ECHO_N "checking the operating system... $ECHO_C" >&6
-
-_os=`uname`
-
-if test `echo $_os | $AWK -F_ '{ print $1 }'` = "CYGWIN"; then
-   if test "$GCC" = "yes"; then
-      if test `$CC -dumpmachine | $AWK -F- '{ print $3 }'` = "mingw32"; then
-         _os="MINGW"
-      else
-         _os="CYGWIN"
-      fi
-   else
-      _os="MSVC6"
-   fi
-fi
-
-
-## At the moment all except mingw builds are OS_TYPE unix
-OS_TYPE=unix
-
-## The following allows like systems to share settings this is not meant to
-## Imply that these OS are the same thing.
-case "$_os" in
-	"SunOS")
-	  OS_VERSION=solaris
-	  ;;
-	"Linux")
-	  OS_VERSION=linux
-	  ;;
-	"CYGWIN")
-	  OS_VERSION=cygwin
-	  ;;
-	"MINGW")
-	  OS_VERSION=mingw
-	  OS_TYPE=winnt
-	  ;;
-	"MSVC6")
-	  OS_VERSION=msvc6
-	  OS_TYPE=winnt
-	  ;;
-	"Darwin")
-	  OS_VERSION=macosx
-	  ;;
-	"FreeBSD")
-	  OS_VERSION=linux
-	  ;;
-	"OSF1")
-	  OS_VERSION=sysvr4
-	  ;;
-	"NetBSD")
-	  OS_VERSION=linux
-	  ;;
-	"IRIX")
-	  OS_VERSION=sysvr4
-	  ;;
-	"IRIX64")
-	  OS_VERSION=sysvr4
-	  ;;
-	"GNU")
-	  OS_VERSION=linux
-	  ;;
-	"AIX")
-	  OS_VERSION=sysvr4
-	  ;;
-   *)
-      { { echo "$as_me:$LINENO: error: $_os operating system is not suitable to build dmake!" >&5
-echo "$as_me: error: $_os operating system is not suitable to build dmake!" >&2;}
-   { (exit 1); exit 1; }; }
-      ;;
-esac
-
-echo "$as_me:$LINENO: result: checked ($_os)" >&5
-echo "${ECHO_T}checked ($_os)" >&6
-
-if test x$OS_TYPE = xunix; then
-  OS_SUBDIRS="unix startup"
-  OS_LIBRARY=unix/libunix.a
-else
-  OS_SUBDIRS="win95 msdos startup"
-  OS_LIBRARY="win95/libwin95.a msdos/libmsdos.a win95/microsft/libmsft.a"
-fi
-
-
-
-
-
-
-          ac_config_headers="$ac_config_headers config.h"
-
-
-                                                                                                                                                      ac_config_files="$ac_config_files Makefile unix/Makefile startup/Makefile startup/unix/Makefile startup/unix/linux/Makefile startup/unix/solaris/Makefile startup/unix/macosx/Makefile startup/unix/sysvr4/Makefile startup/unix/cygwin/Makefile startup/winnt/Makefile startup/winnt/mingw/Makefile startup/winnt/msvc6/Makefile msdos/Makefile win95/Makefile win95/microsft/Makefile"
-
-
-
-
-
-
-
-if test "${prefix}" != NONE; then
-	DMAKEROOT=${prefix}/share/startup/startup.mk
-	export DMAKEROOT
-else
-	DMAKEROOT=startup.mk
-	export DMAKEROOT
-fi
-
 
 cat >confcache <<\_ACEOF
 # This file is a shell script that caches the results of configure
@@ -6759,9 +6867,10 @@ for ac_i in : $LIBOBJS; do test "x$ac_i" = x: && continue
   # 1. Remove the extension, and $U if already installed.
   ac_i=`echo "$ac_i" |
 	 sed 's/\$U\././;s/\.o$//;s/\.obj$//'`
-  # 2. Add them.
-  ac_libobjs="$ac_libobjs $ac_i\$U.$ac_objext"
-  ac_ltlibobjs="$ac_ltlibobjs $ac_i"'$U.lo'
+  # 2. Prepend LIBOBJDIR.  When used with automake>=1.10 LIBOBJDIR
+  #    will be set to the directory where LIBOBJS objects are built.
+  ac_libobjs="$ac_libobjs \${LIBOBJDIR}$ac_i\$U.$ac_objext"
+  ac_ltlibobjs="$ac_ltlibobjs \${LIBOBJDIR}$ac_i"'$U.lo'
 done
 LIBOBJS=$ac_libobjs
 
@@ -6789,6 +6898,13 @@ echo "$as_me: error: conditional \"am__fastdepCC\" was never defined.
 Usually this means the macro was only invoked conditionally." >&2;}
    { (exit 1); exit 1; }; }
 fi
+if test -z "${DBUG_TRUE}" && test -z "${DBUG_FALSE}"; then
+  { { echo "$as_me:$LINENO: error: conditional \"DBUG\" was never defined.
+Usually this means the macro was only invoked conditionally." >&5
+echo "$as_me: error: conditional \"DBUG\" was never defined.
+Usually this means the macro was only invoked conditionally." >&2;}
+   { (exit 1); exit 1; }; }
+fi
 
 : ${CONFIG_STATUS=./config.status}
 ac_clean_files_save=$ac_clean_files
@@ -7060,7 +7176,7 @@ _ASBOX
 } >&5
 cat >&5 <<_CSEOF
 
-This file was extended by dmake $as_me 4.3, which was
+This file was extended by dmake $as_me 4.4, which was
 generated by GNU Autoconf 2.59.  Invocation command line was
 
   CONFIG_FILES    = $CONFIG_FILES
@@ -7123,7 +7239,7 @@ _ACEOF
 
 cat >>$CONFIG_STATUS <<_ACEOF
 ac_cs_version="\\
-dmake config.status 4.3
+dmake config.status 4.4
 configured by $0, generated by GNU Autoconf 2.59,
   with options \\"`echo "$ac_configure_args" | sed 's/[\\""\`\$]/\\\\&/g'`\\"
 
@@ -7233,8 +7349,10 @@ for ac_config_target in $ac_config_targets
 do
   case "$ac_config_target" in
   # Handling of arguments.
+  "dmakeroot.h" ) CONFIG_FILES="$CONFIG_FILES dmakeroot.h" ;;
   "Makefile" ) CONFIG_FILES="$CONFIG_FILES Makefile" ;;
   "unix/Makefile" ) CONFIG_FILES="$CONFIG_FILES unix/Makefile" ;;
+  "startup/config.mk" ) CONFIG_FILES="$CONFIG_FILES startup/config.mk" ;;
   "startup/Makefile" ) CONFIG_FILES="$CONFIG_FILES startup/Makefile" ;;
   "startup/unix/Makefile" ) CONFIG_FILES="$CONFIG_FILES startup/unix/Makefile" ;;
   "startup/unix/linux/Makefile" ) CONFIG_FILES="$CONFIG_FILES startup/unix/linux/Makefile" ;;
@@ -7248,6 +7366,7 @@ do
   "msdos/Makefile" ) CONFIG_FILES="$CONFIG_FILES msdos/Makefile" ;;
   "win95/Makefile" ) CONFIG_FILES="$CONFIG_FILES win95/Makefile" ;;
   "win95/microsft/Makefile" ) CONFIG_FILES="$CONFIG_FILES win95/microsft/Makefile" ;;
+  "tests/Makefile" ) CONFIG_FILES="$CONFIG_FILES tests/Makefile" ;;
   "depfiles" ) CONFIG_COMMANDS="$CONFIG_COMMANDS depfiles" ;;
   "config.h" ) CONFIG_HEADERS="$CONFIG_HEADERS config.h" ;;
   *) { { echo "$as_me:$LINENO: error: invalid argument: $ac_config_target" >&5
@@ -7335,6 +7454,10 @@ s,@ECHO_C@,$ECHO_C,;t t
 s,@ECHO_N@,$ECHO_N,;t t
 s,@ECHO_T@,$ECHO_T,;t t
 s,@LIBS@,$LIBS,;t t
+s,@build@,$build,;t t
+s,@build_cpu@,$build_cpu,;t t
+s,@build_vendor@,$build_vendor,;t t
+s,@build_os@,$build_os,;t t
 s,@INSTALL_PROGRAM@,$INSTALL_PROGRAM,;t t
 s,@INSTALL_SCRIPT@,$INSTALL_SCRIPT,;t t
 s,@INSTALL_DATA@,$INSTALL_DATA,;t t
@@ -7380,12 +7503,15 @@ s,@CPP@,$CPP,;t t
 s,@LN_S@,$LN_S,;t t
 s,@RANLIB@,$RANLIB,;t t
 s,@ac_ct_RANLIB@,$ac_ct_RANLIB,;t t
-s,@EGREP@,$EGREP,;t t
-s,@LIBOBJS@,$LIBOBJS,;t t
 s,@OS_TYPE@,$OS_TYPE,;t t
 s,@OS_VERSION@,$OS_VERSION,;t t
 s,@OS_SUBDIRS@,$OS_SUBDIRS,;t t
 s,@OS_LIBRARY@,$OS_LIBRARY,;t t
+s,@DBUG_TRUE@,$DBUG_TRUE,;t t
+s,@DBUG_FALSE@,$DBUG_FALSE,;t t
+s,@DMAKEROOT_H_LINE1@,$DMAKEROOT_H_LINE1,;t t
+s,@EGREP@,$EGREP,;t t
+s,@LIBOBJS@,$LIBOBJS,;t t
 s,@LTLIBOBJS@,$LTLIBOBJS,;t t
 CEOF
 
@@ -8081,45 +8207,6 @@ chmod +x $CONFIG_STATUS
 ac_clean_files=$ac_clean_files_save
 
 
-
-
-## Generate `dmakeroot.h' in two cases
-## 1. `config.status' is run either explicitly, or via configure.
-##     Esp. not when it is run in `Makefile' to generate makefiles and
-##     config.h
-## 2. CONFIG_OTHER is set explicitly
-##
-## Case 1 is difficult.  We know that `automake' sets one of
-## CONFIG_FILES or CONFIG_HEADERS to empty.  This heuristic works
-## only when AM_CONFIG_HEADER is set, however.
-
-if test -n "${CONFIG_FILES}" && test -n "${CONFIG_HEADERS}"; then
-	# Both CONFIG_FILES and CONFIG_HEADERS are non-empty ==> Case 1
-	CONFIG_OTHER=${CONFIG_OTHER:-dmakeroot.h}
-fi
-    outfile=dmakeroot.h-tmp
-    cat > $outfile <<\_______EOF
-	/* dmakeroot.h
-	 *
-  	 * This is a generated file.  Please modify `configure.in'
-     */
-
-_______EOF
-
-if test x$prefix != x; then
-   if test x$OS_TYPE = xunix; then
-       echo '"DMAKEROOT := '$prefix'/share/startup",' >> $outfile
-   fi
-   echo '"OS := '${OS_VERSION}'",' >> $outfile
-fi
-if cmp -s $outfile dmakeroot.h; then
-    echo dmakeroot.h is unchanged
-    rm -f $outfile
-else
-    mv $outfile dmakeroot.h
-fi
-
-
 # configure is writing to config.log, and then calls config.status.
 # config.status does its own redirection, appending to config.log.
 # Unfortunately, on DOS this fails, as config.log is still kept open