Changeset 2205


Ignore:
Timestamp:
Apr 13, 2011 1:48:45 PM (11 years ago)
Author:
gah
Message:
 
Location:
trunk
Files:
5 edited

Legend:

Unmodified
Added
Removed
  • trunk/aclocal.m4

    r1081 r2205  
    33builtin(include,./cf/ax_ruby_dev_flags.m4)
    44builtin(include,./cf/ax_prog_ruby_version.m4)
     5builtin(include,./cf/rp_lang_python.m4)
     6builtin(include,./cf/rp_lang_perl.m4)
     7builtin(include,./cf/rp_lang_octave.m4)
     8builtin(include,./cf/rp_lang_java.m4)
     9builtin(include,./cf/rp_lang_matlab.m4)
  • trunk/configure

    r2202 r2205  
    659659LDFLAGS_DEFAULT
    660660CFLAGS_DEFAULT
    661 JAVAH
    662 JAVAC
    663 JAVA
    664661RUBY_EXTRA_LIBS
    665662RUBY_SITE_PKG
     
    670667SED
    671668RUBY
     669JAVAH
     670JAVAC
     671JAVA
    672672PYTHON
    673673PERL
     
    783783with_perl
    784784with_python
     785with_java
    785786with_ruby
    786 with_java
    787787enable_shared
    788788enable_symbols
     
    14361436  --with-perl=DIR         location of perl [default=yes]
    14371437  --with-python=DIR       location of python [default=yes]
     1438  --with-java=DIR         location of java [default=yes]
    14381439  --with-ruby=DIR         location of ruby [default=yes]
    1439   --with-java=DIR         location of java [default=yes]
    14401440
    14411441Some influential environment variables:
     
    76207620
    76217621
    7622 #
    7623 # Octave variables:
    7624 #
    7625 #       OCTAVE                  Path to default octave executable.  Will use
    7626 #                               to determine the version.
    7627 #       OCTAVE_VERSION          Full version of octave (X.X.X).  Used in
    7628 #                               Makefiles to indicate if we are building
    7629 #                               the octave language bindings.  The empty
    7630 #                               string indicates octave is not available.
    7631 #       OCTAVE_VERSION_MAJOR    Single verion number of octave.  Used in
    7632 #                               rappture.env scripts to indicate how to set
    7633 #                               OCTAVE_PATH and OCTAVE_LOADPATH variables.
    7634 #       MKOCTFILE               Path to the default octave compiler.  This
    7635 #                               variable isn't used directly.  Either
    7636 #                               MKOCTFILE2 or MKOCTFILE3 will be set to its
    7637 #                               value.
    7638 #       MKOCTFILE2              Path to octave version 2 compiler.
    7639 #       MKOCTFILE3              Path to octave version 3 compiler.
    7640 #
    7641 
    7642 # Standard octave search (use the installed version of octave)
    76437622
    76447623# Check whether --with-octave was given.
     
    79217900PERL_VERSION_RV=
    79227901PERL_LIBSPEC=
     7902{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for Perl" >&5
     7903$as_echo_n "checking for Perl... " >&6; }
    79237904if test "$rp_with_perl" != "no" ; then
    79247905  if test "$rp_with_perl" != "yes" ; then
     
    80228003  fi
    80238004fi
     8005{ $as_echo "$as_me:${as_lineno-$LINENO}: checking $PERL" >&5
     8006$as_echo_n "checking $PERL... " >&6; }
     8007
    80248008
    80258009PYTHON=""
     
    80358019PYTHON_VERSION=""
    80368020pythondir=""
    8037 
    80388021
    80398022# Check whether --with-python was given.
     
    81928175    fi
    81938176  fi
     8177fi
     8178
     8179
     8180JAVA=""
     8181JAVAH=""
     8182JAVAC=""
     8183JAVA_DEV_PKG="no"
     8184
     8185# Check whether --with-java was given.
     8186if test "${with_java+set}" = set; then :
     8187  withval=$with_java; rp_with_java=$withval
     8188fi
     8189
     8190
     8191if test "${rp_with_java}" != "no" ; then
     8192  if test "${rp_with_java}" = "yes" ; then
     8193    # Extract the first word of "java", so it can be a program name with args.
     8194set dummy java; ac_word=$2
     8195{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
     8196$as_echo_n "checking for $ac_word... " >&6; }
     8197if ${ac_cv_path_JAVA+:} false; then :
     8198  $as_echo_n "(cached) " >&6
     8199else
     8200  case $JAVA in
     8201  [\\/]* | ?:[\\/]*)
     8202  ac_cv_path_JAVA="$JAVA" # Let the user override the test with a path.
     8203  ;;
     8204  *)
     8205  as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
     8206for as_dir in $PATH
     8207do
     8208  IFS=$as_save_IFS
     8209  test -z "$as_dir" && as_dir=.
     8210    for ac_exec_ext in '' $ac_executable_extensions; do
     8211  if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
     8212    ac_cv_path_JAVA="$as_dir/$ac_word$ac_exec_ext"
     8213    $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
     8214    break 2
     8215  fi
     8216done
     8217  done
     8218IFS=$as_save_IFS
     8219
     8220  ;;
     8221esac
     8222fi
     8223JAVA=$ac_cv_path_JAVA
     8224if test -n "$JAVA"; then
     8225  { $as_echo "$as_me:${as_lineno-$LINENO}: result: $JAVA" >&5
     8226$as_echo "$JAVA" >&6; }
     8227else
     8228  { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
     8229$as_echo "no" >&6; }
     8230fi
     8231
     8232
     8233    # Extract the first word of "javac", so it can be a program name with args.
     8234set dummy javac; ac_word=$2
     8235{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
     8236$as_echo_n "checking for $ac_word... " >&6; }
     8237if ${ac_cv_path_JAVAC+:} false; then :
     8238  $as_echo_n "(cached) " >&6
     8239else
     8240  case $JAVAC in
     8241  [\\/]* | ?:[\\/]*)
     8242  ac_cv_path_JAVAC="$JAVAC" # Let the user override the test with a path.
     8243  ;;
     8244  *)
     8245  as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
     8246for as_dir in $PATH
     8247do
     8248  IFS=$as_save_IFS
     8249  test -z "$as_dir" && as_dir=.
     8250    for ac_exec_ext in '' $ac_executable_extensions; do
     8251  if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
     8252    ac_cv_path_JAVAC="$as_dir/$ac_word$ac_exec_ext"
     8253    $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
     8254    break 2
     8255  fi
     8256done
     8257  done
     8258IFS=$as_save_IFS
     8259
     8260  ;;
     8261esac
     8262fi
     8263JAVAC=$ac_cv_path_JAVAC
     8264if test -n "$JAVAC"; then
     8265  { $as_echo "$as_me:${as_lineno-$LINENO}: result: $JAVAC" >&5
     8266$as_echo "$JAVAC" >&6; }
     8267else
     8268  { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
     8269$as_echo "no" >&6; }
     8270fi
     8271
     8272
     8273    # Extract the first word of "javah", so it can be a program name with args.
     8274set dummy javah; ac_word=$2
     8275{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
     8276$as_echo_n "checking for $ac_word... " >&6; }
     8277if ${ac_cv_path_JAVAH+:} false; then :
     8278  $as_echo_n "(cached) " >&6
     8279else
     8280  case $JAVAH in
     8281  [\\/]* | ?:[\\/]*)
     8282  ac_cv_path_JAVAH="$JAVAH" # Let the user override the test with a path.
     8283  ;;
     8284  *)
     8285  as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
     8286for as_dir in $PATH
     8287do
     8288  IFS=$as_save_IFS
     8289  test -z "$as_dir" && as_dir=.
     8290    for ac_exec_ext in '' $ac_executable_extensions; do
     8291  if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
     8292    ac_cv_path_JAVAH="$as_dir/$ac_word$ac_exec_ext"
     8293    $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
     8294    break 2
     8295  fi
     8296done
     8297  done
     8298IFS=$as_save_IFS
     8299
     8300  ;;
     8301esac
     8302fi
     8303JAVAH=$ac_cv_path_JAVAH
     8304if test -n "$JAVAH"; then
     8305  { $as_echo "$as_me:${as_lineno-$LINENO}: result: $JAVAH" >&5
     8306$as_echo "$JAVAH" >&6; }
     8307else
     8308  { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
     8309$as_echo "no" >&6; }
     8310fi
     8311
     8312
     8313  else
     8314    # Extract the first word of "java", so it can be a program name with args.
     8315set dummy java; ac_word=$2
     8316{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
     8317$as_echo_n "checking for $ac_word... " >&6; }
     8318if ${ac_cv_path_JAVA+:} false; then :
     8319  $as_echo_n "(cached) " >&6
     8320else
     8321  case $JAVA in
     8322  [\\/]* | ?:[\\/]*)
     8323  ac_cv_path_JAVA="$JAVA" # Let the user override the test with a path.
     8324  ;;
     8325  *)
     8326  as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
     8327as_dummy="${rp_with_java}/bin:${rp_with_java}"
     8328for as_dir in $as_dummy
     8329do
     8330  IFS=$as_save_IFS
     8331  test -z "$as_dir" && as_dir=.
     8332    for ac_exec_ext in '' $ac_executable_extensions; do
     8333  if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
     8334    ac_cv_path_JAVA="$as_dir/$ac_word$ac_exec_ext"
     8335    $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
     8336    break 2
     8337  fi
     8338done
     8339  done
     8340IFS=$as_save_IFS
     8341
     8342  ;;
     8343esac
     8344fi
     8345JAVA=$ac_cv_path_JAVA
     8346if test -n "$JAVA"; then
     8347  { $as_echo "$as_me:${as_lineno-$LINENO}: result: $JAVA" >&5
     8348$as_echo "$JAVA" >&6; }
     8349else
     8350  { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
     8351$as_echo "no" >&6; }
     8352fi
     8353
     8354
     8355    # Extract the first word of "javac", so it can be a program name with args.
     8356set dummy javac; ac_word=$2
     8357{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
     8358$as_echo_n "checking for $ac_word... " >&6; }
     8359if ${ac_cv_path_JAVAC+:} false; then :
     8360  $as_echo_n "(cached) " >&6
     8361else
     8362  case $JAVAC in
     8363  [\\/]* | ?:[\\/]*)
     8364  ac_cv_path_JAVAC="$JAVAC" # Let the user override the test with a path.
     8365  ;;
     8366  *)
     8367  as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
     8368as_dummy="${rp_with_java}/bin:${rp_with_java}"
     8369for as_dir in $as_dummy
     8370do
     8371  IFS=$as_save_IFS
     8372  test -z "$as_dir" && as_dir=.
     8373    for ac_exec_ext in '' $ac_executable_extensions; do
     8374  if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
     8375    ac_cv_path_JAVAC="$as_dir/$ac_word$ac_exec_ext"
     8376    $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
     8377    break 2
     8378  fi
     8379done
     8380  done
     8381IFS=$as_save_IFS
     8382
     8383  ;;
     8384esac
     8385fi
     8386JAVAC=$ac_cv_path_JAVAC
     8387if test -n "$JAVAC"; then
     8388  { $as_echo "$as_me:${as_lineno-$LINENO}: result: $JAVAC" >&5
     8389$as_echo "$JAVAC" >&6; }
     8390else
     8391  { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
     8392$as_echo "no" >&6; }
     8393fi
     8394
     8395
     8396    # Extract the first word of "javah", so it can be a program name with args.
     8397set dummy javah; ac_word=$2
     8398{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
     8399$as_echo_n "checking for $ac_word... " >&6; }
     8400if ${ac_cv_path_JAVAH+:} false; then :
     8401  $as_echo_n "(cached) " >&6
     8402else
     8403  case $JAVAH in
     8404  [\\/]* | ?:[\\/]*)
     8405  ac_cv_path_JAVAH="$JAVAH" # Let the user override the test with a path.
     8406  ;;
     8407  *)
     8408  as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
     8409as_dummy="${rp_with_java}/bin:${rp_with_java}"
     8410for as_dir in $as_dummy
     8411do
     8412  IFS=$as_save_IFS
     8413  test -z "$as_dir" && as_dir=.
     8414    for ac_exec_ext in '' $ac_executable_extensions; do
     8415  if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
     8416    ac_cv_path_JAVAH="$as_dir/$ac_word$ac_exec_ext"
     8417    $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
     8418    break 2
     8419  fi
     8420done
     8421  done
     8422IFS=$as_save_IFS
     8423
     8424  ;;
     8425esac
     8426fi
     8427JAVAH=$ac_cv_path_JAVAH
     8428if test -n "$JAVAH"; then
     8429  { $as_echo "$as_me:${as_lineno-$LINENO}: result: $JAVAH" >&5
     8430$as_echo "$JAVAH" >&6; }
     8431else
     8432  { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
     8433$as_echo "no" >&6; }
     8434fi
     8435
     8436
     8437  fi
     8438fi
     8439JDK=
     8440JAVA_INC_DIR=
     8441JAVA_INC_SPEC=
     8442
     8443# If java exists, let's look for the jni.h file.
     8444if test "x${JAVA}" != "x" ; then
     8445  for d in \
     8446   ${JAVA_HOME} \
     8447   /apps/java/jdk1.6.0_01 \
     8448   /usr/lib/jvm/*sun-1.6* \
     8449   /opt/sun-jdk-1.6* \
     8450   /opt/icedtea6-* \
     8451   /opt/sun-jdk-1.5* \
     8452   /usr/lib/jvm/*sun-1.5*
     8453  do
     8454    if test -r "${d}/include/jni.h" ; then
     8455      JDK=${d}
     8456      break;
     8457    fi
     8458  done
     8459  JAVA_HOME=$JDK
     8460  JAVA_INC_DIR=${JDK}/include
     8461  JAVA_INC_SPEC="-I${JDK}/include -I${JDK}/include/linux"
    81948462fi
    81958463
     
    86088876
    86098877  fi
    8610 fi
    8611 
    8612 JAVA=""
    8613 JAVAH=""
    8614 JAVAC=""
    8615 JAVA_DEV_PKG="no"
    8616 
    8617 # Check whether --with-java was given.
    8618 if test "${with_java+set}" = set; then :
    8619   withval=$with_java; rp_with_java=$withval
    8620 fi
    8621 
    8622 
    8623 if test "${rp_with_java}" != "no" ; then
    8624   if test "${rp_with_java}" = "yes" ; then
    8625     # Extract the first word of "java", so it can be a program name with args.
    8626 set dummy java; ac_word=$2
    8627 { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
    8628 $as_echo_n "checking for $ac_word... " >&6; }
    8629 if ${ac_cv_path_JAVA+:} false; then :
    8630   $as_echo_n "(cached) " >&6
    8631 else
    8632   case $JAVA in
    8633   [\\/]* | ?:[\\/]*)
    8634   ac_cv_path_JAVA="$JAVA" # Let the user override the test with a path.
    8635   ;;
    8636   *)
    8637   as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
    8638 for as_dir in $PATH
    8639 do
    8640   IFS=$as_save_IFS
    8641   test -z "$as_dir" && as_dir=.
    8642     for ac_exec_ext in '' $ac_executable_extensions; do
    8643   if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
    8644     ac_cv_path_JAVA="$as_dir/$ac_word$ac_exec_ext"
    8645     $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
    8646     break 2
    8647   fi
    8648 done
    8649   done
    8650 IFS=$as_save_IFS
    8651 
    8652   ;;
    8653 esac
    8654 fi
    8655 JAVA=$ac_cv_path_JAVA
    8656 if test -n "$JAVA"; then
    8657   { $as_echo "$as_me:${as_lineno-$LINENO}: result: $JAVA" >&5
    8658 $as_echo "$JAVA" >&6; }
    8659 else
    8660   { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
    8661 $as_echo "no" >&6; }
    8662 fi
    8663 
    8664 
    8665     # Extract the first word of "javac", so it can be a program name with args.
    8666 set dummy javac; ac_word=$2
    8667 { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
    8668 $as_echo_n "checking for $ac_word... " >&6; }
    8669 if ${ac_cv_path_JAVAC+:} false; then :
    8670   $as_echo_n "(cached) " >&6
    8671 else
    8672   case $JAVAC in
    8673   [\\/]* | ?:[\\/]*)
    8674   ac_cv_path_JAVAC="$JAVAC" # Let the user override the test with a path.
    8675   ;;
    8676   *)
    8677   as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
    8678 for as_dir in $PATH
    8679 do
    8680   IFS=$as_save_IFS
    8681   test -z "$as_dir" && as_dir=.
    8682     for ac_exec_ext in '' $ac_executable_extensions; do
    8683   if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
    8684     ac_cv_path_JAVAC="$as_dir/$ac_word$ac_exec_ext"
    8685     $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
    8686     break 2
    8687   fi
    8688 done
    8689   done
    8690 IFS=$as_save_IFS
    8691 
    8692   ;;
    8693 esac
    8694 fi
    8695 JAVAC=$ac_cv_path_JAVAC
    8696 if test -n "$JAVAC"; then
    8697   { $as_echo "$as_me:${as_lineno-$LINENO}: result: $JAVAC" >&5
    8698 $as_echo "$JAVAC" >&6; }
    8699 else
    8700   { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
    8701 $as_echo "no" >&6; }
    8702 fi
    8703 
    8704 
    8705     # Extract the first word of "javah", so it can be a program name with args.
    8706 set dummy javah; ac_word=$2
    8707 { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
    8708 $as_echo_n "checking for $ac_word... " >&6; }
    8709 if ${ac_cv_path_JAVAH+:} false; then :
    8710   $as_echo_n "(cached) " >&6
    8711 else
    8712   case $JAVAH in
    8713   [\\/]* | ?:[\\/]*)
    8714   ac_cv_path_JAVAH="$JAVAH" # Let the user override the test with a path.
    8715   ;;
    8716   *)
    8717   as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
    8718 for as_dir in $PATH
    8719 do
    8720   IFS=$as_save_IFS
    8721   test -z "$as_dir" && as_dir=.
    8722     for ac_exec_ext in '' $ac_executable_extensions; do
    8723   if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
    8724     ac_cv_path_JAVAH="$as_dir/$ac_word$ac_exec_ext"
    8725     $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
    8726     break 2
    8727   fi
    8728 done
    8729   done
    8730 IFS=$as_save_IFS
    8731 
    8732   ;;
    8733 esac
    8734 fi
    8735 JAVAH=$ac_cv_path_JAVAH
    8736 if test -n "$JAVAH"; then
    8737   { $as_echo "$as_me:${as_lineno-$LINENO}: result: $JAVAH" >&5
    8738 $as_echo "$JAVAH" >&6; }
    8739 else
    8740   { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
    8741 $as_echo "no" >&6; }
    8742 fi
    8743 
    8744 
    8745   else
    8746     # Extract the first word of "java", so it can be a program name with args.
    8747 set dummy java; ac_word=$2
    8748 { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
    8749 $as_echo_n "checking for $ac_word... " >&6; }
    8750 if ${ac_cv_path_JAVA+:} false; then :
    8751   $as_echo_n "(cached) " >&6
    8752 else
    8753   case $JAVA in
    8754   [\\/]* | ?:[\\/]*)
    8755   ac_cv_path_JAVA="$JAVA" # Let the user override the test with a path.
    8756   ;;
    8757   *)
    8758   as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
    8759 as_dummy="${rp_with_java}/bin:${rp_with_java}"
    8760 for as_dir in $as_dummy
    8761 do
    8762   IFS=$as_save_IFS
    8763   test -z "$as_dir" && as_dir=.
    8764     for ac_exec_ext in '' $ac_executable_extensions; do
    8765   if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
    8766     ac_cv_path_JAVA="$as_dir/$ac_word$ac_exec_ext"
    8767     $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
    8768     break 2
    8769   fi
    8770 done
    8771   done
    8772 IFS=$as_save_IFS
    8773 
    8774   ;;
    8775 esac
    8776 fi
    8777 JAVA=$ac_cv_path_JAVA
    8778 if test -n "$JAVA"; then
    8779   { $as_echo "$as_me:${as_lineno-$LINENO}: result: $JAVA" >&5
    8780 $as_echo "$JAVA" >&6; }
    8781 else
    8782   { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
    8783 $as_echo "no" >&6; }
    8784 fi
    8785 
    8786 
    8787     # Extract the first word of "javac", so it can be a program name with args.
    8788 set dummy javac; ac_word=$2
    8789 { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
    8790 $as_echo_n "checking for $ac_word... " >&6; }
    8791 if ${ac_cv_path_JAVAC+:} false; then :
    8792   $as_echo_n "(cached) " >&6
    8793 else
    8794   case $JAVAC in
    8795   [\\/]* | ?:[\\/]*)
    8796   ac_cv_path_JAVAC="$JAVAC" # Let the user override the test with a path.
    8797   ;;
    8798   *)
    8799   as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
    8800 as_dummy="${rp_with_java}/bin:${rp_with_java}"
    8801 for as_dir in $as_dummy
    8802 do
    8803   IFS=$as_save_IFS
    8804   test -z "$as_dir" && as_dir=.
    8805     for ac_exec_ext in '' $ac_executable_extensions; do
    8806   if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
    8807     ac_cv_path_JAVAC="$as_dir/$ac_word$ac_exec_ext"
    8808     $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
    8809     break 2
    8810   fi
    8811 done
    8812   done
    8813 IFS=$as_save_IFS
    8814 
    8815   ;;
    8816 esac
    8817 fi
    8818 JAVAC=$ac_cv_path_JAVAC
    8819 if test -n "$JAVAC"; then
    8820   { $as_echo "$as_me:${as_lineno-$LINENO}: result: $JAVAC" >&5
    8821 $as_echo "$JAVAC" >&6; }
    8822 else
    8823   { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
    8824 $as_echo "no" >&6; }
    8825 fi
    8826 
    8827 
    8828     # Extract the first word of "javah", so it can be a program name with args.
    8829 set dummy javah; ac_word=$2
    8830 { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
    8831 $as_echo_n "checking for $ac_word... " >&6; }
    8832 if ${ac_cv_path_JAVAH+:} false; then :
    8833   $as_echo_n "(cached) " >&6
    8834 else
    8835   case $JAVAH in
    8836   [\\/]* | ?:[\\/]*)
    8837   ac_cv_path_JAVAH="$JAVAH" # Let the user override the test with a path.
    8838   ;;
    8839   *)
    8840   as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
    8841 as_dummy="${rp_with_java}/bin:${rp_with_java}"
    8842 for as_dir in $as_dummy
    8843 do
    8844   IFS=$as_save_IFS
    8845   test -z "$as_dir" && as_dir=.
    8846     for ac_exec_ext in '' $ac_executable_extensions; do
    8847   if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
    8848     ac_cv_path_JAVAH="$as_dir/$ac_word$ac_exec_ext"
    8849     $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
    8850     break 2
    8851   fi
    8852 done
    8853   done
    8854 IFS=$as_save_IFS
    8855 
    8856   ;;
    8857 esac
    8858 fi
    8859 JAVAH=$ac_cv_path_JAVAH
    8860 if test -n "$JAVAH"; then
    8861   { $as_echo "$as_me:${as_lineno-$LINENO}: result: $JAVAH" >&5
    8862 $as_echo "$JAVAH" >&6; }
    8863 else
    8864   { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
    8865 $as_echo "no" >&6; }
    8866 fi
    8867 
    8868 
    8869   fi
    8870 fi
    8871 JDK=
    8872 JAVA_HOME=
    8873 JAVA_INC_DIR=
    8874 JAVA_INC_SPEC=
    8875 
    8876 # If java exists, let's look for the jni.h file.
    8877 if test "x${JAVA}" != "x" ; then
    8878   for d in \
    8879    /apps/java/jdk1.6.0_01 \
    8880    /usr/lib/jvm/*sun-1.6* \
    8881    /opt/sun-jdk-1.6* \
    8882    /opt/icedtea6-* \
    8883    /opt/sun-jdk-1.5* \
    8884    /usr/lib/jvm/*sun-1.5*
    8885   do
    8886     if test -r "${d}/include/jni.h" ; then
    8887       JDK=${d}
    8888       break;
    8889     fi
    8890   done
    8891   JAVA_HOME=$JDK
    8892   JAVA_INC_DIR=${JDK}/include
    8893   JAVA_INC_SPEC="-I${JDK}/include -I${JDK}/include/linux"
    88948878fi
    88958879
  • trunk/configure.in

    r2202 r2205  
    203203AC_MSG_RESULT([$VTKDIR])
    204204
    205 
    206 AC_ARG_WITH(
    207     [matlab],
    208     [AS_HELP_STRING([--with-matlab[=DIR]],
    209         [location of matlab and mex compiler @<:@default=yes@:>@])],
    210     [rp_with_matlab=$withval],
    211     [rp_with_matlab=yes])
    212 
    213 MCC=""
    214 MEX=""
    215 MEX_ARCH=""
    216 MEXEXT=""
    217 MATLAB=
    218 if test "$rp_with_matlab" != "no" ; then
    219   if test "$rp_with_matlab" = "yes" ; then
    220     AC_PATH_PROG(MATLAB, matlab)
    221   else
    222     AC_PATH_PROG(MATLAB, matlab, [], [${rp_with_matlab}/bin:${rp_with_matlab}])
    223   fi
    224 fi
    225 
    226 if test "x$MATLAB" != "x" ; then
    227   # Found matlab.  May be a symlink to the real binary.  Run "matlab -e"
    228   # to tell where matlab is installed.
    229 
    230   matlab_bindir=`${MATLAB} -e | grep "MATLAB=" | sed s/MATLAB=//`/bin
    231 
    232   # Now see if we can find "mex" or "mexext" there.
    233   AC_PATH_PROG(MEX, mex, [], [${matlab_bindir}])
    234   AC_PATH_PROG(MEXEXT, mexext, [], [${matlab_bindir}])
    235 
    236   # Run "mexext" to get the expected module extension for this platform.
    237   AC_MSG_CHECKING([for mex extension])
    238   if test "x$MEXEXT" != "x" ; then
    239     MEXEXT=`$MEXEXT`
    240   else
    241     MEXEXT="mexglx"
    242   fi
    243   AC_MSG_RESULT([$MEXEXT])
    244   AC_PATH_PROG(MCC, mcc, [], [${matlab_bindir}])
    245   AC_MSG_CHECKING([for mcc extension])
    246 fi
    247 
    248 
    249 #
    250 # Octave variables:
    251 #
    252 #       OCTAVE                  Path to default octave executable.  Will use
    253 #                               to determine the version.
    254 #       OCTAVE_VERSION          Full version of octave (X.X.X).  Used in
    255 #                               Makefiles to indicate if we are building
    256 #                               the octave language bindings.  The empty
    257 #                               string indicates octave is not available.
    258 #       OCTAVE_VERSION_MAJOR    Single verion number of octave.  Used in
    259 #                               rappture.env scripts to indicate how to set
    260 #                               OCTAVE_PATH and OCTAVE_LOADPATH variables.
    261 #       MKOCTFILE               Path to the default octave compiler.  This
    262 #                               variable isn't used directly.  Either
    263 #                               MKOCTFILE2 or MKOCTFILE3 will be set to its
    264 #                               value.
    265 #       MKOCTFILE2              Path to octave version 2 compiler.
    266 #       MKOCTFILE3              Path to octave version 3 compiler.
    267 #
    268 
    269 # Standard octave search (use the installed version of octave)
    270 AC_ARG_WITH(
    271     [octave],
    272     [AS_HELP_STRING([--with-octave[=DIR]],
    273         [path of default octave compiler `mkoctfile' @<:@default=yes@:>@])],
    274     [rp_with_octave=$withval],
    275     [rp_with_octave=yes])
    276 
    277 OCTAVE=
    278 OCTAVE_VERSION=
    279 OCTAVE_VERSION_MAJOR=
    280 MKOCTFILE2=
    281 MKOCTFILE3=
    282 
    283 if test "$rp_with_octave" != "no" ; then
    284   if test "$rp_with_octave" = "yes" ; then
    285     AC_PATH_PROG(OCTAVE, octave)
    286     AC_PATH_PROG(MKOCTFILE, mkoctfile)
    287   else
    288     OCTAVE=$rp_with_octave
    289     MKOCTFILE=`dirname $rp_with_octave`/mkoctfile
    290   fi
    291 fi
    292 
    293 if test "x${OCTAVE}" != "x" ; then
    294   OCTAVE_VERSION=`${OCTAVE} -v | grep version | cut -d' ' -f4`
    295   OCTAVE_VERSION_MAJOR=`echo ${OCTAVE_VERSION} | cut -d'.' -f1`
    296   if test "${OCTAVE_VERSION_MAJOR}" == "3" ; then
    297     OCTAVE3=$OCTAVE
    298     MKOCTFILE3=$MKOCTFILE
    299   fi
    300   if test "${OCTAVE_VERSION_MAJOR}" == "2" ; then
    301     OCTAVE2=$OCTAVE
    302     MKOCTFILE2=$MKOCTFILE
    303   fi
    304 fi
    305 
    306 #
    307 # Check for octave3 before octave2 so that we can override the
    308 # OCTAVE_VERSION variables. 
    309 #
    310 # Rappture doesn't normally really support both octave2 and octave3
    311 # simultaneously.  NANOhub has a hacked version of octave3 that
    312 # looks for OCTAVE_LOADPATH before looking at OCTAVE_PATH (i.e.
    313 # OCTAVE_PATH tells octave2 where to load the rappture bindings
    314 # and OCTAVE_LOADPATH tells octave3 where to load).
    315 #
    316 # Usually you will have installed either octave2 or octave3, but
    317 # not both. 
    318 #
    319 
    320 # Check if octave3 was designated *in addition* to the installed version.
    321 # This can override the default version if they are the same versions.
    322 
    323 AC_ARG_WITH(
    324     [mkoctfile3],
    325     [AS_HELP_STRING([--with-mkoctfile3[=DIR]],
    326         [path of octave compiler `mkoctfile' @<:@default=no@:>@])],
    327     [rp_with_mkoctfile3=$withval],
    328     [rp_with_mkoctfile3=no])
    329 
    330 if test "$rp_with_mkoctfile3" != "no" ; then
    331   if test "$rp_with_mkoctfile3" = "yes" ; then
    332     AC_PATH_PROG(mkoctfile3, mkoctfile)
    333   else
    334     MKOCTFILE3=$rp_with_mkoctfile3
    335   fi
    336   OCTAVE_VERSION=`${MKOCTFILE3} --version 2>&1 | cut -d' ' -f3`
    337   OCTAVE_VERSION_MAJOR=`echo ${OCTAVE_VERSION} | cut -d'.' -f1`
    338 fi
    339 
    340 # Check if mkoctfile2 was designated *in addition* to the installed version.
    341 # This can override the default version if they are the same versions.
    342 AC_ARG_WITH(
    343     [mkoctfile2],
    344     [AS_HELP_STRING([--with-mkoctfile2[=DIR]],
    345         [path of octave compiler `mkoctfile' @<:@default=no@:>@])],
    346     [rp_with_mkoctfile2=$withval],
    347     [rp_with_mkoctfile2=no])
    348 
    349 if test "$rp_with_mkoctfile2" != "no" ; then
    350   if test "$rp_with_mkoctfile2" = "yes" ; then
    351     AC_PATH_PROG(mkoctfile2, mkoctfile)
    352   else
    353     MKOCTFILE2=$rp_with_mkoctfile2
    354   fi
    355   # Have to use octave to get a version, instead of mkoctfile.
    356   octave=`dirname $MKOCTFILE2`/octave
    357   OCTAVE_VERSION=`${octave} -v | grep version | cut -d' ' -f4`
    358   OCTAVE_VERSION_MAJOR=`echo ${OCTAVE_VERSION} | cut -d'.' -f1`
    359 fi
    360 
    361 
    362 echo "MKOCTFILE2 = $MKOCTFILE2"
    363 echo "MKOCTFILE3 = $MKOCTFILE3"
    364 echo "OCTAVE_VERSION_MAJOR = $OCTAVE_VERSION_MAJOR"
    365 echo "OCTAVE_VERSION = $OCTAVE_VERSION"
    366 
    367 
    368 AC_ARG_WITH(
    369     [perl],
    370     [AS_HELP_STRING([--with-perl[=DIR]], [location of perl @<:@default=yes@:>@])],
    371     [],
    372     [rp_with_perl=yes])
    373 
    374 PERL=
    375 PERL_INCLUDES=
    376 PERL_ARCHLIB=
    377 PERL_ARCHLIBEXP=
    378 PERL_VERSION=
    379 PERL_VENDORLIB=
    380 PERL_PRIVLIB=
    381 PERL_CPPFLAGS=
    382 PERL_CCFlAGS=
    383 PERL_VERSION_RV=
    384 PERL_LIBSPEC=
    385 if test "$rp_with_perl" != "no" ; then
    386   if test "$rp_with_perl" != "yes" ; then
    387     AC_PATH_PROG(PERL, perl, [], [$rp_with_perl/bin:$rp_with_perl])
    388   else
    389     AC_PATH_PROG(PERL, perl)
    390   fi
    391   if test "x${PERL}" != "x" ; then
    392     PERL_ARCHLIB=`${PERL} -MConfig -e 'print $Config{archlib}'`
    393     PERL_VERSION=`${PERL} -MConfig -e 'print $Config{version}'`
    394     PERL_CCFLAGS=`${PERL} -MConfig -e 'print $Config{ccflags}'`
    395     PERL_CPPFLAGS=`${PERL} -MConfig -e 'print $Config{cppflags}'`
    396     PERL_VENDORLIB=`${PERL} -MConfig -e 'print $Config{vendorlib}'`
    397     PERL_PRIVLIB=`${PERL} -MConfig -e 'print $Config{privlib}'`
    398     PERL_INSTALLARCHLIB=`${PERL} -MConfig -e 'print $Config{installarchlib}'`
    399     PERL_ARCHLIBEXP=`${PERL} -MConfig -e 'print $Config{archlibexp}'`
    400     PERL_VERSION_RV=`echo ${PERL_VERSION} | cut -d'.' -f1-2`
    401     # libperl may or may not be installed.  Check for its existence.
    402     if test -f "${PERL_ARCHLIBEXP}/CORE/libperl${SHLIB_SUFFIX}" ; then
    403       PERL_LIBSPEC="-L${PERL_ARCHLIBEXP}/CORE -lperl"
    404     fi
    405   fi
    406 fi
    407 
    408 PYTHON=""
    409 PYTHON_CFLAGS=""
    410 PYTHON_CPPFLAGS=""
    411 PYTHON_DISTUTILS=""
    412 PYTHON_INCLUDES=""
    413 PYTHON_LDFLAGS=""
    414 PYTHON_LIB=""
    415 PYTHON_LIBDIR=""
    416 PYTHON_SITE_DIR=""
    417 PYTHON_SITE_PACKAGES=""
    418 PYTHON_VERSION=""
    419 pythondir=""
    420 
    421 AC_ARG_WITH([python],
    422     [AS_HELP_STRING([--with-python[=DIR]],[location of python @<:@default=yes@:>@])],
    423     [],
    424     [rp_with_python=yes])
    425 
    426 if test "$rp_with_python" != "no" ; then
    427   if test "$rp_with_python" = "yes" ; then
    428     AC_PATH_PROG(PYTHON, python python2.5 python2.4 python2.3 python2.2 python2.1 python2.0 python1.6 python1.5)
    429   else
    430     AC_PATH_PROG(PYTHON, python, [], [${rp_with_python}/bin:${rp_with_python}])
    431   fi
    432   AC_MSG_CHECKING([for Python version])
    433   if test "x${PYTHON}" != "x"; then
    434     PYTHON_VERSION=`${PYTHON} -c "import sys; print sys.version[[0:3]]"`
    435   fi
    436   AC_MSG_RESULT([$PYTHON_VERSION])
    437 fi
    438 
    439 if test "x${PYTHON_VERSION}" != "x"; then
    440   PYTHON_INCLUDES=$incdir
    441   AC_MSG_CHECKING([for Python distutils])
    442   PYTHON_DISTUTILS=""
    443   ${PYTHON} -c "from distutils.core import setup; setup(name='test')" \
    444         build build_ext 2>&1 > /dev/null
    445   if test $? = 0 ; then
    446     PYTHON_DISTUTILS="yes"
    447   fi
    448   AC_MSG_RESULT([$PYTHON_DISTUTILS])
    449   if test "${PYTHON_DISTUTILS}" = "yes" ; then
    450     PYTHON_SITE_PACKAGES=`$PYTHON -c "from distutils import sysconfig; print sysconfig.get_python_lib()"`
    451     #
    452     # Check for Python include path
    453     #
    454     AC_MSG_CHECKING([path to Python headers])
    455     PYTHON_INCDIR=`${PYTHON} -c "import distutils.sysconfig; \
    456      print distutils.sysconfig.get_python_inc();"`
    457     AC_MSG_RESULT([$PYTHON_INCDIR])
    458     #
    459     # Python distutils found, get settings from python directly
    460     #
    461     PYTHON_SITE_DIR="`${PYTHON} -c 'from distutils import sysconfig; print sysconfig.get_python_lib(0);'`"
    462    
    463     PYTHON_CFLAGS="`$PYTHON -c 'from distutils import sysconfig; flags = [[\"-I\" + sysconfig.get_python_inc(0), \"-I\" + sysconfig.get_python_inc(1), \" \".join(sysconfig.get_config_var(\"CFLAGS\").split())]]; print \" \".join(flags);'`"
    464     PYTHON_LDFLAGS="`$PYTHON -c 'from distutils import sysconfig; libs = sysconfig.get_config_var(\"LIBS\").split() + sysconfig.get_config_var(\"SYSLIBS\").split(); libs.append(\"-lpython\"+sysconfig.get_config_var(\"VERSION\")); print \" \".join(libs);'`"
    465     PYTHON_LIB="`$PYTHON -c 'from distutils import sysconfig; print \"python\" + sysconfig.get_config_var(\"VERSION\");'`"
    466     PYTHON_LIBDIR="`$PYTHON -c 'from distutils import sysconfig; print sysconfig.get_config_var(\"LIBDIR\");'`"
    467     save_CPPFLAGS=$CPPFLAGS
    468     CPPFLAGS="$CPPFLAGS -I${PYTHON_INCDIR}"
    469     AC_CHECK_HEADERS([Python.h], [found=yes], [found=no])
    470     CPPFLAGS=$save_CPPFLAGS
    471     if test "$found" = "no" ; then
    472       PYTHON_DISTUTILS=""
    473     fi
    474   fi
    475 fi
    476 
     205RP_LANG_MATLAB
     206RP_LANG_OCTAVE
     207RP_LANG_PERL
     208RP_LANG_PYTHON
     209RP_LANG_JAVA
    477210
    478211rp_with_ruby="yes"
     
    505238    AX_RUBY_DEV_FLAGS([${RUBY}])
    506239  fi
    507 fi
    508 
    509 JAVA=""
    510 JAVAH=""
    511 JAVAC=""
    512 JAVA_DEV_PKG="no"
    513 AC_ARG_WITH(
    514     [java],
    515     [AS_HELP_STRING([--with-java=DIR], [location of java @<:@default=yes@:>@])],
    516     [rp_with_java=$withval])
    517 
    518 if test "${rp_with_java}" != "no" ; then
    519   if test "${rp_with_java}" = "yes" ; then
    520     AC_PATH_PROG(JAVA,  java)
    521     AC_PATH_PROG(JAVAC, javac)
    522     AC_PATH_PROG(JAVAH, javah)
    523   else
    524     AC_PATH_PROG(JAVA,  java,  [], [${rp_with_java}/bin:${rp_with_java}])
    525     AC_PATH_PROG(JAVAC, javac, [], [${rp_with_java}/bin:${rp_with_java}])
    526     AC_PATH_PROG(JAVAH, javah, [], [${rp_with_java}/bin:${rp_with_java}])
    527   fi
    528 fi
    529 JDK=
    530 JAVA_HOME=
    531 JAVA_INC_DIR=
    532 JAVA_INC_SPEC=
    533 
    534 # If java exists, let's look for the jni.h file.
    535 if test "x${JAVA}" != "x" ; then
    536   for d in \
    537    /apps/java/jdk1.6.0_01 \
    538    /usr/lib/jvm/*sun-1.6* \
    539    /opt/sun-jdk-1.6* \
    540    /opt/icedtea6-* \
    541    /opt/sun-jdk-1.5* \
    542    /usr/lib/jvm/*sun-1.5*
    543   do
    544     if test -r "${d}/include/jni.h" ; then
    545       JDK=${d}
    546       break;
    547     fi
    548   done
    549   JAVA_HOME=$JDK
    550   JAVA_INC_DIR=${JDK}/include
    551   JAVA_INC_SPEC="-I${JDK}/include -I${JDK}/include/linux"
    552240fi
    553241
  • trunk/gui/scripts/field2dresult.tcl

    r2144 r2205  
    6363        "vtkcontour" {
    6464            set servers [Rappture::VisViewer::GetServerList "vtkvis"]
     65        }
     66        "vtk" {
     67            # Old vtk contour widget
    6568        }
    6669        default {
  • trunk/gui/scripts/field3dresult.tcl

    r1929 r2205  
    5656    array set flags $args
    5757
    58     set servers [Rappture::VisViewer::GetServerList "nanovis"]
     58    switch -- $flags(-mode) {
     59        "auto" - "nanovis" - "flowvis" {
     60            set servers [Rappture::VisViewer::GetServerList "nanovis"]
     61        }
     62        "vtkcontour" {
     63            set servers [Rappture::VisViewer::GetServerList "vtkvis"]
     64        }
     65        "vtk" {
     66            # Old vtk contour widget
     67        }
     68        default {
     69            puts stderr "unknown render mode \"$flags(-mode)\""
     70        }
     71    }           
    5972    if {"" != $servers && $flags(-mode) != "vtk"} {
    6073        switch -- $flags(-mode) {
Note: See TracChangeset for help on using the changeset viewer.