diff options
author | cvs2svn <cvs2svn@FreeBSD.org> | 2005-01-21 15:36:45 +0000 |
---|---|---|
committer | cvs2svn <cvs2svn@FreeBSD.org> | 2005-01-21 15:36:45 +0000 |
commit | 7011c19a8c96a2f8fb7c04d61cb28cdc507584a6 (patch) | |
tree | 22c0efaf2b6bb5b461389f9bac9542c7e3a5909a /editors/openoffice.org-2/files/patch-config_office+configure.in | |
parent | Now buildable on 4.x, still broken on >= 5.x. (diff) |
This commit was manufactured by cvs2svn to create tag 'RELEASE_4_11_0'.release/4.11.0
Notes
Notes:
svn path=/head/; revision=127022
svn path=/tags/RELEASE_4_11_0/; revision=127023; tag=release/4.11.0
Diffstat (limited to '')
-rw-r--r-- | editors/openoffice.org-2/files/patch-config_office+configure.in | 37 |
1 files changed, 0 insertions, 37 deletions
diff --git a/editors/openoffice.org-2/files/patch-config_office+configure.in b/editors/openoffice.org-2/files/patch-config_office+configure.in deleted file mode 100644 index 356c23bd10fb..000000000000 --- a/editors/openoffice.org-2/files/patch-config_office+configure.in +++ /dev/null @@ -1,37 +0,0 @@ -#i27028 -http://qa.openoffice.org/issues/show_bug.cgi?id=27028 (ant) - -Index: config_office/configure.in -=================================================================== -RCS file: /cvs/tools/config_office/configure.in,v -retrieving revision 1.63 -diff -u -r1.63 configure.in ---- config_office/configure.in 17 Mar 2004 09:33:26 -0000 1.63 -+++ config_office/configure.in 8 Jun 2004 20:53:16 -0000 -@@ -1830,10 +1831,12 @@ - - if test "$enable_java" != "no"; then - ANT_HOME=; export ANT_HOME -+WITH_ANT_HOME=; export WITH_ANT_HOME - if test -z "$with_ant_home"; then - AC_PATH_PROGS(ANT, [jakarta-ant ant ant.sh ant.bat]) - else -- AC_PATH_PROGS(ANT, [jakarta-ant ant ant.sh ant.bat],,$with_ant_home/bin) -+ AC_PATH_PROGS(ANT, [jakarta-ant ant ant.sh ant.bat],,$with_ant_home/bin:$PATH) -+ WITH_ANT_HOME=$with_ant_home - fi - - -@@ -1873,7 +1876,11 @@ - AC_TRY_EVAL(ant_cmd) - if test $? = 0 && test -f ./conftest.class ; then - AC_MSG_RESULT([Ant works]) -- ANT_HOME=`echo $ANT | $SED -n "s/\/bin\/ant.*\$//p"` -+ if test -z "$WITH_ANT_HOME"; then -+ ANT_HOME=`echo $ANT | $SED -n "s/\/bin\/ant.*\$//p"` -+ else -+ ANT_HOME="$WITH_ANT_HOME" -+ fi - else - echo "configure: Ant test failed" >&5 - cat conftest.java >&5 |