SF.net SVN: openvrml:[3969] trunk

[<br...@us...>]

Revision: 3969
          http://openvrml.svn.sourceforge.net/openvrml/?rev=3969&view=rev
Author:   braden
Date:     2009-07-12 06:37:50 +0000 (Sun, 12 Jul 2009)

Log Message:
-----------
Remove obsolete configuration code supporting linking with libjvm.  (We don't do that anymore.)

Modified Paths:
--------------
    trunk/ChangeLog
    trunk/examples/Makefile.am
    trunk/m4/jdk.m4

Modified: trunk/ChangeLog
===================================================================
--- trunk/ChangeLog	2009-07-12 06:31:31 UTC (rev 3968)
+++ trunk/ChangeLog	2009-07-12 06:37:50 UTC (rev 3969)
@@ -1,5 +1,13 @@
 2009-07-12 Braden McDaniel  <br...@en...>
 
+	Remove obsolete configuration code supporting linking with
+	libjvm.  (We don't do that anymore.)
+
+	* examples/Makefile.am: Removed obsolete use of JNI_LIBS.
+	* m4/jdk.m4: Removed unused OV_CHECK_JNI macro.
+
+2009-07-12 Braden McDaniel  <br...@en...>
+
 	* tests/Makefile.am: Removed obsolete use of OPENVRML_RPATH.
 
 2009-07-12 Braden McDaniel  <br...@en...>

Modified: trunk/examples/Makefile.am
===================================================================
--- trunk/examples/Makefile.am	2009-07-12 06:31:31 UTC (rev 3968)
+++ trunk/examples/Makefile.am	2009-07-12 06:37:50 UTC (rev 3969)
@@ -20,7 +20,7 @@
         -I$(top_builddir)/src/libopenvrml-gl \
         -I$(top_srcdir)/src/libopenvrml-gl
 sdl_viewer_CXXFLAGS = $(SDL_CFLAGS)
-sdl_viewer_LDFLAGS = $(SDL_LIBS) $(JNI_LIBS) $(GLU_LIBS)
+sdl_viewer_LDFLAGS = $(SDL_LIBS) $(GLU_LIBS)
 sdl_viewer_LDADD = $(top_builddir)/src/libopenvrml-gl/libopenvrml-gl.la
 
 pretty_print_SOURCES = pretty_print.cpp

Modified: trunk/m4/jdk.m4
===================================================================
--- trunk/m4/jdk.m4	2009-07-12 06:31:31 UTC (rev 3968)
+++ trunk/m4/jdk.m4	2009-07-12 06:37:50 UTC (rev 3969)
@@ -15,38 +15,6 @@
 # along with this program; if not, write to the Free Software
 # Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
 
-#
-# OV_CHECK_JNI
-# ------------
-# Check for a Java Native Interface implementation.  If one is found, the
-# required linker flags are included in the output variable "JNI_LIBS";
-# otherwise, the shell variable "no_jni" is set to "yes".
-#
-AC_DEFUN([OV_CHECK_JNI],
-[AC_MSG_CHECKING([for JNI library])
-AC_CACHE_VAL([ov_cv_check_jni_libjvm],
-[ov_cv_check_jni_libjvm=no
-AC_LANG_PUSH(C)
-ov_save_LIBS="${LIBS}"
-LIBS=""
-ov_check_libs="-ljvm -lgcj"
-for ov_lib in ${ov_check_libs}; do
-  LIBS="${ov_lib} ${ov_save_libs}"
-  AC_TRY_LINK([#include <jni.h>], [JNI_CreateJavaVM(0, 0, 0)],
-              [ov_cv_check_jni_libjvm=${ov_lib}; break])
-done
-LIBS="${ov_save_LIBS}"
-AC_LANG_POP(C)])
-AC_MSG_RESULT([$ov_cv_check_jni_libjvm])
-if test "X${ov_cv_check_jni_libjvm}" = "Xno"; then
-  no_jni=yes
-else
-  JNI_LIBS="${ov_cv_check_jni_libjvm}"
-fi
-AC_SUBST([JNI_LIBS])
-])
-
-
 AC_DEFUN([OV_PROG_JAVA],
 [AC_ARG_VAR([JAVA], [Java interpreter command])dnl
 AC_ARG_VAR([JAVAFLAGS], [Java interpreter flags])dnl


This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.