INTEGRATION: CWS geordi2q01 (1.36.8); FILE MERGED

2003/08/18 12:46:08 hr 1.36.8.1: #i18350#: join changes from CWS ooo11rc3

1 files changed, 761 insertions, 189 deletions

diff --git a/config_office/configure b/config_office/configure
index 3bbc0a8cd7e2..82e930ed7cdb 100755
--- a/config_office/configure
+++ b/config_office/configure
@@ -1,5 +1,5 @@
 #! /bin/sh
-# From configure.in Revision: 1.54.2.5  .
+# From configure.in Revision: 1.55.2.11  .
 # Guess values for system-dependent variables and create Makefiles.
 # Generated by GNU Autoconf 2.57.
 #
@@ -271,7 +271,7 @@ PACKAGE_VERSION=
 PACKAGE_STRING=
 PACKAGE_BUGREPORT=
 
-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 AWK SED CC CFLAGS LDFLAGS CPPFLAGS ac_ct_CC EXEEXT OBJEXT COMPATH _cc CPP EGREP CXX CXXFLAGS ac_ct_CXX CXXCPP JAVA XMKMF PERL TCSH PKG_CONFIG GTK_CFLAGS GTK_LIBS X_CFLAGS X_PRE_LIBS X_LIBS X_EXTRA_LIBS BISON FLEX PATCH CYGWIN ML_EXE ZIP_EXE LIBART_CFLAGS LIBART_LIBS ANT ANT_HOME GXX_INCLUDE_PATH GCC_HOME GNUMAKE JAVA_HOME XLIB XINC LOCAL_SOLENV LOCAL_SOLVER UPD COMEX STLPORT4 WITH_LANG WITH_DICT PSDK_HOME ASM_HOME UNZIP_HOME WITH_MINGWIN USE_SHELL EXCEPTIONS OSVERSION USE_GCC3 PTHREAD_CFLAGS PTHREAD_LIBS ENABLE_DEBUG ENABLE_STATIC_GTK ENVCFLAGSCXX ENABLE_CRASHDUMP WITH_GPC WITH_LIBART GNUPATCH GNUCP LIBOBJS 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 AWK SED PTHREAD_CFLAGS PTHREAD_LIBS ENABLE_CRASHDUMP ENABLE_DEBUG ENABLE_SYMBOLS USE_SHELL CC CFLAGS LDFLAGS CPPFLAGS ac_ct_CC EXEEXT OBJEXT COMPATH USE_GCC3 GNUMAKE _cc MSPDB_PATH COMEX MIDL_PATH WDEVENV_PATH CPP EGREP CXX CXXFLAGS ac_ct_CXX GXX_INCLUDE_PATH EXCEPTIONS CXXCPP STLPORT4 SOLAR_JAVA JAVAC JAVA JAVA_HOME JDK XMKMF PERL TCSH PKG_CONFIG GTK_CFLAGS GTK_LIBS X_CFLAGS X_PRE_LIBS X_LIBS X_EXTRA_LIBS XINC XLIB PSDK_HOME BISON FLEX PATCH GNUPATCH GNUCP CYGWIN ML_EXE ASM_HOME ZIP ZIP_HOME LIBART_CFLAGS LIBART_LIBS WITH_LIBART WITH_GPC LIBSN_CFLAGS LIBSN_LIBS WITH_LIBSN ANT ANT_HOME UPD LOCAL_SOLENV LOCAL_SOLVER WITH_LANG WITH_DICT ENABLE_STATIC_GTK GCC_HOME WITH_MINGWIN OSVERSION LIBOBJS LTLIBOBJS'
 ac_subst_files=''
 
 # Initialize some variables set by options.
@@ -818,26 +818,36 @@ if test -n "$ac_init_help"; then
 Optional Features:
   --disable-FEATURE       do not include FEATURE (same as --enable-FEATURE=no)
   --enable-FEATURE[=ARG]  include FEATURE [ARG=yes]
-  --enable-libart          Enables the use of libart, instead of GPC for
+  --enable-libart         Enables the use of libart, instead of GPC for
 			  polygon clipping.
 
-  --enable-gcc3          Deprecated: Now has no effect, checks compiler version.
+  --enable-libsn          Enables the use of libstartup-notification
+
+  --enable-gcc3           Deprecated: Now has no effect, checks compiler version
 
   --enable-symbols        Include debugging symbols in output.  Warning -
                           a complete build needs 8 Gb of space and takes
                           much longer.  (enables -g compiler flag)
 
+                          --enable-symbols=SMALL sets the gcc -g1 setting
+                          which is smaller.
+
 
   --enable-debug:         Include debugging symbols from --enable-symbols
                           plus extra debugging code.  Extra large build!
                           (enables -g compiler flag and dmake debug=true)
 
-  --enable-crashdump:     Enable the crashdump feature code.
+  --enable-crashdump:     Enable the crashdump feature code. This option
+                          implicitly activates --enable-symbols.
 
   --enable-static-gtk:    Modules that are linked against gtk libraries use
                           the static libraries instead of the dynmaic ones.
                           (enables -Bstatic linker flag for gtk libraries)
 
+  --disable-java          Build without Java support.  Use if there is no supported JDK
+                          for your platform.  The build will have no support for Java
+                          components, applets, accessibility or XML filters.
+
   --enable-check-only     Use this option option if you just want to check your
                           environment.  This option stops the generation of an
                           ????env.set
@@ -902,6 +912,21 @@ Optional Packages:
 
                           Usage: --with-cl-home=<absolute path to Microsoft C/C++ compiler home>
 
+  --with-mspdb-path       For Microsoft C/C++ compiler users, please supply the path
+                          pointing to the mspdb60.dll (MSVC 6) or mspdb60.dll (.NET).
+
+                          Usage: --with-mspdb-path=<absolute path to mspdb60.dll/mspdb70.dll>
+
+  --with-midl-path       For Microsoft C/C++ .NET compiler users, please supply the path
+                          pointing to the midl.exe.
+
+                          Usage: --with-midl-path=<absolute path to midl.exe>
+
+  --with-wdevenv-path       For Microsoft C/C++ .NET compiler users, please supply the path
+                          pointing to the wdevenv.exe.
+
+                          Usage: --with-wdevenv-path=<absolute path to wdevenv.exe>
+
   --with-psdk-home        For Windows NT users, please supply the path
                           for the Microsoft Platform SDK.
 
@@ -909,9 +934,9 @@ Optional Packages:
 
   --with-2003-psdk        Deprecated: Now has no effect.
 
-  --with-old-psdk         For Windows users, and compatibility reasons. Please use
-                          this option for the October 2002 version of the Microsoft
-                          Platform SDK.
+  --with-old-psdk         For Windows users, and compatibility reasons. Please
+                          use this option for the October 2002 version of the
+						  Microsoft Platform SDK.
 
                           This is a temporary workaround!
 
@@ -935,9 +960,9 @@ Optional Packages:
                           Usage: --with-lang=SPAN,SWED,TURK
 
   --with-dict             Use this option to build OpenOffice.org with
-                          dictionary support. US English is always
+                          dictionary support. ALL dictionaries are always
                           included by default unless overridden with
-                          this options. Separate multiple dictionaries with
+                          this option. Separate multiple dictionaries with
                           commas. For all dictionaries, use --with-dict=ALL.
 
                           Usage: --with-dict=ENGB,ENUS,ITIT
@@ -952,13 +977,14 @@ Optional Packages:
 
                           Usage: --with-os-version=<OSVERSION>
 
-  --with-unzip-home       For Windows users, please supply the path for
-                          unzip.exe.
+  --with-unzip-home       Deprecated: use --with-zip-home instead
+  --with-zip-home         If you use a non standard zip, for example windows
+                          please supply the path for zip
 
-                          Usage: --with-unzip-home=<path to unzip.exe directory>
+                          Usage: --with-zip-home=<path to zip executable>
 
   --with-mingwin          For Windows users, use the mingwin32 compiler within
-                          cygwin environment (this implies --with-use-shell=tcsh)
+                          cygwin environment, this implies --with-use-shell=tcsh
 
                           Usage: --with-mingwin=yes
 
@@ -1412,6 +1438,11 @@ if test "${enable_libart+set}" = set; then
   enableval="$enable_libart"
 
 fi;
