Changeset 1975

Timestamp:

Dec 2, 2010 9:49:21 PM (13 years ago)

Author:

gah

Message:

 

Location:

trunk

Files:

• configure (modified) (30 diffs)
• configure.in (modified) (20 diffs)

trunk/configure

@@ -7193 +7193 @@
 
 
-with_tclsh="yes"
+rp_with_tclsh="yes"
 
 # Check whether --with-tclsh was given.
@@ -7199 +7199 @@
   withval=$with_tclsh;
 else
-  with_tclsh=yes
+  rp_with_tclsh=yes
 fi
 
 
 TCLSH=
-if test "$with_tclsh" != "no" ; then
+if test "$rp_with_tclsh" != "no" ; then
     { $as_echo "$as_me:${as_lineno-$LINENO}: checking for tclsh" >&5
 $as_echo_n "checking for tclsh... " >&6; }
-    if test -x "$with_tclsh/bin/tclsh"
+    if test -x "$rp_with_tclsh/bin/tclsh"
     then
-        echo Found tclsh in $with_tclsh/bin/tclsh
-        TCLSH="$with_tclsh/bin/tclsh"
+        echo Found tclsh in $rp_with_tclsh/bin/tclsh
+        TCLSH="$rp_with_tclsh/bin/tclsh"
     else
-       if test -x "$with_tclsh"
+       if test -x "$rp_with_tclsh"
         then
-            echo Found tclsh in $with_tclsh
-            TCLSH="$with_tclsh"
+            echo Found tclsh in $rp_with_tclsh
+            TCLSH="$rp_with_tclsh"
         else
             if test -x "${exec_prefix}/bin/tclsh"
@@ -7294 +7294 @@
 TCL_INC_SPEC="$TCL_INCLUDE_SPEC"
 
-if test "x$with_tcllib" != "x" ; then
-   tclconfig="${with_tcllib}/tclConfig.sh"
+if test "x$rp_with_tcllib" != "x" ; then
+   tclconfig="${rp_with_tcllib}/tclConfig.sh"
    if test -f "$tclconfig" ; then
     . $tclconfig
    fi
-   TCL_LIB_SPEC="-L${with_tcllib} -ltcl${TCL_VERSION}"
-fi
-if test "x$with_tclinclude" != "x" ; then
-   TCL_INC_SPEC="-I${with_tclinclude}"
+   TCL_LIB_SPEC="-L${rp_with_tcllib} -ltcl${TCL_VERSION}"
+fi
+if test "x$rp_with_tclinclude" != "x" ; then
+   TCL_INC_SPEC="-I${rp_with_tclinclude}"
 fi
 
@@ -7312 +7312 @@
 # Check whether --with-vtk was given.
 if test "${with_vtk+set}" = set; then :
-  withval=$with_vtk; with_vtk=$withval
-else
-  with_vtk=yes
+  withval=$with_vtk; rp_with_vtk=$withval
+else
+  rp_with_vtk=yes
 fi
 
@@ -7322 +7322 @@
 VTKDIR=""
 
-if test "$with_vtk" != "no" ; then
-  if test "$with_vtk" = "yes" ; then
+if test "$rp_with_vtk" != "no" ; then
+  if test "$rp_with_vtk" = "yes" ; then
     for path in \
      $libdir \
@@ -7349 +7349 @@
 # Check whether --with-matlab was given.
 if test "${with_matlab+set}" = set; then :
-  withval=$with_matlab; with_matlab=$withval
-else
-  with_matlab=yes
+  withval=$with_matlab; rp_with_matlab=$withval
+else
+  rp_with_matlab=yes
 fi
 
@@ -7360 +7360 @@
 MEXEXT=""
 MATLAB=
-if test "$with_matlab" != "no" ; then
-  if test "$with_matlab" = "yes" ; then
+if test "$rp_with_matlab" != "no" ; then
+  if test "$rp_with_matlab" = "yes" ; then
     # Extract the first word of "matlab", so it can be a program name with args.
 set dummy matlab; ac_word=$2
@@ -7416 +7416 @@
   *)
   as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
