From owner-freebsd-java Thu Jan 21 21:43:26 1999 Return-Path: Received: (from majordom@localhost) by hub.freebsd.org (8.8.8/8.8.8) id VAA21531 for freebsd-java-outgoing; Thu, 21 Jan 1999 21:43:26 -0800 (PST) (envelope-from owner-freebsd-java@FreeBSD.ORG) Received: from picasso.wcape.school.za (picasso.wcape.school.za [196.21.102.12]) by hub.freebsd.org (8.8.8/8.8.8) with ESMTP id VAA21517 for ; Thu, 21 Jan 1999 21:43:22 -0800 (PST) (envelope-from pvh@leftside.wcape.school.za) Received: from uucp by picasso.wcape.school.za with local-rmail (Exim 2.05 #1) id 103XRj-0006Lc-00; Fri, 22 Jan 1999 05:39:47 +0200 Received: from localhost (pvh@localhost) by leftside.wcape.school.za (8.8.8/8.8.4) with SMTP id HAA15060; Thu, 21 Jan 1999 07:05:41 +0200 (SAT) Date: Thu, 21 Jan 1999 07:05:41 +0200 (SAT) From: Peter van Heusden To: java@FreeBSD.ORG, java@ak.sax.de Subject: Patch for TYA 1.2v3 configure.in Message-ID: MIME-Version: 1.0 Content-Type: TEXT/PLAIN; charset=US-ASCII Sender: owner-freebsd-java@FreeBSD.ORG Precedence: bulk X-Loop: FreeBSD.org Here's a patch for TYA 1.2v3 configure.in - this adds a check based on 'uname -s' (is that cross-platform portable?) to see if it is on FreeBSD. It also checks that java actually exists on the system (by running 'java -version'). Apply with patch -N &1` ! case "$jversion" in ! java*root:08/30/97*) ! AC_MSG_RESULT(recognized: Byrne JDK1.1.3-v3 libc) ! AC_DEFINE(PORT_ROOT083097) ! AC_DEFINE(JDK113) ! jopt_libdir=../lib/i586/green_threads ! ;; ! java*sbb:08/16/97*) ! AC_MSG_RESULT(recognized: Byrne JDK1.1.3-v2 libc) ! AC_DEFINE(PORT_ROOT081697) ! AC_DEFINE(JDK113) ! jopt_libdir=../lib/i586/green_threads ! ;; ! java*root:02/25/25*) ! AC_MSG_RESULT(recognized: Byrne JDK1.1.5-v5 libc) ! AC_DEFINE(PORT_ROOT022525) ! AC_DEFINE(JDK117) ! jopt_libdir=../lib/i586/green_threads ! ;; ! java*cls:03/11/11*) ! AC_MSG_RESULT(recognized: Byrne JDK1.1.5 glibc) ! AC_DEFINE(PORT_CLS031111) ! AC_DEFINE(JDK117) ! jopt_libdir=../lib/i586/green_threads ! ;; ! java*Linux_JDK_1.1.5_v7*) ! AC_MSG_RESULT(recognized: Byrne JDK1.1.5-v7 libc) ! AC_DEFINE(PORT_BYRNE042798) ! AC_DEFINE(JDK117) ! jopt_libdir=../lib/i586/green_threads ! ;; ! java*Linux_JDK_1.1.6_v1*) ! AC_MSG_RESULT(recognized: Byrne 1.1.6-v1 libc) ! AC_DEFINE(PORT_BYRNE042798) ! AC_DEFINE(JDK117) ! jopt_libdir=../lib/i586/green_threads ! ;; ! java*1.1.6*) ! AC_MSG_RESULT(recognized: Byrne 1.1.6-vX) ! AC_DEFINE(PORT_BYRNE061498) ! AC_DEFINE(JDK117) ! jopt_libdir=../lib/i586/green_threads ! ;; ! java*1.1.7*) ! AC_MSG_RESULT(recognized: Byrne 1.1.7-vX) ! AC_DEFINE(PORT_BYRNE061498) ! AC_DEFINE(JDK117) ! jopt_libdir=../lib/i586/green_threads ! ;; ! java*Sergey_Nikitin:12/21/97*) ! AC_MSG_RESULT(recognized: Nikitin JDK1.1.5 first glibc) ! AC_DEFINE(PORT_NIKITIN122197) ! AC_DEFINE(JDK117) ! jopt_libdir=../lib/Linux/green_threads ! ;; ! java*JDK_1*by_Sergey_Nikitin*03/18/98*) ! AC_MSG_RESULT(recognized: Nikitin JDK1.1.5 second glibc) ! AC_DEFINE(PORT_NIKITIN031898) ! AC_DEFINE(JDK117) ! jopt_libdir=../lib/Linux/green_threads ! ;; ! java*Sergey_Nikitin*06/08/98*) ! AC_MSG_RESULT(recognized: Nikitin JDK1.1.5 or 6? libc) ! AC_DEFINE(PORT_NIKITIN060898) ! AC_DEFINE(JDK117) ! jopt_libdir=../lib/Linux/green_threads ! ;; ! java*Freebsd:02/25/98*) ! AC_MSG_RESULT(recognized: FreeBSD JDK1.1.5 / TYA:experimental) ! AC_DEFINE(PORT_FREEBSD022598) ! AC_DEFINE(JDK117) ! AC_DEFINE(FREEBSD) ! jopt_libdir=../lib/i386/green_threads ! ;; ! java*chapman:10/12/12*) ! echo "This version (jdk1.0) is no longer supported." ! ;; ! *) AC_MSG_RESULT(UNRECOGNIZED!!!!) ! echo "Unknown version of java. Try to config manually by" ! echo "editing configure.in and aconfig.h, and then contact TYA team" ! AC_DEFINE(PORT_UNKNOWN) ! AC_DEFINE(JDKxxx) ! ;; ! esac AC_MSG_CHECKING(if USER_DS works without underscores) AC_EGREP_CPP(yes, --- 40,143 ---- AC_MSG_CHECKING(java port) dnl TODO: We should check if java is available at all in path ! $javabin -version 2>&1 ! if test $? -ne 0 ; then ! AC_MSG_RESULT(Couldn't find Java compiler) ! fi + jversion=`$javabin -version 2>&1` + os=`uname -s 2>/dev/null` + if test "$os" = "FreeBSD" ; then + AC_MSG_RESULT(recognized: FreeBSD Java port) + AC_DEFINE(JDK117) + AC_DEFINE(FREEBSD) + jopt_libdir=../lib/i386/green_threads + else + case "$jversion" in + java*root:08/30/97*) + AC_MSG_RESULT(recognized: Byrne JDK1.1.3-v3 libc) + AC_DEFINE(PORT_ROOT083097) + AC_DEFINE(JDK113) + jopt_libdir=../lib/i586/green_threads + ;; + java*sbb:08/16/97*) + AC_MSG_RESULT(recognized: Byrne JDK1.1.3-v2 libc) + AC_DEFINE(PORT_ROOT081697) + AC_DEFINE(JDK113) + jopt_libdir=../lib/i586/green_threads + ;; + java*root:02/25/25*) + AC_MSG_RESULT(recognized: Byrne JDK1.1.5-v5 libc) + AC_DEFINE(PORT_ROOT022525) + AC_DEFINE(JDK117) + jopt_libdir=../lib/i586/green_threads + ;; + java*cls:03/11/11*) + AC_MSG_RESULT(recognized: Byrne JDK1.1.5 glibc) + AC_DEFINE(PORT_CLS031111) + AC_DEFINE(JDK117) + jopt_libdir=../lib/i586/green_threads + ;; + java*Linux_JDK_1.1.5_v7*) + AC_MSG_RESULT(recognized: Byrne JDK1.1.5-v7 libc) + AC_DEFINE(PORT_BYRNE042798) + AC_DEFINE(JDK117) + jopt_libdir=../lib/i586/green_threads + ;; + java*Linux_JDK_1.1.6_v1*) + AC_MSG_RESULT(recognized: Byrne 1.1.6-v1 libc) + AC_DEFINE(PORT_BYRNE042798) + AC_DEFINE(JDK117) + jopt_libdir=../lib/i586/green_threads + ;; + java*1.1.6*) + AC_MSG_RESULT(recognized: Byrne 1.1.6-vX) + AC_DEFINE(PORT_BYRNE061498) + AC_DEFINE(JDK117) + jopt_libdir=../lib/i586/green_threads + ;; + java*1.1.7*) + AC_MSG_RESULT(recognized: Byrne 1.1.7-vX) + AC_DEFINE(PORT_BYRNE061498) + AC_DEFINE(JDK117) + jopt_libdir=../lib/i586/green_threads + ;; + java*Sergey_Nikitin:12/21/97*) + AC_MSG_RESULT(recognized: Nikitin JDK1.1.5 first glibc) + AC_DEFINE(PORT_NIKITIN122197) + AC_DEFINE(JDK117) + jopt_libdir=../lib/Linux/green_threads + ;; + java*JDK_1*by_Sergey_Nikitin*03/18/98*) + AC_MSG_RESULT(recognized: Nikitin JDK1.1.5 second glibc) + AC_DEFINE(PORT_NIKITIN031898) + AC_DEFINE(JDK117) + jopt_libdir=../lib/Linux/green_threads + ;; + java*Sergey_Nikitin*06/08/98*) + AC_MSG_RESULT(recognized: Nikitin JDK1.1.5 or 6? libc) + AC_DEFINE(PORT_NIKITIN060898) + AC_DEFINE(JDK117) + jopt_libdir=../lib/Linux/green_threads + ;; + dnl java*Freebsd:02/25/98*) + dnl AC_MSG_RESULT(recognized: FreeBSD JDK1.1.5 / TYA:experimental) + dnl AC_DEFINE(PORT_FREEBSD022598) + dnl AC_DEFINE(JDK117) + dnl AC_DEFINE(FREEBSD) + dnl jopt_libdir=../lib/i386/green_threads + dnl ;; + java*chapman:10/12/12*) + echo "This version (jdk1.0) is no longer supported." + ;; + *) AC_MSG_RESULT(UNRECOGNIZED!!!!) + echo "Unknown version of java. Try to config manually by" + echo "editing configure.in and aconfig.h, and then contact TYA team" + AC_DEFINE(PORT_UNKNOWN) + AC_DEFINE(JDKxxx) + ;; + esac + fi AC_MSG_CHECKING(if USER_DS works without underscores) AC_EGREP_CPP(yes, ---END -- Peter van Heusden | Its the 90's, and collective action is STILL cool! pvh@leftside.wcape.school.za | Get active in your union today! To Unsubscribe: send mail to majordomo@FreeBSD.org with "unsubscribe freebsd-java" in the body of the message