INTEGRATION: CWS dmake411 (1.22.2); FILE MERGED

2007/10/13 23:43:18 vq 1.22.2.5: #i79272# Release dmake 4.11.
2007/09/23 22:12:06 vq 1.22.2.4: #i81855# Regenerate configure and friends.
2007/09/22 23:11:20 vq 1.22.2.3: #i81855# Regenerate configure and friends.
2007/07/28 17:12:01 vq 1.22.2.2: #i79815# Fix default DMAKEROOT macro value.
2007/07/05 15:58:50 vq 1.22.2.1: #i79271# Bump version to 4.11-cvs.

1 files changed, 17 insertions, 12 deletions

diff --git a/dmake/configure b/dmake/configure
index c4112155162b..9172b5bc8ba7 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.61 for dmake 4.9.
+# Generated by GNU Autoconf 2.61 for dmake 4.11.
 #
 # Copyright (C) 1992, 1993, 1994, 1995, 1996, 1998, 1999, 2000, 2001,
 # 2002, 2003, 2004, 2005, 2006 Free Software Foundation, Inc.
@@ -572,8 +572,8 @@ SHELL=${CONFIG_SHELL-/bin/sh}
 # Identity of this package.
 PACKAGE_NAME='dmake'
 PACKAGE_TARNAME='dmake'
-PACKAGE_VERSION='4.9'
-PACKAGE_STRING='dmake 4.9'
+PACKAGE_VERSION='4.11'
+PACKAGE_STRING='dmake 4.11'
 PACKAGE_BUGREPORT=''
 
 ac_unique_file="man/dmake.tf"
@@ -1223,7 +1223,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.9 to adapt to many kinds of systems.
+\`configure' configures dmake 4.11 to adapt to many kinds of systems.
 
 Usage: $0 [OPTION]... [VAR=VALUE]...
 
@@ -1292,7 +1292,7 @@ fi
 
 if test -n "$ac_init_help"; then
   case $ac_init_help in
-     short | recursive ) echo "Configuration of dmake 4.9:";;
+     short | recursive ) echo "Configuration of dmake 4.11:";;
    esac
   cat <<\_ACEOF
 
@@ -1382,7 +1382,7 @@ fi
 test -n "$ac_init_help" && exit $ac_status
 if $ac_init_version; then
   cat <<\_ACEOF
-dmake configure 4.9
+dmake configure 4.11
 generated by GNU Autoconf 2.61
 
 Copyright (C) 1992, 1993, 1994, 1995, 1996, 1998, 1999, 2000, 2001,
@@ -1396,7 +1396,7 @@ cat >config.log <<_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.9, which was
+It was created by dmake $as_me 4.11, which was
 generated by GNU Autoconf 2.61.  Invocation command line was
 
   $ $0 $@
@@ -2116,7 +2116,7 @@ fi
 
 # Define the identity of the package.
  PACKAGE='dmake'
- VERSION='4.9'
+ VERSION='4.11'
 
 
 cat >>confdefs.h <<_ACEOF
@@ -4035,6 +4035,10 @@ 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
+	"OS/2")
+	  OS_VERSION=os2
+	  CASE_INSENSITIVE_FS=true
+	  ;;
 	"SunOS")
 	  OS_VERSION=solaris
 	  ;;
@@ -4168,7 +4172,7 @@ else
 echo "${ECHO_T}no" >&6; }
 fi
 
-eval dmakerootprefix="$datadir"
+eval dmakerootprefix="$datarootdir"
 # $datadir is ${prefix}/share if not overridden
 test "x$dmakerootprefix" != "x${dmakerootprefix##NONE}" && dmakerootprefix=${ac_default_prefix}/share
 
@@ -4177,7 +4181,7 @@ DMAKEROOT_H_LINE1='"DMAKEROOT := '${dmakerootprefix}'/startup",'
 fi
 
 
-ac_config_files="$ac_config_files dmakeroot.h 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 tests/Makefile"
+ac_config_files="$ac_config_files dmakeroot.h 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/unix/os2/Makefile startup/winnt/Makefile startup/winnt/mingw/Makefile startup/winnt/msvc6/Makefile tests/Makefile"
 
 
 
@@ -8060,7 +8064,7 @@ exec 6>&1
 # report actual input values of CONFIG_FILES etc. instead of their
 # values after options handling.
 ac_log="
-This file was extended by dmake $as_me 4.9, which was
+This file was extended by dmake $as_me 4.11, which was
 generated by GNU Autoconf 2.61.  Invocation command line was
 
   CONFIG_FILES    = $CONFIG_FILES
@@ -8113,7 +8117,7 @@ Report bugs to <bug-autoconf@gnu.org>."
 _ACEOF
 cat >>$CONFIG_STATUS <<_ACEOF
 ac_cs_version="\\
-dmake config.status 4.9
+dmake config.status 4.11
 configured by $0, generated by GNU Autoconf 2.61,
   with options \\"`echo "$ac_configure_args" | sed 's/^ //; s/[\\""\`\$]/\\\\&/g'`\\"
 
@@ -8238,6 +8242,7 @@ do
     "startup/unix/macosx/Makefile") CONFIG_FILES="$CONFIG_FILES startup/unix/macosx/Makefile" ;;
     "startup/unix/sysvr4/Makefile") CONFIG_FILES="$CONFIG_FILES startup/unix/sysvr4/Makefile" ;;
     "startup/unix/cygwin/Makefile") CONFIG_FILES="$CONFIG_FILES startup/unix/cygwin/Makefile" ;;
+    "startup/unix/os2/Makefile") CONFIG_FILES="$CONFIG_FILES startup/unix/os2/Makefile" ;;
     "startup/winnt/Makefile") CONFIG_FILES="$CONFIG_FILES startup/winnt/Makefile" ;;
     "startup/winnt/mingw/Makefile") CONFIG_FILES="$CONFIG_FILES startup/winnt/mingw/Makefile" ;;
     "startup/winnt/msvc6/Makefile") CONFIG_FILES="$CONFIG_FILES startup/winnt/msvc6/Makefile" ;;