CWS gnumake: resync to m91; conflicts unresolved

131 files changed, 3523 insertions, 5414 deletions

diff --git a/configure b/configure
index 509ae814afa0..6d175d3439d9 100755
--- a/configure
+++ b/configure
@@ -1,12 +1,12 @@
 #! /bin/sh
 # From configure.in Revision: 1.290  .
 # Guess values for system-dependent variables and create Makefiles.
-# Generated by GNU Autoconf 2.67.
+# Generated by GNU Autoconf 2.65.
 #
 #
 # Copyright (C) 1992, 1993, 1994, 1995, 1996, 1998, 1999, 2000, 2001,
-# 2002, 2003, 2004, 2005, 2006, 2007, 2008, 2009, 2010 Free Software
-# Foundation, Inc.
+# 2002, 2003, 2004, 2005, 2006, 2007, 2008, 2009 Free Software Foundation,
+# Inc.
 #
 #
 # This configure script is free software; the Free Software Foundation
@@ -317,7 +317,7 @@ $as_echo X"$as_dir" |
       test -d "$as_dir" && break
     done
     test -z "$as_dirs" || eval "mkdir $as_dirs"
-  } || test -d "$as_dir" || as_fn_error $? "cannot create directory $as_dir"
+  } || test -d "$as_dir" || as_fn_error "cannot create directory $as_dir"
 
 
 } # as_fn_mkdir_p
@@ -357,19 +357,19 @@ else
 fi # as_fn_arith
 
 
-# as_fn_error STATUS ERROR [LINENO LOG_FD]
-# ----------------------------------------
+# as_fn_error ERROR [LINENO LOG_FD]
+# ---------------------------------
 # Output "`basename $0`: error: ERROR" to stderr. If LINENO and LOG_FD are
 # provided, also output the error to LOG_FD, referencing LINENO. Then exit the
-# script with STATUS, using 1 if that was 0.
+# script with status $?, using 1 if that was 0.
 as_fn_error ()
 {
-  as_status=$1; test $as_status -eq 0 && as_status=1
-  if test "$4"; then
-    as_lineno=${as_lineno-"$3"} as_lineno_stack=as_lineno_stack=$as_lineno_stack
-    $as_echo "$as_me:${as_lineno-$LINENO}: error: $2" >&$4
+  as_status=$?; test $as_status -eq 0 && as_status=1
+  if test "$3"; then
+    as_lineno=${as_lineno-"$2"} as_lineno_stack=as_lineno_stack=$as_lineno_stack
+    $as_echo "$as_me:${as_lineno-$LINENO}: error: $1" >&$3
   fi
-  $as_echo "$as_me: error: $2" >&2
+  $as_echo "$as_me: error: $1" >&2
   as_fn_exit $as_status
 } # as_fn_error
 
@@ -531,7 +531,7 @@ test -n "$DJDIR" || exec 7<&0 </dev/null
 exec 6>&1
 
 # Name of the host.
-# hostname on some systems (SVR3.2, old GNU/Linux) returns a bogus exit status,
+# hostname on some systems (SVR3.2, Linux) returns a bogus exit status,
 # so uname gets run too.
 ac_hostname=`(hostname || uname -n) 2>/dev/null | sed 1q`
 
@@ -661,6 +661,9 @@ BUILD_PIXMAN
 ENABLE_CAIRO
 CAIRO_LIBS
 CAIRO_CFLAGS
+ENABLE_GSTREAMER
+GSTREAMER_LIBS
+GSTREAMER_CFLAGS
 ENABLE_SYSTRAY_GTK
 ENABLE_DBUS
 ENABLE_GIO
@@ -698,6 +701,8 @@ PSDK_HOME
 SYSTEM_LIBC
 HAVE_READDIR_R
 HAVE_GETOPT
+SYSTEM_LIBTEXTCAT_DATA
+SYSTEM_LIBTEXTCAT
 SYSTEM_LPSOLVE
 SYSTEM_MYTHES
 MYTHES_LIBS
@@ -841,9 +846,10 @@ SYSTEM_STDLIBS
 BUILD_UNOWINREG
 MINGWSTRIP
 MINGWCXX
+BUILD_STAX
 GPERF
-RPM
 PKGFORMAT
+RPM
 BUILD_EPM
 PKGMK
 DPKG
@@ -903,7 +909,6 @@ PERL
 HAVE_LD_HASH_STYLE
 _cc
 GNUMAKE
-NO_HIDS
 ENABLE_PCH
 HAVE_LD_BSYMBOLIC_FUNCTIONS
 GCCVER
@@ -1019,7 +1024,6 @@ enable_lockdown
 enable_vba
 with_vba_package_format
 enable_pch
-enable_hids
 enable_mozilla
 with_fonts
 with_ppds
@@ -1044,6 +1048,7 @@ enable_dbgutil
 enable_crashdump
 enable_cl_standard
 enable_gtk
+enable_gstreamer
 enable_systray
 enable_cairo
 with_system_cairo
@@ -1139,6 +1144,8 @@ with_system_hunspell
 with_system_mythes
 with_system_altlinuxhyph
 with_system_lpsolve
+with_system_libtextcat
+with_external_libtextcat_data
 with_system_cppunit
 with_system_redland
 with_system_mozilla
@@ -1258,9 +1265,8 @@ do
   fi
 
   case $ac_option in
-  *=?*) ac_optarg=`expr "X$ac_option" : '[^=]*=\(.*\)'` ;;
-  *=)   ac_optarg= ;;
-  *)    ac_optarg=yes ;;
+  *=*)	ac_optarg=`expr "X$ac_option" : '[^=]*=\(.*\)'` ;;
+  *)	ac_optarg=yes ;;
   esac
 
   # Accept the important Cygnus configure options, so we can diagnose typos.
@@ -1305,7 +1311,7 @@ do
     ac_useropt=`expr "x$ac_option" : 'x-*disable-\(.*\)'`
     # Reject names that are not valid shell variable names.
     expr "x$ac_useropt" : ".*[^-+._$as_cr_alnum]" >/dev/null &&
-      as_fn_error $? "invalid feature name: $ac_useropt"
+      as_fn_error "invalid feature name: $ac_useropt"
     ac_useropt_orig=$ac_useropt
     ac_useropt=`$as_echo "$ac_useropt" | sed 's/[-+.]/_/g'`
     case $ac_user_opts in
@@ -1331,7 +1337,7 @@ do
     ac_useropt=`expr "x$ac_option" : 'x-*enable-\([^=]*\)'`
     # Reject names that are not valid shell variable names.
     expr "x$ac_useropt" : ".*[^-+._$as_cr_alnum]" >/dev/null &&
-      as_fn_error $? "invalid feature name: $ac_useropt"
+      as_fn_error "invalid feature name: $ac_useropt"
     ac_useropt_orig=$ac_useropt
     ac_useropt=`$as_echo "$ac_useropt" | sed 's/[-+.]/_/g'`
     case $ac_user_opts in
@@ -1535,7 +1541,7 @@ do
     ac_useropt=`expr "x$ac_option" : 'x-*with-\([^=]*\)'`
     # Reject names that are not valid shell variable names.
     expr "x$ac_useropt" : ".*[^-+._$as_cr_alnum]" >/dev/null &&
-      as_fn_error $? "invalid package name: $ac_useropt"
+      as_fn_error "invalid package name: $ac_useropt"
     ac_useropt_orig=$ac_useropt
     ac_useropt=`$as_echo "$ac_useropt" | sed 's/[-+.]/_/g'`
     case $ac_user_opts in
@@ -1551,7 +1557,7 @@ do
     ac_useropt=`expr "x$ac_option" : 'x-*without-\(.*\)'`
     # Reject names that are not valid shell variable names.
     expr "x$ac_useropt" : ".*[^-+._$as_cr_alnum]" >/dev/null &&
-      as_fn_error $? "invalid package name: $ac_useropt"
+      as_fn_error "invalid package name: $ac_useropt"
     ac_useropt_orig=$ac_useropt
     ac_useropt=`$as_echo "$ac_useropt" | sed 's/[-+.]/_/g'`
     case $ac_user_opts in
@@ -1581,8 +1587,8 @@ do
   | --x-librar=* | --x-libra=* | --x-libr=* | --x-lib=* | --x-li=* | --x-l=*)
     x_libraries=$ac_optarg ;;
 
-  -*) as_fn_error $? "unrecognized option: \`$ac_option'
-Try \`$0 --help' for more information"
+  -*) as_fn_error "unrecognized option: \`$ac_option'
+Try \`$0 --help' for more information."
     ;;
 
   *=*)
@@ -1590,7 +1596,7 @@ Try \`$0 --help' for more information"
     # Reject names that are not valid shell variable names.
     case $ac_envvar in #(
       '' | [0-9]* | *[!_$as_cr_alnum]* )
-      as_fn_error $? "invalid variable name: \`$ac_envvar'" ;;
+      as_fn_error "invalid variable name: \`$ac_envvar'" ;;
     esac
     eval $ac_envvar=\$ac_optarg
     export $ac_envvar ;;
@@ -1608,13 +1614,13 @@ done
 
 if test -n "$ac_prev"; then
   ac_option=--`echo $ac_prev | sed 's/_/-/g'`
-  as_fn_error $? "missing argument to $ac_option"
+  as_fn_error "missing argument to $ac_option"
 fi
 
 if test -n "$ac_unrecognized_opts"; then
   case $enable_option_checking in
     no) ;;
-    fatal) as_fn_error $? "unrecognized options: $ac_unrecognized_opts" ;;
+    fatal) as_fn_error "unrecognized options: $ac_unrecognized_opts" ;;
     *)     $as_echo "$as_me: WARNING: unrecognized options: $ac_unrecognized_opts" >&2 ;;
   esac
 fi
@@ -1637,7 +1643,7 @@ do
     [\\/$]* | ?:[\\/]* )  continue;;
     NONE | '' ) case $ac_var in *prefix ) continue;; esac;;
   esac
-  as_fn_error $? "expected an absolute directory name for --$ac_var: $ac_val"
+  as_fn_error "expected an absolute directory name for --$ac_var: $ac_val"
 done
 
 # There might be people who depend on the old broken behavior: `$host'
@@ -1651,8 +1657,8 @@ target=$target_alias
 if test "x$host_alias" != x; then
   if test "x$build_alias" = x; then
     cross_compiling=maybe
-    $as_echo "$as_me: WARNING: if you wanted to set the --build type, don't use --host.
-    If a cross compiler is detected then cross compile mode will be used" >&2
+    $as_echo "$as_me: WARNING: If you wanted to set the --build type, don't use --host.
+    If a cross compiler is detected then cross compile mode will be used." >&2
   elif test "x$build_alias" != "x$host_alias"; then
     cross_compiling=yes
   fi
@@ -1667,9 +1673,9 @@ test "$silent" = yes && exec 6>/dev/null
 ac_pwd=`pwd` && test -n "$ac_pwd" &&
 ac_ls_di=`ls -di .` &&
 ac_pwd_ls_di=`cd "$ac_pwd" && ls -di .` ||
-  as_fn_error $? "working directory cannot be determined"
+  as_fn_error "working directory cannot be determined"
 test "X$ac_ls_di" = "X$ac_pwd_ls_di" ||
-  as_fn_error $? "pwd does not report name of working directory"
+  as_fn_error "pwd does not report name of working directory"
 
 
 # Find the source files, if location was not specified.
@@ -1708,11 +1714,11 @@ else
 fi
 if test ! -r "$srcdir/$ac_unique_file"; then
   test "$ac_srcdir_defaulted" = yes && srcdir="$ac_confdir or .."
-  as_fn_error $? "cannot find sources ($ac_unique_file) in $srcdir"
+  as_fn_error "cannot find sources ($ac_unique_file) in $srcdir"
 fi
 ac_msg="sources are in $srcdir, but \`cd $srcdir' does not work"
 ac_abs_confdir=`(
-	cd "$srcdir" && test -r "./$ac_unique_file" || as_fn_error $? "$ac_msg"
+	cd "$srcdir" && test -r "./$ac_unique_file" || as_fn_error "$ac_msg"
 	pwd)`
 # When building in place, set srcdir=.
 if test "$ac_abs_confdir" = "$ac_pwd"; then
@@ -1752,7 +1758,7 @@ Configuration:
       --help=short        display options specific to this package
       --help=recursive    display the short help of all the included packages
   -V, --version           display version information and exit
-  -q, --quiet, --silent   do not print \`checking ...' messages
+  -q, --quiet, --silent   do not print \`checking...' messages
       --cache-file=FILE   cache test results in FILE [disabled]
   -C, --config-cache      alias for \`--cache-file=config.cache'
   -n, --no-create         do not create output files
@@ -1827,8 +1833,6 @@ Optional Features:
 
   --enable-pch            EXPERIMENTAL: Enables precompiled header support for C++.
 
-  --enable-hids            Enables generation of HelpId lists.
-
   --disable-mozilla       OO.o usually includes a strangely hacked up mozilla
                           binary for your platform, to build without this
                           version, use this option.
@@ -1900,6 +1904,9 @@ Optional Features:
   --disable-gtk           Determines whether to use Gtk+ vclplug on platforms
                           where Gtk+ is available.
 
+  --disable-gstreamer     Determines whether to use the GStreamer media
+                          backend on platforms where GStreamer is available.
+
   --disable-systray       Determines whether to build the systray quickstarter.
 
   --enable-cairo          Determines whether to use Cairo library on
@@ -2191,6 +2198,10 @@ Optional Packages:
 
   --with-system-lpsolve         Use lpsolve already on system
 
+  --with-system-libtextcat      Use libtextcat already on system
+
+  --with-system-libtextcat-data Use libtextcat data already on system
+
   --with-system-cppunit         Use cppunit already on system
 
   --with-system-redland   Use redland library already on system
@@ -2397,7 +2408,9 @@ Optional Packages:
                           Usage: --with-build-version="Built by Jim"
 
   --with-alloc            Define which allocator to build with
-			                 (choices are oo, system, tcmalloc)
+                          (choices are oo, system, tcmalloc, jemalloc)
+
+                          Note that on FreeBSD/NetBSD system==jemalloc
 
   --with-x                use the X Window System
 
@@ -2482,9 +2495,9 @@ test -n "$ac_init_help" && exit $ac_status
 if $ac_init_version; then
   cat <<\_ACEOF
 configure
-generated by GNU Autoconf 2.67
+generated by GNU Autoconf 2.65
 
-Copyright (C) 2010 Free Software Foundation, Inc.
+Copyright (C) 2009 Free Software Foundation, Inc.
 This configure script is free software; the Free Software Foundation
 gives unlimited permission to copy, distribute and modify it.
 _ACEOF
@@ -2600,7 +2613,7 @@ $as_echo "$ac_try_echo"; } >&5
     mv -f conftest.er1 conftest.err
   fi
   $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
-  test $ac_status = 0; } > conftest.i && {
+  test $ac_status = 0; } >/dev/null && {
 	 test -z "$ac_c_preproc_warn_flag$ac_c_werror_flag" ||
 	 test ! -s conftest.err
        }; then :
@@ -2717,7 +2730,7 @@ $as_echo "$ac_try_echo"; } >&5
     mv -f conftest.er1 conftest.err
   fi
   $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
-  test $ac_status = 0; } > conftest.i && {
+  test $ac_status = 0; } >/dev/null && {
 	 test -z "$ac_cxx_preproc_warn_flag$ac_cxx_werror_flag" ||
 	 test ! -s conftest.err
        }; then :
@@ -2920,7 +2933,7 @@ ac_fn_c_check_header_compile ()
   as_lineno=${as_lineno-"$1"} as_lineno_stack=as_lineno_stack=$as_lineno_stack
   { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $2" >&5
 $as_echo_n "checking for $2... " >&6; }
-if eval "test \"\${$3+set}\"" = set; then :
+if { as_var=$3; eval "test \"\${$as_var+set}\" = set"; }; then :
   $as_echo_n "(cached) " >&6
 else
   cat confdefs.h - <<_ACEOF >conftest.$ac_ext
@@ -2950,10 +2963,10 @@ $as_echo "$ac_res" >&6; }
 ac_fn_c_check_header_mongrel ()
 {
   as_lineno=${as_lineno-"$1"} as_lineno_stack=as_lineno_stack=$as_lineno_stack
-  if eval "test \"\${$3+set}\"" = set; then :
+  if { as_var=$3; eval "test \"\${$as_var+set}\" = set"; }; then :
   { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $2" >&5
 $as_echo_n "checking for $2... " >&6; }
-if eval "test \"\${$3+set}\"" = set; then :
+if { as_var=$3; eval "test \"\${$as_var+set}\" = set"; }; then :
   $as_echo_n "(cached) " >&6
 fi
 eval ac_res=\$$3
@@ -2989,7 +3002,7 @@ if ac_fn_c_try_cpp "$LINENO"; then :
 else
   ac_header_preproc=no
 fi
-rm -f conftest.err conftest.i conftest.$ac_ext
+rm -f conftest.err conftest.$ac_ext
 { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_header_preproc" >&5
 $as_echo "$ac_header_preproc" >&6; }
 
@@ -3016,7 +3029,7 @@ $as_echo "$as_me: WARNING: $2: proceeding with the compiler's result" >&2;}
 esac
   { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $2" >&5
 $as_echo_n "checking for $2... " >&6; }
-if eval "test \"\${$3+set}\"" = set; then :
+if { as_var=$3; eval "test \"\${$as_var+set}\" = set"; }; then :
   $as_echo_n "(cached) " >&6
 else
   eval "$3=\$ac_header_compiler"
@@ -3083,7 +3096,7 @@ ac_fn_c_check_func ()
   as_lineno=${as_lineno-"$1"} as_lineno_stack=as_lineno_stack=$as_lineno_stack
   { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $2" >&5
 $as_echo_n "checking for $2... " >&6; }
-if eval "test \"\${$3+set}\"" = set; then :
+if { as_var=$3; eval "test \"\${$as_var+set}\" = set"; }; then :
   $as_echo_n "(cached) " >&6
 else
   cat confdefs.h - <<_ACEOF >conftest.$ac_ext
@@ -3150,10 +3163,10 @@ $as_echo "$ac_res" >&6; }
 ac_fn_cxx_check_header_mongrel ()
 {
   as_lineno=${as_lineno-"$1"} as_lineno_stack=as_lineno_stack=$as_lineno_stack
-  if eval "test \"\${$3+set}\"" = set; then :
+  if { as_var=$3; eval "test \"\${$as_var+set}\" = set"; }; then :
   { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $2" >&5
 $as_echo_n "checking for $2... " >&6; }
-if eval "test \"\${$3+set}\"" = set; then :
+if { as_var=$3; eval "test \"\${$as_var+set}\" = set"; }; then :
   $as_echo_n "(cached) " >&6
 fi
 eval ac_res=\$$3
@@ -3189,7 +3202,7 @@ if ac_fn_cxx_try_cpp "$LINENO"; then :
 else
   ac_header_preproc=no
 fi
-rm -f conftest.err conftest.i conftest.$ac_ext
+rm -f conftest.err conftest.$ac_ext
 { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_header_preproc" >&5
 $as_echo "$ac_header_preproc" >&6; }
 
@@ -3216,7 +3229,7 @@ $as_echo "$as_me: WARNING: $2: proceeding with the compiler's result" >&2;}
 esac
   { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $2" >&5
 $as_echo_n "checking for $2... " >&6; }
-if eval "test \"\${$3+set}\"" = set; then :
+if { as_var=$3; eval "test \"\${$as_var+set}\" = set"; }; then :
   $as_echo_n "(cached) " >&6
 else
   eval "$3=\$ac_header_compiler"
@@ -3280,7 +3293,7 @@ ac_fn_c_check_member ()
   as_lineno=${as_lineno-"$1"} as_lineno_stack=as_lineno_stack=$as_lineno_stack
   { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $2.$3" >&5
 $as_echo_n "checking for $2.$3... " >&6; }
-if eval "test \"\${$4+set}\"" = set; then :
+if { as_var=$4; eval "test \"\${$as_var+set}\" = set"; }; then :
   $as_echo_n "(cached) " >&6
 else
   cat confdefs.h - <<_ACEOF >conftest.$ac_ext
@@ -3332,7 +3345,7 @@ This file contains any messages produced by compilers while
 running configure, to aid debugging if configure makes a mistake.
 
 It was created by $as_me, which was
-generated by GNU Autoconf 2.67.  Invocation command line was
+generated by GNU Autoconf 2.65.  Invocation command line was
 
   $ $0 $@
 
@@ -3442,9 +3455,11 @@ trap 'exit_status=$?
   {
     echo
 
-    $as_echo "## ---------------- ##
+    cat <<\_ASBOX
+## ---------------- ##
 ## Cache variables. ##
-## ---------------- ##"
+## ---------------- ##
+_ASBOX
     echo
     # The following way of writing the cache mishandles newlines in values,
 (
@@ -3478,9 +3493,11 @@ $as_echo "$as_me: WARNING: cache variable $ac_var contains a newline" >&2;} ;;
 )
     echo
 
-    $as_echo "## ----------------- ##
+    cat <<\_ASBOX
+## ----------------- ##
 ## Output variables. ##
-## ----------------- ##"
+## ----------------- ##
+_ASBOX
     echo
     for ac_var in $ac_subst_vars
     do
@@ -3493,9 +3510,11 @@ $as_echo "$as_me: WARNING: cache variable $ac_var contains a newline" >&2;} ;;
     echo
 
     if test -n "$ac_subst_files"; then
-      $as_echo "## ------------------- ##
+      cat <<\_ASBOX
+## ------------------- ##
 ## File substitutions. ##
-## ------------------- ##"
+## ------------------- ##
+_ASBOX
       echo
       for ac_var in $ac_subst_files
       do
@@ -3509,9 +3528,11 @@ $as_echo "$as_me: WARNING: cache variable $ac_var contains a newline" >&2;} ;;
     fi
 
     if test -s confdefs.h; then
-      $as_echo "## ----------- ##
+      cat <<\_ASBOX
+## ----------- ##
 ## confdefs.h. ##
-## ----------- ##"
+## ----------- ##
+_ASBOX
       echo
       cat confdefs.h
       echo
@@ -3566,12 +3587,7 @@ _ACEOF
 ac_site_file1=NONE
 ac_site_file2=NONE
 if test -n "$CONFIG_SITE"; then
-  # We do not want a PATH search for config.site.
-  case $CONFIG_SITE in #((
-    -*)  ac_site_file1=./$CONFIG_SITE;;
-    */*) ac_site_file1=$CONFIG_SITE;;
-    *)   ac_site_file1=./$CONFIG_SITE;;
-  esac
+  ac_site_file1=$CONFIG_SITE
 elif test "x$prefix" != xNONE; then
   ac_site_file1=$prefix/share/config.site
   ac_site_file2=$prefix/etc/config.site
@@ -3586,11 +3602,7 @@ do
     { $as_echo "$as_me:${as_lineno-$LINENO}: loading site script $ac_site_file" >&5
 $as_echo "$as_me: loading site script $ac_site_file" >&6;}
     sed 's/^/| /' "$ac_site_file" >&5
-    . "$ac_site_file" \
-      || { { $as_echo "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5
-$as_echo "$as_me: error: in \`$ac_pwd':" >&2;}
-as_fn_error $? "failed to load site script $ac_site_file
-See \`config.log' for more details" "$LINENO" 5 ; }
+    . "$ac_site_file"
   fi
 done
 
@@ -3666,7 +3678,7 @@ if $ac_cache_corrupted; then
 $as_echo "$as_me: error: in \`$ac_pwd':" >&2;}
   { $as_echo "$as_me:${as_lineno-$LINENO}: error: changes in the environment can compromise the build" >&5
 $as_echo "$as_me: error: changes in the environment can compromise the build" >&2;}
-  as_fn_error $? "run \`make distclean' and/or \`rm $cache_file' and start over" "$LINENO" 5
+  as_fn_error "run \`make distclean' and/or \`rm $cache_file' and start over" "$LINENO" 5
 fi
 ## -------------------- ##
 ## Main body of script. ##
@@ -3755,11 +3767,6 @@ if test "${enable_pch+set}" = set; then :
   enableval=$enable_pch;
 fi
 
-# Check whether --enable-hids was given.
-if test "${enable_hids+set}" = set; then :
-  enableval=$enable_hids;
-fi
-
 # Check whether --enable-mozilla was given.
 if test "${enable_mozilla+set}" = set; then :
   enableval=$enable_mozilla;
@@ -3904,6 +3911,13 @@ else
   enable_gtk=yes
 fi
 
+# Check whether --enable-gstreamer was given.
+if test "${enable_gstreamer+set}" = set; then :
+  enableval=$enable_gstreamer;
+else
+  enable_gstreamer=yes
+fi
+
 # Check whether --enable-systray was given.
 if test "${enable_systray+set}" = set; then :
   enableval=$enable_systray;
@@ -4500,6 +4514,18 @@ if test "${with_system_lpsolve+set}" = set; then :
 fi
 
 
+# Check whether --with-system-libtextcat was given.
+if test "${with_system_libtextcat+set}" = set; then :
+  withval=$with_system_libtextcat;
+fi
+
+
+# Check whether --with-external-libtextcat-data was given.
+if test "${with_external_libtextcat_data+set}" = set; then :
+  withval=$with_external_libtextcat_data;
+fi
+
+
 # Check whether --with-system-cppunit was given.
 if test "${with_system_cppunit+set}" = set; then :
   withval=$with_system_cppunit;
@@ -4823,7 +4849,7 @@ esac
   done
 IFS=$as_save_IFS
   if test -z "$ac_cv_path_GREP"; then
-    as_fn_error $? "no acceptable grep could be found in $PATH$PATH_SEPARATOR/usr/xpg4/bin" "$LINENO" 5
+    as_fn_error "no acceptable grep could be found in $PATH$PATH_SEPARATOR/usr/xpg4/bin" "$LINENO" 5
   fi
 else
   ac_cv_path_GREP=$GREP
@@ -4889,7 +4915,7 @@ esac
   done
 IFS=$as_save_IFS
   if test -z "$ac_cv_path_EGREP"; then
-    as_fn_error $? "no acceptable egrep could be found in $PATH$PATH_SEPARATOR/usr/xpg4/bin" "$LINENO" 5
+    as_fn_error "no acceptable egrep could be found in $PATH$PATH_SEPARATOR/usr/xpg4/bin" "$LINENO" 5
   fi
 else
   ac_cv_path_EGREP=$EGREP
@@ -4985,7 +5011,7 @@ fi
 
 
 if test -z "$AWK"; then
-   as_fn_error $? "install awk to run this script" "$LINENO" 5
+   as_fn_error "install awk to run this script" "$LINENO" 5
 fi
 
 for ac_prog in sed
@@ -5034,7 +5060,7 @@ fi
 done
 
 if test -z "$SED"; then
-   as_fn_error $? "install sed to run this script" "$LINENO" 5
+   as_fn_error "install sed to run this script" "$LINENO" 5
 fi
 
 { $as_echo "$as_me:${as_lineno-$LINENO}: checking for solenv environment" >&5
@@ -5064,27 +5090,21 @@ if test -e $_solenv/inc/minor.mk; then
    SOURCEVERSION="`grep SOURCEVERSION= $_solenv/inc/minor.mk | $AWK -F"=" '{ print $2 }'`"
 
 else
-   as_fn_error $? "$_solenv/inc/minor.mk missing but needed for architecture/os detecion and proper environment script generation..." "$LINENO" 5
+   as_fn_error "$_solenv/inc/minor.mk missing but needed for architecture/os detecion and proper environment script generation..." "$LINENO" 5
 fi
 
 ac_aux_dir=
 for ac_dir in "$srcdir" "$srcdir/.." "$srcdir/../.."; do
-  if test -f "$ac_dir/install-sh"; then
-    ac_aux_dir=$ac_dir
-    ac_install_sh="$ac_aux_dir/install-sh -c"
-    break
-  elif test -f "$ac_dir/install.sh"; then
-    ac_aux_dir=$ac_dir
-    ac_install_sh="$ac_aux_dir/install.sh -c"
-    break
-  elif test -f "$ac_dir/shtool"; then
-    ac_aux_dir=$ac_dir
-    ac_install_sh="$ac_aux_dir/shtool install -c"
-    break
-  fi
+  for ac_t in install-sh install.sh shtool; do
+    if test -f "$ac_dir/$ac_t"; then
+      ac_aux_dir=$ac_dir
+      ac_install_sh="$ac_aux_dir/$ac_t -c"
+      break 2
+    fi
+  done
 done
 if test -z "$ac_aux_dir"; then
-  as_fn_error $? "cannot find install-sh, install.sh, or shtool in \"$srcdir\" \"$srcdir/..\" \"$srcdir/../..\"" "$LINENO" 5
+  as_fn_error "cannot find install-sh, install.sh, or shtool in \"$srcdir\" \"$srcdir/..\" \"$srcdir/../..\"" "$LINENO" 5
 fi
 
 # These three variables are undocumented and unsupported,
@@ -5098,7 +5118,7 @@ ac_configure="$SHELL $ac_aux_dir/configure"  # Please don't use this var.
 
 # Make sure we can run config.sub.
 $SHELL "$ac_aux_dir/config.sub" sun4 >/dev/null 2>&1 ||
-  as_fn_error $? "cannot run $SHELL $ac_aux_dir/config.sub" "$LINENO" 5
+  as_fn_error "cannot run $SHELL $ac_aux_dir/config.sub" "$LINENO" 5
 
 { $as_echo "$as_me:${as_lineno-$LINENO}: checking build system type" >&5
 $as_echo_n "checking build system type... " >&6; }
@@ -5109,16 +5129,16 @@ else
 test "x$ac_build_alias" = x &&
   ac_build_alias=`$SHELL "$ac_aux_dir/config.guess"`
 test "x$ac_build_alias" = x &&
-  as_fn_error $? "cannot guess build type; you must specify one" "$LINENO" 5
+  as_fn_error "cannot guess build type; you must specify one" "$LINENO" 5
 ac_cv_build=`$SHELL "$ac_aux_dir/config.sub" $ac_build_alias` ||
-  as_fn_error $? "$SHELL $ac_aux_dir/config.sub $ac_build_alias failed" "$LINENO" 5
+  as_fn_error "$SHELL $ac_aux_dir/config.sub $ac_build_alias failed" "$LINENO" 5
 
 fi
 { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_build" >&5
 $as_echo "$ac_cv_build" >&6; }
 case $ac_cv_build in
 *-*-*) ;;
-*) as_fn_error $? "invalid value of canonical build" "$LINENO" 5 ;;
+*) as_fn_error "invalid value of canonical build" "$LINENO" 5;;
 esac
 build=$ac_cv_build
 ac_save_IFS=$IFS; IFS='-'
@@ -5143,7 +5163,7 @@ else
   ac_cv_host=$ac_cv_build
 else
   ac_cv_host=`$SHELL "$ac_aux_dir/config.sub" $host_alias` ||
-    as_fn_error $? "$SHELL $ac_aux_dir/config.sub $host_alias failed" "$LINENO" 5
+    as_fn_error "$SHELL $ac_aux_dir/config.sub $host_alias failed" "$LINENO" 5
 fi
 
 fi
@@ -5151,7 +5171,7 @@ fi
 $as_echo "$ac_cv_host" >&6; }
 case $ac_cv_host in
 *-*-*) ;;
-*) as_fn_error $? "invalid value of canonical host" "$LINENO" 5 ;;
+*) as_fn_error "invalid value of canonical host" "$LINENO" 5;;
 esac
 host=$ac_cv_host
 ac_save_IFS=$IFS; IFS='-'
@@ -5176,7 +5196,7 @@ else
   ac_cv_target=$ac_cv_host
 else
   ac_cv_target=`$SHELL "$ac_aux_dir/config.sub" $target_alias` ||
-    as_fn_error $? "$SHELL $ac_aux_dir/config.sub $target_alias failed" "$LINENO" 5
+    as_fn_error "$SHELL $ac_aux_dir/config.sub $target_alias failed" "$LINENO" 5
 fi
 
 fi
@@ -5184,7 +5204,7 @@ fi
 $as_echo "$ac_cv_target" >&6; }
 case $ac_cv_target in
 *-*-*) ;;
-*) as_fn_error $? "invalid value of canonical target" "$LINENO" 5 ;;
+*) as_fn_error "invalid value of canonical target" "$LINENO" 5;;
 esac
 target=$ac_cv_target
 ac_save_IFS=$IFS; IFS='-'
@@ -5221,7 +5241,7 @@ $as_echo_n "checking Cygwin version... " >&6; }
    { $as_echo "$as_me:${as_lineno-$LINENO}: result: $CygwinVer" >&5
 $as_echo "$CygwinVer" >&6; }
    if test "`echo $CygwinVer | $AWK -F . '{ print $1$2 }'`" -lt "15"; then
-      as_fn_error $? "You need at least Cygwin V1.5.x" "$LINENO" 5
+      as_fn_error "You need at least Cygwin V1.5.x" "$LINENO" 5
    fi
 else
    CygwinVer="false"
@@ -5235,6 +5255,7 @@ case "$build_os" in
 		test_cups=yes
         test_randr=yes
 		test_freetype=yes
+        test_gstreamer=yes
 		_os=SunOS
 		# Extract the first word of "gtar", so it can be a program name with args.
 set dummy gtar; ac_word=$2
@@ -5278,7 +5299,7 @@ fi
 
 
 		if test -z "$GNUTAR"; then
-			as_fn_error $? "gtar (gnu tar) not found but needed. Install it (SUN Freeware package)." "$LINENO" 5
+			as_fn_error "gtar (gnu tar) not found but needed. Install it (SUN Freeware package)." "$LINENO" 5
 		fi
 
 
@@ -5286,7 +5307,7 @@ fi
 $as_echo_n "checking the Solaris operating system release... " >&6; }
    		_os_release=`echo $build_os | $SED -e s/solaris2\.//`
 		if test "$_os_release" -lt "6"; then
-      			as_fn_error $? "use solaris >= 6 to build OpenOffice.org" "$LINENO" 5
+      			as_fn_error "use solaris >= 6 to build OpenOffice.org" "$LINENO" 5
    		else
       			{ $as_echo "$as_me:${as_lineno-$LINENO}: result: ok ($_os_release)" >&5
 $as_echo "ok ($_os_release)" >&6; }
@@ -5298,7 +5319,7 @@ $as_echo_n "checking the processor type... " >&6; }
       			{ $as_echo "$as_me:${as_lineno-$LINENO}: result: ok ($build_cpu)" >&5
 $as_echo "ok ($build_cpu)" >&6; }
    		else
-      			as_fn_error $? "only sparc and i386 processors are supported" "$LINENO" 5
+      			as_fn_error "only sparc and i386 processors are supported" "$LINENO" 5
    		fi
 		;;
 	linux-gnu*|k*bsd*-gnu*)
@@ -5309,7 +5330,8 @@ $as_echo "ok ($build_cpu)" >&6; }
 		test_cups=yes
         test_randr=yes
 		test_freetype=yes
-		_os=Linux
+        test_gstreamer=yes
+        _os=Linux
 		;;
 	gnu)
 		test_cups=no
@@ -5319,6 +5341,7 @@ $as_echo "ok ($build_cpu)" >&6; }
 		test_cups=no
 		test_cairo=yes
 		test_freetype=no
+        test_gstreamer=no
 		_os=WINNT
 		;;
 	darwin*) # Mac OS X
@@ -5327,6 +5350,7 @@ $as_echo "ok ($build_cpu)" >&6; }
 		test_cairo=yes
         test_randr=no
 		test_freetype=no
+        test_gstreamer=no
 		_os=Darwin
       if test "$enable_systray" = "yes" && test "$enable_gtk" != "no"; then
          { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: Disabling gtk-quickstarter - not supported on Mac. Use --disable-systray" >&5
@@ -5341,6 +5365,7 @@ $as_echo "$as_me: WARNING: Disabling gtk-quickstarter - not supported on Mac. Us
         test_randr=no
 		test_gtk=no
 		test_freetype=no
+        test_gstreamer=no
 		_os=OS2
 		;;
 	freebsd*)
@@ -5351,6 +5376,7 @@ $as_echo "$as_me: WARNING: Disabling gtk-quickstarter - not supported on Mac. Us
 		test_cups=yes
         test_randr=yes
 		test_freetype=yes
+        test_gstreamer=yes
 		{ $as_echo "$as_me:${as_lineno-$LINENO}: checking the FreeBSD operating system release" >&5
 $as_echo_n "checking the FreeBSD operating system release... " >&6; }
 		if test -n "$with_os_version"; then
@@ -5389,6 +5415,7 @@ $as_echo "$PTHREAD_LIBS" >&6; }
 		test_cups=no
         test_randr=yes
 		test_freetype=yes
+        test_gstreamer=yes
 		PTHREAD_CFLAGS="-pthread"
 		PTHREAD_LIBS="-pthread -lpthread"
 		_os=NetBSD
@@ -5397,12 +5424,13 @@ $as_echo "$PTHREAD_LIBS" >&6; }
 		test_cups=no
         test_randr=no
 		test_freetype=yes
+        test_gstreamer=yes
 	   PTHREAD_LIBS=-pthread
 		echo "AIX is an alpha port --- Use at own risk" >> warn
 		_os=AIX
 		;;
    *)
-   as_fn_error $? "$_os operating system is not suitable to build OpenOffice.org!" "$LINENO" 5
+   as_fn_error "$_os operating system is not suitable to build OpenOffice.org!" "$LINENO" 5
    ;;
 esac
 
@@ -5510,7 +5538,7 @@ $as_echo "yes" >&6; }
 $as_echo "yes, small ones" >&6; }
 		else if test "$enable_symbols" != "no" ; then
 			     echo enable symbols is: $enable_symbols
-			     as_fn_error $? "--enable-symbols only accepts yes, TRUE or SMALL as parameter." "$LINENO" 5
+			     as_fn_error "--enable-symbols only accepts yes, TRUE or SMALL as parameter." "$LINENO" 5
            	     else
               		     ENABLE_SYMBOLS=
 		     fi
@@ -5531,7 +5559,7 @@ if test -n "$enable_strip_solver"; then
    else if test "$enable_strip_solver" = "no"; then
            DISABLE_STRIP="TRUE"
         else
-           as_fn_error $? "--disable-strip-solver only accepts yes or no as parameter." "$LINENO" 5
+           as_fn_error "--disable-strip-solver only accepts yes or no as parameter." "$LINENO" 5
         fi
    fi
 else
@@ -5710,7 +5738,7 @@ if test $_os = "WINNT"; then
    { $as_echo "$as_me:${as_lineno-$LINENO}: checking Windows build environment sanity" >&5
 $as_echo_n "checking Windows build environment sanity... " >&6; }
                      if test -L $AWK -o -L `which awk` -o -L `which tar` -o -L `which gunzip` ; then
-         as_fn_error $? "$AWK, awk, tar or gunzip is a cygwin symlink!
+         as_fn_error "$AWK, awk, tar or gunzip is a cygwin symlink!
 Native windows programs cannot use cygwin symlinks. Remove the symbolic
 link, and copy the program to the name of the link." "$LINENO" 5
       fi
@@ -5739,7 +5767,7 @@ $as_echo_n "checking for cygwin gcc/g++... " >&6; }
       { $as_echo "$as_me:${as_lineno-$LINENO}: result: found" >&5
 $as_echo "found" >&6; }
    else
-      as_fn_error $? "cygwin gcc and g++ are needed, please install them." "$LINENO" 5
+      as_fn_error "cygwin gcc and g++ are needed, please install them." "$LINENO" 5
    fi
 fi
 
@@ -5785,7 +5813,7 @@ fi
 
 
 if test -z "$SHELLPATH"; then
-   as_fn_error $? "bash not found in \$PATH" "$LINENO" 5
+   as_fn_error "bash not found in \$PATH" "$LINENO" 5
 else
    SHELLPATH=`echo $SHELLPATH | $SED -n "s/\/bash$//p"`
 fi
@@ -6112,8 +6140,8 @@ fi
 
 test -z "$CC" && { { $as_echo "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5
 $as_echo "$as_me: error: in \`$ac_pwd':" >&2;}
-as_fn_error $? "no acceptable C compiler found in \$PATH
-See \`config.log' for more details" "$LINENO" 5 ; }
+as_fn_error "no acceptable C compiler found in \$PATH
+See \`config.log' for more details." "$LINENO" 5; }
 
 # Provide some information about the compiler.
 $as_echo "$as_me:${as_lineno-$LINENO}: checking for C compiler version" >&5
@@ -6227,8 +6255,9 @@ sed 's/^/| /' conftest.$ac_ext >&5
 
 { { $as_echo "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5
 $as_echo "$as_me: error: in \`$ac_pwd':" >&2;}
-as_fn_error 77 "C compiler cannot create executables
-See \`config.log' for more details" "$LINENO" 5 ; }
+{ as_fn_set_status 77
+as_fn_error "C compiler cannot create executables
+See \`config.log' for more details." "$LINENO" 5; }; }
 else
   { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5
 $as_echo "yes" >&6; }
@@ -6270,8 +6299,8 @@ done
 else
   { { $as_echo "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5
 $as_echo "$as_me: error: in \`$ac_pwd':" >&2;}
-as_fn_error $? "cannot compute suffix of executables: cannot compile and link
-See \`config.log' for more details" "$LINENO" 5 ; }
+as_fn_error "cannot compute suffix of executables: cannot compile and link
+See \`config.log' for more details." "$LINENO" 5; }
 fi
 rm -f conftest conftest$ac_cv_exeext
 { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_exeext" >&5
@@ -6328,9 +6357,9 @@ $as_echo "$ac_try_echo"; } >&5
     else
 	{ { $as_echo "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5
 $as_echo "$as_me: error: in \`$ac_pwd':" >&2;}
-as_fn_error $? "cannot run C compiled programs.
+as_fn_error "cannot run C compiled programs.
 If you meant to cross compile, use \`--host'.
-See \`config.log' for more details" "$LINENO" 5 ; }
+See \`config.log' for more details." "$LINENO" 5; }
     fi
   fi
 fi
@@ -6381,8 +6410,8 @@ sed 's/^/| /' conftest.$ac_ext >&5
 
 { { $as_echo "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5
 $as_echo "$as_me: error: in \`$ac_pwd':" >&2;}
-as_fn_error $? "cannot compute suffix of object files: cannot compile
-See \`config.log' for more details" "$LINENO" 5 ; }
+as_fn_error "cannot compute suffix of object files: cannot compile
+See \`config.log' for more details." "$LINENO" 5; }
 fi
 rm -f conftest.$ac_cv_objext conftest.$ac_ext
 fi
@@ -6654,7 +6683,7 @@ done
         COMPATH=`echo $COMPATH | $SED "s@/[^/:]*\\\$@@"`;
 fi
 COMPATH=`echo $COMPATH | $SED "s@/[Bb][Ii][Nn]\\\$@@"`;
-echo $COMPATH
+
 GCCVER=20995
 if test \( "$_os" != "WINNT" -o "$WITH_MINGWIN" = "yes" \) -a "$GCC" = "yes"; then
     { $as_echo "$as_me:${as_lineno-$LINENO}: checking the GNU gcc compiler version" >&5
@@ -6664,24 +6693,24 @@ $as_echo_n "checking the GNU gcc compiler version... " >&6; }
    GCCVER=`echo $_gcc_version | $AWK -F. '{ print \$1*10000+\$2*100+\$3 }'`
 
    if test "$_gcc_major" -lt "3"; then
-      as_fn_error $? "found version \"$_gcc_version\", use version 3+ of the gcc compiler" "$LINENO" 5
+      as_fn_error "found version \"$_gcc_version\", use version 3+ of the gcc compiler" "$LINENO" 5
    else
       if test "$GCCVER" -eq "030203"; then
 	    if test "$ENABLE_SYMBOLS" = "SMALL"; then
-           as_fn_error $? "version \"$_gcc_version\" gives internal error with small." "$LINENO" 5
+           as_fn_error "version \"$_gcc_version\" gives internal error with small." "$LINENO" 5
 	    fi
       fi
    fi
    if test "$_os" = "Darwin" -a "$GCCVER" -ge "040100" ; then
       if test -z "$save_CC" -a -x "$GCC_HOME/bin/gcc-4.0" ; then
-         CC=$GCC_HOME/bin/gcc-4.0
-         GCCVER2=`"$CC" -dumpversion | $AWK -F. '{ print \$1*10000+\$2*100+\$3 }'`
+         export CC=$GCC_HOME/bin/gcc-4.0
+                   GCCVER2=`"$CC" -dumpversion | $AWK -F. '{ print \$1*10000+\$2*100+\$3 }'`
          if test "$GCCVER2" -ge "040000" -a "$GCCVER2" -lt "040100" ; then
             GCCVER=$GCCVER2
          fi
       fi
       if test "$GCCVER" -ge "040100" ; then
-         as_fn_error $? "You need to use the gcc-4.0 compiler (gcc $_gcc_version won't work with the MacOSX10.4u.sdk) - set CC accordingly" "$LINENO" 5
+         as_fn_error "You need to use the gcc-4.0 compiler (gcc $_gcc_version won't work with the MacOSX10.4u.sdk) - set CC accordingly" "$LINENO" 5
       else
          { $as_echo "$as_me:${as_lineno-$LINENO}: result: implicitly using CC=$CC" >&5
 $as_echo "implicitly using CC=$CC" >&6; }
@@ -6694,7 +6723,7 @@ $as_echo "checked (gcc $_gcc_version)" >&6; }
       { $as_echo "$as_me:${as_lineno-$LINENO}: checking gcc linker" >&5
 $as_echo_n "checking gcc linker... " >&6; }
       if $CC -Wl,--version 2>&1 |head -n 1| grep -v GNU > /dev/null;then
-          as_fn_error $? "failed (not GNU ld). Use GNU ld instead of Sun ld on Solaris" "$LINENO" 5
+          as_fn_error "failed (not GNU ld). Use GNU ld instead of Sun ld on Solaris" "$LINENO" 5
       fi
       { $as_echo "$as_me:${as_lineno-$LINENO}: result: ok (GNU ld)" >&5
 $as_echo "ok (GNU ld)" >&6; }
@@ -6763,19 +6792,6 @@ $as_echo "no" >&6; }
 fi
 
 
-{ $as_echo "$as_me:${as_lineno-$LINENO}: checking whether to enable hid list feature" >&5
-$as_echo_n "checking whether to enable hid list feature... " >&6; }
-if test -n "$enable_hids" && test "$enable_hids" != "no"; then
-   NO_HIDS=""
-   { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5
-$as_echo "yes" >&6; }
-else
-   NO_HIDS="TRUE"
-   { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
-$as_echo "no" >&6; }
-fi
-
-
 { $as_echo "$as_me:${as_lineno-$LINENO}: checking for GNU make" >&5
 $as_echo_n "checking for GNU make... " >&6; }
 for a in "$MAKE" $GNUMAKE make gmake gnumake; do
@@ -6788,7 +6804,7 @@ done
 { $as_echo "$as_me:${as_lineno-$LINENO}: result: $GNUMAKE" >&5
 $as_echo "$GNUMAKE" >&6; }
 if test -z "$GNUMAKE"; then
-    as_fn_error $? "not found. install GNU make." "$LINENO" 5
+    as_fn_error "not found. install GNU make." "$LINENO" 5
 fi
 
 { $as_echo "$as_me:${as_lineno-$LINENO}: checking the GNU make version" >&5
@@ -6799,7 +6815,7 @@ if test "$_make_longver" -ge "038100" ; then
    { $as_echo "$as_me:${as_lineno-$LINENO}: result: $GNUMAKE $_make_version" >&5
 $as_echo "$GNUMAKE $_make_version" >&6; }
 else
-   as_fn_error $? "failed ($GNUMAKE version >= 3.81 needed" "$LINENO" 5
+   as_fn_error "failed ($GNUMAKE version >= 3.81 needed" "$LINENO" 5
 fi
 
 
@@ -6815,7 +6831,7 @@ done
 { $as_echo "$as_me:${as_lineno-$LINENO}: result: $GNUTAR" >&5
 $as_echo "$GNUTAR" >&6; }
 if test -z "$GNUTAR"; then
-    as_fn_error $? "not found. install GNU tar." "$LINENO" 5
+    as_fn_error "not found. install GNU tar." "$LINENO" 5
 fi
 
 
@@ -6874,11 +6890,11 @@ $as_echo_n "checking the SunStudio C/C++ compiler version... " >&6; }
       _sunstudio_version=`echo $_sunstudio_string | $AWK '{ print $1 }'`
       _sunstudio_major=`echo $_sunstudio_version | $AWK -F. '{ print $1 }'`
       if test "$_sunstudio_major" != "5"; then
-         as_fn_error $? "found version \"$_sunstudio_version\", use version 5.5, 5.7, 5.8 or 5.9 of the SunStudio C/C++ compiler" "$LINENO" 5
+         as_fn_error "found version \"$_sunstudio_version\", use version 5.5, 5.7, 5.8 or 5.9 of the SunStudio C/C++ compiler" "$LINENO" 5
       else
          _sunstudio_minor=`echo $_sunstudio_version | $AWK -F. '{ if ($2 == 5) print "true"; else if ($2 == 7) print "true"; else if ($2 == 8) print "true"; else if ($2 == 9) print "true"; else print "false" }'`
          if test "$_sunstudio_minor" = "false"; then
-            as_fn_error $? "found version \"$_sunstudio_version\", use version 5.5, 5.7, 5.8 or 5.9 of the SunStudio C/C++ compiler" "$LINENO" 5
+            as_fn_error "found version \"$_sunstudio_version\", use version 5.5, 5.7, 5.8 or 5.9 of the SunStudio C/C++ compiler" "$LINENO" 5
          else
                         { $as_echo "$as_me:${as_lineno-$LINENO}: result: checked" >&5
 $as_echo "checked" >&6; }
@@ -6980,7 +6996,7 @@ $as_echo_n "checking the Compaq C compiler version... " >&6; }
             _compaqc_version=`$CC -V 2>&1 | $AWK '{ print $3 }'`
       _compaqc_major=`echo $_compaqc_version | $AWK -F. '{ print $1 }'`
       if test "$_compaqc_major" != "T6"; then
-         as_fn_error $? "found version \"$_compaqc_version\", use version 6 of the Compaq C compiler" "$LINENO" 5
+         as_fn_error "found version \"$_compaqc_version\", use version 6 of the Compaq C compiler" "$LINENO" 5
       else
                   { $as_echo "$as_me:${as_lineno-$LINENO}: result: checked" >&5
 $as_echo "checked" >&6; }
@@ -7037,7 +7053,7 @@ else
    if test -x "$_perl_path"; then
       PERL=$_perl_path
    else
-      as_fn_error $? "$_perl_path not found" "$LINENO" 5
+      as_fn_error "$_perl_path not found" "$LINENO" 5
    fi
 fi
 
@@ -7047,12 +7063,12 @@ $as_echo_n "checking the Perl version... " >&6; }
    ${PERL} -e "exit($]);"
    _perl_version=$?
    if test "$_perl_version" -lt 5; then
-      as_fn_error $? "found Perl version \"$_perl_version\", use version 5 of Perl" "$LINENO" 5
+      as_fn_error "found Perl version \"$_perl_version\", use version 5 of Perl" "$LINENO" 5
    fi
    { $as_echo "$as_me:${as_lineno-$LINENO}: result: checked (perl $_perl_version)" >&5
 $as_echo "checked (perl $_perl_version)" >&6; }
 else
-   as_fn_error $? "Perl not found, install version 5 of Perl" "$LINENO" 5
+   as_fn_error "Perl not found, install version 5 of Perl" "$LINENO" 5
 fi
 
 
@@ -7062,7 +7078,7 @@ if `$PERL -e 'use Archive::Zip;'`; then
 	{ $as_echo "$as_me:${as_lineno-$LINENO}: result: all modules found" >&5
 $as_echo "all modules found" >&6; }
 else
-	as_fn_error $? "Failed to find some modules" "$LINENO" 5
+	as_fn_error "Failed to find some modules" "$LINENO" 5
 fi
 
 if test "$_os" = "WINNT"; then
@@ -7182,7 +7198,7 @@ fi
 		fi
 
 		if test -z "$MSPDB_PATH"; then
-			as_fn_error $? "You need a mspdb71.dll/mspdb80.dll, make sure it's in the path or use --with-mspdb-path" "$LINENO" 5
+			as_fn_error "You need a mspdb71.dll/mspdb80.dll, make sure it's in the path or use --with-mspdb-path" "$LINENO" 5
 		fi
 		MSPDB_PATH=`cygpath -d "$MSPDB_PATH"`
 		MSPDB_PATH=`cygpath -u "$MSPDB_PATH"`
@@ -7271,10 +7287,10 @@ $as_echo "found .NET 2005." >&6; }
 				{ $as_echo "$as_me:${as_lineno-$LINENO}: result: found .NET 2003." >&5
 $as_echo "found .NET 2003." >&6; }
 			else
-				as_fn_error $? "Compiler too old. Use Microsoft C/C++ .NET 2003/2005 compiler." "$LINENO" 5
+				as_fn_error "Compiler too old. Use Microsoft C/C++ .NET 2003/2005 compiler." "$LINENO" 5
 			fi
 		else
-			as_fn_error $? "Microsoft C/C++ Compiler not found. Use --with-cl-home or set path to cl.exe." "$LINENO" 5
+			as_fn_error "Microsoft C/C++ Compiler not found. Use --with-cl-home or set path to cl.exe." "$LINENO" 5
 		fi
 	else
 		{ $as_echo "$as_me:${as_lineno-$LINENO}: checking the Mingwin32 C++ Compiler" >&5
@@ -7288,7 +7304,7 @@ $as_echo "found." >&6; }
 				USE_MINGW="pure-mingw"
 			fi
 		else
-			as_fn_error $? "Mingwin32 C++ Compiler not found." "$LINENO" 5
+			as_fn_error "Mingwin32 C++ Compiler not found." "$LINENO" 5
 		fi
 	fi
 fi
@@ -7363,7 +7379,7 @@ fi
 		fi
 	fi
 	if test ! -x "$MIDL_PATH/midl.exe"; then
-		as_fn_error $? "midl.exe not found. Make sure it's in the path or use --with-midl-path" "$LINENO" 5
+		as_fn_error "midl.exe not found. Make sure it's in the path or use --with-midl-path" "$LINENO" 5
 	fi
 	# Convert to posix path with 8.3 filename restrictions ( No spaces )
 	MIDL_PATH=`cygpath -d "$MIDL_PATH"`
@@ -7424,7 +7440,7 @@ fi
 	   fi
 	fi
 	if test ! -x "$CSC_PATH/csc.exe"; then
-		as_fn_error $? "csc.exe not found. Make sure it's in the path or use --with-csc-path" "$LINENO" 5
+		as_fn_error "csc.exe not found. Make sure it's in the path or use --with-csc-path" "$LINENO" 5
 	fi
 	# Convert to posix path with 8.3 filename restrictions ( No spaces )
 	CSC_PATH=`cygpath -d "$CSC_PATH"`
@@ -7453,7 +7469,7 @@ $as_echo_n "checking .NET Framework... " >&6; }
           fi
 	    fi
 	    if test ! -f "$FRAME_HOME/lib/mscoree.lib"; then
-		as_fn_error $? "mscoree.lib (.NET Framework) not found. Make sure you use --with-frame-home" "$LINENO" 5
+		as_fn_error "mscoree.lib (.NET Framework) not found. Make sure you use --with-frame-home" "$LINENO" 5
 	    fi
 	    { $as_echo "$as_me:${as_lineno-$LINENO}: result: found" >&5
 $as_echo "found" >&6; }
@@ -7509,7 +7525,7 @@ else
   # Broken: fails on valid input.
 continue
 fi
-rm -f conftest.err conftest.i conftest.$ac_ext
+rm -f conftest.err conftest.$ac_ext
 
   # OK, works on sane cases.  Now check whether nonexistent headers
   # can be detected and how.
@@ -7525,11 +7541,11 @@ else
 ac_preproc_ok=:
 break
 fi
-rm -f conftest.err conftest.i conftest.$ac_ext
+rm -f conftest.err conftest.$ac_ext
 
 done
 # Because of `break', _AC_PREPROC_IFELSE's cleaning code was skipped.
-rm -f conftest.i conftest.err conftest.$ac_ext
+rm -f conftest.err conftest.$ac_ext
 if $ac_preproc_ok; then :
   break
 fi
@@ -7568,7 +7584,7 @@ else
   # Broken: fails on valid input.
 continue
 fi
-rm -f conftest.err conftest.i conftest.$ac_ext
+rm -f conftest.err conftest.$ac_ext
 
   # OK, works on sane cases.  Now check whether nonexistent headers
   # can be detected and how.
@@ -7584,18 +7600,18 @@ else
 ac_preproc_ok=:
 break
 fi
-rm -f conftest.err conftest.i conftest.$ac_ext
+rm -f conftest.err conftest.$ac_ext
 
 done
 # Because of `break', _AC_PREPROC_IFELSE's cleaning code was skipped.
-rm -f conftest.i conftest.err conftest.$ac_ext
+rm -f conftest.err conftest.$ac_ext
 if $ac_preproc_ok; then :
 
 else
   { { $as_echo "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5
 $as_echo "$as_me: error: in \`$ac_pwd':" >&2;}
-as_fn_error $? "C preprocessor \"$CPP\" fails sanity check
-See \`config.log' for more details" "$LINENO" 5 ; }
+as_fn_error "C preprocessor \"$CPP\" fails sanity check
+See \`config.log' for more details." "$LINENO" 5; }
 fi
 
 ac_ext=c
@@ -8015,7 +8031,7 @@ else
   # Broken: fails on valid input.
 continue
 fi
-rm -f conftest.err conftest.i conftest.$ac_ext
+rm -f conftest.err conftest.$ac_ext
 
   # OK, works on sane cases.  Now check whether nonexistent headers
   # can be detected and how.
@@ -8031,11 +8047,11 @@ else
 ac_preproc_ok=:
 break
 fi
-rm -f conftest.err conftest.i conftest.$ac_ext
+rm -f conftest.err conftest.$ac_ext
 
 done
 # Because of `break', _AC_PREPROC_IFELSE's cleaning code was skipped.
-rm -f conftest.i conftest.err conftest.$ac_ext
+rm -f conftest.err conftest.$ac_ext
 if $ac_preproc_ok; then :
   break
 fi
@@ -8074,7 +8090,7 @@ else
   # Broken: fails on valid input.
 continue
 fi
-rm -f conftest.err conftest.i conftest.$ac_ext
+rm -f conftest.err conftest.$ac_ext
 
   # OK, works on sane cases.  Now check whether nonexistent headers
   # can be detected and how.
@@ -8090,18 +8106,18 @@ else
 ac_preproc_ok=:
 break
 fi
-rm -f conftest.err conftest.i conftest.$ac_ext
+rm -f conftest.err conftest.$ac_ext
 
 done
 # Because of `break', _AC_PREPROC_IFELSE's cleaning code was skipped.
-rm -f conftest.i conftest.err conftest.$ac_ext
+rm -f conftest.err conftest.$ac_ext
 if $ac_preproc_ok; then :
 
 else
   { { $as_echo "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5
 $as_echo "$as_me: error: in \`$ac_pwd':" >&2;}
-as_fn_error $? "C++ preprocessor \"$CXXCPP\" fails sanity check
-See \`config.log' for more details" "$LINENO" 5 ; }
+as_fn_error "C++ preprocessor \"$CXXCPP\" fails sanity check
+See \`config.log' for more details." "$LINENO" 5; }
 fi
 
 ac_ext=c
@@ -8156,7 +8172,7 @@ else
   # Broken: fails on valid input.
 continue
 fi
-rm -f conftest.err conftest.i conftest.$ac_ext
+rm -f conftest.err conftest.$ac_ext
 
   # OK, works on sane cases.  Now check whether nonexistent headers
   # can be detected and how.
@@ -8172,11 +8188,11 @@ else
 ac_preproc_ok=:
 break
 fi
-rm -f conftest.err conftest.i conftest.$ac_ext
+rm -f conftest.err conftest.$ac_ext
 
 done
 # Because of `break', _AC_PREPROC_IFELSE's cleaning code was skipped.
-rm -f conftest.i conftest.err conftest.$ac_ext
+rm -f conftest.err conftest.$ac_ext
 if $ac_preproc_ok; then :
   break
 fi
@@ -8215,7 +8231,7 @@ else
   # Broken: fails on valid input.
 continue
 fi
-rm -f conftest.err conftest.i conftest.$ac_ext
+rm -f conftest.err conftest.$ac_ext
 
   # OK, works on sane cases.  Now check whether nonexistent headers
   # can be detected and how.
@@ -8231,18 +8247,18 @@ else
 ac_preproc_ok=:
 break
 fi
-rm -f conftest.err conftest.i conftest.$ac_ext
+rm -f conftest.err conftest.$ac_ext
 
 done
 # Because of `break', _AC_PREPROC_IFELSE's cleaning code was skipped.
-rm -f conftest.i conftest.err conftest.$ac_ext
+rm -f conftest.err conftest.$ac_ext
 if $ac_preproc_ok; then :
 
 else
   { { $as_echo "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5
 $as_echo "$as_me: error: in \`$ac_pwd':" >&2;}
-as_fn_error $? "C preprocessor \"$CPP\" fails sanity check
-See \`config.log' for more details" "$LINENO" 5 ; }
+as_fn_error "C preprocessor \"$CPP\" fails sanity check
+See \`config.log' for more details." "$LINENO" 5; }
 fi
 
 ac_ext=c
@@ -8261,7 +8277,8 @@ do :
   as_ac_Header=`$as_echo "ac_cv_header_$ac_header" | $as_tr_sh`
 ac_fn_c_check_header_compile "$LINENO" "$ac_header" "$as_ac_Header" "$ac_includes_default
 "
-if eval test \"x\$"$as_ac_Header"\" = x"yes"; then :
+eval as_val=\$$as_ac_Header
+   if test "x$as_val" = x""yes; then :
   cat >>confdefs.h <<_ACEOF
 #define `$as_echo "HAVE_$ac_header" | $as_tr_cpp` 1
 _ACEOF
@@ -8286,8 +8303,9 @@ else
   if test "$ac_cv_type_long" = yes; then
      { { $as_echo "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5
 $as_echo "$as_me: error: in \`$ac_pwd':" >&2;}
-as_fn_error 77 "cannot compute sizeof (long)
-See \`config.log' for more details" "$LINENO" 5 ; }
+{ as_fn_set_status 77
+as_fn_error "cannot compute sizeof (long)
+See \`config.log' for more details." "$LINENO" 5; }; }
    else
      ac_cv_sizeof_long=0
    fi
@@ -8526,8 +8544,8 @@ $as_echo "#define AC_APPLE_UNIVERSAL_BUILD 1" >>confdefs.h
 
      ;; #(
    *)
-     as_fn_error $? "unknown endianness
- presetting ac_cv_c_bigendian=no (or yes) will help" "$LINENO" 5  ;;
+     as_fn_error "unknown endianness
+ presetting ac_cv_c_bigendian=no (or yes) will help" "$LINENO" 5 ;;
  esac
 
 WORDS_BIGENDIAN=$ac_cv_c_bigendian
@@ -8767,7 +8785,7 @@ $as_echo "$as_me: WARNING: --with-vba-package-format=extn can cause problems" >&
             { $as_echo "$as_me:${as_lineno-$LINENO}: result: build into installset" >&5
 $as_echo "build into installset" >&6; }
          else
-            as_fn_error $? "unknown packaging method" "$LINENO" 5
+            as_fn_error "unknown packaging method" "$LINENO" 5
          fi
       fi
 
@@ -8788,7 +8806,7 @@ if test "$test_cups" = "yes" -a "$ENABLE_CUPS" = "TRUE" ; then
 if test "x$ac_cv_header_cups_cups_h" = x""yes; then :
 
 else
-  as_fn_error $? "cups/cups.h could not be found. libcupsys2-dev or cups???-devel missing?" "$LINENO" 5
+  as_fn_error "cups/cups.h could not be found. libcupsys2-dev or cups???-devel missing?" "$LINENO" 5
 fi
 
 
@@ -8805,7 +8823,7 @@ $as_echo "yes" >&6; }
 if test "x$ac_cv_header_security_pam_appl_h" = x""yes; then :
 
 else
-  as_fn_error $? "pam_appl.h could not be found. libpam-dev or pam-devel missing?" "$LINENO" 5
+  as_fn_error "pam_appl.h could not be found. libpam-dev or pam-devel missing?" "$LINENO" 5
 fi
 
 
@@ -8859,7 +8877,7 @@ _ACEOF
   LIBS="-lpam $LIBS"
 
 else
-  as_fn_error $? "libpam not found or functional" "$LINENO" 5
+  as_fn_error "libpam not found or functional" "$LINENO" 5
 fi
 
     else
@@ -9015,7 +9033,7 @@ $as_echo "can't tell" >&6; }
     ;;
 
     *)
-    as_fn_error $? "internal error" "$LINENO" 5
+    as_fn_error "internal error" "$LINENO" 5
     ;;
 esac
 
@@ -9084,7 +9102,7 @@ _ACEOF
   LIBS="-lcrypt $LIBS"
 
 else
-  as_fn_error $? "libcrypt not found or functional" "$LINENO" 5
+  as_fn_error "libcrypt not found or functional" "$LINENO" 5
 fi
 
     else
@@ -9383,7 +9401,7 @@ $as_echo_n "checking the GNU C++ compiler version... " >&6; }
          fi
       fi
       if test "$_gpp_majmin" -ge "401" ; then
-         as_fn_error $? "You need to use the g++-4.0 compiler (g++ $_gpp_version won't work with the MacOSX10.4u.sdk) - set CXX accordingly" "$LINENO" 5
+         as_fn_error "You need to use the g++-4.0 compiler (g++ $_gpp_version won't work with the MacOSX10.4u.sdk) - set CXX accordingly" "$LINENO" 5
       else
          { $as_echo "$as_me:${as_lineno-$LINENO}: result: implicitly using CXX=$CXX" >&5
 $as_echo "implicitly using CXX=$CXX" >&6; }
@@ -9399,8 +9417,8 @@ $as_echo_n "checking whether $CXX has the enum bug... " >&6; }
 if test "$cross_compiling" = yes; then :
   { { $as_echo "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5
 $as_echo "$as_me: error: in \`$ac_pwd':" >&2;}
-as_fn_error $? "cannot run test program while cross compiling
-See \`config.log' for more details" "$LINENO" 5 ; }
+as_fn_error "cannot run test program while cross compiling
+See \`config.log' for more details." "$LINENO" 5; }
 else
   cat confdefs.h - <<_ACEOF >conftest.$ac_ext
 /* end confdefs.h.  */
@@ -9428,7 +9446,7 @@ main (void)
 
 _ACEOF
 if ac_fn_c_try_run "$LINENO"; then :
-  as_fn_error $? "your version of the GNU C++ compile has a bug which prevents OpenOffice.org from being compiled correctly - please check http://gcc.gnu.org/ml/gcc-patches/2004-07/msg00968.html for details." "$LINENO" 5
+  as_fn_error "your version of the GNU C++ compile has a bug which prevents OpenOffice.org from being compiled correctly - please check http://gcc.gnu.org/ml/gcc-patches/2004-07/msg00968.html for details." "$LINENO" 5
 else
   { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
 $as_echo "no" >&6; }
@@ -9812,15 +9830,15 @@ if ac_fn_c_try_cpp "$LINENO"; then :
   { $as_echo "$as_me:${as_lineno-$LINENO}: result: checked." >&5
 $as_echo "checked." >&6; }
 else
-  as_fn_error $? "STLport headers not found." "$LINENO" 5
+  as_fn_error "STLport headers not found." "$LINENO" 5
 fi
-rm -f conftest.err conftest.i conftest.$ac_ext
+rm -f conftest.err conftest.$ac_ext
       else
                   if test -f "$STLPORT4/stlport/hash_map"; then
             { $as_echo "$as_me:${as_lineno-$LINENO}: result: checked." >&5
 $as_echo "checked." >&6; }
          else
-            as_fn_error $? "STLport headers not found." "$LINENO" 5
+            as_fn_error "STLport headers not found." "$LINENO" 5
          fi
       fi
       if test "$_os" != "WINNT" -o "$WITH_MINGWIN" = "yes"; then
@@ -9835,7 +9853,7 @@ $as_echo "checked" >&6; }
 $as_echo "checked" >&6; }
 			      STLPORT_VER=500
 		      else
-			      as_fn_error $? "STLport libraries not found" "$LINENO" 5
+			      as_fn_error "STLport libraries not found" "$LINENO" 5
 		      fi
 	      elif test "$_os" = "Darwin"; then
 		      if test -f "$STLPORT4/lib/libstlport_gcc.dylib"; then
@@ -9846,7 +9864,7 @@ $as_echo "checked" >&6; }
 $as_echo "checked" >&6; }
 			      STLPORT_VER=500
 		      else
-			      as_fn_error $? "STLport libraries not found" "$LINENO" 5
+			      as_fn_error "STLport libraries not found" "$LINENO" 5
 		      fi
 		   else
 			   if test -f "$STLPORT4/lib/libstlport_gcc.so"; then
@@ -9857,7 +9875,7 @@ $as_echo "checked" >&6; }
 $as_echo "checked" >&6; }
 				   STLPORT_VER=500
 			   else
-				   as_fn_error $? "STLport libraries not found" "$LINENO" 5
+				   as_fn_error "STLport libraries not found" "$LINENO" 5
 			   fi
 		   fi
 	   fi
@@ -10032,7 +10050,7 @@ $as_echo "$as_me: ccache version $CCACHE_VERSION not accepted. See description f
       fi
    fi
 else
-   as_fn_error $? "invalid option to --enable-ccache-skip. Valid values are \"auto\", \"yes\" and \"no\"" "$LINENO" 5
+   as_fn_error "invalid option to --enable-ccache-skip. Valid values are \"auto\", \"yes\" and \"no\"" "$LINENO" 5
 fi
 
 if test "$USE_SYSTEM_STL" = "YES"; then
@@ -10066,7 +10084,7 @@ fi
 rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
 
    if test "$ac_cv_cxx_have_ext_hash_map" = "no"; then
-      as_fn_error $? "Can't find hash_map. Try with --with-stlport" "$LINENO" 5
+      as_fn_error "Can't find hash_map. Try with --with-stlport" "$LINENO" 5
    else
       { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_cxx_have_ext_hash_map" >&5
 $as_echo "$ac_cv_cxx_have_ext_hash_map" >&6; }
@@ -10198,7 +10216,8 @@ $as_echo "system" >&6; }
 do :
   as_ac_var=`$as_echo "ac_cv_func_$ac_func" | $as_tr_sh`
 ac_fn_c_check_func "$LINENO" "$ac_func" "$as_ac_var"
-if eval test \"x\$"$as_ac_var"\" = x"yes"; then :
+eval as_val=\$$as_ac_var
+   if test "x$as_val" = x""yes; then :
   cat >>confdefs.h <<_ACEOF
 #define `$as_echo "HAVE_$ac_func" | $as_tr_cpp` 1
 _ACEOF
@@ -10211,7 +10230,7 @@ if test "$with_alloc" = "tcmalloc"; then
     { $as_echo "$as_me:${as_lineno-$LINENO}: result: tcmalloc" >&5
 $as_echo "tcmalloc" >&6; }
     if ! echo $build_cpu | grep -E 'i[3456]86' 2>/dev/null >/dev/null; then
-        as_fn_error $? "tcmalloc only available/usable on ix86" "$LINENO" 5
+        as_fn_error "tcmalloc only available/usable on ix86" "$LINENO" 5
     fi
     { $as_echo "$as_me:${as_lineno-$LINENO}: checking for malloc in -ltcmalloc" >&5
 $as_echo_n "checking for malloc in -ltcmalloc... " >&6; }
@@ -10257,11 +10276,85 @@ _ACEOF
   LIBS="-ltcmalloc $LIBS"
 
 else
-  as_fn_error $? "tcmalloc not found or functional. Install the Google Profiling Tools" "$LINENO" 5
+  as_fn_error "tcmalloc not found or functional. Install the Google Profiling Tools" "$LINENO" 5
 fi
 
     ALLOC="TCMALLOC";
 fi
+if test "$with_alloc" = "jemalloc"; then
+  if test "$_os" != "FreeBSD" -o "$_os" != "NetBSD"; then
+    { $as_echo "$as_me:${as_lineno-$LINENO}: result: jemalloc" >&5
+$as_echo "jemalloc" >&6; }
+    save_CFLAGS=$CFLAGS
+    CFLAGS="$CFLAGS -pthread"
+    { $as_echo "$as_me:${as_lineno-$LINENO}: checking for malloc in -ljemalloc" >&5
+$as_echo_n "checking for malloc in -ljemalloc... " >&6; }
+if test "${ac_cv_lib_jemalloc_malloc+set}" = set; then :
+  $as_echo_n "(cached) " >&6
+else
+  ac_check_lib_save_LIBS=$LIBS
+LIBS="-ljemalloc  $LIBS"
+cat confdefs.h - <<_ACEOF >conftest.$ac_ext
+/* end confdefs.h.  */
+
+/* Override any GCC internal prototype to avoid an error.
+   Use char because int might match the return type of a GCC
+   builtin and then its argument prototype would still apply.  */
+#ifdef __cplusplus
+extern "C"
+#endif
+char malloc ();
+int
+main ()
+{
+return malloc ();
+  ;
+  return 0;
+}
+_ACEOF
+if ac_fn_c_try_link "$LINENO"; then :
+  ac_cv_lib_jemalloc_malloc=yes
+else
+  ac_cv_lib_jemalloc_malloc=no
+fi
+rm -f core conftest.err conftest.$ac_objext \
+    conftest$ac_exeext conftest.$ac_ext
+LIBS=$ac_check_lib_save_LIBS
+fi
+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_jemalloc_malloc" >&5
+$as_echo "$ac_cv_lib_jemalloc_malloc" >&6; }
+if test "x$ac_cv_lib_jemalloc_malloc" = x""yes; then :
+  cat >>confdefs.h <<_ACEOF
+#define HAVE_LIBJEMALLOC 1
+_ACEOF
+
+  LIBS="-ljemalloc $LIBS"
+
+else
+  as_fn_error "jemalloc not found or functional. Install the jemalloc allocator." "$LINENO" 5
+fi
+
+    ALLOC="JEMALLOC";
+    CFLAGS=$save_CFLAGS
+  else
+    { $as_echo "$as_me:${as_lineno-$LINENO}: result: system" >&5
+$as_echo "system" >&6; }
+    ALLOC="SYS_ALLOC";
+    for ac_func in malloc realloc calloc free
+do :
+  as_ac_var=`$as_echo "ac_cv_func_$ac_func" | $as_tr_sh`
+ac_fn_c_check_func "$LINENO" "$ac_func" "$as_ac_var"
+eval as_val=\$$as_ac_var
+   if test "x$as_val" = x""yes; then :
+  cat >>confdefs.h <<_ACEOF
+#define `$as_echo "HAVE_$ac_func" | $as_tr_cpp` 1
+_ACEOF
+
+fi
+done
+
+  fi
+fi
 if test "$with_alloc" = "internal" -o -z "$with_alloc"; then
    { $as_echo "$as_me:${as_lineno-$LINENO}: result: internal" >&5
 $as_echo "internal" >&6; }
@@ -10364,7 +10457,7 @@ fi
             if test -x "$_java_path"; then
          JAVAINTERPRETER=$_java_path
       else
-         as_fn_error $? "$_java_path not found set with_jdk_home" "$LINENO" 5
+         as_fn_error "$_java_path not found set with_jdk_home" "$LINENO" 5
       fi
    fi
    if test "$_os" = "WINNT"; then
@@ -10393,7 +10486,7 @@ if test "$SOLAR_JAVA" != ""; then
 $as_echo_n "checking the installed JDK... " >&6; }
    if test -n "$JAVAINTERPRETER"; then
             if test `$JAVAINTERPRETER -version 2>&1 | grep -c "Kaffe"` -gt 0; then
-         as_fn_error $? "No valid check available. Please check the block for your desired java in configure.in" "$LINENO" 5
+         as_fn_error "No valid check available. Please check the block for your desired java in configure.in" "$LINENO" 5
 #        dnl Kaffe specific tests
 #        KAFFE_VER=`$JAVAINTERPRETER -version 2>&1 | $EGREP "  Version:" | $SED -r "s/.*  Version: ([[0-9\.]]*).*/\1/"`
 #        if test -z "$KAFFE_VER"; then
@@ -10419,7 +10512,7 @@ $as_echo "checked (gcj)" >&6; }
         _gij_longver=`echo $_gij_version | $AWK -F. '{ print \$1*10000+\$2*100+\$3 }'`
 
       elif test `$JAVAINTERPRETER -version 2>&1 | awk '{ print }' | grep -c "BEA"` -gt 0; then
-         as_fn_error $? "No valid check available. Please check the block for your desired java in configure.in" "$LINENO" 5
+         as_fn_error "No valid check available. Please check the block for your desired java in configure.in" "$LINENO" 5
 #        JDK=bea
 #
 #        dnl BEA JDK specific tests
@@ -10449,14 +10542,14 @@ $as_echo "checked (gcj)" >&6; }
         _jdk_ver=`echo "$_jdk" | $AWK -F. '{ print (($1 * 100) + $2) * 100 + $3;}'`
 
         if test "$_jdk_ver" -lt 10500; then
-             as_fn_error $? "IBM JDK is too old, you need at least 1.5" "$LINENO" 5
+             as_fn_error "IBM JDK is too old, you need at least 1.5" "$LINENO" 5
         fi
 
         { $as_echo "$as_me:${as_lineno-$LINENO}: result: checked (IBM JDK $_jdk)" >&5
 $as_echo "checked (IBM JDK $_jdk)" >&6; }
 
         if test "$with_jdk_home" = ""; then
-             as_fn_error $? "In order to successfully build OpenOffice.org using the IBM JDK,
+             as_fn_error "In order to successfully build OpenOffice.org using the IBM JDK,
 you must use the \"--with-jdk-home\" configure option explicitly" "$LINENO" 5
         fi
 
@@ -10469,7 +10562,7 @@ you must use the \"--with-jdk-home\" configure option explicitly" "$LINENO" 5
         _jdk_ver=`echo "$_jdk" | $AWK -F. '{ print (($1 * 100) + $2) * 100 + $3;}'`
 
         if test "$_jdk_ver" -lt 10500; then
-             as_fn_error $? "JDK is too old, you need at least 1.5" "$LINENO" 5
+             as_fn_error "JDK is too old, you need at least 1.5" "$LINENO" 5
         fi
         { $as_echo "$as_me:${as_lineno-$LINENO}: result: checked (JDK $_jdk)" >&5
 $as_echo "checked (JDK $_jdk)" >&6; }
@@ -10482,7 +10575,7 @@ $as_echo "checked (JDK $_jdk)" >&6; }
         fi
       fi
    else
-      as_fn_error $? "JAVA not found. You need at least jdk-1.5, or gcj-4" "$LINENO" 5
+      as_fn_error "JAVA not found. You need at least jdk-1.5, or gcj-4" "$LINENO" 5
    fi
 else
       JAVA_HOME=NO_JAVA_HOME ; export JAVA_HOME
@@ -10547,7 +10640,7 @@ fi
         fi
     fi
     if test -z "$JAVACOMPILER"; then
-      as_fn_error $? "$javacompiler not found set with_jdk_home" "$LINENO" 5
+      as_fn_error "$javacompiler not found set with_jdk_home" "$LINENO" 5
     fi
     if test "$_os" = "WINNT"; then
        if test x`echo "$JAVACOMPILER" | grep -i '\.exe$'` = x; then
@@ -10677,7 +10770,7 @@ fi
         fi
     fi
     if test -z "$JAVADOC"; then
-      as_fn_error $? "$_javadoc_path not found set with_jdk_home" "$LINENO" 5
+      as_fn_error "$_javadoc_path not found set with_jdk_home" "$LINENO" 5
     fi
     if test "$_os" = "WINNT"; then
         if test x`echo "$JAVADOC" | grep -i '\.exe$'` = x; then
@@ -10694,7 +10787,7 @@ fi
 fi
 
 if test "$SOLAR_JAVA" != ""; then
-        if test "$JDK" == "gcj" -a -z "$JAVA_HOME"; then
+        if test "$JDK" = "gcj" -a -z "$JAVA_HOME"; then
       if test "x$with_jdk_home" = "x" -a "$_gij_longver" -ge "40200"; then
         cat > findhome.java <<_ACEOF
 import java.io.File;
@@ -10723,7 +10816,7 @@ $as_echo "javac works" >&6; }
         else
           echo "configure: javac test failed" >&5
           cat findhome.java >&5
-          as_fn_error $? "javac does not work - java projects will not build!" "$LINENO" 5
+          as_fn_error "javac does not work - java projects will not build!" "$LINENO" 5
         fi
 
         { $as_echo "$as_me:${as_lineno-$LINENO}: checking if gij knows its java.home" >&5
@@ -10735,7 +10828,7 @@ $as_echo "$JAVA_HOME" >&6; }
         else
           echo "configure: java test failed" >&5
           cat findhome.java >&5
-          as_fn_error $? "gij does not know its java.home - use --with-jdk-home" "$LINENO" 5
+          as_fn_error "gij does not know its java.home - use --with-jdk-home" "$LINENO" 5
         fi
       else
         JAVA_HOME=`echo $JAVAINTERPRETER | $SED -n "s,//*bin//*$WITH_JAVA,,p"`
@@ -10791,7 +10884,7 @@ $as_echo "$as_me: WARNING: in case JAVA_HOME is incorrectly set, some projects w
          echo "JAVA_HOME was not explicitly informed with --with-jdk-home. the configure script" >> warn
          echo "attempted to find JAVA_HOME automatically, but apparently it failed" >> warn
          echo "in case JAVA_HOME is incorrectly set, some projects with not be built correctly" >> warn
-#         if test "$JDK" == "gcj"; then
+#         if test "$JDK" = "gcj"; then
 #             echo "e.g. install java-1.4.2-gcj-compat-devel and use --with-jdk-home=/usr/lib/jvm/java-1.4.2-gcj" >> warn
 #         fi
       fi
@@ -10812,7 +10905,7 @@ $as_echo_n "checking for jawt lib name... " >&6; }
 if test "x$ac_cv_header_jni_h" = x""yes; then :
 
 else
-  as_fn_error $? "jni.h could not be found. Mismatch between gcc and libgcj or libgcj-devel missing?" "$LINENO" 5
+  as_fn_error "jni.h could not be found. Mismatch between gcc and libgcj or libgcj-devel missing?" "$LINENO" 5
 fi
 
 
@@ -10875,7 +10968,7 @@ fi
 if test "x$ac_cv_header_jni_h" = x""yes; then :
 
 else
-  as_fn_error $? "jni.h could not be found." "$LINENO" 5
+  as_fn_error "jni.h could not be found." "$LINENO" 5
 fi
 
 
@@ -11202,7 +11295,7 @@ $as_echo_n "checking whether the found epm is the right epm... " >&6; }
             { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5
 $as_echo "yes" >&6; }
          else
-            as_fn_error $? "no. Install ESP Package Manager (www.easysw.com/epm) and/or specify the path to the right epm" "$LINENO" 5
+            as_fn_error "no. Install ESP Package Manager (www.easysw.com/epm) and/or specify the path to the right epm" "$LINENO" 5
          fi
          { $as_echo "$as_me:${as_lineno-$LINENO}: checking epm version" >&5
 $as_echo_n "checking epm version... " >&6; }
@@ -11217,12 +11310,12 @@ $as_echo "OK, >= 3.7" >&6; }
 $as_echo_n "checking which PackageMaker EPM thinks to use... " >&6; }
         	      _pm=`strings $EPM | grep PackageMaker | cut -d" " -f1`
         	      if test "$_pm" = "/Developer/Applications/PackageMaker.app/Contents/MacOS/PackageMaker"; then
-          		      as_fn_error $? "$_pm; PackageMaker expected in wrong path. Either patch your epm with the right path (/Developer/Applications/Utilities/PackageMaker.app/Contents/MacOS/PackageMaker) or use internal patched epm (--with-epm=internal)" "$LINENO" 5
+          		      as_fn_error "$_pm; PackageMaker expected in wrong path. Either patch your epm with the right path (/Developer/Applications/Utilities/PackageMaker.app/Contents/MacOS/PackageMaker) or use internal patched epm (--with-epm=internal)" "$LINENO" 5
         	      elif test "$_pm" = "/Developer/Applications/Utilities/PackageMaker.app/Contents/MacOS/PackageMaker"; then
           		    { $as_echo "$as_me:${as_lineno-$LINENO}: result: $_pm, ok" >&5
 $as_echo "$_pm, ok" >&6; }
         	      else # we never should get here, but go safe
-			          as_fn_error $? "$_pm; PackageMaker expected in unknown path. Either patch your epm with the right path (/Developer/Applications/Utilities/PackageMaker.app/Contents/MacOS/PackageMaker) or use internal patched epm (--with-epm=internal)" "$LINENO" 5
+			          as_fn_error "$_pm; PackageMaker expected in unknown path. Either patch your epm with the right path (/Developer/Applications/Utilities/PackageMaker.app/Contents/MacOS/PackageMaker) or use internal patched epm (--with-epm=internal)" "$LINENO" 5
 		          fi
 	       fi
 	 else
@@ -11273,7 +11366,7 @@ $as_echo_n "checking which package format to use... " >&6; }
 	# we never should get here since we check the arciecture/os at the beginning,
 	# but go sure...
 	*)
-		as_fn_error $? "unknown system" "$LINENO" 5
+		as_fn_error "unknown system" "$LINENO" 5
    esac
    if test -n "$with_package_format"; then
 	for i in $with_package_format; do
@@ -11281,7 +11374,7 @@ $as_echo_n "checking which package format to use... " >&6; }
 			aix | bsd | deb | inst | tardist | osx | pkg | rpm | setld | native | portable | archive | dmg | installed | msi)
 			;;
 		*)
-			as_fn_error $? "unsupported format $i. Supported by EPM are:
+			as_fn_error "unsupported format $i. Supported by EPM are:
 aix - AIX software distribution
 bsd - FreeBSD, NetBSD, or OpenBSD software distribution
 depot or swinstall - HP-UX software distribution
@@ -11323,11 +11416,13 @@ $as_echo_n "checking for rpm... " >&6; }
          fi
        done
        if test -z "$RPM" ; then
-          as_fn_error $? "not found" "$LINENO" 5
-       else
-	  RPM_PATH=`which $RPM`
+          as_fn_error "not found" "$LINENO" 5
+       elif "$RPM" --usage 2>&1 | $EGREP -- -bb >/dev/null; then
+          RPM_PATH=`which $RPM`
           { $as_echo "$as_me:${as_lineno-$LINENO}: result: $RPM_PATH" >&5
 $as_echo "$RPM_PATH" >&6; }
+       else
+          as_fn_error "cannot build packages. Try installing rpmbuild." "$LINENO" 5
        fi
    fi
    if echo "$PKGFORMAT" | $EGREP deb 2>&1 >/dev/null; then
@@ -11373,7 +11468,7 @@ fi
 
 
       if test "$DPKG" = "no"; then
-         as_fn_error $? "dpkg needed for deb creation. Install dpkg." "$LINENO" 5
+         as_fn_error "dpkg needed for deb creation. Install dpkg." "$LINENO" 5
       fi
    fi
    if echo "PKGFORMAT" | $EGREP osx 2>&1 >/dev/null; then
@@ -11381,13 +11476,13 @@ fi
          { $as_echo "$as_me:${as_lineno-$LINENO}: checking for PackageMaker availability" >&5
 $as_echo_n "checking for PackageMaker availability... " >&6; }
          if ! test -x /Developer/Applications/Utilities/PackageMaker.app/Contents/MacOS/PackageMaker; then
-            as_fn_error $? "not installed. Please install Apples Dev Tools" "$LINENO" 5
+            as_fn_error "not installed. Please install Apples Dev Tools" "$LINENO" 5
          else
             { $as_echo "$as_me:${as_lineno-$LINENO}: result: ok" >&5
 $as_echo "ok" >&6; }
          fi
       else
-         as_fn_error $? "PackageMaker needed to build OSX packages and you are not on OSX..." "$LINENO" 5
+         as_fn_error "PackageMaker needed to build OSX packages and you are not on OSX..." "$LINENO" 5
        fi
    fi
    if echo "$PKGFORMAT" | $EGREP rpm 2>&1 >/dev/null || \
@@ -11468,21 +11563,22 @@ fi
 
 
       if test "$PKGMK" = "no"; then
-         as_fn_error $? "pkgmk needed for Solaris pkg creation. Install it." "$LINENO" 5
+         as_fn_error "pkgmk needed for Solaris pkg creation. Install it." "$LINENO" 5
       fi
    fi
 
 
 
 
-
 else
    { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
 $as_echo "no" >&6; }
    EPM=NO
+   PKGFORMAT=native
 fi
 
 
+
 # Extract the first word of "gperf", so it can be a program name with args.
 set dummy gperf; ac_word=$2
 { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
@@ -11524,7 +11620,7 @@ fi
 
 
 if test -z "$GPERF"; then
-	as_fn_error $? "gperf not found but needed. Install it." "$LINENO" 5
+	as_fn_error "gperf not found but needed. Install it." "$LINENO" 5
 fi
 { $as_echo "$as_me:${as_lineno-$LINENO}: checking gperf version" >&5
 $as_echo_n "checking gperf version... " >&6; }
@@ -11532,9 +11628,22 @@ if test "`$GPERF --version | $EGREP ^GNU\ gperf | $AWK '{ print $3 }' | cut -d.
 	{ $as_echo "$as_me:${as_lineno-$LINENO}: result: OK" >&5
 $as_echo "OK" >&6; }
 else
-	as_fn_error $? "too old, you need at least 3.0.0" "$LINENO" 5
+	as_fn_error "too old, you need at least 3.0.0" "$LINENO" 5
+fi
+
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking whether to build the stax" >&5
+$as_echo_n "checking whether to build the stax... " >&6; }
+if test -f "./stax/download/jsr173_1.0_api.jar"; then
+   BUILD_STAX=NO
+   { $as_echo "$as_me:${as_lineno-$LINENO}: result: no, will use the prebuilt stax/download/jsr173_1.0_api.jar" >&5
+$as_echo "no, will use the prebuilt stax/download/jsr173_1.0_api.jar" >&6; }
+else
+   BUILD_STAX=YES
+   { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5
+$as_echo "yes" >&6; }
 fi
 
+
 { $as_echo "$as_me:${as_lineno-$LINENO}: checking whether to build the ODK" >&5
 $as_echo_n "checking whether to build the ODK... " >&6; }
 if test "z$enable_odk" = "z" -o "$enable_odk" != "no"; then
@@ -11564,7 +11673,7 @@ $as_echo "$as_me: WARNING: not found, will be cross-built using mingw32" >&2;}
    fi
    if test "$_os" != "WINNT" && test "$BUILD_UNOWINREG" = "YES"; then
       if test -z "$WITH_MINGWIN" || test "$WITH_MINGWIN" = "0"; then
-         as_fn_error $? "for rebuilding unowinreg.dll you need the mingw32 C++ compiler.
+         as_fn_error "for rebuilding unowinreg.dll you need the mingw32 C++ compiler.
          Specify mingw32 g++ executable name with --with-mingwin.
          Or use prebuilt one from http://tools.openoffice.org/unowinreg_prebuild/680/ and
          put it into external/unowinreg" "$LINENO" 5
@@ -11666,12 +11775,12 @@ fi
 
       fi
       if test "$MINGWCXX" = "false"; then
-         as_fn_error $? "specified MinGW32 C++ cross-compiler not found. Install it or correct name." "$LINENO" 5
+         as_fn_error "specified MinGW32 C++ cross-compiler not found. Install it or correct name." "$LINENO" 5
       fi
       { $as_echo "$as_me:${as_lineno-$LINENO}: checking whether we are using the MinGW32 cross C++ compiler" >&5
 $as_echo_n "checking whether we are using the MinGW32 cross C++ compiler... " >&6; }
       if ! echo "`$MINGWCXX -dumpmachine`" | grep -q mingw32; then
-         as_fn_error $? "no" "$LINENO" 5
+         as_fn_error "no" "$LINENO" 5
       else
          { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5
 $as_echo "yes" >&6; }
@@ -11773,7 +11882,7 @@ fi
 
       fi
       if test "$MINGWSTRIP" = "false"; then
-         as_fn_error $? "MinGW32 binutils needed. Install them." "$LINENO" 5
+         as_fn_error "MinGW32 binutils needed. Install them." "$LINENO" 5
       fi
       ac_ext=cpp
 ac_cpp='$CXXCPP $CPPFLAGS'
@@ -11877,7 +11986,7 @@ ac_cv_lib_advapi32=ac_cv_lib_advapi32_main
 if test "x$ac_cv_header_windows_h" = x""yes; then :
 
 else
-  as_fn_error $? "windows.h missing" "$LINENO" 5
+  as_fn_error "windows.h missing" "$LINENO" 5
 fi
 
 
@@ -11932,7 +12041,7 @@ $as_echo "external" >&6; }
 if test "x$ac_cv_header_zlib_h" = x""yes; then :
 
 else
-  as_fn_error $? "zlib.h not found. install zlib" "$LINENO" 5
+  as_fn_error "zlib.h not found. install zlib" "$LINENO" 5
 fi
 
 
@@ -11975,7 +12084,7 @@ $as_echo "$ac_cv_lib_z_deflate" >&6; }
 if test "x$ac_cv_lib_z_deflate" = x""yes; then :
    ZLIB=-lz
 else
-  as_fn_error $? "zlib not found or functional" "$LINENO" 5
+  as_fn_error "zlib not found or functional" "$LINENO" 5
 fi
 
 else
@@ -11997,7 +12106,7 @@ $as_echo "external" >&6; }
 if test "x$ac_cv_header_jpeglib_h" = x""yes; then :
 
 else
-  as_fn_error $? "jpeg.h not found. install libjpeg" "$LINENO" 5
+  as_fn_error "jpeg.h not found. install libjpeg" "$LINENO" 5
 fi
 
 
@@ -12063,7 +12172,7 @@ $as_echo "external" >&6; }
 if test "x$ac_cv_header_expat_h" = x""yes; then :
 
 else
-  as_fn_error $? "expat.h not found. install expat" "$LINENO" 5
+  as_fn_error "expat.h not found. install expat" "$LINENO" 5
 fi
 
 
@@ -12224,7 +12333,7 @@ $as_echo "$LIBWPD_LIBS" >&6; }
   if test $succeeded = yes; then
      :
   else
-     as_fn_error $? "Library requirements (libwpd-0.8 ) not met; consider adjusting the PKG_CONFIG_PATH environment variable if your libraries are in a nonstandard prefix so pkg-config can find them." "$LINENO" 5
+     as_fn_error "Library requirements (libwpd-0.8 ) not met; consider adjusting the PKG_CONFIG_PATH environment variable if your libraries are in a nonstandard prefix so pkg-config can find them." "$LINENO" 5
   fi
 
 else
@@ -12341,17 +12450,9 @@ $as_echo "$CPPUNIT_LIBS" >&6; }
   if test $succeeded = yes; then
      :
   else
-     as_fn_error $? "Library requirements (cppunit >= 1.12.1 ) not met; consider adjusting the PKG_CONFIG_PATH environment variable if your libraries are in a nonstandard prefix so pkg-config can find them." "$LINENO" 5
+     as_fn_error "Library requirements (cppunit >= 1.12.1 ) not met; consider adjusting the PKG_CONFIG_PATH environment variable if your libraries are in a nonstandard prefix so pkg-config can find them." "$LINENO" 5
   fi
 
-    { $as_echo "$as_me:${as_lineno-$LINENO}: checking STL compatibility" >&5
-$as_echo_n "checking STL compatibility... " >&6; }
-    if test "$WITH_STLPORT" != "no"; then
-	as_fn_error $? "to use system cppunit you need to use --without-stlport" "$LINENO" 5
-    else
-	{ $as_echo "$as_me:${as_lineno-$LINENO}: result: OK" >&5
-$as_echo "OK" >&6; }
-    fi
 else
     { $as_echo "$as_me:${as_lineno-$LINENO}: result: internal" >&5
 $as_echo "internal" >&6; }
@@ -12459,7 +12560,7 @@ $as_echo "$FREETYPE_LIBS" >&6; }
   if test $succeeded = yes; then
      :
   else
-     as_fn_error $? "Library requirements (freetype2 >= 2.0 ) not met; consider adjusting the PKG_CONFIG_PATH environment variable if your libraries are in a nonstandard prefix so pkg-config can find them." "$LINENO" 5
+     as_fn_error "Library requirements (freetype2 >= 2.0 ) not met; consider adjusting the PKG_CONFIG_PATH environment variable if your libraries are in a nonstandard prefix so pkg-config can find them." "$LINENO" 5
   fi
 
 fi
@@ -12523,7 +12624,7 @@ fi
 if test -n "$with_system_libxslt" -o -n "$with_system_libs" && \
    test "$with_system_libxslt" != "no"; then
     if test -z "$with_system_libxml" -a -z "$with_system_libs" || \
-      test "$with_system_libxml" == "no"; then
+      test "$with_system_libxml" = "no"; then
       # somehow AC_MSG_WARN won't work...
        echo "to prevent incompatibilities between internal libxml2 and libxslt, the office will be build with system-libxml"
        echo "to prevent incompatibilities between internal libxml2 and libxslt, the office will be build with system-libxml" >> warn
@@ -12533,7 +12634,7 @@ fi
 if test -n "$with_system_libxml" -o -n "$with_system_libs" && \
    test "$with_system_libxml" != "no"; then
     if test -z "$with_system_libxslt" -a -z "$with_system_libs" || \
-      test "$with_system_libxslt" == "no"; then
+      test "$with_system_libxslt" = "no"; then
       # somehow AC_MSG_WARN won't work...
        echo "to prevent incompatibilities between internal libxslt and libxml2, the office will be build with system-libxslt"
        echo "to prevent incompatibilities between internal libxslt and libxml2, the office will be build with system-libxslt" >> warn
@@ -12658,7 +12759,7 @@ $as_echo "$LIBXSLT_LIBS" >&6; }
   if test $succeeded = yes; then
      :
   else
-     as_fn_error $? "Library requirements (libxslt) not met; consider adjusting the PKG_CONFIG_PATH environment variable if your libraries are in a nonstandard prefix so pkg-config can find them." "$LINENO" 5
+     as_fn_error "Library requirements (libxslt) not met; consider adjusting the PKG_CONFIG_PATH environment variable if your libraries are in a nonstandard prefix so pkg-config can find them." "$LINENO" 5
   fi
 
  fi
@@ -12706,7 +12807,7 @@ fi
 
 
    if test "$XSLTPROC" = "no"; then
-      as_fn_error $? "xsltproc is required" "$LINENO" 5
+      as_fn_error "xsltproc is required" "$LINENO" 5
    fi
 else
    { $as_echo "$as_me:${as_lineno-$LINENO}: result: internal" >&5
@@ -12835,7 +12936,7 @@ $as_echo "$LIBXML_LIBS" >&6; }
   if test $succeeded = yes; then
      :
   else
-     as_fn_error $? "Library requirements (libxml-2.0 >= 2.0) not met; consider adjusting the PKG_CONFIG_PATH environment variable if your libraries are in a nonstandard prefix so pkg-config can find them." "$LINENO" 5
+     as_fn_error "Library requirements (libxml-2.0 >= 2.0) not met; consider adjusting the PKG_CONFIG_PATH environment variable if your libraries are in a nonstandard prefix so pkg-config can find them." "$LINENO" 5
   fi
 
  fi
@@ -12887,7 +12988,7 @@ sys.exit(sys.hexversion < minverhex)"
   { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5
 $as_echo "yes" >&6; }
 else
-  as_fn_error $? "too old" "$LINENO" 5
+  as_fn_error "too old" "$LINENO" 5
 fi
       am_display_PYTHON=$PYTHON
     else
@@ -12969,7 +13070,7 @@ fi
 
 
   if test "$PYTHON" = :; then
-      as_fn_error $? "no suitable Python interpreter found" "$LINENO" 5
+      as_fn_error "no suitable Python interpreter found" "$LINENO" 5
   else
 
 
@@ -13058,7 +13159,7 @@ if test "$with_system_python" = "yes" ; then
 if test "x$ac_cv_header_Python_h" = x""yes; then :
 
 else
-  as_fn_error $? "Python headers not found" "$LINENO" 5
+  as_fn_error "Python headers not found" "$LINENO" 5
 fi
 
 
@@ -13115,7 +13216,7 @@ fi
 
 
 	if test -z "$BZIP2"; then
-   		as_fn_error $? "the internal Python module has a .tar.bz2. You need bzip2" "$LINENO" 5
+   		as_fn_error "the internal Python module has a .tar.bz2. You need bzip2" "$LINENO" 5
    	fi
    fi
 fi
@@ -13145,7 +13246,7 @@ else
 if test "x$ac_cv_header_db4_db_h" = x""yes; then :
    DB_INCLUDES=/usr/include/db4
 else
-   as_fn_error $? "no. install the db4 libraries" "$LINENO" 5
+   as_fn_error "no. install the db4 libraries" "$LINENO" 5
 fi
 
 
@@ -13158,8 +13259,8 @@ $as_echo_n "checking whether db is at least 4.1... " >&6; }
     if test "$cross_compiling" = yes; then :
   { { $as_echo "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5
 $as_echo "$as_me: error: in \`$ac_pwd':" >&2;}
-as_fn_error $? "cannot run test program while cross compiling
-See \`config.log' for more details" "$LINENO" 5 ; }
+as_fn_error "cannot run test program while cross compiling
+See \`config.log' for more details." "$LINENO" 5; }
 else
   cat confdefs.h - <<_ACEOF >conftest.$ac_ext
 /* end confdefs.h.  */
@@ -13176,7 +13277,7 @@ if ac_fn_c_try_run "$LINENO"; then :
   { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5
 $as_echo "yes" >&6; }
 else
-  as_fn_error $? "no. you need at least db 4.1" "$LINENO" 5
+  as_fn_error "no. you need at least db 4.1" "$LINENO" 5
 fi
 rm -f core *.core core.conftest.* gmon.out bb.out conftest$ac_exeext \
   conftest.$ac_objext conftest.beam conftest.$ac_ext
@@ -13220,7 +13321,7 @@ _ACEOF
   LIBS="-ldb $LIBS"
 
 else
-  as_fn_error $? "db not installed or functional" "$LINENO" 5
+  as_fn_error "db not installed or functional" "$LINENO" 5
 fi
 ac_cv_lib_db=ac_cv_lib_db_main
 
@@ -13250,7 +13351,7 @@ if test "${ac_cv_file__usr_share_java_lucene_core_2_3_jar+set}" = set; then :
   $as_echo_n "(cached) " >&6
 else
   test "$cross_compiling" = yes &&
-  as_fn_error $? "cannot check for file existence when cross compiling" "$LINENO" 5
+  as_fn_error "cannot check for file existence when cross compiling" "$LINENO" 5
 if test -r "/usr/share/java/lucene-core-2.3.jar"; then
   ac_cv_file__usr_share_java_lucene_core_2_3_jar=yes
 else
@@ -13263,13 +13364,31 @@ if test "x$ac_cv_file__usr_share_java_lucene_core_2_3_jar" = x""yes; then :
    LUCENE_CORE_JAR=/usr/share/java/lucene-core-2.3.jar
 else
 
-              { $as_echo "$as_me:${as_lineno-$LINENO}: checking for /usr/share/java/lucene.jar" >&5
+              { $as_echo "$as_me:${as_lineno-$LINENO}: checking for /usr/share/java/lucene-core.jar" >&5
+$as_echo_n "checking for /usr/share/java/lucene-core.jar... " >&6; }
+if test "${ac_cv_file__usr_share_java_lucene_core_jar+set}" = set; then :
+  $as_echo_n "(cached) " >&6
+else
+  test "$cross_compiling" = yes &&
+  as_fn_error "cannot check for file existence when cross compiling" "$LINENO" 5
+if test -r "/usr/share/java/lucene-core.jar"; then
+  ac_cv_file__usr_share_java_lucene_core_jar=yes
+else
+  ac_cv_file__usr_share_java_lucene_core_jar=no
+fi
+fi
+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_file__usr_share_java_lucene_core_jar" >&5
+$as_echo "$ac_cv_file__usr_share_java_lucene_core_jar" >&6; }
+if test "x$ac_cv_file__usr_share_java_lucene_core_jar" = x""yes; then :
+   LUCENE_CORE_JAR=/usr/share/java/lucene-core.jar
+else
+   { $as_echo "$as_me:${as_lineno-$LINENO}: checking for /usr/share/java/lucene.jar" >&5
 $as_echo_n "checking for /usr/share/java/lucene.jar... " >&6; }
 if test "${ac_cv_file__usr_share_java_lucene_jar+set}" = set; then :
   $as_echo_n "(cached) " >&6
 else
   test "$cross_compiling" = yes &&
-  as_fn_error $? "cannot check for file existence when cross compiling" "$LINENO" 5
+  as_fn_error "cannot check for file existence when cross compiling" "$LINENO" 5
 if test -r "/usr/share/java/lucene.jar"; then
   ac_cv_file__usr_share_java_lucene_jar=yes
 else
@@ -13281,7 +13400,11 @@ $as_echo "$ac_cv_file__usr_share_java_lucene_jar" >&6; }
 if test "x$ac_cv_file__usr_share_java_lucene_jar" = x""yes; then :
    LUCENE_CORE_JAR=/usr/share/java/lucene.jar
 else
-   as_fn_error $? "lucene-core.jar replacement not found" "$LINENO" 5
+   as_fn_error "lucene-core.jar replacement not found" "$LINENO" 5
+
+fi
+
+
 
 fi
 
@@ -13293,11 +13416,11 @@ fi
           as_ac_File=`$as_echo "ac_cv_file_$LUCENE_CORE_JAR" | $as_tr_sh`
 { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $LUCENE_CORE_JAR" >&5
 $as_echo_n "checking for $LUCENE_CORE_JAR... " >&6; }
-if eval "test \"\${$as_ac_File+set}\"" = set; then :
+if { as_var=$as_ac_File; eval "test \"\${$as_var+set}\" = set"; }; then :
   $as_echo_n "(cached) " >&6
 else
   test "$cross_compiling" = yes &&
-  as_fn_error $? "cannot check for file existence when cross compiling" "$LINENO" 5
+  as_fn_error "cannot check for file existence when cross compiling" "$LINENO" 5
 if test -r "$LUCENE_CORE_JAR"; then
   eval "$as_ac_File=yes"
 else
@@ -13307,10 +13430,11 @@ fi
 eval ac_res=\$$as_ac_File
 	       { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_res" >&5
 $as_echo "$ac_res" >&6; }
-if eval test \"x\$"$as_ac_File"\" = x"yes"; then :
+eval as_val=\$$as_ac_File
+   if test "x$as_val" = x""yes; then :
 
 else
-  as_fn_error $? "lucene-core.jar not found." "$LINENO" 5
+  as_fn_error "lucene-core.jar not found." "$LINENO" 5
 fi
 
         fi
@@ -13322,7 +13446,7 @@ if test "${ac_cv_file__usr_share_java_lucene_analyzers_2_3_jar+set}" = set; then
   $as_echo_n "(cached) " >&6
 else
   test "$cross_compiling" = yes &&
-  as_fn_error $? "cannot check for file existence when cross compiling" "$LINENO" 5
+  as_fn_error "cannot check for file existence when cross compiling" "$LINENO" 5
 if test -r "/usr/share/java/lucene-analyzers-2.3.jar"; then
   ac_cv_file__usr_share_java_lucene_analyzers_2_3_jar=yes
 else
@@ -13341,7 +13465,7 @@ if test "${ac_cv_file__usr_share_java_lucene_contrib_lucene_analyzers_jar+set}"
   $as_echo_n "(cached) " >&6
 else
   test "$cross_compiling" = yes &&
-  as_fn_error $? "cannot check for file existence when cross compiling" "$LINENO" 5
+  as_fn_error "cannot check for file existence when cross compiling" "$LINENO" 5
 if test -r "/usr/share/java/lucene-contrib/lucene-analyzers.jar"; then
   ac_cv_file__usr_share_java_lucene_contrib_lucene_analyzers_jar=yes
 else
@@ -13353,7 +13477,7 @@ $as_echo "$ac_cv_file__usr_share_java_lucene_contrib_lucene_analyzers_jar" >&6;
 if test "x$ac_cv_file__usr_share_java_lucene_contrib_lucene_analyzers_jar" = x""yes; then :
    LUCENE_ANALYZERS_JAR=/usr/share/java/lucene-contrib/lucene-analyzers.jar
 else
-   as_fn_error $? "lucene-analyzers.jar replacement not found." "$LINENO" 5
+   as_fn_error "lucene-analyzers.jar replacement not found." "$LINENO" 5
 
 fi
 
@@ -13365,11 +13489,11 @@ fi
           as_ac_File=`$as_echo "ac_cv_file_$LUCENE_CORE_JAR" | $as_tr_sh`
 { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $LUCENE_CORE_JAR" >&5
 $as_echo_n "checking for $LUCENE_CORE_JAR... " >&6; }
-if eval "test \"\${$as_ac_File+set}\"" = set; then :
+if { as_var=$as_ac_File; eval "test \"\${$as_var+set}\" = set"; }; then :
   $as_echo_n "(cached) " >&6
 else
   test "$cross_compiling" = yes &&
-  as_fn_error $? "cannot check for file existence when cross compiling" "$LINENO" 5
+  as_fn_error "cannot check for file existence when cross compiling" "$LINENO" 5
 if test -r "$LUCENE_CORE_JAR"; then
   eval "$as_ac_File=yes"
 else
@@ -13379,13 +13503,32 @@ fi
 eval ac_res=\$$as_ac_File
 	       { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_res" >&5
 $as_echo "$ac_res" >&6; }
-if eval test \"x\$"$as_ac_File"\" = x"yes"; then :
+eval as_val=\$$as_ac_File
+   if test "x$as_val" = x""yes; then :
 
 else
-   as_fn_error $? "lucene-analyzers.jar not found." "$LINENO" 5
+   as_fn_error "lucene-analyzers.jar not found." "$LINENO" 5
 fi
 
         fi
+        { $as_echo "$as_me:${as_lineno-$LINENO}: checking whether lucene is version 2.x" >&5
+$as_echo_n "checking whether lucene is version 2.x... " >&6; }
+        export LUCENE_CORE_JAR
+        if $PERL -e 'use Archive::Zip;
+            my $file = "$ENV{'LUCENE_CORE_JAR'}";
+            my $zip = Archive::Zip->new( $file );
+            my $mf = $zip->contents ( "META-INF/MANIFEST.MF" );
+            if ( $mf =~ m/Specification-Version: 2.*/ ) {
+                exit 0;
+            } else {
+                exit 1;
+            }'; then
+            { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5
+$as_echo "yes" >&6; }
+         else
+            as_fn_error "no, you need lucene 2" "$LINENO" 5
+         fi
+
 else
     { $as_echo "$as_me:${as_lineno-$LINENO}: result: internal" >&5
 $as_echo "internal" >&6; }
@@ -13408,7 +13551,7 @@ $as_echo_n "checking for mysqlc module... " >&6; }
    { $as_echo "$as_me:${as_lineno-$LINENO}: result: OK" >&5
 $as_echo "OK" >&6; }
   else
-   as_fn_error $? "not existing. get it (did you get the -extensions tarball?)" "$LINENO" 5
+   as_fn_error "not existing. get it (did you get the -extensions tarball?)" "$LINENO" 5
   fi
   BUILD_TYPE="$BUILD_TYPE MYSQLC"
 else
@@ -13474,7 +13617,7 @@ $as_echo_n "checking MySQL version... " >&6; }
 		{ $as_echo "$as_me:${as_lineno-$LINENO}: result: OK" >&5
 $as_echo "OK" >&6; }
 	else
-		as_fn_error $? "too old, use 5.0.x or 5.1.x" "$LINENO" 5
+		as_fn_error "too old, use 5.0.x or 5.1.x" "$LINENO" 5
 	fi
 	{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for MySQL Client library" >&5
 $as_echo_n "checking for MySQL Client library... " >&6; }
@@ -13501,10 +13644,10 @@ $as_echo_n "checking for $LIBMYSQL... " >&6; }
 $as_echo "found." >&6; }
             LIBMYSQL_PATH=$with_libmysql_path
         else
-            as_fn_error $? "not found. Please specify proper path in --with-libmysql-path." "$LINENO" 5
+            as_fn_error "not found. Please specify proper path in --with-libmysql-path." "$LINENO" 5
         fi
     else
-        as_fn_error $? "not given. Please specify either --with-system-mysql or --with-libmysql-path" "$LINENO" 5
+        as_fn_error "not given. Please specify either --with-system-mysql or --with-libmysql-path" "$LINENO" 5
     fi
 fi
 
@@ -13538,7 +13681,7 @@ ac_compiler_gnu=$ac_cv_cxx_compiler_gnu
 if test "x$ac_cv_header_mysql_driver_h" = x""yes; then :
 
 else
-  as_fn_error $? "mysql_driver.h not found. install MySQL C++ Connectivity" "$LINENO" 5
+  as_fn_error "mysql_driver.h not found. install MySQL C++ Connectivity" "$LINENO" 5
 fi
 
 
@@ -13580,7 +13723,7 @@ _ACEOF
   LIBS="-lmysqlcppconn $LIBS"
 
 else
-  as_fn_error $? "MySQL C++ Connectivity lib not found or functional" "$LINENO" 5
+  as_fn_error "MySQL C++ Connectivity lib not found or functional" "$LINENO" 5
 fi
 
    { $as_echo "$as_me:${as_lineno-$LINENO}: checking version" >&5
@@ -13588,8 +13731,8 @@ $as_echo_n "checking version... " >&6; }
       if test "$cross_compiling" = yes; then :
   { { $as_echo "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5
 $as_echo "$as_me: error: in \`$ac_pwd':" >&2;}
-as_fn_error $? "cannot run test program while cross compiling
-See \`config.log' for more details" "$LINENO" 5 ; }
+as_fn_error "cannot run test program while cross compiling
+See \`config.log' for more details." "$LINENO" 5; }
 else
   cat confdefs.h - <<_ACEOF >conftest.$ac_ext
 /* end confdefs.h.  */
@@ -13612,7 +13755,7 @@ if ac_fn_cxx_try_run "$LINENO"; then :
   { $as_echo "$as_me:${as_lineno-$LINENO}: result: OK" >&5
 $as_echo "OK" >&6; }
 else
-  as_fn_error $? "not suitable, we need >= 1.0.6" "$LINENO" 5
+  as_fn_error "not suitable, we need >= 1.0.6" "$LINENO" 5
 fi
 rm -f core *.core core.conftest.* gmon.out bb.out conftest$ac_exeext \
   conftest.$ac_objext conftest.beam conftest.$ac_ext
@@ -13634,7 +13777,7 @@ $as_echo_n "checking for mysqlcppconn module... " >&6; }
           { $as_echo "$as_me:${as_lineno-$LINENO}: result: OK" >&5
 $as_echo "OK" >&6; }
         else
-          as_fn_error $? "not existing. get it (did you get the -extensions tarball?)" "$LINENO" 5
+          as_fn_error "not existing. get it (did you get the -extensions tarball?)" "$LINENO" 5
         fi
 	BUILD_TYPE="$BUILD_TYPE MYSQLCPPCONN"
 	SYSTEM_MYSQL_CPPCONN=NO
@@ -13661,11 +13804,11 @@ $as_echo "external" >&6; }
         as_ac_File=`$as_echo "ac_cv_file_$HSQLDB_JAR" | $as_tr_sh`
 { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $HSQLDB_JAR" >&5
 $as_echo_n "checking for $HSQLDB_JAR... " >&6; }
-if eval "test \"\${$as_ac_File+set}\"" = set; then :
+if { as_var=$as_ac_File; eval "test \"\${$as_var+set}\" = set"; }; then :
   $as_echo_n "(cached) " >&6
 else
   test "$cross_compiling" = yes &&
-  as_fn_error $? "cannot check for file existence when cross compiling" "$LINENO" 5
+  as_fn_error "cannot check for file existence when cross compiling" "$LINENO" 5
 if test -r "$HSQLDB_JAR"; then
   eval "$as_ac_File=yes"
 else
@@ -13675,40 +13818,41 @@ fi
 eval ac_res=\$$as_ac_File
 	       { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_res" >&5
 $as_echo "$ac_res" >&6; }
-if eval test \"x\$"$as_ac_File"\" = x"yes"; then :
+eval as_val=\$$as_ac_File
+   if test "x$as_val" = x""yes; then :
 
 else
-  as_fn_error $? "hsqldb.jar not found." "$LINENO" 5
+  as_fn_error "hsqldb.jar not found." "$LINENO" 5
 fi
 
-        { $as_echo "$as_me:${as_lineno-$LINENO}: checking whether hsqldb is >= 1.8.0.9" >&5
-$as_echo_n "checking whether hsqldb is >= 1.8.0.9... " >&6; }
+        { $as_echo "$as_me:${as_lineno-$LINENO}: checking whether hsqldb is 1.8.0.x" >&5
+$as_echo_n "checking whether hsqldb is 1.8.0.x... " >&6; }
         export HSQLDB_JAR
         if $PERL -e 'use Archive::Zip;
             my $file = "$ENV{'HSQLDB_JAR'}";
             my $zip = Archive::Zip->new( $file );
             my $mf = $zip->contents ( "META-INF/MANIFEST.MF" );
-	    if ( $mf =~ m/Specification-Version: 1.8.*/ ) {
-	    	push @l, split(/\n/, $mf);
-	    	foreach my $line (@l) {
-		    if ($line =~ m/Specification-Version:/) {
-		        ($t, $version) = split (/:/,$line);
-		        $version =~ s/^\s//;
-		        ($a, $b, $c, $d) = split (/\./,$version);
-		        if (($c == "0" && $d > "8") || $c > 0)  {
-		            exit 0;
-		        } else {
-		            exit 1;
-		        }
-		    }
-		}
-	    } else {
-	        exit 1;
+            if ( $mf =~ m/Specification-Version: 1.8.*/ ) {
+               push @l, split(/\n/, $mf);
+               foreach my $line (@l) {
+                  if ($line =~ m/Specification-Version:/) {
+                      ($t, $version) = split (/:/,$line);
+                      $version =~ s/^\s//;
+                      ($a, $b, $c, $d) = split (/\./,$version);
+                      if ($c == "0" && $d > "8")  {
+                          exit 0;
+                      } else {
+                          exit 1;
+                      }
+                  }
+               }
+            } else {
+                exit 1;
             }'; then
             { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5
 $as_echo "yes" >&6; }
          else
-            as_fn_error $? "no, hsqldb >= 1.8.0.9 is needed" "$LINENO" 5
+            as_fn_error "no, you need hsqldb >= 1.8.0.9 but < 1.8.1" "$LINENO" 5
          fi
 else
     { $as_echo "$as_me:${as_lineno-$LINENO}: result: internal" >&5
@@ -13732,11 +13876,11 @@ $as_echo "external" >&6; }
         as_ac_File=`$as_echo "ac_cv_file_$BSH_JAR" | $as_tr_sh`
 { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $BSH_JAR" >&5
 $as_echo_n "checking for $BSH_JAR... " >&6; }
-if eval "test \"\${$as_ac_File+set}\"" = set; then :
+if { as_var=$as_ac_File; eval "test \"\${$as_var+set}\" = set"; }; then :
   $as_echo_n "(cached) " >&6
 else
   test "$cross_compiling" = yes &&
-  as_fn_error $? "cannot check for file existence when cross compiling" "$LINENO" 5
+  as_fn_error "cannot check for file existence when cross compiling" "$LINENO" 5
 if test -r "$BSH_JAR"; then
   eval "$as_ac_File=yes"
 else
@@ -13746,10 +13890,11 @@ fi
 eval ac_res=\$$as_ac_File
 	       { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_res" >&5
 $as_echo "$ac_res" >&6; }
-if eval test \"x\$"$as_ac_File"\" = x"yes"; then :
+eval as_val=\$$as_ac_File
+   if test "x$as_val" = x""yes; then :
 
 else
-  as_fn_error $? "bsh.jar not found." "$LINENO" 5
+  as_fn_error "bsh.jar not found." "$LINENO" 5
 fi
 
 else
@@ -13776,7 +13921,7 @@ if test "${ac_cv_file__usr_share_java_saxon9_jar+set}" = set; then :
   $as_echo_n "(cached) " >&6
 else
   test "$cross_compiling" = yes &&
-  as_fn_error $? "cannot check for file existence when cross compiling" "$LINENO" 5
+  as_fn_error "cannot check for file existence when cross compiling" "$LINENO" 5
 if test -r "/usr/share/java/saxon9.jar"; then
   ac_cv_file__usr_share_java_saxon9_jar=yes
 else
@@ -13795,7 +13940,7 @@ if test "${ac_cv_file__usr_share_java_saxon_jar+set}" = set; then :
   $as_echo_n "(cached) " >&6
 else
   test "$cross_compiling" = yes &&
-  as_fn_error $? "cannot check for file existence when cross compiling" "$LINENO" 5
+  as_fn_error "cannot check for file existence when cross compiling" "$LINENO" 5
 if test -r "/usr/share/java/saxon.jar"; then
   ac_cv_file__usr_share_java_saxon_jar=yes
 else
@@ -13813,7 +13958,7 @@ if test "${ac_cv_file__usr_share_java_saxon9_jar+set}" = set; then :
   $as_echo_n "(cached) " >&6
 else
   test "$cross_compiling" = yes &&
-  as_fn_error $? "cannot check for file existence when cross compiling" "$LINENO" 5
+  as_fn_error "cannot check for file existence when cross compiling" "$LINENO" 5
 if test -r "/usr/share/java/saxon9.jar"; then
   ac_cv_file__usr_share_java_saxon9_jar=yes
 else
@@ -13825,7 +13970,7 @@ $as_echo "$ac_cv_file__usr_share_java_saxon9_jar" >&6; }
 if test "x$ac_cv_file__usr_share_java_saxon9_jar" = x""yes; then :
    SAXON_JAR=/usr/share/java/saxon9.jar
 else
-   as_fn_error $? "saxon.jar replacement not found" "$LINENO" 5
+   as_fn_error "saxon.jar replacement not found" "$LINENO" 5
 
 fi
 
@@ -13841,11 +13986,11 @@ fi
           as_ac_File=`$as_echo "ac_cv_file_$SAXON_JAR" | $as_tr_sh`
 { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $SAXON_JAR" >&5
 $as_echo_n "checking for $SAXON_JAR... " >&6; }
-if eval "test \"\${$as_ac_File+set}\"" = set; then :
+if { as_var=$as_ac_File; eval "test \"\${$as_var+set}\" = set"; }; then :
   $as_echo_n "(cached) " >&6
 else
   test "$cross_compiling" = yes &&
-  as_fn_error $? "cannot check for file existence when cross compiling" "$LINENO" 5
+  as_fn_error "cannot check for file existence when cross compiling" "$LINENO" 5
 if test -r "$SAXON_JAR"; then
   eval "$as_ac_File=yes"
 else
@@ -13855,10 +14000,11 @@ fi
 eval ac_res=\$$as_ac_File
 	       { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_res" >&5
 $as_echo "$ac_res" >&6; }
-if eval test \"x\$"$as_ac_File"\" = x"yes"; then :
+eval as_val=\$$as_ac_File
+   if test "x$as_val" = x""yes; then :
 
 else
-  as_fn_error $? "saxon.jar replacement not found." "$LINENO" 5
+  as_fn_error "saxon.jar replacement not found." "$LINENO" 5
 fi
 
         fi
@@ -13866,11 +14012,11 @@ fi
           as_ac_File=`$as_echo "ac_cv_file_$SERIALIZER_JAR" | $as_tr_sh`
 { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $SERIALIZER_JAR" >&5
 $as_echo_n "checking for $SERIALIZER_JAR... " >&6; }
-if eval "test \"\${$as_ac_File+set}\"" = set; then :
+if { as_var=$as_ac_File; eval "test \"\${$as_var+set}\" = set"; }; then :
   $as_echo_n "(cached) " >&6
 else
   test "$cross_compiling" = yes &&
-  as_fn_error $? "cannot check for file existence when cross compiling" "$LINENO" 5
+  as_fn_error "cannot check for file existence when cross compiling" "$LINENO" 5
 if test -r "$SERIALIZER_JAR"; then
   eval "$as_ac_File=yes"
 else
@@ -13880,10 +14026,11 @@ fi
 eval ac_res=\$$as_ac_File
 	       { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_res" >&5
 $as_echo "$ac_res" >&6; }
-if eval test \"x\$"$as_ac_File"\" = x"yes"; then :
+eval as_val=\$$as_ac_File
+   if test "x$as_val" = x""yes; then :
 
 else
-  as_fn_error $? "serializer.jar not found." "$LINENO" 5
+  as_fn_error "serializer.jar not found." "$LINENO" 5
 fi
 
 
@@ -13951,13 +14098,13 @@ $as_echo "yes" >&6; }
               cat saxontest.java >&5
               { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
 $as_echo "no" >&6; }
-              as_fn_error $? "Non-functional saxon jar, e.g. crippled saxon-he instead of saxonb" "$LINENO" 5
+              as_fn_error "Non-functional saxon jar, e.g. crippled saxon-he instead of saxonb" "$LINENO" 5
             fi
         else
           { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
 $as_echo "no" >&6; }
           cat saxontest.java >&5
-          as_fn_error $? "saxontest could not be compiled, non-functional saxon jar" "$LINENO" 5
+          as_fn_error "saxontest could not be compiled, non-functional saxon jar" "$LINENO" 5
         fi
 else
     { $as_echo "$as_me:${as_lineno-$LINENO}: result: internal" >&5
@@ -14024,7 +14171,7 @@ fi
 
 
    if test -z "$CURLCONFIG"; then
-      as_fn_error $? "install curl to run this script" "$LINENO" 5
+      as_fn_error "install curl to run this script" "$LINENO" 5
    fi
 
    # check curl version
@@ -14033,7 +14180,7 @@ $as_echo_n "checking whether curl is >= 7.13.1... " >&6; }
    if test "`$CURLCONFIG --version | $AWK -F' ' '{print $2}' | $AWK -F. '{ print $1 }'`" -gt "7" -a \
 	"`$CURLCONFIG --version | $AWK -F' ' '{print $2}' | $AWK -F. '{ print $2 }'`" -gt "13" -a \
 	"`$CURLCONFIG --version | $AWK -F' ' '{print $2}' | $AWK -F. '{ print $3 }'`" -gt "1"; then
-      as_fn_error $? "no, you need at least curl 7.13,1" "$LINENO" 5
+      as_fn_error "no, you need at least curl 7.13,1" "$LINENO" 5
    else
       { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5
 $as_echo "yes" >&6; }
@@ -14067,7 +14214,7 @@ ac_compiler_gnu=$ac_cv_cxx_compiler_gnu
 if test "x$ac_cv_header_mdds_flat_segment_tree_hpp" = x""yes; then :
 
 else
-  as_fn_error $? "mdds/flat_segment_tree.hpp not found. install mdds" "$LINENO" 5
+  as_fn_error "mdds/flat_segment_tree.hpp not found. install mdds" "$LINENO" 5
 fi
 
 
@@ -14102,7 +14249,7 @@ ac_compiler_gnu=$ac_cv_cxx_compiler_gnu
 if test "x$ac_cv_header_boost_shared_ptr_hpp" = x""yes; then :
 
 else
-  as_fn_error $? "boost/shared_ptr.hpp not found. install boost" "$LINENO" 5
+  as_fn_error "boost/shared_ptr.hpp not found. install boost" "$LINENO" 5
 fi
 
 
@@ -14110,7 +14257,7 @@ fi
 if test "x$ac_cv_header_boost_spirit_include_classic_core_hpp" = x""yes; then :
 
 else
-  as_fn_error $? "boost/spirit/include/classic_core.hpp not found. install boost >= 1.38" "$LINENO" 5
+  as_fn_error "boost/spirit/include/classic_core.hpp not found. install boost >= 1.36" "$LINENO" 5
 fi
 
 
@@ -14118,7 +14265,7 @@ fi
 if test "x$ac_cv_header_boost_function_hpp" = x""yes; then :
 
 else
-  as_fn_error $? "boost/function.hpp not found. install boost" "$LINENO" 5
+  as_fn_error "boost/function.hpp not found. install boost" "$LINENO" 5
 fi
 
 
@@ -14147,7 +14294,7 @@ fi
 rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
 
    if test "$ac_cv_cxx_boost_no_exceptons_broken" = "yes"; then
-	as_fn_error $? "no, see https://bugzilla.redhat.com/show_bug.cgi?id=477131" "$LINENO" 5
+	as_fn_error "no, see https://bugzilla.redhat.com/show_bug.cgi?id=477131" "$LINENO" 5
    else
   	{ $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5
 $as_echo "yes" >&6; }
@@ -14184,7 +14331,7 @@ ac_compiler_gnu=$ac_cv_cxx_compiler_gnu
 if test "x$ac_cv_header_vigra_copyimage_hxx" = x""yes; then :
 
 else
-  as_fn_error $? "vigra/copyimage.hxx not found. install vigra" "$LINENO" 5
+  as_fn_error "vigra/copyimage.hxx not found. install vigra" "$LINENO" 5
 fi
 
 
@@ -14214,7 +14361,7 @@ $as_echo "external" >&6; }
 if test "x$ac_cv_header_sqlext_h" = x""yes; then :
 
 else
-  as_fn_error $? "odbc not found. install odbc" "$LINENO" 5
+  as_fn_error "odbc not found. install odbc" "$LINENO" 5
 fi
 
 
@@ -14297,7 +14444,7 @@ if test "x$ac_cv_header_ldap_h" = x""yes; then :
 _ACEOF
 
 else
-  as_fn_error $? "ldap.h not found. install openldap libs" "$LINENO" 5
+  as_fn_error "ldap.h not found. install openldap libs" "$LINENO" 5
 fi
 
 done
@@ -14346,7 +14493,7 @@ _ACEOF
   LIBS="-lldap $LIBS"
 
 else
-  as_fn_error $? "openldap lib not found or functional" "$LINENO" 5
+  as_fn_error "openldap lib not found or functional" "$LINENO" 5
 fi
 
 	   # rumours say that OpenLDAP doesn't have that function. I looked and
@@ -14395,7 +14542,7 @@ _ACEOF
   LIBS="-lldap $LIBS"
 
 else
-  as_fn_error $? "openldap lib not found or functional" "$LINENO" 5
+  as_fn_error "openldap lib not found or functional" "$LINENO" 5
 fi
 
    else
@@ -14628,7 +14775,7 @@ $as_echo "$MOZ_NSS_LIBS" >&6; }
   if test $succeeded = yes; then
      :
   else
-     as_fn_error $? "Library requirements ($MOZ_FLAVOUR-nss ) not met; consider adjusting the PKG_CONFIG_PATH environment variable if your libraries are in a nonstandard prefix so pkg-config can find them." "$LINENO" 5
+     as_fn_error "Library requirements ($MOZ_FLAVOUR-nss ) not met; consider adjusting the PKG_CONFIG_PATH environment variable if your libraries are in a nonstandard prefix so pkg-config can find them." "$LINENO" 5
   fi
 
     else
@@ -14731,7 +14878,7 @@ $as_echo "$MOZ_NSPR_LIBS" >&6; }
   if test $succeeded = yes; then
      :
   else
-     as_fn_error $? "Library requirements (nspr ) not met; consider adjusting the PKG_CONFIG_PATH environment variable if your libraries are in a nonstandard prefix so pkg-config can find them." "$LINENO" 5
+     as_fn_error "Library requirements (nspr ) not met; consider adjusting the PKG_CONFIG_PATH environment variable if your libraries are in a nonstandard prefix so pkg-config can find them." "$LINENO" 5
   fi
 
       NSPR_LIB="-L`$PKG_CONFIG --variable=libdir nspr`"
@@ -14831,7 +14978,7 @@ $as_echo "$MOZ_NSPR_LIBS" >&6; }
   if test $succeeded = yes; then
      :
   else
-     as_fn_error $? "Library requirements ($MOZ_FLAVOUR-nspr ) not met; consider adjusting the PKG_CONFIG_PATH environment variable if your libraries are in a nonstandard prefix so pkg-config can find them." "$LINENO" 5
+     as_fn_error "Library requirements ($MOZ_FLAVOUR-nspr ) not met; consider adjusting the PKG_CONFIG_PATH environment variable if your libraries are in a nonstandard prefix so pkg-config can find them." "$LINENO" 5
   fi
 
     fi
@@ -15033,7 +15180,7 @@ $as_echo "$MOZILLAXPCOM_LIBS" >&6; }
   if test $succeeded = yes; then
      :
   else
-     as_fn_error $? "Library requirements (libxul ) not met; consider adjusting the PKG_CONFIG_PATH environment variable if your libraries are in a nonstandard prefix so pkg-config can find them." "$LINENO" 5
+     as_fn_error "Library requirements (libxul ) not met; consider adjusting the PKG_CONFIG_PATH environment variable if your libraries are in a nonstandard prefix so pkg-config can find them." "$LINENO" 5
   fi
 
       MOZ_INC=`$PKG_CONFIG --variable=includedir libxul`
@@ -15095,7 +15242,7 @@ _ACEOF
   LIBS="-lnss3 $LIBS"
 
 else
-  as_fn_error $? "PK11_GetCertFromPrivateKey missing but needed.
+  as_fn_error "PK11_GetCertFromPrivateKey missing but needed.
 See https://bugzilla.mozilla.org/show_bug.cgi?id=262274.
 Fixed since nss 3.9.3 (contained by e.g. mozilla >= 1.7.5)" "$LINENO" 5
 fi
@@ -15113,7 +15260,7 @@ $as_echo_n "checking whether $tmp was compiled with --enable-ldap... " >&6; }
 $as_echo "yes" >&6; }
          MOZ_LDAP_CFLAGS="-I$MOZ_INC"
       else
-        as_fn_error $? "no.
+        as_fn_error "no.
 Could not find LDAP header include files in $MOZ_INC/ldap.
 Please recompile $tmp with --enable-ldap or use --with-openldap." "$LINENO" 5
       fi
@@ -15121,7 +15268,7 @@ Please recompile $tmp with --enable-ldap or use --with-openldap." "$LINENO" 5
 
     #e.g. http://fedoraproject.org/wiki/Releases/FeatureXULRunnerAPIChanges
     #the plugin pkg-config etc. reverts to "mozilla-plugin" with libxul
-    if test "$MOZ_FLAVOUR" == "libxul"; then
+    if test "$MOZ_FLAVOUR" = "libxul"; then
         MOZ_FLAVOUR="mozilla"
     fi
 
@@ -15207,13 +15354,13 @@ $as_echo "yes" >&6; }
       { $as_echo "$as_me:${as_lineno-$LINENO}: checking for Mozilla build tooling" >&5
 $as_echo_n "checking for Mozilla build tooling... " >&6; }
       if test -z "$MOZILLABUILD" ; then
-as_fn_error $? "Mozilla build tooling not found.
+as_fn_error "Mozilla build tooling not found.
 Use the --with-mozilla-build option after installling the tools obtained
 from http://ftp.mozilla.org/pub/mozilla.org/mozilla/libraries/win32" "$LINENO" 5
       else
          if test \( "$WITH_MINGWIN" = "yes" \) ; then
             if test ! -d "$MOZILLABUILD" ; then
-as_fn_error $? "Mozilla build tooling incomplete!" "$LINENO" 5
+as_fn_error "Mozilla build tooling incomplete!" "$LINENO" 5
             else
                { $as_echo "$as_me:${as_lineno-$LINENO}: result: ok" >&5
 $as_echo "ok" >&6; }
@@ -15221,7 +15368,7 @@ $as_echo "ok" >&6; }
          else
             if test ! -d "$MOZILLABUILD/moztools" \
                -o ! -d "$MOZILLABUILD/msys" ; then
-as_fn_error $? "Mozilla build tooling incomplete!" "$LINENO" 5
+as_fn_error "Mozilla build tooling incomplete!" "$LINENO" 5
             else
                { $as_echo "$as_me:${as_lineno-$LINENO}: result: ok" >&5
 $as_echo "ok" >&6; }
@@ -15240,7 +15387,7 @@ if test "$BUILD_MOZAB" = "TRUE"; then
     if test "$WITH_MINGWIN" != "yes"; then
       # compiling with MSVC. Only supported platform here is MSVS2005 at the moment.
       if test "$MSVSVER" != "2005"; then
-        as_fn_error $? "Building SeaMonkey is supported with Microsoft Visual Studio .NET 2005 only." "$LINENO" 5
+        as_fn_error "Building SeaMonkey is supported with Microsoft Visual Studio .NET 2005 only." "$LINENO" 5
       fi
     else
       { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: Building SeaMonkey with mingwin is not tested, and likely to break." >&5
@@ -15280,14 +15427,14 @@ $as_echo "found" >&6; }
       fi
    fi
    if test "$HAVE_MOZILLA_TARBALL" != "y"; then
-      as_fn_error $? "Mozilla/SeaMonkey source archive not found.
+      as_fn_error "Mozilla/SeaMonkey source archive not found.
 Use \"./fetch_tarballs.sh ooo.lst\" to download." "$LINENO" 5
    fi
    if test "$_os" = "WINNT"; then
       { $as_echo "$as_me:${as_lineno-$LINENO}: checking for moztools binaries" >&5
 $as_echo_n "checking for moztools binaries... " >&6; }
       if test ! -e "$TARFILE_LOCATION/vc8-moztools.zip" ; then
-        as_fn_error $? "The following file is missing in $TARFILE_LOCATION: vc8-moztools.zip
+        as_fn_error "The following file is missing in $TARFILE_LOCATION: vc8-moztools.zip
 (from ftp://ftp.mozilla.org/pub/mozilla.org/mozilla/libraries/win32/historic/vc8/)" "$LINENO" 5
       else
          { $as_echo "$as_me:${as_lineno-$LINENO}: result: ok" >&5
@@ -15392,7 +15539,7 @@ $as_echo "$MOZGTK2_LIBS" >&6; }
      { $as_echo "$as_me:${as_lineno-$LINENO}: OK - can build mozilla" >&5
 $as_echo "$as_me: OK - can build mozilla" >&6;}
   else
-     as_fn_error $? "Prerequisites to build mozilla not met. Either use the precompiled mozilla binaries or install the missing packages" "$LINENO" 5
+     as_fn_error "Prerequisites to build mozilla not met. Either use the precompiled mozilla binaries or install the missing packages" "$LINENO" 5
   fi
 
       else
@@ -15494,7 +15641,7 @@ $as_echo "$MOZLIBREQ_LIBS" >&6; }
   fi
 
          if test -z "$MOZIDL"; then
-            as_fn_error $? "libIDL 0.6.3 or newer is needed to build mozilla with mac toolkit." "$LINENO" 5
+            as_fn_error "libIDL 0.6.3 or newer is needed to build mozilla with mac toolkit." "$LINENO" 5
          fi
       fi
    else
@@ -15598,7 +15745,7 @@ $as_echo "$MOZLIBREQ_LIBS" >&6; }
   fi
 
          if test -z "$MOZGTK"; then
-            as_fn_error $? "GTK2 is needed to build mozilla." "$LINENO" 5
+            as_fn_error "GTK2 is needed to build mozilla." "$LINENO" 5
          fi
 
   succeeded=no
@@ -15698,7 +15845,7 @@ $as_echo "$MOZLIBREQ_LIBS" >&6; }
   fi
 
          if test -z "$MOZIDL"; then
-            as_fn_error $? "libIDL >= 0.8.0 is needed when using GTK2 to build mozilla." "$LINENO" 5
+            as_fn_error "libIDL >= 0.8.0 is needed when using GTK2 to build mozilla." "$LINENO" 5
          fi
       else
 
@@ -15799,7 +15946,7 @@ $as_echo "$MOZLIBREQ_LIBS" >&6; }
   fi
 
          if test -z "$MOZGTK"; then
-            as_fn_error $? "gtk 1.2 is needed when not using GTK2 to build mozilla." "$LINENO" 5
+            as_fn_error "gtk 1.2 is needed when not using GTK2 to build mozilla." "$LINENO" 5
          fi
 
   succeeded=no
@@ -15899,7 +16046,7 @@ $as_echo "$MOZLIBREQ_LIBS" >&6; }
   fi
 
          if test -z "$MOZIDL"; then
-            as_fn_error $? "libIDL 0.6.3 - 0.6.8 is needed when not using GTK2 to build mozilla." "$LINENO" 5
+            as_fn_error "libIDL 0.6.3 - 0.6.8 is needed when not using GTK2 to build mozilla." "$LINENO" 5
          fi
       fi
    fi
@@ -15930,7 +16077,7 @@ $as_echo "external" >&6; }
 if test "x$ac_cv_header_sane_sane_h" = x""yes; then :
 
 else
-  as_fn_error $? "sane not found. install sane" "$LINENO" 5
+  as_fn_error "sane not found. install sane" "$LINENO" 5
 fi
 
 
@@ -15965,9 +16112,9 @@ if ac_fn_cxx_try_cpp "$LINENO"; then :
   { $as_echo "$as_me:${as_lineno-$LINENO}: result: checked." >&5
 $as_echo "checked." >&6; }
 else
-  as_fn_error $? "icu headers not found." "$LINENO" 5
+  as_fn_error "icu headers not found." "$LINENO" 5
 fi
-rm -f conftest.err conftest.i conftest.$ac_ext
+rm -f conftest.err conftest.$ac_ext
    # Extract the first word of "genbrk", so it can be a program name with args.
 set dummy genbrk; ac_word=$2
 { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
@@ -16010,7 +16157,7 @@ fi
 
 
    if test -z "$SYSTEM_GENBRK"; then
-      as_fn_error $? "\\"genbrk\\" not found in \$PATH, install the icu development tool \\"genbrk\"\" "$LINENO" 5
+      as_fn_error "\\"genbrk\\" not found in \$PATH, install the icu development tool \\"genbrk\"\" "$LINENO" 5
    fi
    # Extract the first word of "genccode", so it can be a program name with args.
 set dummy genccode; ac_word=$2
@@ -16054,7 +16201,7 @@ fi
 
 
    if test -z "$SYSTEM_GENCCODE"; then
-      as_fn_error $? "\\"genccode\\" not found in \$PATH, install the icu development tool \\"genccode\"\" "$LINENO" 5
+      as_fn_error "\\"genccode\\" not found in \$PATH, install the icu development tool \\"genccode\"\" "$LINENO" 5
    fi
    # Extract the first word of "gencmn", so it can be a program name with args.
 set dummy gencmn; ac_word=$2
@@ -16098,15 +16245,15 @@ fi
 
 
    if test -z "$SYSTEM_GENCMN"; then
-      as_fn_error $? "\\"gencmn\\" not found in \$PATH, install the icu development tool \\"gencmn\"\" "$LINENO" 5
+      as_fn_error "\\"gencmn\\" not found in \$PATH, install the icu development tool \\"gencmn\"\" "$LINENO" 5
    fi
    { $as_echo "$as_me:${as_lineno-$LINENO}: checking ICU version" >&5
 $as_echo_n "checking ICU version... " >&6; }
       if test "$cross_compiling" = yes; then :
   { { $as_echo "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5
 $as_echo "$as_me: error: in \`$ac_pwd':" >&2;}
-as_fn_error $? "cannot run test program while cross compiling
-See \`config.log' for more details" "$LINENO" 5 ; }
+as_fn_error "cannot run test program while cross compiling
+See \`config.log' for more details." "$LINENO" 5; }
 else
   cat confdefs.h - <<_ACEOF >conftest.$ac_ext
 /* end confdefs.h.  */
@@ -16125,7 +16272,7 @@ if ac_fn_cxx_try_run "$LINENO"; then :
   { $as_echo "$as_me:${as_lineno-$LINENO}: result: OK" >&5
 $as_echo "OK" >&6; }
 else
-  as_fn_error $? "not suitable, only >= 4.0 supported currently" "$LINENO" 5
+  as_fn_error "not suitable, only >= 4.0 supported currently" "$LINENO" 5
 fi
 rm -f core *.core core.conftest.* gmon.out bb.out conftest$ac_exeext \
   conftest.$ac_objext conftest.beam conftest.$ac_ext
@@ -16151,7 +16298,7 @@ fi
 
 { $as_echo "$as_me:${as_lineno-$LINENO}: checking whether to enable graphite support" >&5
 $as_echo_n "checking whether to enable graphite support... " >&6; }
-if test "$_os" = "WINNT" -o "$_os" = "Linux" && test "z$enable_graphite" == "z" -o "$enable_graphite" != "no" ; then
+if test "$_os" = "WINNT" -o "$_os" = "Linux" && test "z$enable_graphite" = "z" -o "$enable_graphite" != "no" ; then
     { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5
 $as_echo "yes" >&6; }
     ENABLE_GRAPHITE="TRUE"
@@ -16256,7 +16403,7 @@ $as_echo "$GRAPHITE_LIBS" >&6; }
   if test $succeeded = yes; then
      :
   else
-     as_fn_error $? "Library requirements (silgraphite ) not met; consider adjusting the PKG_CONFIG_PATH environment variable if your libraries are in a nonstandard prefix so pkg-config can find them." "$LINENO" 5
+     as_fn_error "Library requirements (silgraphite ) not met; consider adjusting the PKG_CONFIG_PATH environment variable if your libraries are in a nonstandard prefix so pkg-config can find them." "$LINENO" 5
   fi
 
     else
@@ -16277,7 +16424,7 @@ fi
 
 if test  "$_os" = "Darwin"; then
    if test "x$with_x" = "xyes"; then
-      as_fn_error $? "X11 build is no longer supported on MacOSX, please use the native aqua build" "$LINENO" 5
+      as_fn_error "X11 build is no longer supported on MacOSX, please use the native aqua build" "$LINENO" 5
    else
       { $as_echo "$as_me:${as_lineno-$LINENO}: checking for /System/Library/Frameworks/AppKit.framework" >&5
 $as_echo_n "checking for /System/Library/Frameworks/AppKit.framework... " >&6; }
@@ -16291,7 +16438,7 @@ $as_echo "yes" >&6; }
          ENABLE_CUPS=""
 
       else
-         as_fn_error $? "No AppKit.framewrok found" "$LINENO" 5
+         as_fn_error "No AppKit.framewrok found" "$LINENO" 5
       fi
    fi
 fi
@@ -16318,7 +16465,7 @@ if test "x$with_x" = xno; then
   have_x=disabled
 else
   case $x_includes,$x_libraries in #(
-    *\'*) as_fn_error $? "cannot use X directory names containing '" "$LINENO" 5 ;; #(
+    *\'*) as_fn_error "cannot use X directory names containing '" "$LINENO" 5;; #(
     *,NONE | NONE,*) if test "${ac_cv_have_x+set}" = set; then :
   $as_echo_n "(cached) " >&6
 else
@@ -16336,7 +16483,7 @@ libdir:
 	@echo libdir='${LIBDIR}'
 _ACEOF
   if (export CC; ${XMKMF-xmkmf}) >/dev/null 2>/dev/null && test -f Makefile; then
-    # GNU make sometimes prints "make[1]: Entering ...", which would confuse us.
+    # GNU make sometimes prints "make[1]: Entering...", which would confuse us.
     for ac_var in incroot usrlibdir libdir; do
       eval "ac_im_$ac_var=\`\${MAKE-make} $ac_var 2>/dev/null | sed -n 's/^$ac_var=//p'\`"
     done
@@ -16422,7 +16569,7 @@ else
   fi
 done
 fi
-rm -f conftest.err conftest.i conftest.$ac_ext
+rm -f conftest.err conftest.$ac_ext
 fi # $ac_x_includes = no
 
 if test "$ac_x_libraries" = no; then
@@ -16995,10 +17142,10 @@ fi
      x_libraries="default_x_libraries"
    fi
       if test -z "$x_libraries"; then
-      as_fn_error $? "No X libraries found" "$LINENO" 5  # Exit
+      as_fn_error "No X libraries found" "$LINENO" 5 # Exit
    fi
    if test -z "$x_includes"; then
-      as_fn_error $? "No X includes found" "$LINENO" 5  # Exit
+      as_fn_error "No X includes found" "$LINENO" 5 # Exit
    fi
    CFLAGS=$X_CFLAGS
    LDFLAGS="$X_LDFLAGS $X_LIBS"
@@ -17041,7 +17188,7 @@ $as_echo "$ac_cv_lib_X11_XOpenDisplay" >&6; }
 if test "x$ac_cv_lib_X11_XOpenDisplay" = x""yes; then :
   x_libs="-lX11 $X_EXTRA_LIBS"
 else
-  as_fn_error $? "X Development libraries not found" "$LINENO" 5
+  as_fn_error "X Development libraries not found" "$LINENO" 5
 fi
 
       { $as_echo "$as_me:${as_lineno-$LINENO}: checking for XauDisposeAuth in -lXau" >&5
@@ -17128,7 +17275,7 @@ if test "x$ac_cv_header_X11_Composite_h" = x""yes; then :
 _ACEOF
 
 else
-  as_fn_error $? "Xt include headers not found" "$LINENO" 5
+  as_fn_error "Xt include headers not found" "$LINENO" 5
 fi
 
 done
@@ -17146,7 +17293,7 @@ if test "x$ac_cv_header_X11_Xaw_Label_h" = x""yes; then :
 _ACEOF
 
 else
-  as_fn_error $? "Xaw include headers not found" "$LINENO" 5
+  as_fn_error "Xaw include headers not found" "$LINENO" 5
 fi
 
 done
@@ -17189,7 +17336,7 @@ _ACEOF
   LIBS="-lXaw $LIBS"
 
 else
-  as_fn_error $? "Xaw library not found or functional" "$LINENO" 5
+  as_fn_error "Xaw library not found or functional" "$LINENO" 5
 fi
 
    fi
@@ -17203,7 +17350,7 @@ if test "$ENABLE_FONTCONFIG" = "TRUE" ; then
 if test "x$ac_cv_header_fontconfig_fontconfig_h" = x""yes; then :
 
 else
-  as_fn_error $? "fontconfig/fontconfig.h could not be found. libfontconfig1-dev or fontconfig???-devel missing?" "$LINENO" 5
+  as_fn_error "fontconfig/fontconfig.h could not be found. libfontconfig1-dev or fontconfig???-devel missing?" "$LINENO" 5
 fi
 
 
@@ -17212,8 +17359,8 @@ $as_echo_n "checking whether fontconfig is >= 2.2.0... " >&6; }
     if test "$cross_compiling" = yes; then :
   { { $as_echo "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5
 $as_echo "$as_me: error: in \`$ac_pwd':" >&2;}
-as_fn_error $? "cannot run test program while cross compiling
-See \`config.log' for more details" "$LINENO" 5 ; }
+as_fn_error "cannot run test program while cross compiling
+See \`config.log' for more details." "$LINENO" 5; }
 else
   cat confdefs.h - <<_ACEOF >conftest.$ac_ext
 /* end confdefs.h.  */
@@ -17230,7 +17377,7 @@ if ac_fn_c_try_run "$LINENO"; then :
   { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5
 $as_echo "yes" >&6; }
 else
-  as_fn_error $? "no, fontconfig >= 2.2.0 needed" "$LINENO" 5
+  as_fn_error "no, fontconfig >= 2.2.0 needed" "$LINENO" 5
 fi
 rm -f core *.core core.conftest.* gmon.out bb.out conftest$ac_exeext \
   conftest.$ac_objext conftest.beam conftest.$ac_ext
@@ -17261,7 +17408,7 @@ $as_echo "external" >&6; }
 if test "x$ac_cv_header_X11_extensions_Xrender_h" = x""yes; then :
 
 else
-  as_fn_error $? "Xrender not found. install X" "$LINENO" 5
+  as_fn_error "Xrender not found. install X" "$LINENO" 5
 fi
 
 
@@ -17316,7 +17463,7 @@ _ACEOF
   LIBS="-lXrender $LIBS"
 
 else
-  as_fn_error $? "libXrender not found or functional" "$LINENO" 5
+  as_fn_error "libXrender not found or functional" "$LINENO" 5
 fi
 
 fi
@@ -17434,7 +17581,7 @@ $as_echo "$XRANDR_LIBS" >&6; }
 if test "x$ac_cv_header_X11_extensions_Xrandr_h" = x""yes; then :
 
 else
-  as_fn_error $? "X11/extensions/Xrandr.h could not be found. X11 dev missing?" "$LINENO" 5
+  as_fn_error "X11/extensions/Xrandr.h could not be found. X11 dev missing?" "$LINENO" 5
 fi
 
 
@@ -17483,7 +17630,7 @@ _ACEOF
   LIBS="-lXrandr $LIBS"
 
 else
-   as_fn_error $? "libXrandr not found or functional" "$LINENO" 5
+   as_fn_error "libXrandr not found or functional" "$LINENO" 5
 fi
 
          XRANDR_LIBS="-lXrandr "
@@ -17612,7 +17759,7 @@ $as_echo "$NEON_LIBS" >&6; }
   if test $succeeded = yes; then
      :
   else
-     as_fn_error $? "you need neon >= 0.24.x for system-neon" "$LINENO" 5
+     as_fn_error "you need neon >= 0.24.x for system-neon" "$LINENO" 5
   fi
 
         NEON_VERSION="`$PKG_CONFIG --modversion neon | $SED 's/\.//g'`"
@@ -17741,7 +17888,7 @@ $as_echo "$OPENSSL_LIBS" >&6; }
   if test $succeeded = yes; then
      :
   else
-     as_fn_error $? "Library requirements (openssl ) not met; consider adjusting the PKG_CONFIG_PATH environment variable if your libraries are in a nonstandard prefix so pkg-config can find them." "$LINENO" 5
+     as_fn_error "Library requirements (openssl ) not met; consider adjusting the PKG_CONFIG_PATH environment variable if your libraries are in a nonstandard prefix so pkg-config can find them." "$LINENO" 5
   fi
 
     fi
@@ -17867,7 +18014,7 @@ $as_echo "$AGG_LIBS" >&6; }
   if test $succeeded = yes; then
      :
   else
-     as_fn_error $? "Library requirements (libagg >= 2.3) not met; consider adjusting the PKG_CONFIG_PATH environment variable if your libraries are in a nonstandard prefix so pkg-config can find them." "$LINENO" 5
+     as_fn_error "Library requirements (libagg >= 2.3) not met; consider adjusting the PKG_CONFIG_PATH environment variable if your libraries are in a nonstandard prefix so pkg-config can find them." "$LINENO" 5
   fi
 
          { $as_echo "$as_me:${as_lineno-$LINENO}: checking agg version" >&5
@@ -17893,7 +18040,7 @@ $as_echo "2.3" >&6; }
             fi
             SYSTEM_AGG=YES
 	 else
-	    as_fn_error $? "only agg 2.3 and 2.4 are supported" "$LINENO" 5
+	    as_fn_error "only agg 2.3 and 2.4 are supported" "$LINENO" 5
 	 fi
   else
          { $as_echo "$as_me:${as_lineno-$LINENO}: result: internal" >&5
@@ -18007,7 +18154,7 @@ $as_echo "$REDLAND_LIBS" >&6; }
   if test $succeeded = yes; then
      :
   else
-     as_fn_error $? "Library requirements (redland >= 1.0.8) not met; consider adjusting the PKG_CONFIG_PATH environment variable if your libraries are in a nonstandard prefix so pkg-config can find them." "$LINENO" 5
+     as_fn_error "Library requirements (redland >= 1.0.8) not met; consider adjusting the PKG_CONFIG_PATH environment variable if your libraries are in a nonstandard prefix so pkg-config can find them." "$LINENO" 5
   fi
 
 else
@@ -18139,7 +18286,7 @@ else
 if test "x$ac_cv_header_hunspell_hunspell_hxx" = x""yes; then :
    HUNSPELL_CFLAGS=-I/usr/include/hunspell
 else
-  as_fn_error $? "hunspell headers not found." "$LINENO" 5
+  as_fn_error "hunspell headers not found." "$LINENO" 5
 fi
 
 
@@ -18185,7 +18332,7 @@ _ACEOF
   LIBS="-lhunspell $LIBS"
 
 else
-   as_fn_error $? "hunspell library not found." "$LINENO" 5
+   as_fn_error "hunspell library not found." "$LINENO" 5
 fi
 
       HUNSPELL_LIBS=-lhunspell
@@ -18217,7 +18364,7 @@ $as_echo "external" >&6; }
 if test "x$ac_cv_header_hyphen_h" = x""yes; then :
 
 else
-   as_fn_error $? "altlinuxhyph headers not found." "$LINENO" 5
+   as_fn_error "altlinuxhyph headers not found." "$LINENO" 5
 fi
 
 
@@ -18226,7 +18373,7 @@ fi
 if test "x$ac_cv_member_struct__HyphenDict_cset" = x""yes; then :
 
 else
-   as_fn_error $? "no. You are sure you have altlinuyhyph headers?" "$LINENO" 5
+   as_fn_error "no. You are sure you have altlinuyhyph headers?" "$LINENO" 5
 fi
 
     { $as_echo "$as_me:${as_lineno-$LINENO}: checking for hnj_hyphen_hyphenate2 in -lhyphen" >&5
@@ -18268,7 +18415,7 @@ $as_echo "$ac_cv_lib_hyphen_hnj_hyphen_hyphenate2" >&6; }
 if test "x$ac_cv_lib_hyphen_hnj_hyphen_hyphenate2" = x""yes; then :
   HYPHEN_LIB=-lhyphen
 else
-   as_fn_error $? "altlinuxhyph library not found or too old." "$LINENO" 5
+   as_fn_error "altlinuxhyph library not found or too old." "$LINENO" 5
 fi
 
     if test -z "$HYPHEN_LIB"; then
@@ -18311,7 +18458,7 @@ $as_echo "$ac_cv_lib_hyph_hnj_hyphen_hyphenate2" >&6; }
 if test "x$ac_cv_lib_hyph_hnj_hyphen_hyphenate2" = x""yes; then :
   HYPHEN_LIB=-lhyph
 else
-   as_fn_error $? "altlinuxhyph library not found or too old." "$LINENO" 5
+   as_fn_error "altlinuxhyph library not found or too old." "$LINENO" 5
 fi
 
     fi
@@ -18355,7 +18502,7 @@ $as_echo "$ac_cv_lib_hnj_hnj_hyphen_hyphenate2" >&6; }
 if test "x$ac_cv_lib_hnj_hnj_hyphen_hyphenate2" = x""yes; then :
   HYPHEN_LIB=-lhnj
 else
-   as_fn_error $? "altlinuxhyph library not found or too old." "$LINENO" 5
+   as_fn_error "altlinuxhyph library not found or too old." "$LINENO" 5
 fi
 
     fi
@@ -18482,7 +18629,7 @@ $as_echo "$MYTHES_LIBS" >&6; }
 if test "x$ac_cv_header_mythes_hxx" = x""yes; then :
 
 else
-   as_fn_error $? "mythes.hxx headers not found." "$LINENO" 5
+   as_fn_error "mythes.hxx headers not found." "$LINENO" 5
 fi
 
 
@@ -18566,7 +18713,7 @@ fi
 
 	fi
 	if test "$MYTHES_FOUND" = "no"; then
-		as_fn_error $? "mythes library not found!." "$LINENO" 5
+		as_fn_error "mythes library not found!." "$LINENO" 5
 	fi
     fi
     ac_ext=c
@@ -18596,9 +18743,100 @@ $as_echo "external" >&6; }
 if test "x$ac_cv_header_lpsolve_lp_lib_h" = x""yes; then :
 
 else
-   as_fn_error $? "lpsolve headers not found." "$LINENO" 5
+   as_fn_error "lpsolve headers not found." "$LINENO" 5
+fi
+
+
+    # some systems need this. Like Ubuntu....
+    { $as_echo "$as_me:${as_lineno-$LINENO}: checking for floor in -lm" >&5
+$as_echo_n "checking for floor in -lm... " >&6; }
+if test "${ac_cv_lib_m_floor+set}" = set; then :
+  $as_echo_n "(cached) " >&6
+else
+  ac_check_lib_save_LIBS=$LIBS
+LIBS="-lm  $LIBS"
+cat confdefs.h - <<_ACEOF >conftest.$ac_ext
+/* end confdefs.h.  */
+
+/* Override any GCC internal prototype to avoid an error.
+   Use char because int might match the return type of a GCC
+   builtin and then its argument prototype would still apply.  */
+#ifdef __cplusplus
+extern "C"
+#endif
+char floor ();
+int
+main ()
+{
+return floor ();
+  ;
+  return 0;
+}
+_ACEOF
+if ac_fn_c_try_link "$LINENO"; then :
+  ac_cv_lib_m_floor=yes
+else
+  ac_cv_lib_m_floor=no
+fi
+rm -f core conftest.err conftest.$ac_objext \
+    conftest$ac_exeext conftest.$ac_ext
+LIBS=$ac_check_lib_save_LIBS
+fi
+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_m_floor" >&5
+$as_echo "$ac_cv_lib_m_floor" >&6; }
+if test "x$ac_cv_lib_m_floor" = x""yes; then :
+  cat >>confdefs.h <<_ACEOF
+#define HAVE_LIBM 1
+_ACEOF
+
+  LIBS="-lm $LIBS"
+
+fi
+
+    { $as_echo "$as_me:${as_lineno-$LINENO}: checking for dlopen in -ldl" >&5
+$as_echo_n "checking for dlopen in -ldl... " >&6; }
+if test "${ac_cv_lib_dl_dlopen+set}" = set; then :
+  $as_echo_n "(cached) " >&6
+else
+  ac_check_lib_save_LIBS=$LIBS
+LIBS="-ldl  $LIBS"
+cat confdefs.h - <<_ACEOF >conftest.$ac_ext
+/* end confdefs.h.  */
+
+/* Override any GCC internal prototype to avoid an error.
+   Use char because int might match the return type of a GCC
+   builtin and then its argument prototype would still apply.  */
+#ifdef __cplusplus
+extern "C"
+#endif
+char dlopen ();
+int
+main ()
+{
+return dlopen ();
+  ;
+  return 0;
+}
+_ACEOF
+if ac_fn_c_try_link "$LINENO"; then :
+  ac_cv_lib_dl_dlopen=yes
+else
+  ac_cv_lib_dl_dlopen=no
+fi
+rm -f core conftest.err conftest.$ac_objext \
+    conftest$ac_exeext conftest.$ac_ext
+LIBS=$ac_check_lib_save_LIBS
 fi
+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_dl_dlopen" >&5
+$as_echo "$ac_cv_lib_dl_dlopen" >&6; }
+if test "x$ac_cv_lib_dl_dlopen" = x""yes; then :
+  cat >>confdefs.h <<_ACEOF
+#define HAVE_LIBDL 1
+_ACEOF
+
+  LIBS="-ldl $LIBS"
 
+fi
 
     { $as_echo "$as_me:${as_lineno-$LINENO}: checking for make_lp in -llpsolve55" >&5
 $as_echo_n "checking for make_lp in -llpsolve55... " >&6; }
@@ -18644,7 +18882,7 @@ _ACEOF
   LIBS="-llpsolve55 $LIBS"
 
 else
-   as_fn_error $? "lpsolve library not found or too old." "$LINENO" 5
+   as_fn_error "lpsolve library not found or too old." "$LINENO" 5
 fi
 
 else
@@ -18655,6 +18893,92 @@ $as_echo "internal" >&6; }
 fi
 
 
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking which libtextcat to use" >&5
+$as_echo_n "checking which libtextcat to use... " >&6; }
+if test -n "$with_system_libtextcat" && test "$with_system_libtextcat" != "no"; then
+    { $as_echo "$as_me:${as_lineno-$LINENO}: result: external" >&5
+$as_echo "external" >&6; }
+    SYSTEM_LIBTEXTCAT=YES
+    ac_fn_c_check_header_mongrel "$LINENO" "libtextcat/textcat.h" "ac_cv_header_libtextcat_textcat_h" "$ac_includes_default"
+if test "x$ac_cv_header_libtextcat_textcat_h" = x""yes; then :
+
+else
+   as_fn_error "libtextcat headers not found." "$LINENO" 5
+fi
+
+
+    { $as_echo "$as_me:${as_lineno-$LINENO}: checking for special_textcat_Init in -ltextcat" >&5
+$as_echo_n "checking for special_textcat_Init in -ltextcat... " >&6; }
+if test "${ac_cv_lib_textcat_special_textcat_Init+set}" = set; then :
+  $as_echo_n "(cached) " >&6
+else
+  ac_check_lib_save_LIBS=$LIBS
+LIBS="-ltextcat  $LIBS"
+cat confdefs.h - <<_ACEOF >conftest.$ac_ext
+/* end confdefs.h.  */
+
+/* Override any GCC internal prototype to avoid an error.
+   Use char because int might match the return type of a GCC
+   builtin and then its argument prototype would still apply.  */
+#ifdef __cplusplus
+extern "C"
+#endif
+char special_textcat_Init ();
+int
+main ()
+{
+return special_textcat_Init ();
+  ;
+  return 0;
+}
+_ACEOF
+if ac_fn_c_try_link "$LINENO"; then :
+  ac_cv_lib_textcat_special_textcat_Init=yes
+else
+  ac_cv_lib_textcat_special_textcat_Init=no
+fi
+rm -f core conftest.err conftest.$ac_objext \
+    conftest$ac_exeext conftest.$ac_ext
+LIBS=$ac_check_lib_save_LIBS
+fi
+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_textcat_special_textcat_Init" >&5
+$as_echo "$ac_cv_lib_textcat_special_textcat_Init" >&6; }
+if test "x$ac_cv_lib_textcat_special_textcat_Init" = x""yes; then :
+  cat >>confdefs.h <<_ACEOF
+#define HAVE_LIBTEXTCAT 1
+_ACEOF
+
+  LIBS="-ltextcat $LIBS"
+
+else
+   as_fn_error "libtextcat library not found or not suitable. libtextcat typically needs to be patched" "$LINENO" 5
+fi
+
+else
+    { $as_echo "$as_me:${as_lineno-$LINENO}: result: internal" >&5
+$as_echo "internal" >&6; }
+    SYSTEM_LIBTEXTCAT=NO
+    BUILD_TYPE="$BUILD_TYPE LIBTEXTCAT"
+fi
+
+
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking which libtextcat data directory to use" >&5
+$as_echo_n "checking which libtextcat data directory to use... " >&6; }
+if test -n "$with_system_libtextcat_data" && test "$with_system_libtextcat_data" != "no"; then
+    if test "$with_system_libtextcat_data" = "yes"; then
+        SYSTEM_LIBTEXTCAT_DATA=file:///usr/share/libtextcat
+    else
+        SYSTEM_LIBTEXTCAT_DATA=file://$with_system_libtextcat_data
+    fi
+    { $as_echo "$as_me:${as_lineno-$LINENO}: result: $SYSTEM_LIBTEXTCAT_DATA" >&5
+$as_echo "$SYSTEM_LIBTEXTCAT_DATA" >&6; }
+else
+    { $as_echo "$as_me:${as_lineno-$LINENO}: result: internal" >&5
+$as_echo "internal" >&6; }
+    BUILD_TYPE="$BUILD_TYPE LIBTEXTCATDATA"
+fi
+
+
 if test "$_os" = "Linux"; then
    { $as_echo "$as_me:${as_lineno-$LINENO}: checking whether libc is >= 2.1.1" >&5
 $as_echo_n "checking whether libc is >= 2.1.1... " >&6; }
@@ -18704,7 +19028,7 @@ fi
       { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5
 $as_echo "yes" >&6; }
    else
-      as_fn_error $? "no, upgrade libc" "$LINENO" 5
+      as_fn_error "no, upgrade libc" "$LINENO" 5
    fi
 fi
 
@@ -18770,7 +19094,7 @@ $as_echo_n "checking for PSDK files... " >&6; }
         PSDK_HOME=`echo $PSDK_HOME | $SED 's/\/$//'`
     # Problem with current PSDK (iz 49865)
     if test -f "$PSDK_HOME/Lib/libcp.lib"; then
-        as_fn_error $? "
+        as_fn_error "
 
 Some modules do not build correctly with MS Platform SDK - April 2005
 Edition if the library ($PSDK_HOME/Lib/libcp.lib) is found.
@@ -18791,14 +19115,14 @@ problem can be found in issue 49856." "$LINENO" 5
 		HAVE_PSDK_LIB="no"
 	fi
     if test "$HAVE_PSDK_H" = "no" -o "$HAVE_PSDK_LIB" = "no"; then
-        as_fn_error $? "Some (all?) PSDK files not found, please check if all needed Platform SDKs
+        as_fn_error "Some (all?) PSDK files not found, please check if all needed Platform SDKs
 are installed or use --with-psdk-home ." "$LINENO" 5
     fi
     if test ! -x "$PSDK_HOME/bin/msiinfo.exe" \
          -o ! -x "$PSDK_HOME/bin/msidb.exe" \
          -o ! -x "$PSDK_HOME/bin/uuidgen.exe" \
          -o ! -x "$PSDK_HOME/bin/msitran.exe" ; then
-        as_fn_error $? "Some (all) files of the Windows Installer SDK are missing, please install." "$LINENO" 5
+        as_fn_error "Some (all) files of the Windows Installer SDK are missing, please install." "$LINENO" 5
     fi
     { $as_echo "$as_me:${as_lineno-$LINENO}: result: SDK files found ...)" >&5
 $as_echo "SDK files found ...)" >&6; }
@@ -18855,7 +19179,7 @@ $as_echo_n "checking for DirectX SDK files... " >&6; }
 		    { $as_echo "$as_me:${as_lineno-$LINENO}: result: found" >&5
 $as_echo "found" >&6; }
 	    else
-		    as_fn_error $? "DirectX SDK files not found, please use --with-directx-home or -disable-directx." "$LINENO" 5
+		    as_fn_error "DirectX SDK files not found, please use --with-directx-home or -disable-directx." "$LINENO" 5
 	    fi
     else
 		DIRECTXSDK_HOME=""
@@ -18977,7 +19301,7 @@ fi
 
 
 if test -z "$BISON"; then
-   as_fn_error $? "no bison found in \$PATH, install bison" "$LINENO" 5
+   as_fn_error "no bison found in \$PATH, install bison" "$LINENO" 5
 else
    { $as_echo "$as_me:${as_lineno-$LINENO}: checking the bison version" >&5
 $as_echo_n "checking the bison version... " >&6; }
@@ -18994,7 +19318,7 @@ $as_echo "$as_me: WARNING: suspect ($BISON $_bison_version)" >&2;}
 $as_echo "checked ($BISON $_bison_version)" >&6; }
        fi
     else
-       as_fn_error $? "failed ($BISON $_bison_version need 1.875+ (or 1.75 and older))" "$LINENO" 5
+       as_fn_error "failed ($BISON $_bison_version need 1.875+ (or 1.75 and older))" "$LINENO" 5
     fi
 fi
 # Extract the first word of "flex", so it can be a program name with args.
@@ -19038,7 +19362,7 @@ fi
 
 
 if test -z "$FLEX"; then
-   as_fn_error $? "no flex found in \$PATH, install flex" "$LINENO" 5
+   as_fn_error "no flex found in \$PATH, install flex" "$LINENO" 5
 fi
 # Extract the first word of "patch", so it can be a program name with args.
 set dummy patch; ac_word=$2
@@ -19081,7 +19405,7 @@ fi
 
 
 if test -z "$PATCH"; then
-   as_fn_error $? "\\"patch\\" not found in \$PATH, install the development tool named\\"patch\"\" "$LINENO" 5
+   as_fn_error "\\"patch\\" not found in \$PATH, install the development tool named\\"patch\"\" "$LINENO" 5
 fi
 
 if test "$_os" = "SunOS" -o "$_os" = "FreeBSD" -o "$_os" = "Darwin"; then
@@ -19091,7 +19415,7 @@ if test "$_os" = "SunOS" -o "$_os" = "FreeBSD" -o "$_os" = "Darwin"; then
       if test -x "$with_gnu_patch"; then
 	GNUPATCH=$with_gnu_patch
       else
-        as_fn_error $? "--with-gnu-patch did not point to an executable" "$LINENO" 5
+        as_fn_error "--with-gnu-patch did not point to an executable" "$LINENO" 5
       fi
    fi
 
@@ -19101,7 +19425,7 @@ $as_echo_n "checking whether $GNUPATCH is GNU patch... " >&6; }
 	{ $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5
 $as_echo "yes" >&6; }
    else
-  	as_fn_error $? "no, GNU patch needed. install or specify with --with-gnu-patch=/path/to/it" "$LINENO" 5
+  	as_fn_error "no, GNU patch needed. install or specify with --with-gnu-patch=/path/to/it" "$LINENO" 5
    fi
 
 
@@ -19152,13 +19476,13 @@ fi
 done
 
     if test -z $GNUCP; then
-      as_fn_error $? "Neither gnucp nor cp found. Install GNU cp and/or specify --with-gnu-cp=/path/to/it" "$LINENO" 5
+      as_fn_error "Neither gnucp nor cp found. Install GNU cp and/or specify --with-gnu-cp=/path/to/it" "$LINENO" 5
     fi
   else
     if test -x "$with_gnu_cp"; then
       GNUCP=$with_gnu_cp
     else
-      as_fn_error $? "--with-gnu-cp did not point to an executable" "$LINENO" 5
+      as_fn_error "--with-gnu-cp did not point to an executable" "$LINENO" 5
     fi
   fi
 
@@ -19177,7 +19501,7 @@ $as_echo "yes" >&6; }
          { $as_echo "$as_me:${as_lineno-$LINENO}: result: no gnucp found - using the system's cp command" >&5
 $as_echo "no gnucp found - using the system's cp command" >&6; }
       else
-         as_fn_error $? "no, GNU cp needed. install or specify with --with-gnu-cp=/path/to/it" "$LINENO" 5
+         as_fn_error "no, GNU cp needed. install or specify with --with-gnu-cp=/path/to/it" "$LINENO" 5
       fi
    fi
   fi
@@ -19288,20 +19612,18 @@ fi
         { $as_echo "$as_me:${as_lineno-$LINENO}: result: found ($with_asm_home)" >&5
 $as_echo "found ($with_asm_home)" >&6; }
       else
-        as_fn_error $? "Configure did not find ml.exe assembler." "$LINENO" 5
+        as_fn_error "Configure did not find ml.exe assembler." "$LINENO" 5
       fi
     else
        with_asm_home="ASM_IN_PATH"
     fi
   fi
-else
-	with_asm_home="NO_ASM_HOME"
-fi
-ASM_HOME="$with_asm_home"
-if test -n "$ASM_HOME"; then
   { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ASM_HOME" >&5
 $as_echo "$ASM_HOME" >&6; }
+else
+  with_asm_home="NO_ASM_HOME"
 fi
+ASM_HOME="$with_asm_home"
 
 
 if test -z "$with_zip_home"; then
@@ -19398,12 +19720,12 @@ fi
     ZIP_HOME=`dirname "$ZIP"`
 fi
 if test -z "$ZIP" -o -z "$UNZIP"; then
-    as_fn_error $? "Zip/Unzip are required to build, please install or use --with-zip-home" "$LINENO" 5
+    as_fn_error "Zip/Unzip are required to build, please install or use --with-zip-home" "$LINENO" 5
 fi
 
 if test "$_os" = "WINNT"; then
     if test -n "`$ZIP -h | grep -i WinNT`" ; then
-as_fn_error $? "$ZIP found in the path is not the required cygwin version of Info-ZIPs zip.exe." "$LINENO" 5
+as_fn_error "$ZIP found in the path is not the required cygwin version of Info-ZIPs zip.exe." "$LINENO" 5
     fi
 fi
 
@@ -19415,7 +19737,7 @@ $as_echo_n "checking for unicows.dll... " >&6; }
       { $as_echo "$as_me:${as_lineno-$LINENO}: result: found" >&5
 $as_echo "found" >&6; }
    else
-      as_fn_error $? "The Microsoft Layer for Unicode (unicows.dll) is missing in external/unicows/.
+      as_fn_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:
@@ -19430,7 +19752,7 @@ $as_echo_n "checking for dbghelp.dll... " >&6; }
       { $as_echo "$as_me:${as_lineno-$LINENO}: result: found" >&5
 $as_echo "found" >&6; }
    else
-      as_fn_error $? "dbghelp.dll is missing in external/dbghelp/.
+      as_fn_error "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:
@@ -19442,7 +19764,7 @@ if test "$_os" = "WINNT" -a "$WITH_MINGWIN" != "yes"; then
        if ./oowintool --msvc-copy-dlls ./external/msvcp ; then
           :
        else
-          as_fn_error $? "oowintool failed to copy CRT" "$LINENO" 5
+          as_fn_error "oowintool failed to copy CRT" "$LINENO" 5
        fi
 fi
 
@@ -19453,7 +19775,7 @@ $as_echo_n "checking for gdiplus.dll... " >&6; }
       { $as_echo "$as_me:${as_lineno-$LINENO}: result: found" >&5
 $as_echo "found" >&6; }
    else
-      as_fn_error $? "gdiplus.dll is missing in external/gdiplus/.
+      as_fn_error "gdiplus.dll is missing in external/gdiplus/.
 Get it from the Microsoft site and put it into external/gdiplus.
 You may have to search Microsoft's website. Last time it was seen at:
 <http://www.microsoft.com/downloads/details.aspx?familyid=6A63AB9C-DF12-4D41-933C-BE590FEAA05A&displaylang=en>." "$LINENO" 5
@@ -19479,7 +19801,7 @@ $as_echo "found" >&6; }
          cp "$MSIWPATH" ./external/msi/ && chmod +x ./external/msi/instmsiw.exe && MSIWCOPY="OK"
       fi
       if test -z "$MSIACOPY" -o -z "$MSIWCOPY"; then
-         as_fn_error $? "instmsia.exe and/or instmsiw.exe are/is missing in the default location.
+         as_fn_error "instmsia.exe and/or instmsiw.exe are/is missing in the default location.
 These programs are part of the Visual Studio installation and should be found in a
 directory similar to:
 \"c:\\Program Files\\Microsoft Visual Studio .NET 2003\\Common7\\Tools\\Deployment\\MsiRedist\\\"
@@ -19625,7 +19947,7 @@ $as_echo "$GCONF_LIBS" >&6; }
   if test $succeeded = yes; then
      :
   else
-     as_fn_error $? "Library requirements (gconf-2.0 ) not met; consider adjusting the PKG_CONFIG_PATH environment variable if your libraries are in a nonstandard prefix so pkg-config can find them." "$LINENO" 5
+     as_fn_error "Library requirements (gconf-2.0 ) not met; consider adjusting the PKG_CONFIG_PATH environment variable if your libraries are in a nonstandard prefix so pkg-config can find them." "$LINENO" 5
   fi
 
 else
@@ -19736,7 +20058,7 @@ $as_echo "$GNOMEVFS_LIBS" >&6; }
   if test $succeeded = yes; then
      :
   else
-     as_fn_error $? "Library requirements (gnome-vfs-2.0 >= 2.6.0 ) not met; consider adjusting the PKG_CONFIG_PATH environment variable if your libraries are in a nonstandard prefix so pkg-config can find them." "$LINENO" 5
+     as_fn_error "Library requirements (gnome-vfs-2.0 >= 2.6.0 ) not met; consider adjusting the PKG_CONFIG_PATH environment variable if your libraries are in a nonstandard prefix so pkg-config can find them." "$LINENO" 5
   fi
 
     if test "$ENABLE_GCONF" != "TRUE"; then
@@ -19834,7 +20156,7 @@ $as_echo "$GCONF_LIBS" >&6; }
   if test $succeeded = yes; then
      :
   else
-     as_fn_error $? "Library requirements (gconf-2.0 ) not met; consider adjusting the PKG_CONFIG_PATH environment variable if your libraries are in a nonstandard prefix so pkg-config can find them." "$LINENO" 5
+     as_fn_error "Library requirements (gconf-2.0 ) not met; consider adjusting the PKG_CONFIG_PATH environment variable if your libraries are in a nonstandard prefix so pkg-config can find them." "$LINENO" 5
   fi
 
     fi
@@ -19946,7 +20268,7 @@ $as_echo "$GTK_LIBS" >&6; }
   if test $succeeded = yes; then
      :
   else
-     as_fn_error $? "requirements to build the gtk-plugin not met. Use --disable-gtk or install the missing packages" "$LINENO" 5
+     as_fn_error "requirements to build the gtk-plugin not met. Use --disable-gtk or install the missing packages" "$LINENO" 5
   fi
 
       BUILD_TYPE="$BUILD_TYPE GTK"
@@ -20056,7 +20378,7 @@ $as_echo "$DBUS_LIBS" >&6; }
   if test $succeeded = yes; then
      :
   else
-     as_fn_error $? "Library requirements (dbus-glib-1 >= 0.70 ) not met; consider adjusting the PKG_CONFIG_PATH environment variable if your libraries are in a nonstandard prefix so pkg-config can find them." "$LINENO" 5
+     as_fn_error "Library requirements (dbus-glib-1 >= 0.70 ) not met; consider adjusting the PKG_CONFIG_PATH environment variable if your libraries are in a nonstandard prefix so pkg-config can find them." "$LINENO" 5
   fi
 
       else
@@ -20068,7 +20390,7 @@ $as_echo "no" >&6; }
 $as_echo_n "checking whether to enable GIO support... " >&6; }
       if test "$_os" != "WINNT" -a "$_os" != "Darwin" -a "$enable_gio" = "yes"; then
           if test "$ENABLE_GNOMEVFS" = "TRUE" ; then
-             as_fn_error $? "please use --enable-gio only together with --disable-gnome-vfs." "$LINENO" 5
+             as_fn_error "please use --enable-gio only together with --disable-gnome-vfs." "$LINENO" 5
           fi
           ENABLE_GIO="TRUE"
           { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5
@@ -20167,7 +20489,7 @@ $as_echo "$GIO_LIBS" >&6; }
   if test $succeeded = yes; then
      :
   else
-     as_fn_error $? "Library requirements (gio-2.0 ) not met; consider adjusting the PKG_CONFIG_PATH environment variable if your libraries are in a nonstandard prefix so pkg-config can find them." "$LINENO" 5
+     as_fn_error "Library requirements (gio-2.0 ) not met; consider adjusting the PKG_CONFIG_PATH environment variable if your libraries are in a nonstandard prefix so pkg-config can find them." "$LINENO" 5
   fi
 
       else
@@ -20185,6 +20507,125 @@ fi
 
 
 
+GSTREAMER_CFLAGS=""
+GSTREAMER_LIBS=""
+ENABLE_GSTREAMER=""
+
+if test "$test_gstreamer" = "yes"; then
+    { $as_echo "$as_me:${as_lineno-$LINENO}: checking whether to build the GStreamer media backend" >&5
+$as_echo_n "checking whether to build the GStreamer media backend... " >&6; }
+    if test "x$enable_gstreamer" != "xno" ; 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
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
+$as_echo_n "checking for $ac_word... " >&6; }
+if test "${ac_cv_path_PKG_CONFIG+set}" = set; then :
+  $as_echo_n "(cached) " >&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 { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
+    ac_cv_path_PKG_CONFIG="$as_dir/$ac_word$ac_exec_ext"
+    $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
+    break 2
+  fi
+done
+  done
+IFS=$as_save_IFS
+
+  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
+  { $as_echo "$as_me:${as_lineno-$LINENO}: result: $PKG_CONFIG" >&5
+$as_echo "$PKG_CONFIG" >&6; }
+else
+  { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
+$as_echo "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
+        { $as_echo "$as_me:${as_lineno-$LINENO}: checking for gtk+-2.0 >= 2.4 gthread-2.0 gstreamer-0.10 gstreamer-interfaces-0.10 " >&5
+$as_echo_n "checking for gtk+-2.0 >= 2.4 gthread-2.0 gstreamer-0.10 gstreamer-interfaces-0.10 ... " >&6; }
+
+        if $PKG_CONFIG --exists "gtk+-2.0 >= 2.4 gthread-2.0 gstreamer-0.10 gstreamer-interfaces-0.10 " ; then
+            { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5
+$as_echo "yes" >&6; }
+            succeeded=yes
+
+            { $as_echo "$as_me:${as_lineno-$LINENO}: checking GSTREAMER_CFLAGS" >&5
+$as_echo_n "checking GSTREAMER_CFLAGS... " >&6; }
+            GSTREAMER_CFLAGS=`$PKG_CONFIG --cflags "gtk+-2.0 >= 2.4 gthread-2.0 gstreamer-0.10 gstreamer-interfaces-0.10 "`
+            { $as_echo "$as_me:${as_lineno-$LINENO}: result: $GSTREAMER_CFLAGS" >&5
+$as_echo "$GSTREAMER_CFLAGS" >&6; }
+
+            { $as_echo "$as_me:${as_lineno-$LINENO}: checking GSTREAMER_LIBS" >&5
+$as_echo_n "checking GSTREAMER_LIBS... " >&6; }
+            GSTREAMER_LIBS=`$PKG_CONFIG --libs "gtk+-2.0 >= 2.4 gthread-2.0 gstreamer-0.10 gstreamer-interfaces-0.10 "`
+            { $as_echo "$as_me:${as_lineno-$LINENO}: result: $GSTREAMER_LIBS" >&5
+$as_echo "$GSTREAMER_LIBS" >&6; }
+        else
+            GSTREAMER_CFLAGS=""
+            GSTREAMER_LIBS=""
+            ## If we have a custom action on failure, don't print errors, but
+            ## do set a variable so people can do so.
+            GSTREAMER_PKG_ERRORS=`$PKG_CONFIG --errors-to-stdout --print-errors "gtk+-2.0 >= 2.4 gthread-2.0 gstreamer-0.10 gstreamer-interfaces-0.10 "`
+
+        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
+     as_fn_error "requirements to build the GStreamer media backend not met. Use --disable-gstreamer or install the missing packages" "$LINENO" 5
+  fi
+
+        ENABLE_GSTREAMER="TRUE"
+        { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5
+$as_echo "yes" >&6; }
+    else
+        { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
+$as_echo "no" >&6; }
+    fi
+fi
+
+
+
+
+
+
 ENABLE_CAIRO=""
 BUILD_PIXMAN=""
 SYSTEM_CAIRO=""
@@ -20299,11 +20740,11 @@ $as_echo "$CAIRO_LIBS" >&6; }
   if test $succeeded = yes; then
      :
   else
-     as_fn_error $? "Library requirements (cairo >= 1.0.2 ) not met; consider adjusting the PKG_CONFIG_PATH environment variable if your libraries are in a nonstandard prefix so pkg-config can find them." "$LINENO" 5
+     as_fn_error "Library requirements (cairo >= 1.0.2 ) not met; consider adjusting the PKG_CONFIG_PATH environment variable if your libraries are in a nonstandard prefix so pkg-config can find them." "$LINENO" 5
   fi
 
 	   if test "$_os" != "WINNT" -a "$_os" != "Darwin" -a "$ENABLE_FONTCONFIG" != "TRUE" ; then
-	      as_fn_error $? "Cairo library requires fontconfig." "$LINENO" 5
+	      as_fn_error "Cairo library requires fontconfig." "$LINENO" 5
 	   fi
            if test "$with_system_xrender_headers" = "yes"; then
               { $as_echo "$as_me:${as_lineno-$LINENO}: checking whether Xrender.h defines PictStandardA8" >&5
@@ -20311,8 +20752,8 @@ $as_echo_n "checking whether Xrender.h defines PictStandardA8... " >&6; }
               if test "$cross_compiling" = yes; then :
   { { $as_echo "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5
 $as_echo "$as_me: error: in \`$ac_pwd':" >&2;}
-as_fn_error $? "cannot run test program while cross compiling
-See \`config.log' for more details" "$LINENO" 5 ; }
+as_fn_error "cannot run test program while cross compiling
+See \`config.log' for more details." "$LINENO" 5; }
 else
   cat confdefs.h - <<_ACEOF >conftest.$ac_ext
 /* end confdefs.h.  */
@@ -20332,7 +20773,7 @@ if ac_fn_c_try_run "$LINENO"; then :
   { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5
 $as_echo "yes" >&6; }
 else
-  as_fn_error $? "no, X headers too old." "$LINENO" 5
+  as_fn_error "no, X headers too old." "$LINENO" 5
 fi
 rm -f core *.core core.conftest.* gmon.out bb.out conftest$ac_exeext \
   conftest.$ac_objext conftest.beam conftest.$ac_ext
@@ -20371,7 +20812,7 @@ $as_echo "yes" >&6; }
 if test "x$ac_cv_header_GL_gl_h" = x""yes; then :
 
 else
-  as_fn_error $? "OpenGL headers not found" "$LINENO" 5
+  as_fn_error "OpenGL headers not found" "$LINENO" 5
 fi
 
 
@@ -20413,7 +20854,7 @@ _ACEOF
   LIBS="-lGL $LIBS"
 
 else
-  as_fn_error $? "libGL not installed or functional" "$LINENO" 5
+  as_fn_error "libGL not installed or functional" "$LINENO" 5
 fi
 
    { $as_echo "$as_me:${as_lineno-$LINENO}: checking for main in -lGLU" >&5
@@ -20454,7 +20895,7 @@ _ACEOF
   LIBS="-lGLU $LIBS"
 
 else
-  as_fn_error $? "libGLU not installed or functional" "$LINENO" 5
+  as_fn_error "libGLU not installed or functional" "$LINENO" 5
 fi
 
    ENABLE_OPENGL=TRUE
@@ -20612,7 +21053,7 @@ $as_echo "$POPPLER_LIBS" >&6; }
   if test $succeeded = yes; then
      :
   else
-     as_fn_error $? "Library requirements (poppler >= 0.8.0 ) not met; consider adjusting the PKG_CONFIG_PATH environment variable if your libraries are in a nonstandard prefix so pkg-config can find them." "$LINENO" 5
+     as_fn_error "Library requirements (poppler >= 0.8.0 ) not met; consider adjusting the PKG_CONFIG_PATH environment variable if your libraries are in a nonstandard prefix so pkg-config can find them." "$LINENO" 5
   fi
 
   else
@@ -20626,7 +21067,7 @@ $as_echo_n "checking for xpdf module... " >&6; }
        { $as_echo "$as_me:${as_lineno-$LINENO}: result: OK" >&5
 $as_echo "OK" >&6; }
       else
-        as_fn_error $? "not existing. get it (did you get the -extensions tarball?)" "$LINENO" 5
+        as_fn_error "not existing. get it (did you get the -extensions tarball?)" "$LINENO" 5
       fi
   fi
 else
@@ -20646,7 +21087,7 @@ $as_echo_n "checking for sdext module... " >&6; }
    { $as_echo "$as_me:${as_lineno-$LINENO}: result: OK" >&5
 $as_echo "OK" >&6; }
   else
-   as_fn_error $? "not existing. get it (did you get the -extensions tarball?)" "$LINENO" 5
+   as_fn_error "not existing. get it (did you get the -extensions tarball?)" "$LINENO" 5
   fi
   BUILD_TYPE="$BUILD_TYPE SDEXT"
 fi
@@ -20662,7 +21103,7 @@ $as_echo_n "checking for swext module... " >&6; }
    { $as_echo "$as_me:${as_lineno-$LINENO}: result: OK" >&5
 $as_echo "OK" >&6; }
   else
-   as_fn_error $? "not existing. get it (did you get the -extensions tarball?)" "$LINENO" 5
+   as_fn_error "not existing. get it (did you get the -extensions tarball?)" "$LINENO" 5
   fi
   ENABLE_MEDIAWIKI=YES
   BUILD_TYPE="$BUILD_TYPE SWEXT"
@@ -20673,7 +21114,7 @@ $as_echo "no" >&6; }
 fi
 
 
-if test "$ENABLE_MEDIAWIKI" == "YES"; then
+if test "$ENABLE_MEDIAWIKI" = "YES"; then
   { $as_echo "$as_me:${as_lineno-$LINENO}: checking which Servlet API Jar to use" >&5
 $as_echo_n "checking which Servlet API Jar to use... " >&6; }
   if test -n "$with_system_servlet_api"; then
@@ -20686,11 +21127,11 @@ $as_echo "external" >&6; }
       as_ac_File=`$as_echo "ac_cv_file_$SERVLETAPI_JAR" | $as_tr_sh`
 { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $SERVLETAPI_JAR" >&5
 $as_echo_n "checking for $SERVLETAPI_JAR... " >&6; }
-if eval "test \"\${$as_ac_File+set}\"" = set; then :
+if { as_var=$as_ac_File; eval "test \"\${$as_var+set}\" = set"; }; then :
   $as_echo_n "(cached) " >&6
 else
   test "$cross_compiling" = yes &&
-  as_fn_error $? "cannot check for file existence when cross compiling" "$LINENO" 5
+  as_fn_error "cannot check for file existence when cross compiling" "$LINENO" 5
 if test -r "$SERVLETAPI_JAR"; then
   eval "$as_ac_File=yes"
 else
@@ -20700,10 +21141,11 @@ fi
 eval ac_res=\$$as_ac_File
 	       { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_res" >&5
 $as_echo "$ac_res" >&6; }
-if eval test \"x\$"$as_ac_File"\" = x"yes"; then :
+eval as_val=\$$as_ac_File
+   if test "x$as_val" = x""yes; then :
 
 else
-  as_fn_error $? "servlet-api.jar not found." "$LINENO" 5
+  as_fn_error "servlet-api.jar not found." "$LINENO" 5
 fi
 
   else
@@ -20728,13 +21170,13 @@ $as_echo_n "checking for reportbuilder module... " >&6; }
     { $as_echo "$as_me:${as_lineno-$LINENO}: result: OK" >&5
 $as_echo "OK" >&6; }
   else
-    as_fn_error $? "not existing. get it (did you get the -extensions tarball?)" "$LINENO" 5
+    as_fn_error "not existing. get it (did you get the -extensions tarball?)" "$LINENO" 5
   fi
   { $as_echo "$as_me:${as_lineno-$LINENO}: checking which jfreereport libs to use" >&5
 $as_echo_n "checking which jfreereport libs to use... " >&6; }
-  if test "$with_system_jfreereport" == "yes"; then
-   	SYSTEM_JFREEREPORT=YES
-  	   { $as_echo "$as_me:${as_lineno-$LINENO}: result: external" >&5
+  if test "$with_system_jfreereport" = "yes"; then
+      SYSTEM_JFREEREPORT=YES
+      { $as_echo "$as_me:${as_lineno-$LINENO}: result: external" >&5
 $as_echo "external" >&6; }
       if test -z $SAC_JAR; then
              SAC_JAR=/usr/share/java/sac.jar
@@ -20742,11 +21184,11 @@ $as_echo "external" >&6; }
       as_ac_File=`$as_echo "ac_cv_file_$SAC_JAR" | $as_tr_sh`
 { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $SAC_JAR" >&5
 $as_echo_n "checking for $SAC_JAR... " >&6; }
-if eval "test \"\${$as_ac_File+set}\"" = set; then :
+if { as_var=$as_ac_File; eval "test \"\${$as_var+set}\" = set"; }; then :
   $as_echo_n "(cached) " >&6
 else
   test "$cross_compiling" = yes &&
-  as_fn_error $? "cannot check for file existence when cross compiling" "$LINENO" 5
+  as_fn_error "cannot check for file existence when cross compiling" "$LINENO" 5
 if test -r "$SAC_JAR"; then
   eval "$as_ac_File=yes"
 else
@@ -20756,10 +21198,11 @@ fi
 eval ac_res=\$$as_ac_File
 	       { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_res" >&5
 $as_echo "$ac_res" >&6; }
-if eval test \"x\$"$as_ac_File"\" = x"yes"; then :
+eval as_val=\$$as_ac_File
+   if test "x$as_val" = x""yes; then :
 
 else
-  as_fn_error $? "sac.jar not found." "$LINENO" 5
+  as_fn_error "sac.jar not found." "$LINENO" 5
 fi
 
 
@@ -20770,7 +21213,7 @@ if test "${ac_cv_file__usr_share_java_libxml_1_0_0_jar+set}" = set; then :
   $as_echo_n "(cached) " >&6
 else
   test "$cross_compiling" = yes &&
-  as_fn_error $? "cannot check for file existence when cross compiling" "$LINENO" 5
+  as_fn_error "cannot check for file existence when cross compiling" "$LINENO" 5
 if test -r "/usr/share/java/libxml-1.0.0.jar"; then
   ac_cv_file__usr_share_java_libxml_1_0_0_jar=yes
 else
@@ -20789,7 +21232,7 @@ if test "${ac_cv_file__usr_share_java_libxml_jar+set}" = set; then :
   $as_echo_n "(cached) " >&6
 else
   test "$cross_compiling" = yes &&
-  as_fn_error $? "cannot check for file existence when cross compiling" "$LINENO" 5
+  as_fn_error "cannot check for file existence when cross compiling" "$LINENO" 5
 if test -r "/usr/share/java/libxml.jar"; then
   ac_cv_file__usr_share_java_libxml_jar=yes
 else
@@ -20801,7 +21244,7 @@ $as_echo "$ac_cv_file__usr_share_java_libxml_jar" >&6; }
 if test "x$ac_cv_file__usr_share_java_libxml_jar" = x""yes; then :
    LIBXML_JAR=/usr/share/java/libxml.jar
 else
-  as_fn_error $? "libxml.jar replacement not found." "$LINENO" 5
+  as_fn_error "libxml.jar replacement not found." "$LINENO" 5
 
 fi
 
@@ -20813,11 +21256,11 @@ fi
         as_ac_File=`$as_echo "ac_cv_file_$LIBXML_JAR" | $as_tr_sh`
 { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $LIBXML_JAR" >&5
 $as_echo_n "checking for $LIBXML_JAR... " >&6; }
-if eval "test \"\${$as_ac_File+set}\"" = set; then :
+if { as_var=$as_ac_File; eval "test \"\${$as_var+set}\" = set"; }; then :
   $as_echo_n "(cached) " >&6
 else
   test "$cross_compiling" = yes &&
-  as_fn_error $? "cannot check for file existence when cross compiling" "$LINENO" 5
+  as_fn_error "cannot check for file existence when cross compiling" "$LINENO" 5
 if test -r "$LIBXML_JAR"; then
   eval "$as_ac_File=yes"
 else
@@ -20827,10 +21270,11 @@ fi
 eval ac_res=\$$as_ac_File
 	       { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_res" >&5
 $as_echo "$ac_res" >&6; }
-if eval test \"x\$"$as_ac_File"\" = x"yes"; then :
+eval as_val=\$$as_ac_File
+   if test "x$as_val" = x""yes; then :
 
 else
-  as_fn_error $? "libxml.jar not found." "$LINENO" 5
+  as_fn_error "libxml.jar not found." "$LINENO" 5
 fi
 
       fi
@@ -20842,7 +21286,7 @@ if test "${ac_cv_file__usr_share_java_flute_1_3_0_jar+set}" = set; then :
   $as_echo_n "(cached) " >&6
 else
   test "$cross_compiling" = yes &&
-  as_fn_error $? "cannot check for file existence when cross compiling" "$LINENO" 5
+  as_fn_error "cannot check for file existence when cross compiling" "$LINENO" 5
 if test -r "/usr/share/java/flute-1.3.0.jar"; then
   ac_cv_file__usr_share_java_flute_1_3_0_jar=yes
 else
@@ -20861,7 +21305,7 @@ if test "${ac_cv_file__usr_share_java_flute_jar+set}" = set; then :
   $as_echo_n "(cached) " >&6
 else
   test "$cross_compiling" = yes &&
-  as_fn_error $? "cannot check for file existence when cross compiling" "$LINENO" 5
+  as_fn_error "cannot check for file existence when cross compiling" "$LINENO" 5
 if test -r "/usr/share/java/flute.jar"; then
   ac_cv_file__usr_share_java_flute_jar=yes
 else
@@ -20873,7 +21317,7 @@ $as_echo "$ac_cv_file__usr_share_java_flute_jar" >&6; }
 if test "x$ac_cv_file__usr_share_java_flute_jar" = x""yes; then :
    FLUTE_JAR=/usr/share/java/flute.jar
 else
-   as_fn_error $? "flute-1.3.0.jar replacement not found." "$LINENO" 5
+   as_fn_error "flute-1.3.0.jar replacement not found." "$LINENO" 5
 
 fi
 
@@ -20885,11 +21329,11 @@ fi
         as_ac_File=`$as_echo "ac_cv_file_$FLUTE_JAR" | $as_tr_sh`
 { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $FLUTE_JAR" >&5
 $as_echo_n "checking for $FLUTE_JAR... " >&6; }
-if eval "test \"\${$as_ac_File+set}\"" = set; then :
+if { as_var=$as_ac_File; eval "test \"\${$as_var+set}\" = set"; }; then :
   $as_echo_n "(cached) " >&6
 else
   test "$cross_compiling" = yes &&
-  as_fn_error $? "cannot check for file existence when cross compiling" "$LINENO" 5
+  as_fn_error "cannot check for file existence when cross compiling" "$LINENO" 5
 if test -r "$FLUTE_JAR"; then
   eval "$as_ac_File=yes"
 else
@@ -20899,10 +21343,11 @@ fi
 eval ac_res=\$$as_ac_File
 	       { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_res" >&5
 $as_echo "$ac_res" >&6; }
-if eval test \"x\$"$as_ac_File"\" = x"yes"; then :
+eval as_val=\$$as_ac_File
+   if test "x$as_val" = x""yes; then :
 
 else
-  as_fn_error $? "flute-1.3.0.jar not found." "$LINENO" 5
+  as_fn_error "flute-1.3.0.jar not found." "$LINENO" 5
 fi
 
       fi
@@ -20914,7 +21359,7 @@ if test "${ac_cv_file__usr_share_java_flow_engine_0_9_2_jar+set}" = set; then :
   $as_echo_n "(cached) " >&6
 else
   test "$cross_compiling" = yes &&
-  as_fn_error $? "cannot check for file existence when cross compiling" "$LINENO" 5
+  as_fn_error "cannot check for file existence when cross compiling" "$LINENO" 5
 if test -r "/usr/share/java/flow-engine-0.9.2.jar"; then
   ac_cv_file__usr_share_java_flow_engine_0_9_2_jar=yes
 else
@@ -20933,7 +21378,7 @@ if test "${ac_cv_file__usr_share_java_flow_engine_jar+set}" = set; then :
   $as_echo_n "(cached) " >&6
 else
   test "$cross_compiling" = yes &&
-  as_fn_error $? "cannot check for file existence when cross compiling" "$LINENO" 5
+  as_fn_error "cannot check for file existence when cross compiling" "$LINENO" 5
 if test -r "/usr/share/java/flow-engine.jar"; then
   ac_cv_file__usr_share_java_flow_engine_jar=yes
 else
@@ -20945,7 +21390,7 @@ $as_echo "$ac_cv_file__usr_share_java_flow_engine_jar" >&6; }
 if test "x$ac_cv_file__usr_share_java_flow_engine_jar" = x""yes; then :
    JFREEREPORT_JAR=/usr/share/java/flow-engine.jar
 else
-  as_fn_error $? "jfreereport.jar replacement not found." "$LINENO" 5
+  as_fn_error "jfreereport.jar replacement not found." "$LINENO" 5
 
 fi
 
@@ -20957,11 +21402,11 @@ fi
         as_ac_File=`$as_echo "ac_cv_file_$JFREEREPORT_JAR" | $as_tr_sh`
 { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $JFREEREPORT_JAR" >&5
 $as_echo_n "checking for $JFREEREPORT_JAR... " >&6; }
-if eval "test \"\${$as_ac_File+set}\"" = set; then :
+if { as_var=$as_ac_File; eval "test \"\${$as_var+set}\" = set"; }; then :
   $as_echo_n "(cached) " >&6
 else
   test "$cross_compiling" = yes &&
-  as_fn_error $? "cannot check for file existence when cross compiling" "$LINENO" 5
+  as_fn_error "cannot check for file existence when cross compiling" "$LINENO" 5
 if test -r "$JFREEREPORT_JAR"; then
   eval "$as_ac_File=yes"
 else
@@ -20971,10 +21416,11 @@ fi
 eval ac_res=\$$as_ac_File
 	       { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_res" >&5
 $as_echo "$ac_res" >&6; }
-if eval test \"x\$"$as_ac_File"\" = x"yes"; then :
+eval as_val=\$$as_ac_File
+   if test "x$as_val" = x""yes; then :
 
 else
-  as_fn_error $? "jfreereport.jar not found." "$LINENO" 5
+  as_fn_error "jfreereport.jar not found." "$LINENO" 5
 fi
 
       fi
@@ -20986,7 +21432,7 @@ if test "${ac_cv_file__usr_share_java_liblayout_0_2_9_jar+set}" = set; then :
   $as_echo_n "(cached) " >&6
 else
   test "$cross_compiling" = yes &&
-  as_fn_error $? "cannot check for file existence when cross compiling" "$LINENO" 5
+  as_fn_error "cannot check for file existence when cross compiling" "$LINENO" 5
 if test -r "/usr/share/java/liblayout-0.2.9.jar"; then
   ac_cv_file__usr_share_java_liblayout_0_2_9_jar=yes
 else
@@ -21005,7 +21451,7 @@ if test "${ac_cv_file__usr_share_java_liblayout_jar+set}" = set; then :
   $as_echo_n "(cached) " >&6
 else
   test "$cross_compiling" = yes &&
-  as_fn_error $? "cannot check for file existence when cross compiling" "$LINENO" 5
+  as_fn_error "cannot check for file existence when cross compiling" "$LINENO" 5
 if test -r "/usr/share/java/liblayout.jar"; then
   ac_cv_file__usr_share_java_liblayout_jar=yes
 else
@@ -21017,7 +21463,7 @@ $as_echo "$ac_cv_file__usr_share_java_liblayout_jar" >&6; }
 if test "x$ac_cv_file__usr_share_java_liblayout_jar" = x""yes; then :
    LIBLAYOUT_JAR=/usr/share/java/liblayout.jar
 else
-  as_fn_error $? "liblayout.jar replacement not found." "$LINENO" 5
+  as_fn_error "liblayout.jar replacement not found." "$LINENO" 5
 
 fi
 
@@ -21029,11 +21475,11 @@ fi
         as_ac_File=`$as_echo "ac_cv_file_$LIBLAYOUT_JAR" | $as_tr_sh`
 { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $LIBLAYOUT_JAR" >&5
 $as_echo_n "checking for $LIBLAYOUT_JAR... " >&6; }
-if eval "test \"\${$as_ac_File+set}\"" = set; then :
+if { as_var=$as_ac_File; eval "test \"\${$as_var+set}\" = set"; }; then :
   $as_echo_n "(cached) " >&6
 else
   test "$cross_compiling" = yes &&
-  as_fn_error $? "cannot check for file existence when cross compiling" "$LINENO" 5
+  as_fn_error "cannot check for file existence when cross compiling" "$LINENO" 5
 if test -r "$LIBLAYOUT_JAR"; then
   eval "$as_ac_File=yes"
 else
@@ -21043,10 +21489,11 @@ fi
 eval ac_res=\$$as_ac_File
 	       { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_res" >&5
 $as_echo "$ac_res" >&6; }
-if eval test \"x\$"$as_ac_File"\" = x"yes"; then :
+eval as_val=\$$as_ac_File
+   if test "x$as_val" = x""yes; then :
 
 else
-  as_fn_error $? "liblayout.jar not found." "$LINENO" 5
+  as_fn_error "liblayout.jar not found." "$LINENO" 5
 fi
 
       fi
@@ -21058,7 +21505,7 @@ if test "${ac_cv_file__usr_share_java_libloader_1_0_0_jar+set}" = set; then :
   $as_echo_n "(cached) " >&6
 else
   test "$cross_compiling" = yes &&
-  as_fn_error $? "cannot check for file existence when cross compiling" "$LINENO" 5
+  as_fn_error "cannot check for file existence when cross compiling" "$LINENO" 5
 if test -r "/usr/share/java/libloader-1.0.0.jar"; then
   ac_cv_file__usr_share_java_libloader_1_0_0_jar=yes
 else
@@ -21077,7 +21524,7 @@ if test "${ac_cv_file__usr_share_java_libloader_jar+set}" = set; then :
   $as_echo_n "(cached) " >&6
 else
   test "$cross_compiling" = yes &&
-  as_fn_error $? "cannot check for file existence when cross compiling" "$LINENO" 5
+  as_fn_error "cannot check for file existence when cross compiling" "$LINENO" 5
 if test -r "/usr/share/java/libloader.jar"; then
   ac_cv_file__usr_share_java_libloader_jar=yes
 else
@@ -21089,7 +21536,7 @@ $as_echo "$ac_cv_file__usr_share_java_libloader_jar" >&6; }
 if test "x$ac_cv_file__usr_share_java_libloader_jar" = x""yes; then :
    LIBLOADER_JAR=/usr/share/java/libloader.jar
 else
-  as_fn_error $? "libloader.jar replacement not found." "$LINENO" 5
+  as_fn_error "libloader.jar replacement not found." "$LINENO" 5
 
 fi
 
@@ -21101,11 +21548,11 @@ fi
         as_ac_File=`$as_echo "ac_cv_file_$LIBLOADER_JAR" | $as_tr_sh`
 { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $LIBLOADER_JAR" >&5
 $as_echo_n "checking for $LIBLOADER_JAR... " >&6; }
-if eval "test \"\${$as_ac_File+set}\"" = set; then :
+if { as_var=$as_ac_File; eval "test \"\${$as_var+set}\" = set"; }; then :
   $as_echo_n "(cached) " >&6
 else
   test "$cross_compiling" = yes &&
-  as_fn_error $? "cannot check for file existence when cross compiling" "$LINENO" 5
+  as_fn_error "cannot check for file existence when cross compiling" "$LINENO" 5
 if test -r "$LIBLOADER_JAR"; then
   eval "$as_ac_File=yes"
 else
@@ -21115,10 +21562,11 @@ fi
 eval ac_res=\$$as_ac_File
 	       { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_res" >&5
 $as_echo "$ac_res" >&6; }
-if eval test \"x\$"$as_ac_File"\" = x"yes"; then :
+eval as_val=\$$as_ac_File
+   if test "x$as_val" = x""yes; then :
 
 else
-  as_fn_error $? "libloader.jar not found." "$LINENO" 5
+  as_fn_error "libloader.jar not found." "$LINENO" 5
 fi
 
       fi
@@ -21130,7 +21578,7 @@ if test "${ac_cv_file__usr_share_java_libformula_0_2_0_jar+set}" = set; then :
   $as_echo_n "(cached) " >&6
 else
   test "$cross_compiling" = yes &&
-  as_fn_error $? "cannot check for file existence when cross compiling" "$LINENO" 5
+  as_fn_error "cannot check for file existence when cross compiling" "$LINENO" 5
 if test -r "/usr/share/java/libformula-0.2.0.jar"; then
   ac_cv_file__usr_share_java_libformula_0_2_0_jar=yes
 else
@@ -21149,7 +21597,7 @@ if test "${ac_cv_file__usr_share_java_libformula_jar+set}" = set; then :
   $as_echo_n "(cached) " >&6
 else
   test "$cross_compiling" = yes &&
-  as_fn_error $? "cannot check for file existence when cross compiling" "$LINENO" 5
+  as_fn_error "cannot check for file existence when cross compiling" "$LINENO" 5
 if test -r "/usr/share/java/libformula.jar"; then
   ac_cv_file__usr_share_java_libformula_jar=yes
 else
@@ -21161,7 +21609,7 @@ $as_echo "$ac_cv_file__usr_share_java_libformula_jar" >&6; }
 if test "x$ac_cv_file__usr_share_java_libformula_jar" = x""yes; then :
    LIBFORMULA_JAR=/usr/share/java/libformula.jar
 else
-  as_fn_error $? "libformula.jar replacement not found." "$LINENO" 5
+  as_fn_error "libformula.jar replacement not found." "$LINENO" 5
 
 fi
 
@@ -21173,11 +21621,11 @@ fi
         as_ac_File=`$as_echo "ac_cv_file_$LIBFORMULA_JAR" | $as_tr_sh`
 { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $LIBFORMULA_JAR" >&5
 $as_echo_n "checking for $LIBFORMULA_JAR... " >&6; }
-if eval "test \"\${$as_ac_File+set}\"" = set; then :
+if { as_var=$as_ac_File; eval "test \"\${$as_var+set}\" = set"; }; then :
   $as_echo_n "(cached) " >&6
 else
   test "$cross_compiling" = yes &&
-  as_fn_error $? "cannot check for file existence when cross compiling" "$LINENO" 5
+  as_fn_error "cannot check for file existence when cross compiling" "$LINENO" 5
 if test -r "$LIBFORMULA_JAR"; then
   eval "$as_ac_File=yes"
 else
@@ -21187,10 +21635,11 @@ fi
 eval ac_res=\$$as_ac_File
 	       { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_res" >&5
 $as_echo "$ac_res" >&6; }
-if eval test \"x\$"$as_ac_File"\" = x"yes"; then :
+eval as_val=\$$as_ac_File
+   if test "x$as_val" = x""yes; then :
 
 else
-  as_fn_error $? "libformula.jar not found." "$LINENO" 5
+  as_fn_error "libformula.jar not found." "$LINENO" 5
 fi
 
       fi
@@ -21202,7 +21651,7 @@ if test "${ac_cv_file__usr_share_java_librepository_1_0_0_jar+set}" = set; then
   $as_echo_n "(cached) " >&6
 else
   test "$cross_compiling" = yes &&
-  as_fn_error $? "cannot check for file existence when cross compiling" "$LINENO" 5
+  as_fn_error "cannot check for file existence when cross compiling" "$LINENO" 5
 if test -r "/usr/share/java/librepository-1.0.0.jar"; then
   ac_cv_file__usr_share_java_librepository_1_0_0_jar=yes
 else
@@ -21221,7 +21670,7 @@ if test "${ac_cv_file__usr_share_java_librepository_jar+set}" = set; then :
   $as_echo_n "(cached) " >&6
 else
   test "$cross_compiling" = yes &&
-  as_fn_error $? "cannot check for file existence when cross compiling" "$LINENO" 5
+  as_fn_error "cannot check for file existence when cross compiling" "$LINENO" 5
 if test -r "/usr/share/java/librepository.jar"; then
   ac_cv_file__usr_share_java_librepository_jar=yes
 else
@@ -21233,7 +21682,7 @@ $as_echo "$ac_cv_file__usr_share_java_librepository_jar" >&6; }
 if test "x$ac_cv_file__usr_share_java_librepository_jar" = x""yes; then :
    LIBREPOSITORY_JAR=/usr/share/java/librepository.jar
 else
-  as_fn_error $? "librepository.jar replacement not found." "$LINENO" 5
+  as_fn_error "librepository.jar replacement not found." "$LINENO" 5
 
 fi
 
@@ -21245,11 +21694,11 @@ fi
         as_ac_File=`$as_echo "ac_cv_file_$LIBREPOSITORY_JAR" | $as_tr_sh`
 { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $LIBREPOSITORY_JAR" >&5
 $as_echo_n "checking for $LIBREPOSITORY_JAR... " >&6; }
-if eval "test \"\${$as_ac_File+set}\"" = set; then :
+if { as_var=$as_ac_File; eval "test \"\${$as_var+set}\" = set"; }; then :
   $as_echo_n "(cached) " >&6
 else
   test "$cross_compiling" = yes &&
-  as_fn_error $? "cannot check for file existence when cross compiling" "$LINENO" 5
+  as_fn_error "cannot check for file existence when cross compiling" "$LINENO" 5
 if test -r "$LIBREPOSITORY_JAR"; then
   eval "$as_ac_File=yes"
 else
@@ -21259,10 +21708,11 @@ fi
 eval ac_res=\$$as_ac_File
 	       { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_res" >&5
 $as_echo "$ac_res" >&6; }
-if eval test \"x\$"$as_ac_File"\" = x"yes"; then :
+eval as_val=\$$as_ac_File
+   if test "x$as_val" = x""yes; then :
 
 else
-  as_fn_error $? "librepository.jar not found." "$LINENO" 5
+  as_fn_error "librepository.jar not found." "$LINENO" 5
 fi
 
       fi
@@ -21274,7 +21724,7 @@ if test "${ac_cv_file__usr_share_java_libfonts_1_0_0_jar+set}" = set; then :
   $as_echo_n "(cached) " >&6
 else
   test "$cross_compiling" = yes &&
-  as_fn_error $? "cannot check for file existence when cross compiling" "$LINENO" 5
+  as_fn_error "cannot check for file existence when cross compiling" "$LINENO" 5
 if test -r "/usr/share/java/libfonts-1.0.0.jar"; then
   ac_cv_file__usr_share_java_libfonts_1_0_0_jar=yes
 else
@@ -21293,7 +21743,7 @@ if test "${ac_cv_file__usr_share_java_libfonts_jar+set}" = set; then :
   $as_echo_n "(cached) " >&6
 else
   test "$cross_compiling" = yes &&
-  as_fn_error $? "cannot check for file existence when cross compiling" "$LINENO" 5
+  as_fn_error "cannot check for file existence when cross compiling" "$LINENO" 5
 if test -r "/usr/share/java/libfonts.jar"; then
   ac_cv_file__usr_share_java_libfonts_jar=yes
 else
@@ -21305,7 +21755,7 @@ $as_echo "$ac_cv_file__usr_share_java_libfonts_jar" >&6; }
 if test "x$ac_cv_file__usr_share_java_libfonts_jar" = x""yes; then :
    LIBFONTS_JAR=/usr/share/java/libfonts.jar
 else
-  as_fn_error $? "libfonts.jar replacement not found." "$LINENO" 5
+  as_fn_error "libfonts.jar replacement not found." "$LINENO" 5
 
 fi
 
@@ -21317,11 +21767,11 @@ fi
         as_ac_File=`$as_echo "ac_cv_file_$LIBFONTS_JAR" | $as_tr_sh`
 { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $LIBFONTS_JAR" >&5
 $as_echo_n "checking for $LIBFONTS_JAR... " >&6; }
-if eval "test \"\${$as_ac_File+set}\"" = set; then :
+if { as_var=$as_ac_File; eval "test \"\${$as_var+set}\" = set"; }; then :
   $as_echo_n "(cached) " >&6
 else
   test "$cross_compiling" = yes &&
-  as_fn_error $? "cannot check for file existence when cross compiling" "$LINENO" 5
+  as_fn_error "cannot check for file existence when cross compiling" "$LINENO" 5
 if test -r "$LIBFONTS_JAR"; then
   eval "$as_ac_File=yes"
 else
@@ -21331,10 +21781,11 @@ fi
 eval ac_res=\$$as_ac_File
 	       { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_res" >&5
 $as_echo "$ac_res" >&6; }
-if eval test \"x\$"$as_ac_File"\" = x"yes"; then :
+eval as_val=\$$as_ac_File
+   if test "x$as_val" = x""yes; then :
 
 else
-  as_fn_error $? "libfonts.jar not found." "$LINENO" 5
+  as_fn_error "libfonts.jar not found." "$LINENO" 5
 fi
 
       fi
@@ -21346,7 +21797,7 @@ if test "${ac_cv_file__usr_share_java_libserializer_1_0_0_jar+set}" = set; then
   $as_echo_n "(cached) " >&6
 else
   test "$cross_compiling" = yes &&
-  as_fn_error $? "cannot check for file existence when cross compiling" "$LINENO" 5
+  as_fn_error "cannot check for file existence when cross compiling" "$LINENO" 5
 if test -r "/usr/share/java/libserializer-1.0.0.jar"; then
   ac_cv_file__usr_share_java_libserializer_1_0_0_jar=yes
 else
@@ -21365,7 +21816,7 @@ if test "${ac_cv_file__usr_share_java_libserializer_jar+set}" = set; then :
   $as_echo_n "(cached) " >&6
 else
   test "$cross_compiling" = yes &&
-  as_fn_error $? "cannot check for file existence when cross compiling" "$LINENO" 5
+  as_fn_error "cannot check for file existence when cross compiling" "$LINENO" 5
 if test -r "/usr/share/java/libserializer.jar"; then
   ac_cv_file__usr_share_java_libserializer_jar=yes
 else
@@ -21377,7 +21828,7 @@ $as_echo "$ac_cv_file__usr_share_java_libserializer_jar" >&6; }
 if test "x$ac_cv_file__usr_share_java_libserializer_jar" = x""yes; then :
    LIBSERIALIZER_JAR=/usr/share/java/libserializer.jar
 else
-  as_fn_error $? "libserializer.jar replacement not found." "$LINENO" 5
+  as_fn_error "libserializer.jar replacement not found." "$LINENO" 5
 
 fi
 
@@ -21389,11 +21840,11 @@ fi
         as_ac_File=`$as_echo "ac_cv_file_$LIBSERIALIZER_JAR" | $as_tr_sh`
 { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $LIBSERIALIZER_JAR" >&5
 $as_echo_n "checking for $LIBSERIALIZER_JAR... " >&6; }
-if eval "test \"\${$as_ac_File+set}\"" = set; then :
+if { as_var=$as_ac_File; eval "test \"\${$as_var+set}\" = set"; }; then :
   $as_echo_n "(cached) " >&6
 else
   test "$cross_compiling" = yes &&
-  as_fn_error $? "cannot check for file existence when cross compiling" "$LINENO" 5
+  as_fn_error "cannot check for file existence when cross compiling" "$LINENO" 5
 if test -r "$LIBSERIALIZER_JAR"; then
   eval "$as_ac_File=yes"
 else
@@ -21403,10 +21854,11 @@ fi
 eval ac_res=\$$as_ac_File
 	       { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_res" >&5
 $as_echo "$ac_res" >&6; }
-if eval test \"x\$"$as_ac_File"\" = x"yes"; then :
+eval as_val=\$$as_ac_File
+   if test "x$as_val" = x""yes; then :
 
 else
-  as_fn_error $? "libserializer.jar not found." "$LINENO" 5
+  as_fn_error "libserializer.jar not found." "$LINENO" 5
 fi
 
       fi
@@ -21419,7 +21871,7 @@ if test "${ac_cv_file__usr_share_java_libbase_1_0_0_jar+set}" = set; then :
   $as_echo_n "(cached) " >&6
 else
   test "$cross_compiling" = yes &&
-  as_fn_error $? "cannot check for file existence when cross compiling" "$LINENO" 5
+  as_fn_error "cannot check for file existence when cross compiling" "$LINENO" 5
 if test -r "/usr/share/java/libbase-1.0.0.jar"; then
   ac_cv_file__usr_share_java_libbase_1_0_0_jar=yes
 else
@@ -21438,7 +21890,7 @@ if test "${ac_cv_file__usr_share_java_libbase_jar+set}" = set; then :
   $as_echo_n "(cached) " >&6
 else
   test "$cross_compiling" = yes &&
-  as_fn_error $? "cannot check for file existence when cross compiling" "$LINENO" 5
+  as_fn_error "cannot check for file existence when cross compiling" "$LINENO" 5
 if test -r "/usr/share/java/libbase.jar"; then
   ac_cv_file__usr_share_java_libbase_jar=yes
 else
@@ -21450,7 +21902,7 @@ $as_echo "$ac_cv_file__usr_share_java_libbase_jar" >&6; }
 if test "x$ac_cv_file__usr_share_java_libbase_jar" = x""yes; then :
    LIBBASE_JAR=/usr/share/java/libbase.jar
 else
-  as_fn_error $? "libbase.jar replacement not found." "$LINENO" 5
+  as_fn_error "libbase.jar replacement not found." "$LINENO" 5
 
 fi
 
@@ -21462,11 +21914,11 @@ fi
         as_ac_File=`$as_echo "ac_cv_file_$LIBBASE_JAR" | $as_tr_sh`
 { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $LIBBASE_JAR" >&5
 $as_echo_n "checking for $LIBBASE_JAR... " >&6; }
-if eval "test \"\${$as_ac_File+set}\"" = set; then :
+if { as_var=$as_ac_File; eval "test \"\${$as_var+set}\" = set"; }; then :
   $as_echo_n "(cached) " >&6
 else
   test "$cross_compiling" = yes &&
-  as_fn_error $? "cannot check for file existence when cross compiling" "$LINENO" 5
+  as_fn_error "cannot check for file existence when cross compiling" "$LINENO" 5
 if test -r "$LIBBASE_JAR"; then
   eval "$as_ac_File=yes"
 else
@@ -21476,10 +21928,11 @@ fi
 eval ac_res=\$$as_ac_File
 	       { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_res" >&5
 $as_echo "$ac_res" >&6; }
-if eval test \"x\$"$as_ac_File"\" = x"yes"; then :
+eval as_val=\$$as_ac_File
+   if test "x$as_val" = x""yes; then :
 
 else
-  as_fn_error $? "libbase.jar not found." "$LINENO" 5
+  as_fn_error "libbase.jar not found." "$LINENO" 5
 fi
 
       fi
@@ -21493,7 +21946,7 @@ $as_echo_n "checking for jfreereport module... " >&6; }
       { $as_echo "$as_me:${as_lineno-$LINENO}: result: OK" >&5
 $as_echo "OK" >&6; }
      else
-      as_fn_error $? "not existing. get it (did you get the -extensions tarball?)" "$LINENO" 5
+      as_fn_error "not existing. get it (did you get the -extensions tarball?)" "$LINENO" 5
      fi
      SYSTEM_JFREEREPORT=NO
      BUILD_TYPE="$BUILD_TYPE JFREEREPORT"
@@ -21536,7 +21989,7 @@ if test "${ac_cv_file__usr_share_java_commons_codec_1_3_jar+set}" = set; then :
   $as_echo_n "(cached) " >&6
 else
   test "$cross_compiling" = yes &&
-  as_fn_error $? "cannot check for file existence when cross compiling" "$LINENO" 5
+  as_fn_error "cannot check for file existence when cross compiling" "$LINENO" 5
 if test -r "/usr/share/java/commons-codec-1.3.jar"; then
   ac_cv_file__usr_share_java_commons_codec_1_3_jar=yes
 else
@@ -21555,7 +22008,7 @@ if test "${ac_cv_file__usr_share_java_commons_codec_jar+set}" = set; then :
   $as_echo_n "(cached) " >&6
 else
   test "$cross_compiling" = yes &&
-  as_fn_error $? "cannot check for file existence when cross compiling" "$LINENO" 5
+  as_fn_error "cannot check for file existence when cross compiling" "$LINENO" 5
 if test -r "/usr/share/java/commons-codec.jar"; then
   ac_cv_file__usr_share_java_commons_codec_jar=yes
 else
@@ -21567,7 +22020,7 @@ $as_echo "$ac_cv_file__usr_share_java_commons_codec_jar" >&6; }
 if test "x$ac_cv_file__usr_share_java_commons_codec_jar" = x""yes; then :
    COMMONS_CODEC_JAR=/usr/share/java/commons-codec.jar
 else
-  as_fn_error $? "commons-codec.jar replacement not found." "$LINENO" 5
+  as_fn_error "commons-codec.jar replacement not found." "$LINENO" 5
 
 fi
 
@@ -21579,11 +22032,11 @@ fi
         as_ac_File=`$as_echo "ac_cv_file_$COMMONS_CODEC_JAR" | $as_tr_sh`
 { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $COMMONS_CODEC_JAR" >&5
 $as_echo_n "checking for $COMMONS_CODEC_JAR... " >&6; }
-if eval "test \"\${$as_ac_File+set}\"" = set; then :
+if { as_var=$as_ac_File; eval "test \"\${$as_var+set}\" = set"; }; then :
   $as_echo_n "(cached) " >&6
 else
   test "$cross_compiling" = yes &&
-  as_fn_error $? "cannot check for file existence when cross compiling" "$LINENO" 5
+  as_fn_error "cannot check for file existence when cross compiling" "$LINENO" 5
 if test -r "$COMMONS_CODEC_JAR"; then
   eval "$as_ac_File=yes"
 else
@@ -21593,10 +22046,11 @@ fi
 eval ac_res=\$$as_ac_File
 	       { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_res" >&5
 $as_echo "$ac_res" >&6; }
-if eval test \"x\$"$as_ac_File"\" = x"yes"; then :
+eval as_val=\$$as_ac_File
+   if test "x$as_val" = x""yes; then :
 
 else
-  as_fn_error $? "commons-codec.jar not found." "$LINENO" 5
+  as_fn_error "commons-codec.jar not found." "$LINENO" 5
 fi
 
       fi
@@ -21608,7 +22062,7 @@ if test "${ac_cv_file__usr_share_java_commons_lang_2_3_jar+set}" = set; then :
   $as_echo_n "(cached) " >&6
 else
   test "$cross_compiling" = yes &&
-  as_fn_error $? "cannot check for file existence when cross compiling" "$LINENO" 5
+  as_fn_error "cannot check for file existence when cross compiling" "$LINENO" 5
 if test -r "/usr/share/java/commons-lang-2.3.jar"; then
   ac_cv_file__usr_share_java_commons_lang_2_3_jar=yes
 else
@@ -21627,7 +22081,7 @@ if test "${ac_cv_file__usr_share_java_commons_lang_jar+set}" = set; then :
   $as_echo_n "(cached) " >&6
 else
   test "$cross_compiling" = yes &&
-  as_fn_error $? "cannot check for file existence when cross compiling" "$LINENO" 5
+  as_fn_error "cannot check for file existence when cross compiling" "$LINENO" 5
 if test -r "/usr/share/java/commons-lang.jar"; then
   ac_cv_file__usr_share_java_commons_lang_jar=yes
 else
@@ -21639,7 +22093,7 @@ $as_echo "$ac_cv_file__usr_share_java_commons_lang_jar" >&6; }
 if test "x$ac_cv_file__usr_share_java_commons_lang_jar" = x""yes; then :
    COMMONS_LANG_JAR=/usr/share/java/commons-lang.jar
 else
-  as_fn_error $? "commons-lang.jar replacement not found." "$LINENO" 5
+  as_fn_error "commons-lang.jar replacement not found." "$LINENO" 5
 
 fi
 
@@ -21651,11 +22105,11 @@ fi
         as_ac_File=`$as_echo "ac_cv_file_$COMMONS_LANG_JAR" | $as_tr_sh`
 { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $COMMONS_LANG_JAR" >&5
 $as_echo_n "checking for $COMMONS_LANG_JAR... " >&6; }
-if eval "test \"\${$as_ac_File+set}\"" = set; then :
+if { as_var=$as_ac_File; eval "test \"\${$as_var+set}\" = set"; }; then :
   $as_echo_n "(cached) " >&6
 else
   test "$cross_compiling" = yes &&
-  as_fn_error $? "cannot check for file existence when cross compiling" "$LINENO" 5
+  as_fn_error "cannot check for file existence when cross compiling" "$LINENO" 5
 if test -r "$COMMONS_LANG_JAR"; then
   eval "$as_ac_File=yes"
 else
@@ -21665,10 +22119,11 @@ fi
 eval ac_res=\$$as_ac_File
 	       { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_res" >&5
 $as_echo "$ac_res" >&6; }
-if eval test \"x\$"$as_ac_File"\" = x"yes"; then :
+eval as_val=\$$as_ac_File
+   if test "x$as_val" = x""yes; then :
 
 else
-  as_fn_error $? "commons-lang.jar not found." "$LINENO" 5
+  as_fn_error "commons-lang.jar not found." "$LINENO" 5
 fi
 
       fi
@@ -21680,7 +22135,7 @@ if test "${ac_cv_file__usr_share_java_commons_httpclient_3_1_jar+set}" = set; th
   $as_echo_n "(cached) " >&6
 else
   test "$cross_compiling" = yes &&
-  as_fn_error $? "cannot check for file existence when cross compiling" "$LINENO" 5
+  as_fn_error "cannot check for file existence when cross compiling" "$LINENO" 5
 if test -r "/usr/share/java/commons-httpclient-3.1.jar"; then
   ac_cv_file__usr_share_java_commons_httpclient_3_1_jar=yes
 else
@@ -21699,7 +22154,7 @@ if test "${ac_cv_file__usr_share_java_commons_httpclient_jar+set}" = set; then :
   $as_echo_n "(cached) " >&6
 else
   test "$cross_compiling" = yes &&
-  as_fn_error $? "cannot check for file existence when cross compiling" "$LINENO" 5
+  as_fn_error "cannot check for file existence when cross compiling" "$LINENO" 5
 if test -r "/usr/share/java/commons-httpclient.jar"; then
   ac_cv_file__usr_share_java_commons_httpclient_jar=yes
 else
@@ -21711,7 +22166,7 @@ $as_echo "$ac_cv_file__usr_share_java_commons_httpclient_jar" >&6; }
 if test "x$ac_cv_file__usr_share_java_commons_httpclient_jar" = x""yes; then :
    COMMONS_HTTPCLIENT_JAR=/usr/share/java/commons-httpclient.jar
 else
-  as_fn_error $? "commons-httpclient.jar replacement not found." "$LINENO" 5
+  as_fn_error "commons-httpclient.jar replacement not found." "$LINENO" 5
 
 fi
 
@@ -21723,11 +22178,11 @@ fi
         as_ac_File=`$as_echo "ac_cv_file_$COMMONS_HTTPCLIENT_JAR" | $as_tr_sh`
 { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $COMMONS_HTTPCLIENT_JAR" >&5
 $as_echo_n "checking for $COMMONS_HTTPCLIENT_JAR... " >&6; }
-if eval "test \"\${$as_ac_File+set}\"" = set; then :
+if { as_var=$as_ac_File; eval "test \"\${$as_var+set}\" = set"; }; then :
   $as_echo_n "(cached) " >&6
 else
   test "$cross_compiling" = yes &&
-  as_fn_error $? "cannot check for file existence when cross compiling" "$LINENO" 5
+  as_fn_error "cannot check for file existence when cross compiling" "$LINENO" 5
 if test -r "$COMMONS_HTTPCLIENT_JAR"; then
   eval "$as_ac_File=yes"
 else
@@ -21737,10 +22192,11 @@ fi
 eval ac_res=\$$as_ac_File
 	       { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_res" >&5
 $as_echo "$ac_res" >&6; }
-if eval test \"x\$"$as_ac_File"\" = x"yes"; then :
+eval as_val=\$$as_ac_File
+   if test "x$as_val" = x""yes; then :
 
 else
-  as_fn_error $? "commons-httpclient.jar not found." "$LINENO" 5
+  as_fn_error "commons-httpclient.jar not found." "$LINENO" 5
 fi
 
       fi
@@ -21753,7 +22209,7 @@ if test "${ac_cv_file__usr_share_java_commons_logging_1_1_1_jar+set}" = set; the
   $as_echo_n "(cached) " >&6
 else
   test "$cross_compiling" = yes &&
-  as_fn_error $? "cannot check for file existence when cross compiling" "$LINENO" 5
+  as_fn_error "cannot check for file existence when cross compiling" "$LINENO" 5
 if test -r "/usr/share/java/commons-logging-1.1.1.jar"; then
   ac_cv_file__usr_share_java_commons_logging_1_1_1_jar=yes
 else
@@ -21772,7 +22228,7 @@ if test "${ac_cv_file__usr_share_java_commons_logging_jar+set}" = set; then :
   $as_echo_n "(cached) " >&6
 else
   test "$cross_compiling" = yes &&
-  as_fn_error $? "cannot check for file existence when cross compiling" "$LINENO" 5
+  as_fn_error "cannot check for file existence when cross compiling" "$LINENO" 5
 if test -r "/usr/share/java/commons-logging.jar"; then
   ac_cv_file__usr_share_java_commons_logging_jar=yes
 else
@@ -21784,7 +22240,7 @@ $as_echo "$ac_cv_file__usr_share_java_commons_logging_jar" >&6; }
 if test "x$ac_cv_file__usr_share_java_commons_logging_jar" = x""yes; then :
    COMMONS_LOGGING_JAR=/usr/share/java/commons-logging.jar
 else
-  as_fn_error $? "commons-logging.jar replacement not found." "$LINENO" 5
+  as_fn_error "commons-logging.jar replacement not found." "$LINENO" 5
 
 fi
 
@@ -21796,11 +22252,11 @@ fi
         as_ac_File=`$as_echo "ac_cv_file_$COMMONS_LOGGING_JAR" | $as_tr_sh`
 { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $COMMONS_LOGGING_JAR" >&5
 $as_echo_n "checking for $COMMONS_LOGGING_JAR... " >&6; }
-if eval "test \"\${$as_ac_File+set}\"" = set; then :
+if { as_var=$as_ac_File; eval "test \"\${$as_var+set}\" = set"; }; then :
   $as_echo_n "(cached) " >&6
 else
   test "$cross_compiling" = yes &&
-  as_fn_error $? "cannot check for file existence when cross compiling" "$LINENO" 5
+  as_fn_error "cannot check for file existence when cross compiling" "$LINENO" 5
 if test -r "$COMMONS_LOGGING_JAR"; then
   eval "$as_ac_File=yes"
 else
@@ -21810,10 +22266,11 @@ fi
 eval ac_res=\$$as_ac_File
 	       { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_res" >&5
 $as_echo "$ac_res" >&6; }
-if eval test \"x\$"$as_ac_File"\" = x"yes"; then :
+eval as_val=\$$as_ac_File
+   if test "x$as_val" = x""yes; then :
 
 else
-  as_fn_error $? "commons-logging.jar not found." "$LINENO" 5
+  as_fn_error "commons-logging.jar not found." "$LINENO" 5
 fi
 
       fi
@@ -21884,7 +22341,7 @@ $as_echo_n "checking for Qt headers... " >&6; }
     { $as_echo "$as_me:${as_lineno-$LINENO}: result: $qt_incdir" >&5
 $as_echo "$qt_incdir" >&6; }
     if test "x$qt_incdir" = "xno" ; then
-        as_fn_error $? "Qt headers not found.  Please specify the root of
+        as_fn_error "Qt headers not found.  Please specify the root of
 your Qt installation by exporting QTDIR before running \"configure\"." "$LINENO" 5
     fi
 
@@ -21900,7 +22357,7 @@ $as_echo_n "checking for Qt libraries... " >&6; }
     { $as_echo "$as_me:${as_lineno-$LINENO}: result: $qt_libdir" >&5
 $as_echo "$qt_libdir" >&6; }
     if test "x$qt_libdir" = "xno" ; then
-        as_fn_error $? "Qt libraries not found.  Please specify the root of
+        as_fn_error "Qt libraries not found.  Please specify the root of
 your Qt installation by exporting QTDIR before running \"configure\"." "$LINENO" 5
     fi
 
@@ -21947,7 +22404,7 @@ fi
 
 
     if test "$MOC" = "no" ; then
-        as_fn_error $? "Qt Meta Object Compiler not found.  Please specify
+        as_fn_error "Qt Meta Object Compiler not found.  Please specify
 the root of your Qt installation by exporting QTDIR before running \"configure\"." "$LINENO" 5
     fi
 
@@ -21963,7 +22420,7 @@ $as_echo_n "checking for KDE headers... " >&6; }
     { $as_echo "$as_me:${as_lineno-$LINENO}: result: $kde_incdir" >&5
 $as_echo "$kde_incdir" >&6; }
     if test "x$kde_incdir" = "xno" ; then
-        as_fn_error $? "KDE headers not found.  Please specify the root of
+        as_fn_error "KDE headers not found.  Please specify the root of
 your KDE installation by exporting KDEDIR before running \"configure\"." "$LINENO" 5
     fi
 
@@ -21979,7 +22436,7 @@ $as_echo_n "checking for KDE libraries... " >&6; }
     { $as_echo "$as_me:${as_lineno-$LINENO}: result: $kde_libdir" >&5
 $as_echo "$kde_libdir" >&6; }
     if test "x$kde_libdir" = "xno" ; then
-        as_fn_error $? "KDE libraries not found.  Please specify the root of
+        as_fn_error "KDE libraries not found.  Please specify the root of
 your KDE installation by exporting KDEDIR before running \"configure\"." "$LINENO" 5
     fi
 
@@ -22001,7 +22458,7 @@ if test "$test_kde4" = "yes" -a "$ENABLE_KDE4" = "TRUE" ; then
    kde_incdirs="/usr/include $x_includes"
    kde_libdirs="/usr/lib $x_libraries"
 
-   if test "$build_cpu" == "x86_64" ; then
+   if test "$build_cpu" = "x86_64" ; then
       qt_libdirs="$qt_libdirs /usr/lib64/qt4 /usr/lib64/qt /usr/lib64"
       kde_libdirs="$kde_libdirs /usr/lib64 /usr/lib64/kde4"
    fi
@@ -22033,7 +22490,7 @@ $as_echo_n "checking for Qt4 headers... " >&6; }
    { $as_echo "$as_me:${as_lineno-$LINENO}: result: $qt_header_dir" >&5
 $as_echo "$qt_header_dir" >&6; }
    if test "x$qt_header_dir" = "xno" ; then
-      as_fn_error $? "Qt4 headers not found.  Please specify the root of your Qt4 installation by exporting QT4DIR before running \"configure\"." "$LINENO" 5
+      as_fn_error "Qt4 headers not found.  Please specify the root of your Qt4 installation by exporting QT4DIR before running \"configure\"." "$LINENO" 5
    fi
 
    { $as_echo "$as_me:${as_lineno-$LINENO}: checking for Qt4 libraries" >&5
@@ -22050,7 +22507,7 @@ $as_echo_n "checking for Qt4 libraries... " >&6; }
 $as_echo "$qt_lib_dir" >&6; }
 
    if test "x$qt_lib_dir" = "xno" ; then
-      as_fn_error $? "Qt4 libraries not found.  Please specify the root of your Qt4 installation by exporting QT4DIR before running \"configure\"." "$LINENO" 5
+      as_fn_error "Qt4 libraries not found.  Please specify the root of your Qt4 installation by exporting QT4DIR before running \"configure\"." "$LINENO" 5
    fi
 
       # Extract the first word of "moc", so it can be a program name with args.
@@ -22096,7 +22553,7 @@ fi
 
 
    if test "$MOC4" = "no" ; then
-      as_fn_error $? "Qt Meta Object Compiler not found.  Please specify
+      as_fn_error "Qt Meta Object Compiler not found.  Please specify
 the root of your Qt installation by exporting QT4DIR before running \"configure\"." "$LINENO" 5
    fi
 
@@ -22112,7 +22569,7 @@ $as_echo_n "checking for KDE4 headers... " >&6; }
    { $as_echo "$as_me:${as_lineno-$LINENO}: result: $kde_incdir" >&5
 $as_echo "$kde_incdir" >&6; }
    if test "x$kde_incdir" = "xno" ; then
-      as_fn_error $? "KDE4 headers not found.  Please specify the root of your KDE4 installation by exporting KDE4DIR before running \"configure\"." "$LINENO" 5
+      as_fn_error "KDE4 headers not found.  Please specify the root of your KDE4 installation by exporting KDE4DIR before running \"configure\"." "$LINENO" 5
    fi
 
       { $as_echo "$as_me:${as_lineno-$LINENO}: checking for KDE4 libraries" >&5
@@ -22128,7 +22585,7 @@ $as_echo_n "checking for KDE4 libraries... " >&6; }
    { $as_echo "$as_me:${as_lineno-$LINENO}: result: $kde_libdir" >&5
 $as_echo "$kde_libdir" >&6; }
    if test "x$kde_libdir" = "xno" ; then
-      as_fn_error $? "KDE4 libraries not found.  Please specify the root of your KDE4 installation by exporting KDE4DIR before running \"configure\"." "$LINENO" 5
+      as_fn_error "KDE4 libraries not found.  Please specify the root of your KDE4 installation by exporting KDE4DIR before running \"configure\"." "$LINENO" 5
    fi
 
    KDE4_CFLAGS="`pkg-config --cflags QtCore` `pkg-config --cflags QtGui` -I$kde_incdir -DQT_CLEAN_NAMESPACE -DQT_THREAD_SUPPORT"
@@ -22250,7 +22707,7 @@ $as_echo "$GOBJECT_LIBS" >&6; }
   if test $succeeded = yes; then
      :
   else
-     as_fn_error $? "Library requirements (gobject-2.0) not met; consider adjusting the PKG_CONFIG_PATH environment variable if your libraries are in a nonstandard prefix so pkg-config can find them." "$LINENO" 5
+     as_fn_error "Library requirements (gobject-2.0) not met; consider adjusting the PKG_CONFIG_PATH environment variable if your libraries are in a nonstandard prefix so pkg-config can find them." "$LINENO" 5
   fi
 
    ENABLE_EVOAB2="TRUE"
@@ -22281,8 +22738,8 @@ $as_echo_n "checking whether KDE is between 3.2 and 3.6... " >&6; }
        if test "$cross_compiling" = yes; then :
   { { $as_echo "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5
 $as_echo "$as_me: error: in \`$ac_pwd':" >&2;}
-as_fn_error $? "cannot run test program while cross compiling
-See \`config.log' for more details" "$LINENO" 5 ; }
+as_fn_error "cannot run test program while cross compiling
+See \`config.log' for more details." "$LINENO" 5; }
 else
   cat confdefs.h - <<_ACEOF >conftest.$ac_ext
 /* end confdefs.h.  */
@@ -22299,7 +22756,7 @@ if ac_fn_cxx_try_run "$LINENO"; then :
   { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5
 $as_echo "yes" >&6; }
 else
-  as_fn_error $? "KDE version too old or too recent, please use another version of KDE or disable KDE address book support" "$LINENO" 5
+  as_fn_error "KDE version too old or too recent, please use another version of KDE or disable KDE address book support" "$LINENO" 5
 fi
 rm -f core *.core core.conftest.* gmon.out bb.out conftest$ac_exeext \
   conftest.$ac_objext conftest.beam conftest.$ac_ext
@@ -22371,6 +22828,7 @@ $as_echo_n "checking whether to include AFMs... " >&6; }
 if test "$with_afms" != "no"; then
   { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5
 $as_echo "yes" >&6; }
+  BUILD_TYPE="$BUILD_TYPE AFMS"
 else
   { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
 $as_echo "no" >&6; }
@@ -22423,7 +22881,7 @@ $as_echo "yes, with $XINERAMA_LINK linking" >&6; }
 if test "x$ac_cv_header_X11_extensions_Xinerama_h" = x""yes; then :
 
 else
-  as_fn_error $? "Xinerama header not found." "$LINENO" 5
+  as_fn_error "Xinerama header not found." "$LINENO" 5
 fi
 
 
@@ -22478,7 +22936,7 @@ _ACEOF
   LIBS="-lXinerama $LIBS"
 
 else
-  as_fn_error $? "Xinerama not functional?" "$LINENO" 5
+  as_fn_error "Xinerama not functional?" "$LINENO" 5
 fi
 
    else
@@ -22597,7 +23055,7 @@ done
 fi
 
 if test -z "$ANT"; then
-  as_fn_error $? "Ant not found - Make sure it's in the path or use --with-ant-home" "$LINENO" 5
+  as_fn_error "Ant not found - Make sure it's in the path or use --with-ant-home" "$LINENO" 5
 else
   # resolve relative or absolute symlink
   while test -h "$ANT"; do
@@ -22615,30 +23073,6 @@ else
     export ANT_HOME
   fi
 
-  ant_minver=1.6.0
-  # update for more extensions...
-  if test "$ENABLE_MEDIAWIKI" = "YES"; then
-    ant_minver=1.7.0
-  fi
-  ant_minminor1=`echo $ant_minver | cut -d"." -f2`
-
-  { $as_echo "$as_me:${as_lineno-$LINENO}: checking whether ant is >= $ant_minver" >&5
-$as_echo_n "checking whether ant is >= $ant_minver... " >&6; }
-  ant_version=`$ANT -version | $AWK '{ print $4; }'`
-  ant_version_major=`echo $ant_version | cut -d. -f1`
-  ant_version_minor=`echo $ant_version | cut -d. -f2`
-echo "configure: ant_version $ant_version " >&5
-echo "configure: ant_version_major $ant_version_major " >&5
-echo "configure: ant_version_minor $ant_version_minor " >&5
-  if test "$ant_version_major" -ge "2"; then
-  	{ $as_echo "$as_me:${as_lineno-$LINENO}: result: yes, $ant_version" >&5
-$as_echo "yes, $ant_version" >&6; }
-  elif test "$ant_version_major" = "1" && test "$ant_version_minor" -ge "$ant_minminor1"; then
-  	{ $as_echo "$as_me:${as_lineno-$LINENO}: result: yes, $ant_version" >&5
-$as_echo "yes, $ant_version" >&6; }
-  else
-  	as_fn_error $? "no, you need at least ant >= $ant_minver" "$LINENO" 5
-  fi
   { $as_echo "$as_me:${as_lineno-$LINENO}: checking if $ANT works" >&5
 $as_echo_n "checking if $ANT works... " >&6; }
 cat > conftest.java << EOF
@@ -22715,7 +23149,7 @@ $as_echo_n "checking Ant lib directory... " >&6; }
                 if test -f $ANT_HOME/lib/ant/ant.jar; then
                     ANT_LIB="$ANT_HOME/lib/ant"
                 else
-                    as_fn_error $? "Ant libraries not found!" "$LINENO" 5
+                    as_fn_error "Ant libraries not found!" "$LINENO" 5
                 fi
              fi
           fi
@@ -22727,6 +23161,31 @@ fi
 
 fi
 
+ant_minver=1.6.0
+# update for more extensions...
+if test "$ENABLE_MEDIAWIKI" = "YES"; then
+  ant_minver=1.7.0
+fi
+ant_minminor1=`echo $ant_minver | cut -d"." -f2`
+
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking whether ant is >= $ant_minver" >&5
+$as_echo_n "checking whether ant is >= $ant_minver... " >&6; }
+ant_version=`$ANT -version | $AWK '{ print $4; }'`
+ant_version_major=`echo $ant_version | cut -d. -f1`
+ant_version_minor=`echo $ant_version | cut -d. -f2`
+echo "configure: ant_version $ant_version " >&5
+echo "configure: ant_version_major $ant_version_major " >&5
+echo "configure: ant_version_minor $ant_version_minor " >&5
+if test "$ant_version_major" -ge "2"; then
+   { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes, $ant_version" >&5
+$as_echo "yes, $ant_version" >&6; }
+elif test "$ant_version_major" = "1" && test "$ant_version_minor" -ge "$ant_minminor1"; then
+   { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes, $ant_version" >&5
+$as_echo "yes, $ant_version" >&6; }
+else
+   as_fn_error "no, you need at least ant >= $ant_minver" "$LINENO" 5
+fi
+
 if test "$ENABLE_MEDIAWIKI" = "YES"; then
 { $as_echo "$as_me:${as_lineno-$LINENO}: checking whether ant supports mapper type=\"regexp\"" >&5
 $as_echo_n "checking whether ant supports mapper type=\"regexp\"... " >&6; }
@@ -22734,18 +23193,18 @@ rm -rf confdir
 mkdir confdir
 cat > conftest.java << EOF
     public class conftest {
-	int testmethod(int a, int b) {
+        int testmethod(int a, int b) {
             return a + b;
-	}
+        }
     }
 EOF
 
 cat > conftest.xml << EOF
     <project name="conftest" default="conftest">
-	<target name="conftest" depends="copytest">
+        <target name="conftest" depends="copytest">
             <javac srcdir="." includes="conftest.java">
-	    </javac>
-	</target>
+            </javac>
+        </target>
         <target name="copytest">
              <copy todir="confdir">
                  <fileset dir="confdir" includes="**/*.abc" casesensitive="yes"/>
@@ -22775,7 +23234,7 @@ $as_echo "yes" >&6; }
     cat conftest.java >&5
     cat conftest.xml >&5
     rm -rf confdir
-    as_fn_error $? "no. Did you install ant-apache-regexp?" "$LINENO" 5
+    as_fn_error "no. Did you install ant-apache-regexp?" "$LINENO" 5
   fi
 fi
 rm -f conftest* core core.* *.core
@@ -22804,7 +23263,7 @@ $as_echo "$OOO_JUNIT_JAR" >&6; }
     else
         { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
 $as_echo "no" >&6; }
-        as_fn_error $? "cannot find JUnit 4 jar; please install one in the default
+        as_fn_error "cannot find JUnit 4 jar; please install one in the default
 location (/usr/share/java), specify its pathname via
 --with-junit=..., or disable it via --without-junit" "$LINENO" 5
     fi
@@ -22952,12 +23411,12 @@ fi
 { $as_echo "$as_me:${as_lineno-$LINENO}: checking build verbosity" >&5
 $as_echo_n "checking build verbosity... " >&6; }
 if test -n "$enable_verbose"; then
-   if test "$enable_verbose" == "yes"; then
+   if test "$enable_verbose" = "yes"; then
       VERBOSE="TRUE"
       { $as_echo "$as_me:${as_lineno-$LINENO}: result: high" >&5
 $as_echo "high" >&6; }
    fi
-   if test "$enable_verbose" == "no"; then
+   if test "$enable_verbose" = "no"; then
       VERBOSE="FALSE"
       { $as_echo "$as_me:${as_lineno-$LINENO}: result: low" >&5
 $as_echo "low" >&6; }
@@ -22987,7 +23446,7 @@ echo "*                                                                  *"
 echo "********************************************************************"
 
 if test -z "$COMPATH"; then
-   as_fn_error $? "No compiler found." "$LINENO" 5
+   as_fn_error "No compiler found." "$LINENO" 5
 fi
 
 
@@ -23130,7 +23589,6 @@ DEFS=`sed -n "$ac_script" confdefs.h`
 
 ac_libobjs=
 ac_ltlibobjs=
-U=
 for ac_i in : $LIBOBJS; do test "x$ac_i" = x: && continue
   # 1. Remove the extension, and $U if already installed.
   ac_script='s/\$U\././;s/\.o$//;s/\.obj$//'
@@ -23293,19 +23751,19 @@ export LANGUAGE
 (unset CDPATH) >/dev/null 2>&1 && unset CDPATH
 
 
-# as_fn_error STATUS ERROR [LINENO LOG_FD]
-# ----------------------------------------
+# as_fn_error ERROR [LINENO LOG_FD]
+# ---------------------------------
 # Output "`basename $0`: error: ERROR" to stderr. If LINENO and LOG_FD are
 # provided, also output the error to LOG_FD, referencing LINENO. Then exit the
-# script with STATUS, using 1 if that was 0.
+# script with status $?, using 1 if that was 0.
 as_fn_error ()
 {
-  as_status=$1; test $as_status -eq 0 && as_status=1
-  if test "$4"; then
-    as_lineno=${as_lineno-"$3"} as_lineno_stack=as_lineno_stack=$as_lineno_stack
-    $as_echo "$as_me:${as_lineno-$LINENO}: error: $2" >&$4
+  as_status=$?; test $as_status -eq 0 && as_status=1
+  if test "$3"; then
+    as_lineno=${as_lineno-"$2"} as_lineno_stack=as_lineno_stack=$as_lineno_stack
+    $as_echo "$as_me:${as_lineno-$LINENO}: error: $1" >&$3
   fi
-  $as_echo "$as_me: error: $2" >&2
+  $as_echo "$as_me: error: $1" >&2
   as_fn_exit $as_status
 } # as_fn_error
 
@@ -23501,7 +23959,7 @@ $as_echo X"$as_dir" |
       test -d "$as_dir" && break
     done
     test -z "$as_dirs" || eval "mkdir $as_dirs"
-  } || test -d "$as_dir" || as_fn_error $? "cannot create directory $as_dir"
+  } || test -d "$as_dir" || as_fn_error "cannot create directory $as_dir"
 
 
 } # as_fn_mkdir_p
@@ -23555,7 +24013,7 @@ cat >>$CONFIG_STATUS <<\_ACEOF || ac_write_fail=1
 # values after options handling.
 ac_log="
 This file was extended by $as_me, which was
-generated by GNU Autoconf 2.67.  Invocation command line was
+generated by GNU Autoconf 2.65.  Invocation command line was
 
   CONFIG_FILES    = $CONFIG_FILES
   CONFIG_HEADERS  = $CONFIG_HEADERS
@@ -23608,10 +24066,10 @@ cat >>$CONFIG_STATUS <<_ACEOF || ac_write_fail=1
 ac_cs_config="`$as_echo "$ac_configure_args" | sed 's/^ //; s/[\\""\`\$]/\\\\&/g'`"
 ac_cs_version="\\
 config.status
-configured by $0, generated by GNU Autoconf 2.67,
+configured by $0, generated by GNU Autoconf 2.65,
   with options \\"\$ac_cs_config\\"
 
-Copyright (C) 2010 Free Software Foundation, Inc.
+Copyright (C) 2009 Free Software Foundation, Inc.
 This config.status script is free software; the Free Software Foundation
 gives unlimited permission to copy, distribute and modify it."
 
@@ -23627,16 +24085,11 @@ ac_need_defaults=:
 while test $# != 0
 do
   case $1 in
-  --*=?*)
+  --*=*)
     ac_option=`expr "X$1" : 'X\([^=]*\)='`
     ac_optarg=`expr "X$1" : 'X[^=]*=\(.*\)'`
     ac_shift=:
     ;;
-  --*=)
-    ac_option=`expr "X$1" : 'X\([^=]*\)='`
-    ac_optarg=
-    ac_shift=:
-    ;;
   *)
     ac_option=$1
     ac_optarg=$2
@@ -23658,7 +24111,6 @@ do
     $ac_shift
     case $ac_optarg in
     *\'*) ac_optarg=`$as_echo "$ac_optarg" | sed "s/'/'\\\\\\\\''/g"` ;;
-    '') as_fn_error $? "missing file argument" ;;
     esac
     as_fn_append CONFIG_FILES " '$ac_optarg'"
     ac_need_defaults=false;;
@@ -23669,7 +24121,7 @@ do
     ac_cs_silent=: ;;
 
   # This is an error.
-  -*) as_fn_error $? "unrecognized option: \`$1'
+  -*) as_fn_error "unrecognized option: \`$1'
 Try \`$0 --help' for more information." ;;
 
   *) as_fn_append ac_config_targets " $1"
@@ -23721,7 +24173,7 @@ do
     "set_soenv") CONFIG_FILES="$CONFIG_FILES set_soenv" ;;
     "Makefile") CONFIG_FILES="$CONFIG_FILES Makefile" ;;
 
-  *) as_fn_error $? "invalid argument: \`$ac_config_target'" "$LINENO" 5 ;;
+  *) as_fn_error "invalid argument: \`$ac_config_target'" "$LINENO" 5;;
   esac
 done
 
@@ -23757,7 +24209,7 @@ $debug ||
 {
   tmp=./conf$$-$RANDOM
   (umask 077 && mkdir "$tmp")
-} || as_fn_error $? "cannot create a temporary directory in ." "$LINENO" 5
+} || as_fn_error "cannot create a temporary directory in ." "$LINENO" 5
 
 # Set up the scripts for CONFIG_FILES section.
 # No need to generate them if there are no CONFIG_FILES.
@@ -23774,7 +24226,7 @@ if test "x$ac_cr" = x; then
 fi
 ac_cs_awk_cr=`$AWK 'BEGIN { print "a\rb" }' </dev/null 2>/dev/null`
 if test "$ac_cs_awk_cr" = "a${ac_cr}b"; then
-  ac_cs_awk_cr='\\r'
+  ac_cs_awk_cr='\r'
 else
   ac_cs_awk_cr=$ac_cr
 fi
@@ -23788,18 +24240,18 @@ _ACEOF
   echo "$ac_subst_vars" | sed 's/.*/&!$&$ac_delim/' &&
   echo "_ACEOF"
 } >conf$$subs.sh ||
-  as_fn_error $? "could not make $CONFIG_STATUS" "$LINENO" 5
-ac_delim_num=`echo "$ac_subst_vars" | grep -c '^'`
+  as_fn_error "could not make $CONFIG_STATUS" "$LINENO" 5
+ac_delim_num=`echo "$ac_subst_vars" | grep -c '$'`
 ac_delim='%!_!# '
 for ac_last_try in false false false false false :; do
   . ./conf$$subs.sh ||
-    as_fn_error $? "could not make $CONFIG_STATUS" "$LINENO" 5
+    as_fn_error "could not make $CONFIG_STATUS" "$LINENO" 5
 
   ac_delim_n=`sed -n "s/.*$ac_delim\$/X/p" conf$$subs.awk | grep -c X`
   if test $ac_delim_n = $ac_delim_num; then
     break
   elif $ac_last_try; then
-    as_fn_error $? "could not make $CONFIG_STATUS" "$LINENO" 5
+    as_fn_error "could not make $CONFIG_STATUS" "$LINENO" 5
   else
     ac_delim="$ac_delim!$ac_delim _$ac_delim!! "
   fi
@@ -23888,28 +24340,20 @@ if sed "s/$ac_cr//" < /dev/null > /dev/null 2>&1; then
 else
   cat
 fi < "$tmp/subs1.awk" > "$tmp/subs.awk" \
-  || as_fn_error $? "could not setup config files machinery" "$LINENO" 5
+  || as_fn_error "could not setup config files machinery" "$LINENO" 5
 _ACEOF
 
-# VPATH may cause trouble with some makes, so we remove sole $(srcdir),
-# ${srcdir} and @srcdir@ entries from VPATH if srcdir is ".", strip leading and
+# VPATH may cause trouble with some makes, so we remove $(srcdir),
+# ${srcdir} and @srcdir@ from VPATH if srcdir is ".", strip leading and
 # trailing colons and then remove the whole line if VPATH becomes empty
 # (actually we leave an empty line to preserve line numbers).
 if test "x$srcdir" = x.; then
-  ac_vpsub='/^[	 ]*VPATH[	 ]*=[	 ]*/{
-h
-s///
-s/^/:/
-s/[	 ]*$/:/
-s/:\$(srcdir):/:/g
-s/:\${srcdir}:/:/g
-s/:@srcdir@:/:/g
-s/^:*//
+  ac_vpsub='/^[	 ]*VPATH[	 ]*=/{
+s/:*\$(srcdir):*/:/
+s/:*\${srcdir}:*/:/
+s/:*@srcdir@:*/:/
+s/^\([^=]*=[	 ]*\):*/\1/
 s/:*$//
-x
-s/\(=[	 ]*\).*/\1/
-G
-s/\n//
 s/^[^=]*=[	 ]*$//
 }'
 fi
@@ -23927,7 +24371,7 @@ do
   esac
   case $ac_mode$ac_tag in
   :[FHL]*:*);;
-  :L* | :C*:*) as_fn_error $? "invalid tag \`$ac_tag'" "$LINENO" 5 ;;
+  :L* | :C*:*) as_fn_error "invalid tag \`$ac_tag'" "$LINENO" 5;;
   :[FH]-) ac_tag=-:-;;
   :[FH]*) ac_tag=$ac_tag:$ac_tag.in;;
   esac
@@ -23955,7 +24399,7 @@ do
 	   [\\/$]*) false;;
 	   *) test -f "$srcdir/$ac_f" && ac_f="$srcdir/$ac_f";;
 	   esac ||
-	   as_fn_error 1 "cannot find input file: \`$ac_f'" "$LINENO" 5 ;;
+	   as_fn_error "cannot find input file: \`$ac_f'" "$LINENO" 5;;
       esac
       case $ac_f in *\'*) ac_f=`$as_echo "$ac_f" | sed "s/'/'\\\\\\\\''/g"`;; esac
       as_fn_append ac_file_inputs " '$ac_f'"
@@ -23982,7 +24426,7 @@ $as_echo "$as_me: creating $ac_file" >&6;}
 
     case $ac_tag in
     *:-:* | *:-) cat >"$tmp/stdin" \
-      || as_fn_error $? "could not create $ac_file" "$LINENO" 5  ;;
+      || as_fn_error "could not create $ac_file" "$LINENO" 5 ;;
     esac
     ;;
   esac
@@ -24108,22 +24552,22 @@ s&@abs_top_builddir@&$ac_abs_top_builddir&;t t
 $ac_datarootdir_hack
 "
 eval sed \"\$ac_sed_extra\" "$ac_file_inputs" | $AWK -f "$tmp/subs.awk" >$tmp/out \
-  || as_fn_error $? "could not create $ac_file" "$LINENO" 5
+  || as_fn_error "could not create $ac_file" "$LINENO" 5
 
 test -z "$ac_datarootdir_hack$ac_datarootdir_seen" &&
   { ac_out=`sed -n '/\${datarootdir}/p' "$tmp/out"`; test -n "$ac_out"; } &&
   { ac_out=`sed -n '/^[	 ]*datarootdir[	 ]*:*=/p' "$tmp/out"`; test -z "$ac_out"; } &&
   { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: $ac_file contains a reference to the variable \`datarootdir'
-which seems to be undefined.  Please make sure it is defined" >&5
+which seems to be undefined.  Please make sure it is defined." >&5
 $as_echo "$as_me: WARNING: $ac_file contains a reference to the variable \`datarootdir'
-which seems to be undefined.  Please make sure it is defined" >&2;}
+which seems to be undefined.  Please make sure it is defined." >&2;}
 
   rm -f "$tmp/stdin"
   case $ac_file in
   -) cat "$tmp/out" && rm -f "$tmp/out";;
   *) rm -f "$ac_file" && mv "$tmp/out" "$ac_file";;
   esac \
-  || as_fn_error $? "could not create $ac_file" "$LINENO" 5
+  || as_fn_error "could not create $ac_file" "$LINENO" 5
  ;;
 
 
@@ -24138,7 +24582,7 @@ _ACEOF
 ac_clean_files=$ac_clean_files_save
 
 test $ac_write_fail = 0 ||
-  as_fn_error $? "write failure creating $CONFIG_STATUS" "$LINENO" 5
+  as_fn_error "write failure creating $CONFIG_STATUS" "$LINENO" 5
 
 
 # configure is writing to config.log, and then calls config.status.
@@ -24159,7 +24603,7 @@ if test "$no_create" != yes; then
   exec 5>>config.log
   # Use ||, not &&, to avoid exiting from the if with $? = 1, which
   # would make configure fail if this is the last instruction.
-  $ac_cs_success || as_fn_exit 1
+  $ac_cs_success || as_fn_exit $?
 fi
 if test -n "$ac_unrecognized_opts" && test "$enable_option_checking" != no; then
   { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: unrecognized options: $ac_unrecognized_opts" >&5
diff --git a/configure.in b/configure.in
index 4fdd074ee6b4..8f156774b762 100644
--- a/configure.in
+++ b/configure.in
@@ -70,9 +70,6 @@ AC_ARG_WITH(vba-package-format,
 AC_ARG_ENABLE(pch,
 [  --enable-pch            EXPERIMENTAL: Enables precompiled header support for C++.
 ],,)
-AC_ARG_ENABLE(hids,
-[  --enable-hids            Enables generation of HelpId lists.
-],,)
 AC_ARG_ENABLE(mozilla,
 [  --disable-mozilla       OO.o usually includes a strangely hacked up mozilla
                           binary for your platform, to build without this
@@ -198,6 +195,10 @@ AC_ARG_ENABLE(gtk,
 [  --disable-gtk           Determines whether to use Gtk+ vclplug on platforms
                           where Gtk+ is available.
 ],,enable_gtk=yes)
+AC_ARG_ENABLE(gstreamer,
+[  --disable-gstreamer     Determines whether to use the GStreamer media
+                          backend on platforms where GStreamer is available.
+],,enable_gstreamer=yes)
 AC_ARG_ENABLE(systray,
 [  --disable-systray       Determines whether to build the systray quickstarter.
 ],,enable_systray=yes)
@@ -546,6 +547,12 @@ AC_ARG_WITH(system-altlinuxhyph,
 AC_ARG_WITH(system-lpsolve,
 [  --with-system-lpsolve         Use lpsolve already on system
 ],,)
+AC_ARG_WITH(system-libtextcat,
+[  --with-system-libtextcat      Use libtextcat already on system
+],,)
+AC_ARG_WITH(external-libtextcat-data,
+[  --with-system-libtextcat-data Use libtextcat data already on system
+],,)
 AC_ARG_WITH(system-cppunit,
 [  --with-system-cppunit         Use cppunit already on system
 ],,)
@@ -810,7 +817,9 @@ AC_ARG_WITH(build-version,
 ],with_build_version=$withval)
 AC_ARG_WITH(alloc,
 [  --with-alloc            Define which allocator to build with
-			                 (choices are oo, system, tcmalloc)
+                          (choices are oo, system, tcmalloc, jemalloc)
+
+                          Note that on FreeBSD/NetBSD system==jemalloc
 ],,)
 AC_ARG_ENABLE(verbose,
 [  --enable-verbose        Increase build verbosity.
@@ -924,6 +933,7 @@ case "$build_os" in
 		test_cups=yes
         test_randr=yes
 		test_freetype=yes
+        test_gstreamer=yes
 		_os=SunOS
 		AC_PATH_PROG( GNUTAR, gtar,,$PATH:/usr/sfw/bin)
 		if test -z "$GNUTAR"; then
@@ -958,7 +968,8 @@ case "$build_os" in
 		test_cups=yes
         test_randr=yes
 		test_freetype=yes
-		_os=Linux
+        test_gstreamer=yes
+        _os=Linux	
 		;;
 	gnu)
 		test_cups=no
@@ -968,6 +979,7 @@ case "$build_os" in
 		test_cups=no
 		test_cairo=yes
 		test_freetype=no
+        test_gstreamer=no
 		_os=WINNT
 		;;
 	darwin*) # Mac OS X
@@ -976,6 +988,7 @@ case "$build_os" in
 		test_cairo=yes
         test_randr=no
 		test_freetype=no
+        test_gstreamer=no
 		_os=Darwin
       if test "$enable_systray" = "yes" && test "$enable_gtk" != "no"; then
          AC_MSG_WARN([Disabling gtk-quickstarter - not supported on Mac. Use --disable-systray])
@@ -989,6 +1002,7 @@ case "$build_os" in
         test_randr=no
 		test_gtk=no
 		test_freetype=no
+        test_gstreamer=no
 		_os=OS2
 		;;
 	freebsd*)
@@ -999,6 +1013,7 @@ case "$build_os" in
 		test_cups=yes
         test_randr=yes
 		test_freetype=yes
+        test_gstreamer=yes
 		AC_MSG_CHECKING([the FreeBSD operating system release])
 		if test -n "$with_os_version"; then
 			OSVERSION="$with_os_version"
@@ -1033,6 +1048,7 @@ case "$build_os" in
 		test_cups=no
         test_randr=yes
 		test_freetype=yes
+        test_gstreamer=yes
 		PTHREAD_CFLAGS="-pthread"
 		PTHREAD_LIBS="-pthread -lpthread"
 		_os=NetBSD
@@ -1041,6 +1057,7 @@ case "$build_os" in
 		test_cups=no
         test_randr=no
 		test_freetype=yes
+        test_gstreamer=yes
 	   PTHREAD_LIBS=-pthread
 		echo "AIX is an alpha port --- Use at own risk" >> warn
 		_os=AIX
@@ -1430,7 +1447,7 @@ if test "$COMPATH" = "." ; then
     COMPATH=`echo $COMPATH | $SED "s@/[[^/:]]*\\\$@@"`;
 fi
 COMPATH=`echo $COMPATH | $SED "s@/[[Bb]][[Ii]][[Nn]]\\\$@@"`;
-echo $COMPATH
+
 dnl ===================================================================
 dnl  Test the gcc version,  3 is OK
 dnl ===================================================================
@@ -1452,7 +1469,8 @@ if test \( "$_os" != "WINNT" -o "$WITH_MINGWIN" = "yes" \) -a "$GCC" = "yes"; th
    fi
    if test "$_os" = "Darwin" -a "$GCCVER" -ge "040100" ; then
       if test -z "$save_CC" -a -x "$GCC_HOME/bin/gcc-4.0" ; then
-         CC=$GCC_HOME/bin/gcc-4.0
+         export CC=$GCC_HOME/bin/gcc-4.0
+          dnl  export CC to have it available in set_soenv -> config.guess
          GCCVER2=`"$CC" -dumpversion | $AWK -F. '{ print \$1*10000+\$2*100+\$3 }'`
          if test "$GCCVER2" -ge "040000" -a "$GCCVER2" -lt "040100" ; then
             GCCVER=$GCCVER2
@@ -1518,19 +1536,6 @@ fi
 AC_SUBST(ENABLE_PCH)
 
 dnl ===================================================================
-dnl Set the NO_HIDS variable. (enable with --enable-hids)
-dnl ===================================================================
-AC_MSG_CHECKING([whether to enable hid list feature])
-if test -n "$enable_hids" && test "$enable_hids" != "no"; then
-   NO_HIDS=""
-   AC_MSG_RESULT([yes])
-else
-   NO_HIDS="TRUE"
-   AC_MSG_RESULT([no])
-fi
-AC_SUBST(NO_HIDS)
-
-dnl ===================================================================
 dnl Search all the common names for GNU make
 dnl ===================================================================
 AC_MSG_CHECKING([for GNU make])
@@ -2675,6 +2680,21 @@ if test "$with_alloc" = "tcmalloc"; then
         [AC_MSG_ERROR(tcmalloc not found or functional. Install the Google Profiling Tools)], [])
     ALLOC="TCMALLOC";
 fi
+if test "$with_alloc" = "jemalloc"; then
+  if test "$_os" != "FreeBSD" -o "$_os" != "NetBSD"; then
+    AC_MSG_RESULT(jemalloc)
+    save_CFLAGS=$CFLAGS
+    CFLAGS="$CFLAGS -pthread"
+    AC_CHECK_LIB(jemalloc, malloc, [],
+        [AC_MSG_ERROR(jemalloc not found or functional. Install the jemalloc allocator.)], [])
+    ALLOC="JEMALLOC";
+    CFLAGS=$save_CFLAGS
+  else
+    AC_MSG_RESULT([system])
+    ALLOC="SYS_ALLOC";
+    AC_CHECK_FUNCS([malloc realloc calloc free])
+  fi
+fi
 if test "$with_alloc" = "internal" -o -z "$with_alloc"; then
    AC_MSG_RESULT([internal])
 fi
@@ -2966,7 +2986,7 @@ fi
 
 if test "$SOLAR_JAVA" != ""; then
     dnl first check if we have been asked to autodetect JAVA_HOME with a recent gij
-    if test "$JDK" == "gcj" -a -z "$JAVA_HOME"; then
+    if test "$JDK" = "gcj" -a -z "$JAVA_HOME"; then
       if test "x$with_jdk_home" = "x" -a "$_gij_longver" -ge "40200"; then
         cat > findhome.java <<_ACEOF
 [import java.io.File;
@@ -3054,7 +3074,7 @@ _ACEOF
          echo "JAVA_HOME was not explicitly informed with --with-jdk-home. the configure script" >> warn
          echo "attempted to find JAVA_HOME automatically, but apparently it failed" >> warn
          echo "in case JAVA_HOME is incorrectly set, some projects with not be built correctly" >> warn
-#         if test "$JDK" == "gcj"; then
+#         if test "$JDK" = "gcj"; then
 #             echo "e.g. install java-1.4.2-gcj-compat-devel and use --with-jdk-home=/usr/lib/jvm/java-1.4.2-gcj" >> warn
 #         fi
       fi
@@ -3329,9 +3349,11 @@ msi - Windows .msi
        done
        if test -z "$RPM" ; then
           AC_MSG_ERROR([not found])
-       else
-	  RPM_PATH=`which $RPM`
+       elif "$RPM" --usage 2>&1 | $EGREP -- -bb >/dev/null; then
+          RPM_PATH=`which $RPM`
           AC_MSG_RESULT([$RPM_PATH])
+       else
+          AC_MSG_ERROR([cannot build packages. Try installing rpmbuild.])
        fi
    fi
    if echo "$PKGFORMAT" | $EGREP deb 2>&1 >/dev/null; then
@@ -3385,15 +3407,16 @@ msi - Windows .msi
       fi
    fi
    AC_SUBST(BUILD_EPM)
-   AC_SUBST(PKGFORMAT)
    AC_SUBST(RPM)
    AC_SUBST(DPKG)
    AC_SUBST(PKGMK)
 else
    AC_MSG_RESULT([no])
    EPM=NO
+   PKGFORMAT=native
 fi
 AC_SUBST(EPM)
+AC_SUBST(PKGFORMAT)
 
 dnl ===================================================================
 dnl Check for gperf
@@ -3410,6 +3433,19 @@ else
 fi
 
 dnl ===================================================================
+dnl Check for building stax
+dnl ===================================================================
+AC_MSG_CHECKING([whether to build the stax])
+if test -f "./stax/download/jsr173_1.0_api.jar"; then
+   BUILD_STAX=NO
+   AC_MSG_RESULT([no, will use the prebuilt stax/download/jsr173_1.0_api.jar])
+else
+   BUILD_STAX=YES
+   AC_MSG_RESULT([yes])
+fi
+AC_SUBST(BUILD_STAX)
+
+dnl ===================================================================
 dnl Check for building ODK
 dnl ===================================================================
 AC_MSG_CHECKING([whether to build the ODK])
@@ -3599,12 +3635,6 @@ if test -n "$with_system_cppunit" -o -n "$with_system_libs" && \
     # a system-cppunit before the first version using a proper cppunit
     # (and that being 1.12.1) anyway
     PKG_CHECK_MODULES( CPPUNIT, cppunit >= 1.12.1 )
-    AC_MSG_CHECKING([STL compatibility])
-    if test "$WITH_STLPORT" != "no"; then
-	AC_MSG_ERROR([to use system cppunit you need to use --without-stlport])
-    else
-	AC_MSG_RESULT([OK])	
-    fi
 else
     AC_MSG_RESULT([internal])
     SYSTEM_CPPUNIT=NO
@@ -3644,7 +3674,7 @@ AC_SUBST(USE_FT_EMBOLDEN)
 if test -n "$with_system_libxslt" -o -n "$with_system_libs" && \
    test "$with_system_libxslt" != "no"; then
     if test -z "$with_system_libxml" -a -z "$with_system_libs" || \
-      test "$with_system_libxml" == "no"; then
+      test "$with_system_libxml" = "no"; then
       # somehow AC_MSG_WARN won't work...
        echo "to prevent incompatibilities between internal libxml2 and libxslt, the office will be build with system-libxml"
        echo "to prevent incompatibilities between internal libxml2 and libxslt, the office will be build with system-libxml" >> warn
@@ -3654,7 +3684,7 @@ fi
 if test -n "$with_system_libxml" -o -n "$with_system_libs" && \
    test "$with_system_libxml" != "no"; then
     if test -z "$with_system_libxslt" -a -z "$with_system_libs" || \
-      test "$with_system_libxslt" == "no"; then
+      test "$with_system_libxslt" = "no"; then
       # somehow AC_MSG_WARN won't work...
        echo "to prevent incompatibilities between internal libxslt and libxml2, the office will be build with system-libxslt"
        echo "to prevent incompatibilities between internal libxslt and libxml2, the office will be build with system-libxslt" >> warn
@@ -3809,9 +3839,13 @@ if test -n "$with_system_lucene" -o -n "$with_system_libs" && \
           AC_CHECK_FILE(/usr/share/java/lucene-core-2.3.jar, 
             [ LUCENE_CORE_JAR=/usr/share/java/lucene-core-2.3.jar ],
             [
-              AC_CHECK_FILE(/usr/share/java/lucene.jar, 
-                [ LUCENE_CORE_JAR=/usr/share/java/lucene.jar ],
-                [ AC_MSG_ERROR(lucene-core.jar replacement not found)]
+              AC_CHECK_FILE(/usr/share/java/lucene-core.jar, 
+                [ LUCENE_CORE_JAR=/usr/share/java/lucene-core.jar ],
+                [ AC_CHECK_FILE(/usr/share/java/lucene.jar, 
+                   [ LUCENE_CORE_JAR=/usr/share/java/lucene.jar ],
+                   [ AC_MSG_ERROR(lucene-core.jar replacement not found)]
+                  )
+                ]
               )
             ]
           )
@@ -3834,6 +3868,22 @@ if test -n "$with_system_lucene" -o -n "$with_system_libs" && \
           AC_CHECK_FILE($LUCENE_CORE_JAR, [],
                [ AC_MSG_ERROR(lucene-analyzers.jar not found.)], [])
         fi
+        AC_MSG_CHECKING([whether lucene is version 2.x])
+        export LUCENE_CORE_JAR
+        if $PERL -e 'use Archive::Zip;
+            my $file = "$ENV{'LUCENE_CORE_JAR'}";
+            my $zip = Archive::Zip->new( $file );
+            my $mf = $zip->contents ( "META-INF/MANIFEST.MF" );
+            if ( $mf =~ m/Specification-Version: 2.*/ ) {
+                exit 0;
+            } else {
+                exit 1;
+            }'; then
+            AC_MSG_RESULT([yes])
+         else
+            AC_MSG_ERROR([no, you need lucene 2])
+         fi
+
 else
     AC_MSG_RESULT([internal])
     SYSTEM_LUCENE=NO
@@ -3971,32 +4021,32 @@ if test -n "$with_system_hsqldb" -o -n "$with_system_libs" && \
         fi
         AC_CHECK_FILE($HSQLDB_JAR, [],
                [AC_MSG_ERROR(hsqldb.jar not found.)], [])
-        AC_MSG_CHECKING([whether hsqldb is >= 1.8.0.9])
+        AC_MSG_CHECKING([whether hsqldb is 1.8.0.x])
         export HSQLDB_JAR
         if $PERL -e 'use Archive::Zip;
             my $file = "$ENV{'HSQLDB_JAR'}";
             my $zip = Archive::Zip->new( $file );
             my $mf = $zip->contents ( "META-INF/MANIFEST.MF" );
-	    if ( $mf =~ m/Specification-Version: 1.8.*/ ) {
-	    	push @l, split(/\n/, $mf);
-	    	foreach my $line (@l) {
-		    if ($line =~ m/Specification-Version:/) {
-		        ($t, $version) = split (/:/,$line);
-		        $version =~ s/^\s//;
-		        ($a, $b, $c, $d) = split (/\./,$version);
-		        if (($c == "0" && $d > "8") || $c > 0)  {
-		            exit 0;
-		        } else {
-		            exit 1;
-		        }
-		    }
-		}
-	    } else {
-	        exit 1;
+            if ( $mf =~ m/Specification-Version: 1.8.*/ ) {
+               push @l, split(/\n/, $mf);
+               foreach my $line (@l) {
+                  if ($line =~ m/Specification-Version:/) {
+                      ($t, $version) = split (/:/,$line);
+                      $version =~ s/^\s//;
+                      ($a, $b, $c, $d) = split (/\./,$version);
+                      if ($c == "0" && $d > "8")  {
+                          exit 0;
+                      } else {
+                          exit 1;
+                      }
+                  }
+               }
+            } else {
+                exit 1;
             }'; then
             AC_MSG_RESULT([yes])
          else
-            AC_MSG_ERROR([no, hsqldb >= 1.8.0.9 is needed])
+            AC_MSG_ERROR([no, you need hsqldb >= 1.8.0.9 but < 1.8.1])
          fi
 else
     AC_MSG_RESULT([internal])
@@ -4203,7 +4253,7 @@ if test -n "$with_system_boost" -o -n "$with_system_headers" && \
    AC_CHECK_HEADER(boost/shared_ptr.hpp, [],
        [AC_MSG_ERROR(boost/shared_ptr.hpp not found. install boost)], [])
    AC_CHECK_HEADER(boost/spirit/include/classic_core.hpp, [],
-       [AC_MSG_ERROR(boost/spirit/include/classic_core.hpp not found. install boost >= 1.38)], [])
+       [AC_MSG_ERROR(boost/spirit/include/classic_core.hpp not found. install boost >= 1.36)], [])
    AC_CHECK_HEADER(boost/function.hpp, [],
        [AC_MSG_ERROR(boost/function.hpp not found. install boost)], [])
 
@@ -4420,7 +4470,7 @@ Please recompile $tmp with --enable-ldap or use --with-openldap.])
 
     #e.g. http://fedoraproject.org/wiki/Releases/FeatureXULRunnerAPIChanges
     #the plugin pkg-config etc. reverts to "mozilla-plugin" with libxul
-    if test "$MOZ_FLAVOUR" == "libxul"; then
+    if test "$MOZ_FLAVOUR" = "libxul"; then
         MOZ_FLAVOUR="mozilla"
     fi
 
@@ -4681,7 +4731,7 @@ dnl Graphite
 dnl ===================================================================
 
 AC_MSG_CHECKING([whether to enable graphite support])
-if test "$_os" = "WINNT" -o "$_os" = "Linux" && test "z$enable_graphite" == "z" -o "$enable_graphite" != "no" ; then
+if test "$_os" = "WINNT" -o "$_os" = "Linux" && test "z$enable_graphite" = "z" -o "$enable_graphite" != "no" ; then
     AC_MSG_RESULT([yes])
     ENABLE_GRAPHITE="TRUE"
     AC_MSG_CHECKING([which graphite to use])
@@ -5125,6 +5175,9 @@ if test -n "$with_system_lpsolve" -o -n "$with_system_libs" && \
     SYSTEM_LPSOLVE=YES
     AC_CHECK_HEADER(lpsolve/lp_lib.h, [],
        [ AC_MSG_ERROR(lpsolve headers not found.)], [])
+    # some systems need this. Like Ubuntu....
+    AC_CHECK_LIB(m, floor)
+    AC_CHECK_LIB(dl, dlopen)
     AC_CHECK_LIB(lpsolve55, make_lp, ,
         [ AC_MSG_ERROR(lpsolve library not found or too old.)], [])
 else
@@ -5134,6 +5187,38 @@ else
 fi
 AC_SUBST(SYSTEM_LPSOLVE)
 
+dnl ===================================================================
+dnl Checking for libtextcat
+dnl ===================================================================
+AC_MSG_CHECKING([which libtextcat to use])
+if test -n "$with_system_libtextcat" && test "$with_system_libtextcat" != "no"; then
+    AC_MSG_RESULT([external])
+    SYSTEM_LIBTEXTCAT=YES
+    AC_CHECK_HEADER(libtextcat/textcat.h, [],
+       [ AC_MSG_ERROR(libtextcat headers not found.)], [])
+    AC_CHECK_LIB(textcat, special_textcat_Init, ,
+        [ AC_MSG_ERROR(libtextcat library not found or not suitable. libtextcat typically needs to be patched)], [])
+else
+    AC_MSG_RESULT([internal])
+    SYSTEM_LIBTEXTCAT=NO
+    BUILD_TYPE="$BUILD_TYPE LIBTEXTCAT"
+fi
+AC_SUBST(SYSTEM_LIBTEXTCAT)
+
+AC_MSG_CHECKING([which libtextcat data directory to use])
+if test -n "$with_system_libtextcat_data" && test "$with_system_libtextcat_data" != "no"; then
+    if test "$with_system_libtextcat_data" = "yes"; then
+        SYSTEM_LIBTEXTCAT_DATA=file:///usr/share/libtextcat
+    else
+        SYSTEM_LIBTEXTCAT_DATA=file://$with_system_libtextcat_data
+    fi
+    AC_MSG_RESULT([$SYSTEM_LIBTEXTCAT_DATA])
+else
+    AC_MSG_RESULT([internal])
+    BUILD_TYPE="$BUILD_TYPE LIBTEXTCATDATA"
+fi
+AC_SUBST(SYSTEM_LIBTEXTCAT_DATA)
+
 dnl ***************************************
 dnl testing libc version for Linux...
 dnl ***************************************
@@ -5438,13 +5523,11 @@ if test "$_os" = "WINNT" -a "$WITH_MINGWIN" != "yes"; then
        with_asm_home="ASM_IN_PATH"
     fi
   fi
+  AC_MSG_RESULT([$ASM_HOME])
 else
-	with_asm_home="NO_ASM_HOME"
+  with_asm_home="NO_ASM_HOME"
 fi
 ASM_HOME="$with_asm_home"
-if test -n "$ASM_HOME"; then
-  AC_MSG_RESULT([$ASM_HOME])
-fi
 AC_SUBST(ASM_HOME)
  
 dnl ===================================================================
@@ -5692,6 +5775,29 @@ AC_SUBST(GTK_CFLAGS)
 AC_SUBST(GTK_LIBS)
 
 dnl ===================================================================
+dnl Check whether the GStreamer libraries are available.
+dnl ===================================================================
+
+GSTREAMER_CFLAGS=""
+GSTREAMER_LIBS=""
+ENABLE_GSTREAMER=""
+
+if test "$test_gstreamer" = "yes"; then
+    AC_MSG_CHECKING([whether to build the GStreamer media backend])
+    if test "x$enable_gstreamer" != "xno" ; then
+        PKG_CHECK_MODULES( GSTREAMER, gtk+-2.0 >= 2.4 gthread-2.0 gstreamer-0.10 gstreamer-interfaces-0.10 ,,AC_MSG_ERROR([requirements to build the GStreamer media backend not met. Use --disable-gstreamer or install the missing packages]))
+        ENABLE_GSTREAMER="TRUE"
+        AC_MSG_RESULT([yes])
+    else
+        AC_MSG_RESULT([no])
+    fi
+fi
+AC_SUBST(ENABLE_GSTREAMER)
+AC_SUBST(GSTREAMER_CFLAGS)
+AC_SUBST(GSTREAMER_LIBS)
+
+
+dnl ===================================================================
 dnl Check whether the Cairo libraries are available.
 dnl ===================================================================
 
@@ -5861,7 +5967,7 @@ else
 fi
 AC_SUBST(ENABLE_MEDIAWIKI)
 
-if test "$ENABLE_MEDIAWIKI" == "YES"; then
+if test "$ENABLE_MEDIAWIKI" = "YES"; then
   AC_MSG_CHECKING([which Servlet API Jar to use])
   if test -n "$with_system_servlet_api"; then
     AC_MSG_RESULT([external])
@@ -5891,9 +5997,9 @@ if test -n "$enable_report_builder" -a "$enable_report_builder" != "no" && test
     AC_MSG_ERROR([not existing. get it (did you get the -extensions tarball?)])
   fi
   AC_MSG_CHECKING([which jfreereport libs to use])
-  if test "$with_system_jfreereport" == "yes"; then
-   	SYSTEM_JFREEREPORT=YES
-  	   AC_MSG_RESULT([external])
+  if test "$with_system_jfreereport" = "yes"; then
+      SYSTEM_JFREEREPORT=YES
+      AC_MSG_RESULT([external])
       if test -z $SAC_JAR; then
              SAC_JAR=/usr/share/java/sac.jar
       fi
@@ -6298,7 +6404,7 @@ if test "$test_kde4" = "yes" -a "$ENABLE_KDE4" = "TRUE" ; then
    kde_incdirs="/usr/include $x_includes"
    kde_libdirs="/usr/lib $x_libraries"
    
-   if test "$build_cpu" == "x86_64" ; then
+   if test "$build_cpu" = "x86_64" ; then
       qt_libdirs="$qt_libdirs /usr/lib64/qt4 /usr/lib64/qt /usr/lib64"
       kde_libdirs="$kde_libdirs /usr/lib64 /usr/lib64/kde4"
    fi
@@ -6496,6 +6602,7 @@ dnl ===================================================================
 AC_MSG_CHECKING([whether to include AFMs])
 if test "$with_afms" != "no"; then
   AC_MSG_RESULT([yes])
+  BUILD_TYPE="$BUILD_TYPE AFMS"
 else
   AC_MSG_RESULT([no])
   WITHOUT_AFMS=YES
@@ -6597,27 +6704,6 @@ else
     export ANT_HOME
   fi
 
-  ant_minver=1.6.0
-  # update for more extensions...
-  if test "$ENABLE_MEDIAWIKI" = "YES"; then
-    ant_minver=1.7.0
-  fi
-  ant_minminor1=`echo $ant_minver | cut -d"." -f2`
-
-  AC_MSG_CHECKING([whether ant is >= $ant_minver])
-  ant_version=`$ANT -version | $AWK '{ print $4; }'`
-  ant_version_major=`echo $ant_version | cut -d. -f1`
-  ant_version_minor=`echo $ant_version | cut -d. -f2`
-echo "configure: ant_version $ant_version " >&5
-echo "configure: ant_version_major $ant_version_major " >&5
-echo "configure: ant_version_minor $ant_version_minor " >&5
-  if test "$ant_version_major" -ge "2"; then
-  	AC_MSG_RESULT([yes, $ant_version])
-  elif test "$ant_version_major" = "1" && test "$ant_version_minor" -ge "$ant_minminor1"; then
-  	AC_MSG_RESULT([yes, $ant_version])
-  else
-  	AC_MSG_ERROR([no, you need at least ant >= $ant_minver])
-  fi
   AC_MSG_CHECKING([if $ANT works])
 cat > conftest.java << EOF
     public class conftest {
@@ -6698,24 +6784,46 @@ fi
 AC_SUBST(ANT_LIB)
 fi
 
+ant_minver=1.6.0
+# update for more extensions...
+if test "$ENABLE_MEDIAWIKI" = "YES"; then
+  ant_minver=1.7.0
+fi
+ant_minminor1=`echo $ant_minver | cut -d"." -f2`
+
+AC_MSG_CHECKING([whether ant is >= $ant_minver])
+ant_version=`$ANT -version | $AWK '{ print $4; }'`
+ant_version_major=`echo $ant_version | cut -d. -f1`
+ant_version_minor=`echo $ant_version | cut -d. -f2`
+echo "configure: ant_version $ant_version " >&5
+echo "configure: ant_version_major $ant_version_major " >&5
+echo "configure: ant_version_minor $ant_version_minor " >&5
+if test "$ant_version_major" -ge "2"; then
+   AC_MSG_RESULT([yes, $ant_version])
+elif test "$ant_version_major" = "1" && test "$ant_version_minor" -ge "$ant_minminor1"; then
+   AC_MSG_RESULT([yes, $ant_version])
+else
+   AC_MSG_ERROR([no, you need at least ant >= $ant_minver])
+fi
+
 if test "$ENABLE_MEDIAWIKI" = "YES"; then
 AC_MSG_CHECKING([whether ant supports mapper type="regexp"])
 rm -rf confdir
 mkdir confdir
 cat > conftest.java << EOF
     public class conftest {
-	int testmethod(int a, int b) {
+        int testmethod(int a, int b) {
             return a + b;
-	}
+        }
     }
 EOF
 
 cat > conftest.xml << EOF
     <project name="conftest" default="conftest">
-	<target name="conftest" depends="copytest">
+        <target name="conftest" depends="copytest">
             <javac srcdir="." includes="conftest.java">
-	    </javac>
-	</target>
+            </javac>
+        </target>
         <target name="copytest">
              <copy todir="confdir">
                  <fileset dir="confdir" includes="**/*.abc" casesensitive="yes"/>
@@ -6884,11 +6992,11 @@ AC_SUBST(ENABLE_LAYOUT)
 # ===================================================================
 AC_MSG_CHECKING([build verbosity])
 if test -n "$enable_verbose"; then
-   if test "$enable_verbose" == "yes"; then
+   if test "$enable_verbose" = "yes"; then
       VERBOSE="TRUE"
       AC_MSG_RESULT([high])
    fi
-   if test "$enable_verbose" == "no"; then
+   if test "$enable_verbose" = "no"; then
       VERBOSE="FALSE"
       AC_MSG_RESULT([low])
    fi
diff --git a/instsetoo_native/inc_ooolangpack/windows/msi_templates/ControlE.idt b/instsetoo_native/inc_ooolangpack/windows/msi_templates/ControlE.idt
index dea5e9767a6e..21f7fe7726a5 100644
--- a/instsetoo_native/inc_ooolangpack/windows/msi_templates/ControlE.idt
+++ b/instsetoo_native/inc_ooolangpack/windows/msi_templates/ControlE.idt
@@ -132,7 +132,6 @@ SetupResume	Next	EndDialog	Return	OutOfNoRbDiskSpace <> 1	0
 SetupResume	Next	NewDialog	OutOfSpace	OutOfNoRbDiskSpace = 1	0
 SetupType	Back	NewDialog	CustomerInformation	1	0
 SetupType	Cancel	SpawnDialog	CancelSetup	1	0
-SetupType	Next	AddLocal	ALL	_IsSetupTypeMin = "Typical"	0
 SetupType	Next	NewDialog	CustomSetup	_IsSetupTypeMin = "Custom"	0
 SetupType	Next	NewDialog	ReadyToInstall	_IsSetupTypeMin <> "Custom"	0
 SplashBitmap	Cancel	SpawnDialog	CancelSetup	1	0
diff --git a/instsetoo_native/inc_openoffice/windows/msi_languages/Control.ulf b/instsetoo_native/inc_openoffice/windows/msi_languages/Control.ulf
index 7fcb566af0e3..ec904cd5e904 100644
--- a/instsetoo_native/inc_openoffice/windows/msi_languages/Control.ulf
+++ b/instsetoo_native/inc_openoffice/windows/msi_languages/Control.ulf
@@ -620,7 +620,7 @@ en-US = "< &Back"
 en-US = "Cancel"
 
 [OOO_CONTROL_255]
-en-US = "All program features will be installed. (Requires the most disk space.)"
+en-US = "The main components will be installed. Recommended for most users."
 
 [OOO_CONTROL_256]
 en-US = "Choose which program features you want installed and where they will be installed. Recommended for advanced users."
diff --git a/instsetoo_native/inc_openoffice/windows/msi_languages/RadioBut.ulf b/instsetoo_native/inc_openoffice/windows/msi_languages/RadioBut.ulf
index da2d44cdb983..24b51774bacb 100644
--- a/instsetoo_native/inc_openoffice/windows/msi_languages/RadioBut.ulf
+++ b/instsetoo_native/inc_openoffice/windows/msi_languages/RadioBut.ulf
@@ -8,7 +8,7 @@ en-US = "{&MSSansBold8}Re&pair"
 en-US = "{&MSSansBold8}&Remove"
 
 [OOO_RADIOBUTTON_4]
-en-US = "{&MSSansBold8}&Complete"
+en-US = "{&MSSansBold8}&Typical"
 
 [OOO_RADIOBUTTON_5]
 en-US = "{&MSSansBold8}Cu&stom"
diff --git a/instsetoo_native/inc_openoffice/windows/msi_templates/ControlE.idt b/instsetoo_native/inc_openoffice/windows/msi_templates/ControlE.idt
index 2200f4d28a3a..56bf6b92d757 100644
--- a/instsetoo_native/inc_openoffice/windows/msi_templates/ControlE.idt
+++ b/instsetoo_native/inc_openoffice/windows/msi_templates/ControlE.idt
@@ -145,7 +145,6 @@ SetupResume	Next	EndDialog	Return	OutOfNoRbDiskSpace <> 1	0
 SetupResume	Next	NewDialog	OutOfSpace	OutOfNoRbDiskSpace = 1	0
 SetupType	Back	NewDialog	CustomerInformation	1	0
 SetupType	Cancel	SpawnDialog	CancelSetup	1	0
-SetupType	Next	AddLocal	ALL	_IsSetupTypeMin = "Typical"	0
 SetupType	Next	NewDialog	CustomSetup	_IsSetupTypeMin = "Custom"	0
 SetupType	Next	[FILETYPEDIALOGUSED]	0	_IsSetupTypeMin <> "Custom"	5
 SetupType	Next	NewDialog	ReadyToInstall	_IsSetupTypeMin <> "Custom"	6
diff --git a/instsetoo_native/inc_sdkoo/windows/msi_templates/ControlE.idt b/instsetoo_native/inc_sdkoo/windows/msi_templates/ControlE.idt
index 332945b50bdb..49407d4770da 100644
--- a/instsetoo_native/inc_sdkoo/windows/msi_templates/ControlE.idt
+++ b/instsetoo_native/inc_sdkoo/windows/msi_templates/ControlE.idt
@@ -133,7 +133,6 @@ SetupResume	Next	EndDialog	Return	OutOfNoRbDiskSpace <> 1	0
 SetupResume	Next	NewDialog	OutOfSpace	OutOfNoRbDiskSpace = 1	0
 SetupType	Back	NewDialog	CustomerInformation	1	0
 SetupType	Cancel	SpawnDialog	CancelSetup	1	0
-SetupType	Next	AddLocal	ALL	_IsSetupTypeMin = "Typical"	0
 SetupType	Next	NewDialog	CustomSetup	_IsSetupTypeMin = "Custom"	0
 SetupType	Next	NewDialog	ReadyToInstall	_IsSetupTypeMin <> "Custom"	0
 SplashBitmap	Cancel	SpawnDialog	CancelSetup	1	0
diff --git a/instsetoo_native/inc_ure/windows/msi_templates/ControlE.idt b/instsetoo_native/inc_ure/windows/msi_templates/ControlE.idt
index 332945b50bdb..49407d4770da 100644
--- a/instsetoo_native/inc_ure/windows/msi_templates/ControlE.idt
+++ b/instsetoo_native/inc_ure/windows/msi_templates/ControlE.idt
@@ -133,7 +133,6 @@ SetupResume	Next	EndDialog	Return	OutOfNoRbDiskSpace <> 1	0
 SetupResume	Next	NewDialog	OutOfSpace	OutOfNoRbDiskSpace = 1	0
 SetupType	Back	NewDialog	CustomerInformation	1	0
 SetupType	Cancel	SpawnDialog	CancelSetup	1	0
-SetupType	Next	AddLocal	ALL	_IsSetupTypeMin = "Typical"	0
 SetupType	Next	NewDialog	CustomSetup	_IsSetupTypeMin = "Custom"	0
 SetupType	Next	NewDialog	ReadyToInstall	_IsSetupTypeMin <> "Custom"	0
 SplashBitmap	Cancel	SpawnDialog	CancelSetup	1	0
diff --git a/instsetoo_native/prj/d.lst b/instsetoo_native/prj/d.lst
index b417858098cc..4a1f33b51071 100644
--- a/instsetoo_native/prj/d.lst
+++ b/instsetoo_native/prj/d.lst
@@ -1,4 +1,3 @@
 mkdir: %_DEST%\pus%_EXT%
-..\%COMMON_OUTDIR%\bin\hid.lst %COMMON_DEST%\bin%_EXT%\hid.lst
 ..\%COMMON_OUTDIR%\bin\hid\userfeedback_VCL_names.csv %COMMON_DEST%\bin%_EXT%\userfeedback_VCL_names.csv
 ..\%__SRC%\misc\*.update.xml %_DEST%\pus%_EXT%\*.update.xml
diff --git a/instsetoo_native/util/makefile.mk b/instsetoo_native/util/makefile.mk
index 72f4262b1c4e..fceadbfdca65 100644
--- a/instsetoo_native/util/makefile.mk
+++ b/instsetoo_native/util/makefile.mk
@@ -28,7 +28,6 @@
 PRJ=..
 PRJNAME=instsetoo_native
 TARGET=util
-GEN_HID2=TRUE
 
 .INCLUDE:  settings.mk
 .INCLUDE: $(SOLARINCDIR)$/rtlbootstrap.mk
@@ -210,7 +209,7 @@ $(MAKETARGETS){$(PKGFORMAT:^".")} : $(ADDDEPS)
 .ENDIF			# "$(MAKETARGETS:e)"=="" && "$(MAKETARGETS:s/_//)"!="$(MAKETARGETS)"
 .ENDIF			# "$(MAKETARGETS)"!=""
 openoffice_%{$(PKGFORMAT:^".") .archive} :
-    $(PERL) -w $(SOLARENV)$/bin$/make_installer.pl -f $(PRJ)$/util$/openoffice.lst -l $(subst,$(@:s/_/ /:1)_, $(@:b)) -p OpenOffice -u $(OUT) -buildid $(BUILD) -msitemplate $(MSIOFFICETEMPLATEDIR) -msilanguage $(COMMONMISC)$/win_ulffiles -format $(@:e:s/.//) $(VERBOSESWITCH) -log
+    $(PERL) -w $(SOLARENV)$/bin$/make_installer.pl -f $(PRJ)$/util$/openoffice.lst -l $(subst,$(@:s/_/ /:1)_, $(@:b)) -p OpenOffice -u $(OUT) -buildid $(BUILD) -msitemplate $(MSIOFFICETEMPLATEDIR) -msilanguage $(COMMONMISC)$/win_ulffiles -format $(@:e:s/.//) $(VERBOSESWITCH)
     $(PERL) -w $(SOLARENV)$/bin$/gen_update_info.pl --buildid $(BUILD) --arch "$(RTL_ARCH)" --os "$(RTL_OS)" --lstfile $(PRJ)$/util$/openoffice.lst --product OpenOffice --languages $(subst,$(@:s/_/ /:1)_, $(@:b)) $(PRJ)$/util$/update.xml > $(MISC)/$(@:b)_$(RTL_OS)_$(RTL_ARCH)$(@:e).update.xml
 
 $(foreach,i,$(alllangiso) openofficewithjre_$i) : $$@{$(PKGFORMAT:^".")}
diff --git a/instsetoo_native/util/openoffice.lst b/instsetoo_native/util/openoffice.lst
index 221aee9868b2..e1f630ee19b9 100644
--- a/instsetoo_native/util/openoffice.lst
+++ b/instsetoo_native/util/openoffice.lst
@@ -4,15 +4,15 @@ Globals
 	{
 		variables
 		{
-			OOOBASEVERSION 3.3
-			OOOPACKAGEVERSION 3.3.0
-			UREPACKAGEVERSION 1.7.0
+			OOOBASEVERSION 3.4
+			OOOPACKAGEVERSION 3.4.0
+			UREPACKAGEVERSION 1.8.0
 			URELAYERVERSION 1
 			BASISROOTNAME OpenOffice.org
 			UNIXBASISROOTNAME openoffice.org
-			SERVICETAG_PRODUCTNAME OpenOffice.org 3.3 
-			SERVICETAG_PRODUCTVERSION 3.3
-			SERVICETAG_PARENTNAME OpenOffice.org 3.3 
+			SERVICETAG_PRODUCTNAME OpenOffice.org 3.4 
+			SERVICETAG_PRODUCTVERSION 3.4
+			SERVICETAG_PARENTNAME OpenOffice.org 3.4 
 			SERVICETAG_SOURCE {buildsource}{minor}(Build:{buildid})
 			SERVICETAG_URN urn:uuid:0187debd-e458-11de-82d6-080020a9ed93
 			HIDELICENSEDIALOG 1
@@ -21,7 +21,7 @@ Globals
 			UREPACKAGEPREFIX openoffice.org
 			SOLSUREPACKAGEPREFIX openofficeorg
 			USE_FILEVERSION 1
-			LIBRARYVERSION 9.3.0
+			LIBRARYVERSION 9.4.0
             POOLPRODUCT 1
             REGISTRATION_HOST https://registration2.services.openoffice.org/RegistrationWeb
 			REGISTRATIONURL http://survey.services.openoffice.org/user/index.php
@@ -36,7 +36,7 @@ Globals
             CREATE_MSP_INSTALLSET 0
             UPDATE_DATABASE_LISTNAME finals_instsetoo.txt
  			PACKAGEMAP package_names.txt,package_names_ext.txt
-			WINDOWSPATCHLEVEL 6
+			WINDOWSPATCHLEVEL 8
             OOOVENDOR Oracle
 			OOODOWNLOADNAME 1
 			STARTCENTER_LAYOUT_STYLE 0
@@ -53,7 +53,7 @@ OpenOffice
 		variables
 		{
 			PRODUCTNAME OpenOffice.org
-			PRODUCTVERSION 3.3
+			PRODUCTVERSION 3.4
 			PRODUCTEXTENSION 
 			LONG_PRODUCTEXTENSION 
 			SHORT_PRODUCTEXTENSION 
@@ -61,22 +61,21 @@ OpenOffice
             POSTVERSIONEXTENSIONUNIX
 			BRANDPACKAGEVERSION 3
 			USERDIRPRODUCTVERSION 3
-			ABOUTBOXPRODUCTVERSION 3.3.0
-			BASEPRODUCTVERSION 3.3
+			ABOUTBOXPRODUCTVERSION 3.4.0
+			BASEPRODUCTVERSION 3.4
             PCPFILENAME openoffice.pcp
-			UPDATEURL http://update36.services.openoffice.org/ProductUpdateService/check.Update
+			UPDATEURL http://update38.services.openoffice.org/ProductUpdateService/check.Update
             ODFNOTIFYURL http://odfnotify.services.openoffice.org/OOo3.0/notification.jsp?version=ODF
-			ADD_INCLUDE_FILES cliureversion.mk,clioootypesversion.mk,userland.txt
+			ADD_INCLUDE_FILES cliureversion.mk,clioootypesversion.mk,userland.txt,version.lst
 			REMOVE_UPGRADE_CODE_FILE upgradecode_remove_ooo.txt
 			ADDSYSTEMINTEGRATION 1
 			EVAL
 			FILEFORMATNAME OpenOffice.org
 			FILEFORMATVERSION 1.0
 			WRITERCOMPATIBILITYVERSIONOOO11 OpenOffice.org 1.1
-			PACKAGEVERSION 3.3.0
+			PACKAGEVERSION 3.4.0
 			PACKAGEREVISION {milestone}
 			LICENSENAME LGPL
-			SERVICESPROJEKT 1
 			GLOBALFILEGID gid_File_Lib_Vcl
 			GLOBALPATCHFILEGID gid_File_Txt_Patchfiles
 			SPELLCHECKERFILE spellchecker_selection.txt
@@ -88,7 +87,7 @@ OpenOffice
 			STUBUPGRADECODE {0E7B27B8-D658-4BF9-98D6-EC361582EB4A}
 			CHANGETARGETDIR 1
 			USE_FILEVERSION 1
-			LIBRARYVERSION 9.3.0
+			LIBRARYVERSION 9.4.0
 			PATCHCODEFILE ooo_patchcodes.txt
 			DOWNLOADBANNER	ooobanner.bmp
 			DOWNLOADBITMAP	ooobitmap.bmp
@@ -118,7 +117,7 @@ OpenOffice_wJRE
 		variables
 		{
 			PRODUCTNAME OpenOffice.org
-			PRODUCTVERSION 3.3
+			PRODUCTVERSION 3.4
 			PRODUCTEXTENSION 
 			LONG_PRODUCTEXTENSION 
 			SHORT_PRODUCTEXTENSION 
@@ -126,21 +125,20 @@ OpenOffice_wJRE
             POSTVERSIONEXTENSIONUNIX
 			BRANDPACKAGEVERSION 3
 			USERDIRPRODUCTVERSION 3
-			ABOUTBOXPRODUCTVERSION 3.3.0
-			BASEPRODUCTVERSION 3.3
-			UPDATEURL http://update36.services.openoffice.org/ProductUpdateService/check.Update
+			ABOUTBOXPRODUCTVERSION 3.4.0
+			BASEPRODUCTVERSION 3.4
+			UPDATEURL http://update38.services.openoffice.org/ProductUpdateService/check.Update
             ODFNOTIFYURL http://odfnotify.services.openoffice.org/OOo3.0/notification.jsp?version=ODF
-			ADD_INCLUDE_FILES cliureversion.mk,clioootypesversion.mk,javaversion2.dat,userland.txt
+			ADD_INCLUDE_FILES cliureversion.mk,clioootypesversion.mk,javaversion2.dat,userland.txt,version.lst
 			REMOVE_UPGRADE_CODE_FILE upgradecode_remove_ooo.txt
 			ADDSYSTEMINTEGRATION 1
 			EVAL
 			FILEFORMATNAME OpenOffice.org
 			FILEFORMATVERSION 1.0
 			WRITERCOMPATIBILITYVERSIONOOO11 OpenOffice.org 1.1
-			PACKAGEVERSION 3.3.0
+			PACKAGEVERSION 3.4.0
 			PACKAGEREVISION {milestone}
 			LICENSENAME LGPL
-			SERVICESPROJEKT 1
 			WITHJREPRODUCT 1
 			GLOBALFILEGID gid_File_Lib_Vcl
 			GLOBALPATCHFILEGID gid_File_Txt_Patchfiles
@@ -153,7 +151,7 @@ OpenOffice_wJRE
 			STUBUPGRADECODE {0E7B27B8-D658-4BF9-98D6-EC361582EB4A}
 			CHANGETARGETDIR 1
 			USE_FILEVERSION 1
-			LIBRARYVERSION 9.3.0
+			LIBRARYVERSION 9.4.0
 			PATCHCODEFILE ooo_patchcodes.txt
 			JAVAPRODUCT 1
 			DOWNLOADBANNER	ooobanner.bmp
@@ -183,7 +181,7 @@ OpenOffice_Dev
 		variables
 		{
 			PRODUCTNAME OOo-dev
-			PRODUCTVERSION 3.3
+			PRODUCTVERSION 3.4
 			PRODUCTEXTENSION 
 			LONG_PRODUCTEXTENSION 
 			SHORT_PRODUCTEXTENSION 
@@ -193,25 +191,24 @@ OpenOffice_Dev
             POSTVERSIONEXTENSIONUNIX
 			BRANDPACKAGEVERSION 3
 			USERDIRPRODUCTVERSION 3
-			ABOUTBOXPRODUCTVERSION 3.3.0
-			BASEPRODUCTVERSION 3.3
+			ABOUTBOXPRODUCTVERSION 3.4.0
+			BASEPRODUCTVERSION 3.4
 			DEVELOPMENTPRODUCT 1
 			BASISPACKAGEPREFIX ooobasis-dev
 			UREPACKAGEPREFIX ooodev
 			SOLSUREPACKAGEPREFIX ooodev
 			REGISTRYLAYERNAME LayerDev
 			SERVICETAG_URN urn:uuid:1680b00d-e45c-11de-82d6-080020a9ed93
-			UPDATEURL http://update36.services.openoffice.org/ProductUpdateService/check.Update
+			UPDATEURL http://update38.services.openoffice.org/ProductUpdateService/check.Update
             ODFNOTIFYURL http://odfnotify.services.openoffice.org/OOo3.0/notification.jsp?version=ODF
-			ADD_INCLUDE_FILES cliureversion.mk,clioootypesversion.mk,javaversion2.dat,userland.txt
+			ADD_INCLUDE_FILES cliureversion.mk,clioootypesversion.mk,javaversion2.dat,userland.txt,version.lst
 			EVAL
 			FILEFORMATNAME OpenOffice.org
 			FILEFORMATVERSION 1.0
 			WRITERCOMPATIBILITYVERSIONOOO11 OpenOffice.org 1.1
-			PACKAGEVERSION 3.3.0
+			PACKAGEVERSION 3.4.0
 			PACKAGEREVISION {milestone}
 			LICENSENAME LGPL
-			SERVICESPROJEKT 1
 			GLOBALFILEGID gid_File_Lib_Vcl
 			GLOBALPATCHFILEGID gid_File_Txt_Patchfiles
 			SPELLCHECKERFILE spellchecker_selection.txt
@@ -224,7 +221,7 @@ OpenOffice_Dev
 			CHANGETARGETDIR 1
 			USE_FILEVERSION 1
 			JAVAPRODUCT 1
-			LIBRARYVERSION 9.3.0
+			LIBRARYVERSION 9.4.0
 			PATCHCODEFILE ooodev_patchcodes.txt
 			CODEFILENAME codes_ooodev.txt
 			DOWNLOADBANNER	ooobanner.bmp
@@ -257,14 +254,13 @@ URE
         variables
         {
             PRODUCTNAME URE
-            PRODUCTVERSION 1.7
-            PACKAGEVERSION 1.7
+            PRODUCTVERSION 1.8
+            PACKAGEVERSION 1.8
             PACKAGEREVISION 1
             PRODUCTEXTENSION
             LONG_PRODUCTEXTENSION
             SHORT_PRODUCTEXTENSION
             LICENSENAME LGPL
-            SERVICESPROJEKT 1
             SETSTATICPATH 1
             NOVERSIONINDIRNAME 1
             PCPFILENAME ure.pcp
@@ -274,20 +270,19 @@ URE
             DOWNLOADBITMAP urebitmap.bmp
             DOWNLOADSETUPICO ooosetup.ico
             DONTUSESTARTMENUFOLDER 1
-            SERVICESPROJEKT 1
             RELATIVE_PATHES_IN_DDF 1
             STARTCENTER_ADDFEATURE_URL http://tools.services.openoffice.org/forward/OpenOffice.org/extensions.jsp?cid=920794
             STARTCENTER_INFO_URL http://tools.services.openoffice.org/forward/OpenOffice.org/homepage.jsp
             STARTCENTER_TEMPLREP_URL http://tools.services.openoffice.org/forward/OpenOffice.org/templates.jsp?cid=926383
             STARTCENTER_LAYOUT_STYLE 0
-            ADD_INCLUDE_FILES cliureversion.mk,clioootypesversion.mk
+            ADD_INCLUDE_FILES cliureversion.mk,clioootypesversion.mk,version.lst
 			PACKAGEMAP package_names_ext.txt
             DICT_REPO_URL http://tools.services.openoffice.org/forward/OpenOffice.org/dictionaries.jsp
         }
         active 1
         compression 5
         script ure
-        include {solarenvpath}/{os}/loader2,{solarpath}/bin.{minor}/ure,{solarpath}/bin.{minor},{solarpath}/bin.{minor}/osl,{solarpath}/lib.{minor},{solarenvpath}/{os}/MS
+        include {solarenvpath}/{os}/loader2,{solarpath}/bin.{minor}/ure,{solarpath}/bin.{minor},{solarpath}/bin.{minor}/osl,{solarpath}/lib.{minor},{solarpath}/xml.{minor},{solarenvpath}/{os}/MS
     }
 }
 
@@ -299,14 +294,14 @@ OpenOffice_SDK
         variables
         {
             PRODUCTNAME OpenOffice.org
-            PRODUCTVERSION 3.3
+            PRODUCTVERSION 3.4
             PRODUCTEXTENSION
             LONG_PRODUCTEXTENSION
             SHORT_PRODUCTEXTENSION
             POSTVERSIONEXTENSION SDK
             POSTVERSIONEXTENSIONUNIX sdk
             BRANDPACKAGEVERSION 3
-            PACKAGEVERSION 3.3.0
+            PACKAGEVERSION 3.4.0
             PACKAGEREVISION {milestone}
             PACK_INSTALLED 1
             POOLPRODUCT 0
@@ -344,7 +339,7 @@ OpenOffice_Dev_SDK
         variables
         {
             PRODUCTNAME OOo-dev
-            PRODUCTVERSION 3.3
+            PRODUCTVERSION 3.4
             PRODUCTEXTENSION
             LONG_PRODUCTEXTENSION
             SHORT_PRODUCTEXTENSION
@@ -353,7 +348,7 @@ OpenOffice_Dev_SDK
             POSTVERSIONEXTENSION SDK
             POSTVERSIONEXTENSIONUNIX sdk
             BRANDPACKAGEVERSION 3
-            PACKAGEVERSION 3.3.0
+            PACKAGEVERSION 3.4.0
             PACKAGEREVISION {milestone}
             BASISPACKAGEPREFIX ooobasis-dev
             UREPACKAGEPREFIX ooodev
@@ -395,7 +390,7 @@ BrOffice
 		variables
 		{
 			PRODUCTNAME BrOffice.org
-			PRODUCTVERSION 3.3
+			PRODUCTVERSION 3.4
 			PRODUCTEXTENSION 
 			LONG_PRODUCTEXTENSION 
 			SHORT_PRODUCTEXTENSION 
@@ -403,25 +398,24 @@ BrOffice
             POSTVERSIONEXTENSIONUNIX
 			BRANDPACKAGEVERSION 3
 			USERDIRPRODUCTVERSION 3
-			ABOUTBOXPRODUCTVERSION 3.3.0
+			ABOUTBOXPRODUCTVERSION 3.4.0
 			PROGRESSBARCOLOR 
 			PROGRESSSIZE 
 			PROGRESSPOSITION 
 			PROGRESSFRAMECOLOR 
 			NATIVEPROGRESS
-			UPDATEURL http://update36.services.openoffice.org/ProductUpdateService/check.Update
+			UPDATEURL http://update38.services.openoffice.org/ProductUpdateService/check.Update
             ODFNOTIFYURL http://odfnotify.services.openoffice.org/OOo3.0/notification.jsp?version=ODF
-			ADD_INCLUDE_FILES cliureversion.mk,clioootypesversion.mk,userland.txt
+			ADD_INCLUDE_FILES cliureversion.mk,clioootypesversion.mk,userland.txt,version.lst
 			REMOVE_UPGRADE_CODE_FILE upgradecode_remove_ooo.txt
 			ADDSYSTEMINTEGRATION 1
 			EVAL
 			FILEFORMATNAME OpenOffice.org
 			FILEFORMATVERSION 1.0
 			WRITERCOMPATIBILITYVERSIONOOO11 OpenOffice.org 1.1
-			PACKAGEVERSION 3.3.0
+			PACKAGEVERSION 3.4.0
 			PACKAGEREVISION {milestone}
 			LICENSENAME LGPL
-			SERVICESPROJEKT 1
 			SETSTATICPATH 1
 			GLOBALFILEGID gid_File_Lib_Vcl
 			GLOBALPATCHFILEGID gid_File_Txt_Patchfiles
@@ -433,7 +427,7 @@ BrOffice
 			STUBUPGRADECODE {0E7B27B8-D658-4BF9-98D6-EC361582EB4A}
 			CHANGETARGETDIR 1
 			USE_FILEVERSION 1
-			LIBRARYVERSION 9.3.0
+			LIBRARYVERSION 9.4.0
 			CODEFILENAME codes_broo.txt
 			PATCHCODEFILE bro_patchcodes.txt
 			DOWNLOADBANNER	brobanner.bmp
@@ -465,7 +459,7 @@ BrOffice_wJRE
 		variables
 		{
 			PRODUCTNAME BrOffice.org
-			PRODUCTVERSION 3.3
+			PRODUCTVERSION 3.4
 			PRODUCTEXTENSION 
 			LONG_PRODUCTEXTENSION 
 			SHORT_PRODUCTEXTENSION 
@@ -473,25 +467,24 @@ BrOffice_wJRE
             POSTVERSIONEXTENSIONUNIX
 			BRANDPACKAGEVERSION 3
 			USERDIRPRODUCTVERSION 3
-			ABOUTBOXPRODUCTVERSION 3.3.0
+			ABOUTBOXPRODUCTVERSION 3.4.0
 			PROGRESSBARCOLOR 
 			PROGRESSSIZE 
 			PROGRESSPOSITION 
 			PROGRESSFRAMECOLOR 
 			NATIVEPROGRESS
-			UPDATEURL http://update36.services.openoffice.org/ProductUpdateService/check.Update
+			UPDATEURL http://update38.services.openoffice.org/ProductUpdateService/check.Update
             ODFNOTIFYURL http://odfnotify.services.openoffice.org/OOo3.0/notification.jsp?version=ODF
-			ADD_INCLUDE_FILES cliureversion.mk,clioootypesversion.mk,javaversion2.dat,userland.txt
+			ADD_INCLUDE_FILES cliureversion.mk,clioootypesversion.mk,javaversion2.dat,userland.txt,version.lst
 			REMOVE_UPGRADE_CODE_FILE upgradecode_remove_ooo.txt
 			ADDSYSTEMINTEGRATION 1
 			EVAL
 			FILEFORMATNAME OpenOffice.org
 			FILEFORMATVERSION 1.0
 			WRITERCOMPATIBILITYVERSIONOOO11 OpenOffice.org 1.1
-			PACKAGEVERSION 3.3.0
+			PACKAGEVERSION 3.4.0
 			PACKAGEREVISION {milestone}
 			LICENSENAME LGPL
-			SERVICESPROJEKT 1
 			WITHJREPRODUCT 1
 			SETSTATICPATH 1
 			GLOBALFILEGID gid_File_Lib_Vcl
@@ -504,7 +497,7 @@ BrOffice_wJRE
 			STUBUPGRADECODE {0E7B27B8-D658-4BF9-98D6-EC361582EB4A}
 			CHANGETARGETDIR 1
 			USE_FILEVERSION 1
-			LIBRARYVERSION 9.3.0
+			LIBRARYVERSION 9.4.0
 			CODEFILENAME codes_broo.txt
 			PATCHCODEFILE bro_patchcodes.txt
 			JAVAPRODUCT 1
@@ -536,7 +529,7 @@ BrOffice_Dev
 		variables
 		{
 			PRODUCTNAME BrOo-dev
-			PRODUCTVERSION 3.3
+			PRODUCTVERSION 3.4
 			PRODUCTEXTENSION 
 			LONG_PRODUCTEXTENSION 
 			SHORT_PRODUCTEXTENSION 
@@ -546,24 +539,23 @@ BrOffice_Dev
             POSTVERSIONEXTENSIONUNIX
 			BRANDPACKAGEVERSION 3
 			USERDIRPRODUCTVERSION 3
-			ABOUTBOXPRODUCTVERSION 3.3.0
+			ABOUTBOXPRODUCTVERSION 3.4.0
 			DEVELOPMENTPRODUCT 1
 			BASISPACKAGEPREFIX ooobasis-dev
 			UREPACKAGEPREFIX ooodev
 			SOLSUREPACKAGEPREFIX ooodev
 			REGISTRYLAYERNAME LayerDevBroffice
 			SERVICETAG_URN urn:uuid:1680b00d-e45c-11de-82d6-080020a9ed93
-			UPDATEURL http://update36.services.openoffice.org/ProductUpdateService/check.Update
+			UPDATEURL http://update38.services.openoffice.org/ProductUpdateService/check.Update
             ODFNOTIFYURL http://odfnotify.services.openoffice.org/OOo3.0/notification.jsp?version=ODF
-			ADD_INCLUDE_FILES cliureversion.mk,clioootypesversion.mk,javaversion2.dat,userland.txt
+			ADD_INCLUDE_FILES cliureversion.mk,clioootypesversion.mk,javaversion2.dat,userland.txt,version.lst
 			EVAL
 			FILEFORMATNAME OpenOffice.org
 			FILEFORMATVERSION 1.0
 			WRITERCOMPATIBILITYVERSIONOOO11 OpenOffice.org 1.1
-			PACKAGEVERSION 3.3.0
+			PACKAGEVERSION 3.4.0
 			PACKAGEREVISION {milestone}
 			LICENSENAME LGPL
-			SERVICESPROJEKT 1
 			SETSTATICPATH 1
 			GLOBALFILEGID gid_File_Lib_Vcl
 			GLOBALPATCHFILEGID gid_File_Txt_Patchfiles
@@ -576,7 +568,7 @@ BrOffice_Dev
 			CHANGETARGETDIR 1
 			USE_FILEVERSION 1
 			JAVAPRODUCT 1
-			LIBRARYVERSION 9.3.0
+			LIBRARYVERSION 9.4.0
 			PATCHCODEFILE brodev_patchcodes.txt
 			CODEFILENAME codes_broodev.txt
 			DOWNLOADBANNER	brobanner.bmp
diff --git a/instsetoo_native/util/pack.lst b/instsetoo_native/util/pack.lst
index c19039118909..c19039118909 100755..100644
--- a/instsetoo_native/util/pack.lst
+++ b/instsetoo_native/util/pack.lst
diff --git a/ooo.lst b/ooo.lst
index 0887e5981d4f..f49780f8e708 100644..100755
--- a/ooo.lst
+++ b/ooo.lst
@@ -1,5 +1,5 @@
 http://hg.services.openoffice.org/binaries
-05a0ece1372392a2cf310ebb96333025-openssl-0.9.8l.tar.gz
+63ddc5116488985e820075e65fbe6aa4-openssl-0.9.8o.tar.gz
 09357cc74975b01714e00c5899ea1881-pixman-0.12.0.tar.gz
 0b49ede71c21c0599b0cc19b353a6cb3-README_apache-commons.txt
 68dd2e8253d9a7930e9fd50e2d7220d0-hunspell-1.2.9.tar.gz
@@ -15,7 +15,7 @@ http://hg.services.openoffice.org/binaries
 2ae988b339daec234019a7066f96733e-commons-lang-2.3-src.tar.gz
 2c9b0f83ed5890af02c0df1c1776f39b-commons-httpclient-3.1-src.tar.gz
 2f6ecca935948f7db92d925d88d0d078-icu4c-4_0_1-src.tgz
-ef9ab6c1740682fbd730606d5f6922e6-liberation-fonts-ttf-1.05.3.20100427.zip
+ca4870d899fd7e943ffc310a5421ad4d-liberation-fonts-ttf-1.06.0.20100721.tar.gz
 35c94d2df8893241173de1d16b6034c0-swingExSrc.zip
 35efabc239af896dfb79be7ebdd6e6b9-gentiumbasic-fonts-1.10.zip
 377a60170e5185eb63d3ed2fae98e621-README_silgraphite-2.3.1.txt
@@ -28,7 +28,7 @@ ef9ab6c1740682fbd730606d5f6922e6-liberation-fonts-ttf-1.05.3.20100427.zip
 4ea70ea87b47e92d318d4e7f5b940f47-cairo-1.8.0.tar.gz
 599dc4cc65a07ee868cf92a667a913d2-xpdf-3.02.tar.gz
 5aba06ede2daa9f2c11892fbd7bc3057-libserializer.zip
-6244eb0b6e2647ee50470951fa6efb47-nss_3_12_5.tar.gz
+b92261a5679276c400555004937af965-nss-3.12.6-with-nspr-4.8.4.tar.gz
 67b42915c8432abf0a922438f00860a2-libxml.zip
 7740a8ec23878a2f50120e1faa2730f2-libxml2-2.7.6.tar.gz
 7376930b0d3f3d77a685d94c4a3acda8-STLport-4.5-0119.tar.gz
@@ -69,7 +69,7 @@ fb7ba5c2182be4e73748859967455455-README_stax-api-1.0-2-sources.txt
 fca8706f2c4619e2fa3f8f42f8fc1e9d-rasqal-0.9.16.tar.gz
 fcc6df1160753d0b8c835d17fdeeb0a7-boost_1_39_0.tar.gz
 fdb27bfe2dbe2e7b57ae194d9bf36bab-SampleICC-1.3.2.tar.gz
-fe5b3e2b7c4577f30dc001054365653e-dejavu-fonts-ttf-2.30.zip
+37282537d0ed1a087b1c8f050dc812d9-dejavu-fonts-ttf-2.32.zip
 831126a1ee5af269923cfab6050769fe-mysql-connector-cpp.zip
 067201ea8b126597670b5eff72e1f66c-mythes-1.2.0.tar.gz
 cf8a6967f7de535ae257fa411c98eb88-mdds_0.3.0.tar.bz2
diff --git a/scp2/inc/macros.inc b/scp2/inc/macros.inc
index 48a1ae148777..5388fe8d105d 100644..100755
--- a/scp2/inc/macros.inc
+++ b/scp2/inc/macros.inc
@@ -290,24 +290,6 @@
         Styles   = (PACKED,DONT_OVERWRITE,PATCH); \
     End
 
-#define UNO_JAR_FILE(id,name) \
-    File id \
-        TXT_FILE_BODY; \
-        Name     = STRING(CONCAT2(name,.jar)); \
-        RegistryID = gid_Starregistry_Services_Rdb; \
-        Dir      = gid_Dir_Classes; \
-        Styles   = (PACKED,DONT_OVERWRITE, UNO_COMPONENT); \
-    End
-
-#define UNO_JAR_FILE_PATCH(id,name) \
-    File id \
-        TXT_FILE_BODY; \
-        Name     = STRING(CONCAT2(name,.jar)); \
-        RegistryID = gid_Starregistry_Services_Rdb; \
-        Dir      = gid_Dir_Classes; \
-        Styles   = (PACKED,DONT_OVERWRITE,UNO_COMPONENT,PATCH); \
-    End
-
 #define JARFILENAME(name) STRING(CONCAT2(name,.jar))
 
 #define PACKED_SHELLNEW_FILE_BODY \
@@ -322,52 +304,16 @@
         Name      = STRING(name) ; \
     End
 
-#define PACKED_UNO_LIB_FILE_BODY \
-        TXT_FILE_BODY; \
-        Styles = (PACKED,UNO_COMPONENT); \
-        Dir    = SCP2_OOO_BIN_DIR; \
-        RegistryID = gid_Starregistry_Services_Rdb
-
-#define PACKED_UNO_LIB_FILE_BODY_PATCH \
-        TXT_FILE_BODY; \
-        Styles = (PACKED,UNO_COMPONENT,PATCH); \
-        Dir    = SCP2_OOO_BIN_DIR; \
-        RegistryID = gid_Starregistry_Services_Rdb
-
-#define STD_UNO_LIB_FILE(id,name) \
-    File id \
-        Name    = LIBNAME(name); \
-        PACKED_UNO_LIB_FILE_BODY; \
-    End
-
-#define STD_UNO_LIB_FILE_PATCH(id,name) \
-    File id \
-        Name    = LIBNAME(name); \
-        PACKED_UNO_LIB_FILE_BODY_PATCH; \
-    End
-
-#define SPECIAL_UNO_LIB_FILE(id,name) \
-    File id \
-        Name    = SPECIAL_NAME(name); \
-        PACKED_UNO_LIB_FILE_BODY; \
-    End
-
-#define SPECIAL_UNO_LIB_FILE_PATCH(id,name) \
-    File id \
-        Name    = SPECIAL_NAME(name); \
-        PACKED_UNO_LIB_FILE_BODY_PATCH; \
-    End
-
-#define SPECIAL_UNO_COMPONENT_LIB_FILE(id,name) \
+#define SPECIAL_COMPONENT_LIB_FILE(id,name) \
     File id \
         Name     = SPECIAL_COMPONENT_LIB_NAME(name); \
-        PACKED_UNO_LIB_FILE_BODY; \
+        PACKED_LIB_FILE_BODY; \
     End
 
-#define SPECIAL_UNO_COMPONENT_LIB_FILE_PATCH(id,name) \
+#define SPECIAL_COMPONENT_LIB_FILE_PATCH(id,name) \
     File id \
         Name     = SPECIAL_COMPONENT_LIB_NAME(name); \
-        PACKED_UNO_LIB_FILE_BODY_PATCH; \
+        PACKED_LIB_FILE_BODY_PATCH; \
     End
 
 #define WINW4WFILTERFILENAME(name) STRING(CONCAT2(name,f32w.dll))
@@ -396,15 +342,6 @@
         Styles = (PACKED, NO_WARNING_IF_NOT_EXISTS); \
     End
 
-#define SPECIAL_UNO_NO_WARNING_IF_NOT_EXISTS_FILE(id,name) \
-    File id \
-        TXT_FILE_BODY; \
-        Name = LIBNAME(name); \
-        Dir = SCP2_OOO_BIN_DIR; \
-        Styles = (PACKED, NO_WARNING_IF_NOT_EXISTS, UNO_COMPONENT); \
-        RegistryID = gid_Starregistry_Services_Rdb; \
-    End
-
 // ---------------------------------------
 #define CONDITIONAL_MODULE_ENTRY(name,modid) \
     Module gid_Module_Root_Reg_##name \
@@ -424,6 +361,15 @@ End
         Value = " "; \
     End
 
+#define REGISTRY_ENTRY_OPEN_WITH_TMPL(name,cond,doc_type,modid,key) \
+    RegistryItem gid_Regitem_OpenOffice_##cond##_OpenWith_##doc_type \
+        ParentID = PREDEFINED_HKEY_CLASSES_ROOT; \
+        ModuleID = modid; \
+        Subkey = STRING(CONCAT3(.,key,\OpenWithProgIDs)); \
+        Name = STRING(CONCAT2(OpenOffice.org.,name)); \
+        Value = " "; \
+    End
+
 #define CONDITIONAL_REGISTRY_ENTRY_EXT(name,cond,key) \
     RegistryItem gid_Regitem__##name \
         ParentID = PREDEFINED_HKEY_CLASSES_ROOT; \
@@ -501,7 +447,7 @@ End
         ModuleID = modid; \
         Subkey = STRING(Software\%MANUFACTURER\%PRODUCTNAME%PRODUCTADDON\%PRODUCTVERSION\Capabilities\FileAssociations); \
         Name = STRING(CONCAT2(.,key)); \
-        Value = STRING(CONCAT3(soffice.Star,doc_type,Document.6)); \
+        Value = STRING(CONCAT2(OpenOffice.org.,name)); \
         Styles = (); \
     End
 
@@ -511,7 +457,7 @@ End
         ModuleID = modid; \
         Subkey = STRING(Software\%MANUFACTURER\%PRODUCTNAME%PRODUCTADDON\%PRODUCTVERSION\Capabilities\FileAssociations); \
         Name = STRING(CONCAT2(.,key)); \
-        Value = STRING(CONCAT3(soffice.Star,doc_type,Template.6)); \
+        Value = STRING(CONCAT2(OpenOffice.org.,name)); \
         Styles = (); \
     End
 
@@ -530,7 +476,7 @@ End
 
 #define CONDITIONAL_REGISTER_DOCTEMPLATE_EXTENSION(name,modid,key,cond,disp_name,icon_id,app,default,doc_type) \
     CONDITIONAL_MODULE_ENTRY(name,modid) \
-    REGISTRY_ENTRY_OPEN_WITH(name,cond,doc_type,modid,key) \
+    REGISTRY_ENTRY_OPEN_WITH_TMPL(name,cond,doc_type,modid,key) \
     CONDITIONAL_REGISTRY_ENTRY_EXT(name,cond,key) \
     REGISTRY_ENTRY_DOC(name,modid,disp_name) \
     REGISTRY_ENTRY_ICON(name,modid,icon_id) \
diff --git a/scp2/source/base/file_base.scp b/scp2/source/base/file_base.scp
index 3d209912479c..4c934c429d13 100644
--- a/scp2/source/base/file_base.scp
+++ b/scp2/source/base/file_base.scp
@@ -48,29 +48,29 @@ File gid_File_Exe_Odbcconfig
 End
 #endif
 
-STD_UNO_LIB_FILE( gid_File_Lib_Abp, abp)
+STD_LIB_FILE( gid_File_Lib_Abp, abp)
 STD_RES_FILE( gid_File_Res_Abp, abp)
 
-STD_UNO_LIB_FILE( gid_File_Lib_Dbp, dbp)
+STD_LIB_FILE( gid_File_Lib_Dbp, dbp)
 STD_RES_FILE( gid_File_Res_Dbp, dbp)
 
-STD_UNO_LIB_FILE( gid_File_Lib_Dbu, dbu )
+STD_LIB_FILE( gid_File_Lib_Dbu, dbu )
 STD_RES_FILE( gid_File_Res_Dbu, dbu)
 
-STD_UNO_LIB_FILE( gid_File_Lib_Adabasui, adabasui )
+STD_LIB_FILE( gid_File_Lib_Adabasui, adabasui )
 STD_RES_FILE( gid_File_Res_Adabasui, adabasui)
 
 STD_RES_FILE( gid_File_Res_Cnr, cnr)
 STD_RES_FILE( gid_File_Res_Sdbcl, sdbcl)
 STD_RES_FILE( gid_File_Res_Sdberr, sdberr)
 
-STD_UNO_LIB_FILE( gid_File_Lib_Rpt, rpt )
+STD_LIB_FILE( gid_File_Lib_Rpt, rpt )
 STD_RES_FILE( gid_File_Res_Rpt, rpt)
 
-STD_UNO_LIB_FILE( gid_File_Lib_Rptui, rptui )
+STD_LIB_FILE( gid_File_Lib_Rptui, rptui )
 STD_RES_FILE( gid_File_Res_Rptui, rptui)
 
-STD_UNO_LIB_FILE( gid_File_Lib_Rptxml, rptxml )
+STD_LIB_FILE( gid_File_Lib_Rptxml, rptxml )
 
 File gid_File_Help_Sdatabase_Zip
     Dir = gid_Dir_Help_Isolanguage;
diff --git a/scp2/source/binfilter/file_binfilter.scp b/scp2/source/binfilter/file_binfilter.scp
index be66b907a25d..951caadf69fb 100644
--- a/scp2/source/binfilter/file_binfilter.scp
+++ b/scp2/source/binfilter/file_binfilter.scp
@@ -39,7 +39,7 @@ File gid_Starregistry_Legacy_Binfilters_Rdb
     TXT_FILE_BODY;
     Name = "legacy_binfilters.rdb";
     Dir = gid_Dir_Program;
-    Styles = (PACKED, STARREGISTRY);
+    Styles = (PACKED);
 End
 
 
@@ -59,8 +59,8 @@ STD_LIB_FILE( gid_File_Lib_Bf_Sw, bf_sw)
 STD_LIB_FILE( gid_File_Lib_Bf_Wrapper, bf_wrapper)
 STD_LIB_FILE( gid_File_Lib_Legacy_Binfilters, legacy_binfilters)
 
-STD_UNO_LIB_FILE( gid_File_Lib_Bf_Migratefilter, bf_migratefilter)
-STD_UNO_LIB_FILE( gid_File_Lib_Bindet, bindet)
+STD_LIB_FILE( gid_File_Lib_Bf_Migratefilter, bf_migratefilter)
+STD_LIB_FILE( gid_File_Lib_Bindet, bindet)
 
 STD_RES_FILE( gid_File_Res_Bf_Sch, bf_sch )
 STD_RES_FILE( gid_File_Res_Bf_Svx, bf_svx )
diff --git a/scp2/source/binfilter/module_binfilter.scp b/scp2/source/binfilter/module_binfilter.scp
index d7cba78f6101..ca3c94b759e0 100644
--- a/scp2/source/binfilter/module_binfilter.scp
+++ b/scp2/source/binfilter/module_binfilter.scp
@@ -33,7 +33,7 @@ Module gid_Module_Optional_Binfilter
     Sortkey = "700";
     InstallOrder = "1100";
     ParentID = gid_Module_Optional;
-    Default = YES;
+    Default = NO;
     Files = (gid_File_Share_Registry_Binfilter_Xcd,
     gid_Starregistry_Legacy_Binfilters_Rdb,
     gid_File_Lib_Bf_Go,
@@ -60,6 +60,7 @@ Module gid_Module_Langpack_Binfilter_Template
     ParentID = gid_Module_Optional_Binfilter;
     Name = "gid_Module_Langpack_Binfilter_Template";
     Description = "gid_Module_Langpack_Binfilter_Template";
+    Default = NO;
     Styles = (TEMPLATEMODULE);
     Files = (gid_File_Res_Bf_Sch,
              gid_File_Res_Bf_Svx,
diff --git a/scp2/source/calc/file_calc.scp b/scp2/source/calc/file_calc.scp
index 7b392f173378..59d7a5aac90e 100644
--- a/scp2/source/calc/file_calc.scp
+++ b/scp2/source/calc/file_calc.scp
@@ -27,7 +27,7 @@
 
 #include "macros.inc"
 
-STD_UNO_LIB_FILE( gid_File_Lib_Solver, solver)
+STD_LIB_FILE( gid_File_Lib_Solver, solver)
 
 #ifndef SYSTEM_LPSOLVE
 File gid_File_Lib_Lpsolve
@@ -36,7 +36,7 @@ File gid_File_Lib_Lpsolve
 End
 #endif
 
-STD_UNO_LIB_FILE( gid_File_Lib_Analysis, analysis)
+STD_LIB_FILE( gid_File_Lib_Analysis, analysis)
 
 File gid_File_Share_Registry_Calc_Xcd
     TXT_FILE_BODY;
@@ -45,17 +45,17 @@ File gid_File_Share_Registry_Calc_Xcd
     Name = "calc.xcd";
 End
 
-STD_UNO_LIB_FILE( gid_File_Lib_Calc, calc)
+STD_LIB_FILE( gid_File_Lib_Calc, calc)
 
-STD_UNO_LIB_FILE( gid_File_Lib_Date, date)
+STD_LIB_FILE( gid_File_Lib_Date, date)
 
-STD_UNO_LIB_FILE( gid_File_Lib_Sc, sc)
+STD_LIB_FILE( gid_File_Lib_Sc, sc)
 
 STD_LIB_FILE( gid_File_Lib_Scui, scui)
 
 STD_LIB_FILE( gid_File_Lib_Scfilt, scfilt)
 
-STD_UNO_LIB_FILE( gid_File_Lib_Scd, scd)
+STD_LIB_FILE( gid_File_Lib_Scd, scd)
 
 STD_RES_FILE( gid_File_Res_Solver, solver)
 
diff --git a/scp2/source/calc/registryitem_calc.scp b/scp2/source/calc/registryitem_calc.scp
index efc71ac73f63..a4708523640f 100644..100755
--- a/scp2/source/calc/registryitem_calc.scp
+++ b/scp2/source/calc/registryitem_calc.scp
@@ -800,7 +800,7 @@ End
 RegistryItem gid_Regitem_ots_FullDetails
     ParentID = PREDEFINED_HKEY_CLASSES_ROOT;
     ModuleID = gid_Module_Optional_Winexplorerext_PropertyHdl;
-    Subkey = "opendocument.Calctemplate.1";
+    Subkey = "opendocument.CalcTemplate.1";
     Name = "FullDetails";
     Value = "prop:System.PropGroup.Description;System.Title;System.Author;System.Subject;System.Keywords;System.Comment;System.PropGroup.FileSystem;System.ItemNameDisplay;System.ItemType;System.ItemFolderPathDisplay;System.Size;System.DateCreated;System.DateModified;System.FileAttributes;System.ComputerName";
 End
@@ -863,7 +863,7 @@ RegistryItem gid_Regitem_OpenOffice_OTS_OpenWith_Calc
     ParentID = PREDEFINED_HKEY_CLASSES_ROOT;
     Subkey = ".ots\OpenWithProgIDs";
     ModuleID = gid_Module_Prg_Calc_Bin;
-    Name = "opendocument.CalcDocument.1";
+    Name = "opendocument.CalcTemplate.1";
     Value = " ";
 End
 
diff --git a/scp2/source/canvas/cairocanvas.scp b/scp2/source/canvas/cairocanvas.scp
index 435cef4304f8..2d7af5321f35 100644
--- a/scp2/source/canvas/cairocanvas.scp
+++ b/scp2/source/canvas/cairocanvas.scp
@@ -29,8 +29,7 @@
 
 File gid_File_Lib_CairoCanvas
     TXT_FILE_BODY;
-    Styles = (PACKED,UNO_COMPONENT);
-    RegistryID = gid_Starregistry_Services_Rdb;
+    Styles = (PACKED);
     Dir = SCP2_OOO_BIN_DIR;
   #ifdef UNX
     Name = STRING(CONCAT2(cairocanvas.uno,UNXSUFFIX));
diff --git a/scp2/source/canvas/canvascommons.scp b/scp2/source/canvas/canvascommons.scp
index f095eff9f23e..9788a90c7f3a 100644
--- a/scp2/source/canvas/canvascommons.scp
+++ b/scp2/source/canvas/canvascommons.scp
@@ -36,5 +36,5 @@ STD_LIB_FILE(gid_File_Lib_Agg, agg)
 #endif
 #endif
 
-SPECIAL_UNO_COMPONENT_LIB_FILE(gid_File_CanvasFactory, canvasfactory.uno)
-SPECIAL_UNO_COMPONENT_LIB_FILE(gid_File_SimpleCanvas, simplecanvas.uno)
+SPECIAL_COMPONENT_LIB_FILE(gid_File_CanvasFactory, canvasfactory.uno)
+SPECIAL_COMPONENT_LIB_FILE(gid_File_SimpleCanvas, simplecanvas.uno)
diff --git a/scp2/source/canvas/directxcanvas.scp b/scp2/source/canvas/directxcanvas.scp
index febdb8428c8b..e79f711aaacd 100644
--- a/scp2/source/canvas/directxcanvas.scp
+++ b/scp2/source/canvas/directxcanvas.scp
@@ -29,8 +29,8 @@
 
 #ifdef WNT
 # ifdef USE_DIRECTX5
-SPECIAL_UNO_COMPONENT_LIB_FILE(gid_File_Lib_DirectX5Canvas,directx5canvas.uno)
+SPECIAL_COMPONENT_LIB_FILE(gid_File_Lib_DirectX5Canvas,directx5canvas.uno)
 # endif
-SPECIAL_UNO_COMPONENT_LIB_FILE(gid_File_Lib_DirectX9Canvas, directx9canvas.uno)
-SPECIAL_UNO_COMPONENT_LIB_FILE(gid_File_Lib_GdiPlusCanvas,  gdipluscanvas.uno)
+SPECIAL_COMPONENT_LIB_FILE(gid_File_Lib_DirectX9Canvas, directx9canvas.uno)
+SPECIAL_COMPONENT_LIB_FILE(gid_File_Lib_GdiPlusCanvas,  gdipluscanvas.uno)
 #endif
diff --git a/scp2/source/canvas/vclcanvas.scp b/scp2/source/canvas/vclcanvas.scp
index 5f69de34fee9..c17301f56d76 100644
--- a/scp2/source/canvas/vclcanvas.scp
+++ b/scp2/source/canvas/vclcanvas.scp
@@ -27,4 +27,4 @@
 
 #include "macros.inc"
 
-SPECIAL_UNO_COMPONENT_LIB_FILE(gid_File_Lib_VCLCanvas, vclcanvas.uno)
+SPECIAL_COMPONENT_LIB_FILE(gid_File_Lib_VCLCanvas, vclcanvas.uno)
diff --git a/scp2/source/draw/registryitem_draw.scp b/scp2/source/draw/registryitem_draw.scp
index 0ecb21536613..63dde34437a1 100644..100755
--- a/scp2/source/draw/registryitem_draw.scp
+++ b/scp2/source/draw/registryitem_draw.scp
@@ -863,7 +863,7 @@ RegistryItem gid_Regitem_OpenOffice_OTG_OpenWith_Draw
     ParentID = PREDEFINED_HKEY_CLASSES_ROOT;
     Subkey = ".otg\OpenWithProgIDs";
     ModuleID = gid_Module_Prg_Draw_Bin;
-    Name = "opendocument.DrawDocument.1";
+    Name = "opendocument.DrawTemplate.1";
     Value = " ";
 End
 
@@ -881,7 +881,7 @@ RegistryItem gid_Regitem_OpenOffice_STD_OpenWith_Draw
     ParentID = PREDEFINED_HKEY_CLASSES_ROOT;
     Subkey = ".std\OpenWithProgIDs";
     ModuleID = gid_Module_Prg_Draw_Bin;
-    Name = "soffice.StarDrawDocument.6";
+    Name = "soffice.StarDrawTemplate.6";
     Value = " ";
 End
 
@@ -891,7 +891,7 @@ RegistryItem gid_Regitem_Software_Manufacturer_Productname_Productversion_Capabi
     Subkey = "Software\%MANUFACTURER\%PRODUCTNAME%PRODUCTADDON\%PRODUCTVERSION\Capabilities\FileAssociations";
     ModuleID = gid_Module_Prg_Draw_Bin;
     Name = ".otg";
-    Value = "opendocument.DrawDocument.1";
+    Value = "opendocument.DrawTemplate.1";
     Styles = ();
 End
 
diff --git a/scp2/source/gnome/file_gnome.scp b/scp2/source/gnome/file_gnome.scp
index 9d10261843d2..d48915072742 100644
--- a/scp2/source/gnome/file_gnome.scp
+++ b/scp2/source/gnome/file_gnome.scp
@@ -32,8 +32,6 @@ File gid_File_Lib_GIO
     Styles = (PACKED);
     Dir = SCP2_OOO_BIN_DIR;
     Name = STRING(CONCAT2(ucpgio1.uno,UNXSUFFIX));
-    RegistryID = gid_Starregistry_Services_Rdb;
-    Regmergefile = "ucpgio-ucd.txt";
 End
 #endif
 
@@ -43,8 +41,6 @@ File gid_File_Lib_Gnomevfs
     Styles = (PACKED);
     Dir = SCP2_OOO_BIN_DIR;
     Name = STRING(CONCAT2(ucpgvfs1.uno,UNXSUFFIX));
-    RegistryID = gid_Starregistry_Services_Rdb;
-    Regmergefile = "ucpgvfs-ucd.txt";
 End
 #endif
 
@@ -63,7 +59,5 @@ File gid_File_Lib_Gconfbe
     Styles = (PACKED);
     Dir = SCP2_OOO_BIN_DIR;
     Name = STRING(CONCAT2(gconfbe1.uno,UNXSUFFIX));
-    RegistryID = gid_Starregistry_Services_Rdb;
-    Regmergefile = "gconfbe1-ucd.txt";
 End
 #endif
diff --git a/scp2/source/graphicfilter/file_graphicfilter.scp b/scp2/source/graphicfilter/file_graphicfilter.scp
index 2cd0f53f9e56..be1d35ed84cc 100644
--- a/scp2/source/graphicfilter/file_graphicfilter.scp
+++ b/scp2/source/graphicfilter/file_graphicfilter.scp
@@ -34,7 +34,7 @@ File gid_File_Share_Registry_Graphicfilter_Xcd
     Name = "graphicfilter.xcd";
 End
 
-STD_UNO_LIB_FILE( gid_File_Lib_Flash, flash )
+STD_LIB_FILE( gid_File_Lib_Flash, flash )
 
-STD_UNO_LIB_FILE( gid_File_Lib_Svg, svgfilter )
+STD_LIB_FILE( gid_File_Lib_Svg, svgfilter )
 
diff --git a/scp2/source/impress/file_impress.scp b/scp2/source/impress/file_impress.scp
index 00dde2ca9162..35f934da962e 100644
--- a/scp2/source/impress/file_impress.scp
+++ b/scp2/source/impress/file_impress.scp
@@ -29,12 +29,12 @@
 
 File gid_File_Lib_Placeware
     Name = LIBNAME(placeware);
-    PACKED_UNO_LIB_FILE_BODY;
+    PACKED_LIB_FILE_BODY;
 End
 
 File gid_File_Lib_Animcore
 	Name = SPECIAL_NAME(animcore);
-	PACKED_UNO_LIB_FILE_BODY;
+	PACKED_LIB_FILE_BODY;
 End
 
 File gid_File_Share_Registry_Impress_Xcd
diff --git a/scp2/source/impress/module_ogltrans.scp b/scp2/source/impress/module_ogltrans.scp
index 06fbb4bfcc1a..300deca7aa34 100644
--- a/scp2/source/impress/module_ogltrans.scp
+++ b/scp2/source/impress/module_ogltrans.scp
@@ -38,8 +38,7 @@ End
 
 File gid_File_Lib_OpenGLTransitions
     TXT_FILE_BODY;
-    Styles = (PACKED,UNO_COMPONENT);
-    RegistryID = gid_Starregistry_Services_Rdb;
+    Styles = (PACKED);
     Dir = SCP2_OOO_BIN_DIR;
   #ifdef UNX
     Name = STRING(CONCAT2(OGLTrans.uno,UNXSUFFIX));
diff --git a/scp2/source/impress/registryitem_impress.scp b/scp2/source/impress/registryitem_impress.scp
index cce7f1d85ad3..7b270e5aca30 100644..100755
--- a/scp2/source/impress/registryitem_impress.scp
+++ b/scp2/source/impress/registryitem_impress.scp
@@ -892,7 +892,7 @@ RegistryItem gid_Regitem_OpenOffice_OTP_OpenWith_Impress
     ParentID = PREDEFINED_HKEY_CLASSES_ROOT;
     Subkey = ".otp\OpenWithProgIDs";
     ModuleID = gid_Module_Prg_Impress_Bin;
-    Name = "opendocument.ImpressDocument.1";
+    Name = "opendocument.ImpressTemplate.1";
     Value = " ";
 End
 
@@ -910,7 +910,7 @@ RegistryItem gid_Regitem_OpenOffice_STI_OpenWith_Impress
     ParentID = PREDEFINED_HKEY_CLASSES_ROOT;
     Subkey = ".sti\OpenWithProgIDs";
     ModuleID = gid_Module_Prg_Impress_Bin;
-    Name = "soffice.StarImpressDocument.6";
+    Name = "soffice.StarImpressTemplate.6";
     Value = " ";
 End
 
@@ -938,7 +938,7 @@ RegistryItem gid_Regitem_Software_Manufacturer_Productname_Productversion_Capabi
     Subkey = "Software\%MANUFACTURER\%PRODUCTNAME%PRODUCTADDON\%PRODUCTVERSION\Capabilities\FileAssociations";
     ModuleID = gid_Module_Prg_Impress_Bin;
     Name = ".otp";
-    Value = "opendocument.ImpressDocument.1";
+    Value = "opendocument.ImpressTemplate.1";
     Styles = ();
 End
 
@@ -947,7 +947,7 @@ RegistryItem gid_Regitem_Software_Manufacturer_Productname_Productversion_Capabi
     Subkey = "Software\%MANUFACTURER\%PRODUCTNAME%PRODUCTADDON\%PRODUCTVERSION\Capabilities\FileAssociations";
     ModuleID = gid_Module_Prg_Impress_Bin;
     Name = ".sti";
-    Value = "soffice.StarImpressDocument.6";
+    Value = "soffice.StarImpressTemplate.6";
     Styles = ();
 End
 
diff --git a/scp2/source/javafilter/file_javafilter.scp b/scp2/source/javafilter/file_javafilter.scp
index d7a902dbf00f..a6d3f3329b25 100644
--- a/scp2/source/javafilter/file_javafilter.scp
+++ b/scp2/source/javafilter/file_javafilter.scp
@@ -76,6 +76,6 @@ STD_JAR_FILE( gid_File_Jar_Aportisdoc, aportisdoc )
 STD_JAR_FILE( gid_File_Jar_Pexcel, pexcel )
 STD_JAR_FILE( gid_File_Jar_Pocketword, pocketword )
 STD_JAR_FILE( gid_File_Jar_Xmerge, xmerge )
-UNO_JAR_FILE( gid_File_Jar_Xmergebridge, XMergeBridge )
+STD_JAR_FILE( gid_File_Jar_Xmergebridge, XMergeBridge )
 
 #endif
diff --git a/scp2/source/kde/file_kde.scp b/scp2/source/kde/file_kde.scp
index 0e0b3d1b73bb..3d139b797d67 100644
--- a/scp2/source/kde/file_kde.scp
+++ b/scp2/source/kde/file_kde.scp
@@ -32,8 +32,6 @@ File gid_File_Lib_Kdebe
     Styles = (PACKED);
     Dir = SCP2_OOO_BIN_DIR;
     Name = STRING(CONCAT2(kdebe1.uno,UNXSUFFIX));
-    RegistryID = gid_Starregistry_Services_Rdb;
-    Regmergefile = "kdebe1-ucd.txt";
 End
 #endif
 
@@ -43,7 +41,5 @@ File gid_File_Lib_Kde4be
     Styles = (PACKED);
     Dir = gid_Dir_Program;
     Name = STRING(CONCAT2(kde4be1.uno,UNXSUFFIX));
-    RegistryID = gid_Starregistry_Services_Rdb;
-    Regmergefile = "kde4be1-ucd.txt";
 End
 #endif
diff --git a/scp2/source/math/file_math.scp b/scp2/source/math/file_math.scp
index 4da9f1a23bbc..6ab010baaf31 100644
--- a/scp2/source/math/file_math.scp
+++ b/scp2/source/math/file_math.scp
@@ -37,9 +37,9 @@ End
 
 #endif
 
-STD_UNO_LIB_FILE( gid_File_Lib_Sm , sm)
+STD_LIB_FILE( gid_File_Lib_Sm , sm)
 
-STD_UNO_LIB_FILE( gid_File_Lib_Smd , smd)
+STD_LIB_FILE( gid_File_Lib_Smd , smd)
 
 STD_RES_FILE( gid_File_Res_Sm, sm )
 
diff --git a/scp2/source/onlineupdate/file_onlineupdate.scp b/scp2/source/onlineupdate/file_onlineupdate.scp
index e33eb6fa35c7..2a7ddd376b6f 100644
--- a/scp2/source/onlineupdate/file_onlineupdate.scp
+++ b/scp2/source/onlineupdate/file_onlineupdate.scp
@@ -27,7 +27,7 @@
 
 #include "macros.inc"
 
-SPECIAL_UNO_COMPONENT_LIB_FILE( gid_File_Lib_Updchk , updchk.uno )
+SPECIAL_COMPONENT_LIB_FILE( gid_File_Lib_Updchk , updchk.uno )
 
 File gid_File_Share_Registry_Onlineupdate_Xcd
     TXT_FILE_BODY;
diff --git a/scp2/source/ooo/common_brand.scp b/scp2/source/ooo/common_brand.scp
index f505a886cba8..7c306e19f427 100644
--- a/scp2/source/ooo/common_brand.scp
+++ b/scp2/source/ooo/common_brand.scp
@@ -43,6 +43,8 @@ Module gid_Module_Root_Brand
             gid_Brand_Dir_Share_C05_Faq,
             gid_Brand_Dir_Share_Config,
             gid_Brand_Dir_Share_Extension,
+            gid_Brand_Dir_Share_Extensions,            
+            gid_Brand_Dir_Share_Prereg,    
             gid_Brand_Dir_Share_Uno_Packages,
             gid_Brand_Dir_Share_Uno_Packages_Cache,
             gid_Brand_Dir_Share_Registry,
@@ -84,8 +86,9 @@ Module gid_Module_Root_Brand
              gid_Brand_File_Msvcm80crt_Manifest,
              gid_Brand_File_Lib_Npsoplugin,
              gid_Brand_File_Lib_Subscrib_C05,
+             gid_Brand_File_ServicesRdb,
              gid_Brand_File_Share_Registry_Brand_Xcd,
-             gid_Brand_File_Share_Registry_O5oo_Xcd
+             gid_Brand_File_Share_Registry_O5oo_Xcd,
              gid_Brand_File_Script_Unopkg,
              gid_Brand_File_Share_Xdg_Base,
              gid_Brand_File_Share_Xdg_Calc,
@@ -97,7 +100,8 @@ Module gid_Module_Root_Brand
              gid_Brand_File_Share_Xdg_Printeradmin,
              gid_Brand_File_Share_Xdg_QStart,
              gid_Brand_File_Share_Xdg_StartCenter,
-             gid_Brand_File_Share_Xdg_Writer);
+             gid_Brand_File_Share_Xdg_Writer,
+             gid_Brand_File_Txt_Package);
     Unixlinks = (gid_Brand_Unixlink_BasisLink,
                  gid_Brand_Unixlink_Program,
                  gid_Brand_Unixlink_Unopkg,
@@ -221,6 +225,12 @@ Directory gid_Brand_Dir_Share_Extensions
     DosName = "extensions";
 End
 
+Directory gid_Brand_Dir_Share_Prereg
+    ParentID = gid_Brand_Dir_Share;
+    DosName = "prereg";
+    Styles = (CREATE);
+End
+
 Directory gid_Brand_Dir_Share_Extensions_Install
     ParentID = gid_Brand_Dir_Share_Extension;
     DosName = "install";
@@ -644,6 +654,13 @@ File gid_Brand_File_Images_Brand_Zip
     Styles = (PACKED);
 End
 
+File gid_Brand_File_Txt_Package
+    TXT_FILE_BODY;
+    Dir = gid_Brand_Dir_Share_Extensions;
+    Name = "package.txt";
+    Styles = (PACKED);
+End
+
 File gid_Brand_File_Share_Registry_Brand_Xcd
     TXT_FILE_BODY;
     Styles = (PACKED, SCPZIP_REPLACE);
@@ -1278,7 +1295,7 @@ ProfileItem gid_Brand_Profileitem_Fundamental_Ure_More_Services
     ProfileID = gid_Brand_Profile_Fundamental_Ini;
     Section = "Bootstrap";
     Key = "URE_MORE_SERVICES";
-    Value = "${${OOO_BASE_DIR}/program/" PROFILENAME(fundamentalbasis) ":URE_MORE_SERVICES}";
+    Value = "${${OOO_BASE_DIR}/program/" PROFILENAME(fundamentalbasis) ":URE_MORE_SERVICES} $ORIGIN/services.rdb";
 End
 
 ProfileItem gid_Brand_Profileitem_Fundamental_Ure_More_Java_Types
diff --git a/scp2/source/ooo/file_font_ooo.scp b/scp2/source/ooo/file_font_ooo.scp
index 8ad8526d9ef6..10e2dca219fb 100644
--- a/scp2/source/ooo/file_font_ooo.scp
+++ b/scp2/source/ooo/file_font_ooo.scp
@@ -142,7 +142,7 @@ STD_FONT_FILE( gid_File_Fnt_GentiumBookBasicBoldItalic, GenBkBasBI.ttf, Gentium
 File gid_File_FcLocal_Conf
     Dir = gid_Dir_Fonts_Truetype;
     USER_FILE_BODY;
-#   Styles = ();
+//  Styles = ();
     Name = "fc_local.conf";
 End
 #endif
diff --git a/scp2/source/ooo/file_improvement.scp b/scp2/source/ooo/file_improvement.scp
index 224d26de6a0d..cd6cfe715d64 100644
--- a/scp2/source/ooo/file_improvement.scp
+++ b/scp2/source/ooo/file_improvement.scp
@@ -37,5 +37,5 @@ End
 #endif
 
 #if defined(BUILD_SPECIAL)
-STD_UNO_LIB_FILE( gid_File_Lib_Oooimprovement , oooimprovement)
+STD_LIB_FILE( gid_File_Lib_Oooimprovement , oooimprovement)
 #endif
diff --git a/scp2/source/ooo/file_library_ooo.scp b/scp2/source/ooo/file_library_ooo.scp
index 401396a604c5..d557f6006a3c 100644..100755
--- a/scp2/source/ooo/file_library_ooo.scp
+++ b/scp2/source/ooo/file_library_ooo.scp
@@ -35,19 +35,18 @@ File gid_File_Lib_Accessbridge
 End
 #endif
 #if ((defined(WNT)) || (defined(LINUX)) || ((defined(SOLARIS)) && (defined(SPARC)))|| defined(NETBSD) )
-STD_UNO_LIB_FILE( gid_File_Lib_Adabas, adabas)
+STD_LIB_FILE( gid_File_Lib_Adabas, adabas)
 #endif
 
 #if defined(WNT)
-STD_UNO_LIB_FILE( gid_File_Lib_Ado, ado)
+STD_LIB_FILE( gid_File_Lib_Ado, ado)
 #endif
 
-STD_UNO_LIB_FILE( gid_File_Lib_Basctl, basctl)
+STD_LIB_FILE( gid_File_Lib_Basctl, basctl)
 
 File gid_File_Lib_Basprov
     TXT_FILE_BODY;
-    Styles = (PACKED,UNO_COMPONENT);
-    RegistryID = gid_Starregistry_Services_Rdb;
+    Styles = (PACKED);
     Dir = SCP2_OOO_BIN_DIR;
   #ifdef UNX
     Name = STRING(CONCAT4(basprov,DLLPOSTFIX,.uno,UNXSUFFIX));
@@ -59,8 +58,7 @@ End
 #ifdef ENABLE_VBA
 File gid_File_Lib_Vbaevent
     TXT_FILE_BODY;
-    Styles = (PACKED,UNO_COMPONENT);
-    RegistryID = gid_Starregistry_Services_Rdb;
+    Styles = (PACKED);
     Dir = SCP2_OOO_BIN_DIR;
   #ifdef UNX
     Name = STRING(CONCAT4(vbaevents,DLLPOSTFIX,.uno,UNXSUFFIX));
@@ -70,12 +68,11 @@ File gid_File_Lib_Vbaevent
 End
 #endif // ENABLE_VBA
 
-STD_UNO_LIB_FILE( gid_File_Lib_Bib , bib)
+STD_LIB_FILE( gid_File_Lib_Bib , bib)
 
 File gid_File_Lib_Cached1
     TXT_FILE_BODY;
-    Styles = (PACKED,UNO_COMPONENT);
-    RegistryID = gid_Starregistry_Services_Rdb;
+    Styles = (PACKED);
     Dir = SCP2_OOO_BIN_DIR;
   #ifdef UNX
     Name = STRING(CONCAT2(libcached1,UNXSUFFIX));
@@ -84,13 +81,12 @@ File gid_File_Lib_Cached1
   #endif
 End
 
-SPECIAL_UNO_COMPONENT_LIB_FILE(gid_File_Lib_Configmgr, configmgr.uno)
+SPECIAL_COMPONENT_LIB_FILE(gid_File_Lib_Configmgr, configmgr.uno)
 
 #ifdef WITH_LDAP
 File gid_File_Lib_Ldapbe2
     TXT_FILE_BODY;
-    Styles = (PACKED,UNO_COMPONENT);
-    RegistryID = gid_Starregistry_Services_Rdb;
+    Styles = (PACKED);
     Dir = SCP2_OOO_BIN_DIR;
   #ifdef UNX
     Name = STRING(CONCAT2(ldapbe2.uno,UNXSUFFIX));
@@ -100,10 +96,10 @@ File gid_File_Lib_Ldapbe2
 End
 #endif
 
-STD_UNO_LIB_FILE(gid_File_Lib_Chartcontroller, chartcontroller)
-STD_UNO_LIB_FILE(gid_File_Lib_Chartmodel, chartmodel)
-STD_UNO_LIB_FILE(gid_File_Lib_Charttools, charttools)
-STD_UNO_LIB_FILE(gid_File_Lib_Chartview, chartview)
+STD_LIB_FILE(gid_File_Lib_Chartcontroller, chartcontroller)
+STD_LIB_FILE(gid_File_Lib_Chartmodel, chartmodel)
+STD_LIB_FILE(gid_File_Lib_Charttools, charttools)
+STD_LIB_FILE(gid_File_Lib_Chartview, chartview)
 
 
 #if defined WNT && defined _MSC
@@ -157,7 +153,7 @@ End
 
 
 #if ! defined WNT // no longer supported on Windows
-SPECIAL_UNO_COMPONENT_LIB_FILE( gid_File_Lib_Cmdmail, cmdmail.uno )
+SPECIAL_COMPONENT_LIB_FILE( gid_File_Lib_Cmdmail, cmdmail.uno )
 #endif
 
 
@@ -169,11 +165,10 @@ File gid_File_Lib_Comphelper2
     Name = STRING(CONCAT3(comphelp4,COMID,.dll));
   #endif
     Dir = SCP2_OOO_BIN_DIR;
-    Styles = (PACKED,UNO_COMPONENT);
-    RegistryID = gid_Starregistry_Services_Rdb;
+    Styles = (PACKED);
 End
 
-STD_UNO_LIB_FILE( gid_File_Lib_Ctl , ctl)
+STD_LIB_FILE( gid_File_Lib_Ctl , ctl)
 
 STD_LIB_FILE( gid_File_Lib_Cui, cui)
 
@@ -235,15 +230,15 @@ End
 #endif
 #endif
 
-STD_UNO_LIB_FILE( gid_File_Lib_Dba, dba)
+STD_LIB_FILE( gid_File_Lib_Dba, dba)
 
-STD_UNO_LIB_FILE( gid_File_Lib_Sdbt, sdbt)
+STD_LIB_FILE( gid_File_Lib_Sdbt, sdbt)
 
-STD_UNO_LIB_FILE( gid_File_Lib_Dbmm, dbmm)
+STD_LIB_FILE( gid_File_Lib_Dbmm, dbmm)
 
-STD_UNO_LIB_FILE( gid_File_Lib_Dbacfg, dbacfg)
+STD_LIB_FILE( gid_File_Lib_Dbacfg, dbacfg)
 
-STD_UNO_LIB_FILE( gid_File_Lib_Dbase2, dbase )
+STD_LIB_FILE( gid_File_Lib_Dbase2, dbase )
 
 STD_LIB_FILE( gid_File_Lib_Dbfile , file)
 STD_LIB_FILE( gid_File_Lib_Odbcbase,odbcbase)
@@ -251,8 +246,7 @@ STD_LIB_FILE( gid_File_Lib_Odbcbase,odbcbase)
 
 File gid_File_Lib_Dbpool
     TXT_FILE_BODY;
-    Styles = (PACKED,UNO_COMPONENT);
-    RegistryID = gid_Starregistry_Services_Rdb;
+    Styles = (PACKED);
     Dir = SCP2_OOO_BIN_DIR;
   #ifdef UNX
     Name = STRING(CONCAT2(libdbpool2,UNXSUFFIX));
@@ -261,9 +255,9 @@ File gid_File_Lib_Dbpool
   #endif
 End
 
-STD_UNO_LIB_FILE( gid_File_Lib_Dbt, dbtools )
+STD_LIB_FILE( gid_File_Lib_Dbt, dbtools )
 
-STD_UNO_LIB_FILE( gid_File_Lib_Dbaxml, dbaxml )
+STD_LIB_FILE( gid_File_Lib_Dbaxml, dbaxml )
 
 File gid_File_Lib_Dict_Ja
     TXT_FILE_BODY;
@@ -322,8 +316,7 @@ End
 
 File gid_File_Lib_Dlgprov
     TXT_FILE_BODY;
-    Styles = (PACKED,UNO_COMPONENT);
-    RegistryID = gid_Starregistry_Services_Rdb;
+    Styles = (PACKED);
     Dir = SCP2_OOO_BIN_DIR;
   #ifdef UNX
     Name = STRING(CONCAT4(dlgprov,DLLPOSTFIX,.uno,UNXSUFFIX));
@@ -334,8 +327,7 @@ End
 
 File gid_File_Lib_Stringresource
     TXT_FILE_BODY;
-    Styles = (PACKED,UNO_COMPONENT);
-    RegistryID = gid_Starregistry_Services_Rdb;
+    Styles = (PACKED);
     Dir = SCP2_OOO_BIN_DIR;
   #ifdef UNX
     Name = STRING(CONCAT4(stringresource,DLLPOSTFIX,.uno,UNXSUFFIX));
@@ -349,8 +341,7 @@ End
 
 File gid_File_Lib_Vbaobj
     TXT_FILE_BODY;
-    Styles = (PACKED,UNO_COMPONENT);
-    RegistryID = gid_Starregistry_Services_Rdb;
+    Styles = (PACKED);
     Dir = SCP2_OOO_BIN_DIR;
   #ifdef UNX
     Name = STRING(CONCAT4(libvbaobj,DLLPOSTFIX,.uno,UNXSUFFIX));
@@ -361,8 +352,7 @@ End
 
 File gid_File_Lib_Vbaswobj
     TXT_FILE_BODY;
-    Styles = (PACKED,UNO_COMPONENT);
-    RegistryID = gid_Starregistry_Services_Rdb;
+    Styles = (PACKED);
     Dir = SCP2_OOO_BIN_DIR;
   #ifdef UNX
     Name = STRING(CONCAT3(vbaswobj,.uno,UNXSUFFIX));
@@ -373,8 +363,7 @@ End
 
 File gid_File_Lib_Vbamsforms
     TXT_FILE_BODY;
-    Styles = (PACKED,UNO_COMPONENT);
-    RegistryID = gid_Starregistry_Services_Rdb;
+    Styles = (PACKED);
     Dir = SCP2_OOO_BIN_DIR;
   #ifdef UNX
     Name = STRING(CONCAT4(libmsforms,DLLPOSTFIX,.uno,UNXSUFFIX));
@@ -387,7 +376,6 @@ End
 File gid_File_Lib_Vbahelper
     TXT_FILE_BODY;
     Styles = (PACKED);
-    RegistryID = gid_Starregistry_Services_Rdb;
     Dir = SCP2_OOO_BIN_DIR;
   #ifdef UNX
     Name = STRING(CONCAT3(libvbahelper,DLLPOSTFIX,UNXSUFFIX));
@@ -402,8 +390,7 @@ End
 
 File gid_File_Lib_Dnd
     TXT_FILE_BODY;
-    Styles = (PACKED,UNO_COMPONENT);
-    RegistryID = gid_Starregistry_Services_Rdb;
+    Styles = (PACKED);
     Dir = SCP2_OOO_BIN_DIR;
     Name = "dnd.dll";
 End
@@ -416,23 +403,22 @@ File gid_File_Lib_Dtrans
     TXT_FILE_BODY;
     Name = "dtrans.dll";
     Dir = SCP2_OOO_BIN_DIR;
-    Styles = (PACKED, UNO_COMPONENT);
-    RegistryID = gid_Starregistry_Services_Rdb;
+    Styles = (PACKED);
 End
 
 #endif
 
 STD_LIB_FILE(gid_File_Lib_Drawinglayer,drawinglayer)
 
-SPECIAL_UNO_LIB_FILE(gid_File_Lib_Embobj,embobj)
+SPECIAL_LIB_FILE(gid_File_Lib_Embobj,embobj)
 
 #ifndef DISABLE_ATL
-SPECIAL_UNO_LIB_FILE(gid_File_Lib_Emboleobj,emboleobj)
+SPECIAL_LIB_FILE(gid_File_Lib_Emboleobj,emboleobj)
 #endif
 
 #if defined(WNT) && !defined(DISABLE_ATL)
 
-STD_UNO_LIB_FILE( gid_File_Lib_Emser, emser )
+STD_LIB_FILE( gid_File_Lib_Emser, emser )
 
 File gid_File_Lib_Inprocserv
     TXT_FILE_BODY;
@@ -448,8 +434,7 @@ End
 #ifdef ENABLE_KAB
 File gid_File_Lib_Kab_1
     TXT_FILE_BODY;
-    Styles = (PACKED,UNO_COMPONENT);
-    RegistryID = gid_Starregistry_Services_Rdb;
+    Styles = (PACKED);
     Dir = SCP2_OOO_BIN_DIR;
     Name = STRING(CONCAT2(libkab1,UNXSUFFIX));
 End
@@ -466,8 +451,7 @@ End
 #ifdef MACOSX
 File gid_File_Lib_Macab_1
     TXT_FILE_BODY;
-    Styles = (PACKED,UNO_COMPONENT);
-    RegistryID = gid_Starregistry_Services_Rdb;
+    Styles = (PACKED);
     Dir = SCP2_OOO_BIN_DIR;
     Name = STRING(CONCAT2(libmacab1,UNXSUFFIX));
 End
@@ -483,7 +467,7 @@ End
 
 #ifdef ENABLE_EVOAB2
 
-STD_UNO_LIB_FILE( gid_File_Lib_Evoab , evoab)
+STD_LIB_FILE( gid_File_Lib_Evoab , evoab)
 
 #endif  // #ifdef ENABLE_EVOAB2
 
@@ -491,8 +475,7 @@ STD_UNO_LIB_FILE( gid_File_Lib_Evoab , evoab)
 
 File gid_File_Lib_Evtatt
     TXT_FILE_BODY;
-    Styles = (PACKED,UNO_COMPONENT);
-    RegistryID = gid_Starregistry_Services_Rdb;
+    Styles = (PACKED);
     Dir = SCP2_OOO_BIN_DIR;
   #ifdef UNX
     Name = STRING(CONCAT2(libevtatt,UNXSUFFIX));
@@ -501,24 +484,22 @@ File gid_File_Lib_Evtatt
   #endif
 End
 
-SPECIAL_UNO_LIB_FILE(gid_File_Lib_Fileacc,fileacc)
+SPECIAL_LIB_FILE(gid_File_Lib_Fileacc,fileacc)
 
 File gid_File_Lib_Filterconfig1
     TXT_FILE_BODY;
-    Styles = (PACKED,UNO_COMPONENT);
+    Styles = (PACKED);
     Dir = SCP2_OOO_BIN_DIR;
-    RegistryID = gid_Starregistry_Services_Rdb;
     Name = SPECIAL_NAME(filterconfig1);
 End
 
-STD_UNO_LIB_FILE( gid_File_Lib_Flat, flat)
+STD_LIB_FILE( gid_File_Lib_Flat, flat)
 
 #ifdef WNT
 
 File gid_File_Lib_Fop
     TXT_FILE_BODY;
-    Styles = (PACKED,UNO_COMPONENT);
-    RegistryID = gid_Starregistry_Services_Rdb;
+    Styles = (PACKED);
     Dir = SCP2_OOO_BIN_DIR;
     Name = "fop.dll";
 End
@@ -529,8 +510,7 @@ End
 
 File gid_File_Lib_Fps
     TXT_FILE_BODY;
-    Styles = (PACKED,UNO_COMPONENT);
-    RegistryID = gid_Starregistry_Services_Rdb;
+    Styles = (PACKED);
     Dir = SCP2_OOO_BIN_DIR;
     Name = "fps.dll";
 End
@@ -544,8 +524,6 @@ File gid_File_Lib_Desktopbe
     Styles = (PACKED);
     Dir = SCP2_OOO_BIN_DIR;
     Name = STRING(CONCAT2(desktopbe1.uno,UNXSUFFIX));
-    RegistryID = gid_Starregistry_Services_Rdb;
-    Regmergefile = "desktopbe1-ucd.txt";
 End
 
 #ifdef ENABLE_GTK
@@ -553,10 +531,8 @@ End
 File gid_File_Lib_Fps_Gnome
     TXT_FILE_BODY;
     Styles = (PACKED);
-    RegistryID = gid_Starregistry_Services_Rdb;
     Dir = SCP2_OOO_BIN_DIR;
     Name = SPECIAL_COMPONENT_LIB_NAME(fps_gnome.uno);
-    Regmergefile = "fps-gnome-ucd.txt";
 End
 #endif
 #endif
@@ -564,11 +540,9 @@ End
 #ifndef MACOSX
 File gid_File_Lib_Fps_Kde4
     TXT_FILE_BODY;
-    Styles = (PACKED,UNO_COMPONENT);
-    RegistryID = gid_Starregistry_Services_Rdb;
+    Styles = (PACKED);
     Dir = gid_Dir_Program;
     Name = SPECIAL_COMPONENT_LIB_NAME(fps_kde4.uno);
-    Regmergefile = "fps-kde4-ucd.txt";
 End
 #endif
 #endif
@@ -579,32 +553,28 @@ End
 File gid_File_Lib_Fps_Aqua
     TXT_FILE_BODY;
     Styles = (PACKED);
-    RegistryID = gid_Starregistry_Services_Rdb;
     Dir = SCP2_OOO_BIN_DIR;
     Name = SPECIAL_COMPONENT_LIB_NAME(fps_aqua.uno);
-    Regmergefile = "fps-aqua-ucd.txt";
 End
 
 File gid_File_Lib_MacOSXSpell
 	TXT_FILE_BODY;
-	Styles = (PACKED,UNO_COMPONENT);
-	RegistryID = gid_Starregistry_Services_Rdb;
+	Styles = (PACKED);
 	Name = LIBNAME(MacOSXSpell);
 	Dir = SCP2_OOO_BIN_DIR;
 End
 
 File gid_File_Lib_avmediaQuickTime
 	TXT_FILE_BODY;
-	Styles = (PACKED,UNO_COMPONENT);
-	RegistryID = gid_Starregistry_Services_Rdb;
+	Styles = (PACKED);
 	Name = LIBNAME(avmediaQuickTime);
 	Dir = SCP2_OOO_BIN_DIR;
 End
 #endif
 #endif
 
-SPECIAL_UNO_COMPONENT_LIB_FILE( gid_File_Lib_Fps_Office, fps_office.uno )
-SPECIAL_UNO_COMPONENT_LIB_FILE( gid_File_Lib_Fpicker, fpicker.uno )
+SPECIAL_COMPONENT_LIB_FILE( gid_File_Lib_Fps_Office, fps_office.uno )
+SPECIAL_COMPONENT_LIB_FILE( gid_File_Lib_Fpicker, fpicker.uno )
 
 
 #if (defined(ENABLE_CAIRO) && ! defined (SYSTEM_CAIRO))
@@ -630,16 +600,15 @@ End
 
 #endif
 
-STD_UNO_LIB_FILE( gid_File_Lib_Frm , frm)
+STD_LIB_FILE( gid_File_Lib_Frm , frm)
 
-SPECIAL_UNO_COMPONENT_LIB_FILE( gid_File_Lib_Fsstorage, fsstorage.uno )
+SPECIAL_COMPONENT_LIB_FILE( gid_File_Lib_Fsstorage, fsstorage.uno )
 
 #ifdef WNT
 
 File gid_File_Lib_Ftransl
     TXT_FILE_BODY;
-    Styles = (PACKED,UNO_COMPONENT);
-    RegistryID = gid_Starregistry_Services_Rdb;
+    Styles = (PACKED);
     Dir = SCP2_OOO_BIN_DIR;
     Name = "ftransl.dll";
 End
@@ -653,14 +622,13 @@ STD_LIB_FILE( gid_File_Lib_Fwi , fwi)
 File gid_File_Lib_Fwk
     Name = LIBNAME(fwk);
     TXT_FILE_BODY;
-    Styles = (PACKED,UNO_COMPONENT);
+    Styles = (PACKED);
     Dir = SCP2_OOO_BIN_DIR;
-    RegistryID = gid_Starregistry_Services_Rdb;
 End
 
-STD_UNO_LIB_FILE( gid_File_Lib_Fwl , fwl)
+STD_LIB_FILE( gid_File_Lib_Fwl , fwl)
 
-STD_UNO_LIB_FILE( gid_File_Lib_Fwm , fwm)
+STD_LIB_FILE( gid_File_Lib_Fwm , fwm)
 
 #ifdef WNT
 File gid_File_Lib_Gdiplus
@@ -671,14 +639,13 @@ File gid_File_Lib_Gdiplus
 End
 #endif
 
-SPECIAL_UNO_COMPONENT_LIB_FILE( gid_File_Lib_Hatchwindowfactory, hatchwindowfactory.uno )
+SPECIAL_COMPONENT_LIB_FILE( gid_File_Lib_Hatchwindowfactory, hatchwindowfactory.uno )
 
 STD_LIB_FILE( gid_File_Lib_Helplinker, helplinker)
 
 File gid_File_Lib_I18npool
     TXT_FILE_BODY;
-    Styles = (PACKED,UNO_COMPONENT);
-    RegistryID = gid_Starregistry_Services_Rdb;
+    Styles = (PACKED);
     Dir = SCP2_OOO_BIN_DIR;
   #ifdef UNX
     Name = STRING(CONCAT2(i18npool.uno,UNXSUFFIX));
@@ -700,8 +667,7 @@ End
 
 File gid_File_Lib_I18nsearch
     TXT_FILE_BODY;
-    Styles = (PACKED,UNO_COMPONENT);
-    RegistryID = gid_Starregistry_Services_Rdb;
+    Styles = (PACKED);
     Dir = SCP2_OOO_BIN_DIR;
   #ifdef UNX
     Name = STRING(CONCAT2(i18nsearch.uno,UNXSUFFIX));
@@ -782,15 +748,14 @@ End
 
 #ifdef SOLAR_JAVA
 
-STD_UNO_LIB_FILE( gid_File_Lib_Jdbc, jdbc)
+STD_LIB_FILE( gid_File_Lib_Jdbc, jdbc)
 
 #endif
 
 #ifdef SOLAR_JAVA
 File gid_File_Lib_Hsqldb_2
     TXT_FILE_BODY;
-    Styles = (PACKED,UNO_COMPONENT);
-    RegistryID = gid_Starregistry_Services_Rdb;
+    Styles = (PACKED);
     Dir = SCP2_OOO_BIN_DIR;
   #ifdef UNX
     Name = STRING(CONCAT2(libhsqldb,UNXSUFFIX));
@@ -856,7 +821,7 @@ End
 
 #endif
 
-STD_UNO_LIB_FILE( gid_File_Lib_Lng, lng)
+STD_LIB_FILE( gid_File_Lib_Lng, lng)
 
 File gid_File_Lib_Localedata_En
     TXT_FILE_BODY;
@@ -904,8 +869,7 @@ End
 
 File gid_File_Lib_Mcnttype
     TXT_FILE_BODY;
-    Styles = (PACKED,UNO_COMPONENT);
-    RegistryID = gid_Starregistry_Services_Rdb;
+    Styles = (PACKED);
     Dir = SCP2_OOO_BIN_DIR;
   #ifdef UNX
     Name = STRING(CONCAT2(libmcnttype,UNXSUFFIX));
@@ -916,15 +880,14 @@ End
 
 #if !defined(SYSTEM_MOZILLA) && !defined(WITHOUT_MOZILLA) && !defined(MACOSX)
                                                                 // #i91209#
-STD_UNO_LIB_FILE(gid_File_Lib_Mozab,mozab)
+STD_LIB_FILE(gid_File_Lib_Mozab,mozab)
 STD_LIB_FILE(gid_File_Lib_Mozabdrv,mozabdrv)
 
 #else
 
 File gid_File_Lib_Mozbootstrap
     TXT_FILE_BODY;
-    Styles = (PACKED,UNO_COMPONENT);
-    RegistryID = gid_Starregistry_Services_Rdb;
+    Styles = (PACKED);
     Dir = SCP2_OOO_BIN_DIR;
   #ifdef UNX
     Name = STRING(CONCAT2(libmozbootstrap,UNXSUFFIX));
@@ -935,11 +898,11 @@ End
 
 #endif
 
-STD_UNO_LIB_FILE(gid_File_Lib_Wpft,wpft)
+STD_LIB_FILE(gid_File_Lib_Wpft,wpft)
 
-STD_UNO_LIB_FILE(gid_File_Lib_T602Filter,t602filter)
+STD_LIB_FILE(gid_File_Lib_T602Filter,t602filter)
 
-STD_UNO_LIB_FILE(gid_File_Lib_Writerfilter,writerfilter)
+STD_LIB_FILE(gid_File_Lib_Writerfilter,writerfilter)
 
 #ifdef WNT
 #if defined(_gcc3)
@@ -1048,12 +1011,12 @@ End
 #endif
 #endif
 
-STD_UNO_LIB_FILE(gid_File_Lib_Mysql,mysql)
-STD_UNO_LIB_FILE(gid_File_Lib_Odbc,odbc)
+STD_LIB_FILE(gid_File_Lib_Mysql,mysql)
+STD_LIB_FILE(gid_File_Lib_Odbc,odbc)
 
 // STD_LIB_FILE( gid_File_Lib_Ofa , ofa)
 
-STD_UNO_LIB_FILE( gid_File_Lib_Offacc, offacc)
+STD_LIB_FILE( gid_File_Lib_Offacc, offacc)
 
 #ifdef SOLAR_JAVA
 #ifndef MACOSX
@@ -1076,23 +1039,22 @@ End
 
 File gid_File_Lib_Ole
     TXT_FILE_BODY;
-    Styles = (PACKED,UNO_COMPONENT);
-    RegistryID = gid_Starregistry_Services_Rdb;
+    Styles = (PACKED);
     Dir = SCP2_OOO_BIN_DIR;
     Name = "oleautobridge.uno.dll";
 End
 
 #endif
 
-SPECIAL_UNO_LIB_FILE(gid_File_Lib_Package2,package2)
+SPECIAL_LIB_FILE(gid_File_Lib_Package2,package2)
 
-SPECIAL_UNO_COMPONENT_LIB_FILE( gid_File_Lib_Passwordcontainer, passwordcontainer.uno )
+SPECIAL_COMPONENT_LIB_FILE( gid_File_Lib_Passwordcontainer, passwordcontainer.uno )
 
-STD_UNO_LIB_FILE( gid_File_Lib_Pcr, pcr)
+STD_LIB_FILE( gid_File_Lib_Pcr, pcr)
 
-STD_UNO_LIB_FILE( gid_File_Lib_Log, log)
+STD_LIB_FILE( gid_File_Lib_Log, log)
 
-STD_UNO_LIB_FILE( gid_File_Lib_Pdffilter, pdffilter)
+STD_LIB_FILE( gid_File_Lib_Pdffilter, pdffilter)
 
 File gid_File_Lib_Deployment
 #if defined UNX
@@ -1100,7 +1062,7 @@ File gid_File_Lib_Deployment
 #else
     Name = STRING(CONCAT3(deployment,DLLPOSTFIX,.uno.dll));
 #endif
-    PACKED_UNO_LIB_FILE_BODY;
+    PACKED_LIB_FILE_BODY;
 End
 
 File gid_File_Lib_DeploymentGui
@@ -1109,18 +1071,18 @@ File gid_File_Lib_DeploymentGui
 #else
     Name = STRING(CONCAT3(deploymentgui,DLLPOSTFIX,.uno.dll));
 #endif
-    PACKED_UNO_LIB_FILE_BODY;
+    PACKED_LIB_FILE_BODY;
 End
 
 STD_LIB_FILE(gid_File_Lib_DeploymentMisc, deploymentmisc)
 
 #ifndef WITHOUT_MOZILLA
-STD_UNO_LIB_FILE( gid_File_Lib_Pl , pl)
+STD_LIB_FILE( gid_File_Lib_Pl , pl)
 #endif
 
-STD_UNO_LIB_FILE( gid_File_Lib_Preload, preload)
+STD_LIB_FILE( gid_File_Lib_Preload, preload)
 
-SPECIAL_UNO_COMPONENT_LIB_FILE( gid_File_Lib_Productregistration, productregistration.uno )
+SPECIAL_COMPONENT_LIB_FILE( gid_File_Lib_Productregistration, productregistration.uno )
 
 #if defined(UNX) && ! defined(QUARTZ)
 File gid_File_Lib_Desktop_Detector
@@ -1238,15 +1200,13 @@ End
 File gid_File_Lib_Res
     Name = LIBNAME(res);
     TXT_FILE_BODY;
-    Styles = (PACKED,UNO_COMPONENT);
+    Styles = (PACKED);
     Dir = SCP2_OOO_BIN_DIR;
-    RegistryID = gid_Starregistry_Services_Rdb;
 End
 
 File gid_File_Lib_Sax_Uno
     TXT_FILE_BODY;
-    Styles = (PACKED,UNO_COMPONENT,DONT_OVERWRITE);
-    RegistryID = gid_Starregistry_Services_Rdb;
+    Styles = (PACKED,DONT_OVERWRITE);
     Dir = SCP2_OOO_BIN_DIR;
   #ifdef UNX
     Name = STRING(CONCAT2(sax.uno,UNXSUFFIX));
@@ -1257,8 +1217,7 @@ End
 
 File gid_File_Lib_Fastsax_Uno
     TXT_FILE_BODY;
-    Styles = (PACKED,UNO_COMPONENT,DONT_OVERWRITE);
-    RegistryID = gid_Starregistry_Services_Rdb;
+    Styles = (PACKED,DONT_OVERWRITE);
     Dir = SCP2_OOO_BIN_DIR;
   #ifdef UNX
     Name = STRING(CONCAT2(fastsax.uno,UNXSUFFIX));
@@ -1269,11 +1228,11 @@ End
 
 STD_LIB_FILE( gid_File_Lib_Sax , sax)
 
-STD_UNO_LIB_FILE( gid_File_Lib_Oox , oox)
+STD_LIB_FILE( gid_File_Lib_Oox , oox)
 
-STD_UNO_LIB_FILE( gid_File_Lib_Sb , sb)
+STD_LIB_FILE( gid_File_Lib_Sb , sb)
 
-STD_UNO_LIB_FILE( gid_File_Lib_Scn, scn)
+STD_LIB_FILE( gid_File_Lib_Scn, scn)
 
 File gid_File_Lib_Scriptframe
     TXT_FILE_BODY;
@@ -1286,18 +1245,16 @@ File gid_File_Lib_Scriptframe
   #else
     Name = "scriptframe.dll";
   #endif
-    RegistryID = gid_Starregistry_Services_Rdb;
     Dir = SCP2_OOO_BIN_DIR;
-    Styles = (PACKED,UNO_COMPONENT);
+    Styles = (PACKED);
 End
 
-STD_UNO_LIB_FILE( gid_File_Lib_Sd , sd)
+STD_LIB_FILE( gid_File_Lib_Sd , sd)
 STD_LIB_FILE( gid_File_Lib_Sdui, sdui)
 
 File gid_File_Lib_Slideshow
     TXT_FILE_BODY;
-    Styles = (PACKED,UNO_COMPONENT);
-    RegistryID = gid_Starregistry_Services_Rdb;
+    Styles = (PACKED);
     Dir = SCP2_OOO_BIN_DIR;
   #ifdef UNX
     Name = STRING(CONCAT2(slideshow.uno,UNXSUFFIX));
@@ -1308,8 +1265,7 @@ End
 
 File gid_File_Lib_Sdbc_2
     TXT_FILE_BODY;
-    Styles = (PACKED,UNO_COMPONENT);
-    RegistryID = gid_Starregistry_Services_Rdb;
+    Styles = (PACKED);
     Dir = SCP2_OOO_BIN_DIR;
   #ifdef UNX
     Name = STRING(CONCAT2(libsdbc2,UNXSUFFIX));
@@ -1318,16 +1274,15 @@ File gid_File_Lib_Sdbc_2
   #endif
 End
 
-STD_UNO_LIB_FILE( gid_File_Lib_Sdd , sdd)
+STD_LIB_FILE( gid_File_Lib_Sdd , sdd)
 
-STD_UNO_LIB_FILE( gid_File_Lib_Sf_Prothdlr, protocolhandler )
+STD_LIB_FILE( gid_File_Lib_Sf_Prothdlr, protocolhandler )
 
 File gid_File_Lib_Sfx
     Name = LIBNAME(sfx);
     TXT_FILE_BODY;
-    Styles = (PACKED,UNO_COMPONENT);
+    Styles = (PACKED);
     Dir = SCP2_OOO_BIN_DIR;
-    RegistryID = gid_Starregistry_Services_Rdb;
 End
 
 #ifdef WNT
@@ -1345,15 +1300,14 @@ End
 
 File gid_File_Lib_Smplmail
     TXT_FILE_BODY;
-    Styles = (PACKED,UNO_COMPONENT);
-    RegistryID = gid_Starregistry_Services_Rdb;
+    Styles = (PACKED);
     Dir = SCP2_OOO_BIN_DIR;
     Name = "smplmail.uno.dll";
 End
 
 #endif
 
-STD_UNO_LIB_FILE( gid_File_Lib_Sot, sot )
+STD_LIB_FILE( gid_File_Lib_Sot, sot )
 
 #if defined(UNX) && !defined(QUARTZ)
 
@@ -1368,29 +1322,28 @@ End
 
 File gid_File_Lib_Spell
     TXT_FILE_BODY;
-    Styles = (PACKED,UNO_COMPONENT);
-    RegistryID = gid_Starregistry_Services_Rdb;
+    Styles = (PACKED);
     Name = LIBNAME(spell);
     Dir = SCP2_OOO_BIN_DIR;
 End
 
-STD_UNO_LIB_FILE( gid_File_Lib_Spl, spl)
+STD_LIB_FILE( gid_File_Lib_Spl, spl)
 
-SPECIAL_UNO_LIB_FILE(gid_File_Lib_Srtrs1,srtrs1)
+SPECIAL_LIB_FILE(gid_File_Lib_Srtrs1,srtrs1)
 
 STD_LIB_FILE( gid_File_Lib_Sts , sts)
 
-STD_UNO_LIB_FILE( gid_File_Lib_Svl, svl )
-STD_UNO_LIB_FILE( gid_File_Lib_Svtools, svt )
+STD_LIB_FILE( gid_File_Lib_Svl, svl )
+STD_LIB_FILE( gid_File_Lib_Svtools, svt )
 
-STD_UNO_LIB_FILE( gid_File_Lib_Svx_Core, svxcore)
-STD_UNO_LIB_FILE( gid_File_Lib_Svx, svx)
-STD_UNO_LIB_FILE( gid_File_Lib_TextConversionDlgs, textconversiondlgs)
+STD_LIB_FILE( gid_File_Lib_Svx_Core, svxcore)
+STD_LIB_FILE( gid_File_Lib_Svx, svx)
+STD_LIB_FILE( gid_File_Lib_TextConversionDlgs, textconversiondlgs)
 STD_LIB_FILE( gid_File_Lib_Editeng, editeng)
 
 STD_LIB_FILE( gid_File_Lib_Msfilter, msfilter)
 
-STD_UNO_LIB_FILE( gid_File_Lib_Sw , sw)
+STD_LIB_FILE( gid_File_Lib_Sw , sw)
 STD_LIB_FILE( gid_File_Lib_Swui, swui)
 
 STD_LIB_FILE( gid_File_Lib_Msword, msword )
@@ -1398,33 +1351,31 @@ STD_LIB_FILE( gid_File_Lib_Msword, msword )
 #if ! defined UNX
 File gid_File_Lib_Sysdtrans
     TXT_FILE_BODY;
-    Styles = (PACKED,UNO_COMPONENT);
-    RegistryID = gid_Starregistry_Services_Rdb;
+    Styles = (PACKED);
     Dir = SCP2_OOO_BIN_DIR;
     Name = "sysdtrans.dll";
 End
 #endif
 
-SPECIAL_UNO_COMPONENT_LIB_FILE( gid_File_Lib_Syssh, syssh.uno )
-SPECIAL_UNO_COMPONENT_LIB_FILE( gid_File_Lib_Localebe, localebe1.uno )
+SPECIAL_COMPONENT_LIB_FILE( gid_File_Lib_Syssh, syssh.uno )
+SPECIAL_COMPONENT_LIB_FILE( gid_File_Lib_Localebe, localebe1.uno )
 
 #ifdef WNT
-SPECIAL_UNO_COMPONENT_LIB_FILE( gid_File_Lib_Wininetbe, wininetbe1.uno )
+SPECIAL_COMPONENT_LIB_FILE( gid_File_Lib_Wininetbe, wininetbe1.uno )
 #endif
 
 #ifdef MACOSX
-SPECIAL_UNO_COMPONENT_LIB_FILE( gid_File_Lib_Macbe, macbe1.uno )
+SPECIAL_COMPONENT_LIB_FILE( gid_File_Lib_Macbe, macbe1.uno )
 #endif
 
-STD_UNO_LIB_FILE( gid_File_Lib_Tk, tk )
+STD_LIB_FILE( gid_File_Lib_Tk, tk )
 STD_LIB_FILE( gid_File_Lib_Acc, acc )
 
 STD_LIB_FILE( gid_File_Lib_Tools, tl )
 
 File gid_File_Lib_Tvhlp1
     TXT_FILE_BODY;
-    Styles = (PACKED,UNO_COMPONENT);
-    RegistryID = gid_Starregistry_Services_Rdb;
+    Styles = (PACKED);
     Dir = SCP2_OOO_BIN_DIR;
   #ifdef UNX
     Name = STRING(CONCAT2(libtvhlp1,UNXSUFFIX));
@@ -1435,8 +1386,7 @@ End
 
 File gid_File_Lib_Ucb1
     TXT_FILE_BODY;
-    Styles = (PACKED,UNO_COMPONENT);
-    RegistryID = gid_Starregistry_Services_Rdb;
+    Styles = (PACKED);
     Dir = SCP2_OOO_BIN_DIR;
   #ifdef UNX
     Name = STRING(CONCAT2(libucb1,UNXSUFFIX));
@@ -1464,59 +1414,55 @@ File gid_File_Lib_Ucpchelp1
     Name = "ucpchelp1.dll";
   #endif
     Dir = SCP2_OOO_BIN_DIR;
-    Styles = (PACKED, UNO_COMPONENT);
-    RegistryID = gid_Starregistry_Services_Rdb;
+    Styles = (PACKED);
 End
 
 #ifndef DISABLE_NEON
-SPECIAL_UNO_LIB_FILE(gid_File_Lib_Ucpdav1,ucpdav1)
+SPECIAL_LIB_FILE(gid_File_Lib_Ucpdav1,ucpdav1)
  #ifndef SYSTEM_NEON
    SPECIAL_LIB_FILE(gid_File_Lib_Neon,neon)
  #endif
 #endif
 
-SPECIAL_UNO_LIB_FILE(gid_File_Lib_Ucpfile1,ucpfile1)
+SPECIAL_LIB_FILE(gid_File_Lib_Ucpfile1,ucpfile1)
 
-SPECIAL_UNO_LIB_FILE(gid_File_Lib_Ucpftp1,ucpftp1)
+SPECIAL_LIB_FILE(gid_File_Lib_Ucpftp1,ucpftp1)
 
-SPECIAL_UNO_LIB_FILE(gid_File_Lib_Ucphier1,ucphier1)
+SPECIAL_LIB_FILE(gid_File_Lib_Ucphier1,ucphier1)
 
-SPECIAL_UNO_LIB_FILE(gid_File_Lib_Ucppkg1,ucppkg1)
+SPECIAL_LIB_FILE(gid_File_Lib_Ucppkg1,ucppkg1)
 
-SPECIAL_UNO_COMPONENT_LIB_FILE(gid_File_Ucptdoc1, ucptdoc1.uno)
+SPECIAL_COMPONENT_LIB_FILE(gid_File_Ucptdoc1, ucptdoc1.uno)
 
-SPECIAL_UNO_COMPONENT_LIB_FILE(gid_File_Ucpext, ucpext.uno)
+SPECIAL_COMPONENT_LIB_FILE(gid_File_Ucpext, ucpext.uno)
 
-SPECIAL_UNO_COMPONENT_LIB_FILE(gid_File_Ucpexpand1, ucpexpand1.uno)
+SPECIAL_COMPONENT_LIB_FILE(gid_File_Ucpexpand1, ucpexpand1.uno)
 
 File gid_File_Lib_Lnth
     TXT_FILE_BODY;
-    Styles = (PACKED,UNO_COMPONENT);
-    RegistryID = gid_Starregistry_Services_Rdb;
+    Styles = (PACKED);
     Name = LIBNAME(lnth);
     Dir = SCP2_OOO_BIN_DIR;
 End
 
 File gid_File_Lib_Hyph
     TXT_FILE_BODY;
-    Styles = (PACKED,UNO_COMPONENT);
-    RegistryID = gid_Starregistry_Services_Rdb;
+    Styles = (PACKED);
     Name = LIBNAME(hyphen);
     Dir = SCP2_OOO_BIN_DIR;
 End
 
-STD_UNO_LIB_FILE( gid_File_Lib_Utl , utl)
+STD_LIB_FILE( gid_File_Lib_Utl , utl)
 
-STD_UNO_LIB_FILE( gid_File_Lib_Uui, uui )
+STD_LIB_FILE( gid_File_Lib_Uui, uui )
 
 STD_LIB_FILE( gid_File_Lib_BaseGfx, basegfx )
 
 File gid_File_Lib_Vcl
     Name = LIBNAME(vcl);
     TXT_FILE_BODY;
-    Styles = (PACKED,UNO_COMPONENT);
+    Styles = (PACKED);
     Dir = SCP2_OOO_BIN_DIR;
-    RegistryID = gid_Starregistry_Services_Rdb;
 End
 
 File gid_File_Lib_Vos
@@ -1530,30 +1476,27 @@ File gid_File_Lib_Vos
     Styles = (PACKED);
 End
 
-// STD_UNO_LIB_FILE( gid_File_Lib_Wrp, wrp)
-
-STD_UNO_LIB_FILE( gid_File_Lib_Xcr, xcr)
-STD_UNO_LIB_FILE( gid_File_Lib_Xmx , xmx)
-STD_UNO_LIB_FILE( gid_File_Lib_Xof , xof)
+STD_LIB_FILE( gid_File_Lib_Xcr, xcr)
+STD_LIB_FILE( gid_File_Lib_Xmx , xmx)
+STD_LIB_FILE( gid_File_Lib_Xof , xof)
 
 File gid_File_Lib_Xo
     Name = LIBNAME(xo);
     TXT_FILE_BODY;
-    Styles = (PACKED,UNO_COMPONENT);
+    Styles = (PACKED);
     Dir = SCP2_OOO_BIN_DIR;
-    RegistryID = gid_Starregistry_Services_Rdb;
 End
 
-SPECIAL_UNO_LIB_FILE(gid_File_Lib_Xstor,xstor)
+SPECIAL_LIB_FILE(gid_File_Lib_Xstor,xstor)
 
-STD_UNO_LIB_FILE( gid_File_Lib_Xsltdlg, xsltdlg )
-STD_UNO_LIB_FILE( gid_File_Lib_Xsltfilter, xsltfilter )
-STD_UNO_LIB_FILE( gid_File_Lib_Xmlfa, xmlfa )
-STD_UNO_LIB_FILE( gid_File_Lib_Xmlfd, xmlfd )
+STD_LIB_FILE( gid_File_Lib_Xsltdlg, xsltdlg )
+STD_LIB_FILE( gid_File_Lib_Xsltfilter, xsltfilter )
+STD_LIB_FILE( gid_File_Lib_Xmlfa, xmlfa )
+STD_LIB_FILE( gid_File_Lib_Xmlfd, xmlfd )
 
 #ifdef SOLAR_JAVA
-UNO_JAR_FILE( gid_File_Jar_Xsltfilter, XSLTFilter )
-UNO_JAR_FILE( gid_File_Jar_Xsltvalidate, XSLTValidate )
+STD_JAR_FILE( gid_File_Jar_Xsltfilter, XSLTFilter )
+STD_JAR_FILE( gid_File_Jar_Xsltvalidate, XSLTValidate )
 #endif
 
 #ifndef SYSTEM_LIBXSLT
@@ -1578,18 +1521,21 @@ End
 #endif
 
 
-STD_UNO_LIB_FILE( gid_File_Lib_Unoxml, unoxml )
+STD_LIB_FILE( gid_File_Lib_Unoxml, unoxml )
 
 // AVMedia
-STD_UNO_LIB_FILE( gid_File_Lib_AVMedia, avmedia )
+STD_LIB_FILE( gid_File_Lib_AVMedia, avmedia )
 
-#if defined UNX
+#if defined UNX 
+#if defined ENABLE_GSTREAMER
+SPECIAL_LIB_FILE( gid_File_Lib_AVMediaGst, avmediagst )
+#endif
 #ifdef SOLAR_JAVA
-UNO_JAR_FILE( gid_File_Jar_AVmedia, avmedia )
+STD_JAR_FILE( gid_File_Jar_AVmedia, avmedia )
 #endif
 #elif defined WNT
 #ifdef ENABLE_DIRECTX
-SPECIAL_UNO_LIB_FILE( gid_File_Lib_AVMediaWin, avmediawin )
+SPECIAL_LIB_FILE( gid_File_Lib_AVMediaWin, avmediawin )
 #endif
 #endif
 
@@ -1602,8 +1548,7 @@ File gid_File_Lib_XSec_Framework
         Name = "xsec_fw.dll";
     #endif
     Dir = SCP2_OOO_BIN_DIR;
-    Styles = (PACKED,UNO_COMPONENT);
-    RegistryID = gid_Starregistry_Services_Rdb;
+    Styles = (PACKED);
 End
 
 File gid_File_Lib_XSec_XmlSec
@@ -1614,8 +1559,7 @@ File gid_File_Lib_XSec_XmlSec
         Name = "xsec_xmlsec.dll";
     #endif
     Dir = SCP2_OOO_BIN_DIR;
-    Styles = (PACKED,UNO_COMPONENT);
-    RegistryID = gid_Starregistry_Services_Rdb;
+    Styles = (PACKED);
 End
 
 File gid_File_Lib_XSec_XMLSecurity
@@ -1626,8 +1570,7 @@ File gid_File_Lib_XSec_XMLSecurity
         Name = "xmlsecurity.dll";
     #endif
     Dir = SCP2_OOO_BIN_DIR;
-    Styles = (PACKED,UNO_COMPONENT);
-    RegistryID = gid_Starregistry_Services_Rdb;
+    Styles = (PACKED);
 End
 
 #ifdef WNT
@@ -1659,8 +1602,7 @@ End
 
 File gid_File_Lib_Migrationoo2
     TXT_FILE_BODY;
-    Styles = (PACKED,UNO_COMPONENT);
-    RegistryID = gid_Starregistry_Services_Rdb;
+    Styles = (PACKED);
     Dir = SCP2_OOO_BIN_DIR;
   #ifdef UNX
     Name = STRING(CONCAT2(migrationoo2.uno,UNXSUFFIX));
@@ -1669,6 +1611,7 @@ File gid_File_Lib_Migrationoo2
   #endif
 End
 
+#ifndef SYSTEM_LIBTEXTCAT
 File gid_File_Lib_Libtextcat
     TXT_FILE_BODY;
     Styles = (PACKED);
@@ -1679,12 +1622,13 @@ File gid_File_Lib_Libtextcat
     Name = "libtextcat.dll";
   #endif
 End
+#endif
 
-STD_UNO_LIB_FILE( gid_File_Lib_Guesslang, guesslang )
+STD_LIB_FILE( gid_File_Lib_Guesslang, guesslang )
 
-STD_UNO_LIB_FILE( gid_File_Lib_Updchkui , updchk )
+STD_LIB_FILE( gid_File_Lib_Updchkui , updchk )
 
-SPECIAL_UNO_COMPONENT_LIB_FILE( gid_File_Lib_Updatefeed , updatefeed.uno )
+SPECIAL_COMPONENT_LIB_FILE( gid_File_Lib_Updatefeed , updatefeed.uno )
 
 #ifdef WNT
 File gid_File_Lib_Onlinecheck
@@ -1732,7 +1676,7 @@ File gid_File_Lib_Unopkgapp
     Styles = (PACKED);
 End
 
-STD_UNO_LIB_FILE( gid_File_Lib_Oooimprovecore , oooimprovecore)
+STD_LIB_FILE( gid_File_Lib_Oooimprovecore , oooimprovecore)
 
 #if defined WNT && !defined _gcc3 && !defined SYSTEM_MOZILLA && !defined WITHOUT_MOZILLA && \
     !(defined M1400 && defined PROF_EDITION && !defined _STLP_DEBUG)
@@ -1811,8 +1755,8 @@ File gid_File_Lib_Rdf
 End
 #endif // SYSTEM_REDLAND
 
-STD_UNO_LIB_FILE(gid_File_Lib_Unordf, unordf)
+STD_LIB_FILE(gid_File_Lib_Unordf, unordf)
 
-STD_UNO_LIB_FILE( gid_File_Lib_For, for)
+STD_LIB_FILE( gid_File_Lib_For, for)
 STD_LIB_FILE( gid_File_Lib_Forui, forui)
 
diff --git a/scp2/source/ooo/file_ooo.scp b/scp2/source/ooo/file_ooo.scp
index a600c135de01..972c371ce489 100755..100644
--- a/scp2/source/ooo/file_ooo.scp
+++ b/scp2/source/ooo/file_ooo.scp
@@ -391,12 +391,6 @@ STD_FILTER_FILE( gid_File_Filter_Iti, iti)
 
 STD_RES_FILE( gid_File_Res_Eps, eps )
 
-STD_RES_FILE( gid_File_Res_Egi, egi )
-
-STD_RES_FILE( gid_File_Res_Ept, ept )
-
-STD_RES_FILE( gid_File_Res_Eme, eme )
-
 File gid_File_Help_Common_Zip
     Dir = gid_Dir_Help_Isolanguage;
     ARCHIVE_TXT_FILE_BODY;
@@ -423,14 +417,13 @@ File gid_File_Help_Schart_Zip
     EXTRA_ALL_GOOD_HELP_LOCALIZATIONS_LANG(schart);
 End
 
-#if defined INCLUDE_JAVA_ACCESSBRIDGE && defined WNT
+#if defined WNT
 
 File gid_File_Jar_Accessbridge
     TXT_FILE_BODY;
     Name = "java_uno_accessbridge.jar";
-    RegistryID = gid_Starregistry_Services_Rdb;
     Dir = gid_Dir_Classes;
-    Styles = (PACKED,DONT_OVERWRITE,UNO_COMPONENT);
+    Styles = (PACKED,DONT_OVERWRITE);
 End
 
 #endif
@@ -449,7 +442,7 @@ STD_JAR_FILE( gid_File_Jar_Lucene_Analyzers, lucene-analyzers-2.3 )
 #endif
 
 #ifdef SOLAR_JAVA
-UNO_JAR_FILE( gid_File_Jar_Lucenehelpwrapper, LuceneHelpWrapper )
+STD_JAR_FILE( gid_File_Jar_Lucenehelpwrapper, LuceneHelpWrapper )
 #endif
 
 #ifdef SOLAR_JAVA
@@ -473,14 +466,14 @@ End
 
 
 #ifdef SOLAR_JAVA
-UNO_JAR_FILE( gid_File_Jar_Report, report )
-UNO_JAR_FILE( gid_File_Jar_Table, table )
-UNO_JAR_FILE( gid_File_Jar_Letter, letter )
-UNO_JAR_FILE( gid_File_Jar_Form, form )
-UNO_JAR_FILE( gid_File_Jar_Fax, fax )
-UNO_JAR_FILE( gid_File_Jar_Agenda, agenda )
-UNO_JAR_FILE( gid_File_Jar_Query, query )
-UNO_JAR_FILE( gid_File_Jar_Web, web )
+STD_JAR_FILE( gid_File_Jar_Report, report )
+STD_JAR_FILE( gid_File_Jar_Table, table )
+STD_JAR_FILE( gid_File_Jar_Letter, letter )
+STD_JAR_FILE( gid_File_Jar_Form, form )
+STD_JAR_FILE( gid_File_Jar_Fax, fax )
+STD_JAR_FILE( gid_File_Jar_Agenda, agenda )
+STD_JAR_FILE( gid_File_Jar_Query, query )
+STD_JAR_FILE( gid_File_Jar_Web, web )
 #endif
 
 #ifdef SOLAR_JAVA
@@ -500,10 +493,10 @@ End
 #endif
 
 #ifdef SOLAR_JAVA
-UNO_JAR_FILE( gid_File_Jar_Scriptframework, ScriptFramework )
-UNO_JAR_FILE( gid_File_Jar_Scriptproviderforbeanshell, ScriptProviderForBeanShell )
-UNO_JAR_FILE( gid_File_Jar_Scriptproviderforjava, ScriptProviderForJava )
-UNO_JAR_FILE( gid_File_Jar_Scriptproviderforjavascript, ScriptProviderForJavaScript )
+STD_JAR_FILE( gid_File_Jar_Scriptframework, ScriptFramework )
+STD_JAR_FILE( gid_File_Jar_Scriptproviderforbeanshell, ScriptProviderForBeanShell )
+STD_JAR_FILE( gid_File_Jar_Scriptproviderforjava, ScriptProviderForJava )
+STD_JAR_FILE( gid_File_Jar_Scriptproviderforjavascript, ScriptProviderForJavaScript )
 #endif
 
 #ifdef SOLAR_JAVA
@@ -523,6 +516,7 @@ STD_JAR_FILE( gid_File_Jar_Saxon, saxon9 )
 #endif
 #endif
 
+#ifndef SYSTEM_LIBTEXTCAT_DATA
 // fingerprint files (lm)
 
 File gid_File_Conf_Fpdb
@@ -1036,7 +1030,7 @@ File gid_File_Lm_Zulu
     Dir = gid_Dir_Share_Fingerprint;
     Styles = (PACKED);
 End
-
+#endif
 
 
 // mod files
@@ -1685,13 +1679,7 @@ File gid_Starregistry_Services_Rdb
     TXT_FILE_BODY;
     Name = "services.rdb";
     Dir = gid_Dir_Program;
-    Styles = (PACKED, STARREGISTRY);
-#if defined WNT
-    NativeServicesURLPrefix = "vnd.sun.star.expand:$BRAND_BASE_DIR/program/";
-#else
-    NativeServicesURLPrefix = "vnd.sun.star.expand:$OOO_BASE_DIR/program/";
-#endif
-    JavaServicesURLPrefix = "vnd.sun.star.expand:$OOO_BASE_DIR/program/classes/";
+    Styles = (PACKED);
 End
 
 #ifdef LINUX
@@ -1804,9 +1792,8 @@ End
 File gid_File_Jar_Productregistration
     TXT_FILE_BODY;
     Name = "productregistration.jar";
-    RegistryID = gid_Starregistry_Services_Rdb;
     Dir = gid_Dir_Classes;
-    Styles = (PACKED,UNO_COMPONENT);
+    Styles = (PACKED);
 End
 #endif
 
diff --git a/scp2/source/ooo/file_resource_ooo.scp b/scp2/source/ooo/file_resource_ooo.scp
index 3790a28bd80a..cbd8ff609721 100644
--- a/scp2/source/ooo/file_resource_ooo.scp
+++ b/scp2/source/ooo/file_resource_ooo.scp
@@ -45,12 +45,6 @@ STD_RES_FILE( gid_File_Res_Dbw, dbw )
 
 STD_RES_FILE( gid_File_Res_Dkt, dkt)
 
-STD_RES_FILE( gid_File_Res_Epb, epb )
-
-STD_RES_FILE( gid_File_Res_Epg, epg )
-
-STD_RES_FILE( gid_File_Res_Epp, epp )
-
 STD_RES_FILE( gid_File_Res_Eur, eur )
 
 STD_RES_FILE( gid_File_Res_Frm, frm)
diff --git a/scp2/source/ooo/makefile.mk b/scp2/source/ooo/makefile.mk
index 0777febdc869..5f2e2795eaad 100644
--- a/scp2/source/ooo/makefile.mk
+++ b/scp2/source/ooo/makefile.mk
@@ -49,9 +49,6 @@ SCPDEFS+=-DBUILD_SPECIAL
 SCPDEFS+=-DBUILD_X64
 .ENDIF
 
-
-SCPDEFS+=-DINCLUDE_JAVA_ACCESSBRIDGE
-
 .IF "$(PROF_EDITION)"!=""
 SCPDEFS+=-DPROF_EDITION
 .ENDIF
@@ -72,6 +69,10 @@ SCPDEFS+=-DGTK_TWO_FOUR
 SCPDEFS+=-DENABLE_SYSTRAY_GTK
 .ENDIF
 
+.IF "$(ENABLE_GSTREAMER)" != ""
+SCPDEFS+=-DENABLE_GSTREAMER
+.ENDIF
+
 .IF "$(ENABLE_KDE)" != ""
 SCPDEFS+=-DENABLE_KDE
 .ENDIF
@@ -233,6 +234,14 @@ SCPDEFS+=-DDISABLE_ATL
 SCPDEFS+=-DSYSTEM_PYTHON
 .ENDIF
 
+.IF "$(SYSTEM_LIBTEXTCAT)" == "YES"
+SCPDEFS+=-DSYSTEM_LIBTEXTCAT
+.ENDIF
+
+.IF "$(SYSTEM_LIBTEXTCAT_DATA)" != ""
+SCPDEFS+=-DSYSTEM_LIBTEXTCAT_DATA
+.ENDIF
+
 .IF "$(ENABLE_SVCTAGS)" == "YES"
 SCPDEFS+=-DENABLE_SVCTAGS
 .ENDIF
diff --git a/scp2/source/ooo/module_hidden_ooo.scp b/scp2/source/ooo/module_hidden_ooo.scp
index 19bdd6cc3c25..e8c20f99ca94 100644
--- a/scp2/source/ooo/module_hidden_ooo.scp
+++ b/scp2/source/ooo/module_hidden_ooo.scp
@@ -214,6 +214,7 @@ Module gid_Module_Root_Files_4
 	gid_File_Lib_Svx,
 	gid_File_Lib_AVMedia,
 	gid_File_Lib_AVMediaWin,
+	gid_File_Lib_AVMediaGst,
 	gid_File_Lib_BaseGfx,
 	gid_File_Lib_Sysdtrans,
 	gid_File_Lib_Sw,
diff --git a/scp2/source/ooo/module_lang_template.scp b/scp2/source/ooo/module_lang_template.scp
index 7a88e543e1dd..a71d36a87c03 100755
--- a/scp2/source/ooo/module_lang_template.scp
+++ b/scp2/source/ooo/module_lang_template.scp
@@ -66,9 +66,6 @@ Module gid_Module_Langpack_Resource_Template
              gid_File_Res_Dbw,
              gid_File_Res_Dkt,
              gid_File_Res_Editeng,
-             gid_File_Res_Epb,
-             gid_File_Res_Epg,
-             gid_File_Res_Epp,
              gid_File_Res_Eur,
              gid_File_Res_For,
              gid_File_Res_Forui,
@@ -109,9 +106,6 @@ Module gid_Module_Langpack_Resource_Template
              gid_File_Res_Stt,
              gid_File_Res_Tfu,
              gid_File_Res_Eps,
-             gid_File_Res_Egi,
-             gid_File_Res_Ept,
-             gid_File_Res_Eme,
              gid_File_Res_UpdChk,
              gid_File_Res_Upd);
 End
diff --git a/scp2/source/ooo/module_ooo.scp b/scp2/source/ooo/module_ooo.scp
index 5b1de3897f77..dcd29c2ed31d 100644
--- a/scp2/source/ooo/module_ooo.scp
+++ b/scp2/source/ooo/module_ooo.scp
@@ -51,9 +51,8 @@ Module gid_Module_Optional
 End
 
 Module gid_Module_Dictionaries
-    ParentID = gid_Module_Root;
-    XPDParentID = "root";
-    Sortkey = "300";
+    ParentID = gid_Module_Optional;
+    Sortkey = "215";
     MOD_NAME_DESC ( MODULE_DICTIONARIES );
 End
 
diff --git a/scp2/source/ooo/ooo_brand.scp b/scp2/source/ooo/ooo_brand.scp
index 3cd20ef97142..4d78d3efb606 100644
--- a/scp2/source/ooo/ooo_brand.scp
+++ b/scp2/source/ooo/ooo_brand.scp
@@ -39,6 +39,13 @@ Directory gid_Dir_Brand_Root
 End
 #endif
 
+File gid_Brand_File_ServicesRdb
+    TXT_FILE_BODY;
+    Dir = gid_Brand_Dir_Program;
+    Name = "/ooo/services.rdb";
+    Styles = (PACKED);
+End
+
 ProfileItem gid_Brand_Profileitem_Bootstrap_Errorreport_Server
     ProfileID = gid_Brand_Profile_Bootstrap_Ini;
     ModuleID = gid_Module_Root_Brand;
diff --git a/scp2/source/ooo/profileitem_ooo.scp b/scp2/source/ooo/profileitem_ooo.scp
index 9818d5b26749..724316ba6f5e 100644
--- a/scp2/source/ooo/profileitem_ooo.scp
+++ b/scp2/source/ooo/profileitem_ooo.scp
@@ -461,4 +461,3 @@ ProfileItem gid_Basis_Profileitem_Version_Ooopackageversion
     Key = "OOOPackageVersion";
     Value = "${OOOPACKAGEVERSION}";
 End
-
diff --git a/scp2/source/ooo/ure.scp b/scp2/source/ooo/ure.scp
index 9aeaf32c5bcb..804f0edad0b2 100755
--- a/scp2/source/ooo/ure.scp
+++ b/scp2/source/ooo/ure.scp
@@ -312,6 +312,13 @@ File gid_File_Dl_Store
     // CompID = "A5477BD7-89A3-44AF-8B42-9E28D55C8066";
 End
 
+File gid_File_Dl_Xmlreader
+    TXT_FILE_BODY;
+    Dir = SCP2_URE_DL_DIR;
+    Name = SCP2_URE_DL_NORMAL("xmlreader");
+    Styles = (PACKED);
+End
+
 File gid_File_Dl_Jvmaccess
     TXT_FILE_BODY;
     Dir = SCP2_URE_DL_DIR;
@@ -667,8 +674,7 @@ File gid_File_Dl_Acceptor
     TXT_FILE_BODY;
     Dir = SCP2_URE_DL_DIR;
     Name = SCP2_URE_DL_BARE("acceptor.uno");
-    Styles = (PACKED, UNO_COMPONENT, VERSION_INDEPENDENT_COMP_ID);
-    RegistryID = gid_Starregistry_Services_Rdb_Ure;
+    Styles = (PACKED, VERSION_INDEPENDENT_COMP_ID);
     // CompID = "31183C51-C9A4-4D7A-A2F4-103252E1FEB0";
 End
 
@@ -676,8 +682,7 @@ File gid_File_Dl_Bootstrap
     TXT_FILE_BODY;
     Dir = SCP2_URE_DL_DIR;
     Name = SCP2_URE_DL_BARE("bootstrap.uno");
-    Styles = (PACKED, UNO_COMPONENT, VERSION_INDEPENDENT_COMP_ID);
-    RegistryID = gid_Starregistry_Services_Rdb_Ure;
+    Styles = (PACKED, VERSION_INDEPENDENT_COMP_ID);
     // CompID = "2620B307-25DB-498F-B2B8-46D928165331";
 End
 
@@ -685,8 +690,7 @@ File gid_File_Dl_Bridgefac
     TXT_FILE_BODY;
     Dir = SCP2_URE_DL_DIR;
     Name = SCP2_URE_DL_BARE("bridgefac.uno");
-    Styles = (PACKED, UNO_COMPONENT, VERSION_INDEPENDENT_COMP_ID);
-    RegistryID = gid_Starregistry_Services_Rdb_Ure;
+    Styles = (PACKED, VERSION_INDEPENDENT_COMP_ID);
     // CompID = "E025163F-FE1E-4E8C-B0E5-49C08924A646";
 End
 
@@ -694,8 +698,7 @@ File gid_File_Dl_Connector
     TXT_FILE_BODY;
     Dir = SCP2_URE_DL_DIR;
     Name = SCP2_URE_DL_BARE("connector.uno");
-    Styles = (PACKED, UNO_COMPONENT, VERSION_INDEPENDENT_COMP_ID);
-    RegistryID = gid_Starregistry_Services_Rdb_Ure;
+    Styles = (PACKED, VERSION_INDEPENDENT_COMP_ID);
     // CompID = "EBCE77E7-E244-40F6-96E2-5319D6571C5D";
 End
 
@@ -703,8 +706,7 @@ File gid_File_Dl_Introspection
     TXT_FILE_BODY;
     Dir = SCP2_URE_DL_DIR;
     Name = SCP2_URE_DL_BARE("introspection.uno");
-    Styles = (PACKED, UNO_COMPONENT, VERSION_INDEPENDENT_COMP_ID);
-    RegistryID = gid_Starregistry_Services_Rdb_Ure;
+    Styles = (PACKED, VERSION_INDEPENDENT_COMP_ID);
     // CompID = "E99960CF-FE59-4332-A2AC-47418C3A17C1";
 End
 
@@ -712,8 +714,7 @@ File gid_File_Dl_Invocadapt
     TXT_FILE_BODY;
     Dir = SCP2_URE_DL_DIR;
     Name = SCP2_URE_DL_BARE("invocadapt.uno");
-    Styles = (PACKED, UNO_COMPONENT, VERSION_INDEPENDENT_COMP_ID);
-    RegistryID = gid_Starregistry_Services_Rdb_Ure;
+    Styles = (PACKED, VERSION_INDEPENDENT_COMP_ID);
     // CompID = "77DDC112-1994-49D5-A086-FB16D4328AB9";
 End
 
@@ -721,8 +722,7 @@ File gid_File_Dl_Invocation
     TXT_FILE_BODY;
     Dir = SCP2_URE_DL_DIR;
     Name = SCP2_URE_DL_BARE("invocation.uno");
-    Styles = (PACKED, UNO_COMPONENT, VERSION_INDEPENDENT_COMP_ID);
-    RegistryID = gid_Starregistry_Services_Rdb_Ure;
+    Styles = (PACKED, VERSION_INDEPENDENT_COMP_ID);
     // CompID = "A79ACB80-DA65-47CA-81BA-7CD9E191C84C";
 End
 
@@ -732,8 +732,7 @@ File gid_File_Dl_Javaloader
     TXT_FILE_BODY;
     Dir = SCP2_URE_DL_DIR;
     Name = SCP2_URE_DL_BARE("javaloader.uno");
-    Styles = (PACKED, UNO_COMPONENT, VERSION_INDEPENDENT_COMP_ID);
-    RegistryID = gid_Starregistry_Services_Rdb_Ure;
+    Styles = (PACKED, VERSION_INDEPENDENT_COMP_ID);
     // CompID = "19A20968-E654-4E2C-9F58-7B66F07CA346";
 End
 #endif
@@ -743,8 +742,7 @@ File gid_File_Dl_Javavm
     TXT_FILE_BODY;
     Dir = SCP2_URE_DL_DIR;
     Name = SCP2_URE_DL_BARE("javavm.uno");
-    Styles = (PACKED, UNO_COMPONENT, VERSION_INDEPENDENT_COMP_ID);
-    RegistryID = gid_Starregistry_Services_Rdb_Ure;
+    Styles = (PACKED, VERSION_INDEPENDENT_COMP_ID);
     // CompID = "F1266B2B-80AD-4248-A921-9161759FA4DA";
 End
 #endif
@@ -753,8 +751,7 @@ File gid_File_Dl_Namingservice
     TXT_FILE_BODY;
     Dir = SCP2_URE_DL_DIR;
     Name = SCP2_URE_DL_BARE("namingservice.uno");
-    Styles = (PACKED, UNO_COMPONENT, VERSION_INDEPENDENT_COMP_ID);
-    RegistryID = gid_Starregistry_Services_Rdb_Ure;
+    Styles = (PACKED, VERSION_INDEPENDENT_COMP_ID);
     // CompID = "DD22BE3A-AD21-447D-B3A3-89B0FCDB0B31";
 End
 
@@ -762,8 +759,7 @@ File gid_File_Dl_Stocservices
     TXT_FILE_BODY;
     Dir = SCP2_URE_DL_DIR;
     Name = SCP2_URE_DL_BARE("stocservices.uno");
-    Styles = (PACKED, UNO_COMPONENT, VERSION_INDEPENDENT_COMP_ID);
-    RegistryID = gid_Starregistry_Services_Rdb_Ure;
+    Styles = (PACKED, VERSION_INDEPENDENT_COMP_ID);
     // CompID = "EBF6BBDE-EC50-4FB8-A0D4-BEC58F1C8C07";
 End
 
@@ -771,8 +767,7 @@ File gid_File_Dl_Proxyfac
     TXT_FILE_BODY;
     Dir = SCP2_URE_DL_DIR;
     Name = SCP2_URE_DL_BARE("proxyfac.uno");
-    Styles = (PACKED, UNO_COMPONENT, VERSION_INDEPENDENT_COMP_ID);
-    RegistryID = gid_Starregistry_Services_Rdb_Ure;
+    Styles = (PACKED, VERSION_INDEPENDENT_COMP_ID);
     // CompID = "A2CDDEC3-B9C7-48C9-AB35-65008777BC2F";
 End
 
@@ -780,8 +775,7 @@ File gid_File_Dl_Reflection
     TXT_FILE_BODY;
     Dir = SCP2_URE_DL_DIR;
     Name = SCP2_URE_DL_BARE("reflection.uno");
-    Styles = (PACKED, UNO_COMPONENT, VERSION_INDEPENDENT_COMP_ID);
-    RegistryID = gid_Starregistry_Services_Rdb_Ure;
+    Styles = (PACKED, VERSION_INDEPENDENT_COMP_ID);
     // CompID = "601C7946-CFEB-4F56-9429-6D5963188DF3";
 End
 
@@ -789,8 +783,7 @@ File gid_File_Dl_Remotebridge
     TXT_FILE_BODY;
     Dir = SCP2_URE_DL_DIR;
     Name = SCP2_URE_DL_BARE("remotebridge.uno");
-    Styles = (PACKED, UNO_COMPONENT, VERSION_INDEPENDENT_COMP_ID);
-    RegistryID = gid_Starregistry_Services_Rdb_Ure;
+    Styles = (PACKED, VERSION_INDEPENDENT_COMP_ID);
     // CompID = "B440B28E-B7AD-40C7-89E1-1508CA798347";
 End
 
@@ -798,8 +791,7 @@ File gid_File_Dl_Streams
     TXT_FILE_BODY;
     Dir = SCP2_URE_DL_DIR;
     Name = SCP2_URE_DL_BARE("streams.uno");
-    Styles = (PACKED, UNO_COMPONENT, VERSION_INDEPENDENT_COMP_ID);
-    RegistryID = gid_Starregistry_Services_Rdb_Ure;
+    Styles = (PACKED, VERSION_INDEPENDENT_COMP_ID);
     // CompID = "6028CF43-A9B7-40A8-8216-509CAB256A2B";
 End
 
@@ -807,8 +799,7 @@ File gid_File_Dl_Textinstream
     TXT_FILE_BODY;
     Dir = SCP2_URE_DL_DIR;
     Name = SCP2_URE_DL_BARE("textinstream.uno");
-    Styles = (PACKED, UNO_COMPONENT, VERSION_INDEPENDENT_COMP_ID);
-    RegistryID = gid_Starregistry_Services_Rdb_Ure;
+    Styles = (PACKED, VERSION_INDEPENDENT_COMP_ID);
     // CompID = "DAA39D01-D9C5-40C4-94EC-9E4B2F94EABA";
 End
 
@@ -816,8 +807,7 @@ File gid_File_Dl_Textoutstream
     TXT_FILE_BODY;
     Dir = SCP2_URE_DL_DIR;
     Name = SCP2_URE_DL_BARE("textoutstream.uno");
-    Styles = (PACKED, UNO_COMPONENT, VERSION_INDEPENDENT_COMP_ID);
-    RegistryID = gid_Starregistry_Services_Rdb_Ure;
+    Styles = (PACKED, VERSION_INDEPENDENT_COMP_ID);
     // CompID = "DD01EB0C-A119-43AE-9100-F7A595D099E4";
 End
 
@@ -825,8 +815,7 @@ File gid_File_Dl_Uuresolver
     TXT_FILE_BODY;
     Dir = SCP2_URE_DL_DIR;
     Name = SCP2_URE_DL_BARE("uuresolver.uno");
-    Styles = (PACKED, UNO_COMPONENT, VERSION_INDEPENDENT_COMP_ID);
-    RegistryID = gid_Starregistry_Services_Rdb_Ure;
+    Styles = (PACKED, VERSION_INDEPENDENT_COMP_ID);
     // CompID = "377090E1-5008-424F-B0F6-A9EFC9F11206";
 End
 
@@ -1018,8 +1007,7 @@ File gid_File_Java_JuhJar
     TXT_FILE_BODY;
     Dir = gid_Dir_Ure_Java;
     Name = "juh.jar";
-    Styles = (PACKED, UNO_COMPONENT, VERSION_INDEPENDENT_COMP_ID);
-    RegistryID = gid_Starregistry_Services_Rdb_Ure;
+    Styles = (PACKED, VERSION_INDEPENDENT_COMP_ID);
     // CompID = "E77CC8B5-0345-4B7F-ABED-5EB9DC94E492";
 End
 #endif
@@ -1066,6 +1054,13 @@ File gid_File_Misc_TypesRdb
     // CompID = "E5086F6A-855B-4CAE-AD3A-A85A21C5AE44";
 End
 
+File gid_File_Misc_ServicesRdb
+    TXT_FILE_BODY;
+    Dir = gid_Dir_Ure_Misc;
+    Name = "/ure/services.rdb";
+    Styles = (PACKED);
+End
+
 // Private Miscellaneous Files:
 
 #if defined SOLAR_JAVA
@@ -1078,18 +1073,6 @@ File gid_File_Misc_JavavendorsXml
 End
 #endif
 
-// StarRegistry File
-
-File gid_Starregistry_Services_Rdb_Ure
-    TXT_FILE_BODY;
-    Name = "services.rdb";
-    Dir = gid_Dir_Ure_Misc;
-    Styles = (PACKED, STARREGISTRY, VERSION_INDEPENDENT_COMP_ID);
-    NativeServicesURLPrefix = "vnd.sun.star.expand:$URE_INTERNAL_LIB_DIR/";
-    JavaServicesURLPrefix = "vnd.sun.star.expand:$URE_INTERNAL_JAVA_DIR/";
-    // CompID = "F4BD7B0A-5A20-4167-9D10-18597C5F85AF";
-End
-
 #if defined MACOSX
 Unixlink gid_Unixlink_Ure_Bin_Urelibs
     Dir = gid_Dir_Ure_Bin;
@@ -1150,6 +1133,7 @@ Module gid_Module_Root_Ure_Hidden
             gid_File_Dl_Reg,
             gid_File_Dl_Rmcxt,
             gid_File_Dl_Store,
+            gid_File_Dl_Xmlreader,
             gid_File_Dl_Jvmaccess,
             gid_File_Dl_Jvmfwk,
             gid_File_Dl_Sunjavaplugin,
@@ -1204,8 +1188,8 @@ Module gid_Module_Root_Ure_Hidden
             gid_File_Java_RidlJar,
             gid_File_Java_JavaUnoJar,
             gid_File_Misc_TypesRdb,
-            gid_File_Misc_JavavendorsXml,
-            gid_Starregistry_Services_Rdb_Ure);
+            gid_File_Misc_ServicesRdb,
+            gid_File_Misc_JavavendorsXml);
     Unixlinks = (gid_Unixlink_Ure_Bin_Urelibs);
 End
 
diff --git a/scp2/source/ooo/windowscustomaction_ooo.scp b/scp2/source/ooo/windowscustomaction_ooo.scp
index 568b3996a8b7..7bd6c18fae99 100755
--- a/scp2/source/ooo/windowscustomaction_ooo.scp
+++ b/scp2/source/ooo/windowscustomaction_ooo.scp
@@ -199,6 +199,25 @@ WindowsCustomAction gid_Customaction_Shellextensionsdll7
 	Assignment1 = ("InstallExecuteSequence", "REMOVE=\"ALL\" And Not PATCH", "InstallValidate");
 End
 
+WindowsCustomAction gid_Customaction_Register_Extensions
+	Name = "RegisterExtensions";
+	Typ = "65";
+	Source = "shlxtmsi.dll";
+	Target = "RegisterExtensions";
+	Inbinarytable = 1;
+	Assignment1 = ("InstallExecuteSequence", "Not REMOVE=\"ALL\"", "end");
+	Assignment2 = ("AdminExecuteSequence", "Not REMOVE=\"ALL\"", "end");
+End
+
+WindowsCustomAction gid_Customaction_Remove_Extensions
+	Name = "RemoveExtensions";
+	Typ = "65";
+	Source = "shlxtmsi.dll";
+	Target = "RemoveExtensions";
+	Inbinarytable = 1;
+	Assignment1 = ("InstallExecuteSequence", "REMOVE=\"ALL\" And Not PATCH", "FileCost");
+End
+
 WindowsCustomAction gid_Customaction_Set_Admininstall
 	Name = "SetAdminInstallProperty";
 	Typ = "65";
@@ -287,6 +306,16 @@ WindowsCustomAction gid_Customaction_Patch_InstallExchangeFiles
 	Assignment2 = ("AdminExecuteSequence", "", "behind_InstallFinalize");
 End
 
+WindowsCustomAction gid_Customaction_Langpack_Register_Extensions
+	Name = "RegisterExtensions";
+	Typ = "65";
+	Source = "lngpckinsthlp.dll";
+	Target = "RegisterExtensions";
+	Inbinarytable = 1;
+	Assignment1 = ("InstallExecuteSequence", "", "end");
+	Assignment2 = ("AdminExecuteSequence", "", "end");
+End
+
 WindowsCustomAction gid_Customaction_Patch_SetFeatureState
 	Name = "SetFeatureState";
 	Typ = "65";
@@ -401,6 +430,16 @@ WindowsCustomAction gid_Customaction_MigrateInstallPath
       Assignment2 = ("InstallUISequence", "Not REMOVE=\"ALL\" And Not PATCH", "CostInitialize");
 End
 
+WindowsCustomAction gid_Customaction_CompleteInstallPath
+      Name = "CompleteInstallPath";
+      Typ = "321";
+      Source = "shlxtmsi.dll";
+      Target = "CompleteInstallPath";
+      Inbinarytable = 1;
+      Assignment1 = ("InstallExecuteSequence", "Not REMOVE=\"ALL\" And Not PATCH", "MigrateInstallPath");
+      Assignment2 = ("InstallUISequence", "Not REMOVE=\"ALL\" And Not PATCH", "MigrateInstallPath");
+End
+
 WindowsCustomAction gid_Customaction_CheckVersions
 	Name = "CheckVersions";
 	Typ = "321";
diff --git a/scp2/source/python/file_python.scp b/scp2/source/python/file_python.scp
index 5cd84d82b3e9..c99a93407e87 100644
--- a/scp2/source/python/file_python.scp
+++ b/scp2/source/python/file_python.scp
@@ -46,9 +46,7 @@ File gid_File_Lib_Pythonloader
   #else
     Name = "pythonloader.uno.dll";
   #endif
-    RegistryID = gid_Starregistry_Services_Rdb;
-    NativeServicesURLPrefix = "vnd.sun.star.expand:$OOO_BASE_DIR/program/";
-    Styles = (PACKED,UNO_COMPONENT);
+    Styles = (PACKED);
 End
 
 File gid_File_Py_Unohelper
@@ -110,8 +108,7 @@ File gid_File_Py_Pythonscript
     TXT_FILE_BODY;
     Dir = gid_Dir_Program;
     Name = "pythonscript.py";
-    RegistryID = gid_Starregistry_Services_Rdb;
-    Styles = (PACKED,UNO_COMPONENT);
+    Styles = (PACKED);
 End
  
 //Scripting Framework Python example scripts
diff --git a/scp2/source/python/module_python_mailmerge.scp b/scp2/source/python/module_python_mailmerge.scp
index 00a5c30a122c..15177971ba1a 100644
--- a/scp2/source/python/module_python_mailmerge.scp
+++ b/scp2/source/python/module_python_mailmerge.scp
@@ -31,6 +31,5 @@ File gid_File_Pymailmerge
     TXT_FILE_BODY;
     Dir = gid_Dir_Program;
     Name = "mailmerge.py";
-    RegistryID = gid_Starregistry_Services_Rdb;
-    Styles = (PACKED,UNO_COMPONENT);
+    Styles = (PACKED);
 End
diff --git a/scp2/source/templates/module_langpack_binfilter.sct b/scp2/source/templates/module_langpack_binfilter.sct
index 76f389049580..72c209228849 100644
--- a/scp2/source/templates/module_langpack_binfilter.sct
+++ b/scp2/source/templates/module_langpack_binfilter.sct
@@ -28,6 +28,7 @@
 Module gid_Module_Langpack_Binfilter_<LANGUAGE_>
     ParentID = gid_Module_Langpack_Root_<LANGUAGE_>;
     Sortkey = "900";
+    Default = NO;
     Language = "<LANGUAGE>";
     Assigns = gid_Module_Langpack_Binfilter_Template;
     Name = "gid_Module_Langpack_Binfilter_<LANGUAGE_>";
diff --git a/scp2/source/testtool/file_testtool.scp b/scp2/source/testtool/file_testtool.scp
index 86faf16faefc..3b30c157fa36 100644
--- a/scp2/source/testtool/file_testtool.scp
+++ b/scp2/source/testtool/file_testtool.scp
@@ -46,13 +46,6 @@ File gid_File_Bin_Testtool
     Name = "testtool.bin";
 End
 
-File gid_File_Hid_Testtool
-    BIN_FILE_BODY;
-    Dir = gid_Dir_Program;
-    Styles = (PACKED);
-    Name = "hid.lst";
-End
-
 File gid_File_Config_Testtool
     BIN_FILE_BODY;
     Dir = gid_Dir_Program;
diff --git a/scp2/source/writer/file_writer.scp b/scp2/source/writer/file_writer.scp
index 3d7c22b9e7a9..e3f6c532fc0c 100644
--- a/scp2/source/writer/file_writer.scp
+++ b/scp2/source/writer/file_writer.scp
@@ -27,19 +27,9 @@
 
 #include "macros.inc"
 
-STD_UNO_LIB_FILE( gid_File_Lib_Swd , swd)
+STD_LIB_FILE( gid_File_Lib_Swd , swd)
 
-File gid_File_Lib_Hwpreader
-    TXT_FILE_BODY;
-  #ifdef UNX
-    Name = STRING(CONCAT2(libhwp,UNXSUFFIX));
-  #else
-    Name = "hwp.dll";
-  #endif
-    Dir = SCP2_OOO_BIN_DIR;
-    Styles = (PACKED, UNO_COMPONENT);
-    RegistryID = gid_Starregistry_Services_Rdb;
-End
+SPECIAL_LIB_FILE(gid_File_Lib_Hwpreader, hwp)
 
 File gid_File_Exe_Swriter
     BIN_FILE_BODY;
diff --git a/scp2/source/writer/registryitem_writer.scp b/scp2/source/writer/registryitem_writer.scp
index 8c3f0a5b82ad..903a48af7d44 100644..100755
--- a/scp2/source/writer/registryitem_writer.scp
+++ b/scp2/source/writer/registryitem_writer.scp
@@ -1256,7 +1256,7 @@ RegistryItem gid_Regitem_OpenOffice_OTT_OpenWith_Writer
     ParentID = PREDEFINED_HKEY_CLASSES_ROOT;
     Subkey = ".ott\OpenWithProgIDs";
     ModuleID = gid_Module_Prg_Wrt_Bin;
-    Name = "opendocument.WriterDocument.1";
+    Name = "opendocument.WriterTemplate.1";
     Value = " ";
 End
 
@@ -1265,7 +1265,7 @@ RegistryItem gid_Regitem_OpenOffice_OTH_OpenWith_Writer
     ParentID = PREDEFINED_HKEY_CLASSES_ROOT;
     Subkey = ".oth\OpenWithProgIDs";
     ModuleID = gid_Module_Prg_Wrt_Bin;
-    Name = "opendocument.WriterDocument.1";
+    Name = "opendocument.WriterWebTemplate.1";
     Value = " ";
 End
 
@@ -1274,7 +1274,7 @@ RegistryItem gid_Regitem_OpenOffice_ODM_OpenWith_Writer
     ParentID = PREDEFINED_HKEY_CLASSES_ROOT;
     Subkey = ".odm\OpenWithProgIDs";
     ModuleID = gid_Module_Prg_Wrt_Bin;
-    Name = "opendocument.WriterDocument.1";
+    Name = "opendocument.WriterGlobalDocument.1";
     Value = " ";
 End
 
@@ -1365,7 +1365,7 @@ RegistryItem gid_Regitem_Software_Manufacturer_Productname_Productversion_Capabi
     Subkey = "Software\%MANUFACTURER\%PRODUCTNAME%PRODUCTADDON\%PRODUCTVERSION\Capabilities\FileAssociations";
     ModuleID = gid_Module_Prg_Wrt_Bin;
     Name = ".ott";
-    Value = "opendocument.WriterDocument.1";
+    Value = "opendocument.WriterTemplate.1";
     Styles = ();
 End
 
@@ -1374,7 +1374,7 @@ RegistryItem gid_Regitem_Software_Manufacturer_Productname_Productversion_Capabi
     Subkey = "Software\%MANUFACTURER\%PRODUCTNAME%PRODUCTADDON\%PRODUCTVERSION\Capabilities\FileAssociations";
     ModuleID = gid_Module_Prg_Wrt_Bin;
     Name = ".stw";
-    Value = "soffice.StarWriterDocument.6";
+    Value = "soffice.StarWriterTemplate.6";
     Styles = ();
 End
 
@@ -1446,7 +1446,7 @@ RegistryItem gid_Regitem_Software_Manufacturer_Productname_Productversion_Capabi
     Subkey = "Software\%MANUFACTURER\%PRODUCTNAME%PRODUCTADDON\%PRODUCTVERSION\Capabilities\FileAssociations";
     ModuleID = gid_Module_Prg_Wrt_Bin;
     Name = ".oth";
-    Value = "opendocument.WriterDocument.1";
+    Value = "opendocument.WriterWebTemplate.1";
     Styles = ();
 End
 
@@ -1455,7 +1455,7 @@ RegistryItem gid_Regitem_Software_Manufacturer_Productname_Productversion_Capabi
     Subkey = "Software\%MANUFACTURER\%PRODUCTNAME%PRODUCTADDON\%PRODUCTVERSION\Capabilities\FileAssociations";
     ModuleID = gid_Module_Prg_Wrt_Bin;
     Name = ".odm";
-    Value = "opendocument.WriterDocument.1";
+    Value = "opendocument.WriterGlobalDocument.1";
     Styles = ();
 End
 
diff --git a/set_soenv.in b/set_soenv.in
index e827c3cb3eef..ab8693ed85b1 100644
--- a/set_soenv.in
+++ b/set_soenv.in
@@ -86,7 +86,7 @@ my ( $oldPATH, $SRC_ROOT, $SO_HOME, $JAVA_HOME, $JDK, $JAVAFLAGS, $OOO_SHELL,
      $PATH, $SOLAREXTRAINC, $SOLAREXTRALIB, $SOLARLIB, 
      $SOLARINC, $LOCALINI, $FRAMEWORKSHOME, $COMEX, $PERL, 
      $COMP_ENV, $ILIB, $JAVAHOME, $PSDK_HOME, $DIRECTXSDK_LIB, $USE_NEW_SDK, $FRAME_HOME, 
-     $USE_DIRECTX5, $ATL_LIB, $ATL_INCLUDE, $MFC_LIB, $MFC_INCLUDE, $NO_HIDS, $TMPDIR,
+     $USE_DIRECTX5, $ATL_LIB, $ATL_INCLUDE, $MFC_LIB, $MFC_INCLUDE, $TMPDIR,
      $COMMON_BUILD_TOOLS, $WIN_GREP, $WIN_FIND, $WIN_LS,
      $WIN_GNUCOPY, $WIN_TOUCH, $STLPORT4, $MOZILLA_VERSION, $MOZILLA_TOOLKIT, $PREBUILD_MOZAB, $MOZILLABUILD,
 	 $PROEXT, $TARFILE_LOCATION,
@@ -1384,7 +1384,7 @@ if ($platform =~ m/linux|freebsd|netbsd/)
 # This simply adds an include path, so even cases that break the FHS work
 $SOLARINC            .= $STLPORT_inc_stlport;
 }
-if ($platform =~ m/solaris/ && $CC !=~ "gcc")
+if ($platform =~ m/solaris/ && ! $CC =~ "gcc")
 {
 $SOLARINC            .= '/SC5 ';
 }
@@ -1619,6 +1619,7 @@ ToFile( "GTK_CFLAGS",        "@GTK_CFLAGS@",       "e" );
 ToFile( "GTK_LIBS",          "@GTK_LIBS@",         "e" );
 ToFile( "ENABLE_SYSTRAY_GTK", "@ENABLE_SYSTRAY_GTK@", "e" );
 ToFile( "ENABLE_STATIC_GTK", "@ENABLE_STATIC_GTK@", "e" );
+ToFile( "ENABLE_GSTREAMER",  "@ENABLE_GSTREAMER@", "e" );
 ToFile( "ENABLE_CAIRO",      "@ENABLE_CAIRO@",     "e" );
 ToFile( "ENABLE_OPENGL",     "@ENABLE_OPENGL@",    "e" );
 ToFile( "ENABLE_PDFIMPORT",  "@ENABLE_PDFIMPORT@", "e" );
@@ -1788,7 +1789,6 @@ ToFile( "ENABLE_FONTCONFIG", "@ENABLE_FONTCONFIG@", "e" );
 ToFile( "ENABLE_DIRECTX",    "@ENABLE_DIRECTX@",    "e" );
 ToFile( "ENABLE_LAYOUT",     "@ENABLE_LAYOUT@",     "e" );
 ToFile( "ENABLE_PCH",        "@ENABLE_PCH@",       "e" );
-ToFile( "NO_HIDS",           "@NO_HIDS@",       "e" );
 ToFile( "ENABLE_GRAPHITE",   "@ENABLE_GRAPHITE@",   "e");
 ToFile( "SYSTEM_GRAPHITE",   "@SYSTEM_GRAPHITE@",   "e");
 ToFile( "GRAPHITE_LIBS",     "@GRAPHITE_LIBS@",     "e");
@@ -1850,6 +1850,8 @@ ToFile( "FREETYPE_LIBS",     "@FREETYPE_LIBS@",    "e" );
 ToFile( "SYSTEM_POPPLER",    "@SYSTEM_POPPLER@",   "e" );
 ToFile( "POPPLER_CFLAGS",    "@POPPLER_CFLAGS@",   "e" );
 ToFile( "POPPLER_LIBS",      "@POPPLER_LIBS@",     "e" );
+ToFile( "GSTREAMER_CFLAGS",  "@GSTREAMER_CFLAGS@", "e" );
+ToFile( "GSTREAMER_LIBS",    "@GSTREAMER_LIBS@",   "e" );
 ToFile( "SYSTEM_CAIRO",      "@SYSTEM_CAIRO@",     "e" );
 ToFile( "BUILD_PIXMAN",      "@BUILD_PIXMAN@",     "e" );
 ToFile( "CAIRO_CFLAGS",      "@CAIRO_CFLAGS@",     "e" );
@@ -1909,6 +1911,7 @@ ToFile( "ENABLE_AGG",        "@ENABLE_AGG@",       "e" );
 ToFile( "SYSTEM_AGG",	     "@SYSTEM_AGG@",       "e" );
 ToFile( "AGG_VERSION",	     "@AGG_VERSION@",      "e" );
 ToFile( "BUILD_DMAKE",       "@BUILD_DMAKE@",      "e" );
+ToFile( "BUILD_STAX",        "@BUILD_STAX@",       "e" );
 ToFile( "BUILD_UNOWINREG",   "@BUILD_UNOWINREG@",  "e" );
 ToFile( "USE_XINERAMA",      "@USE_XINERAMA@",     "e" );
 ToFile( "XINERAMA_LINK",     "@XINERAMA_LINK@",    "e" );
@@ -1926,6 +1929,8 @@ ToFile( "HYPHEN_LIB",        "@HYPHEN_LIB@",       "e" );
 ToFile( "SYSTEM_MYTHES",     "@SYSTEM_MYTHES@",    "e" );
 ToFile( "MYTHES_CFLAGS",     "@MYTHES_CFLAGS@",    "e" );
 ToFile( "MYTHES_LIBS",       "@MYTHES_LIBS@",      "e" );
+ToFile( "SYSTEM_LIBTEXTCAT", "@SYSTEM_LIBTEXTCAT@","e" );
+ToFile( "SYSTEM_LIBTEXTCAT_DATA","@SYSTEM_LIBTEXTCAT_DATA@","e" );
 ToFile( "PAM",               "@PAM@",              "e" );
 ToFile( "NEW_SHADOW_API",    "@NEW_SHADOW_API@",   "e" );
 ToFile( "PAM_LINK",          "@PAM_LINK@",         "e" );
diff --git a/soldep/bootstrp/prj.cxx b/soldep/bootstrp/prj.cxx
index 435580119a76..746fa091e4b6 100644
--- a/soldep/bootstrp/prj.cxx
+++ b/soldep/bootstrp/prj.cxx
@@ -41,31 +41,21 @@
 
 //#define TEST  1
 
-#ifdef MAC
-#define putenv(x)
-#endif
-
-#if defined(DOS) || defined(WNT) || defined(OS2)
+#if defined(WNT) || defined(OS2)
 #define LIST_DELIMETER ';'
 #else
 #ifdef UNX
 #define LIST_DELIMETER ':'
 #else
-#ifdef MAC
-#define LIST_DELIMETER ','
-#endif
 #endif
 #endif
 
-#if defined(DOS) || defined(WNT) || defined(OS2) || defined(WIN)
+#if defined(WNT) || defined(OS2)
 #define PATH_DELIMETER '\\'
 #else
 #ifdef UNX
 #define PATH_DELIMETER '/'
 #else
-#ifdef MAC
-#define PATH_DELIMETER ':'
-#endif
 #endif
 #endif
 
@@ -142,14 +132,6 @@ ByteString  SimpleConfig::GetNextLine()
     ByteString aEraseString;
     for ( USHORT i = 0; i<= nLength; i++)
     {
-#ifdef MAC
-        if ( aTmpStr.GetChar( i ) == '"')
-        {
-            if ( bFound) bFound = FALSE;
-            else bFound = TRUE;
-            aTmpStr.SetChar( i, '\t' );
-        }
-#endif
         if ( aTmpStr.GetChar( i ) == 0x20  && !bFound )
             aTmpStr.SetChar( i, 0x09 );
     }
diff --git a/soldep/inc/soldep/prj.hxx b/soldep/inc/soldep/prj.hxx
index 6ed271b27a87..7a75c5a1c310 100644
--- a/soldep/inc/soldep/prj.hxx
+++ b/soldep/inc/soldep/prj.hxx
@@ -380,7 +380,7 @@ private:
     ByteString      aStarName; // no idee what this should be
 
 protected:
-    NAMESPACE_VOS( OMutex ) aMutex;
+    vos:: OMutex  aMutex;
 
     USHORT          nStarMode;
     SolarFileList   aFileList;
diff --git a/soldep/source/makefile.mk b/soldep/source/makefile.mk
index 3c5ea711b0fa..25cc78adeeba 100644
--- a/soldep/source/makefile.mk
+++ b/soldep/source/makefile.mk
@@ -125,16 +125,6 @@ APP1OBJS= \
 
 .INCLUDE :	target.mk
 
-ALLTAR : $(BIN)$/applicat.rdb
-
-$(BIN)$/applicat.rdb : makefile.mk $(UNOUCRRDB)
-    rm -f $@
-    $(GNUCOPY) $(UNOUCRRDB) $@
-     cd $(BIN) && \
-    $(REGCOMP) -register -r applicat.rdb \
-             -c i18nsearch.uno$(DLLPOST) \
-             -c i18npool.uno$(DLLPOST)
-
 $(MISC)$/$(SHL1TARGET).flt: makefile.mk
     @echo ------------------------------
     @echo Making: $@
diff --git a/soldep/source/soldlg.src b/soldep/source/soldlg.src
index 0f5035fcee6e..723716a435e5 100644
--- a/soldep/source/soldlg.src
+++ b/soldep/source/soldlg.src
@@ -32,6 +32,7 @@
 // Dialogs
 ModalDialog RID_SD_DIALOG_NEWPROJECT
 {
+    HelpID = "soldep:ModalDialog:RID_SD_DIALOG_NEWPROJECT";
     OutputSize = TRUE;
     Text = "New Project";
     PosSize = MAP_SYSFONT(18,18,142,142);
@@ -54,6 +55,7 @@ ModalDialog RID_SD_DIALOG_NEWPROJECT
         Text = "Project Name";
     };
     Edit EDIT_PRJNAME {
+        HelpID = "soldep:Edit:RID_SD_DIALOG_NEWPROJECT:EDIT_PRJNAME";
         Border = TRUE;
         PosSize = MAP_SYSFONT(5,20,132,10);
     };
@@ -62,6 +64,7 @@ ModalDialog RID_SD_DIALOG_NEWPROJECT
         Text = "Project Short Name";
     };
     Edit EDIT_PRJSHORT {
+        HelpID = "soldep:Edit:RID_SD_DIALOG_NEWPROJECT:EDIT_PRJSHORT";
         Border = TRUE;
         PosSize = MAP_SYSFONT(5,40,132,10);
     };
@@ -70,6 +73,7 @@ ModalDialog RID_SD_DIALOG_NEWPROJECT
         Text = "Project Depends on";
     };
     Edit EDIT_PRJDEPS {
+        HelpID = "soldep:Edit:RID_SD_DIALOG_NEWPROJECT:EDIT_PRJDEPS";
         Border = TRUE;
         PosSize = MAP_SYSFONT(5,60,132,10);
     };
@@ -77,6 +81,7 @@ ModalDialog RID_SD_DIALOG_NEWPROJECT
 
 ModalDialog RID_SD_DIALOG_NEWDIRECTORY
 {
+    HelpID = "soldep:ModalDialog:RID_SD_DIALOG_NEWDIRECTORY";
     OutputSize = TRUE;
     Text = "New Directory";
     PosSize = MAP_SYSFONT(18,18,142,142);
@@ -99,6 +104,7 @@ ModalDialog RID_SD_DIALOG_NEWDIRECTORY
         Text = "Directory Name ( with projectname )";
     };
     Edit EDIT_DIRNAME {
+        HelpID = "soldep:Edit:RID_SD_DIALOG_NEWDIRECTORY:EDIT_DIRNAME";
         Border = TRUE;
         PosSize = MAP_SYSFONT(5,20,132,10);
     };
@@ -107,6 +113,7 @@ ModalDialog RID_SD_DIALOG_NEWDIRECTORY
         Text = "Directory Flag";
     };
     Edit EDIT_DIRFLAG {
+        HelpID = "soldep:Edit:RID_SD_DIALOG_NEWDIRECTORY:EDIT_DIRFLAG";
         Border = TRUE;
         PosSize = MAP_SYSFONT(5,40,132,10);
     };
@@ -115,6 +122,7 @@ ModalDialog RID_SD_DIALOG_NEWDIRECTORY
         Text = "Directory Depends on";
     };
     Edit EDIT_DIRDEPS {
+        HelpID = "soldep:Edit:RID_SD_DIALOG_NEWDIRECTORY:EDIT_DIRDEPS";
         Border = TRUE;
         PosSize = MAP_SYSFONT(5,60,132,10);
     };
@@ -123,6 +131,7 @@ ModalDialog RID_SD_DIALOG_NEWDIRECTORY
         Text = "What To Do";
     };
     Edit EDIT_DIRACTION {
+        HelpID = "soldep:Edit:RID_SD_DIALOG_NEWDIRECTORY:EDIT_DIRACTION";
         Border = TRUE;
         PosSize = MAP_SYSFONT(5,80,132,10);
     };
@@ -131,6 +140,7 @@ ModalDialog RID_SD_DIALOG_NEWDIRECTORY
         Text = "Which Environments";
     };
     Edit EDIT_DIRENV {
+        HelpID = "soldep:Edit:RID_SD_DIALOG_NEWDIRECTORY:EDIT_DIRENV";
         Border = TRUE;
         PosSize = MAP_SYSFONT(5,100,132,10);
     };
@@ -139,6 +149,7 @@ ModalDialog RID_SD_DIALOG_NEWDIRECTORY
 
 ModalDialog RID_SD_DIALOG_HELP
 {
+    HelpID = "soldep:ModalDialog:RID_SD_DIALOG_HELP";
     OutputSize = TRUE;
     Text = "Help";
     PosSize = MAP_SYSFONT(18,18,242,242);
@@ -153,12 +164,14 @@ ModalDialog RID_SD_DIALOG_HELP
         DefButton = TRUE;
     };
     MultiLineEdit EDIT_HELP {
+        HelpID = "soldep:MultiLineEdit:RID_SD_DIALOG_HELP:EDIT_HELP";
         Border = TRUE;
         PosSize = MAP_SYSFONT(5,5,232,213);
     };
 };
 
 ModalDialog DLG_VERSIONSELECT {
+    HelpID = "soldep:ModalDialog:DLG_VERSIONSELECT";
     OutputSize = TRUE;
     Pos = MAP_APPFONT( 92, 40 );
     Size = MAP_APPFONT( 161, 98 );
@@ -166,6 +179,7 @@ ModalDialog DLG_VERSIONSELECT {
     Moveable = TRUE;
     Closeable = TRUE;
     ListBox DLG_VERSIONSELECT_LISTBOX {
+        HelpID = "soldep:ListBox:DLG_VERSIONSELECT:DLG_VERSIONSELECT_LISTBOX";
             Border = TRUE;
             Pos = MAP_APPFONT( 8, 16 );
             Size = MAP_APPFONT( 96, 72 );
@@ -193,6 +207,7 @@ ModalDialog DLG_VERSIONSELECT {
             Text = "Minor";
         };
     Edit    DLG_MINORSELECT_EDIT {
+        HelpID = "soldep:Edit:DLG_VERSIONSELECT:DLG_MINORSELECT_EDIT";
             Border = TRUE;
             Pos = MAP_APPFONT( 115, 16 );
             Size = MAP_APPFONT( 36, 12 );
@@ -201,6 +216,7 @@ ModalDialog DLG_VERSIONSELECT {
 };
 
 ModelessDialog DLG_AUTOARRANGE {
+    HelpID = "soldep:ModelessDialog:DLG_AUTOARRANGE";
     OutputSize = TRUE;
     Pos = MAP_APPFONT( 40, 12 );
     Size = MAP_APPFONT( 225, 82 );
@@ -224,6 +240,7 @@ ModelessDialog DLG_AUTOARRANGE {
 };
 
 ModalDialog DLG_FIND_PROJECT {
+    HelpID = "soldep:ModalDialog:DLG_FIND_PROJECT";
     OutputSize = TRUE;
     Pos = MAP_APPFONT( 40, 12 );
     Size = MAP_APPFONT( 155, 55 );
@@ -232,6 +249,7 @@ ModalDialog DLG_FIND_PROJECT {
     SVLook          = TRUE;
     ComboBox DLG_FIND_PROJECT_COMBOBOX
     {
+        HelpID = "soldep:ComboBox:DLG_FIND_PROJECT:DLG_FIND_PROJECT_COMBOBOX";
         Pos = MAP_APPFONT ( 5 , 18 ) ;
         Size = MAP_APPFONT ( 100 , 90 ) ;
         TabStop = TRUE ;
@@ -272,7 +290,6 @@ ToolBox TID_SOLDEP_MAIN
                         Identifier      = TID_SOLDEP_OPEN;
                         Type            = TOOLBOXITEM_BUTTON;
                         Text            = "Load";
-                        HelpId          = TID_SOLDEP_OPEN;
                         HelpText        = "Load";
                         Checkable               = TRUE;
                         ItemBitmap      = Bitmap
@@ -285,7 +302,6 @@ ToolBox TID_SOLDEP_MAIN
                         Identifier      = TID_SOLDEP_SAVE;
                         Type            = TOOLBOXITEM_BUTTON;
                         Text            = "Save";
-                        HelpId          = TID_SOLDEP_SAVE;
                         HelpText        = "Save";
                         Checkable               = TRUE;
                         ItemBitmap      = Bitmap
@@ -302,7 +318,6 @@ ToolBox TID_SOLDEP_MAIN
                         Identifier      = TID_SOLDEP_SELECT_WORKSPACE;
                         Type            = TOOLBOXITEM_BUTTON;
                         Text            = "Select Workspace";
-                        HelpId          = TID_SOLDEP_HIDE_INDEPENDEND;
                         HelpText        = "Select Workspace";
                         Checkable               = TRUE;
                         ItemBitmap      = Bitmap
@@ -315,7 +330,6 @@ ToolBox TID_SOLDEP_MAIN
                         Identifier      = TID_SOLDEP_FIND;
                         Type            = TOOLBOXITEM_BUTTON;
                         Text            = "Find Module";
-                        HelpId          = TID_SOLDEP_FIND;
                         HelpText        = "Find Module";
                         Checkable               = TRUE;
                         ItemBitmap      = Bitmap
@@ -328,7 +342,6 @@ ToolBox TID_SOLDEP_MAIN
                         Identifier      = TID_SOLDEP_BACK;
                         Type            = TOOLBOXITEM_BUTTON;
                         Text            = "Back to Overview";
-                        HelpId          = TID_SOLDEP_BACK;
                         HelpText        = "Back to Overview";
                         Checkable               = TRUE;
                         ItemBitmap      = Bitmap
@@ -341,7 +354,6 @@ ToolBox TID_SOLDEP_MAIN
                         Identifier      = TID_SOLDEP_HIDE_INDEPENDEND;
                         Type            = TOOLBOXITEM_BUTTON;
                         Text            = "Hide Independend Modules";
-                        HelpId          = TID_SOLDEP_HIDE_INDEPENDEND;
                         HelpText        = "Hide Independend Modules";
                         Checkable               = TRUE;
                         ItemBitmap      = Bitmap
diff --git a/solenv/bin/build.pl b/solenv/bin/build.pl
index 66afeec6e2c7..bff6e870f2e9 100755..100644
--- a/solenv/bin/build.pl
+++ b/solenv/bin/build.pl
@@ -45,6 +45,7 @@
 
     use lib ("$ENV{SOLARENV}/bin/modules");
     use SourceConfig;
+    use RepositoryHelper;
 
     my $in_so_env = 0;
     if (defined $ENV{COMMON_ENV_TOOLS}) {
@@ -139,6 +140,8 @@
     $html = '';
     @ignored_errors = ();
     %incompatibles = ();
+    %skip_modules = ();
+    %exclude_branches = ();
     $only_platform = ''; # the only platform to prepare
     $only_common = ''; # the only common output tree to delete when preparing
     %build_modes = ();
@@ -167,8 +170,8 @@
     $html_last_updated = 0;
     %jobs_hash = ();
     $html_path = undef;
-    $html_file = CorrectPath($ENV{SOLARSRC} . '/' . $ENV{INPATH}. '.build.html');
     $build_finished = 0;
+    $html_file = '';
     %had_error = (); # hack for misteriuos windows problems - try run dmake 2 times if first time there was an error
     $mkout = CorrectPath("$ENV{SOLARENV}/bin/mkout.pl");
     %weights_hash = (); # hash contains info about how many modules are dependent from one module
@@ -209,7 +212,6 @@
 
     get_options();
 
-    $html_file = CorrectPath($html_path . '/' . $ENV{INPATH}. '.build.html') if (defined $html_path);
 #    my $temp_html_file = CorrectPath($tmp_dir. '/' . $ENV{INPATH}. '.build.html');
     get_build_modes();
     %deliver_env = ();
@@ -225,12 +227,26 @@
         $deliver_env{'OUTPATH'}++;
         $deliver_env{'L10N_framework'}++;
     };
+    $StandDir = get_stand_dir();   # This also sets $initial_module
+    $source_config = SourceConfig -> new($StandDir);
+
+    if ($html) {
+        if (defined $html_path) {
+            $html_file = CorrectPath($html_path . '/' . $ENV{INPATH}. '.build.html');
+        } else {
+            my $log_directory = Cwd::realpath(CorrectPath($StandDir . '/..')) . '/log';
+            if ((!-d $log_directory) && (!mkdir($log_directory))) {
+                print_error("Cannot create $log_directory for writing html file\n");
+            };
+            $html_file = $log_directory . '/' . $ENV{INPATH}. '.build.html';
+            print "\nPath to html status page: $html_file\n";
+        };
+    };
 
     if ($generate_config && ($clear_config || (scalar keys %remove_from_config)||(scalar keys %add_to_config))) {
         generate_config_file();
         exit 0;
     }
-    $StandDir = get_stand_dir();   # This also sets $initial_module
     get_module_and_buildlist_paths();
     provide_consistency() if (defined $ENV{CWS_WORK_STAMP} && defined($ENV{COMMON_ENV_TOOLS}));
 
@@ -342,7 +358,6 @@ sub rename_file {
 };
 
 sub generate_config_file {
-    my $source_config = SourceConfig->new();
     $source_config->add_active_modules([keys %add_to_config], 1) if (scalar %add_to_config);
     $source_config->remove_activated_modules([keys %remove_from_config], 1) if (scalar %remove_from_config);
     $source_config->remove_all_activated_modules() if ($clear_config);
@@ -556,23 +571,36 @@ sub get_build_list_path {
 # Get dependencies hash of the current and all parent projects
 #
 sub get_parent_deps {
-    my (%parents_deps_hash, $module, $parent);
     my $prj_dir = shift;
     my $deps_hash = shift;
-    my @unresolved_parents = get_parents_array($prj_dir);
-    $parents_deps_hash{$_}++ foreach (@unresolved_parents);
-    $$deps_hash{$prj_dir} = \%parents_deps_hash;
-    while ($module = pop(@unresolved_parents)) {
+    my @unresolved_parents = ($prj_dir);
+    my %skipped_branches = ();
+    while (my $module = pop(@unresolved_parents)) {
+        next if (defined $$deps_hash{$module});
         my %parents_deps_hash = ();
-        $parents_deps_hash{$_}++ foreach (get_parents_array($module));
+        foreach (get_parents_array($module)) {
+            if (defined $exclude_branches{$_}) {
+                $skipped_branches{$_}++;
+                next;
+            };
+            $parents_deps_hash{$_}++;
+        }
         $$deps_hash{$module} = \%parents_deps_hash;
         foreach $Parent (keys %parents_deps_hash) {
-            if (!defined($$deps_hash{$Parent})) {
+            if (!defined($$deps_hash{$Parent}) && (!defined $exclude_branches{$module})) {
                 push (@unresolved_parents, $Parent);
             };
         };
     };
     check_deps_hash($deps_hash);
+    foreach (keys %skipped_branches) {
+        print $echo . "Skipping module's $_ branch\n";
+        delete $exclude_branches{$_};
+    };
+    my @missing_branches = keys %exclude_branches;
+    if (scalar @missing_branches) {
+        print_error("For $prj_dir branche(s): \"@missing_branches\" not found\n");
+    };
 };
 
 sub store_weights {
@@ -605,18 +633,18 @@ sub expand_dependencies {
 };
 
 #
-# This procedure fills out the %reversed_dependencies hash,
-# the hash contaninig the info about modules "waiting" for the module
+# This procedure fills the second hash with reversed dependencies,
+# ie, with info about modules "waiting" for the module
 #
 sub reverse_dependensies {
-    my $deps_hash = shift;
+    my ($deps_hash, $reversed) = @_;
     foreach my $module (keys %$deps_hash) {
         foreach (keys %{$$deps_hash{$module}}) {
-            if (defined $reversed_dependencies{$_}) {
-                ${$reversed_dependencies{$_}}{$module}++
+            if (defined $$reversed{$_}) {
+                ${$$reversed{$_}}{$module}++
             } else {
                 my %single_module_dep_hash = ($module => 1);
-                $reversed_dependencies{$_} = \%single_module_dep_hash;
+                $$reversed{$_} = \%single_module_dep_hash;
             };
         };
     };
@@ -635,10 +663,16 @@ sub build_all {
         };
         modules_classify(keys %global_deps_hash);
         expand_dependencies (\%global_deps_hash);
-#        prepare_build_from(\%global_deps_hash) if (scalar keys %incompatibles);
-        prepare_incompatible_build(\%global_deps_hash) if ($incompatible);
+        prepare_incompatible_build(\%global_deps_hash) if ($incompatible && (!$build_from_with_branches));
+        if ($build_from_with_branches) {
+            my %reversed_full_deps_hash = ();
+            reverse_dependensies(\%global_deps_hash, \%reversed_full_deps_hash);
+            prepare_build_from_with_branches(\%global_deps_hash, \%reversed_full_deps_hash);
+        }
         if ($build_all_cont || $build_since) {
+            store_weights(\%global_deps_hash);
             prepare_build_all_cont(\%global_deps_hash);
+            %weights_hash = ();
         };
         if ($generate_config) {
             %add_to_config = %global_deps_hash;
@@ -653,13 +687,13 @@ sub build_all {
                 print_error("There are modules:\n@missing_modules\n\nthat should be built, but they are not activated. Please, verify your $source_config_file.\n");
             };
         };
-        foreach my $module (%dead_parents) {
+        foreach my $module (keys %dead_parents, keys %skip_modules) {
             remove_from_dependencies($module, \%global_deps_hash);
             delete ($global_deps_hash{$module}) if (defined $global_deps_hash{$module});
         };
         store_weights(\%global_deps_hash);
         backup_deps_hash(\%global_deps_hash, \%global_deps_hash_backup);
-        reverse_dependensies(\%global_deps_hash_backup);
+        reverse_dependensies(\%global_deps_hash_backup, \%reversed_dependencies);
         $modules_number = scalar keys %global_deps_hash;
         initialize_html_info($_) foreach (keys %global_deps_hash);
         if ($processes_to_run) {
@@ -1100,6 +1134,7 @@ sub get_commands {
     while ($arg = pop(@dmake_args)) {
         $dmake .= ' '.$arg;
     };
+    $dmake .= ' verbose=true' if ($html);
 };
 
 #
@@ -1110,34 +1145,44 @@ sub get_stand_dir {
         $ENV{mk_tmp} = '';
         die "No environment set\n";
     };
-    my $StandDir;
-    if ( defined $ENV{PWD} ) {
-        $StandDir = $ENV{PWD};
-    } elsif (defined $ENV{_cwd}) {
-        $StandDir = $ENV{_cwd};
-    } else {
-        $StandDir = cwd();
-    };
-    my $previous_dir = '';
-    do {
-        foreach (@possible_build_lists) {# ('build.lst', 'build.xlist');
-            if (-e $StandDir . '/prj/'.$_) {
-                $initial_module = File::Basename::basename($StandDir);
-                $build_list_paths{$initial_module} =$StandDir . '/prj/'.$_;
-                $StandDir = File::Basename::dirname($StandDir);
-                $module_paths{$initial_module} = $StandDir . "/$initial_module";
+    my $repository_helper = RepositoryHelper->new();
+    my $StandDir = $repository_helper->get_repository_root();
+    my $initial_dir = $repository_helper->get_initial_directory();
+    if ($StandDir eq $initial_dir) {
+        print_error('Found no project to build');
+    };
+    $initial_module = substr($initial_dir, length($StandDir) + 1);
+    if ($initial_module =~ /(\\|\/)/) {
+        $initial_module = $`;
+    };
+    $module_paths{$initial_module} = $StandDir . "/$initial_module";
+#    $build_list_paths{$initial_module} =$StandDir . '/prj/'.$_;
+#    if ( defined $ENV{PWD} ) {
+#       $StandDir = $ENV{PWD};
+#   } elsif (defined $ENV{_cwd}) {
+#       $StandDir = $ENV{_cwd};
+#   } else {
+#       $StandDir = cwd();
+#    };
+#    my $previous_dir = '';
+#    do {
+#        foreach (@possible_build_lists) {# ('build.lst', 'build.xlist');
+#            if (-e $StandDir . '/prj/'.$_) {
+#                $initial_module = File::Basename::basename($StandDir);
+#                $build_list_paths{$initial_module} =$StandDir . '/prj/'.$_;
+#                $StandDir = File::Basename::dirname($StandDir);
+#                $module_paths{$initial_module} = $StandDir . "/$initial_module";
                 return $StandDir;
-            } elsif ($StandDir eq $previous_dir) {
-                $ENV{mk_tmp} = '';
-                print_error('Found no project to build');
-            };
-        };
-        $previous_dir = $StandDir;
-        $StandDir = File::Basename::dirname(Cwd::realpath($StandDir));
-        print_error('Found no project to build') if (!$StandDir);
-    }
-#    while (chdir '..');
-    while (chdir "$StandDir");
+#            } elsif ($StandDir eq $previous_dir) {
+#                $ENV{mk_tmp} = '';
+#                print_error('Found no project to build');
+#            };
+#        };
+#        $previous_dir = $StandDir;
+#        $StandDir = File::Basename::dirname(Cwd::realpath($StandDir));
+#        print_error('Found no project to build') if (!$StandDir);
+#    }
+#    while (chdir "$StandDir");
 };
 
 #
@@ -1236,7 +1281,7 @@ sub check_deps_hash {
                     $jobs_hash{$key} = {    SHORT_NAME => $string,
                                             BUILD_NUMBER => $build_number,
                                             STATUS => 'waiting',
-                                            LOG_PATH => $module . "/$ENV{INPATH}/misc/logs/$log_name",
+                                            LOG_PATH => '../' . $source_config->get_module_repository($module) . "/$module/$ENV{INPATH}/misc/logs/$log_name",
                                             LONG_LOG_PATH => CorrectPath($module_paths{$module} . "/$ENV{INPATH}/misc/logs/$log_name"),
                                             START_TIME => 0,
                                             FINISH_TIME => 0,
@@ -1279,7 +1324,10 @@ sub find_indep_prj {
     $Dependencies = shift;
     if (scalar keys %$Dependencies) {
         foreach my $job (keys %$Dependencies) {
-            push(@candidates, $job) if (!scalar keys %{$$Dependencies{$job}});
+            if (!scalar keys %{$$Dependencies{$job}}) {
+                push(@candidates, $job);
+                last if (!$processes_to_run);
+            };
         };
         if (scalar @candidates) {
             $all_dependent = 0;
@@ -1392,7 +1440,7 @@ sub print_error {
 
 sub usage {
     print STDERR "\nbuild\n";
-    print STDERR "Syntax:    build    [--all|-a[:prj_name]]|[--from|-f prj_name1[:prj_name2] [prj_name3 [...]]]|[--since|-c prj_name] [--with_branches|-b]|[--prepare|-p][:platform] [--deliver|-d [--dlv_switch deliver_switch]]] [-P processes|--server [--setenvstring \"string\"] [--client_timeout MIN] [--port port1[:port2:...:portN]]] [--show|-s] [--help|-h] [--file|-F] [--ignore|-i] [--version|-V] [--mode|-m OOo[,SO[,EXT]] [--html [--html_path html_file_path] [--dontgraboutput]] [--pre_job=pre_job_sring] [--job=job_string|-j] [--post_job=post_job_sring] [--stoponerror] [--genconf [--removeall|--clear|--remove|--add [module1,module2[,...,moduleN]]]] [--interactive]\n";
+    print STDERR "Syntax:    build    [--all|-a[:prj_name]]|[--from|-f prj_name1[:prj_name2] [prj_name3 [...]]]|[--since|-c prj_name] [--with_branches prj_name1[:prj_name2] [--skip prj_name1[:prj_name2] [prj_name3 [...]] [prj_name3 [...]|-b]|[--prepare|-p][:platform] [--deliver|-d [--dlv_switch deliver_switch]]] [-P processes|--server [--setenvstring \"string\"] [--client_timeout MIN] [--port port1[:port2:...:portN]]] [--show|-s] [--help|-h] [--file|-F] [--ignore|-i] [--version|-V] [--mode|-m OOo[,SO[,EXT]] [--html [--html_path html_file_path] [--dontgraboutput]] [--pre_job=pre_job_sring] [--job=job_string|-j] [--post_job=post_job_sring] [--stoponerror] [--genconf [--removeall|--clear|--remove|--add [module1,module2[,...,moduleN]]]] [--exclude_branch_from prj_name1[:prj_name2] [prj_name3 [...]]] [--interactive]\n";
     print STDERR "Example1:    build --from sfx2\n";
     print STDERR "                     - build all projects dependent from sfx2, starting with sfx2, finishing with the current module\n";
     print STDERR "Example2:    build --all:sfx2\n";
@@ -1405,9 +1453,11 @@ sub usage {
     print STDERR "\nSwitches:\n";
     print STDERR "        --all        - build all projects from very beginning till current one\n";
     print STDERR "        --from       - build all projects dependent from the specified (including it) till current one\n";
+    print STDERR "        --exclude_branch_from    - exclude module(s) and its branch from the build\n";
     print STDERR "        --mode OOo   - build only projects needed for OpenOffice.org\n";
     print STDERR "        --prepare    - clear all projects for incompatible build from prj_name till current one [for platform] (cws version)\n";
-    print STDERR "        --with_branches- build all projects in neighbour branches and current branch starting from actual project\n";
+    print STDERR "        --with_branches- the same as \"--from\" but with build all projects in neighbour branches\n";
+    print STDERR "        --skip       - do not build certain module(s)\n";
     print STDERR "        --since      - build all projects beginning from the specified till current one (the same as \"--all:prj_name\", but skipping prj_name)\n";
     print STDERR "        --checkmodules      - check if all required parent projects are availlable\n";
     print STDERR "        --show       - show what is going to be built\n";
@@ -1462,19 +1512,25 @@ sub get_options {
         $arg =~ /^--dlv_switch$/    and $dlv_switch = shift @ARGV    and next;
         $arg =~ /^--file$/        and $cmd_file = shift @ARGV             and next;
         $arg =~ /^-F$/        and $cmd_file = shift @ARGV             and next;
+        $arg =~ /^--skip$/    and get_modules_passed(\%skip_modules)      and next;
 
-        $arg =~ /^--with_branches$/        and $build_all_parents = 1
-                                and $build_from_with_branches = shift @ARGV         and next;
-        $arg =~ /^-b$/        and $build_all_parents = 1
-                                and $build_from_with_branches = shift @ARGV         and next;
-
+        if ($arg =~ /^--with_branches$/ || $arg =~ /^-b$/) {
+                                    $build_from_with_branches = 1;
+                                    $build_all_parents = 1;
+                                    get_modules_passed(\%incompatibles);
+                                    next;
+        };
         $arg =~ /^--all:(\S+)$/ and $build_all_parents = 1
                                 and $build_all_cont = $1            and next;
         $arg =~ /^-a:(\S+)$/ and $build_all_parents = 1
                                 and $build_all_cont = $1            and next;
         if ($arg =~ /^--from$/ || $arg =~ /^-f$/) {
                                     $build_all_parents = 1;
-                                    get_incomp_projects();
+                                    get_modules_passed(\%incompatibles);
+                                    next;
+        };
+        if ($arg =~ /^--exclude_branch_from$/) {
+                                    get_modules_passed(\%exclude_branches);
                                     next;
         };
         $arg =~ /^--prepare$/    and $prepare = 1 and next;
@@ -1527,8 +1583,12 @@ sub get_options {
         print_error("\"--html_path\" switch is used only with \"--html\"") if ($html_path);
         print_error("\"--dontgraboutput\" switch is used only with \"--html\"") if ($dont_grab_output);
     };
+    if ((scalar keys %exclude_branches) && !$build_all_parents) {
+        print_error("\"--exclude_branch_from\" is not applicable for one module builds!!");
+    };
     $grab_output = 0 if ($dont_grab_output);
     print_error('Switches --with_branches and --all collision') if ($build_from_with_branches && $build_all_cont);
+    print_error('Switch --skip is for building multiple modules only!!') if ((scalar keys %skip_modules) && (!$build_all_parents));
 #    print_error('Please prepare the workspace on one of UNIX platforms') if ($prepare && ($ENV{GUI} ne 'UNX'));
     print_error('Switches --with_branches and --since collision') if ($build_from_with_branches && $build_since);
     if ($show) {
@@ -1593,7 +1653,6 @@ sub get_options {
 
 sub get_module_and_buildlist_paths {
     if ($build_all_parents || $checkparents) {
-        my $source_config = SourceConfig -> new($StandDir);
         $source_config_file = $source_config->get_config_file_path();
         $active_modules{$_}++ foreach ($source_config->get_active_modules());
         my %active_modules_copy = %active_modules;
@@ -1652,7 +1711,13 @@ sub cancel_build {
             $message_part .= "--from @broken_modules_names\n";
         };
     } else {
-        $message_part .= "--all:@broken_modules_names\n";
+        if ($processes_to_run) {
+            $message_part .= "--from ";
+        } else {
+            $message_part .= "--all:";
+        };
+        $message_part .= "@broken_modules_names\n";
+
     };
     if ($broken_modules_number && $build_all_parents) {
         print "\n";
@@ -2109,12 +2174,12 @@ sub modules_classify {
 
 #
 # This procedure provides consistency for cws
-# and optimized build (ie in case of -with_branches, -all:prj_name
+# and optimized build (ie in case of --with_branches, -all:prj_name
 # and -since switches)
 #
 sub provide_consistency {
     check_dir();
-    foreach $var_ref (\$build_from_with_branches, \$build_all_cont, \$build_since) {
+    foreach $var_ref (\$build_all_cont, \$build_since) {
         if ($$var_ref) {
             return if (defined $module_paths{$$var_ref});
             print_error("Cannot find module '$$var_ref'", 9);
@@ -2257,6 +2322,20 @@ sub fix_permissions {
      chmod '0664', $file;
 };
 
+sub prepare_build_from_with_branches {
+    ($full_deps_hash, $reversed_full_deps_hash) = @_;
+    foreach my $prerequisite (keys %$full_deps_hash) {
+        foreach my $dependent_module (keys %incompatibles) {
+            if (defined ${$$reversed_full_deps_hash{$prerequisite}}{$dependent_module}) {
+                remove_from_dependencies($prerequisite, $full_deps_hash);
+                delete $$full_deps_hash{$prerequisite};
+#                print "Removed $prerequisite\n";
+                last;
+            };
+        };
+    };
+};
+
 #
 # Removes projects which it is not necessary to build
 # in incompatible build
@@ -2268,7 +2347,6 @@ sub prepare_incompatible_build {
         if (!defined $$deps_hash{$module}) {
             print_error("The module $initial_module is independent from $module\n");
         }
-        delete $incompatibles{$module};
         $incompatibles{$module} = $$deps_hash{$module};
         delete $$deps_hash{$module};
     }
@@ -2286,8 +2364,8 @@ sub prepare_incompatible_build {
     @modules_built = keys %$deps_hash;
     %add_to_config = %$deps_hash;
     if ($prepare) {
-        if ((!defined $ENV{UPDATER}) || (defined $ENV{CWS_WORK_STAMP})) {
-            SourceConfig->new()->add_active_modules([keys %add_to_config], 0);
+        if ((!(defined $ENV{UPDATER} && (!defined $ENV{CWS_WORK_STAMP}))) || (defined $ENV{CWS_WORK_STAMP})) {
+            $source_config->add_active_modules([keys %add_to_config], 0);
         }
         clear_delivered();
     }
@@ -2332,21 +2410,6 @@ sub prepare_incompatible_build {
 
 #
 # Removes projects which it is not necessary to build
-# with -with_branches switch
-#
-#sub prepare_build_from {
-#    my ($prj, $deps_hash);
-#    $deps_hash = shift;
-#    my %from_deps_hash = ();   # hash of dependencies of the -from project
-#    get_parent_deps($build_from_with_branches, \%from_deps_hash);
-#    foreach $prj (keys %from_deps_hash) {
-#        delete $$deps_hash{$prj};
-#        remove_from_dependencies($prj, $deps_hash);
-#    };
-#};
-
-#
-# Removes projects which it is not necessary to build
 # with --all:prj_name or --since switch
 #
 sub prepare_build_all_cont {
@@ -2412,7 +2475,8 @@ sub get_list_of_modules {
 #    };
 };
 
-sub get_incomp_projects {
+sub get_modules_passed {
+    my $hash_ref = shift;
     my $option = '';
     while ($option = shift @ARGV) {
         if ($option =~ /^-+/) {
@@ -2424,7 +2488,7 @@ sub get_incomp_projects {
                 print_error("\'--from\' switch collision") if ($build_all_cont);
                 $build_all_cont = $';
             };
-            $incompatibles{$option}++;
+            $$hash_ref{$option}++;
         };
     };
 };
diff --git a/solenv/bin/checkdll.sh b/solenv/bin/checkdll.sh
index e8faa516a852..a9a502c7f6af 100755
--- a/solenv/bin/checkdll.sh
+++ b/solenv/bin/checkdll.sh
@@ -51,12 +51,12 @@ if [ -x $checkdll ]; then
     shift  # remove the trailing ---
 
     case `uname -s` in
-    Darwin) case "${DYLD_LIBRARY_PATH+X}" in
+    Darwin) case "${DYLD_LIBRARY_PATH:+X}" in
         X) DYLD_LIBRARY_PATH=$libpath:$DYLD_LIBRARY_PATH;;
         *) DYLD_LIBRARY_PATH=$libpath;;
         esac
         export DYLD_LIBRARY_PATH;;
-    *)  case "${LD_LIBRARY_PATH+X}" in
+    *)  case "${LD_LIBRARY_PATH:+X}" in
         X) LD_LIBRARY_PATH=$libpath:$LD_LIBRARY_PATH;;
         *) LD_LIBRARY_PATH=$libpath;;
         esac
diff --git a/solenv/bin/createcomponent.xslt b/solenv/bin/createcomponent.xslt
new file mode 100644
index 000000000000..7f7695d533b3
--- /dev/null
+++ b/solenv/bin/createcomponent.xslt
@@ -0,0 +1,51 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--**********************************************************************
+*
+* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
+*
+* Copyright 2000, 2010 Oracle and/or its affiliates.
+*
+* OpenOffice.org - a multi-platform office productivity suite
+*
+* This file is part of OpenOffice.org.
+*
+* OpenOffice.org is free software: you can redistribute it and/or modify
+* it under the terms of the GNU Lesser General Public License version 3
+* only, as published by the Free Software Foundation.
+*
+* OpenOffice.org is distributed in the hope that it will be useful,
+* but WITHOUT ANY WARRANTY; without even the implied warranty of
+* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+* GNU Lesser General Public License version 3 for more details
+* (a copy is included in the LICENSE file that accompanied this code).
+*
+* You should have received a copy of the GNU Lesser General Public License
+* version 3 along with OpenOffice.org.  If not, see
+* <http://www.openoffice.org/license.html>
+* for a copy of the LGPLv3 License.
+*
+**********************************************************************-->
+
+<xsl:stylesheet version="1.0" xmlns:xsl="http://www.w3.org/1999/XSL/Transform"
+    xmlns:uc="http://openoffice.org/2010/uno-components">
+  <xsl:param name="uri"/>
+  <xsl:strip-space elements="*"/>
+  <xsl:template match="uc:component">
+    <xsl:copy>
+      <xsl:apply-templates select="@*"/>
+      <xsl:attribute name="uri">
+        <xsl:value-of select="$uri"/>
+      </xsl:attribute>
+      <xsl:apply-templates/>
+    </xsl:copy>
+  </xsl:template>
+  <xsl:template match="*">
+    <xsl:copy>
+      <xsl:apply-templates select="@*"/>
+      <xsl:apply-templates/>
+    </xsl:copy>
+  </xsl:template>
+  <xsl:template match="@*">
+    <xsl:copy/>
+  </xsl:template>
+</xsl:stylesheet>
diff --git a/solenv/bin/deliver.pl b/solenv/bin/deliver.pl
index ab91ae34c01f..5c604d27b309 100755
--- a/solenv/bin/deliver.pl
+++ b/solenv/bin/deliver.pl
@@ -43,7 +43,7 @@ use File::Spec;
 
 ( $script_name = $0 ) =~ s/^.*\b(\w+)\.pl$/$1/;
 
-$id_str = ' $Revision$ ';
+$id_str = ' $Revision: 275594 $ ';
 $id_str =~ /Revision:\s+(\S+)\s+\$/
   ? ($script_rev = $1) : ($script_rev = "-");
 
@@ -404,6 +404,8 @@ sub parse_options
 {
     my $arg;
     my $dontdeletecommon = 0;
+    $opt_silent = 1 if ( defined $ENV{VERBOSE} && $ENV{VERBOSE} eq 'FALSE');
+    $opt_verbose = 1 if ( defined $ENV{VERBOSE} && $ENV{VERBOSE} eq 'TRUE');
     while ( $arg = shift @ARGV ) {
         $arg =~ /^-force$/      and $opt_force  = 1  and next;
         $arg =~ /^-check$/      and $opt_check  = 1  and $opt_verbose = 1 and next;
@@ -423,15 +425,13 @@ sub parse_options
         }
         $dest = $arg;
     }
-    $opt_silent = 1 if ( !defined $ENV{VERBOSE} || (defined $ENV{VERBOSE} && $ENV{VERBOSE} eq 'FALSE')) && ( ! $opt_verbose );
-    $opt_verbose = 1 if ( defined $ENV{VERBOSE} && $ENV{VERBOSE} eq 'TRUE') && ( ! $opt_silent );
     # $dest and $opt_zip or $opt_delete are mutually exclusive
     if ( $dest and ($opt_zip || $opt_delete) ) {
         usage(1);
     }
     # $opt_silent and $opt_check or $opt_verbose are mutually exclusive
     if ( ($opt_check or $opt_verbose) and $opt_silent ) {
-        print STDERR "Error on command line: options '-check'/'-verbose' and '-quiet' are mutually exclusive.\n";
+        print STDERR "Error on command line: options '-check' and '-quiet' are mutually exclusive.\n";
         usage(1);
     }
     if ($dontdeletecommon) {
@@ -679,6 +679,12 @@ sub glob_line
     }
     else {
         # no globbing but renaming possible
+        # #i89066#
+        if (-d $to && -f $from) {
+            my $filename = File::Basename::basename($from);
+            $to .= '/' if ($to !~ /[\\|\/]$/);
+            $to .= $filename;
+        };
         push(@globbed_files, [$from, $to]);
     }
     if ( $opt_checkdlst ) {
diff --git a/solenv/bin/gsicheck b/solenv/bin/gsicheck
index 9b898c9d5950..fb2f65cbe01d 100644..100755
--- a/solenv/bin/gsicheck
+++ b/solenv/bin/gsicheck
@@ -5,9 +5,9 @@ exit 1
 fi
 
 if [ "${OS?}" = MACOSX ]; then
-    export DYLD_LIBRARY_PATH=${DYLD_LIBRARY_PATH+${DYLD_LIBRARY_PATH}:}${SOLARVERSION?}/${INPATH?}/lib${UPDMINOREXT}
+    export DYLD_LIBRARY_PATH=${DYLD_LIBRARY_PATH:+${DYLD_LIBRARY_PATH}:}${SOLARVERSION?}/${INPATH?}/lib${UPDMINOREXT}
 else
-    export LD_LIBRARY_PATH=${LD_LIBRARY_PATH+${LD_LIBRARY_PATH}:}${SOLARVERSION?}/${INPATH?}/lib${UPDMINOREXT}
+    export LD_LIBRARY_PATH=${LD_LIBRARY_PATH:+${LD_LIBRARY_PATH}:}${SOLARVERSION?}/${INPATH?}/lib${UPDMINOREXT}
 fi
 
 if [ x${SOLARVER}x = xx -o x${UPDMINOREXT}x = xx  ]; then
diff --git a/solenv/bin/jpropex b/solenv/bin/jpropex
deleted file mode 100755
index 2d62d13b093e..000000000000
--- a/solenv/bin/jpropex
+++ /dev/null
@@ -1,10 +0,0 @@
-#!/bin/sh
-if [ x${SOLARENV}x = xx ]; then
-    echo No environment found, please use 'configure' or 'setsolar'
-    exit 1
-fi
-if [ x${JAVA_HOME}x = xx ]; then
-    echo No Java found!
-    exit 1
-fi
-exec java -DSOLARSRC=${SOLARSRC} -DWORK_STAMP=${WORK_STAMP} -DUSE_SHELL=  -jar ${SOLARVER}/${INPATH}/bin${UPDMINOREXT}/jpropex.jar "$@"
diff --git a/solenv/bin/localize b/solenv/bin/localize
index e14b149226b5..ef5550e72e67 100755
--- a/solenv/bin/localize
+++ b/solenv/bin/localize
@@ -7,9 +7,9 @@ fi
 # localize.pl calls localize_sl in solver bin directory which depends on dynamic
 # libraries in solver lib directory but has no correct RPATH (or equivalent):
 if [ "${OS?}" = MACOSX ]; then
-    export DYLD_LIBRARY_PATH=${DYLD_LIBRARY_PATH+${DYLD_LIBRARY_PATH}:}${SOLARVERSION?}/${INPATH?}/lib${UPDMINOREXT}
+    export DYLD_LIBRARY_PATH=${DYLD_LIBRARY_PATH:+${DYLD_LIBRARY_PATH}:}${SOLARVERSION?}/${INPATH?}/lib${UPDMINOREXT}
 else
-    export LD_LIBRARY_PATH=${LD_LIBRARY_PATH+${LD_LIBRARY_PATH}:}${SOLARVERSION?}/${INPATH?}/lib${UPDMINOREXT}
+    export LD_LIBRARY_PATH=${LD_LIBRARY_PATH:+${LD_LIBRARY_PATH}:}${SOLARVERSION?}/${INPATH?}/lib${UPDMINOREXT}
 fi
 
 if [ x${SOLARVER}x = xx -o x${UPDMINOREXT}x = xx  ]; then
diff --git a/solenv/bin/localize_sl b/solenv/bin/localize_sl
index df8205cf6d22..af7f8351406c 100755
--- a/solenv/bin/localize_sl
+++ b/solenv/bin/localize_sl
@@ -5,9 +5,9 @@ exit 1
 fi
 
 if [ "${OS?}" = MACOSX ]; then
-    export DYLD_LIBRARY_PATH=${DYLD_LIBRARY_PATH+${DYLD_LIBRARY_PATH}:}${SOLARVERSION?}/${INPATH?}/lib${UPDMINOREXT}
+    export DYLD_LIBRARY_PATH=${DYLD_LIBRARY_PATH:+${DYLD_LIBRARY_PATH}:}${SOLARVERSION?}/${INPATH?}/lib${UPDMINOREXT}
 else
-    export LD_LIBRARY_PATH=${LD_LIBRARY_PATH+${LD_LIBRARY_PATH}:}${SOLARVERSION?}/${INPATH?}/lib${UPDMINOREXT}
+    export LD_LIBRARY_PATH=${LD_LIBRARY_PATH:+${LD_LIBRARY_PATH}:}${SOLARVERSION?}/${INPATH?}/lib${UPDMINOREXT}
 fi
 
 if [ x${SOLARVER}x = xx -o x${UPDMINOREXT}x = xx  ]; then
diff --git a/solenv/bin/make_installer.pl b/solenv/bin/make_installer.pl
index 127f28cd7631..d28a2e7e3fa0 100644
--- a/solenv/bin/make_installer.pl
+++ b/solenv/bin/make_installer.pl
@@ -54,11 +54,9 @@ use installer::packagepool;
 use installer::parameter;
 use installer::pathanalyzer;
 use installer::profiles;
-use installer::regmerge;
 use installer::scppatchsoname;
 use installer::scpzipfiles;
 use installer::scriptitems;
-use installer::servicesfile;
 use installer::setupscript;
 use installer::simplepackage;
 use installer::sorter;
@@ -655,7 +653,6 @@ for ( my $n = 0; $n <= $#installer::globals::languageproducts; $n++ )
     $installer::globals::globalinfo_copied = 1;
 
     my $logminor = "";
-    my $avoidlanginlog = 0;
     if ( $installer::globals::updatepack ) { $logminor = $installer::globals::lastminor; }
     else { $logminor = $installer::globals::minor; }
 
@@ -663,14 +660,15 @@ for ( my $n = 0; $n <= $#installer::globals::languageproducts; $n++ )
     my $loglanguagestring_orig = $loglanguagestring;
     if (length($loglanguagestring) > $installer::globals::max_lang_length)
     {
+        my $number_of_languages = installer::systemactions::get_number_of_langs($loglanguagestring);
         chomp(my $shorter = `echo $loglanguagestring | md5sum | sed -e "s/ .*//g"`);
-        $loglanguagestring = $shorter;
-        $avoidlanginlog = 1;
+        my $id = substr($shorter, 0, 8); # taking only the first 8 digits
+        $loglanguagestring = "lang_" . $number_of_languages . "_id_" . $id;
     }
 
     $installer::globals::logfilename = "log_" . $installer::globals::build;
     if ( $logminor ne "" ) { $installer::globals::logfilename .= "_" . $logminor; }
-    if ( ! $avoidlanginlog ) { $installer::globals::logfilename .= "_" . $loglanguagestring; }
+    $installer::globals::logfilename .= "_" . $loglanguagestring;
     $installer::globals::logfilename .= ".log";
     $loggingdir = $loggingdir . $loglanguagestring . $installer::globals::separator;
     installer::systemactions::create_directory($loggingdir);
@@ -732,7 +730,7 @@ for ( my $n = 0; $n <= $#installer::globals::languageproducts; $n++ )
 
     if (!($installer::globals::is_copy_only_project))
     {
-        if ( $installer::globals::iswindowsbuild )
+        if (( $installer::globals::iswindowsbuild ) && ( $installer::globals::packageformat ne "archive" ) && ( $installer::globals::packageformat ne "installed" ))
         {
             installer::windows::msiglobal::set_global_code_variables($languagesarrayref, $languagestringref, $allvariableshashref, $alloldproperties);
         }
@@ -892,43 +890,6 @@ for ( my $n = 0; $n <= $#installer::globals::languageproducts; $n++ )
     installer::worker::resolving_hidden_flag($filesinproductlanguageresolvedarrayref, $allvariableshashref, "File", $languagestringref);
     if ( $installer::globals::globallogging ) { installer::files::save_array_of_hashes($loggingdir . "productfiles13c.log", $filesinproductlanguageresolvedarrayref); }
 
-    #####################################
-    # Creating services.rdb
-    #####################################
-
-    if ( $allvariableshashref->{'SERVICESPROJEKT'} )
-    {
-        if (! $installer::globals::languagepack)
-        {
-            # ATTENTION: For creating the services.rdb it is necessary to execute the native file
-            # "regcomp" or "regcomp.exe". Therefore this function can only be executed on the
-            # corresponding platform.
-
-            if ( $installer::globals::servicesrdb_can_be_created )
-            {
-                installer::logger::print_message( "... creating preregistered services.rdb ...\n" );
-
-                installer::servicesfile::create_services_rdb($allvariableshashref, $filesinproductlanguageresolvedarrayref, $includepatharrayref, $languagestringref);
-                if ( $installer::globals::globallogging ) { installer::files::save_array_of_hashes($loggingdir . "productfiles14.log", $filesinproductlanguageresolvedarrayref); }
-            }
-        }
-    }
-
-    #####################################
-    # Calls of regmerge
-    #####################################
-
-    if (!($installer::globals::is_copy_only_project))
-    {
-        if (! $installer::globals::languagepack)
-        {
-            installer::logger::print_message( "... merging files into registry database ...\n" );
-
-            installer::regmerge::merge_registration_files($filesinproductlanguageresolvedarrayref, $includepatharrayref, $languagestringref, $allvariableshashref);
-            if ( $installer::globals::globallogging ) { installer::files::save_array_of_hashes($loggingdir . "productfiles14b.log", $filesinproductlanguageresolvedarrayref); }
-        }
-    }
-
     ############################################
     # Collecting directories for epm list file
     ############################################
diff --git a/solenv/bin/mhids.pl b/solenv/bin/mhids.pl
deleted file mode 100644
index f0abf2e5cdca..000000000000
--- a/solenv/bin/mhids.pl
+++ /dev/null
@@ -1,394 +0,0 @@
-:
-eval 'exec perl -wS $0 ${1+"$@"}'
-    if 0;
-#*************************************************************************
-#
-# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
-#
-# Copyright 2000, 2010 Oracle and/or its affiliates.
-#
-# OpenOffice.org - a multi-platform office productivity suite
-#
-# This file is part of OpenOffice.org.
-#
-# OpenOffice.org is free software: you can redistribute it and/or modify
-# it under the terms of the GNU Lesser General Public License version 3
-# only, as published by the Free Software Foundation.
-#
-# OpenOffice.org is distributed in the hope that it will be useful,
-# but WITHOUT ANY WARRANTY; without even the implied warranty of
-# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-# GNU Lesser General Public License version 3 for more details
-# (a copy is included in the LICENSE file that accompanied this code).
-#
-# You should have received a copy of the GNU Lesser General Public License
-# version 3 along with OpenOffice.org.  If not, see
-# <http://www.openoffice.org/license.html>
-# for a copy of the LGPLv3 License.
-#
-#*************************************************************************
-
-my $filename;
-my $srs;
-my $prjname;
-my $defs;
-my $solarincludes;
-my $verbose = 0;
-
-my $debug = 0;
-my $filebase;
-my $workfile;
-my $shell_workfile;
-my @cleanuplist = ();
-
-# variables to setup the compiler line
-my $appext;
-my $compiler;
-my $outbin_flag;
-my $outobj_flag;
-my $objext;
-my $preprocess_flag; # preprocess to stdout
-
-my $no_hid_files;
-
-sub cleandie
-{
-    my $errstring = shift @_;
-    my $erroreval = $@;
-
-    print STDERR "$errstring\n";
-    if ( not $debug ) {
-        foreach my $i (@cleanuplist) {
-            unlink "$workfile$i" if -f "$workfile$i" or print STDERR "ERROR - couldn't remove $workfile$i\n";
-        }
-    }
-    die "$erroreval\n";
-}
-
-sub setcompiler
-{
-    my $whichcom = $ENV{COM};
-    my $extra_cflags = $ENV{EXTRA_CFLAGS};
-    $extra_cflags = "" if (!$extra_cflags);
-    if ( "$whichcom" eq "GCC" ) {
-        $appext = ""; # windows for now
-        $compiler = "gcc -x c $extra_cflags";
-        $outbin_flag = "-o ";
-        $outobj_flag = "";
-        $objext = ".o";
-        $preprocess_flag = "-E"; # preprocess to stdout
-    } elsif ( "$whichcom" eq "MSC" ) {
-        $appext = ".exe"; # windows for now
-        $compiler = "cl -nologo";
-        $outbin_flag = "-Fe";
-        $outobj_flag = "-Fo";
-        $objext = ".obj";
-        $preprocess_flag = "-EP"; # preprocess to stdout
-        $solarincludes =~ s/\/stl/\/xstlx/g;
-        $defs =~ s/\/stl/\/xstlx/g;
-    } elsif ( "$whichcom" eq "C52" ) {
-        $appext = ""; # windows for now
-        $compiler = "cc";
-        $outbin_flag = "-o ";
-        $outobj_flag = "";
-        $objext = ".o";
-        $preprocess_flag = "-E"; # preprocess to stdout
-
-        # hack for SO cc wrapper
-        $ENV{wrapper_override_cc_wrapper} = "TRUE";
-        $solarincludes =~ s/stl/xstlx/g;
-        $defs =~ s/\/stl/\/xstlx/g;
-    } else {
-        print STDERR "----------------------------------------------------------------------\n";
-        print STDERR "OOops... looks like your compiler isn't known to \n$0\n";
-        print STDERR "please edit the \"setcompiler\" section of this script to make it work.\n";
-        print STDERR "----------------------------------------------------------------------\n";
-        die "ERROR - compiler (or \$COM settings) unknown!\n";
-    }
-}
-
-#---------------------------------------------------
-$filename = undef;
-$srs = undef;
-$prjname = undef;
-
-my @expectedArgs = ( \$filename, \$srs, \$prjname );
-my $expectedArgsIndex = 0;
-while ( ( $#ARGV >= 0 ) && ( $expectedArgsIndex < 3 ) )
-{
-    $_ = shift @ARGV;
-    if ( /^-verbose$/ )
-    {
-        $verbose = 1;
-        next;
-    }
-    ${$expectedArgs[ $expectedArgsIndex ]} = $_;
-    ++$expectedArgsIndex;
-}
-
-$defs = join " ",@ARGV if ($#ARGV);
-
-if ( !defined $prjname ) { die "ERROR - check usage\n"; }
-
-if ( $ENV{NO_HID_FILES} ) {
-    $no_hid_files = $ENV{"NO_HID_FILES"};
-}
-$solarincludes = $ENV{SOLARINCLUDES};
-if (defined $ENV{TMPDIR}) {
-    $tmpdir = $ENV{TMPDIR};
-} elsif (defined $ENV{TMP}) {
-    $tmpdir = $ENV{TMP};
-} else {
-    die "ERROR - \"TMPDIR\" & \"TMP\" environment variables not set\n";
-};
-die "ERROR - \"$tmpdir\" doesn't exist\n" if ( ! -d $tmpdir );
-
-setcompiler();
-
-# convert windows only?
-$srs =~ s/\\/\//g;
-$filename =~ s/\\/\//g;
-
-$filebase = $filename;
-$filebase =~ s/.*[\\\/]//;
-$filebase =~ s/\..*?$//;
-# now stript it to something that doesn't togger vista execution prevention :(
-$flbs = $filebase;
-$flbs =~ s/[aeiou]//g;
-# call srand ony once per script!
-srand();
-$workfile = "$tmpdir/${flbs}_".$$.rand();
-#$workfile =~ s/setup/set_up/;
-
-# now get $workfile ready for shell usage...
-$shell_workfile = $workfile;
-
-print "workfile: $workfile\n" if $verbose;
-
-#remove old objects which remained in place by a former bug
-unlink "$workfile.obj";
-
-# can't do this for modules with mixed case!
-#$prjname =~ lc $prjname;
-
-if ( -f "$workfile.hid" )
-{
-    unlink "$workfile.hid" or die "ERRROR - cannot remove $workfile.hid\n";
-}
-
-# hack to quit for files which cannot be handled
-if ( defined $ENV{"NO_HID_FILES"} ) {
-    foreach $fname ( split / /, $ENV{"NO_HID_FILES"} )
-    {
-        if ( $fname eq $filename )
-        {
-            print "No hid generation for $filename due to NO_HID_FILES\n";
-            print "Touching $srs/$filebase.hid anyways\n";
-            open TOUCH, ">$srs/$filebase.hid" or die "ERRROR - cannot open $srs/$filebase.hid for writing\n";
-            close TOUCH;
-            exit 0;
-        }
-    }
-}
-
-#echo "perl5 -p -e "s/=[ \t]*\".*\"/=\"\"/go; s/\".*\"[ \t]*;/\"\" ;/go ; s/(\".*)\/\/(.*\")/$1\/\\\/$2/go ;" < %filename% > %srs%\%workfile%.c0"
-#call  perl5 -p -e "s/=[ \t]*\".*\"/=\"\"/go; s/\".*\"[ \t]*;/\"\" ;/go ; s/(\".*)\/\/(.*\")/$1\/\\\/$2/go ;" < %filename% > %srs%\%workfile%.c0
-
-my $verboseSwitch = $verbose ? "-verbose" : "";
-print         "$ENV{SOLARBINDIR}/hidc $verboseSwitch $filename ${shell_workfile}.c1 $prjname\n" if $verbose;
-$ret = system "$ENV{SOLARBINDIR}/hidc $verboseSwitch $filename ${shell_workfile}.c1 $prjname";
-if ( $ret ) {
-    push @cleanuplist, ".c1";
-    cleandie("ERROR - calling \"hidc\" failed");
-}
-push @cleanuplist, ".c1";
-
-print         "$compiler $defs $solarincludes $preprocess_flag ${shell_workfile}.c1 > ${shell_workfile}.c2\n" if $verbose;
-$ret = system "$compiler $defs $solarincludes $preprocess_flag ${shell_workfile}.c1 > ${shell_workfile}.c2";
-if ( $ret ) {
-    push @cleanuplist, ".c2";
-    cleandie("ERROR - calling compiler for preprocessing failed");
-}
-push @cleanuplist, ".c2";
-
-if (!open C_PROG, ">$workfile.c") {
-    push @cleanuplist, ".c";
-    cleandie("ERROR - open $workfile.c\n for writing failed");
-}
-push @cleanuplist, ".c";
-print C_PROG "#include <stdio.h>\n";
-print C_PROG "#include <wctype.h>\n";
-
-if ( !open PRE, "<$workfile.c2" ) {
-    cleandie("ERROR - open $workfile.c2\n for reading failed");
-}
-
-$InMain = 0;
-while (<PRE>)
-{
-    if ( /int\s*main/ )
-    {
-        $InMain = 1;
-    }
-
-    if ( $InMain && !/^\s*$/ )
-    {
-        print C_PROG;
-    }
-}
-
-close PRE;
-close C_PROG;
-
-#cl %SOLARINCLUDES% %_srs%\%_workfile%.c /Fe%_srs%\%_workfile%$appext
-my $outobj_param = "";
-if ( $outobj_flag ne "" )
-{
-    $outobj_param = "$outobj_flag${shell_workfile}$objext";
-}
-print         "$compiler $defs $solarincludes ${shell_workfile}.c $outobj_param $outbin_flag${shell_workfile}$appext \n" if $verbose;
-$ret = system "$compiler $defs $solarincludes ${shell_workfile}.c $outobj_param $outbin_flag${shell_workfile}$appext";
-if ( $ret ) {
-    push @cleanuplist, "$appext";
-    cleandie("ERROR - compiling $workfile.c failed");
-}
-push @cleanuplist, "$objext";
-push @cleanuplist, "$appext";
-
-#awk -f %ENV_TOOLS%\hidcode.awk < %srs%\%workfile%.c3 > %srs%\%workfile%.hid
-if ( !open C3,"$workfile$appext|" ) {
-    cleandie("ERROR - executing $workfile$appext failed");
-}
-if ( !open HID,">$srs/$filebase.hid.$ENV{INPATH}" ) {
-    cleandie("ERROR - open $srs/$filebase.hid.$ENV{INPATH} for writing failed");
-}
-
-while (<C3>)
-{
-    @fields = split /\s+/;
-
-    if ( $fields[1] eq "HelpID" )
-    {
-        print HID "$fields[0] $fields[2]\n";
-        next;
-    }
-
-    @arr = split /:/, $fields[0];
-    if( $arr[1] =~ /^leer$|^bitmap$|^font$|^color$|^image$|^imagelist$|^date$|^brush$|^fixedtext$|^keycode$|^time$|^mapmode$/i )
-    {
-        #print "skipping $arr[1]\n";
-        next;
-    }
-
-    if ( $fields[1] eq "Norm" )
-    {
-        # Felder der Zeile auf Variable verteilen
-        $helpIDString = $fields[0];
-        $GClass = lc($fields[2]);
-        $GID = $fields[3];
-        $LClass  = lc($fields[4]);
-        $LID = $fields[5] || 0;
-
-        #print $LID
-        #print $LClass
-        #print $GID
-        #print $GClass
-
-        $nHID=0;
-
-        $VAL1  = 536870912; #2 hoch 29
-        if   ( $GClass eq "workwindow"     ) { $nHID= $VAL1 *5; }
-        elsif( $GClass eq "modelessdialog" ) { $nHID= $VAL1 *4; }
-        elsif( $GClass eq "floatingwindow" ) { $nHID= $VAL1 *3; }
-        elsif( $GClass eq "modaldialog"    ) { $nHID= $VAL1 *2; }
-        elsif( $GClass eq "tabpage"        ) { $nHID= $VAL1 *1; }
-        elsif( $GClass eq "dockingwindow"  ) { $nHID= $VAL1 *6; }
-                            #Maximal bis 7 dann sind 32Bit ausgeschoepft
-        else {
-            $nHID=0;
-            $outline = "No GClass ".$helpIDString." ".$nHID." ".$GClass;
-            #print "$outline\n";
-            next;
-        }
-        if( $LID != 0 ) {
-            if   ( $LClass eq "tabcontrol"        ) { $nHID += 0;      }
-            elsif( $LClass eq "radiobutton"       ) { $nHID += 2*256;  }
-            elsif( $LClass eq "checkbox"          ) { $nHID += 4*256;  }
-            elsif( $LClass eq "tristatebox"       ) { $nHID += 6*256;  }
-            elsif( $LClass eq "edit"              ) { $nHID += 8*256;  }
-            elsif( $LClass eq "multilineedit"     ) { $nHID += 10*256; }
-            elsif( $LClass eq "multilistbox"      ) { $nHID += 12*256; }
-            elsif( $LClass eq "listbox"           ) { $nHID += 14*256; }
-            elsif( $LClass eq "combobox"          ) { $nHID += 16*256; }
-            elsif( $LClass eq "pushbutton"        ) { $nHID += 18*256; }
-            elsif( $LClass eq "spinfield"         ) { $nHID += 20*256; }
-            elsif( $LClass eq "patternfield"      ) { $nHID += 22*256; }
-            elsif( $LClass eq "numericfield"      ) { $nHID += 24*256; }
-            elsif( $LClass eq "metricfield"       ) { $nHID += 26*256; }
-            elsif( $LClass eq "currencyfield"     ) { $nHID += 28*256; }
-            elsif( $LClass eq "datefield"         ) { $nHID += 30*256; }
-            elsif( $LClass eq "timefield"         ) { $nHID += 32*256; }
-            elsif( $LClass eq "imageradiobutton"  ) { $nHID += 34*256; }
-            elsif( $LClass eq "numericbox"        ) { $nHID += 36*256; }
-            elsif( $LClass eq "metricbox"         ) { $nHID += 38*256; }
-            elsif( $LClass eq "currencybox"       ) { $nHID += 40*256; }
-            elsif( $LClass eq "datebox"           ) { $nHID += 42*256; }
-            elsif( $LClass eq "timebox"           ) { $nHID += 44*256; }
-            elsif( $LClass eq "imagebutton"       ) { $nHID += 46*256; }
-            elsif( $LClass eq "menubutton"        ) { $nHID += 48*256; }
-            elsif( $LClass eq "morebutton"        ) { $nHID += 50*256; }
-            else {
-                $nHID=0;
-                $outline = "No LClass ".$helpIDString." ".$nHID;
-                #print "$outline\n";
-                next;
-            }
-
-            #GID und LID auch beruecksichtigen
-            $nHID += $LID;
-        }
-        $nHID += $GID * 16384;  #14 Bit nach links shiften
-
-        # check here and not above to avoid warnings for restypes not generated anyways
-        if( $GID == 0 || $GID >32767 ||  $LID > 511 )
-        {
-            #GID & LID ungueltig
-            print STDERR "Invalid Global or Local ID: 0 < GID <= 32767 ; LID <= 511\n";
-            print STDERR "$helpIDString GID = $GID; LID = $LID\n";
-            next;
-        }
-
-        #
-        # 1. Stelle selber ausgeben, falls groesser als 2^21
-        # wg. problemen von awk/gawk bei printf mit %u
-        #
-        $x=0;
-        if( $nHID >=       4000000000 ) {
-            $nHID -=       4000000000;
-            $x=4;
-        }elsif( $nHID >= 3000000000) {
-            $nHID -=       3000000000;
-            $x=3;
-        }elsif( $nHID >= 2000000000) {
-            $nHID -=       2000000000;
-            $x=2;
-        }
-        if( $x != 0)
-            { printf HID "%s %d%u \n",$helpIDString,$x, $nHID; }
-        else
-            { printf HID "%s %u \n",$helpIDString, $nHID; }
-    }
-}
-
-close C3;
-close HID;
-
-rename("$srs/$filebase.hid.$ENV{INPATH}", "$srs/$filebase.hid") or cleandie("ERROR - couldn't rename tmp file to final for $filebase");
-
-if ( not $debug ) {
-    foreach my $i (@cleanuplist) {
-        if ( -f "$workfile$i" ) {
-            unlink "$workfile$i"  or cleandie("");
-        }
-    }
-}
diff --git a/solenv/bin/modules/RepositoryHelper.pm b/solenv/bin/modules/RepositoryHelper.pm
new file mode 100644
index 000000000000..8ea7996f6bc6
--- /dev/null
+++ b/solenv/bin/modules/RepositoryHelper.pm
@@ -0,0 +1,210 @@
+#*************************************************************************
+#
+# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
+#
+# Copyright 2000, 2010 Oracle and/or its affiliates.
+#
+# OpenOffice.org - a multi-platform office productivity suite
+#
+# This file is part of OpenOffice.org.
+#
+# OpenOffice.org is free software: you can redistribute it and/or modify
+# it under the terms of the GNU Lesser General Public License version 3
+# only, as published by the Free Software Foundation.
+#
+# OpenOffice.org is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+# GNU Lesser General Public License version 3 for more details
+# (a copy is included in the LICENSE file that accompanied this code).
+#
+# You should have received a copy of the GNU Lesser General Public License
+# version 3 along with OpenOffice.org.  If not, see
+# <http://www.openoffice.org/license.html>
+# for a copy of the LGPLv3 License.
+#
+#*************************************************************************
+
+#*************************************************************************
+#
+# RepositoryHelper - Perl for working with repositories and underlying SCM
+#
+# usage: see below
+#
+#*************************************************************************
+
+package RepositoryHelper;
+
+use strict;
+
+
+use Carp;
+use Cwd qw (cwd);
+use File::Basename;
+#use File::Temp qw(tmpnam);
+
+my $debug = 0;
+
+#####  profiling #####
+
+##### ctor #####
+
+sub new {
+    my $proto = shift;
+    my $class = ref($proto) || $proto;
+    my $initial_directory = shift;
+    if ($initial_directory) {
+        $initial_directory = Cwd::realpath($initial_directory);
+    } else {
+        if ( defined $ENV{PWD} ) {
+            $initial_directory = $ENV{PWD};
+        } elsif (defined $ENV{_cwd}) {
+            $initial_directory = $ENV{_cwd};
+        } else {
+            $initial_directory = cwd();
+        };
+    };
+    my $self = {};
+    $self->{INITIAL_DIRECTORY} = $initial_directory;
+    $self->{REPOSITORY_ROOT} = undef;
+    $self->{REPOSITORY_NAME} = undef;
+    $self->{SCM_NAME} = undef;
+    detect_repository($self);
+    bless($self, $class);
+    return $self;
+}
+
+##### methods #####
+sub get_repository_root
+{
+    my $self        = shift;
+    return $self->{REPOSITORY_ROOT};
+}
+
+sub get_initial_directory
+{
+    my $self        = shift;
+    return $self->{INITIAL_DIRECTORY};
+}
+
+sub get_scm_name
+{
+    my $self        = shift;
+    return$self->{SCM_NAME};
+}
+
+##### private methods #####
+sub search_for_hg {
+    my $self        = shift;
+    my $hg_root;
+    my $scm_name = 'hg';
+    if (open(COMMAND, "$scm_name root 2>&1 |")) {
+        foreach (<COMMAND>) {
+            next if (/^Not trusting file/);
+            chomp;
+            $hg_root = $_;
+            last;
+        };
+        close COMMAND;
+        chomp $hg_root;
+        if ($hg_root !~ /There is no Mercurial repository here/) {
+            $self->{REPOSITORY_ROOT} = $hg_root;
+            $self->{SCM_NAME} = $scm_name;
+            return 1;
+        };
+    };
+    return 0;
+};
+
+sub search_via_build_lst {
+    my $self = shift;
+#    my @possible_build_lists = ('build.lst', 'build.xlist'); # build lists names
+    my @possible_build_lists = ('build.lst'); # build lists names
+    my $previous_dir = '';
+    my $rep_root_candidate = $self->{INITIAL_DIRECTORY};
+    do {
+        foreach (@possible_build_lists) {
+            my $test_file;
+            if ($rep_root_candidate eq '/') {
+                $test_file = '/prj/' . $_;
+            } else {
+                $test_file = $rep_root_candidate . '/prj/' . $_;
+            };
+            if (-e $test_file) {
+                $self->{REPOSITORY_ROOT} = File::Basename::dirname($rep_root_candidate);
+                return 1;
+            };
+        };
+        $previous_dir = $rep_root_candidate;
+        $rep_root_candidate = File::Basename::dirname(Cwd::realpath($rep_root_candidate));
+        return 0 if ((!$rep_root_candidate) || ($rep_root_candidate eq $previous_dir));
+    }
+    while (chdir "$rep_root_candidate");
+};
+
+sub detect_repository {
+    my $self        = shift;
+    return if (search_via_build_lst($self));
+    chdir $self->{INITIAL_DIRECTORY};
+    return if (search_for_hg($self));
+    croak('Cannot determine source directory/repository for ' . $self->{INITIAL_DIRECTORY});
+};
+
+##### finish #####
+
+1; # needed by use or require
+
+__END__
+
+=head1 NAME
+
+RepositoryHelper - Perl module for working with repositories and underlying SCM
+
+=head1 SYNOPSIS
+
+    # example that will analyze sources and return the source root directory
+
+    use RepositoryHelper;
+
+    # Create a new instance:
+    $a = RepositoryHelper->new();
+
+    # Get repositories for the actual workspace:
+    $a->get_repository_root();
+
+
+=head1 DESCRIPTION
+
+RepositoryHelper is a perlPerl module for working with repositories and underlying SCM
+in the database.
+
+Methods:
+
+RepositoryHelper::new()
+
+Creates a new instance of RepositoryHelper. Can be initialized by: some path which likely to belong to a repository, default - empty, the current dir will be taken.
+
+RepositoryHelper::get_repository_root()
+
+Returns the repository root, retrieved by SCM methods or on educated guess...
+
+RepositoryHelper::get_initial_directory()
+
+Returns full path to the initialistion directory.
+
+=head2 EXPORT
+
+RepositoryHelper::new()
+RepositoryHelper::get_repository_root()
+RepositoryHelper::get_scm_name()
+RepositoryHelper::get_initial_directory()
+
+=head1 AUTHOR
+
+Vladimir Glazunov, vg@openoffice.org
+
+=head1 SEE ALSO
+
+perl(1).
+
+=cut
diff --git a/solenv/bin/modules/SourceConfig.pm b/solenv/bin/modules/SourceConfig.pm
index 9379b7764d0a..dfaa797d8f48 100644..100755
--- a/solenv/bin/modules/SourceConfig.pm
+++ b/solenv/bin/modules/SourceConfig.pm
@@ -38,10 +38,11 @@ package SourceConfig;
 use strict;
 
 use constant SOURCE_CONFIG_FILE_NAME => 'source_config';
-use constant SOURCE_CONFIG_VERSION => 2;
+use constant SOURCE_CONFIG_VERSION => 3;
 
 use Carp;
 use Cwd;
+use RepositoryHelper;
 use File::Basename;
 use File::Temp qw(tmpnam);
 
@@ -75,8 +76,9 @@ sub new {
             $source_root .= '/..';
         }
     } else {
-        $source_root = Cwd::realpath($ENV{SOURCE_ROOT_DIR});
+        $source_root = $ENV{SOURCE_ROOT_DIR};
     };
+    $source_root = Cwd::realpath($source_root);
     $self->{SOURCE_ROOT} = $source_root;
     $self->{DEBUG} = 0;
     $self->{VERBOSE} = 0;
@@ -94,14 +96,16 @@ sub new {
     $self->{WARNINGS} = [];
     $self->{REPORT_MESSAGES} = [];
     $self->{CONFIG_FILE_CONTENT} = [];
-    $self->{DEFAULT_REPOSITORY} = undef;
     if (defined $self->{USER_SOURCE_ROOT}) {
         ${$self->{REPOSITORIES}}{File::Basename::basename($self->{USER_SOURCE_ROOT})} = $self->{USER_SOURCE_ROOT};
-        $self->{DEFAULT_REPOSITORY} = File::Basename::basename($self->{USER_SOURCE_ROOT});
     };
     $self->{SOURCE_CONFIG_FILE} = get_config_file($self->{SOURCE_ROOT}) if (!defined $self->{SOURCE_CONFIG_FILE});
     $self->{SOURCE_CONFIG_DEFAULT} = $self->{SOURCE_ROOT} .'/'.SOURCE_CONFIG_FILE_NAME;
+    if (defined $self->{USER_SOURCE_ROOT}) {
+        ${$self->{REPOSITORIES}}{File::Basename::basename($self->{USER_SOURCE_ROOT})} = $self->{USER_SOURCE_ROOT};
+    };
     read_config_file($self);
+       get_module_paths($self);
     bless($self, $class);
     return $self;
 }
@@ -118,6 +122,19 @@ sub get_repositories
     return sort keys %{$self->{REPOSITORIES}};
 }
 
+sub add_repository
+{
+    my $self        = shift;
+    my $new_rep_path = shift;
+    $new_rep_path = Cwd::realpath($new_rep_path);
+    my $new_rep_name = File::Basename::basename($new_rep_path);
+    if (defined ${$self->{REPOSITORIES}}{$new_rep_name}) {
+        croak("Repository $new_rep_name is already defined!!");
+    };
+    ${$self->{REPOSITORIES}}{$new_rep_name} = $new_rep_path;
+    $self -> get_repository_module_paths($new_rep_name);
+}
+
 sub get_config_file_default_path {
     my $self        = shift;
     return $self->{SOURCE_CONFIG_DEFAULT};
@@ -131,7 +148,6 @@ sub get_config_file_path {
 sub get_module_repository {
     my $self = shift;
     my $module = shift;
-    $self -> get_module_paths() if (!scalar keys %{$self->{MODULE_PATHS}});
     if (defined ${$self->{MODULE_REPOSITORY}}{$module}) {
         return ${$self->{MODULE_REPOSITORY}}{$module};
     } else {
@@ -143,7 +159,6 @@ sub get_module_repository {
 sub get_module_path {
     my $self = shift;
     my $module = shift;
-    $self -> get_module_paths() if (!scalar keys %{$self->{MODULE_PATHS}});
     if (defined ${$self->{MODULE_PATHS}}{$module}) {
         return ${$self->{MODULE_PATHS}}{$module};
     } else {
@@ -155,10 +170,17 @@ sub get_module_path {
 sub get_module_build_list {
     my $self = shift;
     my $module = shift;
-    $self -> get_buildlist_paths() if (!scalar keys %{$self->{MODULE_BUILD_LIST_PATHS}});
     if (defined ${$self->{MODULE_BUILD_LIST_PATHS}}{$module}) {
         return ${$self->{MODULE_BUILD_LIST_PATHS}}{$module};
     } else {
+        my @possible_build_lists = ('build.lst', 'build.xlist'); # build lists names
+        foreach (@possible_build_lists) {
+            my $possible_path = ${$self->{MODULE_PATHS}}{$module} . "/prj/$_";
+            if (-e $possible_path) {
+                ${$self->{MODULE_BUILD_LIST_PATHS}}{$module} = $possible_path;
+                return $possible_path;
+            };
+        };
         Carp::cluck("No build list in module $module found!!\n") if ($self->{DEBUG});
         return undef;
     };
@@ -168,7 +190,6 @@ sub get_all_modules
 {
     my $self = shift;
     my $module = shift;
-    $self -> get_module_paths() if (!scalar keys %{$self->{MODULE_PATHS}});
     return sort keys %{$self->{MODULE_PATHS}};
 };
 
@@ -178,7 +199,6 @@ sub get_active_modules
     if (scalar keys %{$self->{ACTIVATED_MODULES}}) {
         return sort keys %{$self->{ACTIVATED_MODULES}};
     }
-    $self -> get_module_paths() if (!scalar keys %{$self->{MODULE_PATHS}});
        return sort keys %{$self->{REAL_MODULES}};
 }
 
@@ -189,49 +209,42 @@ sub is_active
     if (scalar keys %{$self->{ACTIVATED_MODULES}}) {
         return exists ($self->{ACTIVATED_MODULES}{$module});
     }
-       $self -> get_module_paths() if (!scalar keys %{$self->{MODULE_PATHS}});
     return exists ($self->{REAL_MODULES}{$module});
 }
 
 ##### private methods #####
 
-sub get_buildlist_paths {
+sub get_repository_module_paths {
     my $self        = shift;
-    $self -> get_module_paths() if (!scalar keys %{$self->{MODULE_PATHS}});
-    my @possible_build_lists = ('build.lst', 'build.xlist'); # build lists names
-    foreach my $module (keys %{$self->{MODULE_PATHS}}) {
-        foreach (@possible_build_lists) {
-            my $possible_path = ${$self->{MODULE_PATHS}}{$module} . "/prj/$_";
-            ${$self->{MODULE_BUILD_LIST_PATHS}}{$module} = $possible_path if (-e $possible_path);
+    my $repository        = shift;
+    my $repository_path = ${$self->{REPOSITORIES}}{$repository};
+    if (opendir DIRHANDLE, $repository_path) {
+        foreach my $module (readdir(DIRHANDLE)) {
+            next if (($module =~ /^\.+/) || (!-d "$repository_path/$module"));
+            my $module_entry = $module;
+            if (($module !~ s/\.lnk$//) && ($module !~ s/\.link$//)) {
+                $self->{REAL_MODULES}{$module}++;
+            }
+            my $possible_path = "$repository_path/$module_entry";
+            if (-d $possible_path) {
+                if (defined ${$self->{MODULE_PATHS}}{$module}) {
+                    close DIRHANDLE;
+                    croak("Ambiguous paths for module $module: $possible_path and " . ${$self->{MODULE_PATHS}}{$module});
+                };
+                ${$self->{MODULE_PATHS}}{$module} = $possible_path;
+                ${$self->{MODULE_REPOSITORY}}{$module} = $repository;
+            }
         };
+        close DIRHANDLE;
+    } else {
+        croak("Cannot read $repository_path repository content");
     };
 };
 
 sub get_module_paths {
     my $self        = shift;
     foreach my $repository (keys %{$self->{REPOSITORIES}}) {
-        my $repository_path = ${$self->{REPOSITORIES}}{$repository};
-        if (opendir DIRHANDLE, $repository_path) {
-            foreach my $module (readdir(DIRHANDLE)) {
-                next if (($module =~ /^\.+/) || (!-d "$repository_path/$module"));
-                my $module_entry = $module;
-                if (($module !~ s/\.lnk$//) && ($module !~ s/\.link$//)) {
-                    $self->{REAL_MODULES}{$module}++;
-                }
-                my $possible_path = "$repository_path/$module_entry";
-                if (-d $possible_path) {
-                    if (defined ${$self->{MODULE_PATHS}}{$module}) {
-                        close DIRHANDLE;
-                        croak("Ambiguous paths for module $module: $possible_path and " . ${$self->{MODULE_PATHS}}{$module});
-                    };
-                    ${$self->{MODULE_PATHS}}{$module} = $possible_path;
-                    ${$self->{MODULE_REPOSITORY}}{$module} = $repository;
-                }
-            };
-            close DIRHANDLE;
-        } else {
-            croak("Cannot read $_ repository content");
-        };
+        get_repository_module_paths($self, $repository);
     };
     my @false_actives = ();
     foreach (keys %{$self->{ACTIVATED_MODULES}}) {
@@ -248,31 +261,21 @@ sub get_config_file {
     return '';
 };
 
-sub get_hg_root {
+#
+# Fallback - fallback repository is based on RepositoryHelper educated guess
+#
+sub get_fallback_repository {
     my $self = shift;
-    return $self->{USER_SOURCE_ROOT} if (defined $self->{USER_SOURCE_ROOT});
-    my $hg_root;
-    if (open(COMMAND, "hg root 2>&1 |")) {
-        foreach (<COMMAND>) {
-            next if (/^Not trusting file/);
-            chomp;
-            $hg_root = $_;
-            last;
-        };
-        close COMMAND;
-        chomp $hg_root;
-        if ($hg_root !~ /There is no Mercurial repository here/) {
-            return $hg_root;
-        };
-    };
-    croak('Cannot open find source_config and/or determine hg root directory for ' . cwd());
+    my $repository_root = RepositoryHelper->new()->get_repository_root();
+    ${$self->{REPOSITORIES}}{File::Basename::basename($repository_root)} = $repository_root;
 };
 
 sub read_config_file {
     my $self = shift;
     if (!$self->{SOURCE_CONFIG_FILE}) {
-        my $repository_root = get_hg_root($self);
-        ${$self->{REPOSITORIES}}{File::Basename::basename($repository_root)} = $repository_root;
+        if (!defined $self->{USER_SOURCE_ROOT}) {
+            get_fallback_repository($self);
+        };
         return;
     };
     my $repository_section = 0;
@@ -304,11 +307,9 @@ sub read_config_file {
                     my $repository_source_path = $self->{SOURCE_ROOT} . "/$1";
                     if (defined $ENV{UPDMINOREXT}) {
                         $repository_source_path .= $ENV{UPDMINOREXT};
-                    };
-                    if ((defined $self->{DEFAULT_REPOSITORY}) && (${$self->{REPOSITORIES}}{$self->{DEFAULT_REPOSITORY}} eq $repository_source_path)) {
-                        delete ${$self->{REPOSITORIES}}{$self->{DEFAULT_REPOSITORY}};
-                        $self->{DEFAULT_REPOSITORY} = undef;
-
+                        if (defined ${$self->{REPOSITORIES}}{$1.$ENV{UPDMINOREXT}}) {
+                            delete ${$self->{REPOSITORIES}}{$1.$ENV{UPDMINOREXT}};
+                        };
                     };
                     ${$self->{REPOSITORIES}}{$1} = $repository_source_path;
                     ${$self->{ACTIVATED_REPOSITORIES}}{$1}++;
@@ -323,9 +324,7 @@ sub read_config_file {
         };
         close SOURCE_CONFIG_FILE;
         if (!scalar keys %{$self->{REPOSITORIES}}) {
-            # Fallback - default repository is the directory where is our module...
-            my $hg_root = get_hg_root($self);
-            ${$self->{REPOSITORIES}}{File::Basename::basename($hg_root)} = $hg_root;
+            get_fallback_repository($self);
         };
     } else {
         croak('Cannot open ' . $self->{SOURCE_CONFIG_FILE} . 'for reading');
@@ -379,15 +378,18 @@ sub remove_activated_modules {
 sub add_active_repositories {
     my $self = shift;
     $self->{NEW_REPOSITORIES} = shift;
-    croak('Empty module list passed for adding to source_config') if (!scalar @{$self->{NEW_REPOSITORIES}});
+    croak('Empty repository list passed for addition to source_config') if (!scalar @{$self->{NEW_REPOSITORIES}});
     $self->{VERBOSE} = shift;
+    foreach (@{$self->{NEW_REPOSITORIES}}) {
+        $self->add_repository($_);
+    };
     generate_config_file($self);
 };
 
 sub add_active_modules {
     my $self = shift;
     $self->{NEW_MODULES} = shift;
-    croak('Empty module list passed for adding to source_config') if (!scalar @{$self->{NEW_MODULES}});
+    croak('Empty module list passed for addition to source_config') if (!scalar @{$self->{NEW_MODULES}});
     $self->{VERBOSE} = shift;
     generate_config_file($self);
 };
@@ -535,6 +537,8 @@ SourceConfig - Perl extension for parsing general info databases
     # Get repositories for the actual workspace:
     $a->get_repositories();
 
+    # Add a repository new_repository for the actual workspace (via full path):
+    $a->add_repository(/DEV300/new_repository);
 
 =head1 DESCRIPTION
 
@@ -559,6 +563,11 @@ SourceConfig::get_repositories()
 Returns sorted list of active repositories for the actual workspace
 
 
+SourceConfig::add_repository(REPOSITORY_PATH)
+
+Adds a repository to the list of active repositories
+
+
 SourceConfig::get_active_modules()
 
 Returns a sorted list of active modules
@@ -622,6 +631,7 @@ Removes all activated repositories from the source_config file
 SourceConfig::new()
 SourceConfig::get_version()
 SourceConfig::get_repositories()
+SourceConfig::add_repository()
 SourceConfig::get_active_modules()
 SourceConfig::get_all_modules()
 SourceConfig::get_module_path($module)
diff --git a/solenv/bin/modules/SourceConfigHelper.pm b/solenv/bin/modules/SourceConfigHelper.pm
new file mode 100644
index 000000000000..84ffbe0ca3f7
--- /dev/null
+++ b/solenv/bin/modules/SourceConfigHelper.pm
@@ -0,0 +1,422 @@
+#*************************************************************************
+#
+# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
+#
+# Copyright 2000, 2010 Oracle and/or its affiliates.
+#
+# OpenOffice.org - a multi-platform office productivity suite
+#
+# This file is part of OpenOffice.org.
+#
+# OpenOffice.org is free software: you can redistribute it and/or modify
+# it under the terms of the GNU Lesser General Public License version 3
+# only, as published by the Free Software Foundation.
+#
+# OpenOffice.org is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+# GNU Lesser General Public License version 3 for more details
+# (a copy is included in the LICENSE file that accompanied this code).
+#
+# You should have received a copy of the GNU Lesser General Public License
+# version 3 along with OpenOffice.org.  If not, see
+# <http://www.openoffice.org/license.html>
+# for a copy of the LGPLv3 License.
+#
+#*************************************************************************
+
+#*************************************************************************
+#
+# SourceConfigHelper - Perl extension for parsing general info databases
+#
+# usage: see below
+#
+#*************************************************************************
+
+package SourceConfigHelper;
+
+use strict;
+
+use RepositoryHelper;
+use SourceConfig;
+use Cwd qw (cwd);
+use Carp;
+
+my $debug = 0;
+my @source_config_list; # array of sourceconfig objects
+
+#-----------------------------------------------------------------------
+#   Constants
+#-----------------------------------------------------------------------
+
+use constant SOURCE_CONFIG_NONE => 0;
+use constant SOURCE_CONFIG_CURRENT_FIRST => 1;
+use constant SOURCE_CONFIG_ENVIRONMENT_FIRST => 2;
+use constant SOURCE_CONFIG_CURRENT_ONLY => 3;
+use constant SOURCE_CONFIG_ENVIRONMENT_ONLY => 4;
+
+use constant SOURCE_CONFIG_DEFAULT => SOURCE_CONFIG_CURRENT_FIRST;
+
+#####  profiling #####
+
+##### ctor #####
+
+sub new {
+    my $proto = shift;
+    my $class = ref($proto) || $proto;
+    my $init_action = shift;
+    my $self = {};
+    my $SourceConfigCurrent;
+    my $SourceConfigEnvironment;
+
+    $init_action = SOURCE_CONFIG_DEFAULT if (!defined ($init_action));
+    if (!eval ($init_action) or ($init_action < SOURCE_CONFIG_NONE) or ($init_action > SOURCE_CONFIG_ENVIRONMENT_ONLY)) {
+        croak("wrong initial parameter: $init_action\n");
+    }
+
+    if ($init_action != SOURCE_CONFIG_NONE) {
+        my $repositoryHash_ref = {};
+        if ($init_action != SOURCE_CONFIG_ENVIRONMENT_ONLY) {
+            my $initial_directory = cwd();
+            my $result = is_repository($initial_directory, $repositoryHash_ref);
+            if ($result) {
+                $SourceConfigCurrent = SourceConfig->new($repositoryHash_ref->{REPOSITORY_ROOT});
+            }
+        }
+        if ($init_action != SOURCE_CONFIG_CURRENT_ONLY) {
+            my $source_config = $ENV{SOURCE_ROOT_DIR} . '/' . SourceConfig::SOURCE_CONFIG_FILE_NAME;
+            if (-f $source_config) {
+                $SourceConfigEnvironment = SourceConfig->new($source_config);
+            }
+        }
+
+        # fill array
+
+        if (($init_action == SOURCE_CONFIG_CURRENT_FIRST) or ($init_action == SOURCE_CONFIG_CURRENT_ONLY)) {
+            if (defined ($SourceConfigCurrent)) {
+                push (@source_config_list, $SourceConfigCurrent);
+            }
+            if ($init_action == SOURCE_CONFIG_CURRENT_FIRST) {
+                if (defined ($SourceConfigEnvironment)) {
+                    push (@source_config_list, $SourceConfigEnvironment);
+                }
+            }
+        }
+        elsif (($init_action == SOURCE_CONFIG_ENVIRONMENT_FIRST) or ($init_action == SOURCE_CONFIG_ENVIRONMENT_ONLY)) {
+            if (defined ($SourceConfigEnvironment)) {
+                push (@source_config_list, $SourceConfigEnvironment);
+            }
+            if ($init_action == SOURCE_CONFIG_ENVIRONMENT_FIRST) {
+                if (defined ($SourceConfigCurrent)) {
+                    push (@source_config_list, $SourceConfigCurrent);
+                }
+            }
+        }
+    }
+
+    $self->{SOURCE_CONFIG_LIST} = \@source_config_list;
+
+    bless($self, $class);
+    return $self;
+}
+
+##### methods #####
+
+############################################################################################
+
+sub add_SourceConfig {
+    my $self = shift;
+    my $source_config = shift;
+    push (@{$self->{SOURCE_CONFIG_LIST}}, $source_config);
+}
+
+############################################################################################
+
+sub get_SourceConfigList {
+    my $self = shift;
+    return @{$self->{SOURCE_CONFIG_LIST}};
+}
+
+############################################################################################
+
+sub has_SourceConfig {
+    my $self = shift;
+    my $result = 0;
+    my $count = @{$self->{SOURCE_CONFIG_LIST}};
+    $result = 1 if ($count > 0);
+    return $result;
+}
+
+############################################################################################
+
+sub get_module_path {
+    my $self = shift;
+    my $module = shift;
+    my $function = \&SourceConfig::get_module_path;
+    my $result;
+    $result = $self->get_StringResult ($function, $module);
+    return $result;
+}
+
+############################################################################################
+
+sub get_active_modules {
+    my $self = shift;
+    my $parameter; # empty
+    my $function = \&SourceConfig::get_active_modules;
+    my $array_ref;
+    $array_ref = $self->get_ArrayResult ($function, $parameter);
+    return @$array_ref;
+}
+
+############################################################################################
+
+sub get_repositories {
+    my $self = shift;
+    my $parameter; # empty
+    my $function = \&SourceConfig::get_repositories;
+    my $array_ref;
+    $array_ref = $self->get_ArrayResult ($function, $parameter);
+    return @$array_ref;
+}
+
+############################################################################################
+
+sub get_module_repository {
+    my $self = shift;
+    my $module = shift;
+    my $function = \&SourceConfig::get_module_repository;
+    my $result;
+    $result = $self->get_StringResult ($function, $module);
+    return $result;
+}
+
+############################################################################################
+
+sub is_active {
+    my $self = shift;
+    my $module = shift;
+    my $function = \&SourceConfig::is_active;
+    my $result_ref;
+    my $is_active = 0;
+    $result_ref = $self->get_ResultOfList ($function, $module);
+    my $count = @$result_ref;
+    if ($count>0) {
+        foreach my $active (@$result_ref) {
+            if ($active) {
+                $is_active = $active;
+            }
+        }
+    }
+    return $is_active;
+}
+
+##### private methods #####
+
+############################################################################################
+#
+# is_repository () : check if the directory is a valid repository
+#
+# input: - directory
+#        - hash reference, where the output will be stored
+#
+# output: 0 = FALSE, the directory is no valid repository
+#         1 = TRUE, the repository root can be found in $repositoryHash_ref->{REPOSITORY_ROOT}
+#
+############################################################################################
+
+sub is_repository {
+    my $directory = shift;
+    my $repositoryHash_ref = shift;
+    $repositoryHash_ref->{INITIAL_DIRECTORY} = $directory;
+    $repositoryHash_ref->{REPOSITORY_ROOT} = undef;
+    $repositoryHash_ref->{REPOSITORY_NAME} = undef;
+    my $result = RepositoryHelper::search_via_build_lst($repositoryHash_ref);
+    chdir $repositoryHash_ref->{INITIAL_DIRECTORY};
+    if (!$result) {
+        $result = RepositoryHelper::search_for_hg($repositoryHash_ref);
+    }
+    return $result;
+}
+
+############################################################################################
+#
+# get_ResultOfList(): give back an array reference from all SourceConfig Objects results
+#
+# input: - function : reference to the called function of each SourceConfig Object
+#        - parameter : parameter for the called function
+#
+# output: result : array of all results
+#
+############################################################################################
+
+sub get_ResultOfList {
+    my $self = shift;
+    my $function = shift;
+    my $parameter = shift;
+    my @result;
+    foreach my $source_config (@{$self->{SOURCE_CONFIG_LIST}}) {
+        push (@result, &$function ($source_config, $parameter));
+    }
+    return \@result;
+}
+
+############################################################################################
+#
+# get_StringResult(): give back the first defined result from all SourceConfig Objects
+#
+# input: - function : reference to the called function of each SourceConfig Object
+#        - parameter : parameter for the called function
+#
+# output: result : scalar variable (string), undef if no result
+#
+############################################################################################
+
+sub get_StringResult {
+    my $self = shift;
+    my $function = shift;
+    my $parameter = shift;
+    my $result_ref;
+    $result_ref = $self->get_ResultOfList ($function, $parameter);
+    my $count = @$result_ref;
+    if ($count>0) {
+        my $value;
+        my $i = 0;
+        while (($i < $count) and !defined ($value)) { # search the first defined result
+            $value = $$result_ref[$i];
+            $i++;
+        }
+        return $value;
+    }
+    return undef;
+}
+
+############################################################################################
+#
+# get_StringResult(): give back a sorted and uniqe array reference of the results
+#                     from all SourceConfig Objects
+#
+# input: - function : reference to the called function of each SourceConfig Object
+#        - parameter : parameter for the called function
+#
+# output: result : sorted and uniqe array reference
+#
+############################################################################################
+
+sub get_ArrayResult {
+    my $self = shift;
+    my $function = shift;
+    my $parameter = shift;
+    my $result_ref;
+    my @modules;
+    $result_ref = $self->get_ResultOfList ($function, $parameter);
+    my $count = @$result_ref;
+    if ($count>0) {
+        my %moduleHash;
+        foreach my $module (@$result_ref) {
+            $moduleHash{$module}++;
+        }
+        @modules = sort keys %moduleHash;
+    }
+    return \@modules;
+}
+
+ ##### finish #####
+
+1; # needed by use or require
+
+__END__
+
+=head1 NAME
+
+SourceConfigHelper - Perl extension for handling with SourceConfigObjetcs
+
+=head1 SYNOPSIS
+
+    # example that will read source_config file and return the active repositories
+
+    use SourceConfigHelper;
+
+    # Create a new instance:
+    $a = SourceConfigHelper->new();
+
+    # Get repositories for the actual workspace:
+    $a->get_repositories();
+
+=head1 DESCRIPTION
+
+SourceConfigHelper is a perl extension to handle more than one objects of SourceConfig
+to set up a search order for modules.
+
+Methods:
+
+SourceConfigHelper::new()
+
+Creates a new instance of SourceConfigHelper. Can be initialized by: default - empty or with a constant of search order. default: the source_config will be taken first from the current repository and second from the environment
+Possible parameters are:
+SourceConfigHelper::SOURCE_CONFIG_NONE - no SourceConfig Object will be created
+SourceConfigHelper::SOURCE_CONFIG_CURRENT_FIRST - use the current repository first
+SourceConfigHelper::SOURCE_CONFIG_ENVIRONMENT_FIRST - use the repository of the environment first
+SourceConfigHelper::SOURCE_CONFIG_CURRENT_ONLY - use only the current repository
+SourceConfigHelper::SOURCE_CONFIG_ENVIRONMENT_ONLY - use only the repository of the environment
+
+SourceConfigHelper::get_repositories()
+
+Returns sorted list of active repositories for the actual workspace
+
+SourceConfigHelper::get_active_modules()
+
+Returns a sorted list of active modules
+
+SourceConfigHelper::get_all_modules()
+
+Returns sorted list of all modules in active repositories.
+
+SourceConfigHelper::get_module_path($module)
+
+Returns absolute module path. If the module is not active or don't exists, "undef" will be returned.
+
+SourceConfigHelper::get_module_repository($module)
+
+Returns the module's repository. If the module is not active or don't exists, "undef" will be returned.
+
+SourceConfigHelper::is_active()
+
+Returns 1 (TRUE) if a module is active
+Returns 0 (FALSE) if a module is not active
+
+SourceConfigHelper::add_SourceConfig($SourceConfigObject)
+
+Add the SourceConfigObject to the end of the list
+
+SourceConfigHelper::get_SourceConfigList()
+
+Return an array of SourceConfigObjects
+
+SourceConfigHelper::has_SourceConfig()
+
+Returns 1 (TRUE) if one or more SourceConfig Objects is in the list
+Returns 0 (FALSE) if no SourceConfig Object is in the list (can happen if there is no valid repository)
+
+=head2 EXPORT
+
+SourceConfigHelper::new()
+SourceConfigHelper::get_repositories()
+SourceConfigHelper::get_active_modules()
+SourceConfigHelper::get_all_modules()
+SourceConfigHelper::get_module_path($module)
+SourceConfigHelper::get_module_repository($module)
+SourceConfigHelper::is_active($module)
+SourceConfigHelper::add_SourceConfig($SourceConfigObject)
+SourceConfigHelper::get_SourceConfigList()
+SourceConfigHelper::has_SourceConfig()
+
+=head1 AUTHOR
+
+Kurt Zenker, kz@openoffice.org
+
+=head1 SEE ALSO
+
+perl(1).
+
+=cut
diff --git a/solenv/bin/modules/installer/control.pm b/solenv/bin/modules/installer/control.pm
index f4edc8129255..bd700be38758 100644
--- a/solenv/bin/modules/installer/control.pm
+++ b/solenv/bin/modules/installer/control.pm
@@ -405,6 +405,16 @@ sub determine_ship_directory
     my $shipdrive = $ENV{'SHIPDRIVE'};
 
     my $languagestring = $$languagesref;
+
+    if (length($languagestring) > $installer::globals::max_lang_length )
+    {
+        my $number_of_languages = installer::systemactions::get_number_of_langs($languagestring);
+        chomp(my $shorter = `echo $languagestring | md5sum | sed -e "s/ .*//g"`);
+        # $languagestring = $shorter;
+        my $id = substr($shorter, 0, 8); # taking only the first 8 digits
+        $languagestring = "lang_" . $number_of_languages . "_id_" . $id;
+    }
+
     my $productstring = $installer::globals::product;
     my $productsubdir = "";
 
diff --git a/solenv/bin/modules/installer/environment.pm b/solenv/bin/modules/installer/environment.pm
index b54912b72616..98bdffb3122a 100644
--- a/solenv/bin/modules/installer/environment.pm
+++ b/solenv/bin/modules/installer/environment.pm
@@ -117,9 +117,6 @@ sub set_global_environment_variables
     if ( $ENV{'LAST_MINOR'} ) { $installer::globals::lastminor = $ENV{'LAST_MINOR'}; }
 
     if ( $ENV{'PROEXT'} ) { $installer::globals::pro = 1; }
-    if ( $ENV{'SOLAR_JAVA'} ) { $installer::globals::solarjava = 1; }
-    if ( $ENV{'JDKLIB'} ) { $installer::globals::jdklib = $ENV{'JDKLIB'}; }
-    if ( $ENV{'JREPATH'} ) { $installer::globals::jrepath = $ENV{'JREPATH'}; }
 
     if ( $ENV{'VERBOSE'} && ( (lc $ENV{'VERBOSE'}) eq "false" ) ) { $installer::globals::quiet = 1; }
     if ( $ENV{'PREPARE_WINPATCH'} ) { $installer::globals::prepare_winpatch = 1; }
diff --git a/solenv/bin/modules/installer/epmfile.pm b/solenv/bin/modules/installer/epmfile.pm
index 136eca913dd9..8b828b85335f 100644
--- a/solenv/bin/modules/installer/epmfile.pm
+++ b/solenv/bin/modules/installer/epmfile.pm
@@ -762,33 +762,13 @@ sub replace_many_variables_in_shellscripts
     foreach $key (keys %{$variableshashref})
     {
         my $value = $variableshashref->{$key};
-        if ( ! $value =~ /.oxt/ ) { $value = lc($value); }  # lowercase !
-        if ( $installer::globals::issolarisbuild) { $value =~ s/\.org/org/g; }  # openofficeorg instead of openoffice.org
+        # $value = lc($value);  # lowercase !
+        # if ( $installer::globals::issolarisbuild) { $value =~ s/\.org/org/g; }    # openofficeorg instead of openoffice.org
         replace_variable_in_shellscripts($scriptref, $value, $key);
     }
 }
 
 #######################################
-# Setting oxt file name variable
-#######################################
-
-sub set_oxt_filename
-{
-    my ($filesinpackage, $allvariables) = @_;
-
-    for ( my $i = 0; $i <= $#{$filesinpackage}; $i++ )
-    {
-        my $onefile = ${$filesinpackage}[$i];
-        if ( $onefile->{'Name'} =~ /.oxt\s*$/ )
-        {
-            $allvariables->{'OXTFILENAME'} = $onefile->{'Name'};
-            # $allvariables->{'FULLOXTFILENAME'} = $onefile->{'destination'};
-            last;  # only one oxt file for each rpm!
-        }
-    }
-}
-
-#######################################
 # Adding shell scripts to epm file
 #######################################
 
@@ -796,9 +776,6 @@ sub adding_shellscripts_to_epm_file
 {
     my ($epmfileref, $shellscriptsfilename, $localrootpath, $allvariableshashref, $filesinpackage) = @_;
 
-    # Setting variable for ${OXTFILENAME} into $allvariableshashref, if this is a RPM with an extension
-    set_oxt_filename($filesinpackage, $allvariableshashref);
-
     # $installer::globals::shellscriptsfilename
 
     push( @{$epmfileref}, "\n\n" );
@@ -1803,26 +1780,27 @@ sub is_extension_package
 # share/extension/install
 ######################################################################
 
-sub get_extension_name
+sub contains_extension_dir
 {
     my ($prototypefile) = @_;
 
-    my $extensionName = "";
+    my $contains_extension_dir = 0;
+
+    # d none opt/openoffice.org3/share/extensions/
 
     for ( my $i = 0; $i <= $#{$prototypefile}; $i++ )
     {
         my $line = ${$prototypefile}[$i];
-        if ( $line =~ /^\s*f\s+none\s+share\/extension\/install\/(\w+?\.oxt)\s*\=/ )
+        if ( $line =~ /^\s*d\s+none\s.*\/share\/extensions\// )
         {
-            $extensionName = $1;
+            $contains_extension_dir = 1;
             last;
         }
     }
 
-    return $extensionName;
+    return $contains_extension_dir;
 }
 
-
 ############################################################
 # A Solaris patch contains 7 specific scripts
 ############################################################
@@ -1839,9 +1817,9 @@ sub add_scripts_into_prototypefile
     $path = $path . $installer::globals::separator;
 
     my @newlines = ();
-    my $extensionname = get_extension_name($prototypefile);
+    my $is_extension_package = contains_extension_dir($prototypefile);
 
-    if ( $extensionname ne "" )
+    if ( $is_extension_package )
     {
         for ( my $i = 0; $i <= $#installer::globals::solarispatchscriptsforextensions; $i++ )
         {
@@ -1865,9 +1843,7 @@ sub add_scripts_into_prototypefile
             my $scriptfile = installer::files::read_file($sourcefilename);
 
             # Replacing variables
-            my $oldstring = "\$\{OXTFILENAME\}";
-            replace_variables_in_shellscripts_for_patch($scriptfile, $destpath, $oldstring, $extensionname);
-            $oldstring = "PRODUCTDIRECTORYNAME";
+            my $oldstring = "PRODUCTDIRECTORYNAME";
             replace_variables_in_shellscripts_for_patch($scriptfile, $destpath, $oldstring, $staticpath);
 
             # Saving file
@@ -2308,6 +2284,55 @@ sub determine_rpm_version
     return $rpmversion;
 }
 
+####################################################
+# Writing some info about rpm into the log file
+####################################################
+
+sub log_rpm_info
+{
+    my $systemcall = "";
+    my $infoline = "";
+
+    $infoline = "\nLogging rpmrc content using --showrc\n\n";
+    push( @installer::globals::logfileinfo, $infoline);
+
+    if ( $installer::globals::rpm ne "" )
+    {
+        $systemcall = "$installer::globals::rpm --showrc |";
+    }
+    else
+    {
+        $systemcall = "rpm --showrc |";
+    }
+
+    my @fullrpmout = ();
+
+    open (RPM, "$systemcall");
+    while (<RPM>) {push(@fullrpmout, $_); }
+    close (RPM);
+
+    if ( $#fullrpmout > -1 )
+    {
+        for ( my $i = 0; $i <= $#fullrpmout; $i++ )
+        {
+            my $rpmout = $fullrpmout[$i];
+            $rpmout =~ s/\s*$//g;
+
+            $infoline = "$rpmout\n";
+            $infoline =~ s/error/e_r_r_o_r/gi;  # avoiding log problems
+            push( @installer::globals::logfileinfo, $infoline);
+        }
+    }
+    else
+    {
+        $infoline = "Problem in systemcall: $systemcall : No return value\n";
+        push( @installer::globals::logfileinfo, $infoline);
+    }
+
+    $infoline = "End of logging rpmrc\n\n";
+    push( @installer::globals::logfileinfo, $infoline);
+}
+
 #################################################
 # Systemcall to start the packaging process
 #################################################
@@ -2560,6 +2585,12 @@ sub create_packages_without_epm
             mkdir($buildroot = $dir . "/" . $epmdir . "BUILD/");
         }
 
+        if ( ! $installer::globals::rpminfologged )
+        {
+            log_rpm_info();
+            $installer::globals::rpminfologged = 1;
+        }
+
         my $systemcall = "$rpmcommand -bb --define \"_unpackaged_files_terminate_build  0\" $specfilename --target $target $buildrootstring 2\>\&1 |";
 
         installer::logger::print_message( "... $systemcall ...\n" );
diff --git a/solenv/bin/modules/installer/globals.pm b/solenv/bin/modules/installer/globals.pm
index 71429e278f4e..7d6e8c4a9b8f 100644
--- a/solenv/bin/modules/installer/globals.pm
+++ b/solenv/bin/modules/installer/globals.pm
@@ -118,8 +118,6 @@ BEGIN
     $dounzip = 1;
     $languages_defined_in_productlist = 0;
     $setupscript_defined_in_productlist = 0;
-    $services_rdb_created = 0;
-    $servicesrdb_can_be_created = 0;
     $islinux = 0;
     $issolaris = 0;
     $ismacosx = 0;
@@ -179,11 +177,12 @@ BEGIN
     $rpm = "";
     $rpmcommand = "";
     $rpmquerycommand = "";
+    $rpminfologged = 0;
     $debian = "";
     $installertypedir = "";
     $controlledmakecabversion = "5";
     $saved_packages_path = "";
-    $max_lang_length = 65;
+    $max_lang_length = 50;
     $globalblock = "Globals";
     $rootmodulegid = "";
     %alllangmodules = ();
@@ -237,9 +236,6 @@ BEGIN
     $creating_windows_installer_patch = 0;
 
     $strip = 1;
-    $solarjava = 0;
-    $jdklib = "";
-    $jrepath = "";
 
     $globallogging = 0;
     $globalloggingform21 = 1;
@@ -408,9 +404,6 @@ BEGIN
     %usedtreeconditions = ();
     %moduledestination = ();
 
-    $unomaxservices = 1800; # regcomp -c argument length
-    $javamaxservices = 15;
-
     $one_cab_file = 0;
     $fix_number_of_cab_files = 1;
     $cab_file_per_component = 0;
@@ -453,8 +446,6 @@ BEGIN
     @solarispatchfiles = (".diPatch", "patchinfo");
     @environmentvariables = ( "SOLARVERSION", "GUI", "WORK_STAMP", "OUTPATH", "LOCAL_OUT", "LOCAL_COMMON_OUT" );
     @packagelistitems = ("module", "solarispackagename", "packagename", "copyright", "vendor", "description" );
-    @regcompjars = ( "unoil.jar", "java_uno.jar", "ridl.jar", "jurt.jar", "juh.jar", "xmerge.jar", "commonwizards.jar" );
-    @regcompregisterlibs = ( "javavm.uno", "javaloader.uno", "stocservices.uno" );
     @languagepackfeature =();
     @featurecollector =();
     $msiassemblyfiles = "";
@@ -501,7 +492,6 @@ BEGIN
         $separator = "/";
         $pathseparator = "\:";
         $libextension = "\.dll";
-        $quote = "\'";
         $isunix = 0;
         $iswin = 1;
                 $archiveformat = ".zip";
@@ -526,7 +516,6 @@ BEGIN
             $libextension = "\.so";
         }
         $archiveformat = ".tar.gz";
-        $quote = "\'";
         $isunix = 1;
         $iswin = 0;
     }
diff --git a/solenv/bin/modules/installer/parameter.pm b/solenv/bin/modules/installer/parameter.pm
index 0961b598902f..70bc32e36c7c 100644
--- a/solenv/bin/modules/installer/parameter.pm
+++ b/solenv/bin/modules/installer/parameter.pm
@@ -368,19 +368,6 @@ sub setglobalvariables
 
     if ( ! $installer::globals::packageformat ) { $installer::globals::packageformat = "native"; }
 
-    # $installer::globals::servicesrdb_can_be_created can only be set, if regcomp (regcomp.exe) can be executed.
-
-    if ( $installer::globals::iswin && $installer::globals::iswindowsbuild ) { $installer::globals::servicesrdb_can_be_created = 1; }
-    if ( $installer::globals::islinux && $installer::globals::islinuxbuild ) { $installer::globals::servicesrdb_can_be_created = 1; }
-    if ( $installer::globals::issolaris && $installer::globals::issolarisbuild ) { $installer::globals::servicesrdb_can_be_created = 1; }
-
-    # ToDo: Needs to be expanded for additional compiler (setting $installer::globals::servicesrdb_can_be_created = 1 for all external platforms)
-
-    if ((!($installer::globals::iswindowsbuild)) && (!($installer::globals::islinuxbuild)) && (!($installer::globals::issolarisbuild)))
-    {
-        $installer::globals::servicesrdb_can_be_created = 1;
-    }
-
     # extension, if $installer::globals::pro is set
     if ($installer::globals::pro) { $installer::globals::productextension = ".pro"; }
 
@@ -530,7 +517,7 @@ sub control_required_parameter
         # and the UpgradeCode for the product are defined.
         # The name "codes.txt" can be overwritten in Product definition with CODEFILENAME (msiglobal.pm)
 
-        if ($installer::globals::iswindowsbuild)
+        if (( $installer::globals::iswindowsbuild ) && ( $installer::globals::packageformat ne "archive" ) && ( $installer::globals::packageformat ne "installed" ))
         {
             $installer::globals::codefilename = $installer::globals::idttemplatepath  . $installer::globals::separator . $installer::globals::codefilename;
             installer::files::check_file($installer::globals::codefilename);
@@ -638,8 +625,6 @@ sub outputparameter
     if ( $installer::globals::debian ) { push(@output, "Linux: Creating Debian packages\n"); }
     if ( $installer::globals::dounzip ) { push(@output, "Unzip ARCHIVE files\n"); }
     else  { push(@output, "Not unzipping ARCHIVE files\n"); }
-    if ( $installer::globals::servicesrdb_can_be_created ) { push(@output, "services.rdb can be created\n"); }
-    else  { push(@output, "services.rdb cannot be created !\n"); }
     if (!($installer::globals::languages_defined_in_productlist))
     {
         push(@output, "Languages:\n");
diff --git a/solenv/bin/modules/installer/regmerge.pm b/solenv/bin/modules/installer/regmerge.pm
deleted file mode 100644
index 1c2821549131..000000000000
--- a/solenv/bin/modules/installer/regmerge.pm
+++ /dev/null
@@ -1,340 +0,0 @@
-#*************************************************************************
-#
-# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
-#
-# Copyright 2000, 2010 Oracle and/or its affiliates.
-#
-# OpenOffice.org - a multi-platform office productivity suite
-#
-# This file is part of OpenOffice.org.
-#
-# OpenOffice.org is free software: you can redistribute it and/or modify
-# it under the terms of the GNU Lesser General Public License version 3
-# only, as published by the Free Software Foundation.
-#
-# OpenOffice.org is distributed in the hope that it will be useful,
-# but WITHOUT ANY WARRANTY; without even the implied warranty of
-# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-# GNU Lesser General Public License version 3 for more details
-# (a copy is included in the LICENSE file that accompanied this code).
-#
-# You should have received a copy of the GNU Lesser General Public License
-# version 3 along with OpenOffice.org.  If not, see
-# <http://www.openoffice.org/license.html>
-# for a copy of the LGPLv3 License.
-#
-#*************************************************************************
-
-package installer::regmerge;
-
-use Cwd;
-use installer::converter;
-use installer::existence;
-use installer::exiter;
-use installer::globals;
-use installer::logger;
-use installer::pathanalyzer;
-use installer::remover;
-use installer::scriptitems;
-use installer::systemactions;
-
-################################################################
-# Collecting all files with content:
-# Regmergefile = "mydatabasepart.rdb";
-################################################################
-
-sub collect_all_regmergefiles
-{
-    my ($filesarrayref) = @_;
-
-    my @regmergefiles = ();
-
-    for ( my $i = 0; $i <= $#{$filesarrayref}; $i++ )
-    {
-        my $onefile = ${$filesarrayref}[$i];
-        if ( $onefile->{'Regmergefile'} ) { push(@regmergefiles, $onefile); }
-    }
-
-    return \@regmergefiles;
-}
-
-################################################################
-# Collecting all gids of the databases, that are part of
-# the file definition
-################################################################
-
-sub collect_all_database_gids
-{
-    my ($filesarrayref) = @_;
-
-    my @databasegids = ();
-
-    for ( my $i = 0; $i <= $#{$filesarrayref}; $i++ )
-    {
-        my $onefile = ${$filesarrayref}[$i];
-
-        if ( $onefile->{'RegistryID'} )
-        {
-            my $databasegid = $onefile->{'RegistryID'};
-            if (! installer::existence::exists_in_array($databasegid, \@databasegids)) { push(@databasegids, $databasegid); }
-        }
-        else
-        {
-            installer::exiter::exit_program("ERROR: File defintion error. File :$onefile->{'gid'} without RegistryID!", "collect_all_database_gids");
-        }
-    }
-
-    return \@databasegids;
-}
-
-################################################################
-# Returning the database file from the files collector. In the
-# future this file does not need to exist, but currently it
-# has to exist already in the files collector.
-################################################################
-
-sub get_database_file
-{
-    my ($databasegid, $filesarrayref) = @_;
-
-    my $found = 0;
-    my $onefile;
-
-    for ( my $i = 0; $i <= $#{$filesarrayref}; $i++ )
-    {
-        $onefile = ${$filesarrayref}[$i];
-        my $gid = $onefile->{'gid'};
-
-        if ( $databasegid eq $gid )
-        {
-            $found = 1;
-            last;
-        }
-    }
-
-    if ( ! $found ) { installer::exiter::exit_program("ERROR: Did not find StarRegistry file $databasegid!", "get_database_file"); }
-
-    return $onefile;
-}
-
-################################################################
-# The regmerge file has to be found the in include pathes
-################################################################
-
-sub get_regmerge_file
-{
-    my ($includepatharrayref) = @_;
-
-    my $searchname;
-
-    if ($installer::globals::isunix) { $searchname = "regcomplazy"; }
-    else { $searchname = "regcomplazy.exe"; }
-
-    my $regmergefileref = installer::scriptitems::get_sourcepath_from_filename_and_includepath(\$searchname, $includepatharrayref, 1);
-    if ( $$regmergefileref eq "" ) { installer::exiter::exit_program("ERROR: Could not find file $searchname for merging the StarRegistry!", "get_regmerge_file"); }
-
-    return $$regmergefileref;
-}
-
-################################################################
-# Collecting all files that are merged to one defined
-# StarRegistry database
-################################################################
-
-sub collect_all_files_for_one_registry
-{
-    my ($regmergefiles, $databasegid) = @_;
-
-    my @regmergefiles = ();
-
-    for ( my $i = 0; $i <= $#{$regmergefiles}; $i++ )
-    {
-        my $onefile = ${$regmergefiles}[$i];
-        if ( $onefile->{'RegistryID'} eq $databasegid ) { push(@regmergefiles, $onefile); }
-    }
-
-    return \@regmergefiles;
-}
-
-################################################################
-# Collecting all particles from the regmerge files
-################################################################
-
-sub collect_all_regmerge_particles
-{
-    my ($databaseregisterfiles) = @_;
-
-    my @regmergeparticles = ();
-
-    for ( my $i = 0; $i <= $#{$databaseregisterfiles}; $i++ )
-    {
-        my $onefile = ${$databaseregisterfiles}[$i];
-        if ( $onefile->{'Regmergefile'} ) { push(@regmergeparticles, $onefile->{'Regmergefile'}); }
-        else { installer::exiter::exit_program("ERROR: Could not find entry for \"Regmergefile\" in $onefile->{'gid'}!", "collect_all_regmerge_particles"); }
-    }
-
-    return \@regmergeparticles;
-}
-
-################################################################
-# Collecting all source pathes of the regmerge particles
-################################################################
-
-sub get_all_source_pathes
-{
-    my ($regmergeparticles, $includepatharrayref) = @_;
-
-    my @regmergeparticles = ();
-
-    for ( my $i = 0; $i <= $#{$regmergeparticles}; $i++ )
-    {
-        my $filename = ${$regmergeparticles}[$i];
-
-        my $fileref = installer::scriptitems::get_sourcepath_from_filename_and_includepath(\$filename, $includepatharrayref, 1);
-        if ( $$fileref eq "" ) { installer::exiter::exit_program("ERROR: Could not find file $filename for merging the StarRegistry!", "get_all_source_pathes"); }
-
-        push(@regmergeparticles, $$fileref);
-    }
-
-    return \@regmergeparticles;
-}
-
-################################################################
-# Merging the rdb files into the StarRegistry database
-################################################################
-
-sub merge_files
-{
-    my ($regmergefile, $databasefile, $registerfiles, $databasedir, $allvariableshashref) = @_;
-
-    my $databasesource = $databasefile->{'sourcepath'};
-    my $databasename = $databasefile->{'Name'};
-    my $databasedest = $databasedir . $installer::globals::separator . $databasename;
-
-    installer::systemactions::copy_one_file($databasesource, $databasedest);
-    $databasefile->{'sourcepath'} = $databasedest;  # new sourcepath for the StarRegistry file
-
-    # One call for every merge particle. This is only possible, if there are only a few merge particles.
-
-    my $prefix = $databasefile->{'NativeServicesURLPrefix'};
-    # TODO: "NativeServicesURLPrefix" or "JavaServicesURLPrefix"
-
-    my $error_occured = 0;
-
-    for ( my $i = 0; $i <= $#{$registerfiles}; $i++ )
-    {
-        my $registerfile = $databasedir . $installer::globals::separator . $i . ".tmp";
-        open (IN, '<', $registerfiles->[$i]) or $error_occured = 1;
-        open (OUT, '>', $registerfile) or $error_occured = 1;
-        while (<IN>)
-        {
-            s/^ComponentName=/ComponentName=$prefix/;
-            print OUT $_ or $error_occured = 1;
-        }
-        close IN or $error_occured = 1;
-        close OUT or $error_occured = 1;
-
-        my $systemcall = $regmergefile . " -v " . $databasedest . " " . $registerfile . " 2\>\&1 |";
-
-        my @regmergeoutput = ();
-
-        my $var_library_path;
-        my $old_library_path;
-        if ($installer::globals::isunix) {
-            $var_library_path = $installer::globals::ismacosx ?
-                'DYLD_LIBRARY_PATH' : 'LD_LIBRARY_PATH';
-            $old_library_path = $ENV{$var_library_path};
-            installer::servicesfile::include_libdir_into_ld_library_path(
-                $var_library_path, $regmergefile);
-        }
-
-        open (REG, "$systemcall");
-        while (<REG>) {push(@regmergeoutput, $_); }
-        close (REG);
-
-        my $returnvalue = $?;   # $? contains the return value of the systemcall
-
-        if (defined $var_library_path) {
-            if (defined $old_library_path) {
-                $ENV{$var_library_path} = $old_library_path;
-            } else {
-                delete $ENV{$var_library_path};
-            }
-        }
-
-        my $infoline = "Systemcall: $systemcall\n";
-        push( @installer::globals::logfileinfo, $infoline);
-
-        for ( my $j = 0; $j <= $#regmergeoutput; $j++ ) { push( @installer::globals::logfileinfo, "$regmergeoutput[$j]"); }
-
-        if ($returnvalue)
-        {
-            $infoline = "ERROR: $systemcall\n";
-            push( @installer::globals::logfileinfo, $infoline);
-            $error_occured = 1;
-        }
-        else
-        {
-            $infoline = "SUCCESS: $systemcall\n";
-            push( @installer::globals::logfileinfo, $infoline);
-        }
-    }
-
-    return $error_occured;
-}
-
-################################################################
-# Expanding the registry database files by merging rdb files
-# into this registry database files.
-################################################################
-
-sub merge_registration_files
-{
-    my ($filesarrayref, $includepatharrayref, $languagestringref, $allvariableshashref) = @_;
-
-    installer::logger::include_header_into_logfile("Creating starregistry databases:");
-
-    # Test if there is something to do. At least one file has to have the content:
-    # Regmergefile = "mydatabasepart.rdb";
-
-    my $regmergefiles = collect_all_regmergefiles($filesarrayref);
-
-    if ( $#{$regmergefiles} > -1 )  # not empty -> at least one regmerge file
-    {
-        # prepare registration
-
-        my $regmergefile = get_regmerge_file($includepatharrayref); # searching for regmerge (regcomplazy.exe)
-
-        my $databasegids = collect_all_database_gids($regmergefiles);
-
-        # iterating over all database gids
-
-        my $regmergeerror = 0;
-
-        for ( my $i = 0; $i <= $#{$databasegids}; $i++ )
-        {
-            $databasegid = ${$databasegids}[$i];
-
-            # my $databasedirname = "starregistryrdb"; <- not unique!
-            my $databasedirname = $databasegid . "_rdb"; # <- unique!
-            my $databasedir = installer::systemactions::create_directories($databasedirname, $languagestringref);
-            push(@installer::globals::removedirs, $databasedir);
-
-            my $databasefile = get_database_file($databasegid, $filesarrayref);
-            my $databaseregisterfiles = collect_all_files_for_one_registry($regmergefiles, $databasegid);
-
-            if ( $#{$databaseregisterfiles} > -1 )  # not empty -> at least one regmerge file
-            {
-                my $regmergeparticles = collect_all_regmerge_particles($databaseregisterfiles);
-                $regmergeparticles = get_all_source_pathes($regmergeparticles, $includepatharrayref);
-                my $oneregmergeerror = merge_files($regmergefile, $databasefile, $regmergeparticles, $databasedir, $allvariableshashref);
-                if ($oneregmergeerror) { $regmergeerror = 1; }
-            }
-        }
-
-        if ( $regmergeerror ) { installer::exiter::exit_program("ERROR: regmerge !", "merge_registration_files"); }
-
-    }
-}
-
-1;
diff --git a/solenv/bin/modules/installer/scriptitems.pm b/solenv/bin/modules/installer/scriptitems.pm
index a073e60a6697..54d22df1e19e 100644
--- a/solenv/bin/modules/installer/scriptitems.pm
+++ b/solenv/bin/modules/installer/scriptitems.pm
@@ -1223,7 +1223,7 @@ sub get_Source_Directory_For_Files_From_Includepathlist
         my $styles = "";
         my $file_can_miss = 0;
         if ( $onefile->{'Styles'} ) { $styles = $onefile->{'Styles'}; }
-        if (( $styles =~ /\bSTARREGISTRY\b/ ) || ( $styles =~ /\bFILE_CAN_MISS\b/ )) { $file_can_miss = 1; }
+        if ( $styles =~ /\bFILE_CAN_MISS\b/ ) { $file_can_miss = 1; }
 
         if (( $installer::globals::languagepack ) && ( ! $onefile->{'ismultilingual'} ) && ( ! ( $styles =~ /\bFORCELANGUAGEPACK\b/ ))) { $file_can_miss = 1; }
 
@@ -1352,12 +1352,21 @@ sub remove_Files_Without_Sourcedirectory
         if ($sourcepath eq "")
         {
             my $styles = $onefile->{'Styles'};
+            my $filename = $onefile->{'Name'};
 
-            if ( ! ( $styles =~ /\bSTARREGISTRY\b/ ))   # StarRegistry files will be created later
+            if ( ! $installer::globals::languagepack )
             {
-                my $filename = $onefile->{'Name'};
+                $infoline = "ERROR: Removing file $filename from file list.\n";
+                push( @installer::globals::logfileinfo, $infoline);
+
+                push(@missingfiles, "ERROR: File not found: $filename\n");
+                $error_occured = 1;
 
-                if ( ! $installer::globals::languagepack )
+                next;   # removing this file from list, if sourcepath is empty
+            }
+            else # special case for language packs
+            {
+                if (( $onefile->{'ismultilingual'} ) || ( $styles =~ /\bFORCELANGUAGEPACK\b/ ))
                 {
                     $infoline = "ERROR: Removing file $filename from file list.\n";
                     push( @installer::globals::logfileinfo, $infoline);
@@ -1367,27 +1376,14 @@ sub remove_Files_Without_Sourcedirectory
 
                     next;   # removing this file from list, if sourcepath is empty
                 }
-                else # special case for language packs
+                else
                 {
-                    if (( $onefile->{'ismultilingual'} ) || ( $styles =~ /\bFORCELANGUAGEPACK\b/ ))
-                    {
-                        $infoline = "ERROR: Removing file $filename from file list.\n";
-                        push( @installer::globals::logfileinfo, $infoline);
-
-                        push(@missingfiles, "ERROR: File not found: $filename\n");
-                        $error_occured = 1;
-
-                        next;   # removing this file from list, if sourcepath is empty
-                    }
-                    else
-                    {
-                        $infoline = "INFO: Removing file $filename from file list. It is not language dependent.\n";
-                        push( @installer::globals::logfileinfo, $infoline);
-                        $infoline = "INFO: It is not language dependent and can be ignored in language packs.\n";
-                        push( @installer::globals::logfileinfo, $infoline);
+                    $infoline = "INFO: Removing file $filename from file list. It is not language dependent.\n";
+                    push( @installer::globals::logfileinfo, $infoline);
+                    $infoline = "INFO: It is not language dependent and can be ignored in language packs.\n";
+                    push( @installer::globals::logfileinfo, $infoline);
 
-                        next;   # removing this file from list, if sourcepath is empty
-                    }
+                    next;   # removing this file from list, if sourcepath is empty
                 }
             }
         }
@@ -1868,7 +1864,7 @@ sub remove_Languagepacklibraries_from_Installset
     }
 
     $infoline = "\n";
-    push( @installer::globals::logfileinfo, $infoline);
+    push( @installer::globals::globallogfileinfo, $infoline);
 
     return \@newitemsarray;
 }
diff --git a/solenv/bin/modules/installer/servicesfile.pm b/solenv/bin/modules/installer/servicesfile.pm
deleted file mode 100644
index 63e5f44125c8..000000000000
--- a/solenv/bin/modules/installer/servicesfile.pm
+++ /dev/null
@@ -1,1073 +0,0 @@
-#*************************************************************************
-#
-# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
-#
-# Copyright 2000, 2010 Oracle and/or its affiliates.
-#
-# OpenOffice.org - a multi-platform office productivity suite
-#
-# This file is part of OpenOffice.org.
-#
-# OpenOffice.org is free software: you can redistribute it and/or modify
-# it under the terms of the GNU Lesser General Public License version 3
-# only, as published by the Free Software Foundation.
-#
-# OpenOffice.org is distributed in the hope that it will be useful,
-# but WITHOUT ANY WARRANTY; without even the implied warranty of
-# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-# GNU Lesser General Public License version 3 for more details
-# (a copy is included in the LICENSE file that accompanied this code).
-#
-# You should have received a copy of the GNU Lesser General Public License
-# version 3 along with OpenOffice.org.  If not, see
-# <http://www.openoffice.org/license.html>
-# for a copy of the LGPLv3 License.
-#
-#*************************************************************************
-
-package installer::servicesfile;
-
-use Cwd;
-use installer::converter;
-use installer::existence;
-use installer::exiter;
-use installer::globals;
-use installer::logger;
-use installer::pathanalyzer;
-use installer::remover;
-use installer::scriptitems;
-use installer::systemactions;
-
-################################################################
-# Adding the newly created file into the files collector
-################################################################
-
-sub add_services_sourcepath_into_filearray
-{
-    my ( $filesarrayref, $servicesfile, $servicesname ) = @_;
-
-    my $found = 0;
-    my $onefile;
-
-    for ( my $i = 0; $i <= $#{$filesarrayref}; $i++ )
-    {
-        $onefile = ${$filesarrayref}[$i];
-        my $name = $onefile->{'Name'};
-
-        if ( $servicesname eq $name )
-        {
-            $found = 1;
-            $onefile->{'sourcepath'} = $servicesfile;   # setting the sourcepath!
-            last;
-        }
-    }
-
-    if ( ! $found ) { installer::exiter::exit_program("ERROR: Did not find $servicesname in files collector!", "add_services_sourcepath_into_filearray"); }
-
-}
-
-################################################################
-# Generating a file url from a path
-################################################################
-
-sub make_file_url
-{
-    my ( $path ) = @_;
-
-    my $fileurl = "";
-
-    # removing ending slash/backslash
-
-    installer::remover::remove_ending_pathseparator(\$path);
-
-    if ($installer::globals::iswin)
-    {
-        $path =~ s/\\/\//g;
-        $fileurl = "file\:\/\/\/" . $path;
-    }
-    else
-    {
-        $fileurl = "file\:\/\/" . $path;
-    }
-
-    return $fileurl;
-}
-
-################################################################
-# Determining all sourcepath from the uno components
-################################################################
-
-sub get_all_sourcepathes
-{
-    my ( $filesref ) = @_;
-
-    my @pathes = ();
-
-    for ( my $i = 0; $i <= $#{$filesref}; $i++ )
-    {
-        my $onefile = ${$filesref}[$i];
-        my $path = $onefile->{'sourcepath'};
-
-        installer::pathanalyzer::get_path_from_fullqualifiedname(\$path);
-
-        if (! installer::existence::exists_in_array($path, \@pathes))
-        {
-            push(@pathes, $path);
-        }
-    }
-
-    return \@pathes;
-}
-
-################################################################
-# Registering all uno component files in the services.rdb
-################################################################
-
-sub register_unocomponents
-{
-    my ($allvariableshashref, $unocomponents, $regcompfileref, $servicesfile, $nativeservicesurlprefix) = @_;
-
-    installer::logger::include_header_into_logfile("Registering UNO components:");
-
-    my $error_occured = 0;
-    my $filestring = "";
-    for ( my $i = 0; $i <= $#{$unocomponents}; ++$i )
-    {
-        my $local_error1_occured = 0;
-        my $local_error2_occured = 0;
-
-        my $sourcepath = make_file_url(${$unocomponents}[$i]->{'sourcepath'});
-        my $urlprefix = ${$unocomponents}[$i]->{'NativeServicesURLPrefix'};
-        if (defined($urlprefix))
-        {
-            $local_error1_occured = call_regcomp($regcompfileref, $servicesfile, $sourcepath, $urlprefix);
-        }
-        else
-        {
-            $filestring .= ";" unless $filestring eq "";
-            $filestring .= $sourcepath;
-        }
-        if (length($filestring) > $installer::globals::unomaxservices ||
-            ($i == $#{$unocomponents} && $filestring ne ""))
-        {
-            $local_error2_occured = call_regcomp($regcompfileref, $servicesfile, $filestring, $nativeservicesurlprefix);
-            $filestring = "";
-        }
-
-        if (( $local_error1_occured ) || ( $local_error2_occured )) { $error_occured = 1; }
-    }
-
-    return $error_occured;
-}
-
-sub call_regcomp
-{
-    my ($regcompfileref, $servicesfile, $filestring, $urlprefix) = @_;
-    my @regcompoutput = ();
-
-    my $error_occured = 0;
-
-    my $systemcall = "$installer::globals::wrapcmd $$regcompfileref -register -r ".fix_cygwin_path($servicesfile)." -c "  . $installer::globals::quote . $filestring . $installer::globals::quote . " -wop=" . $installer::globals::quote . $urlprefix . $installer::globals::quote . " 2\>\&1 |";
-
-    open (REG, "$systemcall");
-    while (<REG>) {push(@regcompoutput, $_); }
-    close (REG);
-
-    my $returnvalue = $?;   # $? contains the return value of the systemcall
-
-    my $infoline = "Systemcall: $systemcall\n";
-    push( @installer::globals::logfileinfo, $infoline);
-
-    for ( my $j = 0; $j <= $#regcompoutput; $j++ ) { push( @installer::globals::logfileinfo, "$regcompoutput[$j]"); }
-
-    if ($returnvalue)
-    {
-        $infoline = "ERROR: $systemcall\n";
-        push( @installer::globals::logfileinfo, $infoline);
-        $error_occured = 1;
-    }
-    else
-    {
-        $infoline = "SUCCESS: $systemcall\n";
-        push( @installer::globals::logfileinfo, $infoline);
-    }
-
-    return $error_occured;
-}
-
-################################################################
-# Registering all java component files in the services.rdb
-################################################################
-
-sub register_javacomponents
-{
-    my ($allvariableshashref, $javacomponents, $regcompfileref, $servicesfile, $regcomprdb, $javaservicesurlprefix) = @_;
-
-    installer::logger::include_header_into_logfile("Registering Java components:");
-
-    my $ridljar_ref = "ridl.jar";
-    my $ure_internal_java_dir_ref = installer::scriptitems::get_sourcepath_from_filename_and_includepath(\$ridljar_ref, "", 1);
-    installer::pathanalyzer::get_path_from_fullqualifiedname($ure_internal_java_dir_ref);
-    if ( $$ure_internal_java_dir_ref eq "" ) { installer::exiter::exit_program("Could not determine URE_INTERNAL_JAVA_DIR when registering Java components!", "register_javacomponents"); }
-
-    my $error_occured = 0;
-
-    my $do_register = 1;
-    if (!( $installer::globals::solarjava )) { $do_register = 0; }
-
-    if ( $do_register )
-    {
-        my $filestring = "";
-
-        for ( my $i = 0; $i <= $#{$javacomponents}; )
-        {
-            my $sourcepath = ${$javacomponents}[$i++]->{'sourcepath'};
-
-            $filestring = $filestring . make_file_url($sourcepath);
-
-            if ( $i % $installer::globals::javamaxservices == 0 || $i > $#{$javacomponents} )   # limiting to $installer::globals::maxservices files
-            {
-                my @regcompoutput = ();
-
-                my $systemcall = "$installer::globals::wrapcmd $$regcompfileref -register -br ".fix_cygwin_path($regcomprdb)." -r ".fix_cygwin_path($servicesfile)." -c " . $installer::globals::quote . $filestring . $installer::globals::quote . " -l com.sun.star.loader.Java2 -wop=" . $installer::globals::quote . $javaservicesurlprefix . $installer::globals::quote ." -env:URE_INTERNAL_JAVA_DIR=" . $installer::globals::quote . make_file_url($$ure_internal_java_dir_ref) . $installer::globals::quote . " 2\>\&1 |";
-
-                open (REG, "$systemcall");
-                while (<REG>) {push(@regcompoutput, $_); }
-                close (REG);
-
-                my $returnvalue = $?;   # $? contains the return value of the systemcall
-
-                my $infoline = "Systemcall: $systemcall\n";
-                push( @installer::globals::logfileinfo, $infoline);
-
-                for ( my $k = 0; $k <= $#regcompoutput; $k++ ) { push( @installer::globals::logfileinfo, "$regcompoutput[$k]"); }
-
-                if ($returnvalue)
-                {
-                    $infoline = "ERROR: $systemcall\n";
-                    $error_occured = 1;
-                }
-                else
-                {
-                    $infoline = "SUCCESS: $systemcall\n";
-                }
-
-                push( @installer::globals::logfileinfo, $infoline);
-
-                $filestring = "";
-            }
-            else
-            {
-                $filestring = $filestring . ";";
-            }
-        }
-    }
-
-    return $error_occured;
-}
-
-
-
-################################################################
-# Helper routine to change cygwin (POSIX) path to DOS notation
-# if needed
-################################################################
-sub fix_cygwin_path
-{
-    my ( $path ) = @_;
-
-    if ( $installer::globals::iswin eq 1 && $installer::globals::wrapcmd eq "" )
-    {
-    $path = qx{cygpath -m "$path"};
-    chomp($path);
-    }
-
-    return $path;
-}
-
-
-
-################################################################
-# Registering all uno component files in the services.rdb
-################################################################
-sub get_source_path_cygwin_safe
-{
-    my ( $name, $array, $int ) = @_;
-
-    my $ret = installer::scriptitems::get_sourcepath_from_filename_and_includepath(\$name, $array, $int);
-    if ( $installer::globals::iswin eq 1 )
-    {
-    if( substr( $$ret, 1,1 ) eq ":" )
-    {
-        chomp($$ret = qx{cygpath -u "$$ret"});
-    }
-    }
-    return $ret;
-}
-
-sub register_pythoncomponents
-{
-    my ($pythoncomponents, $regcompfileref, $servicesfile,$includepatharrayref) = @_;
-
-    installer::logger::include_header_into_logfile("Registering python UNO components:");
-
-    my $error_occured = 0;
-    my $counter = 0;
-
-    my $systemcall = "";
-
-    my $allsourcepathes = get_all_sourcepathes($pythoncomponents);
-
-    for ( my $j = 0; $j <= $#{$allsourcepathes}; $j++ )
-    {
-        my $filestring = "";
-        my $onesourcepath = ${$allsourcepathes}[$j];
-        my $to = "";
-        my $from = cwd();
-        if ( $installer::globals::iswin ) { $from =~ s/\//\\/g; }
-
-        my $typesrdbname = "types.rdb";
-
-        # FIXME: Remove the unneeded
-        # get_source_path_cygwin_safe() -> fix_cygwin_path()
-        # when WRAPCMD is gone
-        my $typesrdbref = get_source_path_cygwin_safe($typesrdbname, $includepatharrayref, 1);
-
-        if ( $$typesrdbref eq "" ) { installer::exiter::exit_program("ERROR: Could not find file $typesrdbname !", "register_pythoncomponents"); }
-
-        my $pyunoservicesrdbname = "pyuno_services.rdb";
-        my $pyunoservicesrdbref = get_source_path_cygwin_safe($pyunoservicesrdbname, $includepatharrayref, 1);
-
-        if ( $$pyunoservicesrdbref eq "" ) { installer::exiter::exit_program("ERROR: Could not find file $pyunoservicesrname !", "register_pythoncomponents"); }
-
-        for ( my $i = 0; $i <= $#{$pythoncomponents}; $i++ )
-        {
-            my $doinclude = 1;
-            my $sourcepath = ${$pythoncomponents}[$i]->{'sourcepath'};
-
-            $to = $sourcepath;
-            installer::pathanalyzer::get_path_from_fullqualifiedname(\$to);
-
-            if (!($to eq $onesourcepath)) { $doinclude = 0; }
-
-            if ( $doinclude )
-            {
-                my $filename = ${$pythoncomponents}[$i]->{'Name'};
-                $filestring = $filestring . $filename . "\;";
-                $counter++;
-            }
-
-            if ( $counter > 0 )
-            {
-                $filestring =~ s/\;\s*$//;
-                $filestring = substr( $filestring, 0, length($filestring)-3);
-                chdir($onesourcepath);
-
-                my @regcompoutput = ();
-
-                $systemcall = "$installer::globals::wrapcmd $$regcompfileref -register"
-                . " -br " . fix_cygwin_path($$typesrdbref)
-                . " -br " . fix_cygwin_path($$pyunoservicesrdbref)
-                . " -r " . fix_cygwin_path($servicesfile)
-                . " -c vnd.openoffice.pymodule:" . $filestring . " -l com.sun.star.loader.Python 2\>\&1 |";
-
-                open (REG, "$systemcall");
-                while (<REG>) {push(@regcompoutput, $_); }
-                close (REG);
-
-                my $returnvalue = $?;   # $? contains the return value of the systemcall
-
-                my $infoline = "Systemcall: $systemcall\n";
-                push( @installer::globals::logfileinfo, $infoline);
-
-                for ( my $j = 0; $j <= $#regcompoutput; $j++ ) { push( @installer::globals::logfileinfo, "$regcompoutput[$j]"); }
-
-                if ($returnvalue)
-                {
-                    $infoline = "ERROR: $systemcall\n";
-                    push( @installer::globals::logfileinfo, $infoline);
-                    $error_occured = 1;
-                }
-                else
-                {
-                    $infoline = "SUCCESS: $systemcall\n";
-                    push( @installer::globals::logfileinfo, $infoline);
-                }
-
-                chdir($from);
-
-                $counter = 0;
-                $filestring = "";
-            }
-        }
-    }
-
-    return $error_occured;
-}
-
-################################################################
-# Iterating over all files, to find all files with the
-# style UNO_COMPONENT. This can be libraries and jar files.
-################################################################
-
-sub register_all_components
-{
-    my ( $allvariableshashref, $servicesgid, $filesarrayref, $regcompfileref, $servicesfile, $regcomprdb, $includepatharrayref, $nativeservicesurlprefix, $javaservicesurlprefix ) = @_;
-
-    my $registererrorflag = 0;
-
-    my @unocomponents = ();
-    my @javacomponents = ();
-    my @pythoncomponents = ();
-
-    for ( my $i = 0; $i <= $#{$filesarrayref}; $i++ )
-    {
-        my $onefile = ${$filesarrayref}[$i];
-        my $styles = "";
-        my $regmergefile = "";
-        my $registryid = "";
-
-        if ( $onefile->{'RegistryID'} ) { $registryid = $onefile->{'RegistryID'}; }
-
-        if ( $servicesgid ne $registryid ) { next; } # only registration for the current $servicesgid
-
-        if ( $onefile->{'Regmergefile'} ) { $regmergefile = $onefile->{'Regmergefile'}; }
-
-        if ( $onefile->{'Styles'} ) { $styles = $onefile->{'Styles'}; }
-
-        if (( $styles =~ /\bUNO_COMPONENT\b/ ) && ( $regmergefile eq "" ))  # regmergefiles will not be registered with regcomp
-        {
-            my $filename = $onefile->{'Name'};
-
-            if ( $filename =~ /\.jar\s*$/ ) # java component
-            {
-                push(@javacomponents, $onefile);
-            }
-            elsif( $filename =~ /\.py\s*$/ )    # python_component
-            {
-                push(@pythoncomponents, $onefile);
-            }
-            else                            # uno component
-            {
-                push(@unocomponents, $onefile);
-            }
-        }
-    }
-
-    $uno_error_occured = 0;
-    $java_error_occured = 0;
-    $python_error_occured = 0;
-
-    if ( $#unocomponents > -1 ) { $uno_error_occured = register_unocomponents($allvariableshashref, \@unocomponents, $regcompfileref, $servicesfile, $nativeservicesurlprefix); }
-    if ( $#javacomponents > -1 ) { $java_error_occured = register_javacomponents($allvariableshashref, \@javacomponents, $regcompfileref, $servicesfile, $regcomprdb, $javaservicesurlprefix); }
-    if ( $#pythoncomponents > -1 ) { $python_error_occured = register_pythoncomponents(\@pythoncomponents, $regcompfileref, $servicesfile, $includepatharrayref); }
-
-    if ( $uno_error_occured || $java_error_occured || $python_error_occured ) { $registererrorflag = 1; }
-
-    return $registererrorflag;
-}
-
-###################################################
-# Include the solver lib directory into
-# the LD_LIBRARY_PATH for Unix platforms
-###################################################
-
-sub include_libdir_into_ld_library_path
-{
-    my ( $var, $binfile ) = @_;
-
-    my $ld_library_path = $binfile;
-    installer::pathanalyzer::get_path_from_fullqualifiedname(\$ld_library_path);
-    $ld_library_path =~ s/\/\s*$//;     # removing ending slashes
-    $ld_library_path =~ s/\/bin\./\/lib\./;
-    $ld_library_path =~ s/\/bin\s*$/\/lib/; # when packing from flat
-
-    my $oldldlibrarypathstring = $ENV{$var};
-    my $new_ld_library_path = $ld_library_path;
-    if ( defined $oldldlibrarypathstring ) {
-        $new_ld_library_path = $new_ld_library_path . $installer::globals::pathseparator . $oldldlibrarypathstring;
-    }
-    if ( $ENV{'SYSTEM_MOZILLA'} && $ENV{'SYSTEM_MOZILLA'} eq "YES" &&
-      (!$ENV{'WITH_OPENLDAP'} || $ENV{'WITH_OPENLDAP'} ne "YES")) {
-        $new_ld_library_path = $new_ld_library_path . $installer::globals::pathseparator . $ENV{'MOZ_LIB'};
-    }
-    $ENV{$var} = $new_ld_library_path;
-
-    my $infoline = "Setting $var to $ENV{$var}\n";
-    push( @installer::globals::logfileinfo, $infoline);
-}
-
-##################################################################
-# Setting the needed jar files into the CLASSPATH
-# They are needed from regcomp.
-# The jar files are defined in @installer::globals::regcompjars
-##################################################################
-
-sub prepare_classpath_for_java_registration
-{
-    my ( $includepatharrayref ) = @_;
-    my $local_pathseparator = $installer::globals::pathseparator;
-
-    if( $^O =~ /cygwin/i )
-    {   # $CLASSPATH must use DOS separator even when using cygwin's perl
-        $local_pathseparator = ';';
-    }
-
-    for ( my $i = 0; $i <= $#installer::globals::regcompjars; $i++ )
-    {
-        my $filename = $installer::globals::regcompjars[$i];
-
-        my $jarfileref = installer::scriptitems::get_sourcepath_from_filename_and_includepath(\$filename, $includepatharrayref, 1);
-
-        if ( $$jarfileref eq "" ) { installer::exiter::exit_program("ERROR: Could not find file $filename for registering java components!", "prepare_classpath_for_java_registration"); }
-
-        my $oldclasspathstring = "";
-        if ( $ENV{'CLASSPATH'} ) { $oldclasspathstring = $ENV{'CLASSPATH'}; }
-        else { $oldclasspathstring = "\."; }
-        my $classpathstring = $$jarfileref . $local_pathseparator . $oldclasspathstring;
-        if ( $^O =~ /cygwin/i ) {
-            $classpathstring =~ s/\//\\/g;      # guw.pl likes '\' in $PATH.
-        }
-        $ENV{'CLASSPATH'} = $classpathstring;
-
-        my $infoline = "Setting CLASSPATH to $ENV{'CLASSPATH'}\n";
-        push( @installer::globals::logfileinfo, $infoline);
-    }
-}
-
-##################################################################
-# Setting the jdk lib into the LD_LIBRARY_PATH (Unix)
-# This is used by regcomp to register Java components.
-# The jdk lib is defined in $installer::globals::jdklib
-##################################################################
-
-sub add_jdklib_into_ld_library_path
-{
-    my ($var) = @_;
-    if (defined $installer::globals::jdklib) {
-        my $oldldlibrarypathstring = $ENV{$var};
-        my $new_ld_library_path = $installer::globals::jdklib;
-        if (defined $oldldlibrarypathstring) {
-            $new_ld_library_path .=
-                $installer::globals::pathseparator . $oldldlibrarypathstring;
-        }
-        $ENV{$var} = $new_ld_library_path;
-        my $infoline = "Setting $var to $ENV{$var}\n";
-        push( @installer::globals::logfileinfo, $infoline);
-    }
-}
-
-##################################################################
-# Adding the libraries included in zip files into path variable
-# (for example mozruntime.zip). This is needed to register all
-# libraries successfully.
-##################################################################
-
-sub add_path_to_pathvariable_directory
-{
-    my ( $filesarrayref, $searchstring ) = @_;
-
-    # determining the path
-
-    my $path = "";
-
-    for ( my $i = 0; $i <= $#{$filesarrayref}; $i++ )
-    {
-        my $onefile = ${$filesarrayref}[$i];
-        my $sourcepath = $onefile->{'sourcepath'};
-
-        installer::pathanalyzer::get_path_from_fullqualifiedname(\$sourcepath);
-        installer::remover::remove_ending_pathseparator(\$sourcepath);
-
-        if ( $sourcepath =~ /\Q$searchstring\E\s*$/ )
-        {
-            $path = $sourcepath;
-            last;
-        }
-    }
-
-    # adding the path to the PATH variable
-
-    if ( $path ne "" )
-    {
-        my $oldpath = "";
-        if ( $ENV{'PATH'} ) { $oldpath = $ENV{'PATH'}; }
-        else { $oldpath = "\."; }
-        if ( $^O =~ /cygwin/i ) {
-            $path = qx(cygpath -u "$path");
-            chomp $path;
-        }
-        my $newpath = $path . $installer::globals::pathseparator . $oldpath;
-        $ENV{'PATH'} = $newpath;
-
-        my $infoline = "Setting PATH to $ENV{'PATH'}\n";
-        push( @installer::globals::logfileinfo, $infoline);
-    }
-}
-
-##################################################################
-# Adding the path of a specified library to the path variable
-# (for example msvcr70.dll). This is needed to register all
-# libraries successfully.
-##################################################################
-
-sub add_path_to_pathvariable
-{
-    my ( $filesarrayref, $searchstring ) = @_;
-
-    # determining the path
-
-    my $path = "";
-
-    for ( my $i = 0; $i <= $#{$filesarrayref}; $i++ )
-    {
-        my $onefile = ${$filesarrayref}[$i];
-        my $sourcepath = $onefile->{'sourcepath'};
-
-        if ( $sourcepath =~ /\Q$searchstring\E\s*$/ )
-        {
-            installer::pathanalyzer::get_path_from_fullqualifiedname(\$sourcepath);
-            installer::remover::remove_ending_pathseparator(\$sourcepath);
-            $path = $sourcepath;
-            last;
-        }
-    }
-
-    # adding the path to the PATH variable
-
-    if ( $path ne "" )
-    {
-        my $oldpath = "";
-        if ( $ENV{'PATH'} ) { $oldpath = $ENV{'PATH'}; }
-        else { $oldpath = "\."; }
-        if ( $^O =~ /cygwin/i ) {
-            $path = qx(cygpath -u "$path");
-            chomp $path;
-        }
-        my $newpath = $path . $installer::globals::pathseparator . $oldpath;
-        $ENV{'PATH'} = $newpath;
-
-        my $infoline = "Setting PATH to $ENV{'PATH'}\n";
-        push( @installer::globals::logfileinfo, $infoline);
-    }
-}
-
-##################################################################
-# Setting the jre path into the PATH (Windows only)
-# This is used by regcomp.exe to register Java components.
-# The jre path is saved in $installer::globals::jrepath
-##################################################################
-
-sub add_jrepath_into_path
-{
-    my $oldpath = "";
-    if ( $ENV{'PATH'} ) { $oldpath = $ENV{'PATH'}; }
-    else { $oldpath = "\."; }
-
-    if ( $installer::globals::jrepath ne "" )
-    {
-        my $newpath = $installer::globals::jrepath . $installer::globals::pathseparator . $oldpath;
-        $ENV{'PATH'} = $newpath;
-
-        my $infoline = "Setting PATH to $ENV{'PATH'}\n";
-        push( @installer::globals::logfileinfo, $infoline);
-    }
-}
-
-#######################################################################################
-# Preparing a registry "regcomp.rdb" which regcomp can work on (types+java services).
-# Copying the "udkapi.rdb", renaming it to "regcomp.rdb" and registering the
-# libraries @installer::globals::regcompregisterlibs, which are javavm.uno.so
-# and javaloader.uno.so or javavm.uno.dll and javaloader.uno.dll
-#######################################################################################
-
-sub prepare_regcomp_rdb
-{
-    my ( $regcompfile, $servicesdir, $includepatharrayref) = @_;
-
-    # udkapi.rdb has to be found in the sourcepath
-
-    my $filename = "udkapi.rdb";
-    my $udkapirdbref = installer::scriptitems::get_sourcepath_from_filename_and_includepath(\$filename, $includepatharrayref, 1);
-    if ( $$udkapirdbref eq "" ) { installer::exiter::exit_program("ERROR: Could not find file $filename for creating regcomp.rdb!", "prepare_regcomp_rdb"); }
-
-    my $regcompfilename = "regcomp.rdb";
-    my $regcomprdb = $servicesdir . $installer::globals::separator . $regcompfilename;
-
-    # If there is an older version of this file, it has to be removed
-    if ( -f $regcomprdb ) { unlink($regcomprdb); }
-
-    installer::systemactions::copy_one_file($$udkapirdbref, $regcomprdb);
-
-    # now the libraries in @installer::globals::regcompregisterlibs can be registered in the "regcomp.rdb"
-
-    for ( my $i = 0; $i <= $#installer::globals::regcompregisterlibs; $i++ )
-    {
-        my $libfilename = $installer::globals::regcompregisterlibs[$i] . $installer::globals::libextension;
-        my $libfileref = installer::scriptitems::get_sourcepath_from_filename_and_includepath(\$libfilename, $includepatharrayref, 1);
-        if ( $$libfileref eq "" ) { installer::exiter::exit_program("ERROR: Could not find file $libfilename for creating regcomp.rdb!", "prepare_regcomp_rdb"); }
-
-        my $from = cwd();
-        if ( $installer::globals::iswin ) { $from =~ s/\//\\/g; }
-
-        my $to = $$libfileref;
-        installer::pathanalyzer::get_path_from_fullqualifiedname(\$to);
-
-        chdir($to);
-
-        my $systemcall = "$installer::globals::wrapcmd $regcompfile -register -s -r " . fix_cygwin_path($regcomprdb) . " -c $libfilename";
-
-        my $returnvalue = system($systemcall);
-
-        chdir($from);
-
-        my $infoline;
-        if ($returnvalue) { $infoline = "ERROR: $systemcall\n"; }
-        else { $infoline = "SUCCESS: $systemcall\n"; }
-
-        push( @installer::globals::logfileinfo, $infoline);
-    }
-
-    return $regcomprdb;
-}
-
-################################################################
-# Collecting all gids of the databases, that are part of
-# the file definition
-################################################################
-
-sub collect_all_services_gids
-{
-    my ($filesarrayref) = @_;
-
-    my @databasegids = ();
-    my $error_occured = 0;
-    my @error_files = ();
-
-    for ( my $i = 0; $i <= $#{$filesarrayref}; $i++ )
-    {
-        my $onefile = ${$filesarrayref}[$i];
-
-        if ( $onefile->{'RegistryID'} )
-        {
-            my $databasegid = $onefile->{'RegistryID'};
-            if (! installer::existence::exists_in_array($databasegid, \@databasegids)) { push(@databasegids, $databasegid); }
-        }
-        else
-        {
-            push(@error_files, $onefile->{'gid'});
-            $error_occured = 1;
-        }
-    }
-
-    if ( $error_occured )
-    {
-        my $infoline = "ERROR: Style UNO_COMPONENT is set, but no RegistryID is assigned!\n";
-        push( @installer::globals::logfileinfo, $infoline);
-        print $infoline;
-
-        for ( my $j = 0; $j <= $#error_files; $j++ )
-        {
-            $infoline = "$error_files[$j]\n";
-            push( @installer::globals::logfileinfo, $infoline);
-            print $infoline;
-        }
-
-        installer::exiter::exit_program("ERROR: File defintion error.", "collect_all_services_gids");
-    }
-
-    return \@databasegids;
-}
-
-######################################################################
-# All gids in $databasegids are as RegistryID assigned to files.
-# For all this Registry Files a definition has to exist.
-######################################################################
-
-sub check_defintion_of_databasegids
-{
-    my ($databasegids, $registryfiles) = @_;
-
-    my @registryfiles = ();
-
-    # First check: For all assigned Registry files, a definition of
-    # a file with flag STARREGISTRY has to exist.
-
-    for ( my $i = 0; $i <= $#{$databasegids}; $i++ )
-    {
-        my $onegid = ${$databasegids}[$i];
-        my $gid_defined = 0;
-
-        for ( my $j = 0; $j <= $#{$registryfiles}; $j++ )
-        {
-            my $registrygid = ${$registryfiles}[$j]->{'gid'};
-
-            if ( $onegid eq $registrygid )
-            {
-                $gid_defined = 1;
-                last;
-            }
-        }
-
-        if ( ! $gid_defined )
-        {
-            installer::exiter::exit_program("ERROR: Gid $onegid is assigned to file(s), but not defined!", "check_defintion_of_databasegids");
-        }
-    }
-
-    # Second check: If there is a file defined as StarRegistry, is a file with flag UNO_COMPONENT assigned?
-
-    for ( my $j = 0; $j <= $#{$registryfiles}; $j++ )
-    {
-        my $onefile = ${$registryfiles}[$j];
-        my $registrygid = $onefile->{'gid'};
-
-        my $gid_assigned = 0;
-
-        for ( my $i = 0; $i <= $#{$databasegids}; $i++ )
-        {
-            my $onegid = ${$databasegids}[$i];
-
-            if ( $onegid eq $registrygid )
-            {
-                $gid_assigned = 1;
-                last;
-            }
-        }
-
-        if ( ! $gid_assigned )
-        {
-            my $infoline = "Warning: $registrygid is defined with flag STARREGISTRY, but no file is assigned to the registry.\n";
-            push( @installer::globals::logfileinfo, $infoline);
-        }
-        else
-        {
-            push(@registryfiles, $onefile);
-        }
-    }
-
-    return \@registryfiles;
-}
-
-################################################################
-# Some files have flag UNO_COMPONENT, but are not registered
-# with regcomp. This files use the regmerge mechanism, that
-# is not used in this perl-file. Therefore this files
-# have to be filtered out here.
-################################################################
-
-sub filter_regmergefiles
-{
-    my ($unocomponentfiles) = @_;
-
-    my @regcompfiles = ();
-
-    for ( my $i = 0; $i <= $#{$unocomponentfiles}; $i++ )
-    {
-        my $onefile = ${$unocomponentfiles}[$i];
-        my $regmergefile = "";
-
-        if ( $onefile->{'Regmergefile'} ) { $regmergefile = $onefile->{'Regmergefile'}; }
-        if ( $regmergefile ne "" ) { next; }
-
-        push(@regcompfiles, $onefile);
-    }
-
-    return \@regcompfiles;
-}
-
-################################################################
-# Setting defaults for Creating services.rdb file by registering all uno components
-################################################################
-
-sub set_url_prefixes
-{
-    my ( $registryfile ) = @_;
-
-    my $nativeservicesurlprefix = "";
-    my $javaservicesurlprefix = "";
-
-    if ( $registryfile->{'NativeServicesURLPrefix'} ) { $nativeservicesurlprefix = $registryfile->{'NativeServicesURLPrefix'}; }
-    else { $nativeservicesurlprefix = "vnd.sun.star.expand:\$ORIGIN/"; }
-
-    if ( $registryfile->{'JavaServicesURLPrefix'} ) { $javaservicesurlprefix = $registryfile->{'JavaServicesURLPrefix'}; }
-    else { $javaservicesurlprefix = "vnd.sun.star.expand:\$UNO_JAVA_COMPONENT_PATH/"; }
-
-    return ($nativeservicesurlprefix, $javaservicesurlprefix);
-}
-
-################################################################
-# Creating services.rdb file by registering all uno components
-################################################################
-
-sub create_services_rdb
-{
-    my ($allvariableshashref, $filesarrayref, $includepatharrayref, $languagestringref) = @_;
-
-    # collecting all services files
-    my $unocomponentfiles = installer::worker::collect_all_items_with_special_flag($filesarrayref, "UNO_COMPONENT");
-    $unocomponentfiles = filter_regmergefiles($unocomponentfiles);
-
-    if ( $#{$unocomponentfiles} > -1 )  # not empty -> at least one file with flag UNO_COMPONENT
-    {
-        my $databasegids = collect_all_services_gids($unocomponentfiles);
-
-        my $registryfiles = installer::worker::collect_all_items_with_special_flag($filesarrayref, "STARREGISTRY");
-
-        $registryfiles = check_defintion_of_databasegids($databasegids, $registryfiles);
-
-        # Now the creation of all files with flag STARREGISTRY can begin
-
-        for ( my $i = 0; $i <= $#{$registryfiles}; $i++ )
-        {
-            my $registryfile = ${$registryfiles}[$i];
-
-            # my $servicesname = "services.rdb";
-            my $servicesname = $registryfile->{'Name'};  # not unique!
-            my $servicesgid = $registryfile->{'gid'};  # unique
-            my $uniquedirname = $servicesgid . "_servicesrdb";
-            # my $uniquedirname = $servicesgid;
-
-            my ($nativeservicesurlprefix, $javaservicesurlprefix) = set_url_prefixes($registryfile);
-
-            installer::logger::include_header_into_logfile("Creating $servicesname ($servicesgid):");
-
-            # my $servicesdir = installer::systemactions::create_directories($servicesname, $languagestringref);
-            my $servicesdir = installer::systemactions::create_directories($uniquedirname, $languagestringref);
-
-#           if ( $^O =~ /cygwin/i )
-#           {      # $servicesdir is used as a parameter for regcomp and has to be DOS style
-#               $servicesdir = qx{cygpath -d "$servicesdir"};
-#               chomp($servicesdir);
-#               $servicesdir =~ s/\\/\//g;
-#           }
-
-            push(@installer::globals::removedirs, $servicesdir);
-
-            my $servicesfile = $servicesdir . $installer::globals::separator . $servicesname;
-
-            # If there is an older version of this file, it has to be removed
-            if ( -f $servicesfile ) { unlink($servicesfile); }
-
-            # if ((-f $servicesfile) && (!($installer::globals::services_rdb_created))) { $installer::globals::services_rdb_created = 1; }
-            # if ((!($installer::globals::services_rdb_created)) && $installer::globals::servicesrdb_can_be_created )   # This has to be done once
-            if ( $installer::globals::servicesrdb_can_be_created )  # This has to be done always
-            {
-                # Creating the services.rdb in directory "inprogress"
-                my $origservicesdir = $servicesdir;
-                $servicesdir = installer::systemactions::make_numbered_dir("inprogress", $servicesdir);
-                $servicesfile = $servicesdir . $installer::globals::separator . $servicesname;
-
-                # determining the location of the file regcomp
-                # Because the program regcomp.exe (regcomp) is used now, it has to be taken the version
-                # from the platform, this script is running. It is not important, for which platform the
-                # product is built.
-
-                my $searchname;
-
-                if ($installer::globals::isunix) { $searchname = "regcomp"; }
-                else { $searchname = "regcomp.exe"; }
-
-                $regcompfileref = get_source_path_cygwin_safe($searchname, $includepatharrayref, 1);
-                if ( $$regcompfileref eq "" ) { installer::exiter::exit_program("ERROR: Could not find file $searchname for registering uno components!", "create_services_rdb"); }
-
-                # For Windows the libraries included into the mozruntime.zip have to be added to the path
-                if ($installer::globals::iswin) { add_path_to_pathvariable_directory($filesarrayref, "mozruntime_zip"); }
-                if ($installer::globals::iswin) { add_path_to_pathvariable($filesarrayref, "msvcr70.dll"); }
-
-                # setting the LD_LIBRARY_PATH, needed by regcomp
-                # Linux: Take care of the lock daemon. He has to be started!
-                # For windows it is necessary that "msvcp7x.dll" and "msvcr7x.dll" are included into the path !
-
-                my $var_library_path;
-                my $old_library_path;
-                if ( $installer::globals::isunix ) {
-                    $var_library_path = $installer::globals::ismacosx ?
-                        'DYLD_LIBRARY_PATH' : 'LD_LIBRARY_PATH';
-                    $old_library_path = $ENV{$var_library_path};
-                    include_libdir_into_ld_library_path(
-                        $var_library_path, $$regcompfileref);
-                }
-
-                my $regcomprdb = "";
-
-                if ( $installer::globals::solarjava )    # this is needed to register Java components
-                {
-                    prepare_classpath_for_java_registration($includepatharrayref);
-
-                    if ( $installer::globals::isunix )
-                    { add_jdklib_into_ld_library_path($var_library_path); }
-                    else { add_jrepath_into_path(); }
-
-                    # Preparing a registry which regcomp can work on (types+java services).
-                    # Copying the "udkapi.rdb", renaming it to "regcomp.rdb" and registering the
-                    # libraries $(REGISTERLIBS_JAVA), which are javavm.uno.so and javaloader.uno.so
-                    # or javavm.uno.dll and javaloader.uno.dll
-
-                    $regcomprdb = prepare_regcomp_rdb($$regcompfileref, $servicesdir, $includepatharrayref);
-                }
-
-                # and now iteration over all files
-
-                # my $error_during_registration = register_all_components($filesarrayref, $regcompfileref, $servicesfile, $regcomprdb, $includepatharrayref);
-                my $error_during_registration = register_all_components($allvariableshashref, $servicesgid, $unocomponentfiles, $regcompfileref, $servicesfile, $regcomprdb, $includepatharrayref, $nativeservicesurlprefix, $javaservicesurlprefix);
-
-                if (defined $var_library_path) {
-                    if (defined $old_library_path) {
-                        $ENV{$var_library_path} = $old_library_path;
-                    } else {
-                        delete $ENV{$var_library_path};
-                    }
-                }
-
-                # Dependent from the success, the registration directory can be renamed.
-
-                if ( $error_during_registration )
-                {
-                    $servicesdir = installer::systemactions::rename_string_in_directory($servicesdir, "inprogress", "witherror");
-                    push(@installer::globals::removedirs, $servicesdir);
-                    # and exiting the packaging process
-                    installer::exiter::exit_program("ERROR: Could not register all components for file $servicesname ($servicesgid)!", "create_services_rdb");
-                }
-                else
-                {
-                    $servicesdir = installer::systemactions::rename_directory($servicesdir, $origservicesdir);
-                }
-
-                $servicesfile = $servicesdir . $installer::globals::separator . $servicesname;
-            }
-            else
-            {
-                my $infoline;
-
-                if (!($installer::globals::servicesrdb_can_be_created))
-                {
-                    $infoline = "Warning: $servicesname was not created. Build platform and compiler do not match. Build platform: $installer::globals::plat, compiler : $installer::globals::compiler\n";
-                    push( @installer::globals::logfileinfo, $infoline);
-                }
-
-                if ( $installer::globals::services_rdb_created )
-                {
-                    $infoline = "Info: $servicesname was not created. $servicesfile already exists.\n";
-                    push( @installer::globals::logfileinfo, $infoline);
-                }
-
-                if ((!($installer::globals::servicesrdb_can_be_created)) && (!($installer::globals::services_rdb_created)))
-                {
-                    $infoline = "ERROR: $servicesname was not created and does not exist!\n";
-                    push( @installer::globals::logfileinfo, $infoline);
-                }
-            }
-
-            # Adding the new services file source path to the filearray
-            $registryfile->{'sourcepath'} = $servicesfile;  # setting the sourcepath!
-            # add_services_sourcepath_into_filearray( $filesarrayref, $servicesfile, $servicesname );
-        }
-    }
-
-    # Setting the global variable $installer::globals::services_rdb_created
-
-    $installer::globals::services_rdb_created = 1;
-}
-
-1;
diff --git a/solenv/bin/modules/installer/simplepackage.pm b/solenv/bin/modules/installer/simplepackage.pm
index fdf9fc6fa4c3..7936b6d00377 100644
--- a/solenv/bin/modules/installer/simplepackage.pm
+++ b/solenv/bin/modules/installer/simplepackage.pm
@@ -71,9 +71,10 @@ sub get_extensions_dir
 
     my $extensiondir = $subfolderdir . $installer::globals::separator;
     if ( $installer::globals::officedirhostname ne "" ) { $extensiondir = $extensiondir . $installer::globals::officedirhostname . $installer::globals::separator; }
-    $extensiondir = $extensiondir . "share" . $installer::globals::separator . "extensions";
+    my $extensionsdir = $extensiondir . "share" . $installer::globals::separator . "extensions";
+    my $preregdir = $extensiondir . "share" . $installer::globals::separator . "prereg" . $installer::globals::separator . "bundled";
 
-    return $extensiondir;
+    return ( $extensionsdir, $preregdir );
 }
 
 ####################################################
@@ -82,21 +83,24 @@ sub get_extensions_dir
 
 sub register_extensions
 {
-    my ($officedir, $languagestringref) = @_;
+    my ($officedir, $languagestringref, $preregdir) = @_;
+
+    my $infoline = "";
+
+    if ( $preregdir eq "" )
+    {
+        $infoline = "ERROR: Failed to determine directory \"prereg\" for extension registration! Please check your installation set.\n";
+        push( @installer::globals::logfileinfo, $infoline);
+        installer::exiter::exit_program($infoline, "register_extensions");
+    }
 
     my $programdir = $officedir . $installer::globals::separator;
-    # if ( $installer::globals::sundirhostname ne "" ) { $programdir = $programdir . $installer::globals::sundirhostname . $installer::globals::separator; }
     if ( $installer::globals::officedirhostname ne "" ) { $programdir = $programdir . $installer::globals::officedirhostname . $installer::globals::separator; }
     $programdir = $programdir . "program";
 
     my $from = cwd();
     chdir($programdir);
 
-    my $infoline = "";
-
-    # my $unopkgfile = $officedir . $installer::globals::separator . "program" .
-    #               $installer::globals::separator . $installer::globals::unopkgfile;
-
     my $unopkgfile = $installer::globals::unopkgfile;
 
     my $unopkgexists = 1;
@@ -107,87 +111,73 @@ sub register_extensions
         push( @installer::globals::logfileinfo, $infoline);
     }
 
-    # my $extensiondir = $officedir . $installer::globals::separator . "share" .
-    #           $installer::globals::separator . "extension" .
-    #           $installer::globals::separator . "install";
-
-    my $extensiondir = ".." . $installer::globals::separator . "share" . $installer::globals::separator . "extension" . $installer::globals::separator . "install";
-
-    my $allextensions = installer::systemactions::find_file_with_file_extension("oxt", $extensiondir);
+    if ( ! -f $unopkgfile )
+    {
+        $unopkgexists = 0;
+        $infoline = "Info: File $unopkgfile does not exist! Extensions cannot be registered.\n";
+        push( @installer::globals::logfileinfo, $infoline);
+    }
 
-    if (( $#{$allextensions} > -1 ) && ( $unopkgexists ))
+    if ( $unopkgexists )
     {
         my $currentdir = cwd();
         print "... current dir: $currentdir ...\n";
         $infoline = "Current dir: $currentdir\n";
         push( @installer::globals::logfileinfo, $infoline);
 
-        for ( my $i = 0; $i <= $#{$allextensions}; $i++ )
-        {
-            my $oneextension = $extensiondir . $installer::globals::separator . ${$allextensions}[$i];
-
-            # my $systemcall = $unopkgfile . " add --shared --suppress-license " . "\"" . $oneextension . "\"";
+        if ( ! -f $unopkgfile ) { installer::exiter::exit_program("ERROR: $unopkgfile not found!", "register_extensions"); }
 
-            if ( ! -f $unopkgfile ) { installer::exiter::exit_program("ERROR: $unopkgfile not found!", "register_extensions"); }
-            if ( ! -f $oneextension ) { installer::exiter::exit_program("ERROR: $oneextension not found!", "register_extensions"); }
+        my $localtemppath = installer::systemactions::create_directories("uno", $languagestringref);
 
-            my $localtemppath = installer::systemactions::create_directories("uno", $languagestringref);
+        my $slash = "";
 
-            if ( $installer::globals::iswindowsbuild )
+        if ( $installer::globals::iswindowsbuild )
+        {
+            if ( $^O =~ /cygwin/i )
             {
-                if ( $^O =~ /cygwin/i )
-                {
-                    $localtemppath = $installer::globals::cyg_temppath;
-                }
-                else
-                {
-                    $windowsslash = "\/";
-                }
-                $localtemppath =~ s/\\/\//g;
-                $localtemppath = "/".$localtemppath;
+                $localtemppath = $installer::globals::cyg_temppath;
+                $preregdir = qx{cygpath -m "$preregdir"};
+                chomp($preregdir);
             }
-            my $systemcall = $unopkgfile . " add --shared --suppress-license --verbose " . $oneextension . " -env:UserInstallation=file://" . $localtemppath . " 2\>\&1 |";
+            $localtemppath =~ s/\\/\//g;
+            $slash = "/"; # Third slash for Windows. Other OS pathes already start with "/"
+        }
 
-            print "... $systemcall ...\n";
+        $preregdir =~ s/\/\s*$//g;
 
-            $infoline = "Systemcall: $systemcall\n";
-            push( @installer::globals::logfileinfo, $infoline);
+        my $systemcall = $unopkgfile . " sync --verbose -env:BUNDLED_EXTENSIONS_USER=\"file://" . $slash . $preregdir . "\"" . " -env:UserInstallation=file://" . $slash . $localtemppath . " -env:UNO_JAVA_JFW_ENV_JREHOME=true 2\>\&1 |";
 
-            my @unopkgoutput = ();
+        print "... $systemcall ...\n";
 
-            open (UNOPKG, $systemcall);
-            while (<UNOPKG>)
-            {
-                my $lastline = $_;
-                push(@unopkgoutput, $lastline);
-            }
-            close (UNOPKG);
+        $infoline = "Systemcall: $systemcall\n";
+        push( @installer::globals::logfileinfo, $infoline);
 
-            my $returnvalue = $?;   # $? contains the return value of the systemcall
+        my @unopkgoutput = ();
 
-            if ($returnvalue)
-            {
-                # Writing content of @unopkgoutput only in the error case into the log file. Sometimes it
-                # contains strings like "Error" even in the case of success. This causes a packaging error
-                # when the log file is analyzed at the end, even if there is no real error.
-                for ( my $j = 0; $j <= $#unopkgoutput; $j++ ) { push( @installer::globals::logfileinfo, "$unopkgoutput[$j]"); }
+        open (UNOPKG, $systemcall);
+        while (<UNOPKG>)
+        {
+            my $lastline = $_;
+            push(@unopkgoutput, $lastline);
+        }
+        close (UNOPKG);
 
-                $infoline = "ERROR: Could not execute \"$systemcall\"!\nExitcode: '$returnvalue'\n";
-                push( @installer::globals::logfileinfo, $infoline);
-                installer::exiter::exit_program("ERROR: $systemcall failed!", "register_extensions");
-            }
-            else
-            {
-                $infoline = "Success: Executed \"$systemcall\" successfully!\n";
-                push( @installer::globals::logfileinfo, $infoline);
-            }
+        my $returnvalue = $?;   # $? contains the return value of the systemcall
+
+        if ($returnvalue)
+        {
+            # Writing content of @unopkgoutput only in the error case into the log file. Sometimes it
+            # contains strings like "Error" even in the case of success. This causes a packaging error
+            # when the log file is analyzed at the end, even if there is no real error.
+            for ( my $j = 0; $j <= $#unopkgoutput; $j++ ) { push( @installer::globals::logfileinfo, "$unopkgoutput[$j]"); }
+
+            $infoline = "ERROR: Could not execute \"$systemcall\"!\nExitcode: '$returnvalue'\n";
+            push( @installer::globals::logfileinfo, $infoline);
+            installer::exiter::exit_program("ERROR: $systemcall failed!", "register_extensions");
         }
-    }
-    else
-    {
-        if ( ! ( $#{$allextensions} > -1 ))
+        else
         {
-            $infoline = "No extensions located in directory $extensiondir.\n";
+            $infoline = "Success: Executed \"$systemcall\" successfully!\n";
             push( @installer::globals::logfileinfo, $infoline);
         }
     }
@@ -662,6 +652,7 @@ sub create_simple_package
         if ( $onedir->{'HostName'} )
         {
             my $destdir = $subfolderdir . $installer::globals::separator . $onedir->{'HostName'};
+
             if ( ! -d $destdir )
             {
                 if ( $^O =~ /cygwin/i ) # Cygwin performance check
@@ -787,19 +778,18 @@ sub create_simple_package
         system($localcall);
     }
 
-    # Registering the extensions
-
-    # installer::logger::print_message( "... registering extensions ...\n" );
-    # installer::logger::include_header_into_logfile("Registering extensions:");
-    # register_extensions($subfolderdir, $languagestringref);
-
     installer::logger::print_message( "... removing superfluous directories ...\n" );
     installer::logger::include_header_into_logfile("Removing superfluous directories:");
 
-    my $extensionfolder = get_extensions_dir($subfolderdir);
-
+    my ( $extensionfolder, $preregdir ) = get_extensions_dir($subfolderdir);
     installer::systemactions::remove_empty_dirs_in_folder($extensionfolder);
 
+    # Registering the extensions
+
+    installer::logger::print_message( "... registering extensions ...\n" );
+    installer::logger::include_header_into_logfile("Registering extensions:");
+    register_extensions($subfolderdir, $languagestringref, $preregdir);
+
     if ( $installer::globals::compiler =~ /^unxmacx/ )
     {
         installer::worker::put_scpactions_into_installset("$installdir/$packagename");
diff --git a/solenv/bin/modules/installer/systemactions.pm b/solenv/bin/modules/installer/systemactions.pm
index 981dc40f3209..24b070574189 100644
--- a/solenv/bin/modules/installer/systemactions.pm
+++ b/solenv/bin/modules/installer/systemactions.pm
@@ -292,6 +292,27 @@ sub remove_empty_directory
 }
 
 #######################################################################
+# Calculating the number of languages in the string
+#######################################################################
+
+sub get_number_of_langs
+{
+    my ($languagestring) = @_;
+
+    my $number = 1;
+
+    my $workstring = $languagestring;
+
+    while ( $workstring =~ /^\s*(.*)_(.*?)\s*$/ )
+    {
+        $workstring = $1;
+        $number++;
+    }
+
+    return $number;
+}
+
+#######################################################################
 # Creating the directories, in which files are generated or unzipped
 #######################################################################
 
@@ -380,8 +401,11 @@ sub create_directories
 
             if (length($languagestring) > $installer::globals::max_lang_length )
             {
+                my $number_of_languages = get_number_of_langs($languagestring);
                 chomp(my $shorter = `echo $languagestring | md5sum | sed -e "s/ .*//g"`);
-                $languagestring = $shorter;
+                # $languagestring = $shorter;
+                my $id = substr($shorter, 0, 8); # taking only the first 8 digits
+                $languagestring = "lang_" . $number_of_languages . "_id_" . $id;
             }
 
             $path = $path . $languagestring  . $installer::globals::separator;
diff --git a/solenv/bin/modules/installer/windows/property.pm b/solenv/bin/modules/installer/windows/property.pm
index e9f122a54d86..35866103d9fa 100644
--- a/solenv/bin/modules/installer/windows/property.pm
+++ b/solenv/bin/modules/installer/windows/property.pm
@@ -316,6 +316,11 @@ sub set_important_properties
     {
         my $onepropertyline = "OFFICEDIRHOSTNAME" . "\t" . $installer::globals::officedirhostname . "\n";
         push(@{$propertyfile}, $onepropertyline);
+
+        my $localofficedirhostname = $installer::globals::officedirhostname;
+        $localofficedirhostname =~ s/\//\\/g;
+        $onepropertyline = "OFFICEDIRHOSTNAME_" . "\t" . $localofficedirhostname . "\n";
+        push(@{$propertyfile}, $onepropertyline);
     }
 
     if ( $installer::globals::sundirhostname )
diff --git a/solenv/bin/modules/installer/ziplist.pm b/solenv/bin/modules/installer/ziplist.pm
index ddc98c43bdb7..9a5460cacb3c 100644
--- a/solenv/bin/modules/installer/ziplist.pm
+++ b/solenv/bin/modules/installer/ziplist.pm
@@ -806,6 +806,7 @@ sub add_variables_to_allvariableshashref
     $variableshashref->{'PRODUCTMINOR'} = $localminor;
 
     $variableshashref->{'PRODUCTBUILDID'} = $installer::globals::buildid;
+    $variableshashref->{'SYSTEM_LIBTEXTCAT_DATA'} = $ENV{'SYSTEM_LIBTEXTCAT_DATA'} , if( defined $ENV{'SYSTEM_LIBTEXTCAT_DATA'} && $ENV{'SYSTEM_LIBTEXTCAT_DATA'} ne "" );
 }
 
 1;
diff --git a/solenv/bin/modules/par2script/check.pm b/solenv/bin/modules/par2script/check.pm
index 7a975f530445..78808cee9191 100644
--- a/solenv/bin/modules/par2script/check.pm
+++ b/solenv/bin/modules/par2script/check.pm
@@ -139,55 +139,6 @@ sub check_module_existence
 }
 
 ########################################################
-# If the StarRegistry is not defined in the script,
-# it has to be removed from the file definition.
-########################################################
-
-sub check_registry_at_files
-{
-    my %starregistrygid = ();
-
-    my $item;
-    foreach $item ( keys %{$par2script::globals::definitions{'File'}} )
-    {
-        if (( exists($par2script::globals::definitions{'File'}->{$item}->{'Styles'}) ) &&
-            ( $par2script::globals::definitions{'File'}->{$item}->{'Styles'} =~ /\bSTARREGISTRY\b/ ))
-        {
-            $starregistrygid{$item} = 1;
-        }
-    }
-
-    foreach $item ( keys %{$par2script::globals::definitions{'File'}} )
-    {
-        if ( exists($par2script::globals::definitions{'File'}->{$item}->{'RegistryID'}) )
-        {
-            my $registryid = $par2script::globals::definitions{'File'}->{$item}->{'RegistryID'};
-            if ( ! exists($starregistrygid{$registryid}) )
-            {
-                die "\nERROR: No definition found for $registryid at file $item\n\n";
-            }
-
-            # if ( ! ( $par2script::globals::definitions{'File'}->{$item}->{'Styles'} =~ /\bUNO_COMPONENT\b/ ))
-            # {
-            #   die "\nERROR: Flag UNO_COMPONENT required for file $item\n\n";
-            # }
-            # -> also possible, that Regmergefile is defined (does not require flag UNO_COMPONENT)
-        }
-
-        # and also vice versa
-
-        if (( exists($par2script::globals::definitions{'File'}->{$item}->{'Styles'}) ) &&
-            ( $par2script::globals::definitions{'File'}->{$item}->{'Styles'} =~ /\bUNO_COMPONENT\b/ ))
-        {
-            if ( ! exists($par2script::globals::definitions{'File'}->{$item}->{'RegistryID'}) )
-            {
-                die "\nERROR: Flag UNO_COMPONENT defined, but no file as \"RegistryID\" at file $item !\n\n";
-            }
-        }
-    }
-}
-
-########################################################
 # Every script has to contain exactly one root module.
 # This module has no ParentID or an empty ParentID.
 ########################################################
diff --git a/solenv/bin/packcomponents.xslt b/solenv/bin/packcomponents.xslt
new file mode 100644
index 000000000000..6e037a677f73
--- /dev/null
+++ b/solenv/bin/packcomponents.xslt
@@ -0,0 +1,52 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--**********************************************************************
+*
+* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
+*
+* Copyright 2000, 2010 Oracle and/or its affiliates.
+*
+* OpenOffice.org - a multi-platform office productivity suite
+*
+* This file is part of OpenOffice.org.
+*
+* OpenOffice.org is free software: you can redistribute it and/or modify
+* it under the terms of the GNU Lesser General Public License version 3
+* only, as published by the Free Software Foundation.
+*
+* OpenOffice.org is distributed in the hope that it will be useful,
+* but WITHOUT ANY WARRANTY; without even the implied warranty of
+* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+* GNU Lesser General Public License version 3 for more details
+* (a copy is included in the LICENSE file that accompanied this code).
+*
+* You should have received a copy of the GNU Lesser General Public License
+* version 3 along with OpenOffice.org.  If not, see
+* <http://www.openoffice.org/license.html>
+* for a copy of the LGPLv3 License.
+*
+**********************************************************************-->
+
+<xsl:stylesheet version="1.0" xmlns:xsl="http://www.w3.org/1999/XSL/Transform"
+    xmlns:uc="http://openoffice.org/2010/uno-components">
+  <xsl:param name="prefix"/>
+  <xsl:strip-space elements="*"/>
+  <xsl:template match="/">
+    <xsl:element name="components"
+        namespace="http://openoffice.org/2010/uno-components">
+      <xsl:for-each select="list/filename">
+        <xsl:variable name="doc" select="document(concat($prefix, .))"/>
+        <xsl:choose>
+          <xsl:when test="count($doc/uc:component) = 1">
+            <xsl:copy-of select="$doc/uc:component"/>
+          </xsl:when>
+          <xsl:otherwise>
+            <xsl:message terminate="yes">
+              <xsl:text>cannot process </xsl:text>
+              <xsl:value-of select="."/>
+            </xsl:message>
+          </xsl:otherwise>
+        </xsl:choose>
+      </xsl:for-each>
+    </xsl:element>
+  </xsl:template>
+</xsl:stylesheet>
diff --git a/solenv/bin/par2script.pl b/solenv/bin/par2script.pl
index 0789c460d510..06928ad68439 100644
--- a/solenv/bin/par2script.pl
+++ b/solenv/bin/par2script.pl
@@ -86,8 +86,6 @@ print "Checking module definitions ...\n";
 par2script::check::check_module_existence();
 print "Checking module assignments ...\n";
 par2script::check::check_moduleid_at_items();
-print "Checking StarRegistry ...\n";
-par2script::check::check_registry_at_files();
 print "Checking Root Module ...";
 par2script::check::check_rootmodule();
 print "Checking Shortcut assignments ...\n";
diff --git a/solenv/bin/rpm-wrapper b/solenv/bin/rpm-wrapper
index 1a285ddaa3e6..f4234a9c5d89 100755
--- a/solenv/bin/rpm-wrapper
+++ b/solenv/bin/rpm-wrapper
@@ -35,15 +35,15 @@
 set -e
 if [ "$OUTPATH" = "unxlngi6" ]
 then
-LD_LIBRARY_PATH=${LD_LIBRARY_PATH+${LD_LIBRARY_PATH}:}${LIBRARY_PATH?} \
+LD_LIBRARY_PATH=${LD_LIBRARY_PATH:+${LD_LIBRARY_PATH}:}${LIBRARY_PATH?} \
     ${BUILD_TOOLS?}/rpmbuild "$@"
 else
 if [ "$OUTPATH" = "unxlngx6" ]
 then
-LD_LIBRARY_PATH=${LD_LIBRARY_PATH+${LD_LIBRARY_PATH}:}${LIBRARY_PATH?} \
+LD_LIBRARY_PATH=${LD_LIBRARY_PATH:+${LD_LIBRARY_PATH}:}${LIBRARY_PATH?} \
     ${BUILD_TOOLS?}/rpmbuild "$@"
 else
-LD_LIBRARY_PATH=${LD_LIBRARY_PATH+${LD_LIBRARY_PATH}:}${COMPATH?}/lib \
+LD_LIBRARY_PATH=${LD_LIBRARY_PATH:+${LD_LIBRARY_PATH}:}${COMPATH?}/lib \
     ${BUILD_TOOLS?}/rpm "$@"
 fi
 fi
diff --git a/solenv/bin/soirpm.sh b/solenv/bin/soirpm.sh
index 1aa34f2a4a45..86f8a3e269fd 100755
--- a/solenv/bin/soirpm.sh
+++ b/solenv/bin/soirpm.sh
@@ -28,5 +28,5 @@
 LIBRPMBUILD=$(find ${COMPATH} -name 'librpmbuild-4.1*' -print)
 # echo $(dirname $LIBRPMBUILD)
 LD_LIBRARY_PATH=$(dirname ${LIBRPMBUILD}) ${BUILD_TOOLS?}/rpm "$@"
-# LD_LIBRARY_PATH=${LD_LIBRARY_PATH+${LD_LIBRARY_PATH}:}${COMPATH?}/lib \
+# LD_LIBRARY_PATH=${LD_LIBRARY_PATH:+${LD_LIBRARY_PATH}:}${COMPATH?}/lib \
 # ${BUILD_TOOLS?}/rpm "$@"
diff --git a/solenv/bin/subsequenttests b/solenv/bin/subsequenttests
index 34e6b8034c70..8b52f45a6b12 100755
--- a/solenv/bin/subsequenttests
+++ b/solenv/bin/subsequenttests
@@ -30,6 +30,8 @@ eval 'exec "$PERL" -Sw "$0" "$@"'
 use lib("$ENV{SOLARENV}/bin/modules");
 use SourceConfig;
 
+my $keep_going = 0;
+my $dry_run = 0;
 my $max_running = 1;
 while (@ARGV) {
     my $arg = shift(@ARGV);
@@ -38,16 +40,34 @@ while (@ARGV) {
     } elsif ($arg eq '--') {
         last;
     } else {
-        print STDERR "unknown argument \"$arg\"\n";
-        print STDERR "usage: $0 [-P<n>] [-- <args>]\n";
-        print STDERR " -P<n>  number of parallel dmake invocations\n";
-        print STDERR " <args> are passed to dmake invocations\n";
-        exit(1);
+        my $n = substr($arg, 0, 1) eq '-' ? 1 : 0;
+        while ($n && $n < length($arg)) {
+            my $c = substr($arg, $n++, 1);
+            if ($c eq 'k') {
+                $keep_going = 1;
+            } elsif ($c eq 'n') {
+                $dry_run = 1;
+            } else {
+                $n = 0;
+                last;
+            }
+        }
+        if (!$n) {
+            print STDERR "unknown argument \"$arg\"\n";
+            print STDERR "usage: $0 [-kn] [-P<n>] [-- <args>]\n";
+            print STDERR " -k     continue with other dmake invocations upon\n";
+            print STDERR "        failure\n";
+            print STDERR " -n     write directories that would be processed\n";
+            print STDERR "        to standard output\n";
+            print STDERR " -P<n>  number of parallel dmake invocations\n";
+            print STDERR " <args> are passed to dmake invocations\n";
+            exit(1);
+        }
     }
 }
 
 my @testpaths = ();
-my $sc = SourceConfig->new();
+my $sc = SourceConfig->new($ENV{'SOLARSRC'});
 my $module;
 foreach $module ($sc->get_active_modules()) {
     my $buildlst = $sc->get_module_build_list($module);
@@ -82,6 +102,13 @@ foreach $module ($sc->get_active_modules()) {
     }
 }
 
+if ($dry_run) {
+    foreach $path (@testpaths) {
+        print "$path\n";
+    }
+    exit(0);
+}
+
 my $cmd = 'dmake';
 foreach (@ARGV) {
     s/'/'\''/g;
@@ -119,8 +146,8 @@ while (@testpaths || $running > 0) {
     my $testpath = delete($pids{$pid});
     defined($testpath) or die("unmatched PID $pid");
     if ($? != 0) {
-        @testpaths = ();
         push(@failedpaths, $testpath);
+        @testpaths = () unless $keep_going;
     }
     --$running;
 }
diff --git a/solenv/bin/transform_description.pl b/solenv/bin/transform_description.pl
index 0d6ab34583b3..87dcb21deb53 100644
--- a/solenv/bin/transform_description.pl
+++ b/solenv/bin/transform_description.pl
@@ -55,9 +55,9 @@ sub parse_args
 
     # check which languages to use
     my $languages = $ENV{WITH_LANG};
-    if ( ! defined $languages )
+    if ( ( ! defined $languages ) || ( "$languages" eq "" ) )
     {
-        print STDERR "$0: WITH_LANG not set, defaulting to 'en-US'\n";
+        print STDERR "$0: WITH_LANG not set or empty, defaulting to 'en-US'\n";
         $languages = "en-US";
     }
     @languages = split ( ' ', $languages );
diff --git a/solenv/config/sdev300.ini b/solenv/config/sdev300.ini
index 582915e7a806..2a83d2cda49e 100644
--- a/solenv/config/sdev300.ini
+++ b/solenv/config/sdev300.ini
@@ -8,7 +8,14 @@ common
 			BIG_SVX TRUE
 			BMP_WRITES_FLAG TRUE
 			BUILD_SPECIAL TRUE
+<<<<<<< local
 			BUILD_TYPE SO OOo EXT BINFILTER MORE_FONTS BSH CURL DICTIONARIES HSQLDB HUNSPELL HYPHEN MYTHES JPEG LIBXML2 LIBXMLSEC LPSOLVE MOZ NEON TWAIN PYTHON ZLIB SANE UNIXODBC X11_EXTENSIONS LIBWPD EPM ODK MSFONTEXTRACT MATHMLDTD BOOST MDDS EXPAT CRASHREP BERKELEYDB LIBXSLT SUN AGG GTK ICU SYSTRAY_GTK JAVAINSTALLER2 VIGRA OPENSSL JFREEREPORT APACHE_COMMONS TOMCAT REPORTBUILDER SDEXT SWEXT XPDF LUCENE REDLAND SAXON WRITER2LATEX NSS L10N GRAPHITE MYSQLCPPCONN MYSQLC CPPUNIT
+=======
+			BUILD_STAX YES
+			BUILD_TYPE SO OOo EXT BINFILTER MORE_FONTS BSH CURL DICTIONARIES HSQLDB HUNSPELL HYPHEN MYTHES JPEG LIBXML2 LIBXMLSEC LPSOLVE MOZ NEON TWAIN PYTHON ZLIB SANE UNIXODBC X11_EXTENSIONS LIBWPD EPM ODK MSFONTEXTRACT MATHMLDTD BOOST MDDS EXPAT CRASHREP BERKELEYDB LIBXSLT SUN AGG GTK ICU SYSTRAY_GTK JAVAINSTALLER2 VIGRA OPENSSL JFREEREPORT APACHE_COMMONS TOMCAT REPORTBUILDER SDEXT SWEXT XPDF LUCENE REDLAND SAXON WRITER2LATEX NSS L10N GRAPHITE MYSQLCPPCONN MYSQLC CPPUNIT LIBTEXTCAT LIBTEXTCATDATA AFMS
+			common_build TRUE
+			COMMON_OUTDIR common
+>>>>>>> other
 			CONFIG_PROJECT config_office
 			DIC_ALL TRUE
 			ENABLEUNICODE TRUE
@@ -16,8 +23,6 @@ common
 			ENABLE_CUPS TRUE
 			ENABLE_DIRECTX TRUE
 			ENABLE_FONTCONFIG TRUE
-			ENABLE_GCONF TRUE
-			ENABLE_GNOMEVFS TRUE
 			ENABLE_GTK TRUE
 			ENABLE_MEDIAWIKI YES
 			ENABLE_MINIMIZER YES
@@ -46,6 +51,7 @@ common
 			WITH_LDAP YES
 			wrapper_override_cc_wrapper TRUE
 			MAXPROC maxproc=15
+            XINERAMA_LINK dynamic
 		}
 		common:0 IF %UPDATER% == YES
 		{
@@ -183,8 +189,6 @@ finish
 		}
 		common_0:0 IF %OS% == MACOSX
 		{
-			ENABLE_GCONF
-			ENABLE_GNOMEVFS
 			ENABLE_GTK
 			SOLARINCLUDES -I%SOLARVERSION%$/%INPATH%$/inc%UPDMINOREXT% -I%SOLARENV%$/%OUTPATH%$/inc -I%SOLARENV%$/inc %SOLAREXTRAINC%
 		}
@@ -356,6 +360,8 @@ unxfbsdi
 			SOLAREXTRALIB -L../lib -L%SYSBASE%/usr/X11R6/lib -L%SYSBASE%/usr/lib -L/usr/X11R6/lib  -L%SOLAR_STLLIBPATH%
 			SOLAR_JAVA TRUE
 			ZIPDEP perl %SOLARENV%/bin/zipdep.pl
+            ENABLE_GCONF TRUE
+            ENABLE_GNOMEVFS TRUE
 		}
 		common0
 		{
@@ -598,10 +604,13 @@ unxlngi6
 			LIBRARY_PATH %SYSBASE%/usr/lib
 			MKOUT %PERL% %SOLARENV%/bin/mkout.pl
 			PATHEXTRA %combin%:/usr/bin:/bin:/usr/sbin:/etc:/usr/bin/X11
-			SOLAREXTRAINC -I%SOLAR_STLPATH% -I%SYSBASE%/usr/include -I%SYSBASE%/usr/include/X11
+            FREETYPE_CFLAGS -I%SYSBASE%/usr/include/freetype2
+			SOLAREXTRAINC -I%SOLAR_STLPATH% -I%SYSBASE%/usr/include -I%SYSBASE%/usr/include/X11 -I%SYSBASE%/include
 			SOLAREXTRALIB -L../lib -L%SYSBASE%/usr/X11R6/lib -L%SYSBASE%/usr/lib -L/usr/X11R6/lib  -L%SOLAR_STLLIBPATH%
 			SOLAR_JAVA TRUE
 			ZIPDEP %PERL% %SOLARENV%/bin/zipdep.pl
+            ENABLE_GCONF TRUE
+            ENABLE_GNOMEVFS TRUE
 		}
 		common0
 		{
@@ -628,10 +637,12 @@ unxlngi6
 			SOLAR_OJDK16PATH %SOLAR_ENV_ROOT%/openjdk-6-b08-linux-i586
 			SO_PACK %SOLAR_ENV_ROOT%/pack/%WORK_STAMP%
 			SRC_ROOT %SOLAR_SOURCE_ROOT%/%WORK_STAMP%/ooo%UPDMINOREXT%
+            PKG_CONFIG_LIBDIR %SOLAR_SYSBASE_ROOT%/usr/lib/pkgconfig
 		}
 		common2
 		{
 			ENABLE_GRAPHITE TRUE
+			ENABLE_GSTREAMER TRUE
             BUILD_TOOLS %SOLARROOT%/bt_linux_libc2.5/%WORK_STAMP%/bin
 			COM GCC
 			COMMON_BUILD_TOOLS %SOLARROOT%$/btools
@@ -819,6 +830,7 @@ unxlngi6
 		sysbaseroot
 	}
 }
+
 unxlngx6
 {
 	environment
@@ -835,7 +847,7 @@ unxlngx6
 			COPY_PACKED TRUE
 			DEVROOT %SOL_TMP%$/r
 			PCLEAN_PATH %SOLARROOT%/etools
-			PERL %SOL_TMP%$/r$/bt_linux_libc2.32$/%WORK_STAMP%$/bin$/perl
+			PERL %SOL_TMP%$/r$/bt_linux64_libc2.5$/%WORK_STAMP%$/bin$/perl
 			SOLARENV %SOL_TMP%$/o%CWS_WORK_STAMP_EXT%$/%WORK_STAMP%$/ooo%UPDMINOREXT%$/solenv
 			SOLARROOT %SOL_TMP%$/r
 			SOLARVER %SOL_TMP%$/o%CWS_WORK_STAMP_EXT%/%WORK_STAMP%
@@ -847,7 +859,7 @@ unxlngx6
 			COPYALL FALSE
 			DEVROOT %SOL_TMP%$/r
 			PCLEAN_PATH %SOL_TMP%$/r/etools
-			PERL %SOL_TMP%$/r$/bt_linux_libc2.32$/%WORK_STAMP%$/bin$/perl
+			PERL %SOL_TMP%$/r$/bt_linux64_libc2.5$/%WORK_STAMP%$/bin$/perl
 			SOLARENV %SOL_TMP%$/o%CWS_WORK_STAMP_EXT%$/%WORK_STAMP%$/ooo%UPDMINOREXT%$/solenv
 			SOLARROOT %SOL_TMP%$/r
 			SOLARVER %SOL_TMP%$/o%CWS_WORK_STAMP_EXT%/%WORK_STAMP%
@@ -870,25 +882,28 @@ unxlngx6
 			HAVE_GCC_VISIBILITY_FEATURE TRUE
             HAVE_LD_BSYMBOLIC_FUNCTIONS TRUE
             HAVE_LD_HASH_STYLE TRUE
-			LIBRARY_PATH %SYSBASE%/usr/lib
+			LIBRARY_PATH %SYSBASE%/usr/lib64
 			MKOUT %PERL% %SOLARENV%/bin/mkout.pl
 			PATHEXTRA %combin%:/usr/bin:/bin:/usr/sbin:/etc:/usr/bin/X11
-			SOLAREXTRAINC -I%SOLAR_STLPATH% -I%SYSBASE%/usr/include -I%SYSBASE%/usr/include/X11
-			SOLAREXTRALIB -L../lib -L%SYSBASE%/usr/X11R6/lib -L%SYSBASE%/usr/lib -L/usr/X11R6/lib  -L%SOLAR_STLLIBPATH%
+            FREETYPE_CFLAGS -I%SYSBASE%/usr/include/freetype2
+			SOLAREXTRAINC -I%SOLAR_STLPATH% -I%SYSBASE%/usr/include -I%SYSBASE%/usr/include/X11 -I%SYSBASE%/include
+			SOLAREXTRALIB -L../lib64 -L%SYSBASE%/usr/lib64 -L%SOLAR_STLLIBPATH%
 			SOLAR_JAVA TRUE
 			ZIPDEP %PERL% %SOLARENV%/bin/zipdep.pl
+            ENABLE_GCONF TRUE
+            ENABLE_GNOMEVFS TRUE
 		}
 		common0
 		{
 			SOLAR_ENV_ROOT /so/env
 			SOLAR_SOURCE_ROOT %DRIVE_O%
-			SOLAR_SYSBASE_ROOT /so/env/gcc_4.2.3_linux64_libc3.4.6/glibc3.4.6
+			SOLAR_SYSBASE_ROOT /so/env/gcc_4.2.3_linux64_libc2.5/glibc2.5
 		}
 		common1
 		{
-			COMPATH %SOLAR_ENV_ROOT%$/gcc_4.2.3_linux64_libc3.4.6/
+			COMPATH %SOLAR_ENV_ROOT%$/gcc_4.2.3_linux64_libc2.5
 			DEVROOT %SOLAR_ENV_ROOT%
-			PERL %SOLAR_ENV_ROOT%/bt_linux_libc2.32/%WORK_STAMP%/bin/perl
+			PERL %SOLAR_ENV_ROOT%/bt_linux64_libc2.5/%WORK_STAMP%/bin/perl
 			PKGFORMAT rpm
 			SHARED_SOLARENV %SOLAR_SOURCE_ROOT%/%WORK_STAMP%/ooo%UPDMINOREXT%/solenv
 			SHARED_SOLARVERSION %SOLAR_SOURCE_ROOT%/%WORK_STAMP%
@@ -903,11 +918,14 @@ unxlngx6
 			SRC_ROOT %SOLAR_SOURCE_ROOT%/%WORK_STAMP%/ooo%UPDMINOREXT%
 			USE_SYSTEM_STL YES
 			XAU_LIBS -lXau
+            PKG_CONFIG_LIBDIR %SOLAR_SYSBASE_ROOT%/usr/lib/pkgconfig
 		}
 		common2
 		{
+            PKG_CONFIG_PATH %COMPATH%/glibc2.5/usr/lib64/pkgconfig
 			ENABLE_GRAPHITE TRUE
-            BUILD_TOOLS %SOLARROOT%/bt_linux_libc2.32/%WORK_STAMP%/bin
+			ENABLE_GSTREAMER TRUE
+            BUILD_TOOLS %SOLARROOT%/bt_linux64_libc2.5/%WORK_STAMP%/bin
 			COM GCC
 			COMMON_BUILD_TOOLS %SOLARROOT%$/btools
 			COMMON_ENV_TOOLS %SOLARROOT%$/etools
@@ -916,7 +934,7 @@ unxlngx6
 			CVER C341
 			ENABLE_KAB TRUE
 			ENABLE_KDE TRUE
-			ENV_TOOLS %SOLARROOT%/et_linux_libc2.32/%WORK_STAMP%/bin
+			ENV_TOOLS %SOLARROOT%/et_linux64_libc2.5/%WORK_STAMP%/bin
 			GUI UNX
 			GUIBASE unx
 			GUIENV sal
@@ -924,7 +942,7 @@ unxlngx6
 			INPATH unxlngx6%PROEXT%
 			JDK14PATH %SOLAR_JDK14PATH%
 			JDK15PATH %SOLAR_JDK15PATH%
-			KDE_ROOT /so/env/kde/linux/kde-3.2.2
+			KDE_ROOT /so/env/kde/linux-x64/kde-3.5.10
             LIBMYSQL_PATH %SOLAR_ENV_ROOT%/mysql-connector-c-6.0.2/unxlngx6
 			NO_BSYMBOLIC True
 			OJDK16PATH %SOLAR_OJDK16PATH%
@@ -1095,6 +1113,7 @@ unxlngx6
 		sysbaseroot
 	}
 }
+
 unxmacxi
 {
 	environment
@@ -1415,11 +1434,14 @@ unxsoli4
 			DMAKEROOT %SOLARENV%/inc/startup
 			MKOUT %PERL% %SOLARENV%/bin/mkout.pl
 			PATHEXTRA /usr/ccs/bin:/usr/bin:/bin:/usr/sbin:/etc:/usr/bin/X11:/opt/langtools/bin:/usr/dt/bin
+            FREETYPE_CFLAGS -I%SYSBASE%/usr/sfw/include -I%SYSBASE%/usr/sfw/include/freetype2
 			SOLAREXTRAINC -I%SOLAR_STLPATH% -I%SYSBASE%/usr/include
-			SOLAREXTRALIB -L%COMPATH%$/lib -L../lib -L%SYSBASE%/usr/lib -L/lib -L/usr/lib -L/usr/dt/lib -L/usr/openwin/lib -L%SOLAR_STLLIBPATH%
+			SOLAREXTRALIB -L%COMPATH%$/lib -L../lib -L%SYSBASE%/usr/lib -L%SYSBASE%/usr/sfw/lib -L/lib -L/usr/lib -L/usr/dt/lib -L/usr/openwin/lib -L%SOLAR_STLLIBPATH%
 			SOLAR_JAVA TRUE
 			ZIPDEP %PERL% %SOLARENV%/bin/zipdep.pl
 			__cdpath %DRIVE_O%/%WORK_STAMP%/ooo%UPDMINOREXT%
+            ENABLE_GCONF TRUE
+            ENABLE_GNOMEVFS TRUE
 		}
 		common0
 		{
@@ -1672,11 +1694,14 @@ unxsols4
 			DMAKEROOT %SOLARENV%/inc/startup
 			MKOUT %PERL% %SOLARENV%/bin/mkout.pl
 			PATHEXTRA /usr/ccs/bin:/usr/bin:/bin:/usr/sbin:/etc:/usr/bin/X11:/opt/langtools/bin:/usr/dt/bin
+            FREETYPE_CFLAGS -I%SYSBASE%/usr/sfw/include -I%SYSBASE%/usr/sfw/include/freetype2
 			SOLAREXTRAINC -I%SOLAR_STLPATH% -I%SYSBASE%/usr/include
-			SOLAREXTRALIB -L%COMPATH%$/lib -L../lib -L%SYSBASE%/usr/lib -L/lib -L/usr/lib -L/usr/dt/lib -L/usr/openwin/lib -L%SOLAR_STLLIBPATH%
+			SOLAREXTRALIB -L%COMPATH%$/lib -L../lib -L%SYSBASE%/usr/lib -L%SYSBASE%/usr/sfw/lib -L/lib -L/usr/lib -L/usr/dt/lib -L/usr/openwin/lib -L%SOLAR_STLLIBPATH%
 			SOLAR_JAVA TRUE
 			ZIPDEP %PERL% %SOLARENV%/bin/zipdep.pl
 			__cdpath %DRIVE_O%/%WORK_STAMP%/ooo%UPDMINOREXT%
+            ENABLE_GCONF TRUE
+            ENABLE_GNOMEVFS TRUE
 		}
 		common0
 		{
@@ -1935,7 +1960,6 @@ unxsolu4
 			COPYPRJ %PERL% %COMMON_ENV_TOOLS%/copyprj.pl
 			DELIVER %PERL% %SOLARENV%/bin/deliver.pl
 			DMAKEROOT %SOLARENV%/inc/startup
-			ENABLE_GNOMEVFS
 			FREETYPE_CFLAGS -I%SYSBASE%/usr/sfw/include -I%SYSBASE%/usr/sfw/include/freetype2
 			FREETYPE_LIBS -L%SYSBASE%/usr/sfw/lib/sparcv9 -lfreetype
 			LIBXML_CFLAGS -I%SYSBASE%/usr/include/libxml2
@@ -1952,6 +1976,8 @@ unxsolu4
 			SYSTEM_LIBXSLT YES
 			ZIPDEP %PERL% %SOLARENV%/bin/zipdep.pl
 			__cdpath %DRIVE_O%/%WORK_STAMP%/ooo%UPDMINOREXT%
+            ENABLE_GCONF TRUE
+#           ENABLE_GNOMEVFS TRUE
 		}
 		common0
 		{
@@ -2118,242 +2144,6 @@ unxsolu4
 		sysbaseroot
 	}
 }
-unxubti8
-{
-	environment
-	{
-		bs_sourceroot
-		{
-			SOLAR_SOURCE_ROOT %SOURCE_ROOT_TMP%
-			SOURCE_ROOT %SOURCE_ROOT_TMP%
-			SOURCE_ROOT_USED TRUE
-		}
-		cap
-		{
-			COPYALL TRUE
-			COPY_PACKED TRUE
-			DEVROOT %SOL_TMP%$/r
-			PCLEAN_PATH %SOLARROOT%/etools
-			PERL %SOL_TMP%$/r$/bt_linux_libc2.11$/%WORK_STAMP%$/bin$/perl
-			SOLARENV %SOL_TMP%$/o%CWS_WORK_STAMP_EXT%$/%WORK_STAMP%$/ooo%UPDMINOREXT%$/solenv
-			SOLARROOT %SOL_TMP%$/r
-			SOLARVER %SOL_TMP%$/o%CWS_WORK_STAMP_EXT%/%WORK_STAMP%
-			SOLARVERSION %SOL_TMP%$/o%CWS_WORK_STAMP_EXT%/%WORK_STAMP%
-			SO_PACK %SOL_TMP%$/r$/pack$/%WORK_STAMP%
-		}
-		cax
-		{
-			COPYALL FALSE
-			DEVROOT %SOL_TMP%$/r
-			PCLEAN_PATH %SOL_TMP%$/r/etools
-			PERL %SOL_TMP%$/r$/bt_linux_libc2.11$/%WORK_STAMP%$/bin$/perl
-			SOLARENV %SOL_TMP%$/o%CWS_WORK_STAMP_EXT%$/%WORK_STAMP%$/ooo%UPDMINOREXT%$/solenv
-			SOLARROOT %SOL_TMP%$/r
-			SOLARVER %SOL_TMP%$/o%CWS_WORK_STAMP_EXT%/%WORK_STAMP%
-			SOLARVERSION %SOL_TMP%$/o%CWS_WORK_STAMP_EXT%/%WORK_STAMP%
-			SO_PACK %SOL_TMP%$/r$/pack$/%WORK_STAMP%
-		}
-		common
-		{
-			*build nice %PERL% %SOLARENV%/bin/build.pl %PROFULLSWITCH%
-			*build_client nice %PERL% %SOLARENV%/bin/build_client.pl
-			*copyprj %PERL% %COMMON_ENV_TOOLS%/copyprj.pl
-			*deliver %PERL% %SOLARENV%/bin/deliver.pl
-			*mkout %PERL% %SOLARENV%/bin/mkout.pl
-			*r: cd %SOLARROOT%
-			*s: cd %SOLARVERSION%
-			*zipdep %PERL% %SOLARENV%/bin/zipdep.pl
-			COPYPRJ %PERL% %COMMON_ENV_TOOLS%/copyprj.pl
-			DELIVER deliver.pl
-			DMAKEROOT %SOLARENV%/inc/startup
-			HAVE_GCC_VISIBILITY_FEATURE TRUE
-			LD_LIBRARY_PATH .:/usr/lib:/usr/lib/jvm/java-6-openjdk/jre/lib/i386:/usr/lib/jvm/java-6-openjdk/jre/lib/i386/xawt:/usr/lib/jvm/java-6-openjdk/jre/lib/i386/client:/usr/lib/jvm/java-6-openjdk/jre/lib/i386/native_threads:%SOLARVERSION%/%INPATH%/lib%UPDMINOREXT%:
-			MKOUT mkout.pl
-			SOLAREXTRAINC -I%SOLAR_STLPATH%
-			SOLAREXTRALIB -L../lib
-			SOLAR_JAVA TRUE
-			ZIPDEP %PERL% %SOLARENV%/bin/zipdep.pl
-		}
-		common0
-		{
-			SOLAR_ENV_ROOT /so/env
-			SOLAR_SOURCE_ROOT %DRIVE_O%
-		}
-		common1
-		{
-			AGG_VERSION 2300
-			ANT /usr/share/ant/bin/ant
-			ANT_HOME /usr/share/ant
-			ANT_LIB /usr/share/ant/lib
-			AWTLIB -ljawt
-			CC gcc
-			COMPATH /usr/bin
-			CXX g++
-			DEVROOT %SOLAR_ENV_ROOT%
-			EXCEPTIONS dwarf2
-			EXTERNAL_WARNINGS_NOT_ERRORS 1
-			GNUMAKE make
-			GXX_INCLUDE_PATH /usr/include/c++/4.2
-			HAVE_LD_HASH_STYLE TRUE
-			JAVACOMPILER /usr/bin/javac
-			JAVADOC /usr/bin/javadoc
-			JDK sun
-			LFS_CFLAGS -D_FILE_OFFSET_BITS=64
-			PAM YES
-			PAM_LINK NO
-			PERL /usr/bin/perl
-			PKGFORMAT deb
-			SOLARENV %SOLAR_SOURCE_ROOT%/%WORK_STAMP%/ooo%UPDMINOREXT%/solenv
-			SOLARROOT %SOLAR_ENV_ROOT%
-			SOLARVER %SOLAR_SOURCE_ROOT%/%WORK_STAMP%
-			SOLARVERSION %SOLAR_SOURCE_ROOT%/%WORK_STAMP%
-			SOLAR_OJDK16PATH %SOLAR_ENV_ROOT%/openjdk-6-b08-linux-i586
-			SOLAR_PLUGIN TRUE
-			SO_PACK %SOLAR_ENV_ROOT%/pack/%WORK_STAMP%
-			SRC_ROOT %SOLAR_SOURCE_ROOT%/%WORK_STAMP%/ooo%UPDMINOREXT%
-			VBA_EXTENSION NO
-			WITH_LANG en-US de
-			XAU_LIBS -lXau
-			XCLASSPATH /usr/lib/jvm/java-6-openjdk/jre/lib/rt.jar:.
-			XINERAMA_LINK dynamic
-			ZIPDEP zipdep.pl
-		}
-		common2
-		{
-			ENABLE_GRAPHITE TRUE
-            BUILD_TOOLS %SOLARROOT%/bt_linux_libc2.11/%WORK_STAMP%/bin
-			COM GCC
-			COMMON_BUILD_TOOLS %SRC_ROOT%/external/common
-			COMMON_ENV_TOOLS %SOLARROOT%$/etools
-			CPU I
-			CPUNAME INTEL
-			CVER C341
-			GUI UNX
-			GUIBASE unx
-			GVER VCL
-			INPATH unxubti8%PROEXT%
-			NO_BSYMBOLIC TRUE
-			OJDK16PATH /usr/lib/jvm/java-6-openjdk
-			OS LINUX
-			OUTPATH unxubti8
-			RPM /usr/bin/rpmbuild
-			SOLAR_STLPATH %SOLARVERSION%$/unxubti8%PROEXT%$/inc%UPDMINOREXT%$/stl
-			TEMP /tmp
-			TMP /tmp
-		}
-		compath
-		{
-			COMPATH /usr/bin
-		}
-		debug
-		{
-			LD_LIBRARY_PATH %SOLARROOT%/solenv/unxlngi4/lib/debug:%LD_LIBRARY_PATH%
-		}
-		distroot:0 if X%DIST_ROOT%X != XX
-		{
-			SOLARVER %DIST_ROOT%/%WORK_STAMP%
-			SOLARVERSION %DIST_ROOT%/%WORK_STAMP%
-		}
-		envroot:0 IF X%ENV_ROOT%X != XX
-		{
-			SOLAR_ENV_ROOT %ENV_ROOT%
-		}
-		jdk15
-		{
-			JAVA_HOME %OJDK16PATH%
-			JDKINC %OJDK16PATH%/include:%OJDK16PATH%/include/linux
-			JDKINCS -I%OJDK16PATH%/include -I%OJDK16PATH%/include/linux
-			JDKLIB %OJDK16PATH%/jre/lib:%OJDK16PATH%/jre/lib/i386:%OJDK16PATH%/jre/lib/i386/client:%OJDK16PATH%/jre/lib/i386/xawt
-			JDKLIBS -L%OJDK16PATH%/jre/lib -L%OJDK16PATH%/jre/lib/i386 -L%OJDK16PATH%/jre/lib/i386/client -L%OJDK16PATH%/jre/lib/i386/native_threads
-			JDKPATH %OJDK16PATH%/bin
-			XCLASSPATH .:%OJDK16PATH%/jre/lib/rt.jar
-		}
-		jdk15path:0 IF X%JDK_PATH%X != XX
-		{
-			SOLAR_JDK15PATH %JDK_PATH%
-		}
-		ojdk16
-		{
-			JAVA_HOME %OJDK16PATH%
-			JDKINC %OJDK16PATH%/include:%OJDK16PATH%/include/linux
-			JDKINCS -I%OJDK16PATH%/include -I%OJDK16PATH%/include/linux
-			JDKLIB %OJDK16PATH%/jre/lib:%OJDK16PATH%/jre/lib/i386:%OJDK16PATH%/jre/lib/i386/client:%OJDK16PATH%/jre/lib/i386/xawt
-			JDKLIBS -L%OJDK16PATH%/jre/lib -L%OJDK16PATH%/jre/lib/i386 -L%OJDK16PATH%/jre/lib/i386/client -L%OJDK16PATH%/jre/lib/i386/native_threads
-			JDKPATH %OJDK16PATH%/bin
-			XCLASSPATH .:%OJDK16PATH%/jre/lib/rt.jar
-		}
-		ojdk16path:0 IF X%JDK_PATH%X != XX
-		{
-			SOLAR_OJDK16PATH %JDK_PATH%
-		}
-		pro
-		{
-			PROSWITCH -DPRODUCT
-		}
-		sourceroot:0 IF X%SOURCE_ROOT%X != XX
-		{
-			SOLAR_SOURCE_ROOT %SOURCE_ROOT%
-			SOURCE_ROOT_USED TRUE
-		}
-	}
-	extern
-	{
-		DIST_ROOT
-		ENV_ROOT
-		HOME
-		JDK_PATH
-		LOCALINI
-		SOL_TMP
-		SOURCE_ROOT
-		USER
-	}
-	order common0 bs_sourceroot envroot:0 sourceroot:0 common1 ojdk16path:0 distroot:0 cap cax compath common2 pro common jdk15 ojdk16 debug
-	reset
-	{
-		CLASSPATH
-		COPYALL
-		ENABLE_CRASHDUMP
-	}
-	restore
-	{
-		INCLUDE
-	}
-	script
-	{
-		csh
-		{
-			400: if ( ${?COPYALL} ) $SOLAR_ENV_ROOT/etools/lucopy.pl all $LU_HGFLAG $LU_RFLAG $LU_NOSOURCE
-			600: umask 002
-			800: rehash
-            820: wrapfetch.sh
-		}
-		sh
-		{
-			400: if [ $COPYALL ]; then
-			410: $SOLAR_ENV_ROOT/etools/lucopy.pl all $LU_HGFLAG $LU_RFLAG $LU_NOSOURCE
-			415: fi
-			600: umask 002
-			800: hash -r
-            820: wrapfetch.sh
-		}
-	}
-	switches
-	{
-       	bs_sourceroot SOURCE_ROOT_TMP
-		bsclient
-		cap
-		cax
-		debug
-		distroot
-		envroot
-		jdk15
-		l10n L10N_framework
-		ojdk16
-		ojdk16path
-		pro
-		sourceroot
-	}
-}
 wntgcci1
 {
 	environment
diff --git a/solenv/config/ssolar.cmn b/solenv/config/ssolar.cmn
index 937c345e2de8..77b2f592ac67 100644
--- a/solenv/config/ssolar.cmn
+++ b/solenv/config/ssolar.cmn
@@ -44,6 +44,7 @@ common
 		BUILD_TOOLS
         BUILD_TYPE
 		BUILD_SPECIAL
+		BUILD_STAX
         BUILD_X64
 		CLASSPATH
 		CALL_CDECL
@@ -168,6 +169,7 @@ common
 		PACKMS
 		PCLEAN_PATH
         PKGCONFIG_ROOT
+        PKG_CONFIG_PATH
         PKGFORMAT
 		PRE
 	    PREBUILD_MOZAB
diff --git a/solenv/inc/_tg_rslb.mk b/solenv/inc/_tg_rslb.mk
index 273ac8dabe1b..4c67a1d58c97 100644
--- a/solenv/inc/_tg_rslb.mk
+++ b/solenv/inc/_tg_rslb.mk
@@ -2,22 +2,6 @@
 
 .IF "$(RESLIB1TARGETN)"!=""
 
-.IF "$(BUILDHIDS)"!=""
-HIDRES1PARTICLE=$(subst,$(OUTPATH),$(COMMON_OUTDIR) $(MISC))/$(RESLIB1NAME)_res.hid
-
-#HACK cut off the dirty srs files which are included from solver
-RESLIB1HIDFILES:=$(subst,$(OUTPATH),$(COMMON_OUTDIR) $(subst,.srs,_srs.hid $(RESLIB1SRSFILES)))
-$(HIDRES1PARTICLE): $(RESLIB1HIDFILES)
-    @echo "Making:   " $(@:f)
-    @$(IFEXIST) $@ $(THEN) $(RM:s/+//) $@ $(FI)
-# need to strip since solaris cannot handle tab-only whitespace here
-    $(COMMAND_ECHO)$(TYPE) $(mktmp  $(strip, $(subst,/,/ $(RESLIB1HIDFILES))) )| xargs -s 1000 cat > $@.$(ROUT).tmp
-    @$(RENAME) $@.$(ROUT).tmp $@
-
-ALLTAR : $(HIDRES1PARTICLE)
-
-.ENDIF # "$(BUILDHIDS)"!=""
-
 $(RSC_MULTI1) : \
         $(RESLIB1SRSFILES) \
         $(RESLIB1TARGETN) \
@@ -79,22 +63,6 @@ $(RESLIB1TARGETN): \
 
 .IF "$(RESLIB2TARGETN)"!=""
 
-.IF "$(BUILDHIDS)"!=""
-HIDRES2PARTICLE=$(subst,$(OUTPATH),$(COMMON_OUTDIR) $(MISC))/$(RESLIB2NAME)_res.hid
-
-#HACK cut off the dirty srs files which are included from solver
-RESLIB2HIDFILES:=$(subst,$(OUTPATH),$(COMMON_OUTDIR) $(subst,.srs,_srs.hid $(RESLIB2SRSFILES)))
-$(HIDRES2PARTICLE): $(RESLIB2HIDFILES)
-    @echo "Making:   " $(@:f)
-    @$(IFEXIST) $@ $(THEN) $(RM:s/+//) $@ $(FI)
-# need to strip since solaris cannot handle tab-only whitespace here
-    $(COMMAND_ECHO)$(TYPE) $(mktmp  $(strip, $(subst,/,/ $(RESLIB2HIDFILES))) )| xargs -s 1000 cat > $@.$(ROUT).tmp
-    @$(RENAME) $@.$(ROUT).tmp $@
-
-ALLTAR : $(HIDRES2PARTICLE)
-
-.ENDIF # "$(BUILDHIDS)"!=""
-
 $(RSC_MULTI2) : \
         $(RESLIB2SRSFILES) \
         $(RESLIB2TARGETN) \
@@ -156,22 +124,6 @@ $(RESLIB2TARGETN): \
 
 .IF "$(RESLIB3TARGETN)"!=""
 
-.IF "$(BUILDHIDS)"!=""
-HIDRES3PARTICLE=$(subst,$(OUTPATH),$(COMMON_OUTDIR) $(MISC))/$(RESLIB3NAME)_res.hid
-
-#HACK cut off the dirty srs files which are included from solver
-RESLIB3HIDFILES:=$(subst,$(OUTPATH),$(COMMON_OUTDIR) $(subst,.srs,_srs.hid $(RESLIB3SRSFILES)))
-$(HIDRES3PARTICLE): $(RESLIB3HIDFILES)
-    @echo "Making:   " $(@:f)
-    @$(IFEXIST) $@ $(THEN) $(RM:s/+//) $@ $(FI)
-# need to strip since solaris cannot handle tab-only whitespace here
-    $(COMMAND_ECHO)$(TYPE) $(mktmp  $(strip, $(subst,/,/ $(RESLIB3HIDFILES))) )| xargs -s 1000 cat > $@.$(ROUT).tmp
-    @$(RENAME) $@.$(ROUT).tmp $@
-
-ALLTAR : $(HIDRES3PARTICLE)
-
-.ENDIF # "$(BUILDHIDS)"!=""
-
 $(RSC_MULTI3) : \
         $(RESLIB3SRSFILES) \
         $(RESLIB3TARGETN) \
@@ -233,22 +185,6 @@ $(RESLIB3TARGETN): \
 
 .IF "$(RESLIB4TARGETN)"!=""
 
-.IF "$(BUILDHIDS)"!=""
-HIDRES4PARTICLE=$(subst,$(OUTPATH),$(COMMON_OUTDIR) $(MISC))/$(RESLIB4NAME)_res.hid
-
-#HACK cut off the dirty srs files which are included from solver
-RESLIB4HIDFILES:=$(subst,$(OUTPATH),$(COMMON_OUTDIR) $(subst,.srs,_srs.hid $(RESLIB4SRSFILES)))
-$(HIDRES4PARTICLE): $(RESLIB4HIDFILES)
-    @echo "Making:   " $(@:f)
-    @$(IFEXIST) $@ $(THEN) $(RM:s/+//) $@ $(FI)
-# need to strip since solaris cannot handle tab-only whitespace here
-    $(COMMAND_ECHO)$(TYPE) $(mktmp  $(strip, $(subst,/,/ $(RESLIB4HIDFILES))) )| xargs -s 1000 cat > $@.$(ROUT).tmp
-    @$(RENAME) $@.$(ROUT).tmp $@
-
-ALLTAR : $(HIDRES4PARTICLE)
-
-.ENDIF # "$(BUILDHIDS)"!=""
-
 $(RSC_MULTI4) : \
         $(RESLIB4SRSFILES) \
         $(RESLIB4TARGETN) \
@@ -310,22 +246,6 @@ $(RESLIB4TARGETN): \
 
 .IF "$(RESLIB5TARGETN)"!=""
 
-.IF "$(BUILDHIDS)"!=""
-HIDRES5PARTICLE=$(subst,$(OUTPATH),$(COMMON_OUTDIR) $(MISC))/$(RESLIB5NAME)_res.hid
-
-#HACK cut off the dirty srs files which are included from solver
-RESLIB5HIDFILES:=$(subst,$(OUTPATH),$(COMMON_OUTDIR) $(subst,.srs,_srs.hid $(RESLIB5SRSFILES)))
-$(HIDRES5PARTICLE): $(RESLIB5HIDFILES)
-    @echo "Making:   " $(@:f)
-    @$(IFEXIST) $@ $(THEN) $(RM:s/+//) $@ $(FI)
-# need to strip since solaris cannot handle tab-only whitespace here
-    $(COMMAND_ECHO)$(TYPE) $(mktmp  $(strip, $(subst,/,/ $(RESLIB5HIDFILES))) )| xargs -s 1000 cat > $@.$(ROUT).tmp
-    @$(RENAME) $@.$(ROUT).tmp $@
-
-ALLTAR : $(HIDRES5PARTICLE)
-
-.ENDIF # "$(BUILDHIDS)"!=""
-
 $(RSC_MULTI5) : \
         $(RESLIB5SRSFILES) \
         $(RESLIB5TARGETN) \
@@ -387,22 +307,6 @@ $(RESLIB5TARGETN): \
 
 .IF "$(RESLIB6TARGETN)"!=""
 
-.IF "$(BUILDHIDS)"!=""
-HIDRES6PARTICLE=$(subst,$(OUTPATH),$(COMMON_OUTDIR) $(MISC))/$(RESLIB6NAME)_res.hid
-
-#HACK cut off the dirty srs files which are included from solver
-RESLIB6HIDFILES:=$(subst,$(OUTPATH),$(COMMON_OUTDIR) $(subst,.srs,_srs.hid $(RESLIB6SRSFILES)))
-$(HIDRES6PARTICLE): $(RESLIB6HIDFILES)
-    @echo "Making:   " $(@:f)
-    @$(IFEXIST) $@ $(THEN) $(RM:s/+//) $@ $(FI)
-# need to strip since solaris cannot handle tab-only whitespace here
-    $(COMMAND_ECHO)$(TYPE) $(mktmp  $(strip, $(subst,/,/ $(RESLIB6HIDFILES))) )| xargs -s 1000 cat > $@.$(ROUT).tmp
-    @$(RENAME) $@.$(ROUT).tmp $@
-
-ALLTAR : $(HIDRES6PARTICLE)
-
-.ENDIF # "$(BUILDHIDS)"!=""
-
 $(RSC_MULTI6) : \
         $(RESLIB6SRSFILES) \
         $(RESLIB6TARGETN) \
@@ -464,22 +368,6 @@ $(RESLIB6TARGETN): \
 
 .IF "$(RESLIB7TARGETN)"!=""
 
-.IF "$(BUILDHIDS)"!=""
-HIDRES7PARTICLE=$(subst,$(OUTPATH),$(COMMON_OUTDIR) $(MISC))/$(RESLIB7NAME)_res.hid
-
-#HACK cut off the dirty srs files which are included from solver
-RESLIB7HIDFILES:=$(subst,$(OUTPATH),$(COMMON_OUTDIR) $(subst,.srs,_srs.hid $(RESLIB7SRSFILES)))
-$(HIDRES7PARTICLE): $(RESLIB7HIDFILES)
-    @echo "Making:   " $(@:f)
-    @$(IFEXIST) $@ $(THEN) $(RM:s/+//) $@ $(FI)
-# need to strip since solaris cannot handle tab-only whitespace here
-    $(COMMAND_ECHO)$(TYPE) $(mktmp  $(strip, $(subst,/,/ $(RESLIB7HIDFILES))) )| xargs -s 1000 cat > $@.$(ROUT).tmp
-    @$(RENAME) $@.$(ROUT).tmp $@
-
-ALLTAR : $(HIDRES7PARTICLE)
-
-.ENDIF # "$(BUILDHIDS)"!=""
-
 $(RSC_MULTI7) : \
         $(RESLIB7SRSFILES) \
         $(RESLIB7TARGETN) \
@@ -541,22 +429,6 @@ $(RESLIB7TARGETN): \
 
 .IF "$(RESLIB8TARGETN)"!=""
 
-.IF "$(BUILDHIDS)"!=""
-HIDRES8PARTICLE=$(subst,$(OUTPATH),$(COMMON_OUTDIR) $(MISC))/$(RESLIB8NAME)_res.hid
-
-#HACK cut off the dirty srs files which are included from solver
-RESLIB8HIDFILES:=$(subst,$(OUTPATH),$(COMMON_OUTDIR) $(subst,.srs,_srs.hid $(RESLIB8SRSFILES)))
-$(HIDRES8PARTICLE): $(RESLIB8HIDFILES)
-    @echo "Making:   " $(@:f)
-    @$(IFEXIST) $@ $(THEN) $(RM:s/+//) $@ $(FI)
-# need to strip since solaris cannot handle tab-only whitespace here
-    $(COMMAND_ECHO)$(TYPE) $(mktmp  $(strip, $(subst,/,/ $(RESLIB8HIDFILES))) )| xargs -s 1000 cat > $@.$(ROUT).tmp
-    @$(RENAME) $@.$(ROUT).tmp $@
-
-ALLTAR : $(HIDRES8PARTICLE)
-
-.ENDIF # "$(BUILDHIDS)"!=""
-
 $(RSC_MULTI8) : \
         $(RESLIB8SRSFILES) \
         $(RESLIB8TARGETN) \
@@ -618,22 +490,6 @@ $(RESLIB8TARGETN): \
 
 .IF "$(RESLIB9TARGETN)"!=""
 
-.IF "$(BUILDHIDS)"!=""
-HIDRES9PARTICLE=$(subst,$(OUTPATH),$(COMMON_OUTDIR) $(MISC))/$(RESLIB9NAME)_res.hid
-
-#HACK cut off the dirty srs files which are included from solver
-RESLIB9HIDFILES:=$(subst,$(OUTPATH),$(COMMON_OUTDIR) $(subst,.srs,_srs.hid $(RESLIB9SRSFILES)))
-$(HIDRES9PARTICLE): $(RESLIB9HIDFILES)
-    @echo "Making:   " $(@:f)
-    @$(IFEXIST) $@ $(THEN) $(RM:s/+//) $@ $(FI)
-# need to strip since solaris cannot handle tab-only whitespace here
-    $(COMMAND_ECHO)$(TYPE) $(mktmp  $(strip, $(subst,/,/ $(RESLIB9HIDFILES))) )| xargs -s 1000 cat > $@.$(ROUT).tmp
-    @$(RENAME) $@.$(ROUT).tmp $@
-
-ALLTAR : $(HIDRES9PARTICLE)
-
-.ENDIF # "$(BUILDHIDS)"!=""
-
 $(RSC_MULTI9) : \
         $(RESLIB9SRSFILES) \
         $(RESLIB9TARGETN) \
@@ -695,22 +551,6 @@ $(RESLIB9TARGETN): \
 
 .IF "$(RESLIB10TARGETN)"!=""
 
-.IF "$(BUILDHIDS)"!=""
-HIDRES10PARTICLE=$(subst,$(OUTPATH),$(COMMON_OUTDIR) $(MISC))/$(RESLIB10NAME)_res.hid
-
-#HACK cut off the dirty srs files which are included from solver
-RESLIB10HIDFILES:=$(subst,$(OUTPATH),$(COMMON_OUTDIR) $(subst,.srs,_srs.hid $(RESLIB10SRSFILES)))
-$(HIDRES10PARTICLE): $(RESLIB10HIDFILES)
-    @echo "Making:   " $(@:f)
-    @$(IFEXIST) $@ $(THEN) $(RM:s/+//) $@ $(FI)
-# need to strip since solaris cannot handle tab-only whitespace here
-    $(COMMAND_ECHO)$(TYPE) $(mktmp  $(strip, $(subst,/,/ $(RESLIB10HIDFILES))) )| xargs -s 1000 cat > $@.$(ROUT).tmp
-    @$(RENAME) $@.$(ROUT).tmp $@
-
-ALLTAR : $(HIDRES10PARTICLE)
-
-.ENDIF # "$(BUILDHIDS)"!=""
-
 $(RSC_MULTI10) : \
         $(RESLIB10SRSFILES) \
         $(RESLIB10TARGETN) \
diff --git a/solenv/inc/_tg_sdi.mk b/solenv/inc/_tg_sdi.mk
index 5b3db9c696b7..45ea433b04b2 100644
--- a/solenv/inc/_tg_sdi.mk
+++ b/solenv/inc/_tg_sdi.mk
@@ -1,14 +1,5 @@
 # unroll begin
 
-.IF "$(HIDSID1PARTICLE)"!=""
-$(HIDSID1PARTICLE): $(SDI1TARGET)
-    @echo "Making:   " $(@:f)
-    @-$(RM) $@.$(ROUT).tmp $@
-    @$(TYPE) $(MISC)/$(SDI1NAME).sid | $(AWK) '$$1=="#define" { print $$2, $$3 }' > $@.$(ROUT).tmp
-    @-$(RM) $@
-    @$(RENAME) $@.$(ROUT).tmp $@
-.ENDIF # "$(HIDSID1PARTICLE)"!=""
-
 .IF "$(SDI1TARGET)"!=""
 $(SDI1TARGET): $(SVSDI1DEPEND) $(SDI1NAME).sdi
     @echo "Making:   " $(@:f)
@@ -27,15 +18,6 @@ $(SDI1TARGET): $(SVSDI1DEPEND) $(SDI1NAME).sdi
 # Instruction for ???
 # unroll begin
 
-.IF "$(HIDSID2PARTICLE)"!=""
-$(HIDSID2PARTICLE): $(SDI2TARGET)
-    @echo "Making:   " $(@:f)
-    @-$(RM) $@.$(ROUT).tmp $@
-    @$(TYPE) $(MISC)/$(SDI2NAME).sid | $(AWK) '$$1=="#define" { print $$2, $$3 }' > $@.$(ROUT).tmp
-    @-$(RM) $@
-    @$(RENAME) $@.$(ROUT).tmp $@
-.ENDIF # "$(HIDSID2PARTICLE)"!=""
-
 .IF "$(SDI2TARGET)"!=""
 $(SDI2TARGET): $(SVSDI2DEPEND) $(SDI2NAME).sdi
     @echo "Making:   " $(@:f)
@@ -54,15 +36,6 @@ $(SDI2TARGET): $(SVSDI2DEPEND) $(SDI2NAME).sdi
 # Instruction for ???
 # unroll begin
 
-.IF "$(HIDSID3PARTICLE)"!=""
-$(HIDSID3PARTICLE): $(SDI3TARGET)
-    @echo "Making:   " $(@:f)
-    @-$(RM) $@.$(ROUT).tmp $@
-    @$(TYPE) $(MISC)/$(SDI3NAME).sid | $(AWK) '$$1=="#define" { print $$2, $$3 }' > $@.$(ROUT).tmp
-    @-$(RM) $@
-    @$(RENAME) $@.$(ROUT).tmp $@
-.ENDIF # "$(HIDSID3PARTICLE)"!=""
-
 .IF "$(SDI3TARGET)"!=""
 $(SDI3TARGET): $(SVSDI3DEPEND) $(SDI3NAME).sdi
     @echo "Making:   " $(@:f)
@@ -81,15 +54,6 @@ $(SDI3TARGET): $(SVSDI3DEPEND) $(SDI3NAME).sdi
 # Instruction for ???
 # unroll begin
 
-.IF "$(HIDSID4PARTICLE)"!=""
-$(HIDSID4PARTICLE): $(SDI4TARGET)
-    @echo "Making:   " $(@:f)
-    @-$(RM) $@.$(ROUT).tmp $@
-    @$(TYPE) $(MISC)/$(SDI4NAME).sid | $(AWK) '$$1=="#define" { print $$2, $$3 }' > $@.$(ROUT).tmp
-    @-$(RM) $@
-    @$(RENAME) $@.$(ROUT).tmp $@
-.ENDIF # "$(HIDSID4PARTICLE)"!=""
-
 .IF "$(SDI4TARGET)"!=""
 $(SDI4TARGET): $(SVSDI4DEPEND) $(SDI4NAME).sdi
     @echo "Making:   " $(@:f)
@@ -108,15 +72,6 @@ $(SDI4TARGET): $(SVSDI4DEPEND) $(SDI4NAME).sdi
 # Instruction for ???
 # unroll begin
 
-.IF "$(HIDSID5PARTICLE)"!=""
-$(HIDSID5PARTICLE): $(SDI5TARGET)
-    @echo "Making:   " $(@:f)
-    @-$(RM) $@.$(ROUT).tmp $@
-    @$(TYPE) $(MISC)/$(SDI5NAME).sid | $(AWK) '$$1=="#define" { print $$2, $$3 }' > $@.$(ROUT).tmp
-    @-$(RM) $@
-    @$(RENAME) $@.$(ROUT).tmp $@
-.ENDIF # "$(HIDSID5PARTICLE)"!=""
-
 .IF "$(SDI5TARGET)"!=""
 $(SDI5TARGET): $(SVSDI5DEPEND) $(SDI5NAME).sdi
     @echo "Making:   " $(@:f)
@@ -135,15 +90,6 @@ $(SDI5TARGET): $(SVSDI5DEPEND) $(SDI5NAME).sdi
 # Instruction for ???
 # unroll begin
 
-.IF "$(HIDSID6PARTICLE)"!=""
-$(HIDSID6PARTICLE): $(SDI6TARGET)
-    @echo "Making:   " $(@:f)
-    @-$(RM) $@.$(ROUT).tmp $@
-    @$(TYPE) $(MISC)/$(SDI6NAME).sid | $(AWK) '$$1=="#define" { print $$2, $$3 }' > $@.$(ROUT).tmp
-    @-$(RM) $@
-    @$(RENAME) $@.$(ROUT).tmp $@
-.ENDIF # "$(HIDSID6PARTICLE)"!=""
-
 .IF "$(SDI6TARGET)"!=""
 $(SDI6TARGET): $(SVSDI6DEPEND) $(SDI6NAME).sdi
     @echo "Making:   " $(@:f)
@@ -162,15 +108,6 @@ $(SDI6TARGET): $(SVSDI6DEPEND) $(SDI6NAME).sdi
 # Instruction for ???
 # unroll begin
 
-.IF "$(HIDSID7PARTICLE)"!=""
-$(HIDSID7PARTICLE): $(SDI7TARGET)
-    @echo "Making:   " $(@:f)
-    @-$(RM) $@.$(ROUT).tmp $@
-    @$(TYPE) $(MISC)/$(SDI7NAME).sid | $(AWK) '$$1=="#define" { print $$2, $$3 }' > $@.$(ROUT).tmp
-    @-$(RM) $@
-    @$(RENAME) $@.$(ROUT).tmp $@
-.ENDIF # "$(HIDSID7PARTICLE)"!=""
-
 .IF "$(SDI7TARGET)"!=""
 $(SDI7TARGET): $(SVSDI7DEPEND) $(SDI7NAME).sdi
     @echo "Making:   " $(@:f)
@@ -189,15 +126,6 @@ $(SDI7TARGET): $(SVSDI7DEPEND) $(SDI7NAME).sdi
 # Instruction for ???
 # unroll begin
 
-.IF "$(HIDSID8PARTICLE)"!=""
-$(HIDSID8PARTICLE): $(SDI8TARGET)
-    @echo "Making:   " $(@:f)
-    @-$(RM) $@.$(ROUT).tmp $@
-    @$(TYPE) $(MISC)/$(SDI8NAME).sid | $(AWK) '$$1=="#define" { print $$2, $$3 }' > $@.$(ROUT).tmp
-    @-$(RM) $@
-    @$(RENAME) $@.$(ROUT).tmp $@
-.ENDIF # "$(HIDSID8PARTICLE)"!=""
-
 .IF "$(SDI8TARGET)"!=""
 $(SDI8TARGET): $(SVSDI8DEPEND) $(SDI8NAME).sdi
     @echo "Making:   " $(@:f)
@@ -216,15 +144,6 @@ $(SDI8TARGET): $(SVSDI8DEPEND) $(SDI8NAME).sdi
 # Instruction for ???
 # unroll begin
 
-.IF "$(HIDSID9PARTICLE)"!=""
-$(HIDSID9PARTICLE): $(SDI9TARGET)
-    @echo "Making:   " $(@:f)
-    @-$(RM) $@.$(ROUT).tmp $@
-    @$(TYPE) $(MISC)/$(SDI9NAME).sid | $(AWK) '$$1=="#define" { print $$2, $$3 }' > $@.$(ROUT).tmp
-    @-$(RM) $@
-    @$(RENAME) $@.$(ROUT).tmp $@
-.ENDIF # "$(HIDSID9PARTICLE)"!=""
-
 .IF "$(SDI9TARGET)"!=""
 $(SDI9TARGET): $(SVSDI9DEPEND) $(SDI9NAME).sdi
     @echo "Making:   " $(@:f)
@@ -243,15 +162,6 @@ $(SDI9TARGET): $(SVSDI9DEPEND) $(SDI9NAME).sdi
 # Instruction for ???
 # unroll begin
 
-.IF "$(HIDSID10PARTICLE)"!=""
-$(HIDSID10PARTICLE): $(SDI10TARGET)
-    @echo "Making:   " $(@:f)
-    @-$(RM) $@.$(ROUT).tmp $@
-    @$(TYPE) $(MISC)/$(SDI10NAME).sid | $(AWK) '$$1=="#define" { print $$2, $$3 }' > $@.$(ROUT).tmp
-    @-$(RM) $@
-    @$(RENAME) $@.$(ROUT).tmp $@
-.ENDIF # "$(HIDSID10PARTICLE)"!=""
-
 .IF "$(SDI10TARGET)"!=""
 $(SDI10TARGET): $(SVSDI10DEPEND) $(SDI10NAME).sdi
     @echo "Making:   " $(@:f)
diff --git a/solenv/inc/_tg_srs.mk b/solenv/inc/_tg_srs.mk
index 063f98f2f322..375fab35b800 100644
--- a/solenv/inc/_tg_srs.mk
+++ b/solenv/inc/_tg_srs.mk
@@ -1,22 +1,10 @@
 # unroll begin
 
 .IF "$(SRS1NAME)"!=""
-.IF "$(BUILDHIDS)"!=""
-HID1FILES=$(foreach,i,$(SRC1FILES:f) $(SRS)/$(i:s/.src/.hid/))
-HIDSRS1PARTICLE=$(subst,$(OUTPATH),$(COMMON_OUTDIR) $(SRS))/$(SRS1NAME)_srs.hid
-$(HIDSRS1PARTICLE) : $(HID1FILES)
-    @echo "Making:   " $(@:f)
-    @-$(RM) $@
-    $(COMMAND_ECHO)$(TYPE) $(mktmp  $(subst,/,/ $(HID1FILES))) | xargs -s 1000 cat > $@.$(ROUT).tmp
-    @$(RENAME) $@.$(ROUT).tmp $@
-
-ALLTAR : $(HIDSRS1PARTICLE)
-
-.ENDIF # "$(BUILDHIDS)"!=""
 
 $(MISC)/$(TARGET).$(SRS1NAME).dprr: $(LOCALIZE_ME_DEST)
 
-$(MISC)/$(TARGET).$(SRS1NAME).dprr: $(SRC1FILES) $(HIDSRS1PARTICLE) $(HID1FILES)
+$(MISC)/$(TARGET).$(SRS1NAME).dprr: $(SRC1FILES)
     @echo "Making:   " $(@:f)
     @@-$(RM) $(MISC)/$(TARGET).$(SRS1NAME).dprr
     $(COMMAND_ECHO)$(RSC) $(VERBOSITY) $(SRSDEFAULT) $(RSC_SRS_CHARSET) $(RSCFLAGS) -I$(RSCEXTINC) -I$(INCLOCPRJ)  -I$(INCLOCAL) -I$(INC) -I$(INCCOM) $(RSCDEFS) $(RSCUPDVERDEF) -fp={$(SRS)/$(SRS1NAME).srs} -fo=$@ -p=$(TARGET) $(SRC1FILES)
@@ -28,7 +16,7 @@ $(foreach,i,$(SRC1FILES) $(COMMONMISC)/$(TARGET)/$i) : $$(@:f) $(LOCALIZESDF)
     $(COMMAND_ECHO)-$(MKDIR) $(@:d)
     $(COMMAND_ECHO)-$(RM) $@
     $(COMMAND_ECHO)-$(MKDIRHIER)  $(COMMONMISC)$/$(PRJNAME)
-    $(COMMAND_ECHO)$(WRAPCMD) $(TRANSEX) $(TRANSEX_VERBOSITY) -p $(PRJNAME) -i $(@:f) -o $(@).$(INPATH) -m $(LOCALIZESDF) -l all
+    $(COMMAND_ECHO)$(WRAPCMD) $(TRANSEX) -p $(PRJNAME) -i $(@:f) -o $(@).$(INPATH) -m $(LOCALIZESDF) -l all
     $(COMMAND_ECHO)$(RENAME) $@.$(INPATH) $@
     $(COMMAND_ECHO)-$(RM) $@.$(INPATH)
 
@@ -54,22 +42,10 @@ $(SRS)/$(SRS1NAME).srs: $(SRC1FILES)
 # unroll begin
 
 .IF "$(SRS2NAME)"!=""
-.IF "$(BUILDHIDS)"!=""
-HID2FILES=$(foreach,i,$(SRC2FILES:f) $(SRS)/$(i:s/.src/.hid/))
-HIDSRS2PARTICLE=$(subst,$(OUTPATH),$(COMMON_OUTDIR) $(SRS))/$(SRS2NAME)_srs.hid
-$(HIDSRS2PARTICLE) : $(HID2FILES)
-    @echo "Making:   " $(@:f)
-    @-$(RM) $@
-    $(COMMAND_ECHO)$(TYPE) $(mktmp  $(subst,/,/ $(HID2FILES))) | xargs -s 1000 cat > $@.$(ROUT).tmp
-    @$(RENAME) $@.$(ROUT).tmp $@
-
-ALLTAR : $(HIDSRS2PARTICLE)
-
-.ENDIF # "$(BUILDHIDS)"!=""
 
 $(MISC)/$(TARGET).$(SRS2NAME).dprr: $(LOCALIZE_ME_DEST)
 
-$(MISC)/$(TARGET).$(SRS2NAME).dprr: $(SRC2FILES) $(HIDSRS2PARTICLE) $(HID2FILES)
+$(MISC)/$(TARGET).$(SRS2NAME).dprr: $(SRC2FILES)
     @echo "Making:   " $(@:f)
     @@-$(RM) $(MISC)/$(TARGET).$(SRS2NAME).dprr
     $(COMMAND_ECHO)$(RSC) $(VERBOSITY) $(SRSDEFAULT) $(RSC_SRS_CHARSET) $(RSCFLAGS) -I$(RSCEXTINC) -I$(INCLOCPRJ)  -I$(INCLOCAL) -I$(INC) -I$(INCCOM) $(RSCDEFS) $(RSCUPDVERDEF) -fp={$(SRS)/$(SRS2NAME).srs} -fo=$@ -p=$(TARGET) $(SRC2FILES)
@@ -81,7 +57,7 @@ $(foreach,i,$(SRC2FILES) $(COMMONMISC)/$(TARGET)/$i) : $$(@:f) $(LOCALIZESDF)
     $(COMMAND_ECHO)-$(MKDIR) $(@:d)
     $(COMMAND_ECHO)-$(RM) $@
     $(COMMAND_ECHO)-$(MKDIRHIER)  $(COMMONMISC)$/$(PRJNAME)
-    $(COMMAND_ECHO)$(WRAPCMD) $(TRANSEX) $(TRANSEX_VERBOSITY) -p $(PRJNAME) -i $(@:f) -o $(@).$(INPATH) -m $(LOCALIZESDF) -l all
+    $(COMMAND_ECHO)$(WRAPCMD) $(TRANSEX) -p $(PRJNAME) -i $(@:f) -o $(@).$(INPATH) -m $(LOCALIZESDF) -l all
     $(COMMAND_ECHO)$(RENAME) $@.$(INPATH) $@
     $(COMMAND_ECHO)-$(RM) $@.$(INPATH)
 
@@ -107,22 +83,10 @@ $(SRS)/$(SRS2NAME).srs: $(SRC2FILES)
 # unroll begin
 
 .IF "$(SRS3NAME)"!=""
-.IF "$(BUILDHIDS)"!=""
-HID3FILES=$(foreach,i,$(SRC3FILES:f) $(SRS)/$(i:s/.src/.hid/))
-HIDSRS3PARTICLE=$(subst,$(OUTPATH),$(COMMON_OUTDIR) $(SRS))/$(SRS3NAME)_srs.hid
-$(HIDSRS3PARTICLE) : $(HID3FILES)
-    @echo "Making:   " $(@:f)
-    @-$(RM) $@
-    $(COMMAND_ECHO)$(TYPE) $(mktmp  $(subst,/,/ $(HID3FILES))) | xargs -s 1000 cat > $@.$(ROUT).tmp
-    @$(RENAME) $@.$(ROUT).tmp $@
-
-ALLTAR : $(HIDSRS3PARTICLE)
-
-.ENDIF # "$(BUILDHIDS)"!=""
 
 $(MISC)/$(TARGET).$(SRS3NAME).dprr: $(LOCALIZE_ME_DEST)
 
-$(MISC)/$(TARGET).$(SRS3NAME).dprr: $(SRC3FILES) $(HIDSRS3PARTICLE) $(HID3FILES)
+$(MISC)/$(TARGET).$(SRS3NAME).dprr: $(SRC3FILES)
     @echo "Making:   " $(@:f)
     @@-$(RM) $(MISC)/$(TARGET).$(SRS3NAME).dprr
     $(COMMAND_ECHO)$(RSC) $(VERBOSITY) $(SRSDEFAULT) $(RSC_SRS_CHARSET) $(RSCFLAGS) -I$(RSCEXTINC) -I$(INCLOCPRJ)  -I$(INCLOCAL) -I$(INC) -I$(INCCOM) $(RSCDEFS) $(RSCUPDVERDEF) -fp={$(SRS)/$(SRS3NAME).srs} -fo=$@ -p=$(TARGET) $(SRC3FILES)
@@ -134,7 +98,7 @@ $(foreach,i,$(SRC3FILES) $(COMMONMISC)/$(TARGET)/$i) : $$(@:f) $(LOCALIZESDF)
     $(COMMAND_ECHO)-$(MKDIR) $(@:d)
     $(COMMAND_ECHO)-$(RM) $@
     $(COMMAND_ECHO)-$(MKDIRHIER)  $(COMMONMISC)$/$(PRJNAME)
-    $(COMMAND_ECHO)$(WRAPCMD) $(TRANSEX) $(TRANSEX_VERBOSITY) -p $(PRJNAME) -i $(@:f) -o $(@).$(INPATH) -m $(LOCALIZESDF) -l all
+    $(COMMAND_ECHO)$(WRAPCMD) $(TRANSEX) -p $(PRJNAME) -i $(@:f) -o $(@).$(INPATH) -m $(LOCALIZESDF) -l all
     $(COMMAND_ECHO)$(RENAME) $@.$(INPATH) $@
     $(COMMAND_ECHO)-$(RM) $@.$(INPATH)
 
@@ -160,22 +124,10 @@ $(SRS)/$(SRS3NAME).srs: $(SRC3FILES)
 # unroll begin
 
 .IF "$(SRS4NAME)"!=""
-.IF "$(BUILDHIDS)"!=""
-HID4FILES=$(foreach,i,$(SRC4FILES:f) $(SRS)/$(i:s/.src/.hid/))
-HIDSRS4PARTICLE=$(subst,$(OUTPATH),$(COMMON_OUTDIR) $(SRS))/$(SRS4NAME)_srs.hid
-$(HIDSRS4PARTICLE) : $(HID4FILES)
-    @echo "Making:   " $(@:f)
-    @-$(RM) $@
-    $(COMMAND_ECHO)$(TYPE) $(mktmp  $(subst,/,/ $(HID4FILES))) | xargs -s 1000 cat > $@.$(ROUT).tmp
-    @$(RENAME) $@.$(ROUT).tmp $@
-
-ALLTAR : $(HIDSRS4PARTICLE)
-
-.ENDIF # "$(BUILDHIDS)"!=""
 
 $(MISC)/$(TARGET).$(SRS4NAME).dprr: $(LOCALIZE_ME_DEST)
 
-$(MISC)/$(TARGET).$(SRS4NAME).dprr: $(SRC4FILES) $(HIDSRS4PARTICLE) $(HID4FILES)
+$(MISC)/$(TARGET).$(SRS4NAME).dprr: $(SRC4FILES)
     @echo "Making:   " $(@:f)
     @@-$(RM) $(MISC)/$(TARGET).$(SRS4NAME).dprr
     $(COMMAND_ECHO)$(RSC) $(VERBOSITY) $(SRSDEFAULT) $(RSC_SRS_CHARSET) $(RSCFLAGS) -I$(RSCEXTINC) -I$(INCLOCPRJ)  -I$(INCLOCAL) -I$(INC) -I$(INCCOM) $(RSCDEFS) $(RSCUPDVERDEF) -fp={$(SRS)/$(SRS4NAME).srs} -fo=$@ -p=$(TARGET) $(SRC4FILES)
@@ -187,7 +139,7 @@ $(foreach,i,$(SRC4FILES) $(COMMONMISC)/$(TARGET)/$i) : $$(@:f) $(LOCALIZESDF)
     $(COMMAND_ECHO)-$(MKDIR) $(@:d)
     $(COMMAND_ECHO)-$(RM) $@
     $(COMMAND_ECHO)-$(MKDIRHIER)  $(COMMONMISC)$/$(PRJNAME)
-    $(COMMAND_ECHO)$(WRAPCMD) $(TRANSEX) $(TRANSEX_VERBOSITY) -p $(PRJNAME) -i $(@:f) -o $(@).$(INPATH) -m $(LOCALIZESDF) -l all
+    $(COMMAND_ECHO)$(WRAPCMD) $(TRANSEX) -p $(PRJNAME) -i $(@:f) -o $(@).$(INPATH) -m $(LOCALIZESDF) -l all
     $(COMMAND_ECHO)$(RENAME) $@.$(INPATH) $@
     $(COMMAND_ECHO)-$(RM) $@.$(INPATH)
 
@@ -213,22 +165,10 @@ $(SRS)/$(SRS4NAME).srs: $(SRC4FILES)
 # unroll begin
 
 .IF "$(SRS5NAME)"!=""
-.IF "$(BUILDHIDS)"!=""
-HID5FILES=$(foreach,i,$(SRC5FILES:f) $(SRS)/$(i:s/.src/.hid/))
-HIDSRS5PARTICLE=$(subst,$(OUTPATH),$(COMMON_OUTDIR) $(SRS))/$(SRS5NAME)_srs.hid
-$(HIDSRS5PARTICLE) : $(HID5FILES)
-    @echo "Making:   " $(@:f)
-    @-$(RM) $@
-    $(COMMAND_ECHO)$(TYPE) $(mktmp  $(subst,/,/ $(HID5FILES))) | xargs -s 1000 cat > $@.$(ROUT).tmp
-    @$(RENAME) $@.$(ROUT).tmp $@
-
-ALLTAR : $(HIDSRS5PARTICLE)
-
-.ENDIF # "$(BUILDHIDS)"!=""
 
 $(MISC)/$(TARGET).$(SRS5NAME).dprr: $(LOCALIZE_ME_DEST)
 
-$(MISC)/$(TARGET).$(SRS5NAME).dprr: $(SRC5FILES) $(HIDSRS5PARTICLE) $(HID5FILES)
+$(MISC)/$(TARGET).$(SRS5NAME).dprr: $(SRC5FILES)
     @echo "Making:   " $(@:f)
     @@-$(RM) $(MISC)/$(TARGET).$(SRS5NAME).dprr
     $(COMMAND_ECHO)$(RSC) $(VERBOSITY) $(SRSDEFAULT) $(RSC_SRS_CHARSET) $(RSCFLAGS) -I$(RSCEXTINC) -I$(INCLOCPRJ)  -I$(INCLOCAL) -I$(INC) -I$(INCCOM) $(RSCDEFS) $(RSCUPDVERDEF) -fp={$(SRS)/$(SRS5NAME).srs} -fo=$@ -p=$(TARGET) $(SRC5FILES)
@@ -240,7 +180,7 @@ $(foreach,i,$(SRC5FILES) $(COMMONMISC)/$(TARGET)/$i) : $$(@:f) $(LOCALIZESDF)
     $(COMMAND_ECHO)-$(MKDIR) $(@:d)
     $(COMMAND_ECHO)-$(RM) $@
     $(COMMAND_ECHO)-$(MKDIRHIER)  $(COMMONMISC)$/$(PRJNAME)
-    $(COMMAND_ECHO)$(WRAPCMD) $(TRANSEX) $(TRANSEX_VERBOSITY) -p $(PRJNAME) -i $(@:f) -o $(@).$(INPATH) -m $(LOCALIZESDF) -l all
+    $(COMMAND_ECHO)$(WRAPCMD) $(TRANSEX) -p $(PRJNAME) -i $(@:f) -o $(@).$(INPATH) -m $(LOCALIZESDF) -l all
     $(COMMAND_ECHO)$(RENAME) $@.$(INPATH) $@
     $(COMMAND_ECHO)-$(RM) $@.$(INPATH)
 
@@ -266,22 +206,10 @@ $(SRS)/$(SRS5NAME).srs: $(SRC5FILES)
 # unroll begin
 
 .IF "$(SRS6NAME)"!=""
-.IF "$(BUILDHIDS)"!=""
-HID6FILES=$(foreach,i,$(SRC6FILES:f) $(SRS)/$(i:s/.src/.hid/))
-HIDSRS6PARTICLE=$(subst,$(OUTPATH),$(COMMON_OUTDIR) $(SRS))/$(SRS6NAME)_srs.hid
-$(HIDSRS6PARTICLE) : $(HID6FILES)
-    @echo "Making:   " $(@:f)
-    @-$(RM) $@
-    $(COMMAND_ECHO)$(TYPE) $(mktmp  $(subst,/,/ $(HID6FILES))) | xargs -s 1000 cat > $@.$(ROUT).tmp
-    @$(RENAME) $@.$(ROUT).tmp $@
-
-ALLTAR : $(HIDSRS6PARTICLE)
-
-.ENDIF # "$(BUILDHIDS)"!=""
 
 $(MISC)/$(TARGET).$(SRS6NAME).dprr: $(LOCALIZE_ME_DEST)
 
-$(MISC)/$(TARGET).$(SRS6NAME).dprr: $(SRC6FILES) $(HIDSRS6PARTICLE) $(HID6FILES)
+$(MISC)/$(TARGET).$(SRS6NAME).dprr: $(SRC6FILES)
     @echo "Making:   " $(@:f)
     @@-$(RM) $(MISC)/$(TARGET).$(SRS6NAME).dprr
     $(COMMAND_ECHO)$(RSC) $(VERBOSITY) $(SRSDEFAULT) $(RSC_SRS_CHARSET) $(RSCFLAGS) -I$(RSCEXTINC) -I$(INCLOCPRJ)  -I$(INCLOCAL) -I$(INC) -I$(INCCOM) $(RSCDEFS) $(RSCUPDVERDEF) -fp={$(SRS)/$(SRS6NAME).srs} -fo=$@ -p=$(TARGET) $(SRC6FILES)
@@ -293,7 +221,7 @@ $(foreach,i,$(SRC6FILES) $(COMMONMISC)/$(TARGET)/$i) : $$(@:f) $(LOCALIZESDF)
     $(COMMAND_ECHO)-$(MKDIR) $(@:d)
     $(COMMAND_ECHO)-$(RM) $@
     $(COMMAND_ECHO)-$(MKDIRHIER)  $(COMMONMISC)$/$(PRJNAME)
-    $(COMMAND_ECHO)$(WRAPCMD) $(TRANSEX) $(TRANSEX_VERBOSITY) -p $(PRJNAME) -i $(@:f) -o $(@).$(INPATH) -m $(LOCALIZESDF) -l all
+    $(COMMAND_ECHO)$(WRAPCMD) $(TRANSEX) -p $(PRJNAME) -i $(@:f) -o $(@).$(INPATH) -m $(LOCALIZESDF) -l all
     $(COMMAND_ECHO)$(RENAME) $@.$(INPATH) $@
     $(COMMAND_ECHO)-$(RM) $@.$(INPATH)
 
@@ -319,22 +247,10 @@ $(SRS)/$(SRS6NAME).srs: $(SRC6FILES)
 # unroll begin
 
 .IF "$(SRS7NAME)"!=""
-.IF "$(BUILDHIDS)"!=""
-HID7FILES=$(foreach,i,$(SRC7FILES:f) $(SRS)/$(i:s/.src/.hid/))
-HIDSRS7PARTICLE=$(subst,$(OUTPATH),$(COMMON_OUTDIR) $(SRS))/$(SRS7NAME)_srs.hid
-$(HIDSRS7PARTICLE) : $(HID7FILES)
-    @echo "Making:   " $(@:f)
-    @-$(RM) $@
-    $(COMMAND_ECHO)$(TYPE) $(mktmp  $(subst,/,/ $(HID7FILES))) | xargs -s 1000 cat > $@.$(ROUT).tmp
-    @$(RENAME) $@.$(ROUT).tmp $@
-
-ALLTAR : $(HIDSRS7PARTICLE)
-
-.ENDIF # "$(BUILDHIDS)"!=""
 
 $(MISC)/$(TARGET).$(SRS7NAME).dprr: $(LOCALIZE_ME_DEST)
 
-$(MISC)/$(TARGET).$(SRS7NAME).dprr: $(SRC7FILES) $(HIDSRS7PARTICLE) $(HID7FILES)
+$(MISC)/$(TARGET).$(SRS7NAME).dprr: $(SRC7FILES)
     @echo "Making:   " $(@:f)
     @@-$(RM) $(MISC)/$(TARGET).$(SRS7NAME).dprr
     $(COMMAND_ECHO)$(RSC) $(VERBOSITY) $(SRSDEFAULT) $(RSC_SRS_CHARSET) $(RSCFLAGS) -I$(RSCEXTINC) -I$(INCLOCPRJ)  -I$(INCLOCAL) -I$(INC) -I$(INCCOM) $(RSCDEFS) $(RSCUPDVERDEF) -fp={$(SRS)/$(SRS7NAME).srs} -fo=$@ -p=$(TARGET) $(SRC7FILES)
@@ -346,7 +262,7 @@ $(foreach,i,$(SRC7FILES) $(COMMONMISC)/$(TARGET)/$i) : $$(@:f) $(LOCALIZESDF)
     $(COMMAND_ECHO)-$(MKDIR) $(@:d)
     $(COMMAND_ECHO)-$(RM) $@
     $(COMMAND_ECHO)-$(MKDIRHIER)  $(COMMONMISC)$/$(PRJNAME)
-    $(COMMAND_ECHO)$(WRAPCMD) $(TRANSEX) $(TRANSEX_VERBOSITY) -p $(PRJNAME) -i $(@:f) -o $(@).$(INPATH) -m $(LOCALIZESDF) -l all
+    $(COMMAND_ECHO)$(WRAPCMD) $(TRANSEX) -p $(PRJNAME) -i $(@:f) -o $(@).$(INPATH) -m $(LOCALIZESDF) -l all
     $(COMMAND_ECHO)$(RENAME) $@.$(INPATH) $@
     $(COMMAND_ECHO)-$(RM) $@.$(INPATH)
 
@@ -372,22 +288,10 @@ $(SRS)/$(SRS7NAME).srs: $(SRC7FILES)
 # unroll begin
 
 .IF "$(SRS8NAME)"!=""
-.IF "$(BUILDHIDS)"!=""
-HID8FILES=$(foreach,i,$(SRC8FILES:f) $(SRS)/$(i:s/.src/.hid/))
-HIDSRS8PARTICLE=$(subst,$(OUTPATH),$(COMMON_OUTDIR) $(SRS))/$(SRS8NAME)_srs.hid
-$(HIDSRS8PARTICLE) : $(HID8FILES)
-    @echo "Making:   " $(@:f)
-    @-$(RM) $@
-    $(COMMAND_ECHO)$(TYPE) $(mktmp  $(subst,/,/ $(HID8FILES))) | xargs -s 1000 cat > $@.$(ROUT).tmp
-    @$(RENAME) $@.$(ROUT).tmp $@
-
-ALLTAR : $(HIDSRS8PARTICLE)
-
-.ENDIF # "$(BUILDHIDS)"!=""
 
 $(MISC)/$(TARGET).$(SRS8NAME).dprr: $(LOCALIZE_ME_DEST)
 
-$(MISC)/$(TARGET).$(SRS8NAME).dprr: $(SRC8FILES) $(HIDSRS8PARTICLE) $(HID8FILES)
+$(MISC)/$(TARGET).$(SRS8NAME).dprr: $(SRC8FILES)
     @echo "Making:   " $(@:f)
     @@-$(RM) $(MISC)/$(TARGET).$(SRS8NAME).dprr
     $(COMMAND_ECHO)$(RSC) $(VERBOSITY) $(SRSDEFAULT) $(RSC_SRS_CHARSET) $(RSCFLAGS) -I$(RSCEXTINC) -I$(INCLOCPRJ)  -I$(INCLOCAL) -I$(INC) -I$(INCCOM) $(RSCDEFS) $(RSCUPDVERDEF) -fp={$(SRS)/$(SRS8NAME).srs} -fo=$@ -p=$(TARGET) $(SRC8FILES)
@@ -399,7 +303,7 @@ $(foreach,i,$(SRC8FILES) $(COMMONMISC)/$(TARGET)/$i) : $$(@:f) $(LOCALIZESDF)
     $(COMMAND_ECHO)-$(MKDIR) $(@:d)
     $(COMMAND_ECHO)-$(RM) $@
     $(COMMAND_ECHO)-$(MKDIRHIER)  $(COMMONMISC)$/$(PRJNAME)
-    $(COMMAND_ECHO)$(WRAPCMD) $(TRANSEX) $(TRANSEX_VERBOSITY) -p $(PRJNAME) -i $(@:f) -o $(@).$(INPATH) -m $(LOCALIZESDF) -l all
+    $(COMMAND_ECHO)$(WRAPCMD) $(TRANSEX) -p $(PRJNAME) -i $(@:f) -o $(@).$(INPATH) -m $(LOCALIZESDF) -l all
     $(COMMAND_ECHO)$(RENAME) $@.$(INPATH) $@
     $(COMMAND_ECHO)-$(RM) $@.$(INPATH)
 
@@ -425,22 +329,10 @@ $(SRS)/$(SRS8NAME).srs: $(SRC8FILES)
 # unroll begin
 
 .IF "$(SRS9NAME)"!=""
-.IF "$(BUILDHIDS)"!=""
-HID9FILES=$(foreach,i,$(SRC9FILES:f) $(SRS)/$(i:s/.src/.hid/))
-HIDSRS9PARTICLE=$(subst,$(OUTPATH),$(COMMON_OUTDIR) $(SRS))/$(SRS9NAME)_srs.hid
-$(HIDSRS9PARTICLE) : $(HID9FILES)
-    @echo "Making:   " $(@:f)
-    @-$(RM) $@
-    $(COMMAND_ECHO)$(TYPE) $(mktmp  $(subst,/,/ $(HID9FILES))) | xargs -s 1000 cat > $@.$(ROUT).tmp
-    @$(RENAME) $@.$(ROUT).tmp $@
-
-ALLTAR : $(HIDSRS9PARTICLE)
-
-.ENDIF # "$(BUILDHIDS)"!=""
 
 $(MISC)/$(TARGET).$(SRS9NAME).dprr: $(LOCALIZE_ME_DEST)
 
-$(MISC)/$(TARGET).$(SRS9NAME).dprr: $(SRC9FILES) $(HIDSRS9PARTICLE) $(HID9FILES)
+$(MISC)/$(TARGET).$(SRS9NAME).dprr: $(SRC9FILES)
     @echo "Making:   " $(@:f)
     @@-$(RM) $(MISC)/$(TARGET).$(SRS9NAME).dprr
     $(COMMAND_ECHO)$(RSC) $(VERBOSITY) $(SRSDEFAULT) $(RSC_SRS_CHARSET) $(RSCFLAGS) -I$(RSCEXTINC) -I$(INCLOCPRJ)  -I$(INCLOCAL) -I$(INC) -I$(INCCOM) $(RSCDEFS) $(RSCUPDVERDEF) -fp={$(SRS)/$(SRS9NAME).srs} -fo=$@ -p=$(TARGET) $(SRC9FILES)
@@ -452,7 +344,7 @@ $(foreach,i,$(SRC9FILES) $(COMMONMISC)/$(TARGET)/$i) : $$(@:f) $(LOCALIZESDF)
     $(COMMAND_ECHO)-$(MKDIR) $(@:d)
     $(COMMAND_ECHO)-$(RM) $@
     $(COMMAND_ECHO)-$(MKDIRHIER)  $(COMMONMISC)$/$(PRJNAME)
-    $(COMMAND_ECHO)$(WRAPCMD) $(TRANSEX) $(TRANSEX_VERBOSITY) -p $(PRJNAME) -i $(@:f) -o $(@).$(INPATH) -m $(LOCALIZESDF) -l all
+    $(COMMAND_ECHO)$(WRAPCMD) $(TRANSEX) -p $(PRJNAME) -i $(@:f) -o $(@).$(INPATH) -m $(LOCALIZESDF) -l all
     $(COMMAND_ECHO)$(RENAME) $@.$(INPATH) $@
     $(COMMAND_ECHO)-$(RM) $@.$(INPATH)
 
@@ -478,22 +370,10 @@ $(SRS)/$(SRS9NAME).srs: $(SRC9FILES)
 # unroll begin
 
 .IF "$(SRS10NAME)"!=""
-.IF "$(BUILDHIDS)"!=""
-HID10FILES=$(foreach,i,$(SRC10FILES:f) $(SRS)/$(i:s/.src/.hid/))
-HIDSRS10PARTICLE=$(subst,$(OUTPATH),$(COMMON_OUTDIR) $(SRS))/$(SRS10NAME)_srs.hid
-$(HIDSRS10PARTICLE) : $(HID10FILES)
-    @echo "Making:   " $(@:f)
-    @-$(RM) $@
-    $(COMMAND_ECHO)$(TYPE) $(mktmp  $(subst,/,/ $(HID10FILES))) | xargs -s 1000 cat > $@.$(ROUT).tmp
-    @$(RENAME) $@.$(ROUT).tmp $@
-
-ALLTAR : $(HIDSRS10PARTICLE)
-
-.ENDIF # "$(BUILDHIDS)"!=""
 
 $(MISC)/$(TARGET).$(SRS10NAME).dprr: $(LOCALIZE_ME_DEST)
 
-$(MISC)/$(TARGET).$(SRS10NAME).dprr: $(SRC10FILES) $(HIDSRS10PARTICLE) $(HID10FILES)
+$(MISC)/$(TARGET).$(SRS10NAME).dprr: $(SRC10FILES)
     @echo "Making:   " $(@:f)
     @@-$(RM) $(MISC)/$(TARGET).$(SRS10NAME).dprr
     $(COMMAND_ECHO)$(RSC) $(VERBOSITY) $(SRSDEFAULT) $(RSC_SRS_CHARSET) $(RSCFLAGS) -I$(RSCEXTINC) -I$(INCLOCPRJ)  -I$(INCLOCAL) -I$(INC) -I$(INCCOM) $(RSCDEFS) $(RSCUPDVERDEF) -fp={$(SRS)/$(SRS10NAME).srs} -fo=$@ -p=$(TARGET) $(SRC10FILES)
@@ -505,7 +385,7 @@ $(foreach,i,$(SRC10FILES) $(COMMONMISC)/$(TARGET)/$i) : $$(@:f) $(LOCALIZESDF)
     $(COMMAND_ECHO)-$(MKDIR) $(@:d)
     $(COMMAND_ECHO)-$(RM) $@
     $(COMMAND_ECHO)-$(MKDIRHIER)  $(COMMONMISC)$/$(PRJNAME)
-    $(COMMAND_ECHO)$(WRAPCMD) $(TRANSEX) $(TRANSEX_VERBOSITY) -p $(PRJNAME) -i $(@:f) -o $(@).$(INPATH) -m $(LOCALIZESDF) -l all
+    $(COMMAND_ECHO)$(WRAPCMD) $(TRANSEX) -p $(PRJNAME) -i $(@:f) -o $(@).$(INPATH) -m $(LOCALIZESDF) -l all
     $(COMMAND_ECHO)$(RENAME) $@.$(INPATH) $@
     $(COMMAND_ECHO)-$(RM) $@.$(INPATH)
 
diff --git a/solenv/inc/extension_helplink.mk b/solenv/inc/extension_helplink.mk
new file mode 100644
index 000000000000..e375696bda18
--- /dev/null
+++ b/solenv/inc/extension_helplink.mk
@@ -0,0 +1,80 @@
+#*************************************************************************
+#
+# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
+# 
+# Copyright 2000, 2010 Oracle and/or its affiliates.
+#
+# OpenOffice.org - a multi-platform office productivity suite
+#
+# This file is part of OpenOffice.org.
+#
+# OpenOffice.org is free software: you can redistribute it and/or modify
+# it under the terms of the GNU Lesser General Public License version 3
+# only, as published by the Free Software Foundation.
+#
+# OpenOffice.org is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+# GNU Lesser General Public License version 3 for more details
+# (a copy is included in the LICENSE file that accompanied this code).
+#
+# You should have received a copy of the GNU Lesser General Public License
+# version 3 along with OpenOffice.org.  If not, see
+# <http://www.openoffice.org/license.html>
+# for a copy of the LGPLv3 License.
+#
+#*************************************************************************
+
+my_cp:=$(CLASSPATH)$(PATH_SEPERATOR)$(SOLARBINDIR)/jaxp.jar$(PATH_SEPERATOR)$(SOLARBINDIR)/juh.jar$(PATH_SEPERATOR)$(SOLARBINDIR)/parser.jar$(PATH_SEPERATOR)$(SOLARBINDIR)/xt.jar$(PATH_SEPERATOR)$(SOLARBINDIR)/unoil.jar$(PATH_SEPERATOR)$(SOLARBINDIR)/ridl.jar$(PATH_SEPERATOR)$(SOLARBINDIR)/jurt.jar$(PATH_SEPERATOR)$(SOLARBINDIR)/xmlsearch.jar$(PATH_SEPERATOR)$(SOLARBINDIR)/LuceneHelpWrapper.jar$(PATH_SEPERATOR)$(SOLARBINDIR)/HelpIndexerTool.jar$
+
+.IF "$(SYSTEM_LUCENE)" == "YES"
+my_cp!:=$(my_cp)$(PATH_SEPERATOR)$(LUCENE_CORE_JAR)$(PATH_SEPERATOR)$(LUCENE_ANALYZERS_JAR)
+.ELSE
+my_cp!:=$(my_cp)$(PATH_SEPERATOR)$(SOLARBINDIR)/lucene-core-2.3.jar$(PATH_SEPERATOR)$(SOLARBINDIR)/lucene-analyzers-2.3.jar
+.ENDIF
+ 
+.IF "$(SYSTEM_DB)" != "YES"
+JAVA_LIBRARY_PATH= -Djava.library.path=$(SOLARSHAREDBIN)
+.ENDIF 
+
+#aux_alllangiso*:=$(foreach,i,$(alllangiso) $(foreach,j,$(aux_langdirs) $(eq,$i,$j  $i $(NULL))))
+aux_alllangiso*:=$(alllangiso)
+
+#########################################################
+
+
+HELPLINKALLTARGETS=$(foreach,i,$(aux_alllangiso) $(MISC)/$(TARGET)_$(LINKNAME)_$i.done)
+HELPLINKALLADDEDDEPS=$(foreach,i,$(aux_alllangiso) $(subst,LANGUAGE,$i $(LINKADDEDDPES)))
+
+ALLTAR : $(HELPLINKALLTARGETS)
+
+.IF "$(SYSTEM_DB)" != "YES"
+JAVA_LIBRARY_PATH= -Djava.library.path=$(SOLARSHAREDBIN)
+.ENDIF
+
+XSL_DIR*:=$(SOLARBINDIR)
+XHPLINKSRC*:=$(XHPDEST)
+STY_SWITCH:= -sty $(XSL_DIR)/embed.xsl
+
+.IF "$(XHPFILES)"!="" && "$(HELP_OUT)"!=""
+$(foreach,i,$(LINKLINKFILES) $(XHPLINKSRC)/{$(aux_alllangiso)}/$i) : $(HELP_OUT)/$(TARGET).done
+LINKDEPS+=$(HELP_OUT)/xhp_changed.flag
+.ENDIF          # "$(XHPFILES)"!="" && "$(HELP_OUT)"!=""
+
+$(HELPLINKALLTARGETS) : $(foreach,i,$(LINKLINKFILES) $(XHPLINKSRC)/$$(@:b:s/_/./:e:s/.//)/$i) $(subst,LANGUAGE,$$(@:b:s/_/./:e:s/.//) $(LINKDEPS))
+    @echo Building help index for $(@:b:s/_/./:e:s/.//)
+    $(COMMAND_ECHO)$(HELPLINKER) -mod $(LINKNAME) -extlangsrc $(XHPLINKSRC)/{$(subst,$(TARGET)_$(LINKNAME)_, $(@:b))} $(STY_SWITCH) -extlangdest $(XHPLINKSRC)/{$(subst,$(TARGET)_$(LINKNAME)_, $(@:b))} -idxcaption $(XSL_DIR)/idxcaption.xsl -idxcontent $(XSL_DIR)/idxcontent.xsl $(LINKLINKFILES)
+    $(COMMAND_ECHO)cd $(XHPLINKSRC)/{$(subst,$(TARGET)_$(LINKNAME)_, $(@:b))} && zip -u -r $(LINKNAME).jar $(PACKAGE)/* $(CHECKZIPRESULT)
+.IF "$(SOLAR_JAVA)" == "TRUE"
+# cleanup index dir
+    -$(RM) $(XHPLINKSRC)/{$(subst,$(TARGET)_$(LINKNAME)_, $(@:b))}/$(LINKNAME).idxl/*
+.IF "$(CHECK_LUCENCE_INDEXER_OUTPUT)" == ""
+    $(COMMAND_ECHO)$(JAVAI) $(JAVAIFLAGS) $(JAVA_LIBRARY_PATH) -cp "$(my_cp)" com.sun.star.help.HelpIndexerTool -extension -lang $(@:b:s/_/./:e:s/.//) -mod $(LINKNAME) -zipdir $(XHPLINKSRC)/{$(subst,$(TARGET)_$(LINKNAME)_, $(@:b))} && $(TOUCH) $@
+.ELSE
+    $(COMMAND_ECHO)$(JAVAI) $(JAVAIFLAGS) $(JAVA_LIBRARY_PATH) -cp "$(my_cp)" com.sun.star.help.HelpIndexerTool -extension -lang $(@:b:s/_/./:e:s/.//) -mod $(LINKNAME) -zipdir $(XHPLINKSRC)/{$(subst,$(TARGET)_$(LINKNAME)_, $(@:b))} -checkcfsandsegname _0 _3  && $(TOUCH) $@
+.ENDIF
+.ELSE
+    -$(RM) $(XHPLINKSRC)/$(@:b)/content/*.*
+    -$(RM) $(XHPLINKSRC)/$(@:b)/caption/*.*
+.ENDIF
+
diff --git a/solenv/inc/extension_post.mk b/solenv/inc/extension_post.mk
index 47b62d20dd12..f221ff7ebe4a 100644
--- a/solenv/inc/extension_post.mk
+++ b/solenv/inc/extension_post.mk
@@ -39,7 +39,11 @@ fixme4=$(fixme:n)
 $(EXTENSIONDIR)/$(COMPONENT_CONFIGDEST)/%.xcu : %.xcu
 # ugly hacking to workaround prepended first source path
     @@-$(MKDIRHIER) $(subst,$(fixme2),$(MISC) $(@:d))
+.IF "$(COMPONENT_XCU_REPLACEMENT)"!=""
+    $(TYPE) $< | sed '$(COMPONENT_XCU_REPLACEMENT)' > $(subst,$(fixme2),$(MISC) $@)
+.ELSE          # "$(COMPONENT_REPLACEMENT)"!=""
     $(GNUCOPY) $< $(subst,$(fixme2),$(MISC) $@)
+.ENDIF          # "$(COMPONENT_REPLACEMENT)"!=""
     
 $(EXTENSIONDIR)/$(COMPONENT_CONFIGDESTSCHEMA)/%.xcs : %.xcs
     @@-$(MKDIRHIER) $(subst,$(fixme4),$(MISC) $(@:d))
diff --git a/solenv/inc/installationtest.mk b/solenv/inc/installationtest.mk
index 6806e15c69e7..8540140d1533 100644
--- a/solenv/inc/installationtest.mk
+++ b/solenv/inc/installationtest.mk
@@ -89,26 +89,20 @@ $(MISC)/$(TARGET)/installation.flag : $(shell \
     echo "$$my_tmp" > $@
 .END
 
-cpptest .PHONY : $(MISC)/$(TARGET)/services.rdb
+cpptest .PHONY :
     $(RM) -r $(MISC)/$(TARGET)/user
     $(MKDIRHIER) $(MISC)/$(TARGET)/user
     $(CPPUNITTESTER) \
-        -env:UNO_SERVICES=$(my_file)$(PWD)/$(MISC)/$(TARGET)/services.rdb \
+        -env:UNO_SERVICES=$(my_file)$(SOLARXMLDIR)/ure/services.rdb \
         -env:UNO_TYPES=$(my_file)$(SOLARBINDIR)/types.rdb \
         -env:arg-soffice=$(my_soffice) -env:arg-user=$(MISC)/$(TARGET)/user \
-        $(my_cppenv) $(OOO_CPPTEST_ARGS)
+        $(my_cppenv) $(TEST_ARGUMENTS:^"-env:arg-testarg.") $(CPPTEST_LIBRARY)
     $(RM) -r $(MISC)/$(TARGET)/user
 .IF "$(OS)" == "WNT" && "$(OOO_TEST_SOFFICE)" == ""
     $(RM) -r $(installationtest_instpath) $(MISC)/$(TARGET)/installation.flag
 cpptest : $(MISC)/$(TARGET)/installation.flag
 .END
 
-$(MISC)/$(TARGET)/services.rdb :
-    $(MKDIRHIER) $(@:d)
-    $(RM) $@
-    $(REGCOMP) -register -r $@ -wop -c bridgefac.uno -c connector.uno \
-        -c remotebridge.uno -c uuresolver.uno
-
 .IF "$(SOLAR_JAVA)" == "TRUE" && "$(OOO_JUNIT_JAR)" != ""
 javatest .PHONY : $(JAVATARGET)
     $(RM) -r $(MISC)/$(TARGET)/user
@@ -117,7 +111,8 @@ javatest .PHONY : $(JAVATARGET)
         '$(OOO_JUNIT_JAR)$(PATH_SEPERATOR)$(CLASSPATH)' \
         -Dorg.openoffice.test.arg.soffice=$(my_soffice) \
         -Dorg.openoffice.test.arg.user=$(my_file)$(PWD)/$(MISC)/$(TARGET)/user \
-        $(my_javaenv) org.junit.runner.JUnitCore \
+        $(my_javaenv) $(TEST_ARGUMENTS:^"-Dorg.openoffice.test.arg.testarg.") \
+        org.junit.runner.JUnitCore \
         $(foreach,i,$(JAVATESTFILES) $(subst,/,. $(PACKAGE)).$(i:s/.java//))
     $(RM) -r $(MISC)/$(TARGET)/user
 .IF "$(OS)" == "WNT" && "$(OOO_TEST_SOFFICE)" == ""
diff --git a/solenv/inc/libs.mk b/solenv/inc/libs.mk
index 09b6df9d33d9..4f7ffbf40851 100644
--- a/solenv/inc/libs.mk
+++ b/solenv/inc/libs.mk
@@ -354,6 +354,7 @@ LPSOLVELIB=-llpsolve55
 SOFFICELIB=-lsofficeapp
 UNOPKGAPPLIB=-lunopkgapp
 TESTLIB=-ltest
+XMLREADERLIB=-lxmlreader
 
 .ELSE				# ("$(GUI)"=="UNX" || "$(COM)"=="GCC") && "$(GUI)"!="OS2"
 
@@ -535,5 +536,6 @@ LPSOLVELIB=lpsolve55.lib
 SOFFICELIB=isofficeapp.lib
 UNOPKGAPPLIB=iunopkgapp.lib
 TESTLIB=itest.lib
+XMLREADERLIB=ixmlreader.lib
 
 .ENDIF              # ("$(GUI)"=="UNX" || "$(COM)"=="GCC") && "$(GUI)"!="OS2"
diff --git a/solenv/inc/minor.mk b/solenv/inc/minor.mk
index 42eb91b48474..a2e06a2dd244 100644
--- a/solenv/inc/minor.mk
+++ b/solenv/inc/minor.mk
@@ -1,5 +1,5 @@
 RSCVERSION=300
-RSCREVISION=300m84(Build:9512)
-BUILD=9512
-LAST_MINOR=m84
+RSCREVISION=300m91(Build:9538)
+BUILD=9538
+LAST_MINOR=m91
 SOURCEVERSION=DEV300
diff --git a/solenv/inc/postset.mk b/solenv/inc/postset.mk
index 77413849c5f9..f16ccb554fc5 100644
--- a/solenv/inc/postset.mk
+++ b/solenv/inc/postset.mk
@@ -25,7 +25,6 @@
 #
 #*************************************************************************
 
-
 # Default ISO code used when no languages specified
 # This language will be always included!
 defaultlangiso=en-US
@@ -118,6 +117,7 @@ sa-IN \
 si \
 sc \
 sd \
+sq \
 sk \
 sl \
 sh \
@@ -129,6 +129,7 @@ sw \
 sw-TZ \
 te-IN \
 ti-ER \
+ta \
 ta-IN \
 th \
 tn \
diff --git a/solenv/inc/rules.mk b/solenv/inc/rules.mk
index 63c4d0cef28c..2155ab8842d5 100644
--- a/solenv/inc/rules.mk
+++ b/solenv/inc/rules.mk
@@ -600,7 +600,7 @@ $(MISC)/%.dpr :
 .IF "$(nodep)"==""
     @echo "Making:   " $(@:f)
     @@-$(RM) $@
-    $(COMMAND_ECHO)dmake $(MFLAGS) $(MAKEFILE) $(CALLMACROS) NO_HIDS=true make_srs_deps=true $(DEPSRSFILES)
+    $(COMMAND_ECHO)dmake $(MFLAGS) $(MAKEFILE) $(CALLMACROS) make_srs_deps=true $(DEPSRSFILES)
     $(COMMAND_ECHO)-$(TYPE) $(MISC)/$(TARGET).*.dprr >> $@
 .ENDIF			# "$(nodep)"==""
 
@@ -689,11 +689,6 @@ $(OUT)/ucr/$(IDLPACKAGE)/%.urd : %.idl
 $(OUT)/ucrdoc/$(IDLPACKAGE)/%.urd : %.idl
         @noop $(assign all_outdated_doc_idl+:=$<)
 
-# generate hid files
-$(SRS)/%.hid : %.src
-    @echo Compiling: $(PRJNAME)/$(PATH_IN_MODULE)/$(*:f).src
-    $(COMMAND_ECHO)$(AUGMENT_LIBRARY_PATH) $(PERL) $(SOLARENV)/bin/mhids.pl $*.src $(SRS) $(PRJNAME) $(CDEFS) $(INCLUDE)
-
 # make *.xml descriptions available in $(MISC)
 $(MISC)/%$($(WINVERSIONNAMES)_MAJOR).xml : %.xml
     $(COMMAND_ECHO)$(COPY) $< $@
@@ -722,7 +717,7 @@ $(COMMONMISC)/$(TARGET)/%.ulf : %.ulf
     @echo "Making:   " $(@:f)
     $(COMMAND_ECHO)-$(MKDIR) $(@:d)
     $(COMMAND_ECHO)-$(RM) $@
-    $(COMMAND_ECHO)$(ULFEX) $(ULFEX_VERBOSITY) -p $(PRJNAME) -i $(@:f) -o $(@).$(INPATH) -m $(LOCALIZESDF) -l all
+    $(COMMAND_ECHO)$(ULFEX) -p $(PRJNAME) -i $(@:f) -o $(@).$(INPATH) -m $(LOCALIZESDF) -l all
     $(COMMAND_ECHO)$(RENAME) $@.$(INPATH) $@
     $(COMMAND_ECHO)-$(RM) $@.$(INPATH)
 
diff --git a/solenv/inc/set_wntx64.mk b/solenv/inc/set_wntx64.mk
index bf2ca9314f33..412fb3bd2821 100644..100755
--- a/solenv/inc/set_wntx64.mk
+++ b/solenv/inc/set_wntx64.mk
@@ -42,6 +42,10 @@ LIBMGR_X64=$(WRAPCMD) $(LIBMGR_X64_BINARY) $(NOLOGO)
 IMPLIB_X64=$(WRAPCMD) $(LIBMGR_X64_BINARY)
 
 USE_CFLAGS_X64=-c -nologo -Gs $(NOLOGO) -Zm500 -Zc:forScope,wchar_t- -GR
+
+# Stack buffer overrun detection.
+CFLAGS+=-GS
+
 USE_CDEFS_X64+= -DWIN32 -D_AMD64_=1 -D_CRT_SECURE_NO_DEPRECATE -D_CRT_NONSTDC_NO_DEPRECATE -D_CRT_NON_CONFORMING_SWPRINTFS
 .IF "$(debug)"!=""
 USE_CFLAGS_X64+=-Zi -Fd$(MISC_X64)/$(@:b).pdb
@@ -78,6 +82,15 @@ CDEFSOBJMT_X64+=-D_MT
 LINKFLAGS_X64=/MAP /OPT:NOREF
 .ENDIF
 
+# excetion handling protection
+LINKFLAGS+=-safeseh
+
+# enable DEP
+LINKFLAGS+=-nxcompat
+
+# enable ASLR
+LINKFLAGS+=-dynamicbase
+
 .IF "$(PRODUCT)"!="full"
 LINKFLAGS_X64+= -NODEFAULTLIB -DEBUG
 .ELSE # "$(PRODUCT)"!="full"
diff --git a/solenv/inc/settings.mk b/solenv/inc/settings.mk
index a8c661fdb0fc..706f4730a39c 100644
--- a/solenv/inc/settings.mk
+++ b/solenv/inc/settings.mk
@@ -829,6 +829,9 @@ LOCALIZESDF:=$(strip $(shell @+$(IFEXIST) $(TRYSDF) $(THEN) echo $(TRYSDF) $(FI)
 .IF  "$(LOCALIZESDF)"==""
 LOCALSDFFILE:=$(COMMONMISC)$/$(PRJNAME)$/$(PATH_IN_MODULE)$/localize.sdf
 LOCALIZESDF:=$(strip $(shell @+$(IFEXIST) $(SOLARCOMMONSDFDIR)$/$(PRJNAME).zip $(THEN) echo $(LOCALSDFFILE) $(FI)))
+.IF  "$(LOCALIZESDF)"==""
+LOCALSDFFILE!:=
+.ENDIF			# "$(LOCALIZESDF)"==""
 .ENDIF			# "$(LOCALIZESDF)"==""
 # dummy target to keep the build happy.
 .IF  "$(LOCALIZESDF)"==""
@@ -966,9 +969,6 @@ RSC=$(AUGMENT_LIBRARY_PATH) $(FLIPCMD) $(SOLARBINDIR)/rsc
     .IF "$(VERBOSE)" == "FALSE"
         VERBOSITY=-quiet
         ZIP_VERBOSITY=-q
-        TRANSEX_VERBOSITY=-QQ
-        CFGEX_VERBOSITY=-QQ
-        ULFEX_VERBOSITY=-QQ
     .ENDIF
 .ENDIF # "$(VERBOSE)" == "TRUE"
 COMPILE_ECHO_SWITCH=
@@ -1020,15 +1020,15 @@ LNTFLAGSOUTOBJ=-os
 .ENDIF
 
 .IF "$(OOO_LIBRARY_PATH_VAR)" != ""
-# Add SOLARLIBDIR to the end of a (potentially previously undefined) library
-# path (LD_LIBRARY_PATH, PATH, etc.; there is no real reason to prefer adding at
-# the end over adding at the start); the ": &&" in the bash case enables this to
+# Add SOLARLIBDIR at the begin of a (potentially previously undefined) library
+# path (LD_LIBRARY_PATH, PATH, etc.; prepending avoids fetching libraries from
+# an existing office/URE installation ; the ": &&" in the bash case enables this to
 # work at the start of a recipe line that is not prefixed by "+" as well as in
 # the middle of an existing && chain:
 AUGMENT_LIBRARY_PATH = : && \
-    $(OOO_LIBRARY_PATH_VAR)=$${{$(OOO_LIBRARY_PATH_VAR)+$${{$(OOO_LIBRARY_PATH_VAR)}}:}}$(normpath, $(SOLARSHAREDBIN))
+    $(OOO_LIBRARY_PATH_VAR)=$(normpath, $(SOLARSHAREDBIN))$${{$(OOO_LIBRARY_PATH_VAR):+:$${{$(OOO_LIBRARY_PATH_VAR)}}}}
 AUGMENT_LIBRARY_PATH_LOCAL = : && \
-    $(OOO_LIBRARY_PATH_VAR)=$${{$(OOO_LIBRARY_PATH_VAR)+$${{$(OOO_LIBRARY_PATH_VAR)}}:}}$(normpath, $(PWD)/$(DLLDEST)):$(normpath, $(SOLARSHAREDBIN))
+    $(OOO_LIBRARY_PATH_VAR)=$(normpath, $(PWD)/$(DLLDEST)):$(normpath, $(SOLARSHAREDBIN))$${{$(OOO_LIBRARY_PATH_VAR):+:$${{$(OOO_LIBRARY_PATH_VAR)}}}}
 .END
 
 # remove if .Net 2003 support has expired 
@@ -1356,6 +1356,19 @@ XERCES_JAR*=$(SOLARBINDIR)/xercesImpl.jar
 CPPUNIT_CFLAGS =
 .END
 
+COMPONENTPREFIX_URE_NATIVE = vnd.sun.star.expand:$$URE_INTERNAL_LIB_DIR/
+COMPONENTPREFIX_URE_JAVA = vnd.sun.star.expand:$$URE_INTERNAL_JAVA_DIR/
+.IF "$(OS)" == "WNT"
+COMPONENTPREFIX_BASIS_NATIVE = vnd.sun.star.expand:$$BRAND_BASE_DIR/program/
+.ELSE
+COMPONENTPREFIX_BASIS_NATIVE = vnd.sun.star.expand:$$OOO_BASE_DIR/program/
+.END
+COMPONENTPREFIX_BASIS_JAVA = vnd.sun.star.expand:$$OOO_BASE_DIR/program/classes/
+COMPONENTPREFIX_BASIS_PYTHON = vnd.openoffice.pymodule:
+COMPONENTPREFIX_INBUILD_NATIVE = \
+    vnd.sun.star.expand:$$OOO_INBUILD_SHAREDLIB_DIR/
+COMPONENTPREFIX_INBUILD_JAVA = vnd.sun.star.expand:$$OOO_INBUILD_JAR_DIR/
+
 # workaround for strange dmake bug:
 # if the previous block was a rule or a target, "\#" isn't recognized
 # as an escaped "#". if it was an assignment, escaping works...
diff --git a/solenv/inc/target.mk b/solenv/inc/target.mk
index 1a4ad6e182a0..6e8007425454 100644
--- a/solenv/inc/target.mk
+++ b/solenv/inc/target.mk
@@ -960,31 +960,26 @@ NO_SDINAME_allowed
 .IF "$(SDI1NAME)"!=""
 .DIRCACHE=no
 SDI1TARGET=$(MISC)/$(SDI1NAME).don
-HIDSID1PARTICLE=$(subst,$(OUTPATH),$(COMMON_OUTDIR) $(MISC))/$(SDI1NAME)_sid.hid
 .ENDIF
 
 .IF "$(SDI2NAME)"!=""
 .DIRCACHE=no
 SDI2TARGET=$(MISC)/$(SDI2NAME).don
-HIDSID2PARTICLE=$(subst,$(OUTPATH),$(COMMON_OUTDIR) $(MISC))/$(SDI2NAME)_sid.hid
 .ENDIF
 
 .IF "$(SDI3NAME)"!=""
 .DIRCACHE=no
 SDI3TARGET=$(MISC)/$(SDI3NAME).don
-HIDSID3PARTICLE=$(subst,$(OUTPATH),$(COMMON_OUTDIR) $(MISC))/$(SDI3NAME)_sid.hid
 .ENDIF
 
 .IF "$(SDI4NAME)"!=""
 .DIRCACHE=no
 SDI4TARGET=$(MISC)/$(SDI4NAME).don
-HIDSID4PARTICLE=$(subst,$(OUTPATH),$(COMMON_OUTDIR) $(MISC))/$(SDI4NAME)_sid.hid
 .ENDIF
 
 .IF "$(SDI5NAME)"!=""
 .DIRCACHE=no
 SDI5TARGET=$(MISC)/$(SDI5NAME).don
-HIDSID5PARTICLE=$(subst,$(OUTPATH),$(COMMON_OUTDIR) $(MISC))/$(SDI5NAME)_sid.hid
 .ENDIF
 
 .IF "$(XMLPROPERTIES)"!=""
@@ -1008,17 +1003,6 @@ TARGETDPJ=$(MISC)/$(TARGET).dpj
 .ENDIF			# "$(L10N_framework)"==""
 .ENDIF
 
-.IF "$(no_hids)$(NO_HIDS)"==""
-BUILDHIDS:=TRUE
-.IF "$(GEN_HID_OTHER)"!=""
-PRJHIDOTHERTARGET=$(SRS)/hidother.hid
-COMMONPRJHIDOTHERTARGET=$(subst,$(OUTPATH),$(COMMON_OUTDIR) $(MISC)/$(TARGET)_othr.hid)
-.ENDIF
-.IF "$(GEN_HID2)"!=""
-PRJHID2TARGET=$(subst,$(OUTPATH),$(COMMON_OUTDIR) $(BIN))/hid.lst
-.ENDIF
-.ENDIF			# "$(no_hids)$(NO_HIDS)"==""
-
 .IF "$(make_srs_deps)"==""
 .IF "$(SRCFILES)" != "" || "$(SRC1FILES)" != "" || "$(SRC2FILES)" != ""
 DPRTARGET= $(MISC)/$(TARGET).dpr
@@ -1056,8 +1040,6 @@ ALLTAR:	\
         $(DPRTARGET) \
         $(DPZTARGET) \
         $(ZIPALL) \
-        $(HIDSID1PARTICLE)	$(HIDSID2PARTICLE)		\
-        $(HIDSID3PARTICLE)	$(HIDSID4PARTICLE)	$(HIDSID5PARTICLE)		\
         $(SDITARGET)	$(SDI1TARGET)	$(SDI2TARGET)		\
         $(SDI3TARGET)	$(SDI4TARGET)	$(SDI5TARGET)		\
         $(XMLPROPERTIESN) \
@@ -1095,8 +1077,6 @@ ALLTAR:	\
         $(RESLIB3TARGETN) $(RESLIB4TARGETN) \
         $(RESLIB5TARGETN) $(RESLIB6TARGETN) \
         $(RESLIB7TARGETN) $(RESLIB8TARGETN) \
-        $(COMMONPRJHIDOTHERTARGET) \
-        $(PRJHID2TARGET) \
         $(LOCALIZE_ME_DEST)\
         last_target
 
@@ -1134,8 +1114,6 @@ ALLTAR: \
         $(COMP9RDBTARGETN) \
         $(IDL1TARGET)	$(IDL2TARGET)	$(IDL3TARGET)		\
         $(IDL4TARGET)	$(IDL5TARGET)		\
-        $(HIDSID1PARTICLE)	$(HIDSID2PARTICLE)		\
-        $(HIDSID3PARTICLE)	$(HIDSID4PARTICLE)	$(HIDSID5PARTICLE)		\
         $(SDI1TARGET)	$(SDI2TARGET)	$(SDI3TARGET)		\
         $(SDI4TARGET)	$(SDI5TARGET)		\
         $(HXXCOPYTARGET) \
@@ -1204,8 +1182,6 @@ ALLTAR: \
         $(RESLIB5TARGETN) $(RESLIB6TARGETN) \
         $(RESLIB7TARGETN) $(RESLIB8TARGETN) \
         $(RESLIB9TARGETN) \
-        $(COMMONPRJHIDOTHERTARGET) \
-        $(PRJHID2TARGET) \
                 $(SIGNFORNETSCAPE) \
                 $(SIGNFOREXPLORER) \
                 $(SIGNFORJARSIGNER) \
@@ -1518,7 +1494,7 @@ $(LOCALIZE_ME_DEST) .PHONY : $(LOCALIZE_ME) $(LOCALIZESDF)
 .ENDIF			# "$(LASTRUN_MERGED)"=="TRUE"
     $(COMMAND_ECHO)-$(MKDIR) $(@:d)
     $(COMMAND_ECHO)-$(RM) $@
-    $(COMMAND_ECHO)$(TRANSEX) $(TRANSEX_VERBOSITY) -p $(PRJNAME) -i $(@:b:+"_tmpl")$(@:e) -o $(@:d)/$(@:b:+"_tmpl")$(@:e).$(INPATH) -m $(LOCALIZESDF) -l all
+    $(COMMAND_ECHO)$(TRANSEX) -p $(PRJNAME) -i $(@:b:+"_tmpl")$(@:e) -o $(@:d)/$(@:b:+"_tmpl")$(@:e).$(INPATH) -m $(LOCALIZESDF) -l all
     $(COMMAND_ECHO)$(RENAME) $(@:d)$(@:b:+"_tmpl")$(@:e).$(INPATH) $@
 
 .ENDIF			# "$(WITH_LANG)"==""
@@ -1538,22 +1514,14 @@ $(MISC)/$(TARGET)_%.done : %.xrb
     @@$(RM)  $(MISC)/$(<:b).interm$(TARGET)
 .ENDIF			# "$(XMLPROPERTIES)"!=""
 
-.IF "$(HIDSID1PARTICLE)$(SDI1TARGET)$(HIDSID2PARTICLE)$(SDI2TARGET)$(HIDSID3PARTICLE)$(SDI3TARGET)$(HIDSID4PARTICLE)$(SDI4TARGET)$(HIDSID5PARTICLE)$(SDI5TARGET)$(HIDSID6PARTICLE)$(SDI6TARGET)$(HIDSID7PARTICLE)$(SDI7TARGET)$(HIDSID8PARTICLE)$(SDI8TARGET)$(HIDSID9PARTICLE)$(SDI9TARGET)"!=""
+.IF "$(SDI1TARGET)$(SDI2TARGET)$(SDI3TARGET)$(SDI4TARGET)$(SDI5TARGET)$(SDI6TARGET)$(SDI7TARGET)$(SDI8TARGET)$(SDI9TARGET)"!=""
 .INCLUDE : _tg_sdi.mk
-.ENDIF			# "$(HIDSID1PARTICLE)$(SDI1TARGET)$(HIDSID2PARTICLE)$(SDI2TARGET)$(HIDSID3PARTICLE)$(SDI3TARGET)$(HIDSID4PARTICLE)$(SDI4TARGET)$(HIDSID5PARTICLE)$(SDI5TARGET)$(HIDSID6PARTICLE)$(SDI6TARGET)$(HIDSID7PARTICLE)$(SDI7TARGET)$(HIDSID8PARTICLE)$(SDI8TARGET)$(HIDSID9PARTICLE)$(SDI9TARGET)"!=""
+.ENDIF			# "$(SDI1TARGET)$(SDI2TARGET)$(SDI3TARGET)$(SDI4TARGET)$(SDI5TARGET)$(SDI6TARGET)$(SDI7TARGET)$(SDI8TARGET)$(SDI9TARGET)"!=""
 
 .IF "$(DEF1NAME)$(DEF2NAME)$(DEF3NAME)$(DEF4NAME)$(DEF5NAME)$(DEF6NAME)$(DEF7NAME)$(DEF8NAME)$(DEF9NAME)"!=""
 .INCLUDE : _tg_def.mk
 .ENDIF
 
-.IF "$(COMMONPRJHIDOTHERTARGET)"!=""
-$(COMMONPRJHIDOTHERTARGET) : $(PRJHIDOTHERTARGET)
-        @echo "Making:   " $@
-        @$(IFEXIST) $@ $(THEN) $(RM:s/+//) $@ $(FI)
-        $(COMMAND_ECHO)$(TYPE) $(PRJHIDOTHERTARGET) > $@.$(ROUT).tmp 
-        @$(RENAME) $@.$(ROUT).tmp $@
-.ENDIF	    
-
 # -------
 # - LIB -
 # -------
@@ -2022,17 +1990,17 @@ UNOUCRDEPxxx : $(UNOUCRDEP);
 .ENDIF			# "$(UNOTYPES)" != ""
 
 
-#new hid.lst trigger with GEN_HID2=TRUE
-$(subst,$(OUTPATH),$(COMMON_OUTDIR) $(BIN))/hid.lst .PHONY :
-    @echo "Making:   " $@
-    @echo $(WORK_STAMP).$(LAST_MINOR) 010101010101010 > $@.$(ROUT).tmp
-    $(COMMAND_ECHO)$(TYPE) $(SOLARCOMMONBINDIR)/hid/*.hid | tr -d "\015" | $(SORT) -u >> $@.$(ROUT).tmp 
-    @$(IFEXIST) $@ $(THEN) $(RM:s/+//) $@ $(FI)
-    @-$(RENAME) $@.$(ROUT).tmp $@
-    @-mkdir $(@:d)hid
-    $(COMMAND_ECHO)$(PERL) $(SOLARENV)/bin/gen_userfeedback_VCL_names.pl $@ $(SOLARCOMMONBINDIR)/win $(subst,$(OUTPATH),$(COMMON_OUTDIR) $(BIN))/hid/userfeedback_VCL_names.csv.$(ROUT).tmp
-    @$(IFEXIST) $@ $(THEN) $(RM:s/+//) $(subst,$(OUTPATH),$(COMMON_OUTDIR) $(BIN))/hid/userfeedback_VCL_names.csv $(FI)
-    @-$(RENAME) $(subst,$(OUTPATH),$(COMMON_OUTDIR) $(BIN))/hid/userfeedback_VCL_names.csv.$(ROUT).tmp $(subst,$(OUTPATH),$(COMMON_OUTDIR) $(BIN))/hid/userfeedback_VCL_names.csv
+##new hid.lst trigger with GEN_HID2=TRUE
+#$(subst,$(OUTPATH),$(COMMON_OUTDIR) $(BIN))/hid.lst .PHONY :
+#	@echo "Making:   " $@
+#	@echo $(WORK_STAMP).$(LAST_MINOR) 010101010101010 > $@.$(ROUT).tmp
+#	$(COMMAND_ECHO)$(TYPE) $(SOLARCOMMONBINDIR)/hid/*.hid | tr -d "\015" | $(SORT) -u >> $@.$(ROUT).tmp 
+#	@$(IFEXIST) $@ $(THEN) $(RM:s/+//) $@ $(FI)
+#	@-$(RENAME) $@.$(ROUT).tmp $@
+#	@-mkdir $(@:d)hid
+#	$(COMMAND_ECHO)$(PERL) $(SOLARENV)/bin/gen_userfeedback_VCL_names.pl $@ $(SOLARCOMMONBINDIR)/win $(subst,$(OUTPATH),$(COMMON_OUTDIR) $(BIN))/hid/userfeedback_VCL_names.csv.$(ROUT).tmp
+#	@$(IFEXIST) $@ $(THEN) $(RM:s/+//) $(subst,$(OUTPATH),$(COMMON_OUTDIR) $(BIN))/hid/userfeedback_VCL_names.csv $(FI)
+#	@-$(RENAME) $(subst,$(OUTPATH),$(COMMON_OUTDIR) $(BIN))/hid/userfeedback_VCL_names.csv.$(ROUT).tmp $(subst,$(OUTPATH),$(COMMON_OUTDIR) $(BIN))/hid/userfeedback_VCL_names.csv
 
 
 .IF "$(SOLAR_JAVA)"!=""
@@ -2043,6 +2011,7 @@ $(subst,$(OUTPATH),$(COMMON_OUTDIR) $(BIN))/hid.lst .PHONY :
 
 .INCLUDE : tg_merge.mk
 .INCLUDE : tg_propmerge.mk
+.INCLUDE : tg_xmerge.mk
 
 wordcount:
     wc *.* >> $(TMP)/wc.lst
diff --git a/solenv/inc/tg_config.mk b/solenv/inc/tg_config.mk
index bbc720ed600e..cfe2fe147ebe 100644
--- a/solenv/inc/tg_config.mk
+++ b/solenv/inc/tg_config.mk
@@ -137,7 +137,7 @@ $(XCU_LANG) : $(LOCALIZESDF)
 
 $(PROCESSOUT)/merge/$(PACKAGEDIR)/%.xcu : %.xcu
     @-$(MKDIRHIER) $(@:d)
-    $(COMMAND_ECHO)$(CFGEX) $(CFGEX_VERBOSITY) -p $(PRJNAME) -i $(@:f) -o $@ -m $(LOCALIZESDF) -l all
+    $(COMMAND_ECHO)$(CFGEX)  -p $(PRJNAME) -i $(@:f) -o $@ -m $(LOCALIZESDF) -l all
 
 .IF "$(XCU_LANG)" != ""
 $(XCU_LANG) : $(XSLDIR)/alllang.xsl
diff --git a/solenv/inc/tg_help.mk b/solenv/inc/tg_help.mk
index aa62b1cf477f..cce5b9ee62b2 100755..100644
--- a/solenv/inc/tg_help.mk
+++ b/solenv/inc/tg_help.mk
@@ -31,23 +31,31 @@
 aux_alllangiso*:=$(alllangiso)
 
 SHELL_PACKAGE:=$(subst,/,$/ $(PACKAGE))
-HLANGXHPFILES:=$(foreach,i,$(XHPFILES) $(foreach,j,$(aux_alllangiso) $(COMMONMISC)$/$j$/$(SHELL_PACKAGE)$/$(i:f)))
 
-ALLTAR : $(COMMONMISC)$/$(TARGET).done $(COMMONMISC)$/xhp_changed.flag optix
+.IF "$(XHPDEST)"==""
+XHPDEST*:=$(COMMONMISC)
+HELP_OUT:=$(COMMONMISC)
+.ELSE          # "$(XHPDEST)"==""
+HELP_OUT:=$(MISC)
+.ENDIF          # "$(XHPDEST)"==""
+
+HLANGXHPFILES*:=$(foreach,i,$(XHPFILES) $(foreach,j,$(aux_alllangiso) $(XHPDEST)$/$j$/$(SHELL_PACKAGE)$/$(i:f)))
+
+ALLTAR : $(HELP_OUT)$/$(TARGET).done $(HELP_OUT)$/xhp_changed.flag optix
 
 $(HLANGXHPFILES) : $$(@:d)thisdir.created
 
-$(COMMONMISC)$/{$(aux_alllangiso)}$/$(SHELL_PACKAGE)$/%.xhp :| %.xhp
+$(XHPDEST)$/{$(aux_alllangiso)}$/$(SHELL_PACKAGE)$/%.xhp :| %.xhp
     @$(TOUCH) $@
 # internal dependencies not sufficient to trigger merge?
 #    @$(NULL)
 
 
-$(COMMONMISC)$/$(TARGET).done : $(HLANGXHPFILES)
+$(HELP_OUT)$/$(TARGET).done : $(HLANGXHPFILES)
 .IF "$(WITH_LANG)"!=""
-    $(AUGMENT_LIBRARY_PATH) $(HELPEX) -QQ -p $(PRJNAME) -r $(PRJ) -i @$(mktmp $(uniq $(foreach,i,$? $(!eq,$(i:f),$(i:f:s/.xhp//) $(i:f) $(XHPFILES))))) -x $(COMMONMISC) -y $(SHELL_PACKAGE) -l all -lf $(aux_alllangiso:t",") -m $(LOCALIZESDF) && $(TOUCH) $@
+    $(AUGMENT_LIBRARY_PATH) $(HELPEX) -p $(PRJNAME) -r $(PRJ) -i @$(mktmp $(uniq $(foreach,i,$? $(!eq,$(i:f),$(i:f:s/.xhp//) $(i:f) $(XHPFILES))))) -x $(XHPDEST) -y $(SHELL_PACKAGE) -l all -lf $(aux_alllangiso:t",") -m $(LOCALIZESDF) && $(TOUCH) $@
 .ELSE			# "$(WITH_LANG)"!=""
-    cp $(uniq $(foreach,i,$? $(!eq,$(i:f),$(i:f:s/.xhp//) $(i:f) $(XHPFILES)))) $(COMMONMISC)$/en-US$/$(SHELL_PACKAGE) && $(TOUCH) $@
+    cp $(uniq $(foreach,i,$? $(!eq,$(i:f),$(i:f:s/.xhp//) $(i:f) $(XHPFILES)))) $(XHPDEST)$/en-US$/$(SHELL_PACKAGE) && $(TOUCH) $@
 .ENDIF			# "$(WITH_LANG)"!=""
 .IF "$(OS)"=="SOLARIS"
     @$(ECHONL) " "
@@ -55,24 +63,24 @@ $(COMMONMISC)$/$(TARGET).done : $(HLANGXHPFILES)
     @$(ECHONL)
 .ENDIF			# "$(OS)"=="SOLARIS"
 
-$(COMMONMISC)$/xhp_changed.flag : $(HLANGXHPFILES)
+$(HELP_OUT)$/xhp_changed.flag : $(HLANGXHPFILES)
     @$(TOUCH) $@
 
 # urks - dmake mixes up operators and strings :-(
 .IF "$(HLANGXHPFILES:s/defined/xxx/)"!=""
 
 .IF "$(HELPTRANSPHONY)"!=""
-$(COMMONMISC)$/$(TARGET).done .PHONY :
+$(HELP_OUT)$/$(TARGET).done .PHONY :
 .ELSE           # "$(HELPTRANSPHONY)"!=""
 
-$(COMMONMISC)$/$(TARGET).done : makefile.mk
+$(HELP_OUT)$/$(TARGET).done : makefile.mk
 .IF "$(WITH_LANG)"!=""
-$(COMMONMISC)$/$(TARGET).done : $(LOCALIZESDF)
+$(HELP_OUT)$/$(TARGET).done : $(LOCALIZESDF)
 .ENDIF			# "$(WITH_LANG)"!=""
 .ENDIF          # "$(HELPTRANSPHONY)"!=""
 .ENDIF          # "$(HLANGXHPFILES)"!=""
 
-optix: $(COMMONMISC)$/$(TARGET).done
+optix: $(HELP_OUT)$/$(TARGET).done
     @echo done
 
 %.created :
diff --git a/solenv/inc/tg_rslb.mk b/solenv/inc/tg_rslb.mk
index 40096386c436..69721a7e2204 100644
--- a/solenv/inc/tg_rslb.mk
+++ b/solenv/inc/tg_rslb.mk
@@ -30,22 +30,6 @@
 
 .IF "$(RESLIB$(TNR)TARGETN)"!=""
 
-.IF "$(BUILDHIDS)"!=""
-HIDRES$(TNR)PARTICLE=$(subst,$(OUTPATH),$(COMMON_OUTDIR) $(MISC))/$(RESLIB$(TNR)NAME)_res.hid
-
-#HACK cut off the dirty srs files which are included from solver
-RESLIB$(TNR)HIDFILES:=$(subst,$(OUTPATH),$(COMMON_OUTDIR) $(subst,.srs,_srs.hid $(RESLIB$(TNR)SRSFILES)))
-$(HIDRES$(TNR)PARTICLE): $(RESLIB$(TNR)HIDFILES)
-    @echo "Making:   " $(@:f)
-    @$(IFEXIST) $@ $(THEN) $(RM:s/+//) $@ $(FI)
-# need to strip since solaris cannot handle tab-only whitespace here
-    $(COMMAND_ECHO)$(TYPE) $(mktmp  $(strip, $(subst,/,/ $(RESLIB$(TNR)HIDFILES))) )| xargs -s 1000 cat > $@.$(ROUT).tmp
-    @$(RENAME) $@.$(ROUT).tmp $@
-
-ALLTAR : $(HIDRES$(TNR)PARTICLE)
-
-.ENDIF # "$(BUILDHIDS)"!=""
-
 $(RSC_MULTI$(TNR)) : \
         $(RESLIB$(TNR)SRSFILES) \
         $(RESLIB$(TNR)TARGETN) \
diff --git a/solenv/inc/tg_sdi.mk b/solenv/inc/tg_sdi.mk
index a515fc1ed13a..66b8c89850b8 100644
--- a/solenv/inc/tg_sdi.mk
+++ b/solenv/inc/tg_sdi.mk
@@ -29,15 +29,6 @@
 # instructions for ???
 # unroll begin
 
-.IF "$(HIDSID$(TNR)PARTICLE)"!=""
-$(HIDSID$(TNR)PARTICLE): $(SDI$(TNR)TARGET)
-    @echo "Making:   " $(@:f)
-    @-$(RM) $@.$(ROUT).tmp $@
-    @$(TYPE) $(MISC)/$(SDI$(TNR)NAME).sid | $(AWK) '$$1=="#define" { print $$2, $$3 }' > $@.$(ROUT).tmp
-    @-$(RM) $@
-    @$(RENAME) $@.$(ROUT).tmp $@
-.ENDIF # "$(HIDSID$(TNR)PARTICLE)"!=""
-
 .IF "$(SDI$(TNR)TARGET)"!=""
 $(SDI$(TNR)TARGET): $(SVSDI$(TNR)DEPEND) $(SDI$(TNR)NAME).sdi
     @echo "Making:   " $(@:f)
diff --git a/solenv/inc/tg_srs.mk b/solenv/inc/tg_srs.mk
index 347dd25569de..a919069cd3cd 100644
--- a/solenv/inc/tg_srs.mk
+++ b/solenv/inc/tg_srs.mk
@@ -29,22 +29,10 @@
 # unroll begin
 
 .IF "$(SRS$(TNR)NAME)"!=""
-.IF "$(BUILDHIDS)"!=""
-HID$(TNR)FILES=$(foreach,i,$(SRC$(TNR)FILES:f) $(SRS)/$(i:s/.src/.hid/))
-HIDSRS$(TNR)PARTICLE=$(subst,$(OUTPATH),$(COMMON_OUTDIR) $(SRS))/$(SRS$(TNR)NAME)_srs.hid
-$(HIDSRS$(TNR)PARTICLE) : $(HID$(TNR)FILES)
-    @echo "Making:   " $(@:f)
-    @-$(RM) $@
-    $(COMMAND_ECHO)$(TYPE) $(mktmp  $(subst,/,/ $(HID$(TNR)FILES))) | xargs -s 1000 cat > $@.$(ROUT).tmp
-    @$(RENAME) $@.$(ROUT).tmp $@
-
-ALLTAR : $(HIDSRS$(TNR)PARTICLE)
-
-.ENDIF # "$(BUILDHIDS)"!=""
 
 $(MISC)/$(TARGET).$(SRS$(TNR)NAME).dprr: $(LOCALIZE_ME_DEST)
 
-$(MISC)/$(TARGET).$(SRS$(TNR)NAME).dprr: $(SRC$(TNR)FILES) $(HIDSRS$(TNR)PARTICLE) $(HID$(TNR)FILES)
+$(MISC)/$(TARGET).$(SRS$(TNR)NAME).dprr: $(SRC$(TNR)FILES)
     @echo "Making:   " $(@:f)
     @@-$(RM) $(MISC)/$(TARGET).$(SRS$(TNR)NAME).dprr
     $(COMMAND_ECHO)$(RSC) $(VERBOSITY) $(SRSDEFAULT) $(RSC_SRS_CHARSET) $(RSCFLAGS) -I$(RSCEXTINC) -I$(INCLOCPRJ)  -I$(INCLOCAL) -I$(INC) -I$(INCCOM) $(RSCDEFS) $(RSCUPDVERDEF) -fp={$(SRS)/$(SRS$(TNR)NAME).srs} -fo=$@ -p=$(TARGET) $(SRC$(TNR)FILES)
@@ -56,7 +44,7 @@ $(foreach,i,$(SRC$(TNR)FILES) $(COMMONMISC)/$(TARGET)/$i) : $$(@:f) $(LOCALIZESD
     $(COMMAND_ECHO)-$(MKDIR) $(@:d)
     $(COMMAND_ECHO)-$(RM) $@
     $(COMMAND_ECHO)-$(MKDIRHIER)  $(COMMONMISC)$/$(PRJNAME)
-    $(COMMAND_ECHO)$(WRAPCMD) $(TRANSEX) $(TRANSEX_VERBOSITY) -p $(PRJNAME) -i $(@:f) -o $(@).$(INPATH) -m $(LOCALIZESDF) -l all
+    $(COMMAND_ECHO)$(WRAPCMD) $(TRANSEX) -p $(PRJNAME) -i $(@:f) -o $(@).$(INPATH) -m $(LOCALIZESDF) -l all
     $(COMMAND_ECHO)$(RENAME) $@.$(INPATH) $@
     $(COMMAND_ECHO)-$(RM) $@.$(INPATH)
 
diff --git a/solenv/inc/tg_xmerge.mk b/solenv/inc/tg_xmerge.mk
new file mode 100755
index 000000000000..6ff412bb022f
--- /dev/null
+++ b/solenv/inc/tg_xmerge.mk
@@ -0,0 +1,108 @@
+#*************************************************************************
+#
+# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
+# 
+# Copyright 2000, 2010 Oracle and/or its affiliates.
+#
+# OpenOffice.org - a multi-platform office productivity suite
+#
+# This file is part of OpenOffice.org.
+#
+# OpenOffice.org is free software: you can redistribute it and/or modify
+# it under the terms of the GNU Lesser General Public License version 3
+# only, as published by the Free Software Foundation.
+#
+# OpenOffice.org is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+# GNU Lesser General Public License version 3 for more details
+# (a copy is included in the LICENSE file that accompanied this code).
+#
+# You should have received a copy of the GNU Lesser General Public License
+# version 3 along with OpenOffice.org.  If not, see
+# <http://www.openoffice.org/license.html>
+# for a copy of the LGPLv3 License.
+#
+#*************************************************************************
+
+.IF "$(XTXFILES)"!=""
+
+L10NEXT*=.txt
+XTX_TARGET_PATH*=$(MISC)/$(TARGET)
+
+ALLTAR : $(XTX_TARGET_PATH).xtx.pmerge.mk $(XTXFILES)
+
+$(XTX_TARGET_PATH).xtx.pmerge.mk :  $(XTXFILES)
+
+$(XTXFILES) : $(LOCALIZESDF)
+
+.INCLUDE .IGNORE : $(XTX_TARGET_PATH).xtx.pmerge.mk
+
+.IF "$(alllangiso)"!="$(last_merge)"
+XTXMERGEPHONY:=.PHONY
+.ENDIF          # "$(alllangiso)" != "$(last_merge)"
+
+$(XTX_TARGET_PATH)/%$(L10NEXT) $(XTXMERGEPHONY) : %.xtx
+    @@-$(MKDIRHIER) $(@:d)
+.IF "$(WITH_LANG)"==""
+    $(COMMAND_ECHO)$(COPY) $< $(@:d)$(@:b)_en-US$(L10NEXT)
+.ELSE          # "$(WITH_LANG)"==""
+    @@-$(RM) $@
+    $(COMMAND_ECHO)@noop $(assign XTXMERGELIST+:=$(<:f))
+    $(COMMAND_ECHO)@noop $(assign XTXDESTDIR:=$(@:d))
+.ENDIF          # "$(WITH_LANG)"==""
+
+$(XTX_TARGET_PATH).xtx.pmerge.mk : $(XTXMERGELIST)
+.IF "$(WITH_LANG)"!=""
+# xtxex command file requirements:
+# - one file per line
+# - no spaces
+# - no empty lines
+# $(uniq ...) to workaround $assign adding the value twice...
+    @noop $(assign XTXMERGEFILELIST:=$(uniq $(XTXMERGELIST)))
+    $(COMMAND_ECHO) $(SOLARBINDIR)/xtxex -p $(PRJNAME) -r $(PRJ) -o $(XTXDESTDIR) -i @$(mktmp $(XTXMERGEFILELIST:t"\n":s/ //)) -l $(alllangiso:s/ /,/) -f $(alllangiso:s/ /,/) -m $(LOCALIZESDF) -s"[path]/[fileNoExt]_[language]$(L10NEXT)" 
+.ENDIF          # "$(WITH_LANG)"!=""
+
+    @-$(RM) $@
+    $(COMMAND_ECHO)echo last_merge=$(alllangiso) > $@
+.ENDIF          # "$(XTXFILES)"!=""
+
+.IF "$(TREEFILE)"!=""
+ALLTAR : $(MISC)/$(TARGET).tree.pmerge.mk $(TREEFILE)
+
+$(MISC)/$(TARGET).tree.pmerge.mk :  $(TREEFILE)
+
+$(TREEFILE) : $(LOCALIZESDF)
+
+.INCLUDE .IGNORE : $(MISC)/$(TARGET).tree.pmerge.mk
+
+.IF "$(alllangiso)"!="$(last_merge)"
+TREEMERGEPHONY:=.PHONY
+.ENDIF          # "$(alllangiso)" != "$(last_merge)"
+
+$(OUT_HELP)/en-US/help.tree $(TREEMERGEPHONY) : help.tree
+    @@-$(MKDIRHIER) $(@:d)
+.IF "$(WITH_LANG)"==""
+    $(COMMAND_ECHO)$(COPY) $< $@
+.ELSE          # "$(WITH_LANG)"==""
+    @@-$(RM) $@
+    $(COMMAND_ECHO)@noop $(assign TREEMERGELIST+:=$(<:f))
+    $(COMMAND_ECHO)@noop $(assign TREEDESTDIR:=$(@:d:d:d))
+.ENDIF          # "$(WITH_LANG)"==""
+
+$(MISC)/$(TARGET).tree.pmerge.mk : $(TREEMERGELIST)
+.IF "$(WITH_LANG)"!=""
+# xtxex command file requirements:
+# - one file per line
+# - no spaces
+# - no empty lines
+# $(uniq ...) to workaround $assign adding the value twice...
+    @noop $(assign TREEMERGEFILELIST:=$(uniq $(TREEMERGELIST)))
+# Variables for the pattern filename,fileNoExt,language,extension,pathPrefix,pathPostFix,path
+    $(COMMAND_ECHO) $(SOLARBINDIR)/xhtex -p $(PRJNAME) -r $(PRJ) -o $(TREEDESTDIR) -i @$(mktmp $(TREEMERGEFILELIST:t"\n":s/ //)) -l $(alllangiso:s/ /,/) -f $(alllangiso:s/ /,/) -m $(LOCALIZESDF) -s"[path]/[language]/[fileNoExt].tree" 
+.ENDIF          # "$(WITH_LANG)"!=""
+    @-$(RM) $@
+    $(COMMAND_ECHO)echo last_merge=$(alllangiso) > $@
+.ENDIF          # "$(TREEFILE)"!=""
+
+
diff --git a/solenv/inc/unx.mk b/solenv/inc/unx.mk
index a05b4629755e..e558c9955d82 100644
--- a/solenv/inc/unx.mk
+++ b/solenv/inc/unx.mk
@@ -199,6 +199,9 @@ DLLPOST!:=$(DLLPOST).$($(UNIXVERSIONNAMES)_MAJOR)
 KDE_CFLAGS:=-I$(KDE_ROOT)/include -DQT_CLEAN_NAMESPACE
 KDE_LIBS:=-lkdeui -lkdecore -lqt-mt
 SOLARLIB+=-L$(KDE_ROOT)/lib
+.IF "$(OS)$(CPU)" == "LINUXX"
+SOLARLIB+=-L$(KDE_ROOT)/lib64
+.ENDIF          # "$(OS)$(CPU)" == "LINUXX"
 .ENDIF          # "$(KDE_ROOT)"!=""
 .ENDIF          # "$(ENABLE_KDE)" != ""
 
diff --git a/solenv/inc/unxlng.mk b/solenv/inc/unxlng.mk
index be8c5d01b714..1ca4faa34402 100644
--- a/solenv/inc/unxlng.mk
+++ b/solenv/inc/unxlng.mk
@@ -65,7 +65,7 @@ CXX*=g++
 # name of C Compiler
 CC*=gcc
 .IF "$(SYSBASE)"!=""
-CFLAGS_SYSBASE:=-isystem $(SYSBASE)$/usr$/include
+CFLAGS_SYSBASE:=--sysroot=$(SYSBASE)
 CXX+:=$(CFLAGS_SYSBASE)
 CC+:=$(CFLAGS_SYSBASE)
 .ENDIF          # "$(SYSBASE)"!=""
@@ -153,8 +153,7 @@ LINKFLAGSRUNPATH_BRAND=-Wl,-rpath,\''$$ORIGIN:$$ORIGIN/../basis-link/program:$$O
 LINKFLAGSRUNPATH_OXT=
 LINKFLAGSRUNPATH_BOXT=-Wl,-rpath,\''$$ORIGIN/../../../basis-link/program'\'
 LINKFLAGSRUNPATH_NONE=
-# flag -Wl,-z,noexecstack sets the NX bit on the stack
-LINKFLAGS=-Wl,-z,noexecstack -Wl,-z,combreloc $(LINKFLAGSDEFS)
+LINKFLAGS=-Wl,-z,combreloc $(LINKFLAGSDEFS)
 .IF "$(HAVE_LD_BSYMBOLIC_FUNCTIONS)"  == "TRUE"
 LINKFLAGS += -Wl,-Bsymbolic-functions -Wl,--dynamic-list-cpp-new -Wl,--dynamic-list-cpp-typeinfo
 .ENDIF
@@ -198,6 +197,14 @@ STDLIBCUIMT+=-ltcmalloc
 STDSHLGUIMT+=-ltcmalloc
 STDSHLCUIMT+=-ltcmalloc
 .ENDIF
+
+.IF "$(ALLOC)" == "JEMALLOC"
+STDLIBGUIMT+=-ljemalloc
+STDLIBCUIMT+=-ljemalloc
+STDSHLGUIMT+=-ljemalloc
+STDSHLCUIMT+=-ljemalloc
+.ENDIF
+
 .IF "$(HAVE_LD_HASH_STYLE)"  == "TRUE"
 LINKFLAGS += -Wl,--hash-style=both
 .ELSE
diff --git a/solenv/inc/unxlngx.mk b/solenv/inc/unxlngx.mk
index 1ced6c3912d0..414f15d0dc92 100644
--- a/solenv/inc/unxlngx.mk
+++ b/solenv/inc/unxlngx.mk
@@ -29,7 +29,5 @@
 
 .INCLUDE : unxlng.mk
 CDEFS+=-DX86_64
-MODULES_WITH_WARNINGS+=\
-    svx
 DLLPOSTFIX=lx
 BUILD64=1
diff --git a/solenv/inc/version.hrc b/solenv/inc/version.hrc
index d4c205f942b9..426e55437e1b 100644..100755
--- a/solenv/inc/version.hrc
+++ b/solenv/inc/version.hrc
@@ -26,19 +26,19 @@
  *************************************************************************/
 
 #define VERSION         3
-#define SUBVERSION      2
+#define SUBVERSION      4
 //#define VERVARIANT    0 // never define this one, will be provided by build environment (BUILD_ID)
 // .0 + VER_CONCEPT
 // .100 + VER_ALPHA
 // .200 + VER_BETA
 // .300 + VER_GAMMA
 // .500 + VER_FINAL
-//#define VER_CONCEPT       0
+//#define VER_CONCEPT   0
 //#define VER_BETA      6
 #define VER_FINAL       0
 
 #define VER_DAY         1
-#define VER_MONTH       1
+#define VER_MONTH       8
 #define VER_YEAR        2010
 
 #ifndef VER_FIRSTYEAR
@@ -54,7 +54,7 @@
 #endif
 
 // -----------------------------------------------------------------------
-//              language/character set specification table
+//                  language/character set specification table
 // -----------------------------------------------------------------------
 
 RCD_LANGUAGE rcdata
diff --git a/solenv/inc/version.lst b/solenv/inc/version.lst
new file mode 100644
index 000000000000..5dd3a2a37fad
--- /dev/null
+++ b/solenv/inc/version.lst
@@ -0,0 +1,30 @@
+#*************************************************************************
+#
+# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
+#
+# Copyright 2000, 2010 Oracle and/or its affiliates.
+#
+# OpenOffice.org - a multi-platform office productivity suite
+#
+# This file is part of OpenOffice.org.
+#
+# OpenOffice.org is free software: you can redistribute it and/or modify
+# it under the terms of the GNU Lesser General Public License version 3
+# only, as published by the Free Software Foundation.
+#
+# OpenOffice.org is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+# GNU Lesser General Public License version 3 for more details
+# (a copy is included in the LICENSE file that accompanied this code).
+#
+# You should have received a copy of the GNU Lesser General Public License
+# version 3 along with OpenOffice.org.  If not, see
+# <http://www.openoffice.org/license.html>
+# for a copy of the LGPLv3 License.
+#
+#*************************************************************************
+
+OOOBASEVERSIONMAJOR=3
+OOOBASEVERSIONMINOR=4
+OOOBASEVERSIONMICRO=0
diff --git a/solenv/inc/version_so.hrc b/solenv/inc/version_so.hrc
index 70ea1c193ee6..5493a1587b7c 100644..100755
--- a/solenv/inc/version_so.hrc
+++ b/solenv/inc/version_so.hrc
@@ -25,20 +25,20 @@
  *
  *************************************************************************/
 
-#define VERSION         9
-#define SUBVERSION      2
+#define VERSION         3
+#define SUBVERSION      4
 //#define VERVARIANT    0 // never define this one, will be provided by build environment (BUILD_ID)
 // .0 + VER_CONCEPT
 // .100 + VER_ALPHA
 // .200 + VER_BETA
 // .300 + VER_GAMMA
 // .500 + VER_FINAL
-//#define VER_CONCEPT       0
+//#define VER_CONCEPT   0
 //#define VER_BETA      6
 #define VER_FINAL       0
 
 #define VER_DAY         1
-#define VER_MONTH       1
+#define VER_MONTH       8
 #define VER_YEAR        2010
 
 #ifndef VER_FIRSTYEAR
@@ -54,7 +54,7 @@
 #endif
 
 // -----------------------------------------------------------------------
-//              language/character set specification table
+//                  language/character set specification table
 // -----------------------------------------------------------------------
 
 RCD_LANGUAGE rcdata
diff --git a/soltools/HIDCompiler/makefile.mk b/solenv/inc/versionlist.mk
index 8c65fc09cd21..31a255e48be1 100644
--- a/soltools/HIDCompiler/makefile.mk
+++ b/solenv/inc/versionlist.mk
@@ -25,39 +25,6 @@
 #
 #*************************************************************************
 
-PRJ=..
+.INCLUDE: version.lst
 
-PRJNAME=soltools
-TARGET=hidc
-TARGETTYPE=CUI
-LIBTARGET=no
-NO_DEFAULT_STL=TRUE
-INCPRE=$(MISC)
-
-# --- Settings -----------------------------------------------------
-
-.INCLUDE : $(PRJ)$/util$/makefile.pmk
-.INCLUDE :  settings.mk
-.INCLUDE :  libs.mk
-CDEFS+= -DYY_NEVER_INTERACTIVE=1
-
-UWINAPILIB=$(0)
-
-# --- Files --------------------------------------------------------
-
-# HID compiler
-APP1TARGET=     $(TARGET)
-APP1OBJS=   $(OBJ)$/wrap_hidclex.obj
-APP1DEPN=   $(OBJ)$/wrap_hidclex.obj
-APP1LIBSALCPPRT=
-
-DEPOBJFILES=$(APP1OBJS)
-
-# --- Targets ------------------------------------------------------
-
-.INCLUDE :  target.mk
-
-$(MISC)$/%_yy.cxx : %lex.l
-    flex -l -8 -o$@ $<
-
-$(OBJ)$/wrap_hidclex.obj: $(MISC)$/hidc_yy.cxx
+.EXPORT : OOOBASEVERSIONMAJOR OOOBASEVERSIONMINOR OOOBASEVERSIONMICRO
diff --git a/solenv/inc/wntmsci10.mk b/solenv/inc/wntmsci10.mk
index 6ed8327c8506..5c959f7d0e3c 100644
--- a/solenv/inc/wntmsci10.mk
+++ b/solenv/inc/wntmsci10.mk
@@ -34,7 +34,7 @@ JAVAFLAGSDEBUG=-g
 # SOLAR JAva Unterstuetzung nur fuer wntmsci
 
 ASM=ml
-AFLAGS=/c /Cp /coff
+AFLAGS=/c /Cp /coff /safeseh
 
 # architecture dependent flags for the C and C++ compiler that can be changed by
 # exporting the variable ARCH_FLAGS="..." in the shell, which is used to start build
diff --git a/solenv/inc/wntmsci11.mk b/solenv/inc/wntmsci11.mk
index b270a6a25cfe..972feb0a8fdc 100644..100755
--- a/solenv/inc/wntmsci11.mk
+++ b/solenv/inc/wntmsci11.mk
@@ -34,7 +34,7 @@ JAVAFLAGSDEBUG=-g
 # SOLAR JAva Unterstuetzung nur fuer wntmsci
 
 ASM=ml
-AFLAGS=/c /Cp /coff
+AFLAGS=/c /Cp /coff /safeseh
 
 # architecture dependent flags for the C and C++ compiler that can be changed by
 # exporting the variable ARCH_FLAGS="..." in the shell, which is used to start build
@@ -82,6 +82,10 @@ COMPILE_ECHO_FILE=
 # lookup":
 # -wd4251 -wd4275 -wd4290 -wd4675 -wd4786 -wd4800
 CFLAGS+=-Zm500 -Zc:forScope,wchar_t- -GR
+
+# Stack buffer overrun detection.
+CFLAGS+=-GS
+
 CFLAGS+=-c -nologo -Gs $(NOLOGO)
 
 CDEFS+= -D_X86_=1 -D_CRT_SECURE_NO_DEPRECATE -D_CRT_NONSTDC_NO_DEPRECATE -D_CRT_NON_CONFORMING_SWPRINTFS
@@ -235,8 +239,17 @@ LINKOUTPUTFILTER= $(PIPEERROR) $(GREP) -v "LNK4197:"
 LINKFLAGS=/MAP /OPT:NOREF
 .ENDIF
 
+# excetion handling protection
+LINKFLAGS+=-safeseh
+
+# enable DEP
+LINKFLAGS+=-nxcompat
+
+# enable ASLR
+LINKFLAGS+=-dynamicbase
+
 .IF "$(linkinc)" != ""
-LINKFLAGS=-NODEFAULTLIB -INCREMENTAL:YES -DEBUG
+LINKFLAGS+=-NODEFAULTLIB -INCREMENTAL:YES -DEBUG
 MAPFILE=
 _VC_MANIFEST_INC=1
 .ELSE # "$(linkinc)" != ""
diff --git a/solenv/prj/d.lst b/solenv/prj/d.lst
index e69de29bb2d1..edbfc190c808 100644
--- a/solenv/prj/d.lst
+++ b/solenv/prj/d.lst
@@ -0,0 +1,2 @@
+mkdir: %_DEST%\bin%_EXT%

+..\inc\version.lst %_DEST%\bin%_EXT%\version.lst

diff --git a/solenv/src/component.map b/solenv/src/component.map
index ac2c3750bfe0..62b8829a0f51 100755
--- a/solenv/src/component.map
+++ b/solenv/src/component.map
@@ -1,7 +1,6 @@
 UDK_3_0_0 {
     global:
         component_getImplementationEnvironment;
-        component_writeInfo;
         component_getFactory;
     local:
     *;
diff --git a/solenv/src/reg-component.map b/solenv/src/reg-component.map
new file mode 100644
index 000000000000..ac2c3750bfe0
--- /dev/null
+++ b/solenv/src/reg-component.map
@@ -0,0 +1,8 @@
+UDK_3_0_0 {
+    global:
+        component_getImplementationEnvironment;
+        component_writeInfo;
+        component_getFactory;
+    local:
+    *;
+};
diff --git a/solenv/src/unloadablecomponent.map b/solenv/src/unloadablecomponent.map
index 30c5bb729ac7..2da0c5709c7b 100755
--- a/solenv/src/unloadablecomponent.map
+++ b/solenv/src/unloadablecomponent.map
@@ -1,7 +1,6 @@
 UDK_3_0_0 {
     global:
         component_getImplementationEnvironment;
-        component_writeInfo;
         component_getFactory;
         component_canUnload;
     local:
diff --git a/soltools/HIDCompiler/hidclex.l b/soltools/HIDCompiler/hidclex.l
deleted file mode 100755
index e99618f30225..000000000000
--- a/soltools/HIDCompiler/hidclex.l
+++ /dev/null
@@ -1,951 +0,0 @@
-/*************************************************************************
- *
- * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- * 
- * Copyright 2000, 2010 Oracle and/or its affiliates.
- *
- * OpenOffice.org - a multi-platform office productivity suite
- *
- * This file is part of OpenOffice.org.
- *
- * OpenOffice.org is free software: you can redistribute it and/or modify
- * it under the terms of the GNU Lesser General Public License version 3
- * only, as published by the Free Software Foundation.
- *
- * OpenOffice.org is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU Lesser General Public License version 3 for more details
- * (a copy is included in the LICENSE file that accompanied this code).
- *
- * You should have received a copy of the GNU Lesser General Public License
- * version 3 along with OpenOffice.org.  If not, see
- * <http://www.openoffice.org/license.html>
- * for a copy of the LGPLv3 License.
- *
- ************************************************************************/
-%{
-// Suppress any warnings from generated code:
-#if defined __GNUC__
-#pragma GCC system_header
-#elif defined __SUNPRO_CC
-#pragma disable_warn
-#elif defined _MSC_VER
-#pragma warning(push, 1)
-#endif
-
-static char const Revision[]     = "$Revision: 1.9 $" ;
-
-/*
-
-XX  XX     XXXX   XXXXXX
-XX  XX      XX     XX  XX
-XX  XX      XX     XX  XX
-XXXXXX      XX     XX  XX
-XX  XX      XX     XX  XX
-XX  XX      XX     XX  XX
-XX  XX     XXXX   XXXXXX
-
-
-  XXXX                                 XX      XXX
- XX  XX                                         XX
-XX         XXXX   XXX XX   XX XXX     XXX       XX     XXXXX   XX XXX
-XX        XX  XX  XX X XX   XX  XX     XX       XX    XX    X   XXX XX
-XX    X   XX  XX  XX X XX   XX  XX     XX       XX    XXXXXXX   XX
- XX  XX   XX  XX  XX   XX   XXXXX      XX       XX    XX        XX
-  XXXX     XXXX   XXX  XXX  XX        XXXX     XXXX    XXXXX   XXXX
-                           XXXX
-
-*/
-
-
-/* length of buffer for reading with lex */
-/**/
-/* enlarge token buffer to tokenize whole strings */
-#undef YYLMAX
-#define YYLMAX 64000
-
-int exclude_bracelevel=0; /* count braces in that start state */
-static YY_BUFFER_STATE InputFiles[127];		// for recursive parse
-static int nInputFileDepth = 0;
-
-
-#include <stdio.h>
-#include <stdlib.h>
-#include <string.h>
-
-#include <ctype.h>
-
-int alloc_cnt = 0;
-static bool bVerbose = false;
-void freestring( char const * ); //forward
-
-char* dot2underline( char* str )
-{
-	size_t len=strlen(str);
-	for( size_t i=0; i<len; i++ )
-		if( str[i]=='.' ) str[i]='_';
-	return str;
-}
-
-void dotappend( char*& base, char const * suffix )
-{
-	// append like "str.suffix" if suffix else "str"
-
-	if( suffix == NULL )
-		return ;
-
-	size_t siz;
-	if( (siz=strlen(suffix)) == 0 )
-		return ;
-
-	size_t siz2 = base==NULL ? 0 : strlen(base);
-
-	char* newstr;
-
-	{//do never forget to increment/decrement alloc_cnt
-	newstr = (char*) malloc( (siz2+siz+1) +1 /*for "." */ );
-	alloc_cnt++;
-	}
-
-	if( newstr == NULL )
-		fprintf( stderr,"error: dotappend() could not malloc() \n"), exit(1);
-
-	if( base ) {
-		strcpy( newstr, base );
-		freestring( base );
-	}
-	else
-		newstr[0] = '\0';
-
-	strcat( newstr, "." );
-	strcat( newstr, suffix );
-	base = newstr;
-}
-
-void dotsubtract( char*& base, char const * suffix )
-{
-	// remove dotted suffix from base.suffix --> base
-
-	if( base == NULL || suffix == NULL )
-		return;
-	if( strlen(suffix) == 0 )
-		return;
-	if( (strlen(suffix)+1) > strlen(base) )
-		return;
-	char * pos=strstr( base, suffix);
-	if( pos && (pos-1 >= base) && ( *(pos-1) == '.') )
-		if( *(pos+strlen(suffix)) == '\0' ) //only if at end of base
-			*(pos-1)= '\0';
-	return;
-}
-
-int level = 0;
-char levelbuffer[512];
-
-void adjust_levelbuffer()
-{
-	int i;
-	for(i=0; i<level;i++) {
-		levelbuffer[i] = '\t';
-	}
-	levelbuffer[i] = '\0';
-}
-
-void freestring( char const * ptr )
-{
-    alloc_cnt--;
-    adjust_levelbuffer();
-    if ( bVerbose )
-	    fprintf(stdout,"%sinfo: freestring line %d\n",levelbuffer, __LINE__);
-    free(const_cast< char * >(ptr)), ptr = NULL;
-}
-
-void makestring(char** newstr, char* oldstr)
-{
-	alloc_cnt++;
-	adjust_levelbuffer();
-	if ( bVerbose )
-	    fprintf(stdout,"%sinfo: makestring on line %d\n",levelbuffer,__LINE__);
-	strcpy( (*newstr=(char*)malloc(strlen(oldstr)+1)), oldstr);
-	if( *newstr==NULL ) {
-		fprintf( stderr,
-		"error: cannot malloc for makestring() alloc_cnt==%d \n", alloc_cnt);
-		exit(1);
-	}
-}
-
-#ifndef WNT
-int strcmpi(char const * stra, char const * strb)
-{
-	// like strcmp() but case insensitive
-	size_t i;
-	char a,b;
-	for(i=0; ;i++){
-		a = (char) tolower(stra[i]);
-		b = (char) tolower(strb[i]);
-		if( a < b )
-			return -1;
-		if( a > b )
-			return 1;
-		if( a == '\0' && b == '\0' )
-			return 0;
-	}
-}
-#endif
-
-/* variables for listfile ( with project + pathname of src file ) */
-char* listfilename;
-#define MAXSRCFILES 2048
-char* filename_tab[MAXSRCFILES];
-char* project_tab[MAXSRCFILES];
-int tab_entries = 0;
-//int fileno = 0; /* currently used filenumber */
-
-/* globale variablen */
-FILE* outfile;
-char const *filename = ""; //incl. path
-//char *basename = "";
-char const *project = "";
-char const *subpath = "";	//from project name downwards like source\ui\xxx.src
-
-int firstprint = 1;
-
-int in_define = 0;
-
-class ident_ring
-{
-	#define MAXRING 2
-	//nicht aendern wg externer Abfrage ->size() == 2
-
-	char*  ring[MAXRING];
-	int     ringpos;
-	int     last;
-	int 	broken;
-public:
-	        ident_ring()  {
-							last = ringpos = -1;
-							for(int i=0; i<MAXRING;i++)
-								ring[i]=NULL;
-							broken = 0;
-						  }
-
-	void    set_zero()    {
-							last = ringpos = -1;
-							for(int i=0; i<MAXRING;i++) {
-								if( ring[i] != NULL )
-									freestring( ring[i] );
-								ring[i]=NULL;
-							}
-							broken = 0;
-						  }
-	void	set_broken()  { broken = 1; }
-	int     size()        {
-							if( ringpos == -1 )
-								return 0;
-
-							if( broken) {
-								if( ringpos==0 )
-									return 0;
-								else
-									return 1;
-							} else {
-								if( ringpos==0 )
-									return 1;
-								else
-									return 2;
-							}
-						  }
-
-	char*	extract_last(){
-							if( last == -1 )  {
-								return NULL;
-							} else {
-								char* ttt=ring[last];
-								ring[last]=NULL;
-								return ttt;
-							}
-					      }
-
-	char*	extract_actual()  {
-							if(ringpos == -1) {
-								return NULL;
-							} else {
-								char *ttt=ring[ringpos];
-								ring[ringpos]=NULL;
-								return ttt;
-							}
-						  }
-
-	void    set(char* id) {
-							ringpos= (++ringpos) % MAXRING;
-							if( ring[ringpos] != NULL )
-								freestring( ring[ringpos] ); /*otherwise: memory lost*/
-							ring[ ringpos ] = id;
-							if ( bVerbose )
-							    fprintf(stdout,
-								    "info: ring[%d] == %s broken==%d \n"
-								    ,ringpos,ring[ringpos],broken
-							    );
-
-							if( !(ringpos==0 && last==-1) )
-								last = (++last) % MAXRING;
-						  }
-};
-
-
-/* Notnagel: die letzten identifier/number merken, fuer klasse & globalID */
-ident_ring *ring;
-
-//
-typedef int token;
-//
-#define TOK_SEMICOLON	';'
-#define TOK_EQUAL		'='
-#define TOK_OPENBRACKET	'['
-#define TOK_CLOSEBRACKET ']'
-#define TOK_OPENBRACE	'{'
-#define TOK_CLOSEBRACE	'}'
-#define TOK_KOMMA		','
-#define TOK_LESS		'<'
-#define TOK_GREATER		'>'
-#define TOK_OPENPAREN	'('
-#define TOK_CLOSEPAREN	')'
-#define TOK_PLUS		'+'
-#define TOK_MINUS		'-'
-#define TOK_STAR		'*'
-#define TOK_SLASH		'/'
-//
-#define TOK_POSorSIZE	146
-#define TOK_POSSIZE		147
-#define TOK_TEXTTAG		148
-#define TOK_IDNUM		149
-//
-#define TOK_EXTRADATA	151
-#define TOK_TEXT		152
-#define TOK_MESSAGE		153
-#define TOK_HELPTEXT	154
-#define TOK_TRUE		155
-#define TOK_FALSE		156
-//
-#define TOK_RESID	180
-//
-#define TOK_STRING		190
-//
-#define TOK_INVALID     (-1)
-
-token  lasttoken = TOK_INVALID;
-
-
-
-
-#define UNDEF (-1)
-
-char *globalID = const_cast< char * >("");
-char const *globalKLASSE = NULL;
-
-void reset_globalID() {
-	//
-	if( globalID && (strlen(globalID) > 0 ) ) {
-		freestring( globalID );
-		globalID = const_cast< char * >("");
-	}
-}
-
-
-//--------------------------------------------------------------------
-class resource
-{
-private:
-	resource ( const resource& );  //copy-ctor soll keiner benutzen
-	void operator=( const resource& ); // zuweisung auch nicht
-public:
-	resource();
-	~resource();
-public:
-	int	 lineno;
-	token  lasttoken; //before opening {
-	char const *klasse ;
-	char *localID;
-	char *helpID;
-	int  residfound;
-};
-
-resource *ares ; /* aktuell bearbeitete resource */
-
-resource::~resource()
-{
-	if( klasse != NULL )   freestring(klasse);
-	if( localID != NULL )  freestring(localID);
-	if( helpID != NULL )   freestring(helpID);
-
-}
-
-resource::resource()
-{
-	lineno =   UNDEF;
-	lasttoken= TOK_INVALID;
-	klasse =    NULL ;
-	localID =  NULL ;
-	helpID =   NULL ;
-	residfound= 0;
-}
-
-int residfound = 0; // "Identifier = " auf momentanem level gefunden
-
-#define   MAXSTACK 32
-resource* stack[MAXSTACK]; /* resource stack */
-#define   EMPTYSTACK (-1)
-int       stackptr = EMPTYSTACK;
-
-void push_resource( resource* r )
-{
-	stackptr++;
-	if( stackptr >= MAXSTACK ) {
-		fprintf( stderr, "error: resource stack is full %d \n", stackptr);
-		exit(1);
-	}
-	stack[ stackptr ] = r;
-}
-
-resource* pop_resource()
-{
-	if( stackptr < 0 ) {
-		fprintf( stderr, "error: pop resource from empty stack \n");
-		exit(1);
-	}
-	return stack[ stackptr-- ];
-}
-
-/* forward */
-int eat_comment();
-int eat_cpp_comment();
-
-/*===================================================*/
-//
-// '+' im identifier wg basic\source\classes\sb.src
-//
-// '<' im identifier wg sc subtdlg.src
-//
-// '&' im identifier wg scerror.src so2..nocode.src svxerr.src scwarngs.src
-
-
-//string		(\"[^"]*\") alter einfacher string ohne "
-
-%}
-
-/* 89012 */
-%option never-interactive
-
-
-simple		([^\n\"]*)
-%p 7000
-string		\"{simple}((((\\\\)*(\\\"))?){simple})*\"
-
-%x MACRO_STATE
-
-%x EXCLUDE_STATE
-resfilelist	    ([Ff][Ii][Ll][Ee][Ll][Ii][Ss][Tt])
-resstringlist	([Ss][Tt][Rr][Ii][Nn][Gg][Ll][Ii][Ss][Tt])
-resstring   	([Ss][Tt][Rr][Ii][Nn][Gg])
-
-identifier ([a-z_A-Z]+[a-z_A-Z<+&0-9]*)
-number		(([0-9]+)|(0x[0-9a-fA-F]+))
-residentifier ([Ii][Dd][Ee][Nn][Tt][Ii][Ff][Ii][Ee][Rr])
-w			([ \t\n]*)
-wspecial	([\\ \t\n]*)
-texttag		(([Tt][Ii][Tt][Ll][Ee])|([Tt][Ee][Xx][Tt])|([Mm][Ee][Ss][Ss][Aa][Gg][Ee]))
-qhelptag	(([Qq][Uu][Ii][Cc][Kk])?([Hh][Ee][Ll][Pp][Tt][Ee][Xx][Tt]))
-langtag		([a-zA-Z_]+)
-helptag		([Hh][Ee][Ll][Pp][Ii][Dd])
-helpid		([a-zA-Z_0-9]+)
-num2tag		(([Pp][Oo][Ss])|([Ss][Ii][Zz][Ee]))
-num4tag		(([Pp][Oo][Ss][Ss][Ii][Zz][Ee]))
-
-%%
-[ \t]		{
-				/* forget whitespace */;
-			}
-
-^[ \t]*#include.*\.src[">].*	{
-				char NewFile[255];		//long names???
-				int i, j, GetIt;
-
-				GetIt = 0;
-				j = 0;
-				nInputFileDepth++;
-//	nicht schoen aber geht...
-				for (i = 0; yytext[i+1] != 0; i++)
-				{
-					if ( GetIt == 1 )
-					{
-						if ( yytext[i] == '"' || yytext[i] == '>' )
-							GetIt = 0;
-						else
-							NewFile[j++] = yytext[i];
-					}
-					if ( yytext[i] == '"' || yytext[i] == '<' )
-						GetIt = 1;
-				}
-				NewFile[j] = '\0';
-				FILE* pFile = NULL;
-				pFile = fopen( NewFile, "r" );
-				if( pFile == NULL ) {
-					fprintf( stdout, "warning: could not open inputfile %s \n", NewFile );
-					// try the new *_tmpl.src version instead
-					// this hack was introduced to allow localisation of included src files
-					const char* sStrTmpl = "_tmpl";
-					j -= 4;
-					for ( i = 0 ; i <5 ; i++,j++ )
-					{
-					    NewFile[j+5] = NewFile[j];
-					    NewFile[j] = sStrTmpl[i];
-					}
-    				NewFile[j+4] = '\0';
-					fprintf( stderr, "trying inputfile %s \n", NewFile );
-    				pFile = fopen( NewFile, "r" );
-				    if( pFile == NULL ) {
-					    fprintf( stderr, "error: could not open inputfile %s \n", NewFile );
-					    exit(1);
-    			    }
-				}
-				InputFiles[ nInputFileDepth ] = yy_create_buffer( pFile, YY_BUF_SIZE );
-                yy_switch_to_buffer( InputFiles[ nInputFileDepth ] );
-
-                if ( bVerbose )
-				    fprintf( stdout, "%s //ATTENTION!! %s gets included here\n", yytext, NewFile );
-				fprintf( outfile, "// %s //ATTENTION!! %s gets included here\n\n", yytext, NewFile );
-			}
-
-^[ \t]*#include.*	{
-				fprintf( outfile, "%s\n\n", yytext );
-			}
-
-^[ \t]*#(if|ifdef|ifndef|elif).*		{
-				;
-			}
-
-^[ \t]*#else	{
-				;
-			}
-^[ \t]*#endif	{
-				;
-			}
-
-^[ \t]*#(undef|error|pragma).*	{
-				;
-			}
-
-^[ \t]*#define	{
-				fprintf( outfile, "%s", yytext );
-				BEGIN MACRO_STATE;
-			}
-
-<INITIAL,MACRO_STATE>"/*"		{
-				eat_comment();
-			}
-
-<INITIAL,MACRO_STATE>"//"		{
-				eat_cpp_comment();
-			}
-
-<MACRO_STATE>\n {
-				fprintf( outfile, "%s\n", yytext );
-				BEGIN INITIAL;
-			}
-
-<MACRO_STATE>\\\n {
-				fprintf( outfile, "\\\n" );
-			;/* macro schadet nicht, koennte gebraucht werden */
-			}
-
-
-<MACRO_STATE>. {
-			fprintf( outfile, "%s", yytext );
-			;/* ignore all this unused input */
-			}
-
-";" 		{ring->set_zero(); lasttoken = TOK_SEMICOLON; }
-"=" 		{ring->set_zero(); lasttoken = TOK_EQUAL; }
-"[" 		{ring->set_broken(); lasttoken = TOK_OPENBRACKET; }
-"]" 		{ring->set_broken(); lasttoken = TOK_CLOSEBRACKET; }
-
-
-<EXCLUDE_STATE>"{" 		{
-				exclude_bracelevel += 1;
-			    if ( bVerbose )
-				    fprintf( stdout,"info: lev %d : found {\n", exclude_bracelevel );
-			}
-
-
-\\\n		|
-"{" 		{
-				// define continues
-				// or a brace opens a block
-
-				if( in_define && !strcmp(yytext,"\\\n") ) {
-
-					if( in_define++ == 1 )
-						;// keep on working
-					else
-						goto blockend;
-				}
-
-				level++;
-				if( ares != NULL ){
-					if( level > 1 )
-						dotappend( globalID, ares->localID );
-					ares->residfound = residfound;
-					push_resource( ares );
-				}
-				ares = new resource;
-
-				residfound = 0;
-				ares->residfound = 0;
-
-				ares->lineno = yylineno;
-				ares->lasttoken = lasttoken;
-				if( ring->size() == 2 ) {
-					ares->klasse = ring->extract_last();
-					ares->localID = ring->extract_actual();
-				} else if(ring->size() == 1) {
-					ares->klasse = ring->extract_actual();
-				}
-				if( level==1 ){ //Ausnahme: Resource auf Ebene 1
-					globalID= ares->localID;
-					ares->localID = NULL;
-					globalKLASSE= ares->klasse;
-				}
-
-                if ( bVerbose )
-				    fprintf(stdout,"info: { level: %d\n", level);
-
-				lasttoken = TOK_OPENBRACE;
-				ring->set_zero();
-			}
-
-<EXCLUDE_STATE>"}" 		{
-				//-----------------------------
-				exclude_bracelevel -= 1;
-				if ( bVerbose )
-				    fprintf( stdout,"info: lev %d : found }\n", exclude_bracelevel );
-				if( exclude_bracelevel==1 ) {
-					BEGIN INITIAL;
-					exclude_bracelevel=0;
-				}
-			}
-
-
-\n			|
-"}" 		{
-				if ( bVerbose )
-				    fprintf(stdout,"info:   } level: %d\n",level);
-
-				if( !strcmp(yytext,"}") )
-					;
-				else if( in_define && (!strcmp(yytext,"\n") )) {
-					if( in_define==1 ) {
-						//no continuation line for #define
-						in_define=0;
-						goto blockend;
-					}
-					else {
-						//there was a continuation line for #define
-						in_define=0;
-					}
-				}
-				else
-					goto blockend;
-
-				// ares ausgeben
-				if( ares != NULL ) {
-
-					#define LEER "leer"
-					char const * globklasse =
-                      globalKLASSE==NULL ? LEER:globalKLASSE;
-					char const * local =
-                      ares->localID==NULL ? LEER:ares->localID;
-					char const * klasse =
-                      ares->klasse==NULL ? LEER:ares->klasse;
-					char const * glob =
-                      globalID==NULL ? LEER:globalID;
-
-
-					//wg. Starview-Klasse String in ehdl.c und doc.c
-					// wenn generierte C++-Quellen compiliert werden
-					//
-					//if( !strcmp(globklasse,"String" )) globklasse = "string";
-					//if( !strcmp(klasse,"String" )) klasse = "string";
-
-
-					//---------------------------------------------------
-					// generate the body of a new C main program,
-					// which is filled with printf statements
-					// to compute (via preproseccor & compiler)
-					// the codenumbers for resource names like menu$RID_SVX$xyz
-
-				   	if( firstprint ) {
-				   		firstprint=0;
-						fprintf(outfile, "#include \"starview.hid\" \n\n");
-						fprintf(outfile, " int main() { \n\n\n");
-					}
-
-					char globunder[256];
-				    strcpy(globunder,glob);
-					dot2underline( globunder );
-					char const * globsuffix = strrchr(glob,'.');
-					globsuffix = globsuffix==NULL ? glob:globsuffix+1;
-
-					if( ares->helpID ) {
-						fprintf( outfile,"\n\t printf(\"%s \\t %cs %cu \\n\",\n",
-						ares->helpID,'%','%');
-						fprintf(outfile,"\t\"HelpID\", (%s) ); \n", ares->helpID);
-					}
-					else if( ares->localID ) {
-						fprintf( outfile,"\n\t printf(\"%s:%s:%s:%s \\t %cs %cu %cs %cu \\n\",\n",
-						project,klasse,globunder,local,'%','%','%','%');
-						fprintf( outfile,"\t\"Norm %s\", (%s), \"%s\", (%s) );\n",
-						globklasse,globsuffix, klasse,local);
-					}
-					else if( (strcmpi("MenuItem",klasse)==0) ||
-						    (strcmpi("ToolBoxItem",klasse)==0) ) {
-							; //no output (99% is a separator)
-					}
-					else {
-						fprintf( outfile,"\n\t printf(\"%s:%s:%s \\t %cs %cu %cs \\n\",\n",
-						project,klasse,globunder,'%','%','%');
-						fprintf( outfile,"\t\"Norm %s\", (%s), \"%s\" );\n",
-						globklasse,globsuffix, klasse);
-					}
-
-					delete ares;
-				}
-
-
-				// ein level zurueck
-				if( level == 1) {
-					reset_globalID();
-					globalKLASSE = NULL;
-				}
-				level--;
-				ares = pop_resource();
-				residfound = ares->residfound;
-				dotsubtract( globalID, ares->localID );
-
-
-				//
-				lasttoken = TOK_CLOSEBRACE;
-				ring->set_zero();
-		blockend:	;
-			}
-
-"," 		{ring->set_broken(); lasttoken = TOK_KOMMA; }
-
-"<" 		{ring->set_broken(); lasttoken = TOK_LESS; }
-">" 		{ring->set_broken(); lasttoken = TOK_GREATER; }
-
-"(" 		{ring->set_broken(); lasttoken = TOK_OPENPAREN; }
-")" 		{ring->set_broken(); lasttoken = TOK_CLOSEPAREN; }
-"+" 		{ring->set_broken(); lasttoken = TOK_PLUS; }
-"-" 		{ring->set_broken(); lasttoken = TOK_MINUS; }
-"*" 		{ring->set_broken(); lasttoken = TOK_STAR; }
-"/" 		{ring->set_broken(); lasttoken = TOK_SLASH; }
-
-
-{helptag}{w}"="{w}{helpid}{w}";" {
-
-			// extract text for helpid and put to ares
-			char*     pos = strchr(yytext,'=');
-			size_t offset = strspn(pos+1," \t\n");
-			char*   start = pos+1+offset;
-			size_t offset2= strcspn( start, "; \t\n");
-			char*     end = start+offset2;
-			*end = '\0';
-			char *helpid;
-			makestring( &helpid, start );
-			ares->helpID = helpid;
-			}
-
-{residentifier}{w}"="[ \t\n]*({identifier}|{number}) {
-			ring->set_zero();
-			lasttoken = TOK_RESID;
-			residfound=1;
-
-			//extract resource id and store as localID
-			char *after = strrchr(yytext,'=');
-			char *resid = after + strspn(after,"= \t\n");
-			char *localID;
-			makestring( &localID, resid );
-			ares->localID = localID;
-			}
-
-{resfilelist}	|
-{resstring}     |
-{resstringlist} {
-			BEGIN EXCLUDE_STATE;
-			exclude_bracelevel = 1;
-			if ( bVerbose )
-			    fprintf( stdout,"info: lev %d : found exclusion\n", exclude_bracelevel );
-			}
-
-^[ \t]*#define		|
-{number}	        |
-{identifier} {
-		/* identifier/number in einem ring ablegen */
-		char *identifier;
-		char *def=strstr(yytext,"#define");
-		if( def ) {
-			in_define = 1;
-			makestring( &identifier, def+1 );
-		}
-		else
-			makestring( &identifier, yytext );
-		ring->set( identifier );
-		lasttoken = TOK_IDNUM;
-
-	}
-<INITIAL,EXCLUDE_STATE>{string}	{
-			ring->set_broken();
-            lasttoken = TOK_STRING;
-            if ( bVerbose )
-			    fprintf(stdout, "%6s %11s %8d %s \n",project,filename,yylineno, yytext);
-			}
-
-
-<INITIAL,EXCLUDE_STATE>.	{ if ( bVerbose ) fprintf( stdout,"warning: unused input on line %d of %s \n%s\n",
-					yylineno, filename, yytext);
-	}
-
-<EXCLUDE_STATE>\n	{
-						; //do nothing, ignore
-	}
-
-
-%%
-
-
-void makeversion( char* version )
-{
-	char const *pos = strpbrk( Revision, "0123456789." );
-	size_t siz = strspn( pos,      "0123456789." );
-	if( pos && siz ) {
-		strncpy(version, pos, siz);
-		strcat( version, " ");
-	}
-	else
-		strcpy( version," unknown " );
-}
-
-int main( int argc, char* argv[] )
-{
-	static char const *Compiler = "HID-Compiler ";
-	static char const *Author   = "OG ";
-	static char HIDCompiler[100];
-	static char Version[100];
-
-    // check for switches given on the command line
-    if ( ( argc > 0 ) && ( 0 == strcmp( argv[0], "-verbose" ) ) )
-    {
-        bVerbose = true;
-        for ( size_t i=0; i<argc-1; ++i )
-        {
-            argv[i] = argv[i+1];
-            --argc;
-        }
-    }
-
-	makeversion( Version );
-	strcpy( HIDCompiler, Compiler );
-	strcat( HIDCompiler, Version  );
-	strcat( HIDCompiler, Author   );
-	if ( bVerbose )
-	    fprintf( stdout, "\n %s \n\n", HIDCompiler);
-	if(argc < 4) {
-		fprintf(
-		stderr,
-		"usage: hidc [-verbose] file.src file.c project\n"
-		"\n"
-		"You must give exactly 3 arguments.\n"
-		"1 - an existing SRC file.\n"
-		"2 - C file to be generated (which generates the HID file when run).\n"
-		"3 - the project name (an arbitrary name).\n\n"
-		);
-		exit(1);
-	}
-
-	project = argv[3];
-
-	char *outfilename = argv[2];
-	if( (outfile=fopen( outfilename , "w" )) ==NULL ) {
-		fprintf(stderr,"error: could not open outputfile '%s' \n", outfilename);
-		exit(1);
-	}
-
-	filename = argv[1];
-	nInputFileDepth = 0;
-	FILE* pFile;
-	pFile = fopen( filename, "r" );
-	if( pFile == NULL ) {
-		fprintf( stderr, "error: could not open inputfile %s \n", filename );
-		exit(1);
-	}
-	InputFiles[ nInputFileDepth ] = yy_create_buffer( pFile, YY_BUF_SIZE );
-    yy_switch_to_buffer( InputFiles[ nInputFileDepth ] );
-	ring = new ident_ring;
-	ares = new resource;
-
-	fprintf(outfile, "/* Generated from %s */\n\n", HIDCompiler );
-	fprintf(outfile, "/* Source was: %s */\n", filename );
-
-	yylineno = 1;
-	yylex(); /* do the real work here */
-
-   	if( firstprint ) {
-		fprintf(outfile, "#include \"starview.hid\" \n\n");
-		fprintf(outfile, " int main() { \n\n\n");
-	}
-	fprintf(outfile, "\nreturn 0;");
-	fprintf(outfile, "\n} /*main*/\n");
-	return 0;
-}
-
-int yywrap()
-{
-    yy_delete_buffer( InputFiles[ nInputFileDepth ] );
-	if ( nInputFileDepth == 0 )
-		return 1;/* keine src files mehr */
-	else
-	{
-		nInputFileDepth--;
-    	fprintf(outfile, "// Done reading file\n\n");
-        yy_switch_to_buffer( InputFiles[ nInputFileDepth ] );
-		return 0;
-	}
-}
-
-int eat_comment()
-{
-	int c;
-	int lastc = ' ';
-	while( (c=yyinput()) != EOF ) {
-		if( c=='\n')
-			;
-		else if( c=='/' && lastc=='*' )
-			break; /* end of comment found */
-		lastc=c;
-	}
-	return 0;
-}
-
-int eat_cpp_comment()
-{
-	int c;
-	while( (c=yyinput()) != EOF ) {
-		if( c=='\n') {
-			break;
-		}
-	}
-	if( c != EOF )
-		unput(c); /* because next #.... line was not found */
-	return 0;
-}
diff --git a/soltools/javadep/javadep.c b/soltools/javadep/javadep.c
index a573d78eed75..d0517d832f45 100644
--- a/soltools/javadep/javadep.c
+++ b/soltools/javadep/javadep.c
@@ -733,6 +733,7 @@ usage()
             pprogname);
 }
 
+#ifdef WNT
 /* my very simple minded implementation of getopt()
  * it's to sad that getopt() is not available everywhere
  * note: this is not a full POSIX conforming getopt()
@@ -770,6 +771,7 @@ int simple_getopt(char *pargv[], const char *poptstring)
     }
     return -1;
 }
+#endif
 
 int CDECL
 main(int argc, char *argv[])
diff --git a/soltools/prj/build.lst b/soltools/prj/build.lst
index 73611addf782..578723b0e09d 100644
--- a/soltools/prj/build.lst
+++ b/soltools/prj/build.lst
@@ -10,5 +10,4 @@ so	soltools\javadep						nmake	-	all	so_jvdep so_mkdep so_adjvis.u NULL
 so	soltools\support						nmake	-	all	so_supp so_mkdep so_adjvis.u NULL
 so	soltools\giparser						nmake	-	all	so_gip so_supp so_adjvis.u NULL
 so	soltools\adjustvisibility				nmake	-	u	so_adjvis so_mkdep NULL
-so	soltools\HIDCompiler					nmake	-	all	so_hidc so_mkdep so_adjvis.u so_wunistd.n NULL
 so  soltools\testhxx                        nmake   -   all so_testhxx so_mkdep NULL
diff --git a/soltools/prj/d.lst b/soltools/prj/d.lst
index ee3ae5e2f907..970805f5d60c 100644
--- a/soltools/prj/d.lst
+++ b/soltools/prj/d.lst
@@ -8,6 +8,4 @@
 ..\%__SRC%\bin\cpp.exe %_DEST%\bin%_EXT%\cpplcc.exe
 ..\%__SRC%\bin\cpp %_DEST%\bin%_EXT%\cpp.lcc
 ..\%__SRC%\inc\unistd.h %_DEST%\inc%_EXT%\unistd.h
-..\%__SRC%\bin\hidc.exe %_DEST%\bin%_EXT%\hidc.exe
-..\%__SRC%\bin\hidc %_DEST%\bin%_EXT%\hidc
 ..\%__SRC%\bin\testhxx* %_DEST%\bin%_EXT%\testhxx*
diff --git a/stlport/prj/d.lst b/stlport/prj/d.lst
index f379d7d14c36..29848a6475e3 100644
--- a/stlport/prj/d.lst
+++ b/stlport/prj/d.lst
@@ -17,6 +17,7 @@ mkdir: %_DEST%\inc%_EXT%\stl\wrap_std\h
 ..\%__SRC%\inc\stlport\using\h\* %_DEST%\inc%_EXT%\stl\using\h\*
 ..\%__SRC%\inc\stlport\wrap_std\* %_DEST%\inc%_EXT%\stl\wrap_std\*
 ..\%__SRC%\inc\stlport\wrap_std\h\* %_DEST%\inc%_EXT%\stl\wrap_std\h\*
+..\systemstlguards\*.h %_DEST%\inc%_EXT%\stl\*.h
 ..\%__SRC%\lib\lib*.so %_DEST%\lib%_EXT%\lib*.so
 ..\%__SRC%\lib\lib*.a %_DEST%\lib%_EXT%\lib*.a
 ..\%__SRC%\lib\*.lib %_DEST%\lib%_EXT%\*.lib
diff --git a/soltools/HIDCompiler/wrap_hidclex.cxx b/stlport/systemstlguards/postextstl.h
index 1eb79e80a5da..81a21e25c15b 100644
--- a/soltools/HIDCompiler/wrap_hidclex.cxx
+++ b/stlport/systemstlguards/postextstl.h
@@ -25,7 +25,12 @@
  *
  ************************************************************************/
 
-// MARKER(update_precomp.py): autogen include statement, do not remove
-#include "precompiled_soltools.hxx"
-
-#include "hidc_yy.cxx"
+#ifdef std_was_redefined_as_stlport
+//  put things back the way they were
+#   define std std_was_redefined_as_stlport
+#   undef _STLP_OUTERMOST_HEADER_ID
+//  force config to be re-read
+#   undef _STLP_NOTHROW_INHERENTLY
+#   undef _STLP_CONFIG_H
+#   include <stddef.h>
+#endif
diff --git a/stlport/systemstlguards/preextstl.h b/stlport/systemstlguards/preextstl.h
new file mode 100644
index 000000000000..763f0dfa79f3
--- /dev/null
+++ b/stlport/systemstlguards/preextstl.h
@@ -0,0 +1,77 @@
+/*************************************************************************
+ *
+ * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
+ *
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
+ *
+ * OpenOffice.org - a multi-platform office productivity suite
+ *
+ * This file is part of OpenOffice.org.
+ *
+ * OpenOffice.org is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU Lesser General Public License version 3
+ * only, as published by the Free Software Foundation.
+ *
+ * OpenOffice.org is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU Lesser General Public License version 3 for more details
+ * (a copy is included in the LICENSE file that accompanied this code).
+ *
+ * You should have received a copy of the GNU Lesser General Public License
+ * version 3 along with OpenOffice.org.  If not, see
+ * <http://www.openoffice.org/license.html>
+ * for a copy of the LGPLv3 License.
+ *
+ ************************************************************************/
+//1. Force inclusion of a std:: using header to ensure the stlport define
+//of std as "stlport"
+#include <algorithm>
+#if defined(ADAPT_EXT_STL)
+//2. Force inclusion of stlport headers to get their stlport:: definitions
+#   include <ostream>
+#   include <istream>
+#   include <fstream>
+#   include <iostream>
+#   include <sstream>
+#   include <vector>
+#   include <deque>
+#   include <set>
+#   include <list>
+#   include <map>
+//3. Now force inclusion of native headers to get their std:: definitions
+#   if defined(std)
+#       define std_was_redefined_as_stlport std
+#       undef std
+#       define _STLP_OUTERMOST_HEADER_ID 0xdeadbeaf
+#       if defined(_GNUC__)
+#           pragma GCC visibility push(default)
+#       endif
+#       include _STLP_NATIVE_HEADER(exception_defines.h)
+#       include _STLP_NATIVE_HEADER(limits)
+#       include _STLP_NATIVE_HEADER(memory)
+#       include _STLP_NATIVE_HEADER(exception)
+#       include _STLP_NATIVE_HEADER(iosfwd)
+#       include _STLP_NATIVE_HEADER(algorithm)
+#       include _STLP_NATIVE_HEADER(string)
+#       include _STLP_NATIVE_HEADER(streambuf)
+#       include _STLP_NATIVE_HEADER(ios)
+#       include _STLP_NATIVE_HEADER(locale)
+#       include _STLP_NATIVE_HEADER(stdexcept)
+#       include _STLP_NATIVE_HEADER(ostream)
+#       include _STLP_NATIVE_HEADER(istream)
+#       include _STLP_NATIVE_HEADER(iostream)
+#       include _STLP_NATIVE_HEADER(sstream)
+#       include _STLP_NATIVE_HEADER(vector)
+#       include _STLP_NATIVE_HEADER(deque)
+#       include _STLP_NATIVE_HEADER(set)
+#       include _STLP_NATIVE_HEADER(list)
+#       include _STLP_NATIVE_HEADER(map)
+#       if defined(_GNUC__)
+#           pragma GCC visibility pop
+#       endif
+#   endif
+#endif
+//ext_std resolves to the std that external c++ libs, e.g. Graphite were built
+//against regardless of whether that is stlport or system stl
+namespace ext_std = std;