Changeset 1733 for trunk/configure.in

Timestamp:

May 24, 2010, 3:48:01 PM (14 years ago)

Author:

gah

Message:

 

File:

• trunk/configure.in (modified) (3 diffs)

trunk/configure.in

@@ -452 +452 @@
 AC_SUBST(RUBY_PLATFORM)
 
-# TODO: Check that these actually exist.
-JAVA=/apps/java/bin/java
-JAVAC=/apps/java/bin/javac
-JAVAH=/apps/java/bin/javah
-
-# TODO: Find the java install from path to java exectuable.
-JAVA_HOME=/apps/java/jdk1.6.0_01
-
-# TODO: find the location of jni.h and jni_md.h.
-# Obviously the linux subdir won't exist on all platforms.
-JAVA_INCLUDES="-I ${JAVA_HOME}/include -I ${JAVA_HOME}/include/linux"
+rappture_with_java="yes"
+JAVA=""
+JAVAH=""
+JAVAC=""
+JAVA_DEV_PKG="no"
+
+AC_ARG_WITH(java,
+  AS_HELP_STRING([--with-java=PATH], [absolute path to java executable]),
+  [rappture_with_java=$with_val])
+if test "${rappture_with_java}" != "no" ; then
+  if test "${rappture_with_java}" = "yes" ; then
+    AC_PATH_PROG(JAVA, java)
+    AC_PATH_PROG(JAVAC, javac)
+    AC_PATH_PROG(JAVAH, javah)
+  else
+    AC_PATH_PROG(JAVA, java, [],
+      [${rappture_with_java}/bin/java:${rappture_with_java}])
+    AC_PATH_PROG(JAVAC, javac, [],
+      [${rappture_with_java}/bin/java:${rappture_with_java}])
+    AC_PATH_PROG(JAVAH, javah, [],
+      [${rappture_with_java}/bin/java:${rappture_with_java}])
+  fi
+fi
+JDK=
+JAVA_HOME=
+JAVA_INC_DIR=
+JAVA_INC_SPEC=
+
+# If java exists, let's look for the jni.h file.
+if test "x${JAVA}" != "x" ; then
+  for d in \
+   /apps/java/jdk1.6.0_01 \
+   /opt/icedtea6-* \
+   /opt/sun-jdk-1.6* \
+   /opt/sun-jdk-1.5* 
+  do 
+    if test -r "${d}/include/jni.h" ; then
+      JDK=${d}
+      break;
+    fi
+  done
+  JAVA_HOME=$JDK
+  JAVA_INC_DIR=${JDK}/include
+  JAVA_INC_SPEC="-I${JDK}/include -I${JDK}/include/linux"
+fi
 
 AC_SUBST(JAVA)
@@ -468 +502 @@
 AC_SUBST(JAVAH)
 AC_SUBST(JAVA_HOME)
-AC_SUBST(JAVA_INCLUDES)
+AC_SUBST(JAVA_INC_DIR)
+AC_SUBST(JAVA_INC_SPEC)
 
 RP_BASE=`pwd`
@@ -560 +595 @@
     gui/scripts/Makefile
     instant/Makefile
+    instant/irappture
     lang/Makefile
     lang/java/Makefile