INTEGRATION: CWS os2port02 (1.220.8); FILE MERGED

2007/10/08 14:25:31 obr 1.220.8.2: RESYNC: (1.220-1.221); FILE MERGED
2007/09/29 16:18:20 ydario 1.220.8.1: Issue number: i82034
Submitted by: ydario
Reviewed by:  ydario
Commit of changes for OS/2 CWS source code integration.

1 files changed, 54 insertions, 5 deletions

diff --git a/config_office/configure.in b/config_office/configure.in
index b87564f511fe..f57a0c191cd6 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-11-02 08:42:50 $
+dnl * Date: $Date: 2007-11-02 13:05:03 $
 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.225 $ )
+AC_REVISION( $Revision: 1.226 $ )
 AC_PREREQ(2.50)
 AC_INIT()
 echo "$@" >config.parms
@@ -795,6 +795,12 @@ case "$build_os" in
          enable_systray=no
       fi
 		;;
+	os2*)
+		test_x=no
+		test_cups=no
+		test_gtk=no
+		_os=OS2
+		;;
 	freebsd*)
 		test_gtk=yes
 		build_cairo=yes
@@ -1126,6 +1132,10 @@ link, and copy the program to the name of the link.])
          CXX="g++ -mno-cygwin"
       fi
    fi
+elif test $_os = "OS2"; then
+   if test "$with_use_shell" != "tcsh" -a "$with_use_shell" != "4nt"; then
+      AC_MSG_ERROR([only "tcsh" or "4nt" are supported options])
+   fi
 else 
    dnl ===================================================================
    dnl All other operating systems use tcsh or bash.
@@ -1181,7 +1191,7 @@ elif test "$with_use_shell" = "bash"; then
       SHELLPATH=`echo $SHELLPATH | $SED -n "s/\/bash$//p"`
    fi
 else
-   AC_MSG_WARN([Windows 4NT builds don't test for the shell])
+   AC_MSG_WARN([Windows/OS/2 4NT builds don't test for the shell])
    SHELLPATH="NO_SHELLPATH_NEEDED"
 fi
 AC_SUBST(SHELLPATH)
@@ -2325,6 +2335,9 @@ you must use the "--with-jdk-home" configure option explicitly])
         if test "$_os" = "WINNT"; then
           JAVA_HOME=`echo $JAVA_HOME | $SED "s,\.[[eE]][[xX]][[eE]]$,,"`
         fi
+        if test "$_os" = "OS2"; then
+          JAVA_HOME=`echo $JAVA_HOME | $SED "s,\.[[eE]][[xX]][[eE]]$,,"`
+        fi
       fi
    else
       AC_MSG_ERROR([JAVA not found. You need at least jdk-1.3, Kaffee 1.01, or gcj-4])
@@ -2343,6 +2356,11 @@ if test "$SOLAR_JAVA" != ""; then
     else
         javacompiler="javac"
     fi
+    if test "$_os" = "OS2"; then
+      if test x`echo "$javacompiler" | grep -i '\.exe$'` = x; then
+          javacompiler="${javacompiler}.exe"
+      fi
+    fi
     if test -z "$with_jdk_home"; then
         AC_PATH_PROG(JAVACOMPILER, $javacompiler)
     else
@@ -2362,6 +2380,11 @@ if test "$SOLAR_JAVA" != ""; then
        JAVACOMPILER=`cygpath -d "$JAVACOMPILER"`
        JAVACOMPILER=`cygpath -u "$JAVACOMPILER"`
     fi
+    if test "$_os" = "OS2"; then
+       if test x`echo "$JAVACOMPILER" | grep -i '\.exe$'` = x; then
+          JAVACOMPILER="${JAVACOMPILER}.exe"
+       fi
+    fi
 fi
 
 JAVACISGCJ=""
@@ -2383,6 +2406,11 @@ if test "$SOLAR_JAVA" != ""; then
         AC_PATH_PROG(JAVADOC, javadoc)
     else
         _javadoc_path="$with_jdk_home/bin/javadoc"
+        if test "$_os" = "OS2"; then
+          if test x`echo "$_javadoc_path" | grep -i '\.exe$'` = x; then
+              _javadoc_path="${_javadoc_path}.exe"
+          fi
+        fi
         dnl Check if there is a javadoc at all.
         if test -x "$_javadoc_path"; then
             JAVADOC=$_javadoc_path
@@ -2400,6 +2428,11 @@ if test "$SOLAR_JAVA" != ""; then
         JAVADOC=`cygpath -d "$JAVADOC"`
         JAVADOC=`cygpath -u "$JAVADOC"`
     fi
+    if test "$_os" = "OS2"; then
+        if test x`echo "$JAVADOC" | grep -i '\.exe$'` = x; then
+            JAVADOC="${JAVADOC}.exe"
+        fi
+    fi
 fi
 
 if test "$SOLAR_JAVA" != ""; then
@@ -2662,6 +2695,9 @@ if test "$_os" != "WINNT" -a \( "z$enable_epm" = "z" -o "$enable_epm" != "no" \)
 
    # defaults
    case "$_os" in
+	OS2)
+		PKGFORMAT=native
+		;;
 	Darwin)
 		PKGFORMAT=portable
 		;;
@@ -3834,6 +3870,10 @@ if test "$_os" = "Darwin" -a "x$x_includes" = "xno_x_includes"; then
    echo "Do Nothing for _os = Darwin and x_includes = no_x_includes"
    dnl Mac OS X using Aqua graphics. Don't check for X11.
    :
+elif test "$_os" = "OS2" ; then
+   echo "Do Nothing for _os = OS2. Don't check for X11."
+   dnl OS/2 uses native graphics. Don't check for X11.
+   :
 elif test "$_os" != "WINNT" ; then
    AC_PATH_X
    AC_PATH_XTRA
@@ -5163,9 +5203,9 @@ 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])
+   AC_PATH_PROGS(ANT, [jakarta-ant ant ant.sh ant.bat ant.cmd])
 else
-   AC_PATH_PROGS(ANT, [jakarta-ant ant ant.sh ant.bat],,$with_ant_home/bin:$PATH)
+   AC_PATH_PROGS(ANT, [jakarta-ant ant ant.sh ant.bat ant.cmd],,$with_ant_home/bin:$PATH)
    WITH_ANT_HOME=$with_ant_home
 fi
 
@@ -5182,10 +5222,19 @@ else
      ANT="`pwd`"/"`basename "$a_script"`"
      cd "$a_cwd"
   done
+
+  if test "$_os" = "OS2"; then
+    ANT_HOME=`echo $ANT | $SED -n "s/\/bin\/ant.*\$//p"`
+    export ANT_HOME
+  fi
+
   AC_MSG_CHECKING([whether ant is >= 1.6.0])
   ant_version=`$ANT -version | $AWK '{ print $4; }'`
   ant_version_major=`echo $ant_version | cut -d. -f1`
   ant_version_minor=`echo $ant_version | cut -d. -f2`
+echo "configure: ant_version $ant_version " >&5
+echo "configure: ant_version_major $ant_version_major " >&5
+echo "configure: ant_version_minor $ant_version_minor " >&5
   if test "$ant_version_major" -ge "2"; then
   	AC_MSG_RESULT([yes, $ant_version])
   elif test "$ant_version_major" = "1" && test "$ant_version_minor" -ge "6"; then