configure.ac (c4b07b4b) configure.ac (28633775)
1dnl * *************************************************************
2dnl *
3dnl * Licensed to the Apache Software Foundation (ASF) under one
4dnl * or more contributor license agreements. See the NOTICE file
5dnl * distributed with this work for additional information
6dnl * regarding copyright ownership. The ASF licenses this file
7dnl * to you under the Apache License, Version 2.0 (the
8dnl * "License"); you may not use this file except in compliance

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

1006 _solenv="./solenv"
1007else
1008 _solenv="$LOCAL_SOLENV"
1009fi
1010AC_SUBST(_solenv)
1011
1012if test -e $_solenv/inc/minor.mk; then
1013 # Get UPD number from ./solenv/inc/minor.mk
1dnl * *************************************************************
2dnl *
3dnl * Licensed to the Apache Software Foundation (ASF) under one
4dnl * or more contributor license agreements. See the NOTICE file
5dnl * distributed with this work for additional information
6dnl * regarding copyright ownership. The ASF licenses this file
7dnl * to you under the Apache License, Version 2.0 (the
8dnl * "License"); you may not use this file except in compliance

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

1006 _solenv="./solenv"
1007else
1008 _solenv="$LOCAL_SOLENV"
1009fi
1010AC_SUBST(_solenv)
1011
1012if test -e $_solenv/inc/minor.mk; then
1013 # Get UPD number from ./solenv/inc/minor.mk
1014 UPD="`grep RSCVERSION= $_solenv/inc/minor.mk | $AWK -F"=" '{ print $2 }'`"
1014 UPD="`$GREP RSCVERSION= $_solenv/inc/minor.mk | $AWK -F"=" '{ print $2 }'`"
1015 AC_SUBST(UPD)
1015 AC_SUBST(UPD)
1016 SOURCEVERSION="`grep SOURCEVERSION= $_solenv/inc/minor.mk | $AWK -F"=" '{ print $2 }'`"
1016 SOURCEVERSION="`$GREP SOURCEVERSION= $_solenv/inc/minor.mk | $AWK -F"=" '{ print $2 }'`"
1017 AC_SUBST(SOURCEVERSION)
1018else
1019 AC_MSG_ERROR([$_solenv/inc/minor.mk missing but needed for architecture/os detecion and proper environment script generation...])
1020fi
1021
1022
1023dnl ==================================================================
1024dnl Checks for custom pack.lst

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

1046dnl ===================================================================
1047AC_CANONICAL_SYSTEM
1048if test "$build" != "$host" -o "$build" != "$target" \
1049 -o "$host" != "$target"; then
1050 AC_MSG_WARN([cross-compiling by any means is not supported (yet)!])
1051 echo "cross-compiling by any means is not supported (yet)!" >> warn
1052fi
1053
1017 AC_SUBST(SOURCEVERSION)
1018else
1019 AC_MSG_ERROR([$_solenv/inc/minor.mk missing but needed for architecture/os detecion and proper environment script generation...])
1020fi
1021
1022
1023dnl ==================================================================
1024dnl Checks for custom pack.lst

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

1046dnl ===================================================================
1047AC_CANONICAL_SYSTEM
1048if test "$build" != "$host" -o "$build" != "$target" \
1049 -o "$host" != "$target"; then
1050 AC_MSG_WARN([cross-compiling by any means is not supported (yet)!])
1051 echo "cross-compiling by any means is not supported (yet)!" >> warn
1052fi
1053
1054if echo "$build_os" | grep cygwin; then
1054if echo "$build_os" | $GREP cygwin; then
1055 AC_MSG_CHECKING([Cygwin version])
1056 CygwinVer=`uname -r`
1057 AC_MSG_RESULT([$CygwinVer])
1058 if test "`echo $CygwinVer | $AWK -F . '{ print $1$2 }'`" -lt "15"; then
1059 AC_MSG_ERROR([You need at least Cygwin V1.5.x])
1060 fi
1061else
1062 CygwinVer="false"

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

