Changeset 1757 for branches/blt4/configure.in

Timestamp:

Jun 14, 2010 12:04:02 PM (14 years ago)

Author:

gah

Message:

 

File:

• branches/blt4/configure.in (modified) (7 diffs)

branches/blt4/configure.in

@@ -268 +268 @@
     AC_PATH_PROG(OCTAVE, octave, [], [$with_octave/bin:$with_octave])
     AC_PATH_PROG(MKOCTFILE, mkoctfile, [],
-        [${with_octave}/bin/mkoctfile:${with_octave}])
+        [${with_octave}/bin:${with_octave}])
   fi
   if test "x${OCTAVE}" != "x" ; then 
@@ -442 +442 @@
 AC_SUBST(HAVE_PYTHON_DISTUTILS)
 
-rappture_with_ruby="yes"
+with_ruby="yes"
 
 RUBY=""
@@ -449 +449 @@
 AC_ARG_WITH(ruby,
   AS_HELP_STRING([--with-ruby=PATH], [absolute path to ruby executable]),
-  [rappture_with_ruby=$with_val])
-if test "${rappture_with_ruby}" != "no" ; then
-  if test "${rappture_with_ruby}" = "yes" ; then
+  [with_ruby=$with_val])
+if test "${with_ruby}" != "no" ; then
+  if test "${with_ruby}" = "yes" ; then
     AC_PATH_PROG(RUBY, ruby)
   else
     AC_PATH_PROG(RUBY, ruby, [],
-      [${rappture_with_ruby}/bin/ruby:${rappture_with_ruby}])
+      [${with_ruby}/bin/ruby:${with_ruby}])
   fi
 fi
@@ -476 +476 @@
 AC_SUBST(RUBY_PLATFORM)
 
-rappture_with_java="yes"
+with_java="yes"
 JAVA=""
 JAVAH=""
@@ -482 +482 @@
 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=
@@ -507 +490 @@
 if test "x${JAVA}" != "x" ; then
   for d in \
+   ${with_java} \
    /apps/java/jdk1.6.0_01 \
    /opt/icedtea6-* \
@@ -520 +504 @@
   JAVA_INC_DIR=${JDK}/include
   JAVA_INC_SPEC="-I${JDK}/include -I${JDK}/include/linux"
+fi
+
+AC_ARG_WITH(java,
+  AS_HELP_STRING([--with-java=PATH], [absolute path to java executable]),
+  [with_java=$with_val])
+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, [],
+      [${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