Update to SRC680_m176

2 files changed, 61 insertions, 501 deletions

diff --git a/editors/openoffice.org-2-devel/files/patch-i65513 b/editors/openoffice.org-2-devel/files/patch-i65513
index b8ddb89af6d..7ca69874d97 100644
--- a/editors/openoffice.org-2-devel/files/patch-i65513
+++ b/editors/openoffice.org-2-devel/files/patch-i65513
@@ -102,461 +102,7 @@ diff -u -p -r1.32 -r1.32.158.1
  
  .IF "$(COM)$(OS)$(CPU)" == "C730IRIXM"
  .INCLUDE : unxirxm3.mk
-Index: solenv/inc/unxfbsd.mk
-===================================================================
-RCS file: solenv/inc/unxfbsd.mk
-diff -N solenv/inc/unxfbsd.mk
---- /dev/null	1 Jan 1970 00:00:00 -0000
-+++ solenv/inc/unxfbsd.mk	8 Jul 2006 03:41:38 -0000	1.1.2.2
-@@ -0,0 +1,238 @@
-+#*************************************************************************
-+#
-+#   OpenOffice.org - a multi-platform office productivity suite
-+#
-+#   $RCSfile$
-+#
-+#   $Revision$
-+#
-+#   last change: $Author$ $Date$
-+#
-+#   The Contents of this file are made available subject to
-+#   the terms of GNU Lesser General Public License Version 2.1.
-+#
-+#
-+#     GNU Lesser General Public License Version 2.1
-+#     =============================================
-+#     Copyright 2005 by Sun Microsystems, Inc.
-+#     901 San Antonio Road, Palo Alto, CA 94303, USA
-+#
-+#     This library is free software; you can redistribute it and/or
-+#     modify it under the terms of the GNU Lesser General Public
-+#     License version 2.1, as published by the Free Software Foundation.
-+#
-+#     This library 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 for more details.
-+#
-+#     You should have received a copy of the GNU Lesser General Public
-+#     License along with this library; if not, write to the Free Software
-+#     Foundation, Inc., 59 Temple Place, Suite 330, Boston,
-+#     MA  02111-1307  USA
-+#
-+#*************************************************************************
-+
-+# Makefile for FreeBSD.
-+
-+ASM=
-+AFLAGS=
-+
-+SOLAR_JAVA*=
-+JAVAFLAGSDEBUG=-g
-+
-+# Include arch specific makefile.
-+.IF "$(CPUNAME)" == "INTEL"
-+.INCLUDE : unxfbsdi.mk
-+.ENDIF
-+.IF "$(CPUNAME)" == "X86_64"
-+.INCLUDE : unxfbsdx.mk
-+.ENDIF
-+
-+# filter for supressing verbose messages from linker
-+#not needed at the moment
-+#LINKOUTPUT_FILTER=" |& $(SOLARENV)$/bin$/msg_filter"
-+
-+# _PTHREADS is needed for the stl
-+CDEFS+=$(PTHREAD_CFLAGS) -D_PTHREADS -D_REENTRANT -DNEW_SOLAR -D_USE_NAMESPACE=1 -DSTLPORT_VERSION=450
-+
-+# enable visibility define in "sal/types.h"
-+.IF "$(HAVE_GCC_VISIBILITY_FEATURE)" == "TRUE"
-+CDEFS += -DHAVE_GCC_VISIBILITY_FEATURE
-+.ENDIF # "$(HAVE_GCC_VISIBILITY_FEATURE)" == "TRUE"
-+
-+# this is a platform with JAVA support
-+.IF "$(SOLAR_JAVA)"!=""
-+JAVADEF=-DSOLAR_JAVA
-+.IF "$(debug)"==""
-+JAVA_RUNTIME=-ljava
-+.ELSE
-+JAVA_RUNTIME=-ljava_g
-+.ENDIF
-+.ENDIF
-+
-+# 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
-+ARCH_FLAGS*=-mtune=pentiumpro
-+
-+# name of C++ Compiler
-+CXX*=g++
-+# name of C Compiler
-+CC*=gcc
-+.IF "$(SYSBASE)"!=""
-+CFLAGS_SYSBASE:=-isystem $(SYSBASE)$/usr$/include
-+CXX+:=$(CFLAGS_SYSBASE)
-+CC+:=$(CFLAGS_SYSBASE)
-+.ENDIF          # "$(SYSBASE)"!=""
-+CFLAGS+=-fmessage-length=0 -c
-+
-+# flags to enable build with symbols; required for crashdump feature
-+.IF "$(ENABLE_SYMBOLS)"=="SMALL"
-+CFLAGSENABLESYMBOLS=-g1
-+.ELSE
-+CFLAGSENABLESYMBOLS=-g # was temporarily commented out, reenabled before Beta
-+
-+.ENDIF
-+
-+# flags for the C++ Compiler
-+CFLAGSCC= -pipe $(ARCH_FLAGS)
-+# Flags for enabling exception handling
-+CFLAGSEXCEPTIONS=-fexceptions -fno-enforce-eh-specs
-+# Flags for disabling exception handling
-+CFLAGS_NO_EXCEPTIONS=-fno-exceptions
-+
-+# -fpermissive should be removed as soon as possible
-+CFLAGSCXX= -pipe $(ARCH_FLAGS)
-+PICSWITCH:=-fpic
-+.IF "$(HAVE_GCC_VISIBILITY_FEATURE)" == "TRUE"
-+CFLAGSCXX += -fvisibility-inlines-hidden
-+.ENDIF # "$(HAVE_GCC_VISIBILITY_FEATURE)" == "TRUE"
-+
-+# Compiler flags for compiling static object in single threaded environment with graphical user interface
-+CFLAGSOBJGUIST=
-+# Compiler flags for compiling static object in single threaded environment with character user interface
-+CFLAGSOBJCUIST=
-+# Compiler flags for compiling static object in multi threaded environment with graphical user interface
-+CFLAGSOBJGUIMT=
-+# Compiler flags for compiling static object in multi threaded environment with character user interface
-+CFLAGSOBJCUIMT=
-+# Compiler flags for compiling shared object in multi threaded environment with graphical user interface
-+CFLAGSSLOGUIMT=$(PICSWITCH)
-+# Compiler flags for compiling shared object in multi threaded environment with character user interface
-+CFLAGSSLOCUIMT=$(PICSWITCH)
-+# Compiler flags for profiling
-+CFLAGSPROF=
-+# Compiler flags for debugging
-+CFLAGSDEBUG=-g
-+CFLAGSDBGUTIL=
-+# Compiler flags for enabling optimizations
-+.IF "$(PRODUCT)"!=""
-+CFLAGSOPT=-Os -fno-strict-aliasing		# optimizing for products
-+.ELSE 	# "$(PRODUCT)"!=""
-+CFLAGSOPT=   							# no optimizing for non products
-+.ENDIF	# "$(PRODUCT)"!=""
-+# Compiler flags for disabling optimizations
-+CFLAGSNOOPT=-O0
-+# Compiler flags for describing the output path
-+CFLAGSOUTOBJ=-o
-+
-+# -Wshadow does not work for C with nested uses of pthread_cleanup_push:
-+CFLAGSWARNCC=-Wall -Wextra -Wendif-labels
-+CFLAGSWARNCXX=$(CFLAGSWARNCC) -Wshadow -Wno-ctor-dtor-privacy \
-+    -Wno-non-virtual-dtor
-+CFLAGSWALLCC=$(CFLAGSWARNCC)
-+CFLAGSWALLCXX=$(CFLAGSWARNCXX)
-+CFLAGSWERRCC=-Werror
-+
-+# Once all modules on this platform compile without warnings, set
-+# COMPILER_WARN_ERRORS=TRUE here instead of setting MODULES_WITH_WARNINGS (see
-+# settings.mk): Currently this is not tested on FreeBSD
-+#MODULES_WITH_WARNINGS :=
-+
-+# switches for dynamic and static linking
-+STATIC		= -Wl,-Bstatic
-+DYNAMIC		= -Wl,-Bdynamic
-+
-+# name of linker
-+LINK*=$(CXX)
-+LINKC*=$(CC)
-+
-+# default linker flags
-+LINKFLAGSDEFS*=#-Wl,-z,defs
-+LINKFLAGSRUNPATH*=-Wl,-rpath,\''$$ORIGIN'\'
-+LINKFLAGS=-Wl,-z,combreloc $(LINKFLAGSDEFS) $(LINKFLAGSRUNPATH)
-+
-+# linker flags for linking applications
-+LINKFLAGSAPPGUI= -Wl,-export-dynamic -Wl,--noinhibit-exec
-+LINKFLAGSAPPCUI= -Wl,-export-dynamic -Wl,--noinhibit-exec
-+
-+# linker flags for linking shared libraries
-+LINKFLAGSSHLGUI= -shared
-+LINKFLAGSSHLCUI= -shared
-+
-+LINKFLAGSTACK=
-+LINKFLAGSPROF=
-+LINKFLAGSDEBUG=-g
-+LINKFLAGSOPT=
-+
-+# linker flags for optimization (symbol hashtable)
-+# for now, applied to symbol scoped libraries, only
-+LINKFLAGSOPTIMIZE*=-Wl,-O1
-+LINKVERSIONMAPFLAG=$(LINKFLAGSOPTIMIZE) -Wl,--version-script
-+
-+SONAME_SWITCH=-Wl,-h
-+
-+# Sequence of libs does matter !
-+
-+STDLIBCPP=-lstdc++
-+
-+# default objectfilenames to link
-+STDOBJVCL=$(L)$/salmain.o
-+STDOBJGUI=
-+STDSLOGUI=
-+STDOBJCUI=
-+STDSLOCUI=
-+
-+# libraries for linking applications
-+STDLIBCUIST=-lm
-+STDLIBGUIMT=-lX11 $(PTHREAD_LIBS) -lm
-+STDLIBCUIMT=$(PTHREAD_LIBS) -lm
-+STDLIBGUIST=-lX11 -lm
-+# libraries for linking shared libraries
-+STDSHLGUIMT=-lX11 -lXext $(PTHREAD_LIBS) -lm
-+STDSHLCUIMT=$(PTHREAD_LIBS) -lm
-+STDSHLGUIST=-lX11 -lXext -lm
-+STDSHLCUIST=-lm
-+
-+LIBSALCPPRT*=-Wl,--whole-archive -lsalcpprt -Wl,--no-whole-archive
-+
-+.IF "$(USE_STLP_DEBUG)" != ""
-+LIBSTLPORT=$(DYNAMIC) -lstlport_gcc_stldebug
-+LIBSTLPORTST=$(STATIC) -lstlport_gcc_stldebug $(DYNAMIC)
-+.ELSE # "$(USE_STLP_DEBUG)" != ""
-+LIBSTLPORT=$(DYNAMIC) -lstlport_gcc
-+LIBSTLPORTST=$(STATIC) -lstlport_gcc $(DYNAMIC)
-+.ENDIF # "$(USE_STLP_DEBUG)" != ""
-+
-+#FILLUPARC=$(STATIC) -lsupc++ $(DYNAMIC)
-+
-+# name of library manager
-+LIBMGR=ar
-+LIBFLAGS=-r
-+
-+# tool for generating import libraries
-+IMPLIB=
-+IMPLIBFLAGS=
-+
-+MAPSYM=
-+MAPSYMFLAGS=
-+
-+RC=irc
-+RCFLAGS=-fo$@ $(RCFILES)
-+RCLINK=
-+RCLINKFLAGS=
-+RCSETVERSION=
-+
-+# platform specific identifier for shared libs
-+DLLPRE=lib
-+DLLPOST=.so
-Index: solenv/inc/unxfbsdi.mk
-===================================================================
-RCS file: /cvs/tools/solenv/inc/unxfbsdi.mk,v
-retrieving revision 1.22
-retrieving revision 1.21.16.3
-diff -u -p -r1.22 -r1.21.16.3
---- solenv/inc/unxfbsdi.mk	5 Jul 2006 22:01:09 -0000	1.22
-+++ solenv/inc/unxfbsdi.mk	8 Jul 2006 04:06:30 -0000	1.21.16.3
-@@ -33,196 +33,15 @@
- #
- #*************************************************************************
- 
--# mk file for unxfbsdi
--ASM=
--AFLAGS=
--
--SOLAR_JAVA*=TRUE
--JAVAFLAGSDEBUG=-g
--
--# filter for supressing verbose messages from linker
--#not needed at the moment
--#LINKOUTPUT_FILTER=" |& $(SOLARENV)$/bin$/msg_filter"
--
--# _PTHREADS is needed for the stl
--CDEFS+=$(PTHREAD_CFLAGS) -DX86 -D_PTHREADS -D_REENTRANT -DNEW_SOLAR -D_USE_NAMESPACE=1 -DSTLPORT_VERSION=450
--
--# enable visibility define in "sal/types.h"
--.IF "$(HAVE_GCC_VISIBILITY_FEATURE)" == "TRUE"
--CDEFS += -DHAVE_GCC_VISIBILITY_FEATURE
--.ENDIF # "$(HAVE_GCC_VISIBILITY_FEATURE)" == "TRUE"
--
--# this is a platform with JAVA support
--.IF "$(SOLAR_JAVA)"!=""
--JAVADEF=-DSOLAR_JAVA
--.IF "$(debug)"==""
--JAVA_RUNTIME=-ljava
--.ELSE
--JAVA_RUNTIME=-ljava_g
--.ENDIF
--.ENDIF
-+#
-+# FreBSD/i386 specific defines
-+#
-+ 
-+CDEFS+=-DX86
- 
- # 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
- ARCH_FLAGS*=-mtune=pentiumpro
- 
--# name of C++ Compiler
--CXX*=g++
--# name of C Compiler
--CC*=gcc
--.IF "$(SYSBASE)"!=""
--CFLAGS_SYSBASE:=-isystem $(SYSBASE)$/usr$/include
--CXX+:=$(CFLAGS_SYSBASE)
--CC+:=$(CFLAGS_SYSBASE)
--.ENDIF          # "$(SYSBASE)"!=""
--CFLAGS+=-fmessage-length=0 -c
--
--# flags to enable build with symbols; required for crashdump feature
--.IF "$(ENABLE_SYMBOLS)"=="SMALL"
--CFLAGSENABLESYMBOLS=-g1
--.ELSE
--CFLAGSENABLESYMBOLS=-g # was temporarily commented out, reenabled before Beta
--
--.ENDIF
--
--# flags for the C++ Compiler
--CFLAGSCC= -pipe $(ARCH_FLAGS)
--# Flags for enabling exception handling
--CFLAGSEXCEPTIONS=-fexceptions -fno-enforce-eh-specs
--# Flags for disabling exception handling
--CFLAGS_NO_EXCEPTIONS=-fno-exceptions
--
--# -fpermissive should be removed as soon as possible
--CFLAGSCXX= -pipe $(ARCH_FLAGS)
--PICSWITCH:=-fpic
--.IF "$(HAVE_GCC_VISIBILITY_FEATURE)" == "TRUE"
--CFLAGSCXX += -fvisibility-inlines-hidden
--.ENDIF # "$(HAVE_GCC_VISIBILITY_FEATURE)" == "TRUE"
--
--# Compiler flags for compiling static object in single threaded environment with graphical user interface
--CFLAGSOBJGUIST=
--# Compiler flags for compiling static object in single threaded environment with character user interface
--CFLAGSOBJCUIST=
--# Compiler flags for compiling static object in multi threaded environment with graphical user interface
--CFLAGSOBJGUIMT=
--# Compiler flags for compiling static object in multi threaded environment with character user interface
--CFLAGSOBJCUIMT=
--# Compiler flags for compiling shared object in multi threaded environment with graphical user interface
--CFLAGSSLOGUIMT=$(PICSWITCH)
--# Compiler flags for compiling shared object in multi threaded environment with character user interface
--CFLAGSSLOCUIMT=$(PICSWITCH)
--# Compiler flags for profiling
--CFLAGSPROF=
--# Compiler flags for debugging
--CFLAGSDEBUG=-g
--CFLAGSDBGUTIL=
--# Compiler flags for enabling optimizations
--.IF "$(PRODUCT)"!=""
--CFLAGSOPT=-Os -fno-strict-aliasing		# optimizing for products
--.ELSE 	# "$(PRODUCT)"!=""
--CFLAGSOPT=   							# no optimizing for non products
--.ENDIF	# "$(PRODUCT)"!=""
--# Compiler flags for disabling optimizations
--CFLAGSNOOPT=-O0
--# Compiler flags for describing the output path
--CFLAGSOUTOBJ=-o
--
--CFLAGSWARNCC=-Wreturn-type
--.IF "$(PRODUCT)"!=""
--CFLAGSWARNCC+=-Wuninitialized # not supported without optimization
--.ENDIF
--CFLAGSWARNCXX=$(CFLAGSWARNCC) -Wno-ctor-dtor-privacy
--# -Wshadow does not work for C with nested uses of pthread_cleanup_push:
--CFLAGSWALLCC=-Wall -Wextra -Wendif-labels
--CFLAGSWALLCXX=$(CFLAGSWALLCC) -Wshadow -Wno-ctor-dtor-privacy
--CFLAGSWERRCC=-Werror
--
--# switches for dynamic and static linking
--STATIC		= -Wl,-Bstatic
--DYNAMIC		= -Wl,-Bdynamic
--
--# name of linker
--LINK*=$(CXX)
--LINKC*=$(CC)
--
--# default linker flags
--LINKFLAGSDEFS*=#-Wl,-z,defs
--LINKFLAGSRUNPATH*=-Wl,-rpath,\''$$ORIGIN'\'
--LINKFLAGS=-Wl,-z,combreloc $(LINKFLAGSDEFS) $(LINKFLAGSRUNPATH)
--
--# linker flags for linking applications
--LINKFLAGSAPPGUI= -Wl,-export-dynamic -Wl,--noinhibit-exec
--LINKFLAGSAPPCUI= -Wl,-export-dynamic -Wl,--noinhibit-exec
--
--# linker flags for linking shared libraries
--LINKFLAGSSHLGUI= -shared
--LINKFLAGSSHLCUI= -shared
--
--LINKFLAGSTACK=
--LINKFLAGSPROF=
--LINKFLAGSDEBUG=-g
--LINKFLAGSOPT=
--
--# linker flags for optimization (symbol hashtable)
--# for now, applied to symbol scoped libraries, only
--LINKFLAGSOPTIMIZE*=-Wl,-O1
--LINKVERSIONMAPFLAG=$(LINKFLAGSOPTIMIZE) -Wl,--version-script
--
--SONAME_SWITCH=-Wl,-h
--
--# Sequence of libs does matter !
--
--STDLIBCPP=-lstdc++
--
--# default objectfilenames to link
--STDOBJVCL=$(L)$/salmain.o
--STDOBJGUI=
--STDSLOGUI=
--STDOBJCUI=
--STDSLOCUI=
--
--# libraries for linking applications
--STDLIBCUIST=-lm
--STDLIBGUIMT=-lX11 $(PTHREAD_LIBS) -lm
--STDLIBCUIMT=$(PTHREAD_LIBS) -lm
--STDLIBGUIST=-lX11 -lm
--# libraries for linking shared libraries
--STDSHLGUIMT=-lX11 -lXext $(PTHREAD_LIBS) -lm
--STDSHLCUIMT=$(PTHREAD_LIBS) -lm
--STDSHLGUIST=-lX11 -lXext -lm
--STDSHLCUIST=-lm
--
--LIBSALCPPRT*=-Wl,--whole-archive -lsalcpprt -Wl,--no-whole-archive
--
--.IF "$(USE_STLP_DEBUG)" != ""
--LIBSTLPORT=$(DYNAMIC) -lstlport_gcc_stldebug
--LIBSTLPORTST=$(STATIC) -lstlport_gcc_stldebug $(DYNAMIC)
--.ELSE # "$(USE_STLP_DEBUG)" != ""
--LIBSTLPORT=$(DYNAMIC) -lstlport_gcc
--LIBSTLPORTST=$(STATIC) -lstlport_gcc $(DYNAMIC)
--.ENDIF # "$(USE_STLP_DEBUG)" != ""
--
--#FILLUPARC=$(STATIC) -lsupc++ $(DYNAMIC)
--
--# name of library manager
--LIBMGR=ar
--LIBFLAGS=-r
--
--# tool for generating import libraries
--IMPLIB=
--IMPLIBFLAGS=
--
--MAPSYM=
--MAPSYMFLAGS=
--
--RC=irc
--RCFLAGS=-fo$@ $(RCFILES)
--RCLINK=
--RCLINKFLAGS=
--RCSETVERSION=
--
- # platform specific identifier for shared libs
- DLLPOSTFIX=fi
--DLLPRE=lib
--DLLPOST=.so
--
+
 Index: solenv/inc/unxfbsdx.mk
 ===================================================================
 RCS file: solenv/inc/unxfbsdx.mk
