- up

[packages/libreoffice.git] / openoffice-nostlport.patch

diff -Nur oo_641_src/config_office/configure.in oo_641_src.new/config_office/configure.in
--- oo_641_src/config_office/configure.in	Mon Nov 12 22:45:53 2001
+++ oo_641_src.new/config_office/configure.in	Sun Dec 16 03:12:50 2001
@@ -23,13 +23,6 @@
                           
                           Usage: --with-gcc-home=<absolute path to gcc home>
 ],,)
-AC_ARG_WITH(stlport4-home,
-[  --with-stlport4-home    The location that STLport4 is installed in. The STL
-                          header files are assumed to be in stlport4-home/stlport
-                          and the STLport4 library in stlport4-home/lib.
-
-                          Usage: --with-stlport4-home=<absolute path to stlport4 home>
-],,)
 AC_ARG_WITH(jdk-home,
 [  --with-jdk-home         if you have installed JDK 1.2.2, on your system,
                           please supply the path here.
@@ -104,12 +97,7 @@
 
                           Usage: --with-unzip-home=<path to unzip.exe directory>
 ],,)
-AC_ARG_ENABLE(sgistl,
-[  --enable-sgistl         for IRIX users, use this option option to build OpenOffice 
-                          using SGI's STL.
 
-                          Usage: --enable-check-only=yes
-],,)
 dnl ===================================================================
 dnl Message.
 dnl ===================================================================
@@ -526,7 +514,6 @@
       AC_MSG_RESULT([checked])
    fi
 fi
-
 dnl **************************************************************
 dnl Testing for required  Solaris and workshop compiler patches...
 dnl **************************************************************
@@ -639,77 +626,6 @@
 fi
 
 dnl ===================================================================
-dnl Checks for SGI STL
-dnl ===================================================================
-if test -n "$enable_sgistl"; then
-	if test "$_os" = "IRIX" -o "$_os" = "IRIX64"; then
-		AC_MSG_CHECKING([for SGI STL])
-		if test -d /usr/include/CC ; then
-			AC_MSG_RESULT([yes.])
-
-		else
-			AC_MSG_RESULT([not found.])
-		fi
-	else
-		AC_MSG_ERROR([IRIX not found.])
-	fi
-else
-
-dnl ===================================================================
-dnl Checks for STLPORT4
-dnl ===================================================================
-AC_MSG_CHECKING([for STLport4 headers])
-if test -d "$with_stlport4_home"; then
-	STLPORT4=$with_stlport4_home
-        if test "$_os" != "WINNT"; then
-           AC_TRY_CPP($STLPORT4/stlport/hash_map, AC_MSG_RESULT([checked.]), AC_MSG_ERROR([STLport4 headers not found.]))
-        else
-           dnl AC_TRY_CPP doesn't work on Windows because C++ preprocessor is not found by autoconf.
-           if test -f "$STLPORT4/stlport/hash_map"; then
-              AC_MSG_RESULT([checked.])
-           else
-              AC_MSG_ERROR([STLport4 headers not found.])
-           fi
-        fi
-        if test "$_os" != "WINNT"; then
-		AC_MSG_CHECKING([for STLport4 libraries])
-		if test "$_os" = "SunOS"; then
-			if test -f "$STLPORT4/lib/libstlport_sunpro.so"; then
-				AC_MSG_RESULT([checked])
-			else
-				AC_MSG_ERROR([STLport4 libraries not found])
-			fi
-		elif test "$_os" = "Darwin"; then
-			if test -f "$STLPORT4/lib/libstlport_gcc.dylib"; then
-				AC_MSG_RESULT([checked])
-			else
-				AC_MSG_ERROR([STLport4 libraries not found])
-			fi
-		elif test "$_os" = "IRIX" -o "$_os" = "IRIX64"; then
-			if test -f "$STLPORT4/lib/libstlport_mipspro_41.so"; then
-				AC_MSG_RESULT([checked])
-			else
-				if test -f "$STLPORT4/lib/libstlport_gcc.so"; then
-					AC_MSG_RESULT([checked])
-				else
-					AC_MSG_ERROR([STLport4 libraries not found])
-				fi
-			fi
-		else
-			if test -f "$STLPORT4/lib/libstlport_gcc.so"; then
-				AC_MSG_RESULT([checked])
-			else
-				AC_MSG_ERROR([STLport4 libraries not found])
-			fi
-		fi
-	fi
-else
-	AC_MSG_WARN([No STLPORT4 directory specified with the --with-stlport4-home option. Will build the one provided.])
-dnl AC_MSG_ERROR([No STLPORT4 directory found. You must use the --with-stlport4-home option.])
-fi
-
-fi
-dnl ===================================================================
 dnl Checks for JDK.
 dnl ===================================================================
 JAVA_HOME=; export JAVA_HOME
