--- oo_1.0.1_src/config_office/set_soenv.1.bak	2002-09-19 10:20:05.000000000 +0200
+++ oo_1.0.1_src/config_office/set_soenv.1	2002-09-19 10:20:31.000000000 +0200
@@ -389,6 +390,17 @@
       $JRETOOLKITDIR  = '$JAVA_HOME'.$ds."jre".$ds."lib".$ds."ppc".$ds."classic";
       $JRETHREADDIR   = '$JAVA_HOME'.$ds."jre".$ds."lib".$ds."ppc".$ds."native_threads";
    }
+   elsif ($machine_type eq "s390")
+   {  print "Setting Linux S/390 specific values... ";
+      $outfile        = "LinuxS390Env.Set";
+      $CPU            = "3";
+      $CPUNAME        = "S390";
+      $DLLSUFFIX      = "l3";
+      $OUTPATH        = "unxlngs390";
+      $JRELIBDIR      = '$JAVA_HOME'.$ds."jre".$ds."lib".$ds."s390";
+      $JRETOOLKITDIR  = '$JAVA_HOME'.$ds."jre".$ds."lib".$ds."s390".$ds."client";
+      $JRETHREADDIR   = '$JAVA_HOME'.$ds."jre".$ds."lib".$ds."s390".$ds."native_threads";
+       }
    elsif ($machine_type eq "alpha") 
    {  print "Setting Linux Alpha specific values... ";
       $outfile        = "LinuxAlphaEnv.Set"; 
diff -urN oo_1.0.1_src/solenv/inc.bak/unx.mk oo_1.0.1_src/solenv/inc/unx.mk
--- oo_1.0.1_src/solenv/inc.bak/unx.mk	2002-09-19 10:05:25.000000000 +0200
+++ oo_1.0.1_src/solenv/inc/unx.mk	2002-09-19 10:07:35.000000000 +0200
@@ -124,6 +124,10 @@
 .INCLUDE : unxlngppc4.mk 
 .ENDIF 
  
+.IF "$(COM)$(CVER)$(OS)$(CPU)$(GLIBC)" == "GCCC300LINUX32REDHAT60" 
+.INCLUDE : unxlngs3904.mk 
+.ENDIF 
+ 
 .IF "$(COM)$(OS)$(CPU)$(GLIBC)" == "GCCLINUXR2REDHAT60"
 .INCLUDE : unxlngr.mk
 .ENDIF
diff -urN oo_1.0.1_src/solenv/inc.bak/unxlngs3904.mk oo_1.0.1_src/solenv/inc/unxlngs3904.mk
--- oo_1.0.1_src/solenv/inc.bak/unxlngs3904.mk	1970-01-01 01:00:00.000000000 +0100
+++ oo_1.0.1_src/solenv/inc/unxlngs3904.mk	2002-09-19 10:08:47.000000000 +0200
@@ -0,0 +1,228 @@
+#*************************************************************************
+#
+#   $RCSfile: unxlngs3904.mk,v $
+#
+#   $Revision: 1.1.2.3 $
+#
+#   last change: $Author: khendricks $ $Date: 2002/06/07 14:11:58 $
+#
+#   The Contents of this file are made available subject to the terms of
+#   either of the following licenses
+#
+#          - GNU Lesser General Public License Version 2.1
+#          - Sun Industry Standards Source License Version 1.1
+#
+#   Sun Microsystems Inc., October, 2000
+#
+#   GNU Lesser General Public License Version 2.1
+#   =============================================
+#   Copyright 2000 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
+#
+#
+#   Sun Industry Standards Source License Version 1.1
+#   =================================================
+#   The contents of this file are subject to the Sun Industry Standards
+#   Source License Version 1.1 (the "License"); You may not use this file
+#   except in compliance with the License. You may obtain a copy of the
+#   License at http://www.openoffice.org/license.html.
+#
+#   Software provided under this License is provided on an "AS IS" basis,
+#   WITHOUT WARRANTY OF ANY KIND, EITHER EXPRESSED OR IMPLIED, INCLUDING,
+#   WITHOUT LIMITATION, WARRANTIES THAT THE SOFTWARE IS FREE OF DEFECTS,
+#   MERCHANTABLE, FIT FOR A PARTICULAR PURPOSE, OR NON-INFRINGING.
+#   See the License for the specific provisions governing your rights and
+#   obligations concerning the Software.
+#
+#   The Initial Developer of the Original Code is: Sun Microsystems, Inc.
+#
+#   Copyright: 2000 by Sun Microsystems, Inc.
+#
+#   All Rights Reserved.
+#
+#   Contributor(s): _______________________________________
+#
+#
+#
+#*************************************************************************
+
+# mk file for linux s390 using gcc 3.X
+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+=-DGLIBC=2 -D_PTHREADS -D_REENTRANT -DNEW_SOLAR -D_USE_NAMESPACE=1 -DSTLPORT_VERSION=400
+
+# 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 
+
+# name of C++ Compiler
+CC=$(CXXCOMP)
+# name of C Compiler
+cc=$(CCCOMP)
+
+# flags for C and C++ Compiler
+# do not use standard header search paths
+# if installed elsewhere
+.IF "$(BUILD_SOSL)"!=""
+CFLAGS= 
+.ENDIF
+CFLAGS+=-fsigned-char -fmessage-length=0 -c $(INCLUDE)
+
+# flags for the C++ Compiler
+CFLAGSCC= -fsigned-char -pipe 
+
+# 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= -fsigned-char -pipe -fno-for-scope -fpermissive -fno-rtti 
+CFLAGSCXX= -fsigned-char -pipe -fno-for-scope -fpermissive
+
+
+# Compiler flags for compiling static object in single threaded environment with graphical user interface
+CFLAGSOBJGUIST=-fPIC
+# Compiler flags for compiling static object in single threaded environment with character user interface
+CFLAGSOBJCUIST=-fPIC
+# Compiler flags for compiling static object in multi threaded environment with graphical user interface
+CFLAGSOBJGUIMT=-fPIC
+# Compiler flags for compiling static object in multi threaded environment with character user interface
+CFLAGSOBJCUIMT=-fPIC
+# Compiler flags for compiling shared object in multi threaded environment with graphical user interface
+CFLAGSSLOGUIMT=-fPIC
+# Compiler flags for compiling shared object in multi threaded environment with character user interface
+CFLAGSSLOCUIMT=-fPIC
+
+# Compiler flags for profiling
+CFLAGSPROF=
+
+# Compiler flags for debugging
+CFLAGSDEBUG=-g
+CFLAGSDBGUTIL=
+
+# Compiler flags for enabling optimazations
+#CFLAGSOPT=-O2 -fno-schedule-insns -fno-strict-aliasing -fno-schedule-insns2
+CFLAGSOPT=-O2 -fno-strict-aliasing
+
+# Compiler flags for disabling optimazations
+# don't change - require dto work around optimization bugs
+CFLAGSNOOPT=-O0
+
+# Compiler flags for discibing the output path
+CFLAGSOUTOBJ=-o
+
+# Enable all warnings
+CFLAGSWALL=-Wall
+
+# Set default warn level
+CFLAGSDFLTWARN=-w
+
+# switches for dynamic and static linking
+STATIC		= -Wl,-Bstatic
+DYNAMIC		= -Wl,-Bdynamic
+
+# name of linker
+LINK=$(CXXCOMP)
+# default linker flags
+LINKFLAGS=
+
+# 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=
+
+.IF "$(NO_BSYMBOLIC)"==""
+.IF "$(PRJNAME)" != "envtest"
+LINKFLAGSSHLGUI+=-Wl,-Bsymbolic
+LINKFLAGSSHLCUI+=-Wl,-Bsymbolic
+.ENDIF
+.ENDIF				# "$(NO_BSYMBOLIC)"==""
+
+LINKVERSIONMAPFLAG=-Wl,--version-script
+
+SONAME_SWITCH=-Wl,-h
+
+# Sequence of libs does matter !
+
+STDLIBCPP=-lstdc++
+
+# default objectfilenames to link
+STDOBJGUI=
+STDSLOGUI=
+STDOBJCUI=
+STDSLOCUI=
+
+# libraries for linking applications
+STDLIBCUIST=-ldl -lm
+STDLIBGUIMT=-lX11 -ldl -lpthread -lm
+STDLIBCUIMT=-ldl -lpthread -lm
+STDLIBGUIST=-lX11 -ldl -lm
+# libraries for linking shared libraries
+STDSHLGUIMT=-lX11 -lXext -ldl -lpthread -lm
+STDSHLCUIMT=-ldl -lpthread -lm
+
+LIBSTLPORT=$(DYNAMIC) -lstlport_gcc -lstdc++
+LIBSTLPORTST=$(STATIC) -lstlport_gcc $(DYNAMIC)
+
+#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=l3
+DLLPRE=lib
+DLLPOST=.so
--- oo_1.0.1_src/psprint/source/fontsubset/sft.h.bak	2002-09-19 10:31:13.000000000 +0200
+++ oo_1.0.1_src/psprint/source/fontsubset/sft.h	2002-09-15 21:57:35.000000000 +0200
@@ -122,6 +122,12 @@
 #endif
 #endif
 
+#if defined(__s390__)
+#ifndef G_BIG_ENDIAN
+#define G_BIG_ENDIAN
+#endif
+#endif
+
 #ifdef __i386
 #ifndef G_LITTLE_ENDIAN
 #define G_LITTLE_ENDIAN
--- oo_1.0.1_src/tools/inc/solar.h.bak	2002-09-19 10:33:20.000000000 +0200
+++ oo_1.0.1_src/tools/inc/solar.h	2002-09-19 10:33:41.000000000 +0200
@@ -416,6 +416,7 @@
 #define SYSTEM_UNXBSDS		25
 #define SYSTEM_UNXLNXR		26
 #define SYSTEM_UNXBSDP		27
+#define SYSTEM_UNXLNX3         28
 
 #if defined WNT
   #define __DLLEXTENSION "mi"
@@ -454,6 +455,9 @@
 #elif defined LINUX && defined POWERPC
   #define __DLLEXTENSION "lp.so"
   #define SYSTEM_ID 		SYSTEM_UNXLNXP
+#elif defined LINUX && defined S390
+  #define __DLLEXTENSION "l3.so"
+  #define SYSTEM_ID 		SYSTEM_UNXLNX3
 #elif defined LINUX && defined ARM32
   #define __DLLEXTENSION "lr.so"
   #define SYSTEM_ID 	SYSTEM_UNXLNXR
--- oo_1.0.1_src/setup2/source/custom/jvmsetup/unx/jvmscan.cxx.bak	2002-09-19 10:39:15.000000000 +0200
+++ oo_1.0.1_src/setup2/source/custom/jvmsetup/unx/jvmscan.cxx	2002-09-19 10:39:47.000000000 +0200
@@ -111,6 +111,8 @@
 #define ARCH "ppc"
 #elif defined (MIPS)
 #define ARCH "mips"
+#elif defined (S390)
+#define ARCH "s390"
 #else
 #error unknown plattform
 #endif
--- oo_1.0.1_src/config_office/configure.in.bak	2002-11-27 08:04:30.000000000 +0100
+++ oo_1.0.1_src/config_office/configure.in	2002-11-27 08:05:41.000000000 +0100
@@ -829,6 +829,15 @@
    if test "$_os" = "Linux" -a "$_machine_type" = "armv4l"; then
       _jdk_middle=`echo $_jdk | $AWK -F. '{ if ($2 != 2) print "false"; else print "true" }'`
    fi
+   if test "$_os" = "Linux" -a "$_machine_type" = "s390"; then
+      _jdk_middle=`echo $_jdk | $AWK -F. '{ if ($2 != 2) print "false"; else print "true" }'`
+      _jdk_middle3=`echo $_jdk | $AWK -F. '{ if ($2 != 3) print "false"; else print "true" }'`
+
+      if test "$_jdk_middle" = "false" -a "$_jdk_middle3" = "true"; then
+         _jdk_minor="true"
+      fi
+
+   fi
    if test "$_os" = "WINNT"; then
       _jdk_middle=`echo $_jdk | $AWK -F. '{ if ($2 != 2) print "false"; else print "true" }'`
       _jdk_middle3=`echo $_jdk | $AWK -F. '{ if ($2 != 3) print "false"; else print "true" }'`
@@ -863,6 +872,9 @@
          if test "$_machine_type" = "armv4l"; then
             _jdk_minor=`echo $_jdk | $AWK -F. '{ if ($3 != 2) print "false"; else print "true" }'`
          fi 
+         if test "$_machine_type" = "s390"; then
+            _jdk_minor=`echo $_jdk | $AWK -F. '{ if ($3 != 2) print "false"; else print "true" }'`
+         fi 
       fi
       if test "$_os" = "OSF1"; then
          _jdk_minor=`echo $_jdk | $AWK -F- '{print $1}' | $AWK -F. '{ if ($3 != 2) print "false"; else print "true" }'`