[Cdk-commits] CVS: cdk/packages/tar/cdk-bin ChangeLog,1.6,1.7 VERSION,1.5,1.6 configure.in,1.10,1.11

[Egon W. <eg...@us...>]

Update of /cvsroot/cdk/cdk/packages/tar/cdk-bin
In directory usw-pr-cvs1:/tmp/cvs-serv28938

Modified Files:
	ChangeLog VERSION configure.in 
Log Message:
Fixed bug in Java3D detection.


Index: ChangeLog
===================================================================
RCS file: /cvsroot/cdk/cdk/packages/tar/cdk-bin/ChangeLog,v
retrieving revision 1.6
retrieving revision 1.7
diff -C2 -r1.6 -r1.7
*** ChangeLog	19 Apr 2002 13:40:03 -0000	1.6
--- ChangeLog	15 May 2002 14:03:49 -0000	1.7
***************
*** 1,2 ****
--- 1,7 ----
+ 20020518
+ =================
+ * removed bugs in detection of Java3D
+ * added Java3D jars to cdk-view classpath
+ 
  20020419
  =================

Index: VERSION
===================================================================
RCS file: /cvsroot/cdk/cdk/packages/tar/cdk-bin/VERSION,v
retrieving revision 1.5
retrieving revision 1.6
diff -C2 -r1.5 -r1.6
*** VERSION	19 Apr 2002 13:40:03 -0000	1.5
--- VERSION	15 May 2002 14:03:49 -0000	1.6
***************
*** 1 ****
! 20020419
--- 1 ----
! 20020518

Index: configure.in
===================================================================
RCS file: /cvsroot/cdk/cdk/packages/tar/cdk-bin/configure.in,v
retrieving revision 1.10
retrieving revision 1.11
diff -C2 -r1.10 -r1.11
*** configure.in	8 Feb 2002 12:57:16 -0000	1.10
--- configure.in	15 May 2002 14:03:49 -0000	1.11
***************
*** 86,92 ****
  AC_MSG_CHECKING(for Java3D lib)
  if test -f "$JAVA3DDIR/lib/ext/j3dcore.jar"
-     AC_MSG_RESULT($JAVA3DDIR/lib/ext/j3dcore.jar)
-     PATHTO3DJAR="$JAVA3DDIR/lib/ext/j3dcore.jar:$JAVA3DDIR/lib/ext/j3dutils.jar:$JAVA3DDIR/lib/ext/vecmath.jar"
  then
      if test "x$prefix" = xNONE
      then
--- 86,92 ----
  AC_MSG_CHECKING(for Java3D lib)
  if test -f "$JAVA3DDIR/lib/ext/j3dcore.jar"
  then
+     PATHTO3DJAR="$JAVA3DDIR/lib/ext/j3dcore.jar:$JAVA3DDIR/lib/ext/j3dutils.jar:$JAVA3DDIR/lib/ext/vecmath.jar"
+ else
      if test "x$prefix" = xNONE
      then
***************
*** 102,111 ****
      for d in $try_dirs
      do
!         if test -f "$d/j3dcore.jar"
!         then 
!             AC_MSG_RESULT($d/j3dcore.jar)
!             PATHTO3DJAR="$d/j3dcore.jar:$d/j3dutils.jar:$d/vecmath.jar"
          fi
      done
  fi
  AC_SUBST(PATHTO3DJAR)
--- 102,116 ----
      for d in $try_dirs
      do
!         if test -f "$d/lib/ext/j3dcore.jar"
!         then
!             PATHTO3DJAR="$d/lib/ext/j3dcore.jar:$d/lib/ext/j3dutils.jar:$d/lib/ext/vecmath.jar"
          fi
      done
+ fi
+ if test "x$PATHTO3DJAR" = "x"
+ then
+     AC_MSG_RESULT(no)
+ else
+     AC_MSG_RESULT($PATHTO3DJAR)
  fi
  AC_SUBST(PATHTO3DJAR)