+# Check whether --enable-libsn or --disable-libsn was given.
+if test "${enable_libsn+set}" = set; then
+  enableval="$enable_libsn"
+
+fi;
 # Check whether --enable-gcc3 or --disable-gcc3 was given.
 if test "${enable_gcc3+set}" = set; then
   enableval="$enable_gcc3"
@@ -1449,6 +1480,11 @@ if test "${with_jdk_home+set}" = set; then
   withval="$with_jdk_home"
 
 fi;
+# Check whether --enable-java or --disable-java was given.
+if test "${enable_java+set}" = set; then
+  enableval="$enable_java"
+
+fi;
 
 # Check whether --with-ant-home or --without-ant-home was given.
 if test "${with_ant_home+set}" = set; then
@@ -1468,6 +1504,24 @@ if test "${with_cl_home+set}" = set; then
 
 fi;
 
+# Check whether --with-mspdb-path or --without-mspdb-path was given.
+if test "${with_mspdb_path+set}" = set; then
+  withval="$with_mspdb_path"
+
+fi;
+
+# Check whether --with-midl-path or --without-midl-path was given.
+if test "${with_midl_path+set}" = set; then
+  withval="$with_midl_path"
+
+fi;
+
+# Check whether --with-wdevenv-path or --without-wdevenv-path was given.
+if test "${with_wdevenv_path+set}" = set; then
+  withval="$with_wdevenv_path"
+
+fi;
+
 # Check whether --with-psdk-home or --without-psdk-home was given.
 if test "${with_psdk_home+set}" = set; then
   withval="$with_psdk_home"
@@ -1538,6 +1592,12 @@ if test "${with_unzip_home+set}" = set; then
 
 fi;
 
+# Check whether --with-zip-home or --without-zip-home was given.
+if test "${with_zip_home+set}" = set; then
+  withval="$with_zip_home"
+
+fi;
+
 # Check whether --with-mingwin or --without-mingwin was given.
 if test "${with_mingwin+set}" = set; then
   withval="$with_mingwin"
@@ -1774,19 +1834,20 @@ esac
 echo "$as_me:$LINENO: result: checked ($_os)" >&5
 echo "${ECHO_T}checked ($_os)" >&6
 
-if test "$enable_symbols" = "yes"; then
-   ENVCFLAGSCXX="-g"
-   ENVCFLAGS="-g"
-else
-   ENVCFLAGSCXX=""
-   ENVCFLAGS=""
-fi
+
+
 
 if test "$enable_crashdump" = "yes" -o "$enable_crashdump" = "TRUE"; then
    ENABLE_CRASHDUMP="TRUE"
+   if test -z "$enable_symbols"; then
+      enable_symbols="yes"
+   fi
 else
    if test "$enable_crashdump" = "STATIC"; then
       ENABLE_CRASHDUMP="STATIC"
+      if test -z "$enable_symbols"; then
+         enable_symbols="yes"
+      fi
    else
       if test "$enable_crashdump" = "" -o "$enable_crashdump" = "no"; then
          ENABLE_CRASHDUMP=""
@@ -1798,6 +1859,33 @@ echo "$as_me: error: --enable-crashdump only accepts yes, TRUE or STATIC as para
    fi
 fi
 
+
+if test -n "$enable_debug"; then
+   ENABLE_DEBUG="TRUE"
+   if test -z "$enable_symbols"; then
+      enable_symbols="yes"
+   fi
+else
+   ENABLE_DEBUG="FALSE"
+fi
+
+
+if test -n "$enable_symbols" ; then
+	if test "$enable_symbols" = "yes" -o "$enable_symbols" = "TRUE"; then
+		ENABLE_SYMBOLS="TRUE"
+	else
+		if test "$enable_symbols" = "SMALL" -o "$enable_symbols" = "small"; then
+			ENABLE_SYMBOLS="SMALL"
+		else
+			echo enable symbols is: $enable_symbols
+			{ { echo "$as_me:$LINENO: error: --enable-symbols only accepts yes, TRUE or SMALL as parameter." >&5
+echo "$as_me: error: --enable-symbols only accepts yes, TRUE or SMALL as parameter." >&2;}
+   { (exit 1); exit 1; }; }
+		fi
+	fi
+fi
+
+
 if test $_os = "WINNT" -a $CygwinVer = "true"; then
    if test "$with_use_shell" = "0"; then
       with_use_shell="4nt"
@@ -1842,6 +1930,8 @@ else
       fi
    fi
 fi
+USE_SHELL="$with_use_shell"
+
 
 _machine_type=`uname -m`
 
@@ -2646,7 +2736,8 @@ if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
   echo "$as_me:$LINENO: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
   for ac_declaration in \
-   '' \
+   ''\
+   '#include <stdlib.h>' \
    'extern "C" void std::exit (int) throw (); using std::exit;' \
    'extern "C" void std::exit (int); using std::exit;' \
    'extern "C" void exit (int) throw ();' \
@@ -2660,8 +2751,8 @@ _ACEOF
 cat confdefs.h >>conftest.$ac_ext
 cat >>conftest.$ac_ext <<_ACEOF
 /* end confdefs.h.  */
-$ac_declaration
 #include <stdlib.h>
