View | Details | Raw Unified | Return to bug 127112
Collapse All | Expand All

(-)configure (-3 / +24 lines)
Lines 2496-2503 Link Here
2496
echo "${ECHO_T}$ac_cv_jdk_version" >&6
2496
echo "${ECHO_T}$ac_cv_jdk_version" >&6
2497
case "$ac_cv_jdk_version" in
2497
case "$ac_cv_jdk_version" in
2498
1.1|1.2*)
2498
1.1|1.2*)
2499
	{ { echo "$as_me:$LINENO: error: Java 1.3.x or 1.4.x is needed" >&5
2499
	{ { echo "$as_me:$LINENO: error: Java >=1.3.x is needed" >&5
2500
echo "$as_me: error: Java 1.3.x or 1.4.x is needed" >&2;}
2500
echo "$as_me: error: Java >=1.3.x is needed" >&2;}
2501
   { (exit 1); exit 1; }; }
2501
   { (exit 1); exit 1; }; }
2502
	;;
2502
	;;
2503
1.3*)
2503
1.3*)
Lines 2507-2512 Link Here
2507
	JAVAHFLAGS=""
2507
	JAVAHFLAGS=""
2508
	JAVA_INCLUDES="$ac_cv_java_home/include"
2508
	JAVA_INCLUDES="$ac_cv_java_home/include"
2509
	JAVA_INCLUDES_OS="$ac_cv_java_home/include/$PLATFORM"
2509
	JAVA_INCLUDES_OS="$ac_cv_java_home/include/$PLATFORM"
2510
	JAVA_LIBS_OS=""
2510
	;;
2511
	;;
2511
1.4*)
2512
1.4*)
2512
	JDK_VERSION_STRING=$ac_cv_jdk_version
2513
	JDK_VERSION_STRING=$ac_cv_jdk_version
Lines 2515-2521 Link Here
2515
	JAVAHFLAGS=""
2516
	JAVAHFLAGS=""
2516
	JAVA_INCLUDES="$ac_cv_java_home/include"
2517
	JAVA_INCLUDES="$ac_cv_java_home/include"
2517
	JAVA_INCLUDES_OS="$ac_cv_java_home/include/$JNI_MD_H_SUBDIR"
2518
	JAVA_INCLUDES_OS="$ac_cv_java_home/include/$JNI_MD_H_SUBDIR"
2518
#	AC_MSG_ERROR(jdk 1.4 is not yet supported)
2519
	JAVA_LIBS_OS=""
2520
	;;
2521
1.5*)
2522
	JDK_VERSION_STRING=$ac_cv_jdk_version
2523
	JDK_VERSION=15
2524
	JAVACFLAGS="-classpath ."
2525
	JAVAHFLAGS=""
2526
	JAVA_INCLUDES="$ac_cv_java_home/include"
2527
	JAVA_INCLUDES_OS="$ac_cv_java_home/include/$JNI_MD_H_SUBDIR"
2528
	JAVA_LIBS_OS="$ac_cv_java_home/jre/lib/i386:$ac_cv_java_home/jre/lib/i386/xawt"
2529
	;;
2530
1.6*)
2531
	JDK_VERSION_STRING=$ac_cv_jdk_version
2532
	JDK_VERSION=16
2533
	JAVACFLAGS="-classpath ."
2534
	JAVAHFLAGS=""
2535
	JAVA_INCLUDES="$ac_cv_java_home/include"
2536
	JAVA_INCLUDES_OS="$ac_cv_java_home/include/$JNI_MD_H_SUBDIR"
2537
	JAVA_LIBS_OS="$ac_cv_java_home/jre/lib/i386:$ac_cv_java_home/jre/lib/i386/xawt"
2519
	;;
2538
	;;
2520
*)
2539
*)
2521
	{ { echo "$as_me:$LINENO: error: unrecognized JDK version:$ac_cv_jdk_version" >&5
2540
	{ { echo "$as_me:$LINENO: error: unrecognized JDK version:$ac_cv_jdk_version" >&5
Lines 2527-2532 Link Here
2527
2546
2528
2547
2529
2548
2549
2530
# Extract the first word of "javac", so it can be a program name with args.
2550
# Extract the first word of "javac", so it can be a program name with args.
2531
set dummy javac; ac_word=$2
2551
set dummy javac; ac_word=$2
2532
echo "$as_me:$LINENO: checking for $ac_word" >&5
2552
echo "$as_me:$LINENO: checking for $ac_word" >&5
Lines 3627-3632 Link Here
3627
s,@JAVA@,$JAVA,;t t
3647
s,@JAVA@,$JAVA,;t t
3628
s,@JAVA_INCLUDES@,$JAVA_INCLUDES,;t t
3648
s,@JAVA_INCLUDES@,$JAVA_INCLUDES,;t t
3629
s,@JAVA_INCLUDES_OS@,$JAVA_INCLUDES_OS,;t t
3649
s,@JAVA_INCLUDES_OS@,$JAVA_INCLUDES_OS,;t t
3650
s,@JAVA_LIBS_OS@,$JAVA_LIBS_OS,;t t
3630
s,@ac_cv_javac@,$ac_cv_javac,;t t
3651
s,@ac_cv_javac@,$ac_cv_javac,;t t
3631
s,@ac_cv_jikes@,$ac_cv_jikes,;t t
3652
s,@ac_cv_jikes@,$ac_cv_jikes,;t t
3632
s,@JAVAC@,$JAVAC,;t t
3653
s,@JAVAC@,$JAVAC,;t t

Return to bug 127112