Date: Thu, 21 Jan 1999 07:05:41 +0200 (SAT) From: Peter van Heusden <pvh@leftside.wcape.school.za> To: java@FreeBSD.ORG, java@ak.sax.de Subject: Patch for TYA 1.2v3 configure.in Message-ID: <Pine.BSF.4.02A.9901210701100.15055-100000@leftside.wcape.school.za>
next in thread | raw e-mail | index | archive | help
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 <patchfile. Peter P.S. TYA is very cool - the NetBeans IDE seems to run much faster with it than without it. ---START *** configure.in.old Thu Jan 21 06:58:39 1999 --- configure.in Thu Jan 21 06:58:50 1999 *************** *** 40,131 **** AC_MSG_CHECKING(java port) dnl TODO: We should check if java is available at all in path ! jversion=`$javabin -version 2>&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
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?Pine.BSF.4.02A.9901210701100.15055-100000>