+$ac_declaration
 int
 main ()
 {
@@ -2804,6 +2895,13 @@ echo $ECHO_N "checking the GNU gcc compiler version... $ECHO_C" >&6
 
    if test "$_gcc_major" = "3"; then
       USE_GCC3="TRUE"
+      if test "$_gcc_longver"  -eq "030203"; then
+         { { echo "$as_me:$LINENO: error: found version \"$_gcc_version\"
+		 	gives internal error, use another version please." >&5
+echo "$as_me: error: found version \"$_gcc_version\"
+		 	gives internal error, use another version please." >&2;}
+   { (exit 1); exit 1; }; }
+      fi
    else
       USE_GCC3="FALSE"
       if test "$_gcc_longver"  -lt "029502"; then
@@ -2823,6 +2921,7 @@ echo "$as_me: error: found version \"$_gcc_version\", Not supported. Upgrade to
 echo "${ECHO_T}checked (gcc $_gcc_version)" >&6
 fi
 
+
 echo "$as_me:$LINENO: checking the GNU make version" >&5
 echo $ECHO_N "checking the GNU make version... $ECHO_C" >&6
 for a in "$MAKE" $GNUMAKE make gmake gnumake ; do
@@ -2868,6 +2967,7 @@ echo "$as_me: error: failed ($GNUMAKE $_make_version need 3.79.1+)" >&2;}
     fi
 fi
 
+
 if test "$_os" = "SunOS"; then
    if test "$CC" = "cc"; then
       for ac_prog in cc
@@ -2914,7 +3014,7 @@ fi
   test -n "$_cc" && break
 done
 
-      COMPATH=`echo $_cc | $SED -n "s/\/bin\/cc//p"`
+      COMPATH=`echo $_cc | $SED -n "s/\/cc//p"`
       echo "$as_me:$LINENO: checking the SUN Workshop C compiler version" >&5
 echo $ECHO_N "checking the SUN Workshop C compiler version... $ECHO_C" >&6
             _workshop_version=`$CC -V 2>&1 | $AWK '/^cc/ { print $7 }'`
@@ -2986,7 +3086,7 @@ fi
   test -n "$_cc" && break
 done
 
-      COMPATH=`echo $_cc | $SED -n "s/\/usr\/bin\/cc//p"`
+      COMPATH=`echo $_cc | $SED -n "s/\/cc//p"`
       echo "$as_me:$LINENO: checking the SGI MIPSpro C compiler version" >&5
 echo $ECHO_N "checking the SGI MIPSpro C compiler version... $ECHO_C" >&6
             _mipspro_version=`$CC -version 2>&1 | $AWK '{ print $4 }'`
@@ -3055,7 +3155,7 @@ fi
   test -n "$_cc" && break
 done
 
-      COMPATH=`echo $_cc | $SED -n "s/\/usr\/bin\/cc//p"`
+      COMPATH=`echo $_cc | $SED -n "s/\/cc//p"`
       { echo "$as_me:$LINENO: WARNING: ******* $_cc , $COMPATH" >&5
 echo "$as_me: WARNING: ******* $_cc , $COMPATH" >&2;}
       echo "$as_me:$LINENO: checking the Compaq C compiler version" >&5
@@ -3077,6 +3177,112 @@ if test "$_os" = "WINNT"; then
 	if test "$WITH_MINGWIN" != "yes"; then
 		echo "$as_me:$LINENO: checking the Microsoft C/C++ Compiler" >&5
 echo $ECHO_N "checking the Microsoft C/C++ Compiler... $ECHO_C" >&6
+										# Extract the first word of "mspdb70.dll", so it can be a program name with args.
+set dummy mspdb70.dll; ac_word=$2
+echo "$as_me:$LINENO: checking for $ac_word" >&5
+echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6
+if test "${ac_cv_path_MSPDB_PATH+set}" = set; then
+  echo $ECHO_N "(cached) $ECHO_C" >&6
+else
+  case $MSPDB_PATH in
+  [\\/]* | ?:[\\/]*)
+  ac_cv_path_MSPDB_PATH="$MSPDB_PATH" # Let the user override the test with a path.
+  ;;
+  *)
+  as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
+for as_dir in $PATH
+do
+  IFS=$as_save_IFS
+  test -z "$as_dir" && as_dir=.
+  for ac_exec_ext in '' $ac_executable_extensions; do
+  if $as_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
+    ac_cv_path_MSPDB_PATH="$as_dir/$ac_word$ac_exec_ext"
+    echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
+    break 2
+  fi
+done
+done
+
+  ;;
+esac
+fi
+MSPDB_PATH=$ac_cv_path_MSPDB_PATH
+
+if test -n "$MSPDB_PATH"; then
+  echo "$as_me:$LINENO: result: $MSPDB_PATH" >&5
+echo "${ECHO_T}$MSPDB_PATH" >&6
+else
+  echo "$as_me:$LINENO: result: no" >&5
+echo "${ECHO_T}no" >&6
+fi
+
+		if test -n "$MSPDB_PATH";then
+			MSPDB_PATH=`dirname "$MSPDB_PATH"`
+		fi
+   		if test -e "$with_mspdb_path/mspdb70.dll"; then
+			MSPDB_PATH="$with_mspdb_path"
+		fi
+		if test -z "$MSPDB_PATH" -a -e "$with_cl_home/../Common7/IDE/mspdb70.dll"; then
+			MSPDB_PATH="$with_cl_home/../Common7/IDE"
+		fi
+		if test -z "$MSPDB_PATH"; then
+					# Extract the first word of "mspdb60.dll", so it can be a program name with args.
+set dummy mspdb60.dll; ac_word=$2
+echo "$as_me:$LINENO: checking for $ac_word" >&5
+echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6
+if test "${ac_cv_path_MSPDB_PATH+set}" = set; then
+  echo $ECHO_N "(cached) $ECHO_C" >&6
+else
+  case $MSPDB_PATH in
+  [\\/]* | ?:[\\/]*)
+  ac_cv_path_MSPDB_PATH="$MSPDB_PATH" # Let the user override the test with a path.
+  ;;
+  *)
+  as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
+for as_dir in $PATH
+do
+  IFS=$as_save_IFS
+  test -z "$as_dir" && as_dir=.
+  for ac_exec_ext in '' $ac_executable_extensions; do
+  if $as_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
+    ac_cv_path_MSPDB_PATH="$as_dir/$ac_word$ac_exec_ext"
+    echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
+    break 2
+  fi
+done
+done
+
+  ;;
+esac
+fi
+MSPDB_PATH=$ac_cv_path_MSPDB_PATH
+
+if test -n "$MSPDB_PATH"; then
+  echo "$as_me:$LINENO: result: $MSPDB_PATH" >&5
+echo "${ECHO_T}$MSPDB_PATH" >&6
+else
+  echo "$as_me:$LINENO: result: no" >&5
+echo "${ECHO_T}no" >&6
+fi
+
+			if test -n "$MSPDB_PATH";then
+				MSPDB_PATH=`dirname "$MSPDB_PATH"`
+			fi
+   			if test -e "$with_mspdb_path/mspdb60.dll"; then
+				MSPDB_PATH="$with_mspdb_path"
+            fi
+			if test -z "$MSPDB_PATH" -a -e "$with_cl_home/../Common/msdev98/mspdb60.dll"; then
+				MSPDB_PATH="$with_cl_home/../Common/msdev98"
+			fi
+		fi
+		if test -z "$MSPDB_PATH"; then
+			{ { echo "$as_me:$LINENO: error: You need a mspdb?0.dll, make sure it's in the path or use --with-mspdb-path" >&5
+echo "$as_me: error: You need a mspdb?0.dll, make sure it's in the path or use --with-mspdb-path" >&2;}
+   { (exit 1); exit 1; }; }
+		fi
+		MSPDB_PATH=`cygpath -d "$MSPDB_PATH"`
+		MSPDB_PATH=`cygpath -u "$MSPDB_PATH"`
+		PATH="$MSPDB_PATH:$PATH"
    		if test -x "$with_cl_home/bin/cl.exe"; then
    			CC="$with_cl_home/bin/cl.exe"
    		else
@@ -3182,6 +3388,123 @@ echo "$as_me: error: Mingwin32 C++ Compiler not found." >&2;}
 fi
 
 
+
+if test "$COMEX" = "8"; then
+		# Extract the first word of "midl.exe", so it can be a program name with args.
+set dummy midl.exe; ac_word=$2
+echo "$as_me:$LINENO: checking for $ac_word" >&5
+echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6
+if test "${ac_cv_path_MIDL_PATH+set}" = set; then
+  echo $ECHO_N "(cached) $ECHO_C" >&6
+else
+  case $MIDL_PATH in
+  [\\/]* | ?:[\\/]*)
+  ac_cv_path_MIDL_PATH="$MIDL_PATH" # Let the user override the test with a path.
+  ;;
+  *)
+  as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
+for as_dir in $PATH
+do
+  IFS=$as_save_IFS
+  test -z "$as_dir" && as_dir=.
+  for ac_exec_ext in '' $ac_executable_extensions; do
+  if $as_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
+    ac_cv_path_MIDL_PATH="$as_dir/$ac_word$ac_exec_ext"
+    echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
+    break 2
+  fi
+done
+done
+
+  ;;
+esac
+fi
+MIDL_PATH=$ac_cv_path_MIDL_PATH
+
+if test -n "$MIDL_PATH"; then
+  echo "$as_me:$LINENO: result: $MIDL_PATH" >&5
+echo "${ECHO_T}$MIDL_PATH" >&6
+else
+  echo "$as_me:$LINENO: result: no" >&5
+echo "${ECHO_T}no" >&6
+fi
+
+	if test -n "$MIDL_PATH";then
+		MIDL_PATH=`dirname $MIDL_PATH`
+	fi
+	if test -x "$with_midl_path/midl.exe"; then
+		MIDL_PATH="$with_midl_path"
+	fi
+	if test -z "$MIDL_PATH" -a -e "$with_cl_home/../Common7/Tools/Bin/midl.exe"; then
+		MIDL_PATH="$with_cl_home/../Common7/Tools/Bin"
+	fi
+	if test ! -x "$MIDL_PATH/midl.exe"; then
+		{ { echo "$as_me:$LINENO: error: midl.exe not found. Make sure it's in the path or use --with-midl-path" >&5
+echo "$as_me: error: midl.exe not found. Make sure it's in the path or use --with-midl-path" >&2;}
+   { (exit 1); exit 1; }; }
+	fi
+	# Convert to posix path with 8.3 filename restrictions ( No spaces )
+	MIDL_PATH=`cygpath -d "$MIDL_PATH"`
+	MIDL_PATH=`cygpath -u "$MIDL_PATH"`
+
+		# Extract the first word of "wdevenv.exe", so it can be a program name with args.
+set dummy wdevenv.exe; ac_word=$2
+echo "$as_me:$LINENO: checking for $ac_word" >&5
+echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6
+if test "${ac_cv_path_WDEVENV_PATH+set}" = set; then
+  echo $ECHO_N "(cached) $ECHO_C" >&6
+else
+  case $WDEVENV_PATH in
+  [\\/]* | ?:[\\/]*)
+  ac_cv_path_WDEVENV_PATH="$WDEVENV_PATH" # Let the user override the test with a path.
+  ;;
+  *)
+  as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
+for as_dir in $PATH
+do
+  IFS=$as_save_IFS
+  test -z "$as_dir" && as_dir=.
+  for ac_exec_ext in '' $ac_executable_extensions; do
+  if $as_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
+    ac_cv_path_WDEVENV_PATH="$as_dir/$ac_word$ac_exec_ext"
+    echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
+    break 2
+  fi
+done
+done
+
+  ;;
+esac
+fi
+WDEVENV_PATH=$ac_cv_path_WDEVENV_PATH
+
+if test -n "$WDEVENV_PATH"; then
+  echo "$as_me:$LINENO: result: $WDEVENV_PATH" >&5
+echo "${ECHO_T}$WDEVENV_PATH" >&6
+else
+  echo "$as_me:$LINENO: result: no" >&5
+echo "${ECHO_T}no" >&6
+fi
+
+	if test -n "$WDEVENV_PATH"; then
+		WDEVENV_PATH=`dirname $WDEVENV_PATH`
+	fi
+	if test -x "$with_wdevenv_path/wdevenv.exe"; then
+		WDEVENV_PATH="$with_wdevenv_path"
+	fi
+	if test ! -x "$WDEVENV_PATH/wdevenv.exe"; then
+		{ { echo "$as_me:$LINENO: error: wdevenv.exe not found. Make sure it's in the path or use --with-wdevenv-path" >&5
+echo "$as_me: error: wdevenv.exe not found. Make sure it's in the path or use --with-wdevenv-path" >&2;}
+   { (exit 1); exit 1; }; }
+	fi
+	# Convert to posix path with 8.3 filename restrictions ( No spaces )
+	WDEVENV_PATH=`cygpath -d "$WDEVENV_PATH"`
+	WDEVENV_PATH=`cygpath -u "$WDEVENV_PATH"`
+fi
+
+
+
+
 ac_ext=c
 ac_cpp='$CPP $CPPFLAGS'
 ac_compile='$CC -c $CFLAGS $CPPFLAGS conftest.$ac_ext >&5'