-as_dummy="${with_matlab}/bin:${with_matlab}"
+as_dummy="${rp_with_matlab}/bin:${rp_with_matlab}"
 for as_dir in $as_dummy
 do
@@ -7599 +7599 @@
 # Check whether --with-octave was given.
 if test "${with_octave+set}" = set; then :
-  withval=$with_octave; with_octave=$withval
-else
-  with_octave=yes
+  withval=$with_octave; rp_with_octave=$withval
+else
+  rp_with_octave=yes
 fi
 
@@ -7613 +7613 @@
 MKOCTFILE2=
 MKOCTFILE3=
-if test "$with_octave" != "no" ; then
+if test "$rp_with_octave" != "no" ; then
   { $as_echo "$as_me:${as_lineno-$LINENO}: checking for octave and mkoctfile" >&5
 $as_echo_n "checking for octave and mkoctfile... " >&6; }
-  if test "$with_octave" = "yes" ; then
+  if test "$rp_with_octave" = "yes" ; then
     # Extract the first word of "octave", so it can be a program name with args.
 set dummy octave; ac_word=$2
@@ -7698 +7698 @@
 
   else
-    MKOCTFILE=$with_octave
-    OCTAVE=$with_octave
+    MKOCTFILE=$rp_with_octave
+    OCTAVE=$rp_with_octave
   fi
 fi
@@ -7719 +7719 @@
 # Check whether --with-octave2 was given.
 if test "${with_octave2+set}" = set; then :
-  withval=$with_octave2; with_octave2=$withval
-else
-  with_octave2=no
-fi
-
-
-if test "$with_octave2" != "no" ; then
-  if test "$with_octave2" = "yes" ; then
+  withval=$with_octave2; rp_with_octave2=$withval
+else
+  rp_with_octave2=no
+fi
+
+
+if test "$rp_with_octave2" != "no" ; then
+  if test "$rp_with_octave2" = "yes" ; then
     { $as_echo "$as_me:${as_lineno-$LINENO}: checking for octave and mkoctfile" >&5
 $as_echo_n "checking for octave and mkoctfile... " >&6; }
@@ -7810 +7810 @@
 
   else
-    octave2=$with_octave2
-    mkoctfile2=`dirname $with_octave2`/mkoctfile
+    octave2=$rp_with_octave2
+    mkoctfile2=`dirname $rp_with_octave2`/mkoctfile
   fi
 fi
@@ -7828 +7828 @@
 # Check whether --with-octave3 was given.
 if test "${with_octave3+set}" = set; then :
-  withval=$with_octave3; with_octave3=$withval
-else
-  with_octave3=no
-fi
-
-
-echo with_octave3=$with_octave3
-if test "$with_octave3" != "no" ; then
-  if test "$with_octave3" = "yes" ; then
+  withval=$with_octave3; rp_with_octave3=$withval
+else
+  rp_with_octave3=no
+fi
+
+
+echo rp_with_octave3=$rp_with_octave3
+if test "$rp_with_octave3" != "no" ; then
+  if test "$rp_with_octave3" = "yes" ; then
     { $as_echo "$as_me:${as_lineno-$LINENO}: checking for octave and mkoctfile" >&5
 $as_echo_n "checking for octave and mkoctfile... " >&6; }
@@ -7920 +7920 @@
 
   else
-    octave3=$with_octave3
-    mkoctfile3=`dirname $with_octave3`/mkoctfile
+    octave3=$rp_with_octave3
+    mkoctfile3=`dirname $rp_with_octave3`/mkoctfile
   fi
 fi
@@ -7933 +7933 @@
   echo version_major=$version_major
   if test "$version_major" = "3" ; then
-    OCTAVE3=$with_octave3
+    OCTAVE3=$rp_with_octave3
     MKOCTFILE3=$mkoctfile3
   fi
@@ -7952 +7952 @@
   withval=$with_perl;
 else
-  with_perl=yes
+  rp_with_perl=yes
 fi
 
@@ -7967 +7967 @@
 PERL_VERSION_RV=
 PERL_LIBSPEC=