@@ -1016,7 +932,7 @@
    TCSH="NO_TCSH"
 fi
 if test -z "$STLPORT4"; then 
-   STLPORT4="NO_STLPORT4"
+   STLPORT4="/no/_/stlport4"
 fi
 if test -z "$PERL"; then
    PERL="NO_PERL"
diff -Nur oo_641_src/config_office/set_soenv.1 oo_641_src.new/config_office/set_soenv.1
--- oo_641_src/config_office/set_soenv.1	Tue Nov 20 18:26:33 2001
+++ oo_641_src.new/config_office/set_soenv.1	Sun Dec 16 03:22:36 2001
@@ -588,7 +588,7 @@
 {  if ( $ARGV[ 0 ] eq $no_gcc) 
    {  AddWarning( "set_soenv", "Autoconf did not find correct gcc compiler, prompted for value" );
       printf "Did you build gcc 2.95.2 from source using the --prefix and --enable-shared flags (y/n)?: ";
-      my $answer = <STDIN>; 
+      my $answer = "n"; 
       chomp( $answer );
       if ( $answer eq "y" || $answer eq "Y" ) 
       {  $GCC_HOME = GetValue( "Please enter the gcc 2.95.2 --prefix value: " );
diff -Nur oo_641_src/solenv/inc/unxlngi3.mk oo_641_src.new/solenv/inc/unxlngi3.mk
--- oo_641_src/solenv/inc/unxlngi3.mk	Fri Oct 19 17:27:08 2001
+++ oo_641_src.new/solenv/inc/unxlngi3.mk	Sun Dec 16 02:49:45 2001
@@ -91,10 +91,7 @@
 # flags for C and C++ Compiler
 # do not use standard header search paths
 # if installed elsewhere
-.IF "$(BUILD_SOSL)"!=""
-CFLAGS=-nostdinc
-.ENDIF
-CFLAGS+=-c $(INCLUDE)
+CFLAGS=-c $(INCLUDE)
 # flags for the C++ Compiler
 CFLAGSCC= -pipe -mpentiumpro
 # Flags for enabling exception handling
@@ -185,8 +182,8 @@
 STDSHLGUIMT=-lXaw -lXt -lX11 -lXext -ldl -lpthread -lm
 STDSHLCUIMT=-ldl -lpthread -lm
 
-LIBSTLPORT=$(DYNAMIC) -lstlport_gcc
-LIBSTLPORTST=$(STATIC) -lstlport_gcc $(DYNAMIC)
+LIBSTLPORT=$(DYNAMIC) $(STDLIBCPP)
+LIBSTLPORTST=$(STATIC) $(STDLIBCPP) $(DYNAMIC)
 
 
 # name of library manager
diff -Nur oo_641_src/stlport/makefile.mk oo_641_src.new/stlport/makefile.mk
--- oo_641_src/stlport/makefile.mk	Mon Nov 19 18:06:09 2001
+++ oo_641_src.new/stlport/makefile.mk	Sun Dec 16 03:34:28 2001
@@ -70,7 +70,7 @@
         @echo "         An already available installatin of STLport has been chosen in the configure process."
         @echo "         Therefore the version provided here does not need to be built in addition."
 
-	+$(COPY) $(STLPORT4)$/lib$/*stlport*$(DLLPOST) $(DLLDEST)
+#	+$(COPY) $(STLPORT4)$/lib$/*stlport*$(DLLPOST) $(DLLDEST)
 .ENDIF
 
 # --- Settings -----------------------------------------------------