@@ -3845,7 +4168,8 @@ else
   fi
 fi
 for ac_declaration in \
-   '' \
+   ''\
+   '#include <stdlib.h>' \
    'extern "C" void std::exit (int) throw (); using std::exit;' \
    'extern "C" void std::exit (int); using std::exit;' \
    'extern "C" void exit (int) throw ();' \
@@ -3859,8 +4183,8 @@ _ACEOF
 cat confdefs.h >>conftest.$ac_ext
 cat >>conftest.$ac_ext <<_ACEOF
 /* end confdefs.h.  */
-$ac_declaration
 #include <stdlib.h>
+$ac_declaration
 int
 main ()
 {
@@ -3952,12 +4276,17 @@ if test "$GXX" = "yes"; then
 fi
 else
 if test "$GXX" = "yes"; then
-   _gxx_include_path=`echo "#include <cstring>" | $CXX -E -xc++ - | $SED -n '/.*1*"\(.*\)\/cstring".*/s//\1/p' | head -1`
+   _gxx_include_path=`echo "#include <cstring>" | $CXX -E -xc++ - | $SED -n '/.*1*"\(.*\)\/cstring".*/s//\1/p' | head -n 1`
    if test "$_gxx_include_path" = "/usr/libexec/(null)/include"; then
        _gxx_include_path="/usr/include"
    fi
 fi
 fi
+if test -z "$_gxx_include_path"; then
+   _gxx_include_path="NO_GXX_INCLUDE"
+fi
+GXX_INCLUDE_PATH="$_gxx_include_path"
+
 
 if test "$_os" = "SunOS"; then
       if test "$CC" = "cc"; then
@@ -4082,6 +4411,8 @@ ac_compile='$CC -c $CFLAGS $CPPFLAGS conftest.$ac_ext >&5'
 ac_link='$CC -o conftest$ac_exeext $CFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5'
 ac_compiler_gnu=$ac_cv_c_compiler_gnu
 
+EXCEPTIONS="$exceptions_type"
+
 
 if test "$_os" = "SunOS"; then
    _temp=`showrev -p | $AWK -F" " '{ print $2 }'`
@@ -4467,15 +4798,15 @@ echo "${ECHO_T}yes." >&6
 echo "${ECHO_T}not found." >&6
 		fi
 	else
-		{ { echo "$as_me:$LINENO: error: IRIX not found." >&5
-echo "$as_me: error: IRIX not found." >&2;}
+		{ { echo "$as_me:$LINENO: error: Option --enable-sgistl is only valid for IRIX" >&5
+echo "$as_me: error: Option --enable-sgistl is only valid for IRIX" >&2;}
    { (exit 1); exit 1; }; }
 	fi
 else
 
-echo "$as_me:$LINENO: checking for STLport4 headers" >&5
+  echo "$as_me:$LINENO: checking for STLport4 headers" >&5
 echo $ECHO_N "checking for STLport4 headers... $ECHO_C" >&6
-if test -d "$with_stlport4_home"; then
+  if test -d "$with_stlport4_home"; then
 	STLPORT4=$with_stlport4_home
         if test "$_os" != "WINNT" -o "$WITH_MINGWIN" = "yes"; then
            cat >conftest.$ac_ext <<_ACEOF
@@ -4571,18 +4902,75 @@ echo "$as_me: error: STLport4 libraries not found" >&2;}
 			fi
 		fi
 	fi
-else
+  else
 	echo "$as_me:$LINENO: result: using internal stlport." >&5
 echo "${ECHO_T}using internal stlport." >&6
+  fi
 fi
 
+if test -z "$STLPORT4"; then
+   STLPORT4="NO_STLPORT4"
 fi
+
+
+echo "$as_me:$LINENO: checking whether to build with Java support" >&5
+echo $ECHO_N "checking whether to build with Java support... $ECHO_C" >&6
+if test "$enable_java" != "no"; then
+   echo "$as_me:$LINENO: result: yes" >&5
+echo "${ECHO_T}yes" >&6
+   SOLAR_JAVA="TRUE"
+else
+   echo "$as_me:$LINENO: result: no" >&5
+echo "${ECHO_T}no" >&6
+   SOLAR_JAVA=""
+fi
+
+
 JAVA_HOME=; export JAVA_HOME
 if test -z "$with_jdk_home"; then
    # Extract the first word of "javac", so it can be a program name with args.
 set dummy javac; ac_word=$2
 echo "$as_me:$LINENO: checking for $ac_word" >&5
 echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6
+if test "${ac_cv_path_JAVAC+set}" = set; then
+  echo $ECHO_N "(cached) $ECHO_C" >&6
+else
+  case $JAVAC in
+  [\\/]* | ?:[\\/]*)
+  ac_cv_path_JAVAC="$JAVAC" # Let the user override the test with a path.
+  ;;
+  *)
+  as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
+for as_dir in $PATH
+do
+  IFS=$as_save_IFS
+  test -z "$as_dir" && as_dir=.
+  for ac_exec_ext in '' $ac_executable_extensions; do
+  if $as_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
+    ac_cv_path_JAVAC="$as_dir/$ac_word$ac_exec_ext"
+    echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
+    break 2
+  fi
+done
+done
+
+  ;;
+esac
+fi
+JAVAC=$ac_cv_path_JAVAC
+
+if test -n "$JAVAC"; then
+  echo "$as_me:$LINENO: result: $JAVAC" >&5
+echo "${ECHO_T}$JAVAC" >&6
+else
+  echo "$as_me:$LINENO: result: no" >&5
+echo "${ECHO_T}no" >&6
+fi
+
+   # Extract the first word of "java", so it can be a program name with args.
+set dummy java; ac_word=$2
+echo "$as_me:$LINENO: checking for $ac_word" >&5
+echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6
 if test "${ac_cv_path_JAVA+set}" = set; then
   echo $ECHO_N "(cached) $ECHO_C" >&6
 else
@@ -4619,7 +5007,16 @@ echo "${ECHO_T}no" >&6
 fi
 
 else
-   _java_path="$with_jdk_home/bin/javac"
+   _javac_path="$with_jdk_home/bin/javac"
+      if test -x "$_javac_path"; then
+      JAVAC=$_javac_path
+	else
+		{ { echo "$as_me:$LINENO: error: $_javac_path not found set with_jdk_home" >&5
+echo "$as_me: error: $_javac_path not found set with_jdk_home" >&2;}
+   { (exit 1); exit 1; }; }
+   fi
+
+   _java_path="$with_jdk_home/bin/java"
       if test -x "$_java_path"; then
       JAVA=$_java_path
 	else
@@ -4631,24 +5028,51 @@ fi
 echo "$as_me:$LINENO: checking the installed JDK" >&5
 echo $ECHO_N "checking the installed JDK... $ECHO_C" >&6
 if test "$JAVA"; then