-if test "$with_perl" != "no" ; then
+if test "$rp_with_perl" != "no" ; then
   { $as_echo "$as_me:${as_lineno-$LINENO}: checking for perl" >&5
 $as_echo_n "checking for perl... " >&6; }
-  if test "$with_perl" != "yes" ; then
+  if test "$rp_with_perl" != "yes" ; then
     # Extract the first word of "perl", so it can be a program name with args.
 set dummy perl; ac_word=$2
@@ -7984 +7984 @@
   *)
   as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
-as_dummy="$with_perl/bin:$with_perl"
+as_dummy="$rp_with_perl/bin:$rp_with_perl"
 for as_dir in $as_dummy
 do
@@ -8105 +8105 @@
   withval=$with_python;
 else
-  with_python=yes
-fi
-
-
-if test "$with_python" != "no" ; then
+  rp_with_python=yes
+fi
+
+
+if test "$rp_with_python" != "no" ; then
   { $as_echo "$as_me:${as_lineno-$LINENO}: checking for python" >&5
 $as_echo_n "checking for python... " >&6; }
-  if test -x "$with_python/bin/python"; then
-    echo Found python in $with_python/bin/python
-    PYTHON="$with_python/bin/python"
-  elif test -x "$with_python"; then
-    echo Found python in $with_python
-    PYTHON="$with_python"
+  if test -x "$rp_with_python/bin/python"; then
+    echo Found python in $rp_with_python/bin/python
+    PYTHON="$rp_with_python/bin/python"
+  elif test -x "$rp_with_python"; then
+    echo Found python in $rp_with_python
+    PYTHON="$rp_with_python"
   else
     # Extract the first word of "python python2.5 python2.4 python2.3 python2.2 python2.1 python2.0 python1.6 python1.5", so it can be a program name with args.
@@ -8165 +8165 @@
   fi
   if test "x${PYTHON_VERSION}" != "x"; then
-    if test -r $with_python/include/python$PYTHON_VERSION/Python.h -a \
-     -d $with_python/lib/python$PYTHON_VERSION/site-packages; then
-      PYTHON_INCLUDES=$with_python/include/python$PYTHON_VERSION
-      PYTHON_SITE_PACKAGES=$with_python/lib/python$PYTHON_VERSION/site-packages
+    if test -r $rp_with_python/include/python$PYTHON_VERSION/Python.h -a \
+     -d $rp_with_python/lib/python$PYTHON_VERSION/site-packages; then
+      PYTHON_INCLUDES=$rp_with_python/include/python$PYTHON_VERSION
+      PYTHON_SITE_PACKAGES=$rp_with_python/lib/python$PYTHON_VERSION/site-packages
     else
       if test -r $prefix/include/python$PYTHON_VERSION/Python.h; then
@@ -8186 +8186 @@
     fi
   fi
-  if test "x$with_python" != "x" ;  then
+  if test "x$rp_with_python" != "x" ;  then
     pythondir='$(PYTHON_SITE_PACKAGES)'
   else
@@ -8242 +8242 @@
 
 
-rappture_with_ruby="yes"
+rp_with_ruby="yes"
 
 RUBY=""
@@ -8250 +8250 @@
 # 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; rp_with_ruby=$withval
+fi
+
+if test "${rp_with_ruby}" != "no" ; then
+  if test "${rp_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
@@ -8309 +8309 @@
   *)
   as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
-as_dummy="${rappture_with_ruby}/bin/ruby:${rappture_with_ruby}"
+as_dummy="${rp_with_ruby}/bin:${rp_with_ruby}"
 for as_dir in $as_dummy
 do
@@ -8660 +8660 @@
 
 
-rappture_with_java="yes"
+rp_with_java="yes"
 JAVA=""
 JAVAH=""
@@ -8669 +8669 @@
 # 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; rp_with_java=$withval
+fi
+
+
+if test "${rp_with_java}" != "no" ; then
+  if test "${rp_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
@@ -8808 +8809 @@
   *)
   as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
