Author: arist
Date: Thu Feb 16 19:50:10 2012
New Revision: 1245136
URL: http://svn.apache.org/viewvc?rev=1245136&view=rev
Log:
change to ant program list broke windows build
ant.bat needs to be before ant.cmd with cygwin as ant.cmd (inexplicably) has unix style comments
and errors out
switched to ifdef OS2 for the altered program list
Modified:
incubator/ooo/trunk/main/configure.in
Modified: incubator/ooo/trunk/main/configure.in
URL: http://svn.apache.org/viewvc/incubator/ooo/trunk/main/configure.in?rev=1245136&r1=1245135&r2=1245136&view=diff
==============================================================================
--- incubator/ooo/trunk/main/configure.in (original)
+++ incubator/ooo/trunk/main/configure.in Thu Feb 16 19:50:10 2012
@@ -6867,12 +6867,20 @@ if test "$SOLAR_JAVA" != ""; 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.cmd ant ant.sh ant.bat])
+ if test "$_os" = "OS2"; then
+ AC_PATH_PROGS(ANT, [jakarta-ant ant.cmd ant ant.sh ant.bat])
+ else
+ AC_PATH_PROGS(ANT, [jakarta-ant ant ant.sh ant.bat ant.cmd])
+ fi
else
if test "$_os" = "WINNT"; then
with_ant_home=`cygpath -u "$with_ant_home"`
fi
- AC_PATH_PROGS(ANT, [jakarta-ant ant.cmd ant ant.sh ant.bat],,$with_ant_home/bin:$PATH)
+ if test "$_os" = "OS2"; then
+ AC_PATH_PROGS(ANT, [jakarta-ant ant.cmd ant ant.sh ant.bat],,$with_ant_home/bin:$PATH)
+ else
+ AC_PATH_PROGS(ANT, [jakarta-ant ant ant.sh ant.bat ant.cmd],,$with_ant_home/bin:$PATH)
+ fi
WITH_ANT_HOME=$with_ant_home
ANT_HOME=$with_ant_home
fi
|