@@ -620,3 +166,17 @@ diff -N solenv/inc/unxfbsdx.mk
 +
 +# platform specific identifier for shared libs
 +DLLPOSTFIX=fx
+Index: solenv/inc/unxfbsdi.mk
+===================================================================
+RCS file: /cvs/tools/solenv/inc/unxfbsdi.mk,v
+retrieving revision 1.23
+diff -u -r1.23 unxfbsdi.mk
+--- solenv/inc/unxfbsdi.mk	8 Jul 2006 03:16:08 -0000	1.23
++++ solenv/inc/unxfbsdi.mk	13 Jul 2006 10:55:23 -0000
+@@ -42,3 +42,6 @@
+ # 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
+ ARCH_FLAGS*=-mtune=pentiumpro
++
++# platform specific identifier for shared libs
++DLLPOSTFIX=fi
diff --git a/editors/openoffice.org-2-devel/files/patch-i67139 b/editors/openoffice.org-2-devel/files/patch-i67139
index b43a2035a9a..4b3eefc5a98 100644
--- a/editors/openoffice.org-2-devel/files/patch-i67139
+++ b/editors/openoffice.org-2-devel/files/patch-i67139
@@ -1,35 +1,27 @@
-Index: work/config_office/configure.in
+Index: config_office/set_soenv.in
 ===================================================================
