diff options
| author | nobody <nobody@gnome.org> | 2003-11-25 16:59:58 +0000 |
|---|---|---|
| committer | nobody <nobody@gnome.org> | 2003-11-25 16:59:58 +0000 |
| commit | 1f40d46ca38fbe439af7b121d4dcc203fca4ca2d (patch) | |
| tree | 39147bc89bf26af58b9c83d2376e1a085a066dc1 | |
| parent | bdb17b6c7d36d0ed46cbad6c67a229d1d30a0f0a (diff) | |
This commit was manufactured by cvs2svn to create tagOOO_BUILD_1_1_47_1
'OOO_BUILD_1_1_47_1'.
| -rwxr-xr-x | bin/build-ooo | 2 | ||||
| -rw-r--r-- | configure.in | 2 | ||||
| -rw-r--r-- | patches/OOO_1_1/allow-no-jdk.diff | 27 |
3 files changed, 24 insertions, 7 deletions
diff --git a/bin/build-ooo b/bin/build-ooo index f392aab16..350fbd7f4 100755 --- a/bin/build-ooo +++ b/bin/build-ooo @@ -282,7 +282,7 @@ rm -f config.cache echo "configuring ..."; autoconf || exit 1; -./configure $CONFIGURE_OPTIONS || exit 1; +./configure $CONFIGURE_OPTIONS || echo "Configure failed - it does that on RH 7.3" # Final build preparation diff --git a/configure.in b/configure.in index 7991250d2..ba89466ba 100644 --- a/configure.in +++ b/configure.in @@ -1,7 +1,7 @@ AC_INIT(bin/build-ooo) AC_PREREQ(2.12) AC_PREFIX_DEFAULT(/usr) -AM_INIT_AUTOMAKE(ooo-build, 1.1.47) +AM_INIT_AUTOMAKE(ooo-build, 1.1.47.1) AC_WITH(tag, [ diff --git a/patches/OOO_1_1/allow-no-jdk.diff b/patches/OOO_1_1/allow-no-jdk.diff index e848b81c2..1b1247557 100644 --- a/patches/OOO_1_1/allow-no-jdk.diff +++ b/patches/OOO_1_1/allow-no-jdk.diff @@ -1,6 +1,6 @@ ---- config_office/configure.in.orig 2003-09-22 11:14:29.000000000 -0700 -+++ config_office/configure.in 2003-09-22 11:33:19.000000000 -0700 -@@ -1124,66 +1124,79 @@ +--- config_office/configure.in.cool 2003-11-24 12:59:05.000000000 -0500 ++++ config_office/configure.in 2003-11-24 13:01:04.000000000 -0500 +@@ -1163,66 +1163,79 @@ dnl =================================================================== dnl Checks for JDK. dnl =================================================================== @@ -133,8 +133,25 @@ dnl =================================================================== dnl Checks for specific files. ---- config_office/set_soenv.in.orig 2003-09-22 11:27:24.000000000 -0700 -+++ config_office/set_soenv.in 2003-09-22 11:30:33.000000000 -0700 +@@ -1738,6 +1751,8 @@ + dnl Test for the presence of Ant and that it works + dnl =================================================================== + ++if test "$enable_java" != "no"; then ++ + ANT_HOME=; export ANT_HOME + if test -z "$with_ant_home"; then + AC_PATH_PROGS(ANT, [jakarta-ant ant ant.sh ant.bat]) +@@ -1788,6 +1803,7 @@ + fi + AC_SUBST(ANT_HOME) + ++fi + + dnl =================================================================== + dnl Setting up the environment. +--- config_office/set_soenv.in.cool 2003-11-24 13:01:23.000000000 -0500 ++++ config_office/set_soenv.in 2003-11-24 13:01:55.000000000 -0500 @@ -1359,6 +1359,7 @@ if ( '@JDK@' ne '' ) { ToFile( "JDK", "@JDK@", "e" ); |