Changeset 2189 for trunk/configure


Ignore:
Timestamp:
Mar 31, 2011, 6:16:43 PM (9 years ago)
Author:
gah
Message:
 
File:
1 edited

Legend:

Unmodified
Added
Removed
  • trunk/configure

    r2181 r2189  
    660660OCTAVE_VERSION_MAJOR
    661661OCTAVE_VERSION
     662mkoctfile2
    662663mkoctfile3
    663 mkoctfile2
    664664MKOCTFILE
    665665OCTAVE
     
    777777with_matlab
    778778with_octave
     779with_mkoctfile3
    779780with_mkoctfile2
    780 with_mkoctfile3
    781781with_perl
    782782with_python
     
    14301430  --with-octave=DIR       path of default octave compiler `mkoctfile'
    14311431                          [default=yes]
     1432  --with-mkoctfile3=DIR   path of octave compiler `mkoctfile' [default=no]
    14321433  --with-mkoctfile2=DIR   path of octave compiler `mkoctfile' [default=no]
    1433   --with-mkoctfile3=DIR   path of octave compiler `mkoctfile' [default=no]
    14341434  --with-perl=DIR         location of perl [default=yes]
    14351435  --with-python=DIR       location of python [default=yes]
     
    77717771fi
    77727772
     7773#
     7774# Check for octave3 before octave2 so that we can override the
     7775# OCTAVE_VERSION variables.
     7776#
     7777# Rappture doesn't normally really support both octave2 and octave3
     7778# simultaneously.  NANOhub has a hacked version of octave3 that
     7779# looks for OCTAVE_LOADPATH before looking at OCTAVE_PATH (i.e.
     7780# OCTAVE_PATH tells octave2 where to load the rappture bindings
     7781# and OCTAVE_LOADPATH tells octave3 where to load).
     7782#
     7783# Usually you will have installed either octave2 or octave3, but
     7784# not both.
     7785#
     7786
     7787# Check if octave3 was designated *in addition* to the installed version.
     7788# This can override the default version if they are the same versions.
     7789
     7790# Check whether --with-mkoctfile3 was given.
     7791if test "${with_mkoctfile3+set}" = set; then :
     7792  withval=$with_mkoctfile3; rp_with_mkoctfile3=$withval
     7793else
     7794  rp_with_mkoctfile3=no
     7795fi
     7796
     7797
     7798if test "$rp_with_mkoctfile3" != "no" ; then
     7799  if test "$rp_with_mkoctfile3" = "yes" ; then
     7800    # Extract the first word of "mkoctfile", so it can be a program name with args.
     7801set dummy mkoctfile; ac_word=$2
     7802{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
     7803$as_echo_n "checking for $ac_word... " >&6; }
     7804if ${ac_cv_path_mkoctfile3+:} false; then :
     7805  $as_echo_n "(cached) " >&6
     7806else
     7807  case $mkoctfile3 in
     7808  [\\/]* | ?:[\\/]*)
     7809  ac_cv_path_mkoctfile3="$mkoctfile3" # Let the user override the test with a path.
     7810  ;;
     7811  *)
     7812  as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
     7813for as_dir in $PATH
     7814do
     7815  IFS=$as_save_IFS
     7816  test -z "$as_dir" && as_dir=.
     7817    for ac_exec_ext in '' $ac_executable_extensions; do
     7818  if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
     7819    ac_cv_path_mkoctfile3="$as_dir/$ac_word$ac_exec_ext"
     7820    $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
     7821    break 2
     7822  fi
     7823done
     7824  done
     7825IFS=$as_save_IFS
     7826
     7827  ;;
     7828esac
     7829fi
     7830mkoctfile3=$ac_cv_path_mkoctfile3
     7831if test -n "$mkoctfile3"; then
     7832  { $as_echo "$as_me:${as_lineno-$LINENO}: result: $mkoctfile3" >&5
     7833$as_echo "$mkoctfile3" >&6; }
     7834else
     7835  { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
     7836$as_echo "no" >&6; }
     7837fi
     7838
     7839
     7840  else
     7841    MKOCTFILE3=$rp_with_mkoctfile3
     7842  fi
     7843  OCTAVE_VERSION=`${MKOCTFILE3} --version 2>&1 | cut -d' ' -f3`
     7844  OCTAVE_VERSION_MAJOR=`echo ${OCTAVE_VERSION} | cut -d'.' -f1`
     7845fi
     7846
    77737847# Check if mkoctfile2 was designated *in addition* to the installed version.
    77747848# This can override the default version if they are the same versions.
     
    78317905fi
    78327906
    7833 # Check if octave3 was designated *in addition* to the installed version.
    7834 # This can override the default version if they are the same versions.
    7835 
    7836 # Check whether --with-mkoctfile3 was given.
    7837 if test "${with_mkoctfile3+set}" = set; then :
    7838   withval=$with_mkoctfile3; rp_with_mkoctfile3=$withval
    7839 else
    7840   rp_with_mkoctfile3=no
    7841 fi
    7842 
    7843 
    7844 if test "$rp_with_mkoctfile3" != "no" ; then
    7845   if test "$rp_with_mkoctfile3" = "yes" ; then
    7846     # Extract the first word of "mkoctfile", so it can be a program name with args.
    7847 set dummy mkoctfile; ac_word=$2
    7848 { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
    7849 $as_echo_n "checking for $ac_word... " >&6; }
    7850 if ${ac_cv_path_mkoctfile3+:} false; then :
    7851   $as_echo_n "(cached) " >&6
    7852 else
    7853   case $mkoctfile3 in
    7854   [\\/]* | ?:[\\/]*)
    7855   ac_cv_path_mkoctfile3="$mkoctfile3" # Let the user override the test with a path.
    7856   ;;
    7857   *)
    7858   as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
    7859 for as_dir in $PATH
    7860 do
    7861   IFS=$as_save_IFS
    7862   test -z "$as_dir" && as_dir=.
    7863     for ac_exec_ext in '' $ac_executable_extensions; do
    7864   if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
    7865     ac_cv_path_mkoctfile3="$as_dir/$ac_word$ac_exec_ext"
    7866     $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
    7867     break 2
    7868   fi
    7869 done
    7870   done
    7871 IFS=$as_save_IFS
    7872 
    7873   ;;
    7874 esac
    7875 fi
    7876 mkoctfile3=$ac_cv_path_mkoctfile3
    7877 if test -n "$mkoctfile3"; then
    7878   { $as_echo "$as_me:${as_lineno-$LINENO}: result: $mkoctfile3" >&5
    7879 $as_echo "$mkoctfile3" >&6; }
    7880 else
    7881   { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
    7882 $as_echo "no" >&6; }
    7883 fi
    7884 
    7885 
    7886   else
    7887     MKOCTFILE3=$rp_with_mkoctfile3
    7888   fi
    7889   OCTAVE_VERSION=`${MKOCTFILE3} --version 2>&1 | cut -d' ' -f3`
    7890   OCTAVE_VERSION_MAJOR=`echo ${OCTAVE_VERSION} | cut -d'.' -f1`
    7891 fi
    78927907
    78937908echo "MKOCTFILE2 = $MKOCTFILE2"
Note: See TracChangeset for help on using the changeset viewer.