You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@openoffice.apache.org by yd...@apache.org on 2012/02/29 12:26:48 UTC
svn commit: r1295065 - in /incubator/ooo/trunk/main: configure.cmd
configure.in
Author: ydario
Date: Wed Feb 29 11:26:48 2012
New Revision: 1295065
URL: http://svn.apache.org/viewvc?rev=1295065&view=rev
Log:
i118923 - OS/2 port: make configure script more OS/2 friendly, hacks no more required.
Modified:
incubator/ooo/trunk/main/configure.cmd
incubator/ooo/trunk/main/configure.in
Modified: incubator/ooo/trunk/main/configure.cmd
URL: http://svn.apache.org/viewvc/incubator/ooo/trunk/main/configure.cmd?rev=1295065&r1=1295064&r2=1295065&view=diff
==============================================================================
--- incubator/ooo/trunk/main/configure.cmd (original)
+++ incubator/ooo/trunk/main/configure.cmd Wed Feb 29 11:26:48 2012
@@ -3,11 +3,9 @@ setlocal
SET JAVA_HOME=d:\os2\java160
SET MY_ANT_HOME=d:/os2/java160/apache-ant-1.7.0
SET PATH=%JAVA_HOME%\bin;%PATH%;%MY_ANT_HOME%\bin;
-rem set grep=grep.exe
set config_shell=sh
set perl_sh_dir=/usr/bin
-rem --with-system-icu --disable-epm
-sh ./configure --disable-binfilter --with-system-zlib --with-system-jpeg --without-stlport --with-system-icu --with-system-curl --with-system-python --with-system-openssl --with-system-libxml --with-system-libxslt --disable-werror --disable-mozilla --disable-odk --with-x=no --disable-fontconfig --disable-gnome-vfs --disable-gtk --with-java=yes --disable-gcjaot --without-fonts --with-ant-home=%MY_ANT_HOME% --without-junit | tee configure.log
+sh ./configure --prefix=/@unixroot/usr --disable-binfilter --with-system-zlib --with-system-jpeg --without-stlport --with-system-icu --with-system-curl --with-system-python --with-system-openssl --with-system-libxml --with-system-libxslt --disable-werror --disable-mozilla --disable-odk --with-x=no --disable-fontconfig --disable-gnome-vfs --disable-gtk --with-java=yes --disable-gcjaot --without-fonts --with-ant-home=%MY_ANT_HOME% --without-junit | tee configure.log
endlocal
Modified: incubator/ooo/trunk/main/configure.in
URL: http://svn.apache.org/viewvc/incubator/ooo/trunk/main/configure.in?rev=1295065&r1=1295064&r2=1295065&view=diff
==============================================================================
--- incubator/ooo/trunk/main/configure.in (original)
+++ incubator/ooo/trunk/main/configure.in Wed Feb 29 11:26:48 2012
@@ -1744,7 +1744,7 @@ else
# different
# This test _should_ work because the one accepts -V (ours) and one
# (the other) not...
- $DMAKE -V 2>/dev/null | grep 'dmake .* Version .*' >/dev/null
+ $DMAKE -V 2>/dev/null | grep -E 'dmake(.exe)? .* Version .*' >/dev/null
if test $? -eq 0; then
BUILD_DMAKE=NO
AC_MSG_RESULT([yes])
@@ -4906,10 +4906,14 @@ if test -n "$with_system_icu" -o -n "$wi
AC_PATH_PROG( ICUCONFIG, icu-config)
AC_MSG_CHECKING([ICU version])
- ICU_VERSION=`$ICUCONFIG --version`
- ICU_MAJOR=`$ICUCONFIG --version | cut -d"." -f1`
- ICU_MINOR=`$ICUCONFIG --version | cut -d"." -f2`
- ICU_MICRO=`$ICUCONFIG --version | cut -d"." -f3`
+ if test "$_os" = "OS2"; then
+ ICU_MAJOR=4
+ else
+ ICU_VERSION=`$ICUCONFIG --version`
+ ICU_MAJOR=`$ICUCONFIG --version | cut -d"." -f1`
+ ICU_MINOR=`$ICUCONFIG --version | cut -d"." -f2`
+ ICU_MICRO=`$ICUCONFIG --version | cut -d"." -f3`
+ fi
if test "$ICU_MAJOR" -ge "4"; then
AC_MSG_RESULT([OK])
@@ -6865,7 +6869,7 @@ ANT_HOME=; export ANT_HOME
WITH_ANT_HOME=; export WITH_ANT_HOME
if test -z "$with_ant_home"; then
if test "$_os" = "OS2"; then
- AC_PATH_PROGS(ANT, [jakarta-ant ant.cmd ant ant.sh ant.bat])
+ AC_PATH_PROGS(ANT, ant.cmd)
else
AC_PATH_PROGS(ANT, [jakarta-ant ant ant.sh ant.bat ant.cmd])
fi
@@ -6874,7 +6878,7 @@ else
with_ant_home=`cygpath -u "$with_ant_home"`
fi
if test "$_os" = "OS2"; then
- AC_PATH_PROGS(ANT, [jakarta-ant ant.cmd ant ant.sh ant.bat],,$with_ant_home/bin:$PATH)
+ AC_PATH_PROGS(ANT, ant.cmd,,$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