-RCS file: /cvs/tools/config_office/configure.in,v
-retrieving revision 1.168
-diff -u -r1.168 configure.in
---- config_office/configure.in	5 Jul 2006 22:32:27 -0000	1.168
-+++ config_office/configure.in	8 Jul 2006 05:14:53 -0000
-@@ -1059,14 +1059,14 @@
- dnl ===================================================================
- dnl Check whether the chosen shell can be used.
- dnl ===================================================================
--if test "$with_use_shell" == "tcsh"; then
-+if test "$with_use_shell" = "tcsh"; then
-    AC_PATH_PROG(SHELLPATH, tcsh)
-    if test -z "$SHELLPATH"; then
-       AC_MSG_ERROR([tcsh not found in \$PATH])
-    else
-       SHELLPATH=`echo $SHELLPATH | $SED -n "s/\/tcsh//p"`
-    fi
--elif test "$with_use_shell" == "bash"; then
-+elif test "$with_use_shell" = "bash"; then
-    AC_PATH_PROG(SHELLPATH, bash)
-    if test -z "$SHELLPATH"; then
-       AC_MSG_ERROR([bash not found in \$PATH])
-Index: work/config_office/configure
+RCS file: /cvs/tools/config_office/set_soenv.in,v
+retrieving revision 1.107
+diff -u -r1.107 set_soenv.in
+--- config_office/set_soenv.in	5 Jul 2006 22:32:39 -0000	1.107
++++ config_office/set_soenv.in	8 Jul 2006 05:23:48 -0000
+@@ -1965,7 +1994,7 @@
+ open( OUT, ">$bootfile" ) ||
+ die "Cannot open $bootfile: $!\n";
+ print OUT "#!/bin/sh\n";
+-print OUT "export _ISBOOTSTRAP_=TRUE ; source $SRC_ROOT/$outfile.sh\n"; 
++print OUT "export _ISBOOTSTRAP_=TRUE ; . $SRC_ROOT/$outfile.sh\n"; 
+ close( OUT ) || print "Can't close $bootfile: $!";
+ system(`cat bootstrap.1 >> bootstrap`);
+ system(`chmod +x bootstrap`);
+Index: config_office/configure
 ===================================================================
 RCS file: /cvs/tools/config_office/configure,v
