Changeset 2307 for branches/blt4/cf/rpLangJava.m4

Timestamp:

Jul 10, 2011, 5:55:10 PM (13 years ago)

Author:

gah

Message:

update from trunk

File:

• branches/blt4/cf/rpLangJava.m4 (modified) (2 diffs)

branches/blt4/cf/rpLangJava.m4

@@ -1 +1 @@
 AC_DEFUN([RP_LANG_JAVA],[
-rp_with_java="yes"
 AC_ARG_WITH([java],
     [AS_HELP_STRING([--with-java[=DIR]],[location of java @<:@default=yes@:>@])],
-    [rp_with_java=$withval],
-    [rp_with_java=yes])
+    [],
+    [with_java=yes])
 JAVA=""
 JAVAH=""
 JAVAC=""
 JAVA_DEV_PKG="no"
-AC_ARG_WITH(
-    [java],
-    [AS_HELP_STRING([--with-java=DIR], [location of java @<:@default=yes@:>@])],
-    [rp_with_java=$withval])
 
-if test "${rp_with_java}" != "no" ; then
-  if test "${rp_with_java}" = "yes" ; then
+if test "${with_java}" != "no" ; then
+  if test "${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,  [], [${rp_with_java}/bin:${rp_with_java}])
-    AC_PATH_PROG(JAVAC, javac, [], [${rp_with_java}/bin:${rp_with_java}])
-    AC_PATH_PROG(JAVAH, javah, [], [${rp_with_java}/bin:${rp_with_java}])
+    AC_PATH_PROG(JAVA,  java,  [], [${with_java}/bin:${with_java}])
+    AC_PATH_PROG(JAVAC, javac, [], [${with_java}/bin:${with_java}])
+    AC_PATH_PROG(JAVAH, javah, [], [${with_java}/bin:${with_java}])
   fi
 fi
@@ -32 +27 @@
 if test "x${JAVA}" != "x" ; then
   for d in \
-   ${rp_with_java} \
+   ${with_java} \
    ${JAVA_HOME} \
    /apps/java/jdk1.6* \