[Jukebox-cvs] CVS update: J4 Makefile.am acinclude.m4 configure.in

[CVS B. <vt...@fr...>]

  User: vt      
  Date: 00/07/16 19:15:25

  Modified:    .        Makefile.am acinclude.m4 configure.in
  Log:
  Adjusted the behavior to accomodate JDK 1.3 changes
  
  Revision  Changes    Path
  1.24      +6 -5      J4/Makefile.am
  
  CVSWEB Options: -------------------
  
  CVSWeb: Annotate this file:         http://cvs.sourceforge.net/cgi-bin/cvsweb.cgi/J4/Makefile.am?annotate=1.24&cvsroot=jukebox4
  
  CVSWeb: View this file:             http://cvs.sourceforge.net/cgi-bin/cvsweb.cgi/J4/Makefile.am?rev=1.24&content-type=text/x-cvsweb-markup&cvsroot=jukebox4
  
  CVSWeb: Diff to previous version:   http://cvs.sourceforge.net/cgi-bin/cvsweb.cgi/J4/Makefile.am.diff?r1=1.24&r2=1.23&cvsroot=jukebox4
  
  -----------------------------------
  
  Index: Makefile.am
  ===================================================================
  RCS file: /usr/local/cvs/J4/Makefile.am,v
  retrieving revision 1.23
  retrieving revision 1.24
  diff -u -r1.23 -r1.24
  --- Makefile.am	2000/07/06 10:46:58	1.23
  +++ Makefile.am	2000/07/17 02:15:25	1.24
  @@ -1,11 +1,11 @@
   ## Makefile.am: top level automake makefile for Jukebox.
   ## Process this file with automake to get Makefile.in
   ##
  -## $Id: Makefile.am,v 1.23 2000/07/06 10:46:58 vt Exp $
  +## $Id: Makefile.am,v 1.24 2000/07/17 02:15:25 vt Exp $
   
   # Makefile.in: top level autoconf makefile for Jukebox.
   #
  -# $Id: Makefile.am,v 1.23 2000/07/06 10:46:58 vt Exp $
  +# $Id: Makefile.am,v 1.24 2000/07/17 02:15:25 vt Exp $
   
   AUTOMAKE_OPTIONS = gnu
   
  @@ -85,14 +85,15 @@
   EJB_PACKAGES =
   endif
   
  -if JDBC
  -JDBC_PACKAGES = gnu.j4.io.storage.jdbc
  +if JAVA1
  +JAVA1_PACKAGES = gnu.j4.io.storage.jdbc
   else
  -JDBC_PACKAGES =
  +JAVA1_PACKAGES =
   endif
   
   PACKAGES = ${CORE_PACKAGES} \
   	   ${MAIL_PACKAGES} \
  +	   ${JAVA1_PACKAGES} \
   	   ${EJB_PACKAGES}
   
   # 'JAVADOCX' is the javadoc properly wrapped in a classpath definition,
  
  
  
  1.25      +8 -4      J4/acinclude.m4
  
  CVSWEB Options: -------------------
  
  CVSWeb: Annotate this file:         http://cvs.sourceforge.net/cgi-bin/cvsweb.cgi/J4/acinclude.m4?annotate=1.25&cvsroot=jukebox4
  
  CVSWeb: View this file:             http://cvs.sourceforge.net/cgi-bin/cvsweb.cgi/J4/acinclude.m4?rev=1.25&content-type=text/x-cvsweb-markup&cvsroot=jukebox4
  
  CVSWeb: Diff to previous version:   http://cvs.sourceforge.net/cgi-bin/cvsweb.cgi/J4/acinclude.m4.diff?r1=1.25&r2=1.24&cvsroot=jukebox4
  
  -----------------------------------
  
  Index: acinclude.m4
  ===================================================================
  RCS file: /usr/local/cvs/J4/acinclude.m4,v
  retrieving revision 1.24
  retrieving revision 1.25
  diff -u -r1.24 -r1.25
  --- acinclude.m4	2000/07/17 00:05:01	1.24
  +++ acinclude.m4	2000/07/17 02:15:25	1.25
  @@ -120,7 +120,6 @@
   
                           3)
                               AC_MSG_RESULT([guess Java 2 (1.3? You better pay attention to the rest, untested)])
  -                            JAVA_PLATFORM=2
                               ;;
   
                           *)
  @@ -156,11 +155,16 @@
               dnl This requires a bit of tweaking to be handled properly, but
               dnl the default is good enough
               
  -            JAVA_PLATFORM="2"
  -            AC_SUBST(JAVA_PLATFORM)
  +            if ${TEST} "${JAVA_PLATFORM}" = "3" ; then
  +                AC_MSG_RESULT([with all due respect, I will not downgrade])
  +            else
  +                JAVA_PLATFORM="2"
  +                AC_SUBST(JAVA_PLATFORM)
  +                AC_MSG_RESULT(forced Java ${JAVA_PLATFORM})
  +            fi
           ])
   
  -        AC_MSG_RESULT(forced Java ${JAVA_PLATFORM})
  +        
   
       fi
   
  
  
  
  1.62      +12 -4     J4/configure.in
  
  CVSWEB Options: -------------------
  
  CVSWeb: Annotate this file:         http://cvs.sourceforge.net/cgi-bin/cvsweb.cgi/J4/configure.in?annotate=1.62&cvsroot=jukebox4
  
  CVSWeb: View this file:             http://cvs.sourceforge.net/cgi-bin/cvsweb.cgi/J4/configure.in?rev=1.62&content-type=text/x-cvsweb-markup&cvsroot=jukebox4
  
  CVSWeb: Diff to previous version:   http://cvs.sourceforge.net/cgi-bin/cvsweb.cgi/J4/configure.in.diff?r1=1.62&r2=1.61&cvsroot=jukebox4
  
  -----------------------------------
  
  Index: configure.in
  ===================================================================
  RCS file: /usr/local/cvs/J4/configure.in,v
  retrieving revision 1.61
  retrieving revision 1.62
  diff -u -r1.61 -r1.62
  --- configure.in	2000/07/17 00:05:01	1.61
  +++ configure.in	2000/07/17 02:15:25	1.62
  @@ -1,6 +1,6 @@
   dnl Process this file with autoconf to produce a configure script.
   
  -AC_REVISION($Id: configure.in,v 1.61 2000/07/17 00:05:01 vt Exp $)dnl
  +AC_REVISION($Id: configure.in,v 1.62 2000/07/17 02:15:25 vt Exp $)dnl
   
   dnl I'd like it to read the ./configure-options to allow both the basic set
   dnl of options, as well as the local set.
  @@ -386,12 +386,10 @@
   
   AC_SUBST(JAVA_OPT)
   
  +AM_CONDITIONAL(JAVA1, ${TEST} "${JAVA_PLATFORM}" = 1)
   AM_CONDITIONAL(JAVA2, ${TEST} "${JAVA_PLATFORM}" = 2)
  +AM_CONDITIONAL(JAVA3, ${TEST} "${JAVA_PLATFORM}" = 3)
   
  -dnl I'm cheating here, allowing JDBC only for JDK 1.1.
  -
  -AM_CONDITIONAL(JDBC, ${TEST} "${JAVA_PLATFORM}" = 1)
  -
   AC_OUTPUT(
   	index.html
   	buildtools/Makefile
  @@ -459,6 +457,16 @@
   AC_MSG_RESULT(Jukebox will be installed to: ${prefix})
   AC_MSG_RESULT(Configuration files are in:   ${prefix}/etc)
   AC_MSG_RESULT(JDK used:                     ${JDK_HOME})
  +
  +dnl Let's tell them what thread lib we're using
  +
  +if ${TEST} -n "${GREEN}" ; then
  +    THREADLIB="green"
  +else
  +    THREADLIB="native"
  +fi
  +
  +AC_MSG_RESULT(Thread library:               ${THREADLIB})
   
   AC_MSG_RESULT(Build classpath is set to:    ${TARGET_CLASSPATH})