1 diff -Nur oo_641_src/config_office/configure.in oo_641_src.new/config_office/configure.in
2 --- oo_641_src/config_office/configure.in Mon Nov 12 22:45:53 2001
3 +++ oo_641_src.new/config_office/configure.in Sun Dec 16 03:12:50 2001
6 Usage: --with-gcc-home=<absolute path to gcc home>
8 -AC_ARG_WITH(stlport4-home,
9 -[ --with-stlport4-home The location that STLport4 is installed in. The STL
10 - header files are assumed to be in stlport4-home/stlport
11 - and the STLport4 library in stlport4-home/lib.
13 - Usage: --with-stlport4-home=<absolute path to stlport4 home>
16 [ --with-jdk-home if you have installed JDK 1.2.2, on your system,
17 please supply the path here.
20 Usage: --with-unzip-home=<path to unzip.exe directory>
22 -AC_ARG_ENABLE(sgistl,
23 -[ --enable-sgistl for IRIX users, use this option option to build OpenOffice
26 - Usage: --enable-check-only=yes
28 dnl ===================================================================
30 dnl ===================================================================
32 AC_MSG_RESULT([checked])
36 dnl **************************************************************
37 dnl Testing for required Solaris and workshop compiler patches...
38 dnl **************************************************************
42 dnl ===================================================================
43 -dnl Checks for SGI STL
44 -dnl ===================================================================
45 -if test -n "$enable_sgistl"; then
46 - if test "$_os" = "IRIX" -o "$_os" = "IRIX64"; then
47 - AC_MSG_CHECKING([for SGI STL])
48 - if test -d /usr/include/CC ; then
49 - AC_MSG_RESULT([yes.])
52 - AC_MSG_RESULT([not found.])
55 - AC_MSG_ERROR([IRIX not found.])
59 -dnl ===================================================================
60 -dnl Checks for STLPORT4
61 -dnl ===================================================================
62 -AC_MSG_CHECKING([for STLport4 headers])
63 -if test -d "$with_stlport4_home"; then
64 - STLPORT4=$with_stlport4_home
65 - if test "$_os" != "WINNT"; then
66 - AC_TRY_CPP($STLPORT4/stlport/hash_map, AC_MSG_RESULT([checked.]), AC_MSG_ERROR([STLport4 headers not found.]))
68 - dnl AC_TRY_CPP doesn't work on Windows because C++ preprocessor is not found by autoconf.
69 - if test -f "$STLPORT4/stlport/hash_map"; then
70 - AC_MSG_RESULT([checked.])
72 - AC_MSG_ERROR([STLport4 headers not found.])
75 - if test "$_os" != "WINNT"; then
76 - AC_MSG_CHECKING([for STLport4 libraries])
77 - if test "$_os" = "SunOS"; then
78 - if test -f "$STLPORT4/lib/libstlport_sunpro.so"; then
79 - AC_MSG_RESULT([checked])
81 - AC_MSG_ERROR([STLport4 libraries not found])
83 - elif test "$_os" = "Darwin"; then
84 - if test -f "$STLPORT4/lib/libstlport_gcc.dylib"; then
85 - AC_MSG_RESULT([checked])
87 - AC_MSG_ERROR([STLport4 libraries not found])
89 - elif test "$_os" = "IRIX" -o "$_os" = "IRIX64"; then
90 - if test -f "$STLPORT4/lib/libstlport_mipspro_41.so"; then
91 - AC_MSG_RESULT([checked])
93 - if test -f "$STLPORT4/lib/libstlport_gcc.so"; then
94 - AC_MSG_RESULT([checked])
96 - AC_MSG_ERROR([STLport4 libraries not found])
100 - if test -f "$STLPORT4/lib/libstlport_gcc.so"; then
101 - AC_MSG_RESULT([checked])
103 - AC_MSG_ERROR([STLport4 libraries not found])
108 - AC_MSG_WARN([No STLPORT4 directory specified with the --with-stlport4-home option. Will build the one provided.])
109 -dnl AC_MSG_ERROR([No STLPORT4 directory found. You must use the --with-stlport4-home option.])
113 -dnl ===================================================================
115 dnl ===================================================================
116 JAVA_HOME=; export JAVA_HOME
120 if test -z "$STLPORT4"; then
121 - STLPORT4="NO_STLPORT4"
122 + STLPORT4="/no/_/stlport4"
124 if test -z "$PERL"; then
126 diff -Nur oo_641_src/config_office/set_soenv.1 oo_641_src.new/config_office/set_soenv.1
127 --- oo_641_src/config_office/set_soenv.1 Tue Nov 20 18:26:33 2001
128 +++ oo_641_src.new/config_office/set_soenv.1 Sun Dec 16 03:22:36 2001
130 { if ( $ARGV[ 0 ] eq $no_gcc)
131 { AddWarning( "set_soenv", "Autoconf did not find correct gcc compiler, prompted for value" );
132 printf "Did you build gcc 2.95.2 from source using the --prefix and --enable-shared flags (y/n)?: ";
133 - my $answer = <STDIN>;
136 if ( $answer eq "y" || $answer eq "Y" )
137 { $GCC_HOME = GetValue( "Please enter the gcc 2.95.2 --prefix value: " );
138 diff -Nur oo_641_src/solenv/inc/unxlngi3.mk oo_641_src.new/solenv/inc/unxlngi3.mk
139 --- oo_641_src/solenv/inc/unxlngi3.mk Fri Oct 19 17:27:08 2001
140 +++ oo_641_src.new/solenv/inc/unxlngi3.mk Sun Dec 16 02:49:45 2001
142 # flags for C and C++ Compiler
143 # do not use standard header search paths
144 # if installed elsewhere
145 -.IF "$(BUILD_SOSL)"!=""
148 -CFLAGS+=-c $(INCLUDE)
149 +CFLAGS=-c $(INCLUDE)
150 # flags for the C++ Compiler
151 CFLAGSCC= -pipe -mpentiumpro
152 # Flags for enabling exception handling
154 STDSHLGUIMT=-lXaw -lXt -lX11 -lXext -ldl -lpthread -lm
155 STDSHLCUIMT=-ldl -lpthread -lm
157 -LIBSTLPORT=$(DYNAMIC) -lstlport_gcc
158 -LIBSTLPORTST=$(STATIC) -lstlport_gcc $(DYNAMIC)
159 +LIBSTLPORT=$(DYNAMIC) $(STDLIBCPP)
160 +LIBSTLPORTST=$(STATIC) $(STDLIBCPP) $(DYNAMIC)
163 # name of library manager
164 diff -Nur oo_641_src/stlport/makefile.mk oo_641_src.new/stlport/makefile.mk
165 --- oo_641_src/stlport/makefile.mk Mon Nov 19 18:06:09 2001
166 +++ oo_641_src.new/stlport/makefile.mk Sun Dec 16 03:34:28 2001
168 @echo " An already available installatin of STLport has been chosen in the configure process."
169 @echo " Therefore the version provided here does not need to be built in addition."
171 - +$(COPY) $(STLPORT4)$/lib$/*stlport*$(DLLPOST) $(DLLDEST)
172 +# +$(COPY) $(STLPORT4)$/lib$/*stlport*$(DLLPOST) $(DLLDEST)
175 # --- Settings -----------------------------------------------------