-retrieving revision 1.153
-diff -u -r1.153 configure
---- config_office/configure	6 Jul 2006 08:51:06 -0000	1.153
-+++ config_office/configure	8 Jul 2006 05:15:35 -0000
-@@ -3150,7 +3183,7 @@
+retrieving revision 1.154
+diff -u -r1.154 configure
+--- config_office/configure	10 Jul 2006 19:05:10 -0000	1.154
++++ config_office/configure	13 Jul 2006 11:32:02 -0000
+@@ -3183,7 +3183,7 @@
  
  
  
@@ -38,28 +30,36 @@ diff -u -r1.153 configure
     # Extract the first word of "tcsh", so it can be a program name with args.
  set dummy tcsh; ac_word=$2
  echo "$as_me:$LINENO: checking for $ac_word" >&5
-@@ -3197,7 +3230,7 @@
+@@ -3230,7 +3230,7 @@
     else
-       SHELLPATH=`echo $SHELLPATH | $SED -n "s/\/tcsh//p"`
+       SHELLPATH=`echo $SHELLPATH | $SED -n "s/\/tcsh$//p"`
     fi
 -elif test "$with_use_shell" == "bash"; then
 +elif test "$with_use_shell" = "bash"; then
     # Extract the first word of "bash", so it can be a program name with args.
  set dummy bash; ac_word=$2
  echo "$as_me:$LINENO: checking for $ac_word" >&5
