Changeset 1757 for branches/blt4

Timestamp:

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

Author:

gah

Message:

 

Location:

branches/blt4

Files:

• configure (modified) (10 diffs)
• configure.in (modified) (7 diffs)
• gui/scripts/xylegend.tcl (modified) (1 diff)

branches/blt4/configure

@@ -7704 +7704 @@
   *)
   as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
-as_dummy="${with_octave}/bin/mkoctfile:${with_octave}"
+as_dummy="${with_octave}/bin:${with_octave}"
 for as_dir in $as_dummy
 do
@@ -8038 +8038 @@
 
 
-rappture_with_ruby="yes"
+with_ruby="yes"
 
 RUBY=""
@@ -8046 +8046 @@
 # Check whether --with-ruby was given.
 if test "${with_ruby+set}" = set; then :
-  withval=$with_ruby; rappture_with_ruby=$with_val
-fi
-
-if test "${rappture_with_ruby}" != "no" ; then
-  if test "${rappture_with_ruby}" = "yes" ; then
+  withval=$with_ruby; with_ruby=$with_val
+fi
+
+if test "${with_ruby}" != "no" ; then
+  if test "${with_ruby}" = "yes" ; then
     # Extract the first word of "ruby", so it can be a program name with args.
 set dummy ruby; ac_word=$2
@@ -8105 +8105 @@
   *)
   as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
-as_dummy="${rappture_with_ruby}/bin/ruby:${rappture_with_ruby}"
+as_dummy="${with_ruby}/bin/ruby:${with_ruby}"
 for as_dir in $as_dummy
 do
@@ -8456 +8456 @@
 
 
-rappture_with_java="yes"
+with_java="yes"
 JAVA=""
 JAVAH=""
@@ -8462 +8462 @@
 JAVA_DEV_PKG="no"
 
+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 \
+   ${with_java} \
+   /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
+
 
 # Check whether --with-java was given.
 if test "${with_java+set}" = set; then :
-  withval=$with_java; rappture_with_java=$with_val
-fi
-
-if test "${rappture_with_java}" != "no" ; then
-  if test "${rappture_with_java}" = "yes" ; then
+  withval=$with_java; with_java=$with_val
+fi
+
+if test "${with_java}" != "no" ; then
+  if test "${with_java}" = "yes" ; then
     # Extract the first word of "java", so it can be a program name with args.
 set dummy java; ac_word=$2
@@ -8604 +8628 @@
   *)
   as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
-as_dummy="${rappture_with_java}/bin/java:${rappture_with_java}"
+as_dummy="${with_java}/bin:${with_java}"
 for as_dir in $as_dummy
 do
@@ -8645 +8669 @@
   *)
   as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
-as_dummy="${rappture_with_java}/bin/java:${rappture_with_java}"
+as_dummy="${with_java}/bin:${with_java}"
 for as_dir in $as_dummy
 do
@@ -8686 +8710 @@
   *)
   as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
-as_dummy="${rappture_with_java}/bin/java:${rappture_with_java}"
+as_dummy="${with_java}/bin:${with_java}"
 for as_dir in $as_dummy
 do
@@ -8715 +8739 @@
 
   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
 

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
 

branches/blt4/gui/scripts/xylegend.tcl

@@ -474 +474 @@
     $sum length [$xcoords length]
 
-    foreach node $nodes {
-        set elem [$_tree label $node]
-        $x set [GetData $elem -x]
-        $y set [GetData $elem -y]
-        blt::spline natural $x $y $xcoords $ycoords
-
-        # Sum the interpolated y-coordinate values.
-        $sum expr "$sum + $ycoords" 
-    }
-    blt::vector destroy $x $y
-
+        foreach node $nodes {
+            set elem [$_tree label $node]
+            $x set [GetData $elem -x]
+            $y set [GetData $elem -y]
+            if { [catch {
+                blt::spline natural $x $y $xcoords $ycoords
+            }] != 0 } {
+            }
+            # Sum the interpolated y-coordinate values.
+            $sum expr "$sum + $ycoords" 
+        }
+        blt::vector destroy $x $y
+    }
     # Get the average
     $sum expr "$sum / [llength $elements]"