configure.ac (35779863) configure.ac (86bbd642)
1dnl /******************************************************************
2dnl * vi:set sw=3 ts=3 et:
3dnl *
4dnl * Name: configure.in
5dnl * Auth: Willem van Dorp, Ross Nicholson, Oisin Boydell - Sun Microsystems Ireland
6dnl * Date: $Date: 2008-09-08 07:38:40 $
7dnl *
8dnl * Desc: This file serves as input for the GNU autoconf package

--- 1730 unchanged lines hidden (view full) ---

1739 fi
1740else
1741 AC_MSG_CHECKING([whether the found dmake is the right dmake])
1742 # we need to find out whether that dmake we found is "our" dmake
1743 # or the dmake from Sun's SunStudio Compiler which is something
1744 # different
1745 # This test _should_ work because the one accepts -V (ours) and one
1746 # (the other) not...
1dnl /******************************************************************
2dnl * vi:set sw=3 ts=3 et:
3dnl *
4dnl * Name: configure.in
5dnl * Auth: Willem van Dorp, Ross Nicholson, Oisin Boydell - Sun Microsystems Ireland
6dnl * Date: $Date: 2008-09-08 07:38:40 $
7dnl *
8dnl * Desc: This file serves as input for the GNU autoconf package

--- 1730 unchanged lines hidden (view full) ---

1739 fi
1740else
1741 AC_MSG_CHECKING([whether the found dmake is the right dmake])
1742 # we need to find out whether that dmake we found is "our" dmake
1743 # or the dmake from Sun's SunStudio Compiler which is something
1744 # different
1745 # This test _should_ work because the one accepts -V (ours) and one
1746 # (the other) not...
1747 $DMAKE -V 2>/dev/null | grep 'dmake .* Version .*' >/dev/null
1747 $DMAKE -V 2>/dev/null | grep -E 'dmake(.exe)? .* Version .*' >/dev/null
1748 if test $? -eq 0; then
1749 BUILD_DMAKE=NO
1750 AC_MSG_RESULT([yes])
1751 AC_MSG_CHECKING([the dmake version])
1752 DMAKE_VERSION=`$DMAKE -V | $AWK '$3 == "Version" {print $4}'`
1753 if test "`echo $DMAKE_VERSION | cut -d'.' -f1`" -gt "4"; then
1754 AC_MSG_RESULT([OK, >= 4.11])
1755 elif test "`echo $DMAKE_VERSION | cut -d'.' -f1`" = "4" && \

--- 3145 unchanged lines hidden (view full) ---

4901 fi
4902 AC_PATH_PROG(SYSTEM_GENCMN, gencmn, [], [$PATH:/usr/sbin:/sbin])
4903 if test -z "$SYSTEM_GENCMN"; then
4904 AC_MSG_ERROR([\"gencmn\" not found in \$PATH, install the icu development tool \"gencmn"\])
4905 fi
4906
4907 AC_PATH_PROG( ICUCONFIG, icu-config)
4908 AC_MSG_CHECKING([ICU version])
1748 if test $? -eq 0; then
1749 BUILD_DMAKE=NO
1750 AC_MSG_RESULT([yes])
1751 AC_MSG_CHECKING([the dmake version])
1752 DMAKE_VERSION=`$DMAKE -V | $AWK '$3 == "Version" {print $4}'`
1753 if test "`echo $DMAKE_VERSION | cut -d'.' -f1`" -gt "4"; then
1754 AC_MSG_RESULT([OK, >= 4.11])
1755 elif test "`echo $DMAKE_VERSION | cut -d'.' -f1`" = "4" && \

--- 3145 unchanged lines hidden (view full) ---

4901 fi
4902 AC_PATH_PROG(SYSTEM_GENCMN, gencmn, [], [$PATH:/usr/sbin:/sbin])
4903 if test -z "$SYSTEM_GENCMN"; then
4904 AC_MSG_ERROR([\"gencmn\" not found in \$PATH, install the icu development tool \"gencmn"\])
4905 fi
4906
4907 AC_PATH_PROG( ICUCONFIG, icu-config)
4908 AC_MSG_CHECKING([ICU version])
4909 ICU_VERSION=`$ICUCONFIG --version`
4910 ICU_MAJOR=`$ICUCONFIG --version | cut -d"." -f1`
4911 ICU_MINOR=`$ICUCONFIG --version | cut -d"." -f2`
4912 ICU_MICRO=`$ICUCONFIG --version | cut -d"." -f3`
4909 if test "$_os" = "OS2"; then
4910 ICU_MAJOR=4
4911 else
4912 ICU_VERSION=`$ICUCONFIG --version`
4913 ICU_MAJOR=`$ICUCONFIG --version | cut -d"." -f1`
4914 ICU_MINOR=`$ICUCONFIG --version | cut -d"." -f2`
4915 ICU_MICRO=`$ICUCONFIG --version | cut -d"." -f3`
4916 fi
4913
4914 if test "$ICU_MAJOR" -ge "4"; then
4915 AC_MSG_RESULT([OK])
4916 else
4917 AC_MSG_ERROR([not suitable, only >= 4.0 supported currently])
4918 fi
4919
4920else

--- 1939 unchanged lines hidden (view full) ---

6860dnl Test for the presence of Ant and that it works
6861dnl ===================================================================
6862
6863if test "$SOLAR_JAVA" != ""; then
6864ANT_HOME=; export ANT_HOME
6865WITH_ANT_HOME=; export WITH_ANT_HOME
6866if test -z "$with_ant_home"; then
6867 if test "$_os" = "OS2"; then
4917
4918 if test "$ICU_MAJOR" -ge "4"; then
4919 AC_MSG_RESULT([OK])
4920 else
4921 AC_MSG_ERROR([not suitable, only >= 4.0 supported currently])
4922 fi
4923
4924else

--- 1939 unchanged lines hidden (view full) ---

6864dnl Test for the presence of Ant and that it works
6865dnl ===================================================================
6866
6867if test "$SOLAR_JAVA" != ""; then
6868ANT_HOME=; export ANT_HOME
6869WITH_ANT_HOME=; export WITH_ANT_HOME
6870if test -z "$with_ant_home"; then
6871 if test "$_os" = "OS2"; then
6868 AC_PATH_PROGS(ANT, [jakarta-ant ant.cmd ant ant.sh ant.bat])
6872 AC_PATH_PROGS(ANT, ant.cmd)
6869 else
6870 AC_PATH_PROGS(ANT, [jakarta-ant ant ant.sh ant.bat ant.cmd])
6871 fi
6872else
6873 if test "$_os" = "WINNT"; then
6874 with_ant_home=`cygpath -u "$with_ant_home"`
6875 fi
6876 if test "$_os" = "OS2"; then
6873 else
6874 AC_PATH_PROGS(ANT, [jakarta-ant ant ant.sh ant.bat ant.cmd])
6875 fi
6876else
6877 if test "$_os" = "WINNT"; then
6878 with_ant_home=`cygpath -u "$with_ant_home"`
6879 fi
6880 if test "$_os" = "OS2"; then
6877 AC_PATH_PROGS(ANT, [jakarta-ant ant.cmd ant ant.sh ant.bat],,$with_ant_home/bin:$PATH)
6881 AC_PATH_PROGS(ANT, ant.cmd,,$with_ant_home/bin:$PATH)
6878 else
6879 AC_PATH_PROGS(ANT, [jakarta-ant ant ant.sh ant.bat ant.cmd],,$with_ant_home/bin:$PATH)
6880 fi
6881 WITH_ANT_HOME=$with_ant_home
6882 ANT_HOME=$with_ant_home
6883fi
6884
6885if test -z "$ANT"; then

--- 400 unchanged lines hidden --- 		6882 else
6883 AC_PATH_PROGS(ANT, [jakarta-ant ant ant.sh ant.bat ant.cmd],,$with_ant_home/bin:$PATH)
6884 fi
6885 WITH_ANT_HOME=$with_ant_home
6886 ANT_HOME=$with_ant_home
6887fi
6888
6889if test -z "$ANT"; then

--- 400 unchanged lines hidden ---