-Index: config_office/set_soenv.in
+Index: config_office/configure.in
 ===================================================================
-RCS file: /cvs/tools/config_office/set_soenv.in,v
-retrieving revision 1.107
-diff -u -r1.107 set_soenv.in
---- config_office/set_soenv.in	5 Jul 2006 22:32:39 -0000	1.107
-+++ config_office/set_soenv.in	8 Jul 2006 05:23:48 -0000
-@@ -1965,7 +1994,7 @@
- open( OUT, ">$bootfile" ) ||
- die "Cannot open $bootfile: $!\n";
- print OUT "#!/bin/sh\n";
--print OUT "export _ISBOOTSTRAP_=TRUE ; source $SRC_ROOT/$outfile.sh\n"; 
-+print OUT "export _ISBOOTSTRAP_=TRUE ; . $SRC_ROOT/$outfile.sh\n"; 
- close( OUT ) || print "Can't close $bootfile: $!";
- system(`cat bootstrap.1 >> bootstrap`);
- system(`chmod +x bootstrap`);
+RCS file: /cvs/tools/config_office/configure.in,v
+retrieving revision 1.169
+diff -u -r1.169 configure.in
+--- config_office/configure.in	10 Jul 2006 19:00:12 -0000	1.169
++++ config_office/configure.in	13 Jul 2006 11:32:04 -0000
+@@ -1059,14 +1059,14 @@
+ dnl ===================================================================
+ dnl Check whether the chosen shell can be used.
+ dnl ===================================================================
+-if test "$with_use_shell" == "tcsh"; then
++if test "$with_use_shell" = "tcsh"; then
+    AC_PATH_PROG(SHELLPATH, tcsh)
+    if test -z "$SHELLPATH"; then
+       AC_MSG_ERROR([tcsh not found in \$PATH])
+    else
+       SHELLPATH=`echo $SHELLPATH | $SED -n "s/\/tcsh$//p"`
+    fi
+-elif test "$with_use_shell" == "bash"; then
++elif test "$with_use_shell" = "bash"; then
+    AC_PATH_PROG(SHELLPATH, bash)
+    if test -z "$SHELLPATH"; then
+       AC_MSG_ERROR([bash not found in \$PATH])