From a423698f97ae768ed9e8c71b9c7adae82493d761 Mon Sep 17 00:00:00 2001 From: Ernst de Haan Date: Mon, 15 Dec 2003 07:04:50 +0000 Subject: Fixed bug. If a Linux 1.4 JDK would have been installed, it would not have been picked up if USE_JAVA was set to "1.3+". The behaviour is now as follows if USE_JAVA is set to "1.3+": - If the setting is 1.3+, then use an already installed 1.3 or 1.4 JDK. If there is no such JDK, then set USE_JAVA to 1.3. The FreeBSD JDK 1.4 is preferred over all other JDK's. Noticed by: pav --- Mk/bsd.java.mk | 11 +++++++---- 1 file changed, 7 insertions(+), 4 deletions(-) (limited to 'Mk/bsd.java.mk') diff --git a/Mk/bsd.java.mk b/Mk/bsd.java.mk index 8df6def91a15..76e181ead03f 100644 --- a/Mk/bsd.java.mk +++ b/Mk/bsd.java.mk @@ -204,7 +204,7 @@ JAVA_HOME= ${_JAVA_HOME} # # If the setting is 1.3+, then use an already installed 1.3 or 1.4 JDK. If # there is no such JDK, then set USE_JAVA to 1.3. The FreeBSD JDK 1.4 is -# preferred over 1.3 JDK's. +# preferred over all other JDK's. # # If the setting is 1.4+, then set it to 1.4 right away. There is no other # option at the moment. @@ -254,11 +254,14 @@ USE_JAVA= 1.4 defined(HAVE_JAVA_FREEBSD_1_3) || \ defined(HAVE_JAVA_SUN_LINUX_1_3) || \ defined(HAVE_JAVA_IBM_LINUX_1_3) || \ - defined(HAVE_JAVA_BLACKDOWN_LINUX_1_3) || \ - !defined(HAVE_JAVA_SUN_LINUX_1_4) + defined(HAVE_JAVA_BLACKDOWN_LINUX_1_3) USE_JAVA= 1.3 -. else +. elif defined(HAVE_JAVA_SUN_LINUX_1_4) || \ + defined(HAVE_JAVA_IBM_LINUX_1_4) || \ + defined(HAVE_JAVA_BLACKDOWN_LINUX_1_4) USE_JAVA= 1.4 +. else +USE_JAVA= 1.3 . endif . elif (${USE_JAVA} == "1.4+") -- cgit v1.2.3