-      _jdk=`$JAVA -J-version 2>&1 | $AWK -F'"' '{ print \$2 }' | $SED s/[-A-Za-z]*//`
 
-   _jdk_ver=`echo "$_jdk" | $AWK -F. '{ print (($1 * 100) + $2) * 100 + $3;}'`
+      if test `$JAVA -version 2>&1 | grep -c "Kaffe"` -gt 0; then
 
-   if test "$_jdk_ver" -lt 10300; then
-        { { echo "$as_me:$LINENO: error: You need at least jdk-1.3" >&5
-echo "$as_me: error: You need at least jdk-1.3" >&2;}
+          KAFFE_VER=`$JAVA -version 2>&1 | $EGREP "  Version:" | $SED -r "s/.*  Version: ([0-9\.]*).*/\1/"`
+     if test -z "$KAFFE_VER"; then
+       { { echo "$as_me:$LINENO: error: looks like Kaffe but version detection failed" >&5
+echo "$as_me: error: looks like Kaffe but version detection failed" >&2;}
+   { (exit 1); exit 1; }; }
+     fi
+     _kaffe_ver=`echo "$KAFFE_VER" | $AWK -F. '{ print (($1 * 100) + $2) * 100 + $3;}'`
+     if test "$_kaffe_ver" -lt 10100; then
+        { { echo "$as_me:$LINENO: error: Kaffe is too old ($KAFFE_VER - $_kaffe_ver), you need at least 1.1.0" >&5
+echo "$as_me: error: Kaffe is too old ($KAFFE_VER - $_kaffe_ver), you need at least 1.1.0" >&2;}
    { (exit 1); exit 1; }; }
+     fi
+     JDK=kaffe
+
+
+     echo "$as_me:$LINENO: result: checked (Kaffe $KAFFE_VER)" >&5
+echo "${ECHO_T}checked (Kaffe $KAFFE_VER)" >&6
+     { echo "$as_me:$LINENO: WARNING: EXPERIMENTAL: Kaffe is not a full JDK replacement - some projects will fail to compile" >&5
+echo "$as_me: WARNING: EXPERIMENTAL: Kaffe is not a full JDK replacement - some projects will fail to compile" >&2;}
+     echo "EXPERIMENTAL: Kaffe is not a full JDK replacement - some projects will fail to compile" >>warn
    else
-      JAVA_HOME=`echo $JAVA | $SED -n "s,//*bin//*javac,,p"`
-      echo "$as_me:$LINENO: result: checked (JDK $_jdk)" >&5
+
+          _jdk=`$JAVAC -J-version 2>&1 | $AWK -F'"' '{ print \$2 }' | $SED s/[-A-Za-z]*//`
+     _jdk_ver=`echo "$_jdk" | $AWK -F. '{ print (($1 * 100) + $2) * 100 + $3;}'`
+
+     if test "$_jdk_ver" -lt 10300; then
+          { { echo "$as_me:$LINENO: error: JDK is too old, you need at least 1.3" >&5
+echo "$as_me: error: JDK is too old, you need at least 1.3" >&2;}
+   { (exit 1); exit 1; }; }
+     fi
+     echo "$as_me:$LINENO: result: checked (JDK $_jdk)" >&5
 echo "${ECHO_T}checked (JDK $_jdk)" >&6
    fi
+   JAVA_HOME=`echo $JAVAC | $SED -n "s,//*bin//*javac,,p"`
 else
    { { echo "$as_me:$LINENO: error: JAVA not found. You need at least jdk-1.3" >&5
 echo "$as_me: error: JAVA not found. You need at least jdk-1.3" >&2;}
    { (exit 1); exit 1; }; }
 fi
+
+
+
 if test "$_os" = "Linux" -o "$_os" = "FreeBSD" -o "$_os" = "NetBSD" ; then
    ac_ext=c
 ac_cpp='$CPP $CPPFLAGS'
@@ -5168,8 +5592,6 @@ done
 echo "$as_me: error: install xmkmf to run this script, include openwin in path" >&2;}
    { (exit 1); exit 1; }; }
 		fi
-else
-	echo "Skipping xmkmf test $test_x"
 fi
 
 if test -z "$with_perl_home"; then
@@ -5241,6 +5663,7 @@ echo "$as_me: error: Perl not found, install version 5 of Perl" >&2;}
    { (exit 1); exit 1; }; }
 fi
 
+
 if test "$_os" != "WINNT" -o "$with_use_shell" != "4nt"; then
    # Extract the first word of "tcsh", so it can be a program name with args.
 set dummy tcsh; ac_word=$2
@@ -5293,7 +5716,11 @@ else
 echo "$as_me: WARNING: Windows 4NT builds don't need tcsh" >&2;}
    TCSH="NO_TCSH_NEEDED"
 fi
-if test  "$test_gtk" = "yes"; then
+
+
+if test -n "$ENABLE_CRASHDUMP" ; then
+
+  if test  "$test_gtk" = "yes"; then
     pkg_modules="gtk+-2.0 >= 1.3.13"
 
   succeeded=no
@@ -5393,6 +5820,7 @@ echo "$as_me: error: Library requirements ($pkg_modules ) not met; consider adju
    { (exit 1); exit 1; }; }
   fi
 
+  fi
 fi
 
 
@@ -6695,6 +7123,17 @@ else
    x_includes="no_x_includes"
    x_libraries="no_x_libraries"
 fi
+if test -z "$x_includes"; then
+   x_includes="no_x_includes"
+fi
+if test -z "$x_libraries"; then
+   x_libraries="no_x_libraries"
+fi
+XINC="$x_includes"
+
+XLIB="$x_libraries"
+
+
 if test "$_os" = "Linux"; then
    echo "$as_me:$LINENO: checking for gnu_get_libc_version in -lc" >&5
 echo $ECHO_N "checking for gnu_get_libc_version in -lc... $ECHO_C" >&6
@@ -6796,6 +7235,8 @@ echo "$as_me: error: PSDK files not found, please use --with-psdk-home ." >&2;}
    { (exit 1); exit 1; }; }
 	fi
 fi
+
+
 # Extract the first word of "bison", so it can be a program name with args.
 set dummy bison; ac_word=$2
 echo "$as_me:$LINENO: checking for $ac_word" >&5
@@ -6956,6 +7397,8 @@ echo "$as_me: error: --with-gnu-cp did not point to an executable" >&2;}
   fi
 fi
 
+
+
 if test "$_os" = "WINNT"; then
 	# Extract the first word of "bash", so it can be a program name with args.
 set dummy bash; ac_word=$2
@@ -6998,6 +7441,11 @@ fi
 
 	CYGWIN=`dirname $CYGWIN`
 fi
+if test -z "$CYGWIN"; then
+   CYGWIN="NO_CYGWIN"
+fi
+
+
 if test "$_os" = "WINNT" -a "$WITH_MINGWIN" != "yes"; then
   if test ! -x "$with_asm_home/ml.exe"; then
     # Extract the first word of "ml.exe", so it can be a program name with args.
@@ -7050,20 +7498,28 @@ echo "$as_me: error: Configure did not find ml.exe assembler." >&2;}
 else
 	with_asm_home="NO_ASM_HOME"
 fi
-if test "$_os" = "WINNT"; then
-# We are looking for zip, not unzip. All occurences should
-# change from UNZIP to ZIP
-if test ! -x "$with_unzip_home/zip.exe"; then
-   # Extract the first word of "zip.exe", so it can be a program name with args.
-set dummy zip.exe; ac_word=$2
+ASM_HOME="$with_asm_home"
+
+
+if test -z "$with_zip_home"; then
+	with_zip_home="$with_unzip_home"
+fi
+if test -n "$with_zip_home" ; then
+	ZIP="$with_zip_home/zip"
+    ZIP_HOME="$with_zip_home"
+else
+	ZIP_HOME="ZIP_IN_PATH"
+fi
+# Extract the first word of "zip", so it can be a program name with args.
+set dummy zip; ac_word=$2
 echo "$as_me:$LINENO: checking for $ac_word" >&5
 echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6
-if test "${ac_cv_path_ZIP_EXE+set}" = set; then
+if test "${ac_cv_path_ZIP+set}" = set; then
   echo $ECHO_N "(cached) $ECHO_C" >&6
 else
-  case $ZIP_EXE in
+  case $ZIP in
   [\\/]* | ?:[\\/]*)