-as_dummy="${rappture_with_java}/bin/java:${rappture_with_java}"
+as_dummy="${rp_with_java}/bin:${rp_with_java}"
 for as_dir in $as_dummy
 do
@@ -8849 +8850 @@
   *)
   as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
-as_dummy="${rappture_with_java}/bin/java:${rappture_with_java}"
+as_dummy="${rp_with_java}/bin:${rp_with_java}"
 for as_dir in $as_dummy
 do
@@ -8890 +8891 @@
   *)
   as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
-as_dummy="${rappture_with_java}/bin/java:${rappture_with_java}"
+as_dummy="${rp_with_java}/bin:${rp_with_java}"
 for as_dir in $as_dummy
 do

trunk/configure.in

@@ -114 +114 @@
 AC_SUBST(ENABLE_GUI)
 
-with_tclsh="yes"
+rp_with_tclsh="yes"
 AC_ARG_WITH(
     [tclsh],
@@ -120 +120 @@
         [location of tclsh @<:@default=yes@:>@])],
     [],
-    [with_tclsh=yes])
+    [rp_with_tclsh=yes])
 
 TCLSH=
-if test "$with_tclsh" != "no" ; then
+if test "$rp_with_tclsh" != "no" ; then
     AC_MSG_CHECKING([for tclsh])
-    if test -x "$with_tclsh/bin/tclsh"
+    if test -x "$rp_with_tclsh/bin/tclsh"
     then
-        echo Found tclsh in $with_tclsh/bin/tclsh
-        TCLSH="$with_tclsh/bin/tclsh"
+        echo Found tclsh in $rp_with_tclsh/bin/tclsh
+        TCLSH="$rp_with_tclsh/bin/tclsh"
     else
-       if test -x "$with_tclsh"
+       if test -x "$rp_with_tclsh"
         then
-            echo Found tclsh in $with_tclsh
-            TCLSH="$with_tclsh"
+            echo Found tclsh in $rp_with_tclsh
+            TCLSH="$rp_with_tclsh"
         else
             if test -x "${exec_prefix}/bin/tclsh"
@@ -172 +172 @@
 TCL_INC_SPEC="$TCL_INCLUDE_SPEC"
 
-if test "x$with_tcllib" != "x" ; then
-   tclconfig="${with_tcllib}/tclConfig.sh"
+if test "x$rp_with_tcllib" != "x" ; then
+   tclconfig="${rp_with_tcllib}/tclConfig.sh"
    if test -f "$tclconfig" ; then
     . $tclconfig
    fi
-   TCL_LIB_SPEC="-L${with_tcllib} -ltcl${TCL_VERSION}"
-fi
-if test "x$with_tclinclude" != "x" ; then
-   TCL_INC_SPEC="-I${with_tclinclude}"
+   TCL_LIB_SPEC="-L${rp_with_tcllib} -ltcl${TCL_VERSION}"
+fi
+if test "x$rp_with_tclinclude" != "x" ; then
+   TCL_INC_SPEC="-I${rp_with_tclinclude}"
 fi
 
@@ -191 +191 @@
     [AS_HELP_STRING([--with-vtk[=DIR]],
         [location of vtk library @<:@default=yes@:>@])],
-    [with_vtk=$withval], [with_vtk=yes])
+    [rp_with_vtk=$withval], [rp_with_vtk=yes])
 
 AC_MSG_CHECKING([for vtk])
 VTKDIR=""
 
-if test "$with_vtk" != "no" ; then
-  if test "$with_vtk" = "yes" ; then
+if test "$rp_with_vtk" != "no" ; then
+  if test "$rp_with_vtk" = "yes" ; then
     for path in \
      $libdir \
@@ -223 +223 @@
     [AS_HELP_STRING([--with-matlab[=DIR]],
         [location of matlab and mex compiler @<:@default=yes@:>@])],
-    [with_matlab=$withval],
-    [with_matlab=yes])
+    [rp_with_matlab=$withval],
+    [rp_with_matlab=yes])
 
 MCC=""
@@ -231 +231 @@
 MEXEXT=""
 MATLAB=
