| configure.ac (24fe865a) | configure.ac (897adb27) |
|---|---|
| 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 --- 2827 unchanged lines hidden (view full) --- 2836 if test -z "$with_jdk_home"; then 2837 AC_PATH_PROG(JAVAINTERPRETER, $WITH_JAVA) 2838 else 2839 _java_path="$with_jdk_home/bin/$WITH_JAVA" 2840 dnl Check if there is a java interpreter at all. 2841 if test -x "$_java_path"; then 2842 JAVAINTERPRETER=$_java_path 2843 else | 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 --- 2827 unchanged lines hidden (view full) --- 2836 if test -z "$with_jdk_home"; then 2837 AC_PATH_PROG(JAVAINTERPRETER, $WITH_JAVA) 2838 else 2839 _java_path="$with_jdk_home/bin/$WITH_JAVA" 2840 dnl Check if there is a java interpreter at all. 2841 if test -x "$_java_path"; then 2842 JAVAINTERPRETER=$_java_path 2843 else |
| 2844 AC_MSG_ERROR([$_java_path not found, please use --with_jdk_home]) | 2844 AC_MSG_ERROR([$_java_path not found, please use --with-jdk-home]) |
| 2845 fi 2846 fi 2847 if test "$_os" = "WINNT"; then 2848 if test x`echo "$JAVAINTERPRETER" | grep -i '\.exe$'` = x; then 2849 JAVAINTERPRETER="${JAVAINTERPRETER}.exe" 2850 fi 2851 JAVAINTERPRETER=`cygpath -d "$JAVAINTERPRETER"` 2852 JAVAINTERPRETER=`cygpath -u "$JAVAINTERPRETER"` --- 134 unchanged lines hidden (view full) --- 2987 else 2988 _javac_path="$with_jdk_home/bin/$javacompiler" 2989 dnl Check if there is a java compiler at all. 2990 if test -x "$_javac_path"; then 2991 JAVACOMPILER=$_javac_path 2992 fi 2993 fi 2994 if test -z "$JAVACOMPILER"; then | 2845 fi 2846 fi 2847 if test "$_os" = "WINNT"; then 2848 if test x`echo "$JAVAINTERPRETER" | grep -i '\.exe$'` = x; then 2849 JAVAINTERPRETER="${JAVAINTERPRETER}.exe" 2850 fi 2851 JAVAINTERPRETER=`cygpath -d "$JAVAINTERPRETER"` 2852 JAVAINTERPRETER=`cygpath -u "$JAVAINTERPRETER"` --- 134 unchanged lines hidden (view full) --- 2987 else 2988 _javac_path="$with_jdk_home/bin/$javacompiler" 2989 dnl Check if there is a java compiler at all. 2990 if test -x "$_javac_path"; then 2991 JAVACOMPILER=$_javac_path 2992 fi 2993 fi 2994 if test -z "$JAVACOMPILER"; then |
| 2995 AC_MSG_ERROR([$javacompiler not found, please use --with_jdk_home]) | 2995 AC_MSG_ERROR([$javacompiler not found, please use --with-jdk-home]) |
| 2996 fi 2997 if test "$_os" = "WINNT"; then 2998 if test x`echo "$JAVACOMPILER" | grep -i '\.exe$'` = x; then 2999 JAVACOMPILER="${JAVACOMPILER}.exe" 3000 fi 3001 JAVACOMPILER=`cygpath -d "$JAVACOMPILER"` 3002 JAVACOMPILER=`cygpath -u "$JAVACOMPILER"` 3003 fi --- 40 unchanged lines hidden (view full) --- 3044 dnl Check if there is a javadoc at all. 3045 if test -x "$_javadoc_path"; then 3046 JAVADOC=$_javadoc_path 3047 else 3048 AC_PATH_PROG(JAVADOC, javadoc) 3049 fi 3050 fi 3051 if test -z "$JAVADOC"; then | 2996 fi 2997 if test "$_os" = "WINNT"; then 2998 if test x`echo "$JAVACOMPILER" | grep -i '\.exe$'` = x; then 2999 JAVACOMPILER="${JAVACOMPILER}.exe" 3000 fi 3001 JAVACOMPILER=`cygpath -d "$JAVACOMPILER"` 3002 JAVACOMPILER=`cygpath -u "$JAVACOMPILER"` 3003 fi --- 40 unchanged lines hidden (view full) --- 3044 dnl Check if there is a javadoc at all. 3045 if test -x "$_javadoc_path"; then 3046 JAVADOC=$_javadoc_path 3047 else 3048 AC_PATH_PROG(JAVADOC, javadoc) 3049 fi 3050 fi 3051 if test -z "$JAVADOC"; then |
| 3052 AC_MSG_ERROR([$_javadoc_path not found, please use --with_jdk_home]) | 3052 AC_MSG_ERROR([$_javadoc_path not found, please use --with-jdk-home]) |
| 3053 fi 3054 if test "$_os" = "WINNT"; then 3055 if test x`echo "$JAVADOC" | grep -i '\.exe$'` = x; then 3056 JAVADOC="${JAVADOC}.exe" 3057 fi 3058 JAVADOC=`cygpath -d "$JAVADOC"` 3059 JAVADOC=`cygpath -u "$JAVADOC"` 3060 fi --- 168 unchanged lines hidden (view full) --- 3229 if test -x "$_javac_path"; then 3230 JAVAAOTCOMPILER=$_javac_path 3231 fi 3232 fi 3233 if test -z "$JAVAAOTCOMPILER"; then 3234 AC_PATH_PROG(JAVAAOTCOMPILER, $gcjaot) 3235 fi 3236 if test -z "$JAVAAOTCOMPILER"; then | 3053 fi 3054 if test "$_os" = "WINNT"; then 3055 if test x`echo "$JAVADOC" | grep -i '\.exe$'` = x; then 3056 JAVADOC="${JAVADOC}.exe" 3057 fi 3058 JAVADOC=`cygpath -d "$JAVADOC"` 3059 JAVADOC=`cygpath -u "$JAVADOC"` 3060 fi --- 168 unchanged lines hidden (view full) --- 3229 if test -x "$_javac_path"; then 3230 JAVAAOTCOMPILER=$_javac_path 3231 fi 3232 fi 3233 if test -z "$JAVAAOTCOMPILER"; then 3234 AC_PATH_PROG(JAVAAOTCOMPILER, $gcjaot) 3235 fi 3236 if test -z "$JAVAAOTCOMPILER"; then |
| 3237 AC_MSG_WARN([$gcjaot not found, please use --with_jdk_home]) | 3237 AC_MSG_WARN([$gcjaot not found, please use --with-jdk-home]) |
| 3238 fi 3239 else 3240 AC_MSG_RESULT([no]) 3241 fi 3242fi 3243 3244AC_SUBST(JAVA_HOME) 3245AC_SUBST(JDK) --- 4179 unchanged lines hidden --- | 3238 fi 3239 else 3240 AC_MSG_RESULT([no]) 3241 fi 3242fi 3243 3244AC_SUBST(JAVA_HOME) 3245AC_SUBST(JDK) --- 4179 unchanged lines hidden --- |