Changeset 3065


Ignore:
Timestamp:
Jun 28, 2012, 9:20:47 AM (12 years ago)
Author:
gah
Message:

don't build java binding unless we find jni.h

Location:
trunk
Files:
2 edited

Legend:

Unmodified
Added
Removed

  • trunk/cf/rpLangJava.m4

    r2298 r3065  
    3030   ${JAVA_HOME} \
    3131   /apps/java/jdk1.6* \
     32   /usr/lib/jvm/java-6-openjdk \
     33   /usr/lib/jvm/icedtea-6 \
    3234   /usr/lib/jvm/*sun-1.6* \
    3335   /opt/sun-jdk-1.6* \
     36   /usr/lib/jvm/icedtea-7 \
    3437   /opt/icedtea6-* \
    3538   /opt/sun-jdk-1.5* \
    36    /usr/lib/jvm/*sun-1.5*
     39   /usr/lib/jvm/*sun-1.5* 
    3740  do
    3841    if test -r "${d}/include/jni.h" ; then

  • trunk/lang/Makefile.in

    r2709 r3065  
    2121MEX             = @MEX@
    2222OCTAVE          = @OCTAVE_VERSION@
    23 JAVAC           = @JAVAC@
     23JAVA_INC_DIR    = @JAVA_INC_DIR@
    2424R               = @R@
    2525
    … …  
    4242  LANGS += octave
    4343endif
    44 ifneq ($(JAVAC),)
     44ifneq ($(JAVA_INC_DIR),)
    4545  LANGS += java
    4646endif
Note: See TracChangeset for help on using the changeset viewer.