-if test "$with_matlab" != "no" ; then
-  if test "$with_matlab" = "yes" ; then
+if test "$rp_with_matlab" != "no" ; then
+  if test "$rp_with_matlab" = "yes" ; then
     AC_PATH_PROG(MATLAB, matlab)
   else
-    AC_PATH_PROG(MATLAB, matlab, [], [${with_matlab}/bin:${with_matlab}])
+    AC_PATH_PROG(MATLAB, matlab, [], [${rp_with_matlab}/bin:${rp_with_matlab}])
   fi
 fi
@@ -272 +272 @@
     [AS_HELP_STRING([--with-octave[=DIR]],
         [location of octave compiler MKOCTFILE @<:@default=yes@:>@])],
-    [with_octave=$withval],
-    [with_octave=yes])
+    [rp_with_octave=$withval],
+    [rp_with_octave=yes])
 
 OCTAVE=
@@ -283 +283 @@
 MKOCTFILE2=
 MKOCTFILE3=
-if test "$with_octave" != "no" ; then
+if test "$rp_with_octave" != "no" ; then
   AC_MSG_CHECKING([for octave and mkoctfile])
-  if test "$with_octave" = "yes" ; then
+  if test "$rp_with_octave" = "yes" ; then
     AC_PATH_PROG(OCTAVE, octave)
     AC_PATH_PROG(MKOCTFILE, mkoctfile)
   else
-    MKOCTFILE=$with_octave
-    OCTAVE=$with_octave
+    MKOCTFILE=$rp_with_octave
+    OCTAVE=$rp_with_octave
   fi
 fi
@@ -311 +311 @@
     [AS_HELP_STRING([--with-octave2[=DIR]],
         [location of octave compiler MKOCTFILE @<:@default=no@:>@])],
-    [with_octave2=$withval],
-    [with_octave2=no])
-
-if test "$with_octave2" != "no" ; then
-  if test "$with_octave2" = "yes" ; then
+    [rp_with_octave2=$withval],
+    [rp_with_octave2=no])
+
+if test "$rp_with_octave2" != "no" ; then
+  if test "$rp_with_octave2" = "yes" ; then
     AC_MSG_CHECKING([for octave and mkoctfile])
     AC_PATH_PROG(octave2, octave)
     AC_PATH_PROG(mkoctfile2, mkoctfile)
   else 
-    octave2=$with_octave2
-    mkoctfile2=`dirname $with_octave2`/mkoctfile
+    octave2=$rp_with_octave2
+    mkoctfile2=`dirname $rp_with_octave2`/mkoctfile
   fi
 fi
@@ -339 +339 @@
     [AS_HELP_STRING([--with-octave3[=DIR]],
         [location of octave compiler MKOCTFILE @<:@default=no@:>@])],
-    [with_octave3=$withval],
-    [with_octave3=no])
-
-echo with_octave3=$with_octave3
-if test "$with_octave3" != "no" ; then
-  if test "$with_octave3" = "yes" ; then
+    [rp_with_octave3=$withval],
+    [rp_with_octave3=no])
+
+echo rp_with_octave3=$rp_with_octave3
+if test "$rp_with_octave3" != "no" ; then
+  if test "$rp_with_octave3" = "yes" ; then
     AC_MSG_CHECKING([for octave and mkoctfile])
     AC_PATH_PROG(octave3, octave)
     AC_PATH_PROG(mkoctfile3, mkoctfile)
   else 
-    octave3=$with_octave3
-    mkoctfile3=`dirname $with_octave3`/mkoctfile
+    octave3=$rp_with_octave3
+    mkoctfile3=`dirname $rp_with_octave3`/mkoctfile
   fi
 fi
@@ -362 +362 @@
   echo version_major=$version_major
   if test "$version_major" = "3" ; then
-    OCTAVE3=$with_octave3
+    OCTAVE3=$rp_with_octave3
     MKOCTFILE3=$mkoctfile3
   fi
@@ -380 +380 @@
     [AS_HELP_STRING([--with-perl[=DIR]], [location of perl @<:@default=yes@:>@])],
     [],
-    [with_perl=yes])
+    [rp_with_perl=yes])
 
 PERL=