-  ac_cv_path_ZIP_EXE="$ZIP_EXE" # Let the user override the test with a path.
+  ac_cv_path_ZIP="$ZIP" # Let the user override the test with a path.
   ;;
   *)
   as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
@@ -7073,7 +7529,7 @@ do
   test -z "$as_dir" && as_dir=.
   for ac_exec_ext in '' $ac_executable_extensions; do
   if $as_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
-    ac_cv_path_ZIP_EXE="$as_dir/$ac_word$ac_exec_ext"
+    ac_cv_path_ZIP="$as_dir/$ac_word$ac_exec_ext"
     echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
     break 2
   fi
@@ -7083,39 +7539,102 @@ done
   ;;
 esac
 fi
-ZIP_EXE=$ac_cv_path_ZIP_EXE
+ZIP=$ac_cv_path_ZIP
 
-if test -n "$ZIP_EXE"; then
-  echo "$as_me:$LINENO: result: $ZIP_EXE" >&5
-echo "${ECHO_T}$ZIP_EXE" >&6
+if test -n "$ZIP"; then
+  echo "$as_me:$LINENO: result: $ZIP" >&5
+echo "${ECHO_T}$ZIP" >&6
 else
   echo "$as_me:$LINENO: result: no" >&5
 echo "${ECHO_T}no" >&6
 fi
 
