diff options
| author | Rüdiger Timm <rt@openoffice.org> | 2007-01-30 07:25:14 +0000 |
|---|---|---|
| committer | Rüdiger Timm <rt@openoffice.org> | 2007-01-30 07:25:14 +0000 |
| commit | e2ed0046539d3d364bf7721328cadb154ca25d8f (patch) | |
| tree | 5680fab42f23089f299a845aa7b69d537afdd6d6 /config_office | |
| parent | 056aeb27a327c600a031511f349629881f43e40c (diff) | |
INTEGRATION: CWS buildfixes02 (1.187.10); FILE MERGED
2007/01/09 02:48:58 thb 1.187.10.2: RESYNC: (1.187-1.190); FILE MERGED
2006/11/24 09:51:11 thb 1.187.10.1: #i10000# Make ant detection work on Solaris10
Diffstat (limited to 'config_office')
| -rw-r--r-- | config_office/configure.in | 10 |
1 files changed, 7 insertions, 3 deletions
diff --git a/config_office/configure.in b/config_office/configure.in index 0bb141b7955b..b602216332bd 100644 --- a/config_office/configure.in +++ b/config_office/configure.in @@ -3,7 +3,7 @@ dnl * vi:set sw=3 ts=3 et: dnl * dnl * Name: configure.in dnl * Auth: Willem van Dorp, Ross Nicholson, Oisin Boydell - Sun Microsystems Ireland -dnl * Date: $Date: 2007-01-23 06:35:17 $ +dnl * Date: $Date: 2007-01-30 08:25:14 $ dnl * dnl * Desc: This file serves as input for the GNU autoconf package dnl * in order to create a configure script. @@ -12,7 +12,7 @@ dnl * necessary to build OpenOffice.org dnl * dnl * dnl ******************************************************************/ -AC_REVISION( $Revision: 1.196 $ ) +AC_REVISION( $Revision: 1.197 $ ) AC_PREREQ(2.50) AC_INIT() echo "$@" >config.parms @@ -5076,7 +5076,11 @@ if test "$ANT_HOME" != "NO_ANT_HOME"; then if test -f /usr/share/ant-core/lib/ant.jar; then ANT_LIB=/usr/share/ant-core/lib else - AC_MSG_ERROR([Ant libraries not found!]) + if test -f $ANT_HOME/lib/ant/ant.jar; then + ANT_LIB="$ANT_HOME/lib/ant" + else + AC_MSG_ERROR([Ant libraries not found!]) + fi fi fi fi |