diff options
Diffstat (limited to 'editors/openoffice-1.0/files/patch-config_office+configure.in')
| -rw-r--r-- | editors/openoffice-1.0/files/patch-config_office+configure.in | 58 |
1 files changed, 12 insertions, 46 deletions
diff --git a/editors/openoffice-1.0/files/patch-config_office+configure.in b/editors/openoffice-1.0/files/patch-config_office+configure.in index 94d4b1cf08dc..e0af7351d24e 100644 --- a/editors/openoffice-1.0/files/patch-config_office+configure.in +++ b/editors/openoffice-1.0/files/patch-config_office+configure.in @@ -1,19 +1,11 @@ ---- configure.in.orig Thu Jan 16 13:42:46 2003 -+++ configure.in Sat Jan 25 18:24:08 2003 -@@ -89,6 +89,12 @@ - - Usage: --enable-check-only=yes - ],,) -+AC_ARG_ENABLE(linuxjdk, -+[ --enable-linuxjdk Use this option option if you like to use -+ the linux-jdk instead of the native jdk. -+ -+ Usage: --enable-linuxjdk -+],,) - AC_ARG_ENABLE(macos9, - [ --enable-macos9 Use this option option if you want to generate a - macos9 environment on macosx. -@@ -352,10 +358,7 @@ +Index: config_office/configure.in +=================================================================== +RCS file: /cvs/tools/config_office/configure.in,v +retrieving revision 1.41.2.18 +diff -u -r1.41.2.18 configure.in +--- config_office/configure.in 12 Mar 2003 11:38:41 -0000 1.41.2.18 ++++ config_office/configure.in 10 Jul 2005 03:38:11 -0000 +@@ -383,10 +383,7 @@ if test "$COMPATH" != "NO_GCC"; then AC_MSG_RESULT([checked (gcc $_gcc_version)]) fi @@ -24,8 +16,8 @@ +fi dnl =================================================================== - dnl Search all the common names for GNU make -@@ -553,14 +556,27 @@ + dnl Test the solaris compiler version +@@ -545,14 +542,27 @@ fi dnl =================================================================== @@ -34,10 +26,10 @@ dnl =================================================================== +if test "$_os" = "FreeBSD" && test "$CC" != "cc"; then +if test "$GXX" = "yes"; then -+ if test -n "$enable_gcc3"; then ++ if test "$_gcc_major" = "3" ; then + _gccincname1="g++-v3" + else -+ _gccincname1="g++-3" ++ _gccincname1="g++-3" #not checked + fi + _gcc_include_path=".." + _gxx_include_path="$_gcc_include_path/$_gccincname1" @@ -57,29 +49,3 @@ dnl =================================================================== dnl Extra checking for the SUN OS compiler -@@ -1222,12 +1238,16 @@ - else - with_lang=","$with_lang"," - fi -- - if test -n "$enable_debug"; then - ENABLE_DEBUG="TRUE" - else - ENABLE_DEBUG="FALSE" - fi -+if test -n "$enable_linuxjdk"; then -+ USE_LINUXJDK="TRUE" -+else -+ USE_LINUXJDK="FALSE" -+fi - - dnl =================================================================== - dnl Bits to substitute into set_soenv.in -@@ -1272,6 +1292,7 @@ - AC_SUBST(PTHREAD_CFLAGS) - AC_SUBST(PTHREAD_LIBS) - AC_SUBST(ENABLE_DEBUG) -+AC_SUBST(USE_LINUXJDK) - - AC_OUTPUT([set_soenv]) - |