diff options
| -rwxr-xr-x | configure.cmd | 12 | ||||
| -rw-r--r-- | configure.in | 4 | ||||
| -rw-r--r-- | set_soenv.in | 12 |
3 files changed, 22 insertions, 6 deletions
diff --git a/configure.cmd b/configure.cmd index aff7e810b520..57118cb366c1 100755 --- a/configure.cmd +++ b/configure.cmd @@ -1,7 +1,13 @@ @echo off setlocal -SET MY_ANT_HOME=e:/java150/apache-ant-1.7.0 -SET JAVA_HOME=e:\java150 +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; -sh -c "configure --with-system-openssl --with-system-icu --with-system-libxml --with-system-libxslt --disable-werror --with-use-shell=bash --disable-mozilla --disable-epm --disable-odk --disable-qadevooo --with-x=no --disable-fontconfig --disable-gnome-vfs --disable-gtk --with-java=yes --disable-gcjaot --without-nas --without-fonts --with-ant-home=%MY_ANT_HOME%" | tee configure.log +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 endlocal diff --git a/configure.in b/configure.in index bef3b6405c1a..6693a34f4e74 100644 --- a/configure.in +++ b/configure.in @@ -6867,12 +6867,12 @@ 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 ant.sh ant.bat ant.cmd]) + AC_PATH_PROGS(ANT, [jakarta-ant ant.cmd ant ant.sh ant.bat]) else if test "$_os" = "WINNT"; then with_ant_home=`cygpath -u "$with_ant_home"` fi - AC_PATH_PROGS(ANT, [jakarta-ant ant ant.sh ant.bat ant.cmd],,$with_ant_home/bin:$PATH) + AC_PATH_PROGS(ANT, [jakarta-ant ant.cmd ant ant.sh ant.bat],,$with_ant_home/bin:$PATH) WITH_ANT_HOME=$with_ant_home ANT_HOME=$with_ant_home fi diff --git a/set_soenv.in b/set_soenv.in index 052256c56f55..920c72843e25 100644 --- a/set_soenv.in +++ b/set_soenv.in @@ -147,6 +147,9 @@ $GLIBC = ""; # Whether the platform uses glibc $PROEXT = "@PROEXT@"; $EPM_FLAGS = ""; +# Required for OS/2 macro expansion +my @unixroot='@unixroot'; + # #-------------------------------------------------------------------- # IV. Initialise the warning container and print a note to the user. @@ -839,7 +842,14 @@ if ( $platform =~ m/cygwin|os2/ ) { $JAVA_HOME =~ s/[\s\/]+$//; # remove trailing \n or \/ if there is any. } # 3. shell path. +if ( $platform =~ m/os2/ ) +{ +$OOO_SHELL = 'sh'; +} +else +{ $OOO_SHELL = '@SHELLPATH@'."\/bash"; +} if ( '@STLPORT4@' eq $no_stl ) { @@ -1309,7 +1319,7 @@ elsif ($platform =~ m/os2/) if ( '@ANT_HOME@' ne '' ) { - $PATH .= $ps.'@ANT_HOME@'; + $PATH .= $ps.'@ANT_HOME@/bin'; } # Append old PATH |