-   if test -z "$ZIP_EXE"; then
-      with_unzip_home="NO_UNZIP_HOME"
-   else
-      if test "$with_use_shell" = "4nt" ; then
-         if test -z "`$ZIP_EXE -h | grep -i WinNT`" ; then
-{ { echo "$as_me:$LINENO: error: $ZIP_EXE found in the path is not the required native Windows Version 2.3 of Info-ZIPs zip.exe.
+if test -z "$ZIP"; then
+    { { echo "$as_me:$LINENO: error: Zip is required to build, please install or use --with-zip-home" >&5
+echo "$as_me: error: Zip is required to build, please install or use --with-zip-home" >&2;}
+   { (exit 1); exit 1; }; }
+fi
+
+if test "$_os" = "WINNT"; then
+    if test "$with_use_shell" = "4nt" ; then
+         if test -z "`$ZIP -h | grep -i WinNT`" ; then
+{ { echo "$as_me:$LINENO: error: $ZIP found in the path is not the required native Windows Version 2.3 of Info-ZIPs zip.exe.
 Probably there is a cygwin version in the path." >&5
-echo "$as_me: error: $ZIP_EXE found in the path is not the required native Windows Version 2.3 of Info-ZIPs zip.exe.
+echo "$as_me: error: $ZIP found in the path is not the required native Windows Version 2.3 of Info-ZIPs zip.exe.
 Probably there is a cygwin version in the path." >&2;}
    { (exit 1); exit 1; }; }
          fi
-      else
-         if test -n "`$ZIP_EXE -h | grep -i WinNT`" ; then
-{ { echo "$as_me:$LINENO: error: $ZIP_EXE found in the path is not the required cygwin version of Info-ZIPs zip.exe." >&5
-echo "$as_me: error: $ZIP_EXE found in the path is not the required cygwin version of Info-ZIPs zip.exe." >&2;}
+    else
+         if test -n "`$ZIP -h | grep -i WinNT`" ; then
+{ { echo "$as_me:$LINENO: error: $ZIP found in the path is not the required cygwin version of Info-ZIPs zip.exe." >&5
+echo "$as_me: error: $ZIP found in the path is not the required cygwin version of Info-ZIPs zip.exe." >&2;}
    { (exit 1); exit 1; }; }
          fi
-      fi
-      with_unzip_home="UNZIP_IN_PATH"
+    fi
+fi
+
+
+if test "$_os" = "WINNT"; then
+   echo "$as_me:$LINENO: checking unicows.dll" >&5
+echo $ECHO_N "checking unicows.dll... $ECHO_C" >&6
+   if test -f ../external/unicows/unicows.dll; then
+      echo "$as_me:$LINENO: result: found" >&5
+echo "${ECHO_T}found" >&6
+   else
+      { { echo "$as_me:$LINENO: error: The Microsoft Layer for Unicode (unicows.dll) is missing in external/unicows/.
+Get it from the Microsoft site and put it into external/unicows.
+(Note: Microsoft seems to enjoy changing the exact location of this file. You
+may have to search Microsoft's website.) Last time it was seen at:
+<http://download.microsoft.com/download/b/7/5/b75eace3-00e2-4aa0-9a6f-0b6882c71642/unicows.exe>." >&5
+echo "$as_me: error: The Microsoft Layer for Unicode (unicows.dll) is missing in external/unicows/.
+Get it from the Microsoft site and put it into external/unicows.
+(Note: Microsoft seems to enjoy changing the exact location of this file. You
+may have to search Microsoft's website.) Last time it was seen at:
+<http://download.microsoft.com/download/b/7/5/b75eace3-00e2-4aa0-9a6f-0b6882c71642/unicows.exe>." >&2;}
+   { (exit 1); exit 1; }; }
    fi
 fi
-else
-        with_unzip_home="NO_UNZIP_HOME"
+
+if test "$_os" = "WINNT"; then
+   echo "$as_me:$LINENO: checking dbghelp.dll" >&5
+echo $ECHO_N "checking dbghelp.dll... $ECHO_C" >&6
+   if test -f ../external/dbghelp/dbghelp.dll; then
+      echo "$as_me:$LINENO: result: found" >&5
+echo "${ECHO_T}found" >&6
+   else
+      { { echo "$as_me:$LINENO: error: The dbghelp.dll is missing in external/dbghelp/.
+Get it from the Microsoft site and put it into external/dbghelp.
+(Note: Microsoft seems to enjoy changing the exact location of this file. You
+may have to search Microsoft's website.) Last time it was seen at:
+<http://www.microsoft.com/downloads/release.asp?releaseid=30682>." >&5
+echo "$as_me: error: The dbghelp.dll is missing in external/dbghelp/.
+Get it from the Microsoft site and put it into external/dbghelp.
+(Note: Microsoft seems to enjoy changing the exact location of this file. You
+may have to search Microsoft's website.) Last time it was seen at:
+<http://www.microsoft.com/downloads/release.asp?releaseid=30682>." >&2;}
+   { (exit 1); exit 1; }; }
+   fi
+fi
+
+if test "$_os" = "WINNT" -a "$COMEX" = "8"; then
+   echo "$as_me:$LINENO: checking msvcp70.dll" >&5
+echo $ECHO_N "checking msvcp70.dll... $ECHO_C" >&6
+   if test -f ../external/msvcp70/msvcp70.dll; then
+      echo "$as_me:$LINENO: result: found" >&5
+echo "${ECHO_T}found" >&6
+   else
+      { { echo "$as_me:$LINENO: error: The msvcp70.dll is missing in external/msvcp70/.
+The dll is part of the .NET installation and can be found in a directory
+similar to:
+\"c:\\Program Files\\Microsoft Visual Studio .NET\\Visual C++ .NET Professional - English\\\"
+Please copy the file to external/msvcp70." >&5
+echo "$as_me: error: The msvcp70.dll is missing in external/msvcp70/.
+The dll is part of the .NET installation and can be found in a directory
+similar to:
+\"c:\\Program Files\\Microsoft Visual Studio .NET\\Visual C++ .NET Professional - English\\\"
+Please copy the file to external/msvcp70." >&2;}
+   { (exit 1); exit 1; }; }
+   fi
 fi
 
 
@@ -7221,8 +7740,6 @@ echo "$as_me: error: Library requirements (libart-2.0 >= 2.3.13 ) not met; consi
    { (exit 1); exit 1; }; }
   fi
 
-
-
   WITH_LIBART=YES
 
 elif test "$with_gpc" != "no" ; then
@@ -7246,14 +7763,127 @@ echo $ECHO_N "checking GPC files... $ECHO_C" >&6
 echo "${ECHO_T}GPC files found" >&6
   else
 	{ { echo "$as_me:$LINENO: error: GPC files not found
-ftp://ftp.cs.man.ac.uk/pub/toby/gpc/gpc231.tar.Z and untar in external/gpc" >&5
+ftp://ftp.cs.man.ac.uk/pub/toby/gpc/gpc231.tar.Z and untar in external/gpc,
+or install libart and use --enable-libart" >&5
 echo "$as_me: error: GPC files not found
-ftp://ftp.cs.man.ac.uk/pub/toby/gpc/gpc231.tar.Z and untar in external/gpc" >&2;}
+ftp://ftp.cs.man.ac.uk/pub/toby/gpc/gpc231.tar.Z and untar in external/gpc,
+or install libart and use --enable-libart" >&2;}
    { (exit 1); exit 1; }; }
   fi
 fi
 
 
+
+
+
+
+WITH_LIBSN=NO
+if test -n "$enable_libsn"; then
+
+  succeeded=no
+
+  if test -z "$PKG_CONFIG"; then
+    # Extract the first word of "pkg-config", so it can be a program name with args.
+set dummy pkg-config; ac_word=$2
+echo "$as_me:$LINENO: checking for $ac_word" >&5
+echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6
+if test "${ac_cv_path_PKG_CONFIG+set}" = set; then
+  echo $ECHO_N "(cached) $ECHO_C" >&6
+else
+  case $PKG_CONFIG in
+  [\\/]* | ?:[\\/]*)
+  ac_cv_path_PKG_CONFIG="$PKG_CONFIG" # Let the user override the test with a path.
+  ;;
+  *)
+  as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
+for as_dir in $PATH
+do
+  IFS=$as_save_IFS
+  test -z "$as_dir" && as_dir=.
+  for ac_exec_ext in '' $ac_executable_extensions; do
+  if $as_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
+    ac_cv_path_PKG_CONFIG="$as_dir/$ac_word$ac_exec_ext"
+    echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
+    break 2
+  fi
+done
+done
+
+  test -z "$ac_cv_path_PKG_CONFIG" && ac_cv_path_PKG_CONFIG="no"
+  ;;
+esac
+fi
+PKG_CONFIG=$ac_cv_path_PKG_CONFIG
+
+if test -n "$PKG_CONFIG"; then
+  echo "$as_me:$LINENO: result: $PKG_CONFIG" >&5
+echo "${ECHO_T}$PKG_CONFIG" >&6
+else
+  echo "$as_me:$LINENO: result: no" >&5
+echo "${ECHO_T}no" >&6
+fi
+
+  fi
+
+  if test "$PKG_CONFIG" = "no" ; then
+     echo "*** The pkg-config script could not be found. Make sure it is"
+     echo "*** in your path, or set the PKG_CONFIG environment variable"
+     echo "*** to the full path to pkg-config."
+     echo "*** Or see http://www.freedesktop.org/software/pkgconfig to get pkg-config."
+  else
+     PKG_CONFIG_MIN_VERSION=0.9.0
+     if $PKG_CONFIG --atleast-pkgconfig-version $PKG_CONFIG_MIN_VERSION; then
+        echo "$as_me:$LINENO: checking for libstartup-notification-1.0 >= 0.5 " >&5
+echo $ECHO_N "checking for libstartup-notification-1.0 >= 0.5 ... $ECHO_C" >&6
+
+        if $PKG_CONFIG --exists "libstartup-notification-1.0 >= 0.5 " ; then
+            echo "$as_me:$LINENO: result: yes" >&5
+echo "${ECHO_T}yes" >&6
+            succeeded=yes
+
+            echo "$as_me:$LINENO: checking LIBSN_CFLAGS" >&5
+echo $ECHO_N "checking LIBSN_CFLAGS... $ECHO_C" >&6
+            LIBSN_CFLAGS=`$PKG_CONFIG --cflags "libstartup-notification-1.0 >= 0.5 "`
+            echo "$as_me:$LINENO: result: $LIBSN_CFLAGS" >&5
+echo "${ECHO_T}$LIBSN_CFLAGS" >&6
+
+            echo "$as_me:$LINENO: checking LIBSN_LIBS" >&5
+echo $ECHO_N "checking LIBSN_LIBS... $ECHO_C" >&6
+            LIBSN_LIBS=`$PKG_CONFIG --libs "libstartup-notification-1.0 >= 0.5 "`
+            echo "$as_me:$LINENO: result: $LIBSN_LIBS" >&5
+echo "${ECHO_T}$LIBSN_LIBS" >&6
+        else
+            LIBSN_CFLAGS=""
+            LIBSN_LIBS=""
+            ## If we have a custom action on failure, don't print errors, but
+            ## do set a variable so people can do so.
+            LIBSN_PKG_ERRORS=`$PKG_CONFIG --errors-to-stdout --print-errors "libstartup-notification-1.0 >= 0.5 "`
+            echo $LIBSN_PKG_ERRORS
+        fi
+
+
+
+     else
+        echo "*** Your version of pkg-config is too old. You need version $PKG_CONFIG_MIN_VERSION or newer."
+        echo "*** See http://www.freedesktop.org/software/pkgconfig"
+     fi
+  fi
+
+  if test $succeeded = yes; then
+     :
+  else
+     { { echo "$as_me:$LINENO: error: Library requirements (libstartup-notification-1.0 >= 0.5 ) not met; consider adjusting the PKG_CONFIG_PATH environment variable if your libraries are in a nonstandard prefix so pkg-config can find them." >&5
+echo "$as_me: error: Library requirements (libstartup-notification-1.0 >= 0.5 ) not met; consider adjusting the PKG_CONFIG_PATH environment variable if your libraries are in a nonstandard prefix so pkg-config can find them." >&2;}
+   { (exit 1); exit 1; }; }
+  fi
+
+  WITH_LIBSN=YES
+fi
+
+
+
+
+
 ANT_HOME=; export ANT_HOME
 if test -z "$with_ant_home"; then
    for ac_prog in jakarta-ant ant ant.sh ant.bat
@@ -7393,6 +8023,10 @@ echo "$as_me: WARNING: Ant does not work - Some Java projects will not build!" >
 
   rm -f conftest* core core.* *.core
 fi
+if test -z "$ANT_HOME"; then
+   ANT_HOME="NO_ANT_HOME"
+fi
+
 
 
 echo "********************************************************************"
@@ -7402,72 +8036,43 @@ echo "*                                                                  *"
 echo "********************************************************************"
 
 # Get UPD number from ../solenv/inc/minor.mk
-upd=`grep RSCVERSION= ../solenv/inc/minor.mk | $AWK -F"=" '{ print $2 }'`
+UPD="`grep RSCVERSION= ../solenv/inc/minor.mk | $AWK -F"=" '{ print $2 }'`"
+
 
 if test -z "$COMPATH"; then
    { { echo "$as_me:$LINENO: error: No compiler found." >&5
 echo "$as_me: error: No compiler found." >&2;}
    { (exit 1); exit 1; }; }
 fi
-if test -z "$_gxx_include_path"; then
-   _gxx_include_path="NO_GXX_INCLUDE"
-fi
-if test -z "$JAVA_HOME"; then
-   { { echo "$as_me:$LINENO: error: No java found." >&5
-echo "$as_me: error: No java found." >&2;}
-   { (exit 1); exit 1; }; }
-fi
-if test -z "$ANT_HOME"; then
-   ANT_HOME="NO_ANT_HOME"
-fi
-if test -z "$TCSH"; then
-   { { echo "$as_me:$LINENO: error: No tcsh found." >&5
-echo "$as_me: error: No tcsh found." >&2;}
-   { (exit 1); exit 1; }; }
-fi
-if test -z "$STLPORT4"; then
-   STLPORT4="NO_STLPORT4"
-fi
-if test -z "$PERL"; then
-   { { echo "$as_me:$LINENO: error: No perl found." >&5
-echo "$as_me: error: No perl found." >&2;}
-   { (exit 1); exit 1; }; }
-fi
-if test -z "$x_libraries"; then
-   x_libraries="no_x_libraries"
-fi
-if test -z "$x_includes"; then
-   x_includes="no_x_includes"
-fi
+
+
 if test -z "$with_local_solenv"; then
    LOCAL_SOLENV="DEFAULT"
 else
    LOCAL_SOLENV=$with_local_solenv
 fi
+
+
 if test -z "$with_local_solver"; then
    LOCAL_SOLVER="DEFAULT"
 else
    LOCAL_SOLVER=$with_local_solver
 fi
-if test -z "$CYGWIN"; then
-   CYGWIN="NO_CYGWIN"
-fi
+
+
 if test -z "$with_lang"; then
-   with_lang=,ENUS,
+   WITH_LANG=,ENUS,
 else
-   with_lang=","$with_lang","
+   WITH_LANG=","$with_lang","
 fi
+
+
 if test -z "$with_dict"; then
-   with_dict=,ALL,
+   WITH_DICT=,ALL,
 else
-   with_dict=","$with_dict","
+   WITH_DICT=","$with_dict","
 fi
 
-if test -n "$enable_debug"; then
-   ENABLE_DEBUG="TRUE"
-else
-   ENABLE_DEBUG="FALSE"
-fi
 
 if test -n "$enable_static_gtk"; then
    ENABLE_STATIC_GTK="TRUE"
@@ -7477,55 +8082,13 @@ fi
 
 
 
-GXX_INCLUDE_PATH="$_gxx_include_path"
-
 GCC_HOME="$with_gcc_home"
 
 
 
-
-
-XLIB="$x_libraries"
-
-XINC="$x_includes"
-
-
-
-UPD="$upd"
-
-
-
-
-WITH_LANG="$with_lang"
-
-WITH_DICT="$with_dict"
-
-
-ASM_HOME="$with_asm_home"
-
-UNZIP_HOME="$with_unzip_home"
-
-
-USE_SHELL="$with_use_shell"
-
-EXCEPTIONS="$exceptions_type"
-
 OSVERSION="$with_os_version"
 
 
-
-
-
-
-
-
-
-
-
-
-
-
-
           ac_config_files="$ac_config_files set_soenv"
 cat >confcache <<\_ACEOF
 # This file is a shell script that caches the results of configure
@@ -8162,6 +8725,12 @@ s,@ECHO_T@,$ECHO_T,;t t
 s,@LIBS@,$LIBS,;t t
 s,@AWK@,$AWK,;t t
 s,@SED@,$SED,;t t
+s,@PTHREAD_CFLAGS@,$PTHREAD_CFLAGS,;t t
+s,@PTHREAD_LIBS@,$PTHREAD_LIBS,;t t
+s,@ENABLE_CRASHDUMP@,$ENABLE_CRASHDUMP,;t t
+s,@ENABLE_DEBUG@,$ENABLE_DEBUG,;t t
+s,@ENABLE_SYMBOLS@,$ENABLE_SYMBOLS,;t t
+s,@USE_SHELL@,$USE_SHELL,;t t
 s,@CC@,$CC,;t t
 s,@CFLAGS@,$CFLAGS,;t t
 s,@LDFLAGS@,$LDFLAGS,;t t
@@ -8170,14 +8739,27 @@ s,@ac_ct_CC@,$ac_ct_CC,;t t
 s,@EXEEXT@,$EXEEXT,;t t
 s,@OBJEXT@,$OBJEXT,;t t
 s,@COMPATH@,$COMPATH,;t t
+s,@USE_GCC3@,$USE_GCC3,;t t
+s,@GNUMAKE@,$GNUMAKE,;t t
 s,@_cc@,$_cc,;t t
+s,@MSPDB_PATH@,$MSPDB_PATH,;t t
+s,@COMEX@,$COMEX,;t t
+s,@MIDL_PATH@,$MIDL_PATH,;t t
+s,@WDEVENV_PATH@,$WDEVENV_PATH,;t t
 s,@CPP@,$CPP,;t t
 s,@EGREP@,$EGREP,;t t
 s,@CXX@,$CXX,;t t
 s,@CXXFLAGS@,$CXXFLAGS,;t t
 s,@ac_ct_CXX@,$ac_ct_CXX,;t t
+s,@GXX_INCLUDE_PATH@,$GXX_INCLUDE_PATH,;t t
+s,@EXCEPTIONS@,$EXCEPTIONS,;t t
 s,@CXXCPP@,$CXXCPP,;t t
+s,@STLPORT4@,$STLPORT4,;t t
+s,@SOLAR_JAVA@,$SOLAR_JAVA,;t t
+s,@JAVAC@,$JAVAC,;t t
 s,@JAVA@,$JAVA,;t t
+s,@JAVA_HOME@,$JAVA_HOME,;t t
+s,@JDK@,$JDK,;t t
 s,@XMKMF@,$XMKMF,;t t
 s,@PERL@,$PERL,;t t
 s,@TCSH@,$TCSH,;t t
@@ -8188,47 +8770,37 @@ s,@X_CFLAGS@,$X_CFLAGS,;t t
 s,@X_PRE_LIBS@,$X_PRE_LIBS,;t t
 s,@X_LIBS@,$X_LIBS,;t t
 s,@X_EXTRA_LIBS@,$X_EXTRA_LIBS,;t t
+s,@XINC@,$XINC,;t t
+s,@XLIB@,$XLIB,;t t
+s,@PSDK_HOME@,$PSDK_HOME,;t t
 s,@BISON@,$BISON,;t t
 s,@FLEX@,$FLEX,;t t
 s,@PATCH@,$PATCH,;t t
+s,@GNUPATCH@,$GNUPATCH,;t t
+s,@GNUCP@,$GNUCP,;t t
 s,@CYGWIN@,$CYGWIN,;t t
 s,@ML_EXE@,$ML_EXE,;t t
-s,@ZIP_EXE@,$ZIP_EXE,;t t
+s,@ASM_HOME@,$ASM_HOME,;t t
+s,@ZIP@,$ZIP,;t t
+s,@ZIP_HOME@,$ZIP_HOME,;t t
 s,@LIBART_CFLAGS@,$LIBART_CFLAGS,;t t
 s,@LIBART_LIBS@,$LIBART_LIBS,;t t
+s,@WITH_LIBART@,$WITH_LIBART,;t t
+s,@WITH_GPC@,$WITH_GPC,;t t
+s,@LIBSN_CFLAGS@,$LIBSN_CFLAGS,;t t
+s,@LIBSN_LIBS@,$LIBSN_LIBS,;t t
+s,@WITH_LIBSN@,$WITH_LIBSN,;t t
 s,@ANT@,$ANT,;t t
 s,@ANT_HOME@,$ANT_HOME,;t t
-s,@GXX_INCLUDE_PATH@,$GXX_INCLUDE_PATH,;t t
-s,@GCC_HOME@,$GCC_HOME,;t t
-s,@GNUMAKE@,$GNUMAKE,;t t
-s,@JAVA_HOME@,$JAVA_HOME,;t t
-s,@XLIB@,$XLIB,;t t
-s,@XINC@,$XINC,;t t
+s,@UPD@,$UPD,;t t
 s,@LOCAL_SOLENV@,$LOCAL_SOLENV,;t t
 s,@LOCAL_SOLVER@,$LOCAL_SOLVER,;t t
-s,@UPD@,$UPD,;t t
-s,@COMEX@,$COMEX,;t t
-s,@STLPORT4@,$STLPORT4,;t t
 s,@WITH_LANG@,$WITH_LANG,;t t
 s,@WITH_DICT@,$WITH_DICT,;t t
-s,@PSDK_HOME@,$PSDK_HOME,;t t
-s,@ASM_HOME@,$ASM_HOME,;t t
-s,@UNZIP_HOME@,$UNZIP_HOME,;t t
+s,@ENABLE_STATIC_GTK@,$ENABLE_STATIC_GTK,;t t
+s,@GCC_HOME@,$GCC_HOME,;t t
 s,@WITH_MINGWIN@,$WITH_MINGWIN,;t t
-s,@USE_SHELL@,$USE_SHELL,;t t
-s,@EXCEPTIONS@,$EXCEPTIONS,;t t
 s,@OSVERSION@,$OSVERSION,;t t
-s,@USE_GCC3@,$USE_GCC3,;t t
-s,@PTHREAD_CFLAGS@,$PTHREAD_CFLAGS,;t t
-s,@PTHREAD_LIBS@,$PTHREAD_LIBS,;t t
-s,@ENABLE_DEBUG@,$ENABLE_DEBUG,;t t
-s,@ENABLE_STATIC_GTK@,$ENABLE_STATIC_GTK,;t t
-s,@ENVCFLAGSCXX@,$ENVCFLAGSCXX,;t t
-s,@ENABLE_CRASHDUMP@,$ENABLE_CRASHDUMP,;t t
-s,@WITH_GPC@,$WITH_GPC,;t t
-s,@WITH_LIBART@,$WITH_LIBART,;t t
-s,@GNUPATCH@,$GNUPATCH,;t t
-s,@GNUCP@,$GNUCP,;t t
 s,@LIBOBJS@,$LIBOBJS,;t t
 s,@LTLIBOBJS@,$LTLIBOBJS,;t t
 CEOF