1685
1686dnl The following checks for gcc, cc and then cl (if it weren't guarded for win32)
1687if test "$_os" != "WINNT" -o "$WITH_MINGWIN" = "yes"; then
1688 AC_PROG_CC
1689fi
1690
1691if test "$_os" = "FreeBSD"; then
1692 FBSD_GCC_RPATH=
1055 AC_MSG_CHECKING([Cygwin version])
1056 CygwinVer=`uname -r`
1057 AC_MSG_RESULT([$CygwinVer])
1058 if test "`echo $CygwinVer | $AWK -F . '{ print $1$2 }'`" -lt "15"; then
1059 AC_MSG_ERROR([You need at least Cygwin V1.5.x])
1060 fi
1061else
1062 CygwinVer="false"

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

1685
1686dnl The following checks for gcc, cc and then cl (if it weren't guarded for win32)
1687if test "$_os" != "WINNT" -o "$WITH_MINGWIN" = "yes"; then
1688 AC_PROG_CC
1689fi
1690
1691if test "$_os" = "FreeBSD"; then
1692 FBSD_GCC_RPATH=
1693 if $CC --version 2>&1 | grep clang > /dev/null ; then
1693 if $CC --version 2>&1 | $GREP clang > /dev/null ; then
1694 COM_IS=CLANG
1695 else
1696 COM_IS=GCC
1697 rpath=`$CC --print-file-name libstdc++.so`
1698 rpath=`realpath $rpath`
1699 rpath=`dirname $rpath`
1700 if test "$rpath" != "/usr/lib" ; then
1701 FBSD_GCC_RPATH="-Wl,-rpath=$rpath"

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

1735 fi
1736 if test "$_os" = "Darwin" ; then
1737 AC_MSG_RESULT([implicitly using CC=$CC])
1738 else
1739 AC_MSG_RESULT([checked (gcc $_gcc_version)])
1740 fi
1741 if test "$_os" = "SunOS"; then
1742 AC_MSG_CHECKING([gcc linker])
1694 COM_IS=CLANG
1695 else
1696 COM_IS=GCC
1697 rpath=`$CC --print-file-name libstdc++.so`
1698 rpath=`realpath $rpath`
1699 rpath=`dirname $rpath`
1700 if test "$rpath" != "/usr/lib" ; then
1701 FBSD_GCC_RPATH="-Wl,-rpath=$rpath"

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

1735 fi
1736 if test "$_os" = "Darwin" ; then
1737 AC_MSG_RESULT([implicitly using CC=$CC])
1738 else
1739 AC_MSG_RESULT([checked (gcc $_gcc_version)])
1740 fi
1741 if test "$_os" = "SunOS"; then
1742 AC_MSG_CHECKING([gcc linker])
1743 if $CC -Wl,--version 2>&1 |head -n 1| grep -v GNU > /dev/null;then
1743 if $CC -Wl,--version 2>&1 |head -n 1| $GREP -v GNU > /dev/null;then
1744 AC_MSG_ERROR([failed (not GNU ld). Use GNU ld instead of Sun ld on Solaris])
1745 fi
1746 AC_MSG_RESULT([ok (GNU ld)])
1747 fi
1748fi
1749AC_SUBST(GCCVER)
1750
1751HAVE_LD_BSYMBOLIC_FUNCTIONS=

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

1789fi
1790AC_SUBST(ENABLE_PCH)
1791
1792dnl ===================================================================
1793dnl Search all the common names for GNU make
1794dnl ===================================================================
1795AC_MSG_CHECKING([for GNU make])
1796for a in "$MAKE" $GNUMAKE make gmake gnumake; do
1744 AC_MSG_ERROR([failed (not GNU ld). Use GNU ld instead of Sun ld on Solaris])
1745 fi
1746 AC_MSG_RESULT([ok (GNU ld)])
1747 fi
1748fi
1749AC_SUBST(GCCVER)
1750
1751HAVE_LD_BSYMBOLIC_FUNCTIONS=

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

1789fi
1790AC_SUBST(ENABLE_PCH)
1791
1792dnl ===================================================================
1793dnl Search all the common names for GNU make
1794dnl ===================================================================
1795AC_MSG_CHECKING([for GNU make])
1796for a in "$MAKE" $GNUMAKE make gmake gnumake; do
1797 $a --version 2> /dev/null | grep GNU 2>&1 > /dev/null
1797 $a --version 2> /dev/null | $GREP GNU 2>&1 > /dev/null
1798 if test $? -eq 0; then
1799 GNUMAKE=$a
1800 break
1801 fi
1802done
1803AC_MSG_RESULT($GNUMAKE)
1804if test -z "$GNUMAKE"; then
1805 AC_MSG_ERROR([not found. install GNU make.])
1806fi
1807
1808AC_MSG_CHECKING([the GNU make version])
1798 if test $? -eq 0; then
1799 GNUMAKE=$a
1800 break
1801 fi
1802done
1803AC_MSG_RESULT($GNUMAKE)
1804if test -z "$GNUMAKE"; then
1805 AC_MSG_ERROR([not found. install GNU make.])
1806fi
1807
1808AC_MSG_CHECKING([the GNU make version])
1809_make_version=`$GNUMAKE --version | grep GNU | $SED -e 's@^[[^0-9]]*@@' -e 's@ .*@@' -e 's@,.*@@'`;
1809_make_version=`$GNUMAKE --version | $GREP GNU | $SED -e 's@^[[^0-9]]*@@' -e 's@ .*@@' -e 's@,.*@@'`;
1810_make_longver=`echo $_make_version | $AWK -F. '{ print \$1*10000+\$2*100+\$3 }'`
1811if test "$_make_longver" -ge "038100" ; then
1812 AC_MSG_RESULT([$GNUMAKE $_make_version])
1813else
1814 AC_MSG_ERROR([failed ($GNUMAKE version >= 3.81 needed])
1815fi
1816AC_SUBST(GNUMAKE)
1817

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

1855 fi
1856else
1857 AC_MSG_CHECKING([whether the found dmake is the right dmake])
1858 # we need to find out whether that dmake we found is "our" dmake
1859 # or the dmake from Sun's SunStudio Compiler which is something
1860 # different
1861 # This test _should_ work because the one accepts -V (ours) and one
1862 # (the other) not...
1810_make_longver=`echo $_make_version | $AWK -F. '{ print \$1*10000+\$2*100+\$3 }'`
1811if test "$_make_longver" -ge "038100" ; then
1812 AC_MSG_RESULT([$GNUMAKE $_make_version])
1813else
1814 AC_MSG_ERROR([failed ($GNUMAKE version >= 3.81 needed])
1815fi
1816AC_SUBST(GNUMAKE)
1817

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

1855 fi
1856else
1857 AC_MSG_CHECKING([whether the found dmake is the right dmake])
1858 # we need to find out whether that dmake we found is "our" dmake
1859 # or the dmake from Sun's SunStudio Compiler which is something
1860 # different
1861 # This test _should_ work because the one accepts -V (ours) and one
1862 # (the other) not...
1863 $DMAKE -V 2>/dev/null | grep -E 'dmake(.exe)? .* Version .*' >/dev/null
1863 $DMAKE -V 2>/dev/null | $GREP -E 'dmake(.exe)? .* Version .*' >/dev/null
1864 if test $? -eq 0; then
1865 BUILD_DMAKE=NO
1866 AC_MSG_RESULT([yes])
1867 AC_MSG_CHECKING([the dmake version])
1868 DMAKE_VERSION=`$DMAKE -V | $AWK '$3 == "Version" {print $4}'`
1869 if test "`echo $DMAKE_VERSION | cut -d'.' -f1`" -gt "4"; then
1870 AC_MSG_RESULT([OK, >= 4.11])
1871 elif test "`echo $DMAKE_VERSION | cut -d'.' -f1`" = "4" && \

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

1888AC_SUBST(IS_SYSTEM_DMAKE)
1889
1890
1891dnl ===================================================================
1892dnl Search all the common names for GNU or BSD tar
1893dnl ===================================================================
1894AC_MSG_CHECKING([for GNU or compatible BSD tar])
1895for a in $GNUTAR gtar gnutar bsdtar tar; do
1864 if test $? -eq 0; then
1865 BUILD_DMAKE=NO
1866 AC_MSG_RESULT([yes])
1867 AC_MSG_CHECKING([the dmake version])
1868 DMAKE_VERSION=`$DMAKE -V | $AWK '$3 == "Version" {print $4}'`
1869 if test "`echo $DMAKE_VERSION | cut -d'.' -f1`" -gt "4"; then
1870 AC_MSG_RESULT([OK, >= 4.11])
1871 elif test "`echo $DMAKE_VERSION | cut -d'.' -f1`" = "4" && \

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

1888AC_SUBST(IS_SYSTEM_DMAKE)
1889
1890
1891dnl ===================================================================
1892dnl Search all the common names for GNU or BSD tar
1893dnl ===================================================================
1894AC_MSG_CHECKING([for GNU or compatible BSD tar])
1895for a in $GNUTAR gtar gnutar bsdtar tar; do
1896 $a --version 2> /dev/null | egrep "GNU|libarchive" 2>&1 > /dev/null
1896 $a --version 2> /dev/null | $EGREP "GNU|libarchive" 2>&1 > /dev/null
1897 if test $? -eq 0; then
1898 GNUTAR=$a
1899 break
1900 fi
1901done
1902AC_MSG_RESULT($GNUTAR)
1903if test -z "$GNUTAR"; then
1904 AC_MSG_ERROR([not found. install GNU tar.])

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

1910dnl Test the solaris compiler version
1911dnl ===================================================================
1912if test "$_os" = "SunOS"; then
1913 if test "$CC" = "cc"; then
1914 AC_PATH_PROGS(_cc, cc)
1915 COMPATH=`echo $_cc | $SED -n "s/\/bin\/cc//p"`
1916 AC_MSG_CHECKING([the SunStudio C/C++ compiler version])
1917 dnl cc -V outputs to standard error!!!!
1897 if test $? -eq 0; then
1898 GNUTAR=$a
1899 break
1900 fi
1901done
1902AC_MSG_RESULT($GNUTAR)
1903if test -z "$GNUTAR"; then
1904 AC_MSG_ERROR([not found. install GNU tar.])

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

1910dnl Test the solaris compiler version
1911dnl ===================================================================
1912if test "$_os" = "SunOS"; then
1913 if test "$CC" = "cc"; then
1914 AC_PATH_PROGS(_cc, cc)
1915 COMPATH=`echo $_cc | $SED -n "s/\/bin\/cc//p"`
1916 AC_MSG_CHECKING([the SunStudio C/C++ compiler version])
1917 dnl cc -V outputs to standard error!!!!
1918 _sunstudio_string=`$CC -V 2>&1 | grep '^cc' | sed -e 's/.* C //'`
1918 _sunstudio_string=`$CC -V 2>&1 | $GREP '^cc' | sed -e 's/.* C //'`
1919 _sunstudio_version=`echo $_sunstudio_string | $AWK '{ print $1 }'`
1920 _sunstudio_major=`echo $_sunstudio_version | $AWK -F. '{ print $1 }'`
1921 if test "$_sunstudio_major" != "5"; then
1922 AC_MSG_ERROR([found version "$_sunstudio_version", use version 5.5, 5.7, 5.8 or 5.9 of the SunStudio C/C++ compiler])
1923 else
1924 _sunstudio_minor=`echo $_sunstudio_version | $AWK -F. '{ if ($2 == 5) print "true"; else if ($2 == 7) print "true"; else if ($2 == 8) print "true"; else if ($2 == 9) print "true"; else print "false" }'`
1925 if test "$_sunstudio_minor" = "false"; then
1926 AC_MSG_ERROR([found version "$_sunstudio_version", use version 5.5, 5.7, 5.8 or 5.9 of the SunStudio C/C++ compiler])

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

2121 fi
2122 else
2123 AC_MSG_ERROR([Microsoft C/C++ Compiler not found. Use --with-cl-home or set path to cl.exe.])
2124 fi
2125 else
2126 AC_MSG_CHECKING([the Mingwin32 C++ Compiler])
2127 if test `$CC -dumpmachine | $SED -e 's/^.*-//'` = "mingw32"; then
2128 AC_MSG_RESULT([found.])
1919 _sunstudio_version=`echo $_sunstudio_string | $AWK '{ print $1 }'`
1920 _sunstudio_major=`echo $_sunstudio_version | $AWK -F. '{ print $1 }'`
1921 if test "$_sunstudio_major" != "5"; then
1922 AC_MSG_ERROR([found version "$_sunstudio_version", use version 5.5, 5.7, 5.8 or 5.9 of the SunStudio C/C++ compiler])
1923 else
1924 _sunstudio_minor=`echo $_sunstudio_version | $AWK -F. '{ if ($2 == 5) print "true"; else if ($2 == 7) print "true"; else if ($2 == 8) print "true"; else if ($2 == 9) print "true"; else print "false" }'`
1925 if test "$_sunstudio_minor" = "false"; then
1926 AC_MSG_ERROR([found version "$_sunstudio_version", use version 5.5, 5.7, 5.8 or 5.9 of the SunStudio C/C++ compiler])

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

2121 fi
2122 else
2123 AC_MSG_ERROR([Microsoft C/C++ Compiler not found. Use --with-cl-home or set path to cl.exe.])
2124 fi
2125 else
2126 AC_MSG_CHECKING([the Mingwin32 C++ Compiler])
2127 if test `$CC -dumpmachine | $SED -e 's/^.*-//'` = "mingw32"; then
2128 AC_MSG_RESULT([found.])
2129 if $CC -dumpspecs | grep -q "mno-cygwin"; then
2129 if $CC -dumpspecs | $GREP -q "mno-cygwin"; then
2130 USE_MINGW="cygwin"
2131 else
2132 USE_MINGW="pure-mingw"
2133 fi
2134 else
2135 AC_MSG_ERROR([Mingwin32 C++ Compiler not found.])
2136 fi
2137 fi

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

2425 with_gxx_include_path=`echo "#include <cstring>" | $CXX -E -xc++ - | $SED -n '/.*1*"\(.*\)\/cstring".*/s//\1/p' | head -n 1`
2426 if test "$with_gxx_include_path" = "/usr/libexec/(null)/include"; then
2427 with_gxx_include_path="/usr/include"
2428 fi
2429 if test "$WITH_MINGWIN" = "yes"; then
2430 with_gxx_include_path=`cygpath -d "$with_gxx_include_path"`
2431 with_gxx_include_path=`cygpath -u "$with_gxx_include_path"`
2432 fi
2130 USE_MINGW="cygwin"
2131 else
2132 USE_MINGW="pure-mingw"
2133 fi
2134 else
2135 AC_MSG_ERROR([Mingwin32 C++ Compiler not found.])
2136 fi
2137 fi

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

2425 with_gxx_include_path=`echo "#include <cstring>" | $CXX -E -xc++ - | $SED -n '/.*1*"\(.*\)\/cstring".*/s//\1/p' | head -n 1`
2426 if test "$with_gxx_include_path" = "/usr/libexec/(null)/include"; then
2427 with_gxx_include_path="/usr/include"
2428 fi
2429 if test "$WITH_MINGWIN" = "yes"; then
2430 with_gxx_include_path=`cygpath -d "$with_gxx_include_path"`
2431 with_gxx_include_path=`cygpath -u "$with_gxx_include_path"`
2432 fi
2433 if echo $with_gxx_include_path | grep -q linux; then
2433 if echo $with_gxx_include_path | $GREP -q linux; then
2434 # workaround for Mandriva - issue 100049
2435 with_gxx_include_path=`cd $with_gxx_include_path && pwd`
2436 fi
2437 fi
2438fi
2439dnl This is the original code...
2434 # workaround for Mandriva - issue 100049
2435 with_gxx_include_path=`cd $with_gxx_include_path && pwd`
2436 fi
2437 fi
2438fi
2439dnl This is the original code...
2440dnl with_gxx_include_path=`$CXX -print-search-dirs | grep instal |$AWK '{ print \$2 }'`/include
2440dnl with_gxx_include_path=`$CXX -print-search-dirs | $GREP instal |$AWK '{ print \$2 }'`/include
2441if test -z "$with_gxx_include_path"; then
2442 with_gxx_include_path="NO_GXX_INCLUDE"
2443 AC_MSG_RESULT([no g++ includes])
2444else
2445 AC_MSG_RESULT([$with_gxx_include_path])
2446fi
2447GXX_INCLUDE_PATH="$with_gxx_include_path"
2448AC_SUBST(GXX_INCLUDE_PATH)

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

2867AC_MSG_CHECKING([which memory allocator to use])
2868if test "$with_alloc" = "system"; then
2869 AC_MSG_RESULT([system])
2870 ALLOC="SYS_ALLOC";
2871 AC_CHECK_FUNCS([malloc realloc calloc free])
2872fi
2873if test "$with_alloc" = "tcmalloc"; then
2874 AC_MSG_RESULT(tcmalloc)
2441if test -z "$with_gxx_include_path"; then
2442 with_gxx_include_path="NO_GXX_INCLUDE"
2443 AC_MSG_RESULT([no g++ includes])
2444else
2445 AC_MSG_RESULT([$with_gxx_include_path])
2446fi
2447GXX_INCLUDE_PATH="$with_gxx_include_path"
2448AC_SUBST(GXX_INCLUDE_PATH)

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

2867AC_MSG_CHECKING([which memory allocator to use])
2868if test "$with_alloc" = "system"; then
2869 AC_MSG_RESULT([system])
2870 ALLOC="SYS_ALLOC";
2871 AC_CHECK_FUNCS([malloc realloc calloc free])
2872fi
2873if test "$with_alloc" = "tcmalloc"; then
2874 AC_MSG_RESULT(tcmalloc)
2875 if ! echo $build_cpu | grep -E 'i[[3456]]86' 2>/dev/null >/dev/null; then
2875 if ! echo $build_cpu | $GREP -E 'i[[3456]]86' 2>/dev/null >/dev/null; then
2876 AC_MSG_ERROR([tcmalloc only available/usable on ix86])
2877 fi
2878 AC_CHECK_LIB(tcmalloc, malloc, [],
2879 [AC_MSG_ERROR(tcmalloc not found or functional. Install the Google Profiling Tools)], [])
2880 ALLOC="TCMALLOC";
2881fi
2882if test "$with_alloc" = "jemalloc"; then
2883 if test "$_os" != "FreeBSD" -o "$_os" != "NetBSD"; then

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

2958 dnl Check if there is a java interpreter at all.
2959 if test -x "$_java_path"; then
2960 JAVAINTERPRETER=$_java_path
2961 else
2962 AC_MSG_ERROR([$_java_path not found, please use --with-jdk-home])
2963 fi
2964 fi
2965 if test "$_os" = "WINNT"; then
2876 AC_MSG_ERROR([tcmalloc only available/usable on ix86])
2877 fi
2878 AC_CHECK_LIB(tcmalloc, malloc, [],
2879 [AC_MSG_ERROR(tcmalloc not found or functional. Install the Google Profiling Tools)], [])
2880 ALLOC="TCMALLOC";
2881fi
2882if test "$with_alloc" = "jemalloc"; then
2883 if test "$_os" != "FreeBSD" -o "$_os" != "NetBSD"; then

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

2958 dnl Check if there is a java interpreter at all.
2959 if test -x "$_java_path"; then
2960 JAVAINTERPRETER=$_java_path
2961 else
2962 AC_MSG_ERROR([$_java_path not found, please use --with-jdk-home])
2963 fi
2964 fi
2965 if test "$_os" = "WINNT"; then
2966 if test x`echo "$JAVAINTERPRETER" | grep -i '\.exe$'` = x; then
2966 if test x`echo "$JAVAINTERPRETER" | $GREP -i '\.exe$'` = x; then
2967 JAVAINTERPRETER="${JAVAINTERPRETER}.exe"
2968 fi
2969 JAVAINTERPRETER=`cygpath -d "$JAVAINTERPRETER"`
2970 JAVAINTERPRETER=`cygpath -u "$JAVAINTERPRETER"`
2971 elif test "$_os" = "Darwin"; then
2972 JAVAIFLAGS=""
2973 fi
2974fi
2975
2976dnl ===================================================================
2977dnl Checks for JDK.
2978dnl ===================================================================
2979if test "$SOLAR_JAVA" != ""; then
2980 _gij_longver=0
2981 AC_MSG_CHECKING([the installed JDK])
2982 if test -n "$JAVAINTERPRETER"; then
2983 dnl java -version sends output to stderr!
2967 JAVAINTERPRETER="${JAVAINTERPRETER}.exe"
2968 fi
2969 JAVAINTERPRETER=`cygpath -d "$JAVAINTERPRETER"`
2970 JAVAINTERPRETER=`cygpath -u "$JAVAINTERPRETER"`
2971 elif test "$_os" = "Darwin"; then
2972 JAVAIFLAGS=""
2973 fi
2974fi
2975
2976dnl ===================================================================
2977dnl Checks for JDK.
2978dnl ===================================================================
2979if test "$SOLAR_JAVA" != ""; then
2980 _gij_longver=0
2981 AC_MSG_CHECKING([the installed JDK])
2982 if test -n "$JAVAINTERPRETER"; then
2983 dnl java -version sends output to stderr!
2984 if test `$JAVAINTERPRETER -version 2>&1 | grep -c "Kaffe"` -gt 0; then
2984 if test `$JAVAINTERPRETER -version 2>&1 | $GREP -c "Kaffe"` -gt 0; then
2985 AC_MSG_ERROR([No valid check available. Please check the block for your desired java in configure.in])
2986# dnl Kaffe specific tests
2987# KAFFE_VER=`$JAVAINTERPRETER -version 2>&1 | $EGREP " Version:" | $SED -r "s/.* Version: ([[0-9\.]]*).*/\1/"`
2988# if test -z "$KAFFE_VER"; then
2989# AC_MSG_ERROR([looks like Kaffe but version detection failed])
2990# fi
2991# _kaffe_ver=`echo "$KAFFE_VER" | $AWK -F. '{ print (($1 * 100) + $2) * 100 + $3;}'`
2992# if test "$_kaffe_ver" -lt 10100; then
2993# AC_MSG_ERROR([Kaffe is too old ($KAFFE_VER - $_kaffe_ver), you need at least 1.1.0])
2994# fi
2995# JDK=kaffe
2996#
2997# dnl TODO: define some project exclusion variables
2998#
2999# AC_MSG_RESULT([checked (Kaffe $KAFFE_VER)])
3000# AC_MSG_WARN([EXPERIMENTAL: Kaffe is not a full JDK replacement - some projects will fail to compile])
3001# echo "EXPERIMENTAL: Kaffe is not a full JDK replacement - some projects will fail to compile" >>warn
3002# JAVA_HOME=`echo $JAVAINTERPRETER | $SED -n "s,//*bin//*java,,p"`
2985 AC_MSG_ERROR([No valid check available. Please check the block for your desired java in configure.in])
2986# dnl Kaffe specific tests
2987# KAFFE_VER=`$JAVAINTERPRETER -version 2>&1 | $EGREP " Version:" | $SED -r "s/.* Version: ([[0-9\.]]*).*/\1/"`
2988# if test -z "$KAFFE_VER"; then
2989# AC_MSG_ERROR([looks like Kaffe but version detection failed])
2990# fi
2991# _kaffe_ver=`echo "$KAFFE_VER" | $AWK -F. '{ print (($1 * 100) + $2) * 100 + $3;}'`
2992# if test "$_kaffe_ver" -lt 10100; then
2993# AC_MSG_ERROR([Kaffe is too old ($KAFFE_VER - $_kaffe_ver), you need at least 1.1.0])
2994# fi
2995# JDK=kaffe
2996#
2997# dnl TODO: define some project exclusion variables
2998#
2999# AC_MSG_RESULT([checked (Kaffe $KAFFE_VER)])
3000# AC_MSG_WARN([EXPERIMENTAL: Kaffe is not a full JDK replacement - some projects will fail to compile])
3001# echo "EXPERIMENTAL: Kaffe is not a full JDK replacement - some projects will fail to compile" >>warn
3002# JAVA_HOME=`echo $JAVAINTERPRETER | $SED -n "s,//*bin//*java,,p"`
3003 elif test `$JAVAINTERPRETER --version 2>&1 | grep -c "GNU libgcj"` -gt 0; then
3003 elif test `$JAVAINTERPRETER --version 2>&1 | $GREP -c "GNU libgcj"` -gt 0; then
3004 JDK=gcj
3005 AC_MSG_RESULT([checked (gcj)])
3004 JDK=gcj
3005 AC_MSG_RESULT([checked (gcj)])
3006 _gij_version=`$JAVAINTERPRETER --version | grep GNU | $SED -e 's@^[[^0-9]]*@@' -e 's@ .*@@' -e 's@,.*@@'`;
3006 _gij_version=`$JAVAINTERPRETER --version | $GREP GNU | $SED -e 's@^[[^0-9]]*@@' -e 's@ .*@@' -e 's@,.*@@'`;
3007 _gij_longver=`echo $_gij_version | $AWK -F. '{ print \$1*10000+\$2*100+\$3 }'`
3008
3007 _gij_longver=`echo $_gij_version | $AWK -F. '{ print \$1*10000+\$2*100+\$3 }'`
3008
3009 elif test `$JAVAINTERPRETER -version 2>&1 | awk '{ print }' | grep -c "BEA"` -gt 0; then
3009 elif test `$JAVAINTERPRETER -version 2>&1 | awk '{ print }' | $GREP -c "BEA"` -gt 0; then
3010 AC_MSG_ERROR([No valid check available. Please check the block for your desired java in configure.in])
3011# JDK=bea
3012#
3013# dnl BEA JDK specific tests
3014# _jdk=`$JAVAINTERPRETER -version 2>&1 | $AWK -F'"' '{ print \$2 }' | $SED s/[[-A-Za-z]]*//`
3015# _jdk_ver=`echo "$_jdk" | $AWK -F. '{ print (($1 * 100) + $2) * 100 + $3;}'`
3016#
3017# if test "$_jdk_ver" -lt 10500; then

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

3025#you must use the "--with-jdk-home" configure option explicitly])
3026# fi
3027#
3028# AC_MSG_WARN([A bug in certain BEA JREs can prevent you from successfully compiling some modules])
3029# echo "A bug in certain BEA JREs can prevent you from successfully compiling some modules" >>warn
3030#
3031# JAVA_HOME=$with_jdk_home
3032#
3010 AC_MSG_ERROR([No valid check available. Please check the block for your desired java in configure.in])
3011# JDK=bea
3012#
3013# dnl BEA JDK specific tests
3014# _jdk=`$JAVAINTERPRETER -version 2>&1 | $AWK -F'"' '{ print \$2 }' | $SED s/[[-A-Za-z]]*//`
3015# _jdk_ver=`echo "$_jdk" | $AWK -F. '{ print (($1 * 100) + $2) * 100 + $3;}'`
3016#
3017# if test "$_jdk_ver" -lt 10500; then

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

3025#you must use the "--with-jdk-home" configure option explicitly])
3026# fi
3027#
3028# AC_MSG_WARN([A bug in certain BEA JREs can prevent you from successfully compiling some modules])
3029# echo "A bug in certain BEA JREs can prevent you from successfully compiling some modules" >>warn
3030#
3031# JAVA_HOME=$with_jdk_home
3032#
3033 elif test `$JAVAINTERPRETER -version 2>&1 | awk '{ print }' | grep -c "IBM"` -gt 0; then
3033 elif test `$JAVAINTERPRETER -version 2>&1 | awk '{ print }' | $GREP -c "IBM"` -gt 0; then
3034 JDK=ibm
3035
3036 dnl IBM JDK specific tests
3037 _jdk=`$JAVAINTERPRETER -version 2>&1 | $AWK -F'"' '{ print \$2 }' | $SED s/[[-A-Za-z]]*//`
3038 _jdk_ver=`echo "$_jdk" | $AWK -F. '{ print (($1 * 100) + $2) * 100 + $3;}'`
3039
3040 if test "$_jdk_ver" -lt 10500; then
3041 AC_MSG_ERROR([IBM JDK is too old, you need at least 1.5])

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

3082dnl ===================================================================
3083if test "$SOLAR_JAVA" != ""; then
3084 if test "$JDK" = "gcj"; then
3085 javacompiler=`echo $WITH_JAVA | $SED -e "s/gij/gcj/g" | $SED -e "s/java/javac/g"`
3086 else
3087 javacompiler="javac"
3088 fi
3089 if test "$_os" = "OS2"; then
3034 JDK=ibm
3035
3036 dnl IBM JDK specific tests
3037 _jdk=`$JAVAINTERPRETER -version 2>&1 | $AWK -F'"' '{ print \$2 }' | $SED s/[[-A-Za-z]]*//`
3038 _jdk_ver=`echo "$_jdk" | $AWK -F. '{ print (($1 * 100) + $2) * 100 + $3;}'`
3039
3040 if test "$_jdk_ver" -lt 10500; then
3041 AC_MSG_ERROR([IBM JDK is too old, you need at least 1.5])

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

3082dnl ===================================================================
3083if test "$SOLAR_JAVA" != ""; then
3084 if test "$JDK" = "gcj"; then
3085 javacompiler=`echo $WITH_JAVA | $SED -e "s/gij/gcj/g" | $SED -e "s/java/javac/g"`
3086 else
3087 javacompiler="javac"
3088 fi
3089 if test "$_os" = "OS2"; then
3090 if test x`echo "$javacompiler" | grep -i '\.exe$'` = x; then
3090 if test x`echo "$javacompiler" | $GREP -i '\.exe$'` = x; then
3091 javacompiler="${javacompiler}.exe"
3092 fi
3093 fi
3094 if test -z "$with_jdk_home"; then
3095 AC_PATH_PROG(JAVACOMPILER, $javacompiler)
3096 else
3097 _javac_path="$with_jdk_home/bin/$javacompiler"
3098 dnl Check if there is a java compiler at all.
3099 if test -x "$_javac_path"; then
3100 JAVACOMPILER=$_javac_path
3101 fi
3102 fi
3103 if test -z "$JAVACOMPILER"; then
3104 AC_MSG_ERROR([$javacompiler not found, please use --with-jdk-home])
3105 fi
3106 if test "$_os" = "WINNT"; then
3091 javacompiler="${javacompiler}.exe"
3092 fi
3093 fi
3094 if test -z "$with_jdk_home"; then
3095 AC_PATH_PROG(JAVACOMPILER, $javacompiler)
3096 else
3097 _javac_path="$with_jdk_home/bin/$javacompiler"
3098 dnl Check if there is a java compiler at all.
3099 if test -x "$_javac_path"; then
3100 JAVACOMPILER=$_javac_path
3101 fi
3102 fi
3103 if test -z "$JAVACOMPILER"; then
3104 AC_MSG_ERROR([$javacompiler not found, please use --with-jdk-home])
3105 fi
3106 if test "$_os" = "WINNT"; then
3107 if test x`echo "$JAVACOMPILER" | grep -i '\.exe$'` = x; then
3107 if test x`echo "$JAVACOMPILER" | $GREP -i '\.exe$'` = x; then
3108 JAVACOMPILER="${JAVACOMPILER}.exe"
3109 fi
3110 JAVACOMPILER=`cygpath -d "$JAVACOMPILER"`
3111 JAVACOMPILER=`cygpath -u "$JAVACOMPILER"`
3112 fi
3113 if test "$_os" = "OS2"; then
3108 JAVACOMPILER="${JAVACOMPILER}.exe"
3109 fi
3110 JAVACOMPILER=`cygpath -d "$JAVACOMPILER"`
3111 JAVACOMPILER=`cygpath -u "$JAVACOMPILER"`
3112 fi
3113 if test "$_os" = "OS2"; then
3114 if test x`echo "$JAVACOMPILER" | grep -i '\.exe$'` = x; then
3114 if test x`echo "$JAVACOMPILER" | $GREP -i '\.exe$'` = x; then
3115 JAVACOMPILER="${JAVACOMPILER}.exe"
3116 fi
3117 fi
3118
3115 JAVACOMPILER="${JAVACOMPILER}.exe"
3116 fi
3117 fi
3118
3119 if test `$JAVACOMPILER -version 2>&1 | grep -c "Eclipse Java Compiler"` -gt 0; then
3119 if test `$JAVACOMPILER -version 2>&1 | $GREP -c "Eclipse Java Compiler"` -gt 0; then
3120 AC_MSG_CHECKING([re-checking JDK])
3121 JDK=gcj
3122 AC_MSG_RESULT([checked (ecj)])
3123 #TODO: what's to do here? some switch to do 1.5 compiling?
3124 JAVAFLAGS="-source 1.5 -target 1.5"
3125 _gij_longver="40200"
3126 fi
3127fi
3128
3129JAVACISGCJ=""
3130dnl ===================================================================
3131dnl Checks that javac is gcj
3132dnl ===================================================================
3133if test "$SOLAR_JAVA" != ""; then
3120 AC_MSG_CHECKING([re-checking JDK])
3121 JDK=gcj
3122 AC_MSG_RESULT([checked (ecj)])
3123 #TODO: what's to do here? some switch to do 1.5 compiling?
3124 JAVAFLAGS="-source 1.5 -target 1.5"
3125 _gij_longver="40200"
3126 fi
3127fi
3128
3129JAVACISGCJ=""
3130dnl ===================================================================
3131dnl Checks that javac is gcj
3132dnl ===================================================================
3133if test "$SOLAR_JAVA" != ""; then
3134 if test `$JAVACOMPILER --version 2>&1 | grep -c "GCC"` -gt 0; then
3134 if test `$JAVACOMPILER --version 2>&1 | $GREP -c "GCC"` -gt 0; then
3135 JAVACISGCJ="yes"
3136 fi
3137fi
3138AC_SUBST(JAVACISGCJ)
3139
3140dnl ===================================================================
3141dnl Checks for javadoc
3142dnl ===================================================================
3143if test "$SOLAR_JAVA" != ""; then
3144 if test -z "$with_jdk_home"; then
3145 AC_PATH_PROG(JAVADOC, javadoc)
3146 else
3147 _javadoc_path="$with_jdk_home/bin/javadoc"
3148 if test "$_os" = "OS2"; then
3135 JAVACISGCJ="yes"
3136 fi
3137fi
3138AC_SUBST(JAVACISGCJ)
3139
3140dnl ===================================================================
3141dnl Checks for javadoc
3142dnl ===================================================================
3143if test "$SOLAR_JAVA" != ""; then
3144 if test -z "$with_jdk_home"; then
3145 AC_PATH_PROG(JAVADOC, javadoc)
3146 else
3147 _javadoc_path="$with_jdk_home/bin/javadoc"
3148 if test "$_os" = "OS2"; then
3149 if test x`echo "$_javadoc_path" | grep -i '\.exe$'` = x; then
3149 if test x`echo "$_javadoc_path" | $GREP -i '\.exe$'` = x; then
3150 _javadoc_path="${_javadoc_path}.exe"
3151 fi
3152 fi
3153 dnl Check if there is a javadoc at all.
3154 if test -x "$_javadoc_path"; then
3155 JAVADOC=$_javadoc_path
3156 else
3157 AC_PATH_PROG(JAVADOC, javadoc)
3158 fi
3159 fi
3160 if test -z "$JAVADOC"; then
3161 AC_MSG_ERROR([$_javadoc_path not found, please use --with-jdk-home])
3162 fi
3163 if test "$_os" = "WINNT"; then
3150 _javadoc_path="${_javadoc_path}.exe"
3151 fi
3152 fi
3153 dnl Check if there is a javadoc at all.
3154 if test -x "$_javadoc_path"; then
3155 JAVADOC=$_javadoc_path
3156 else
3157 AC_PATH_PROG(JAVADOC, javadoc)
3158 fi
3159 fi
3160 if test -z "$JAVADOC"; then
3161 AC_MSG_ERROR([$_javadoc_path not found, please use --with-jdk-home])
3162 fi
3163 if test "$_os" = "WINNT"; then
3164 if test x`echo "$JAVADOC" | grep -i '\.exe$'` = x; then
3164 if test x`echo "$JAVADOC" | $GREP -i '\.exe$'` = x; then
3165 JAVADOC="${JAVADOC}.exe"
3166 fi
3167 JAVADOC=`cygpath -d "$JAVADOC"`
3168 JAVADOC=`cygpath -u "$JAVADOC"`
3169 fi
3170 if test "$_os" = "OS2"; then
3165 JAVADOC="${JAVADOC}.exe"
3166 fi
3167 JAVADOC=`cygpath -d "$JAVADOC"`
3168 JAVADOC=`cygpath -u "$JAVADOC"`
3169 fi
3170 if test "$_os" = "OS2"; then
3171 if test x`echo "$JAVADOC" | grep -i '\.exe$'` = x; then
3171 if test x`echo "$JAVADOC" | $GREP -i '\.exe$'` = x; then
3172 JAVADOC="${JAVADOC}.exe"
3173 fi
3174 fi
3175fi
3176
3177if test "$SOLAR_JAVA" != ""; then
3178 dnl first check if we have been asked to autodetect JAVA_HOME with a recent gij
3179 if test "$JDK" = "gcj" -a -z "$JAVA_HOME"; then

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

3321
3322dnl ===================================================================
3323dnl Check for optional gcj for AOT
3324dnl ===================================================================
3325if test "$SOLAR_JAVA" != ""; then
3326 AC_MSG_CHECKING([whether to enable gcj aot compilation])
3327 if test -n "$enable_gcjaot" && test "$enable_gcjaot" != "no"; then
3328 AC_MSG_RESULT([yes])
3172 JAVADOC="${JAVADOC}.exe"
3173 fi
3174 fi
3175fi
3176
3177if test "$SOLAR_JAVA" != ""; then
3178 dnl first check if we have been asked to autodetect JAVA_HOME with a recent gij
3179 if test "$JDK" = "gcj" -a -z "$JAVA_HOME"; then

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

3321
3322dnl ===================================================================
3323dnl Check for optional gcj for AOT
3324dnl ===================================================================
3325if test "$SOLAR_JAVA" != ""; then
3326 AC_MSG_CHECKING([whether to enable gcj aot compilation])
3327 if test -n "$enable_gcjaot" && test "$enable_gcjaot" != "no"; then
3328 AC_MSG_RESULT([yes])
3329 if test `echo $WITH_JAVA | grep -c "gij"` -eq 0; then
3329 if test `echo $WITH_JAVA | $GREP -c "gij"` -eq 0; then
3330 gcjaot="gcj"
3331 else
3332 gcjaot=`echo $WITH_JAVA | $SED -e "s/gij/gcj/g"`
3333 fi
3334 AC_MSG_RESULT([$gcjaot])
3335 if test -n "$with_jdk_home"; then
3336 _javac_path="$with_jdk_home/bin/$gcjaot"
3337 dnl Check if there is a gcj at all.

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

3390 BUILD_EPM=YES
3391 BUILD_TYPE="$BUILD_TYPE EPM"
3392 else
3393 if test "$EPM" = "no" ; then
3394 AC_MSG_ERROR([no. Install ESP Package Manager (http://www.msweet.org/projects.php?Z2) and/or specify the path to the right epm (--with-epm). Or specify an URL to an epm-3.7 source package (--with-epm-url); run configure with the --help option for a list of possible URLs.])
3395 else
3396 # Gentoo has some epm which is something different...
3397 AC_MSG_CHECKING([whether the found epm is the right epm])
3330 gcjaot="gcj"
3331 else
3332 gcjaot=`echo $WITH_JAVA | $SED -e "s/gij/gcj/g"`
3333 fi
3334 AC_MSG_RESULT([$gcjaot])
3335 if test -n "$with_jdk_home"; then
3336 _javac_path="$with_jdk_home/bin/$gcjaot"
3337 dnl Check if there is a gcj at all.

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

3390 BUILD_EPM=YES
3391 BUILD_TYPE="$BUILD_TYPE EPM"
3392 else
3393 if test "$EPM" = "no" ; then
3394 AC_MSG_ERROR([no. Install ESP Package Manager (http://www.msweet.org/projects.php?Z2) and/or specify the path to the right epm (--with-epm). Or specify an URL to an epm-3.7 source package (--with-epm-url); run configure with the --help option for a list of possible URLs.])
3395 else
3396 # Gentoo has some epm which is something different...
3397 AC_MSG_CHECKING([whether the found epm is the right epm])
3398 if $EPM | grep "ESP Package Manager" >/dev/null 2>/dev/null; then
3398 if $EPM | $GREP "ESP Package Manager" >/dev/null 2>/dev/null; then
3399 AC_MSG_RESULT([yes])
3400 else
3401 AC_MSG_ERROR([no. Install ESP Package Manager (http://www.msweet.org/projects.php?Z2) and/or specify the path to the right epm (--with-epm). Or specify an URL to an epm-3.7 source package (--with-epm-url); run configure with the --help option for a list of possible URLs.])
3402 fi
3403 AC_MSG_CHECKING([epm version])
3399 AC_MSG_RESULT([yes])
3400 else
3401 AC_MSG_ERROR([no. Install ESP Package Manager (http://www.msweet.org/projects.php?Z2) and/or specify the path to the right epm (--with-epm). Or specify an URL to an epm-3.7 source package (--with-epm-url); run configure with the --help option for a list of possible URLs.])
3402 fi
3403 AC_MSG_CHECKING([epm version])
3404 EPM_VERSION=`$EPM | grep 'ESP Package Manager' | cut -d' ' -f4 | $SED -e s/v//`
3404 EPM_VERSION=`$EPM | $GREP 'ESP Package Manager' | cut -d' ' -f4 | $SED -e s/v//`
3405 if test "`echo $EPM_VERSION | cut -d'.' -f1`" -gt "3" || \
3406 test "`echo $EPM_VERSION | cut -d'.' -f1`" -eq "3" -a "`echo $EPM_VERSION | cut -d'.' -f2`" -ge "7"; then
3407 AC_MSG_RESULT([OK, >= 3.7])
3408 BUILD_EPM=NO
3409 if test "$_os" = "Darwin"; then
3410 AC_MSG_CHECKING([which PackageMaker EPM thinks to use])
3405 if test "`echo $EPM_VERSION | cut -d'.' -f1`" -gt "3" || \
3406 test "`echo $EPM_VERSION | cut -d'.' -f1`" -eq "3" -a "`echo $EPM_VERSION | cut -d'.' -f2`" -ge "7"; then
3407 AC_MSG_RESULT([OK, >= 3.7])
3408 BUILD_EPM=NO
3409 if test "$_os" = "Darwin"; then
3410 AC_MSG_CHECKING([which PackageMaker EPM thinks to use])
3411 _pm=`strings $EPM | grep PackageMaker | cut -d" " -f1`
3411 _pm=`strings $EPM | $GREP PackageMaker | cut -d" " -f1`
3412 if test "$_pm" = "/Developer/Applications/PackageMaker.app/Contents/MacOS/PackageMaker"; then
3413 AC_MSG_ERROR([$_pm; PackageMaker expected in wrong path. Either patch your epm with the right path (/Developer/Applications/Utilities/PackageMaker.app/Contents/MacOS/PackageMaker)])
3414 elif test "$_pm" = "/Developer/Applications/Utilities/PackageMaker.app/Contents/MacOS/PackageMaker"; then
3415 AC_MSG_RESULT([$_pm, ok])
3416 else # we never should get here, but go safe
3417 AC_MSG_ERROR([$_pm; PackageMaker expected in unknown path. Either patch your epm with the right path (/Developer/Applications/Utilities/PackageMaker.app/Contents/MacOS/PackageMaker)])
3418 fi
3419 fi

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

3535 AC_MSG_ERROR([PackageMaker needed to build OSX packages and you are not on OSX...])
3536 fi
3537 fi
3538 if echo "$PKGFORMAT" | $EGREP rpm 2>&1 >/dev/null || \
3539 echo "$PKGFORMAT" | $EGREP pkg 2>&1 >/dev/null; then
3540 if test "$EPM" != "no" && test "$EPM" != "internal"; then
3541 if test "`echo $EPM_VERSION | cut -d'.' -f1`" -lt "4"; then
3542 AC_MSG_CHECKING([whether epm is patched for OOos needs])
3412 if test "$_pm" = "/Developer/Applications/PackageMaker.app/Contents/MacOS/PackageMaker"; then
3413 AC_MSG_ERROR([$_pm; PackageMaker expected in wrong path. Either patch your epm with the right path (/Developer/Applications/Utilities/PackageMaker.app/Contents/MacOS/PackageMaker)])
3414 elif test "$_pm" = "/Developer/Applications/Utilities/PackageMaker.app/Contents/MacOS/PackageMaker"; then
3415 AC_MSG_RESULT([$_pm, ok])
3416 else # we never should get here, but go safe
3417 AC_MSG_ERROR([$_pm; PackageMaker expected in unknown path. Either patch your epm with the right path (/Developer/Applications/Utilities/PackageMaker.app/Contents/MacOS/PackageMaker)])
3418 fi
3419 fi

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

3535 AC_MSG_ERROR([PackageMaker needed to build OSX packages and you are not on OSX...])
3536 fi
3537 fi
3538 if echo "$PKGFORMAT" | $EGREP rpm 2>&1 >/dev/null || \
3539 echo "$PKGFORMAT" | $EGREP pkg 2>&1 >/dev/null; then
3540 if test "$EPM" != "no" && test "$EPM" != "internal"; then
3541 if test "`echo $EPM_VERSION | cut -d'.' -f1`" -lt "4"; then
3542 AC_MSG_CHECKING([whether epm is patched for OOos needs])
3543 if grep "Patched for Apache OpenOffice" $EPM >/dev/null 2>/dev/null; then
3543 if $GREP "Patched for Apache OpenOffice" $EPM >/dev/null 2>/dev/null; then
3544 AC_MSG_RESULT([yes])
3545 else
3546 AC_MSG_RESULT([no])
3544 AC_MSG_RESULT([yes])
3545 else
3546 AC_MSG_RESULT([no])
3547 if echo "$PKGFORMAT" | grep -q rpm; then
3547 if echo "$PKGFORMAT" | $GREP -q rpm; then
3548 _pt="rpm"
3549 AC_MSG_WARN([the rpms will need to be installed with --nodeps])
3550 echo "the rpms will need to be installed with --nodeps" >> warn
3551 else
3552 _pt="pkg"
3553 fi
3554 AC_MSG_WARN([the ${_pt}s will not be relocateable])
3555 echo "the ${_pt}s will not be relocateable" >> warn

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

3655 if ! test -x "$WITH_MINGWIN"; then MINGWCXX=false; else MINGWCXX=`basename $WITH_MINGWIN`; fi
3656 else
3657 AC_CHECK_TOOL(MINGWCXX, $WITH_MINGWIN, false)
3658 fi
3659 if test "$MINGWCXX" = "false"; then
3660 AC_MSG_ERROR(specified MinGW32 C++ cross-compiler not found. Install it or correct name.)
3661 fi
3662 AC_MSG_CHECKING(whether we are using the MinGW32 cross C++ compiler)
3548 _pt="rpm"
3549 AC_MSG_WARN([the rpms will need to be installed with --nodeps])
3550 echo "the rpms will need to be installed with --nodeps" >> warn
3551 else
3552 _pt="pkg"
3553 fi
3554 AC_MSG_WARN([the ${_pt}s will not be relocateable])
3555 echo "the ${_pt}s will not be relocateable" >> warn

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

3655 if ! test -x "$WITH_MINGWIN"; then MINGWCXX=false; else MINGWCXX=`basename $WITH_MINGWIN`; fi
3656 else
3657 AC_CHECK_TOOL(MINGWCXX, $WITH_MINGWIN, false)
3658 fi
3659 if test "$MINGWCXX" = "false"; then
3660 AC_MSG_ERROR(specified MinGW32 C++ cross-compiler not found. Install it or correct name.)
3661 fi
3662 AC_MSG_CHECKING(whether we are using the MinGW32 cross C++ compiler)
3663 if ! echo "`$MINGWCXX -dumpmachine`" | grep -q mingw32; then
3663 if ! echo "`$MINGWCXX -dumpmachine`" | $GREP -q mingw32; then
3664 AC_MSG_ERROR(no)
3665 else
3666 AC_MSG_RESULT(yes)
3667 fi
3668 if echo "$WITH_MINGWIN" | $EGREP -q "/"; then
3669 if ! test -x "`echo $WITH_MINGWIN | $SED -e s/g++/strip/ | $SED -e s/c++/strip/`"; then MINGSTRIP=false; else MINGWSTRIP=$(basename $(echo $WITH_MINGWIN | $SED -e s/g++/strip/ | $SED -e s/c++/strip/)); fi
3670 else
3671 AC_CHECK_TOOL(MINGWSTRIP, `echo $WITH_MINGWIN | $SED -e s/g++/strip/ | $SED -e s/c++/strip/`, false)

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

3913
3914 sdk_minor=`echo $sdk_target | cut -d"." -f2`
3915
3916 if test "$sdk_minor" -lt "7"; then
3917 AC_MSG_ERROR([SDK version < 10.7 is not longer supported])
3918 else
3919 MACOSX_DEPLOYMENT_TARGET=$sdk_target
3920
3664 AC_MSG_ERROR(no)
3665 else
3666 AC_MSG_RESULT(yes)
3667 fi
3668 if echo "$WITH_MINGWIN" | $EGREP -q "/"; then
3669 if ! test -x "`echo $WITH_MINGWIN | $SED -e s/g++/strip/ | $SED -e s/c++/strip/`"; then MINGSTRIP=false; else MINGWSTRIP=$(basename $(echo $WITH_MINGWIN | $SED -e s/g++/strip/ | $SED -e s/c++/strip/)); fi
3670 else
3671 AC_CHECK_TOOL(MINGWSTRIP, `echo $WITH_MINGWIN | $SED -e s/g++/strip/ | $SED -e s/c++/strip/`, false)

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

3913
3914 sdk_minor=`echo $sdk_target | cut -d"." -f2`
3915
3916 if test "$sdk_minor" -lt "7"; then
3917 AC_MSG_ERROR([SDK version < 10.7 is not longer supported])
3918 else
3919 MACOSX_DEPLOYMENT_TARGET=$sdk_target
3920
3921 sdk_found=`xcodebuild -showsdks | egrep "sdk macosx10.(7|8|9|10|11)" | sed -e "s/.*sdk //" | tail -n1`
3921 sdk_found=`xcodebuild -showsdks | $EGREP "sdk macosx10.(7|8|9|10|11)" | sed -e "s/.*sdk //" | tail -n1`
3922 if test -z "$sdk_found"; then
3923 AC_MSG_ERROR([No SDK with OSX $sdk_target compatibility found])
3924 else
3925 AC_MSG_RESULT([yes, by using SDK $sdk_found])
3926 fi
3927
3928 sdk_path=`xcodebuild -version -sdk ${sdk_found} Path`
3929 AC_MSG_CHECKING([for $sdk_path])

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

5300 if test ! -x "$PSDK_HOME/bin/msiinfo.exe" \
5301 -o ! -x "$PSDK_HOME/bin/msidb.exe" \
5302 -o ! -x "$PSDK_HOME/bin/uuidgen.exe" \
5303 -o ! -x "$PSDK_HOME/bin/msitran.exe" ; then
5304 AC_MSG_ERROR([Some (all) files of the Windows Installer SDK are missing, please install.])
5305 fi
5306 AC_MSG_RESULT([SDK files found ...)])
5307dnl Check if this is the right SDK.
3922 if test -z "$sdk_found"; then
3923 AC_MSG_ERROR([No SDK with OSX $sdk_target compatibility found])
3924 else
3925 AC_MSG_RESULT([yes, by using SDK $sdk_found])
3926 fi
3927
3928 sdk_path=`xcodebuild -version -sdk ${sdk_found} Path`
3929 AC_MSG_CHECKING([for $sdk_path])

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

5300 if test ! -x "$PSDK_HOME/bin/msiinfo.exe" \
5301 -o ! -x "$PSDK_HOME/bin/msidb.exe" \
5302 -o ! -x "$PSDK_HOME/bin/uuidgen.exe" \
5303 -o ! -x "$PSDK_HOME/bin/msitran.exe" ; then
5304 AC_MSG_ERROR([Some (all) files of the Windows Installer SDK are missing, please install.])
5305 fi
5306 AC_MSG_RESULT([SDK files found ...)])
5307dnl Check if this is the right SDK.
5308 if echo $PSDK_HOME | grep "v6.1" >/dev/null 2>/dev/null; then
5308 if echo $PSDK_HOME | $GREP "v6.1" >/dev/null 2>/dev/null; then
5309 AC_MSG_RESULT([Found Windows SDK 6.1 ($PSDK_HOME)])
5310 WINDOWS_VISTA_PSDK=TRUE
5309 AC_MSG_RESULT([Found Windows SDK 6.1 ($PSDK_HOME)])
5310 WINDOWS_VISTA_PSDK=TRUE
5311 elif echo $PSDK_HOME | grep "v6.0" >/dev/null 2>/dev/null; then
5311 elif echo $PSDK_HOME | $GREP "v6.0" >/dev/null 2>/dev/null; then
5312 AC_MSG_RESULT([Found Windows SDK 6.0 ($PSDK_HOME)])
5313 WINDOWS_VISTA_PSDK=TRUE
5312 AC_MSG_RESULT([Found Windows SDK 6.0 ($PSDK_HOME)])
5313 WINDOWS_VISTA_PSDK=TRUE
5314 elif echo $PSDK_HOME | grep "v7.0" >/dev/null 2>/dev/null; then
5314 elif echo $PSDK_HOME | $GREP "v7.0" >/dev/null 2>/dev/null; then
5315 AC_MSG_RESULT([Found Windows SDK 7.0 ($PSDK_HOME)])
5316 WINDOWS_VISTA_PSDK=TRUE
5317 else
5318 AC_MSG_RESULT([Found Legacy Windows Platform SDK ($PSDK_HOME)])
5319 fi
5320fi
5321AC_SUBST(PSDK_HOME)
5322AC_SUBST(WINDOWS_VISTA_PSDK)

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

5533dnl ***************************************
5534dnl testing bison and flex exist
5535dnl ***************************************
5536AC_PATH_PROG(BISON, bison)
5537if test -z "$BISON"; then
5538 AC_MSG_ERROR([no bison found in \$PATH, install bison])
5539else
5540 AC_MSG_CHECKING([the bison version])
5315 AC_MSG_RESULT([Found Windows SDK 7.0 ($PSDK_HOME)])
5316 WINDOWS_VISTA_PSDK=TRUE
5317 else
5318 AC_MSG_RESULT([Found Legacy Windows Platform SDK ($PSDK_HOME)])
5319 fi
5320fi
5321AC_SUBST(PSDK_HOME)
5322AC_SUBST(WINDOWS_VISTA_PSDK)

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

5533dnl ***************************************
5534dnl testing bison and flex exist
5535dnl ***************************************
5536AC_PATH_PROG(BISON, bison)
5537if test -z "$BISON"; then
5538 AC_MSG_ERROR([no bison found in \$PATH, install bison])
5539else
5540 AC_MSG_CHECKING([the bison version])
5541 _bison_version=`$BISON --version | grep GNU | $SED -e 's@^[[^0-9]]*@@' -e 's@ .*@@' -e 's@,.*@@'`;
5541 _bison_version=`$BISON --version | $GREP GNU | $SED -e 's@^[[^0-9]]*@@' -e 's@ .*@@' -e 's@,.*@@'`;
5542 _bison_longver=`echo $_bison_version | $AWK -F. '{ print \$1*1000+\$2}'`
5543 # Accept newer than 1.875 or older(equal) than 1.75
5544 if test "$_bison_longver" -ge 1875 -o "$_bison_longver" -le 1075; then
5545 if test "$_bison_version" = "1.875" ; then
5546 AC_MSG_WARN([suspect ($BISON $_bison_version)])
5547 echo "Suspect ($BISON $_bison_version) suggest upgrade" >> warn
5548 else
5549 AC_MSG_RESULT([checked ($BISON $_bison_version)])

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

5572 if test -x "$with_gnu_patch"; then
5573 GNUPATCH=$with_gnu_patch
5574 else
5575 AC_MSG_ERROR([--with-gnu-patch did not point to an executable])
5576 fi
5577 fi
5578
5579 AC_MSG_CHECKING([whether $GNUPATCH is GNU patch])
5542 _bison_longver=`echo $_bison_version | $AWK -F. '{ print \$1*1000+\$2}'`
5543 # Accept newer than 1.875 or older(equal) than 1.75
5544 if test "$_bison_longver" -ge 1875 -o "$_bison_longver" -le 1075; then
5545 if test "$_bison_version" = "1.875" ; then
5546 AC_MSG_WARN([suspect ($BISON $_bison_version)])
5547 echo "Suspect ($BISON $_bison_version) suggest upgrade" >> warn
5548 else
5549 AC_MSG_RESULT([checked ($BISON $_bison_version)])

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

5572 if test -x "$with_gnu_patch"; then
5573 GNUPATCH=$with_gnu_patch
5574 else
5575 AC_MSG_ERROR([--with-gnu-patch did not point to an executable])
5576 fi
5577 fi
5578
5579 AC_MSG_CHECKING([whether $GNUPATCH is GNU patch])
5580 if $GNUPATCH --version | grep "Free Software Foundation" >/dev/null 2>/dev/null; then
5580 if $GNUPATCH --version | $GREP "Free Software Foundation" >/dev/null 2>/dev/null; then
5581 AC_MSG_RESULT([yes])
5582 else
5583 AC_MSG_ERROR([no, GNU patch needed. install or specify with --with-gnu-patch=/path/to/it])
5584 fi
5585fi
5586
5587dnl We also need to check for --with-gnu-cp
5588

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

5600 if test -x "$with_gnu_cp"; then
5601 GNUCP=$with_gnu_cp
5602 else
5603 AC_MSG_ERROR([--with-gnu-cp did not point to an executable])
5604 fi
5605fi
5606
5607AC_MSG_CHECKING([whether $GNUCP is GNU cp from coreutils with preserve= support])
5581 AC_MSG_RESULT([yes])
5582 else
5583 AC_MSG_ERROR([no, GNU patch needed. install or specify with --with-gnu-patch=/path/to/it])
5584 fi
5585fi
5586
5587dnl We also need to check for --with-gnu-cp
5588

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

5600 if test -x "$with_gnu_cp"; then
5601 GNUCP=$with_gnu_cp
5602 else
5603 AC_MSG_ERROR([--with-gnu-cp did not point to an executable])
5604 fi
5605fi
5606
5607AC_MSG_CHECKING([whether $GNUCP is GNU cp from coreutils with preserve= support])
5608if $GNUCP --version 2>/dev/null | grep "coreutils" >/dev/null 2>/dev/null; then
5608if $GNUCP --version 2>/dev/null | $GREP "coreutils" >/dev/null 2>/dev/null; then
5609 AC_MSG_RESULT([yes])
5610else
5611 AC_MSG_RESULT([no])
5612 GNUCP=''
5613fi
5614
5615if test -z "$GNUCP"; then
5616 if test "$_os" = "SunOS"; then

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

5691if test -z "$ZIP" -o -z "$UNZIP"; then
5692 AC_MSG_ERROR([Zip/Unzip are required to build, please install or use --with-zip-home],,)
5693fi
5694
5695dnl ===================================================================
5696dnl Zip must be a specific type for different build types.
5697dnl ===================================================================
5698if test "$_os" = "WINNT"; then
5609 AC_MSG_RESULT([yes])
5610else
5611 AC_MSG_RESULT([no])
5612 GNUCP=''
5613fi
5614
5615if test -z "$GNUCP"; then
5616 if test "$_os" = "SunOS"; then

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

5691if test -z "$ZIP" -o -z "$UNZIP"; then
5692 AC_MSG_ERROR([Zip/Unzip are required to build, please install or use --with-zip-home],,)
5693fi
5694
5695dnl ===================================================================
5696dnl Zip must be a specific type for different build types.
5697dnl ===================================================================
5698if test "$_os" = "WINNT"; then
5699 if test -n "`$ZIP -h | grep -i WinNT`" ; then
5699 if test -n "`$ZIP -h | $GREP -i WinNT`" ; then
5700AC_MSG_ERROR([$ZIP found in the path is not the required cygwin version of Info-ZIPs zip.exe.])
5701 fi
5702fi
5703AC_SUBST(ZIP_HOME)
5704
5705dnl ===================================================================
5706dnl Windows builds need dbghelp.dll in external/dbghelp/
5707dnl ===================================================================

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

6755 XINERAMA_LINK=static
6756 fi
6757 elif test -e "$XLIB/libXinerama.so" -a ! -e "$XLIB/libXinerama.a"; then
6758 # we have only the dynamic version
6759 USE_XINERAMA=YES
6760 XINERAMA_LINK=dynamic
6761 elif test -e "$XLIB/libXinerama.a"; then
6762 # static version
5700AC_MSG_ERROR([$ZIP found in the path is not the required cygwin version of Info-ZIPs zip.exe.])
5701 fi
5702fi
5703AC_SUBST(ZIP_HOME)
5704
5705dnl ===================================================================
5706dnl Windows builds need dbghelp.dll in external/dbghelp/
5707dnl ===================================================================

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

6755 XINERAMA_LINK=static
6756 fi
6757 elif test -e "$XLIB/libXinerama.so" -a ! -e "$XLIB/libXinerama.a"; then
6758 # we have only the dynamic version
6759 USE_XINERAMA=YES
6760 XINERAMA_LINK=dynamic
6761 elif test -e "$XLIB/libXinerama.a"; then
6762 # static version
6763 if echo $build_cpu | grep -E 'i[[3456]]86' 2>/dev/null >/dev/null; then
6763 if echo $build_cpu | $GREP -E 'i[[3456]]86' 2>/dev/null >/dev/null; then
6764 USE_XINERAMA=YES
6765 XINERAMA_LINK=static
6766 else
6767 USE_XINERAMA=NO
6768 XINERAMA_LINK=none
6769 fi
6770 else
6771 # no Xinerama

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

7129 fi
7130 else
7131 OOO_JUNIT_JAR=$with_junit
7132 fi
7133 if test "$_os" = "WINNT"; then
7134 OOO_JUNIT_JAR=`cygpath -m "$OOO_JUNIT_JAR"`
7135 fi
7136 "$JAVA_HOME/bin/jar" tf "$OOO_JUNIT_JAR" 2>&5 | \
6764 USE_XINERAMA=YES
6765 XINERAMA_LINK=static
6766 else
6767 USE_XINERAMA=NO
6768 XINERAMA_LINK=none
6769 fi
6770 else
6771 # no Xinerama

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

7129 fi
7130 else
7131 OOO_JUNIT_JAR=$with_junit
7132 fi
7133 if test "$_os" = "WINNT"; then
7134 OOO_JUNIT_JAR=`cygpath -m "$OOO_JUNIT_JAR"`
7135 fi
7136 "$JAVA_HOME/bin/jar" tf "$OOO_JUNIT_JAR" 2>&5 | \
7137 grep org/junit/Before.class > /dev/null 2>&5
7137 $GREP org/junit/Before.class > /dev/null 2>&5
7138 if test $? -eq 0; then
7139 AC_MSG_RESULT([$OOO_JUNIT_JAR])
7140 else
7141 AC_MSG_RESULT([no])
7142 AC_MSG_ERROR([cannot find JUnit 4 jar; please install one in the default
7143location (/usr/share/java), specify its pathname via
7144--with-junit=..., or disable it via --without-junit])
7145 fi

--- 201 unchanged lines hidden --- 		7138 if test $? -eq 0; then
7139 AC_MSG_RESULT([$OOO_JUNIT_JAR])
7140 else
7141 AC_MSG_RESULT([no])
7142 AC_MSG_ERROR([cannot find JUnit 4 jar; please install one in the default
7143location (/usr/share/java), specify its pathname via
7144--with-junit=..., or disable it via --without-junit])
7145 fi

--- 201 unchanged lines hidden ---