@@ -393 +393 @@
 PERL_VERSION_RV=
 PERL_LIBSPEC=
-if test "$with_perl" != "no" ; then
+if test "$rp_with_perl" != "no" ; then
   AC_MSG_CHECKING([for perl])
-  if test "$with_perl" != "yes" ; then 
-    AC_PATH_PROG(PERL, perl, [], [$with_perl/bin:$with_perl])
+  if test "$rp_with_perl" != "yes" ; then 
+    AC_PATH_PROG(PERL, perl, [], [$rp_with_perl/bin:$rp_with_perl])
   else
     AC_PATH_PROG(PERL, perl)
@@ -448 +448 @@
     [AS_HELP_STRING([--with-python[=DIR]],[location of python @<:@default=yes@:>@])],
     [],
-    [with_python=yes])
-
-if test "$with_python" != "no" ; then
+    [rp_with_python=yes])
+
+if test "$rp_with_python" != "no" ; then
   AC_MSG_CHECKING([for python])
-  if test -x "$with_python/bin/python"; then
-    echo Found python in $with_python/bin/python
-    PYTHON="$with_python/bin/python"
-  elif test -x "$with_python"; then
-    echo Found python in $with_python
-    PYTHON="$with_python"
+  if test -x "$rp_with_python/bin/python"; then
+    echo Found python in $rp_with_python/bin/python
+    PYTHON="$rp_with_python/bin/python"
+  elif test -x "$rp_with_python"; then
+    echo Found python in $rp_with_python
+    PYTHON="$rp_with_python"
   else
     AC_PATH_PROG(PYTHON, python python2.5 python2.4 python2.3 python2.2 python2.1 python2.0 python1.6 python1.5)
@@ -466 +466 @@
   fi
   if test "x${PYTHON_VERSION}" != "x"; then
-    if test -r $with_python/include/python$PYTHON_VERSION/Python.h -a \
-     -d $with_python/lib/python$PYTHON_VERSION/site-packages; then
-      PYTHON_INCLUDES=$with_python/include/python$PYTHON_VERSION
-      PYTHON_SITE_PACKAGES=$with_python/lib/python$PYTHON_VERSION/site-packages
+    if test -r $rp_with_python/include/python$PYTHON_VERSION/Python.h -a \
+     -d $rp_with_python/lib/python$PYTHON_VERSION/site-packages; then
+      PYTHON_INCLUDES=$rp_with_python/include/python$PYTHON_VERSION
+      PYTHON_SITE_PACKAGES=$rp_with_python/lib/python$PYTHON_VERSION/site-packages
     else
       if test -r $prefix/include/python$PYTHON_VERSION/Python.h; then
@@ -487 +487 @@
     fi
   fi
-  if test "x$with_python" != "x" ;  then
+  if test "x$rp_with_python" != "x" ;  then
     pythondir='$(PYTHON_SITE_PACKAGES)'
   else
@@ -538 +538 @@
 AC_SUBST(HAVE_PYTHON_DISTUTILS)
 
-rappture_with_ruby="yes"
+rp_with_ruby="yes"
 
 RUBY=""
@@ -545 +545 @@
 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
+  [rp_with_ruby=$withval])
+if test "${rp_with_ruby}" != "no" ; then
+  if test "${rp_with_ruby}" = "yes" ; then
     AC_PATH_PROG(RUBY, ruby)
   else
-    AC_PATH_PROG(RUBY, ruby, [],
-      [${rappture_with_ruby}/bin/ruby:${rappture_with_ruby}])
+    AC_PATH_PROG(RUBY, ruby, [], [${rp_with_ruby}/bin:${rp_with_ruby}])
   fi
 fi
@@ -572 +571 @@
 AC_SUBST(RUBY_PLATFORM)
 
-rappture_with_java="yes"
+rp_with_java="yes"
 JAVA=""
 JAVAH=""
@@ -580 +579 @@
 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
+  [rp_with_java=$withval])
+
+if test "${rp_with_java}" != "no" ; then
+  if test "${rp_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}])
+    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}])
   fi
 fi