Changeset 2308


Ignore:
Timestamp:
Jul 10, 2011, 5:55:40 PM (13 years ago)
Author:
gah
Message:

update from trunk

File:
1 edited

Legend:

Unmodified
Added
Removed
  • branches/blt4/configure

    r2299 r2308  
    14401440  --with-python=DIR       location of python [default=yes]
    14411441  --with-java=DIR         location of java [default=yes]
     1442  --with-ruby=DIR         location of ruby [default=yes]
    14421443  --with-java=DIR         location of java [default=yes]
    1443   --with-ruby=DIR         location of ruby [default=yes]
    14441444
    14451445Some influential environment variables:
     
    73697369
    73707370
    7371 rp_with_matlab="yes"
     7371with_matlab="yes"
    73727372
    73737373# Check whether --with-matlab was given.
    73747374if test "${with_matlab+set}" = set; then :
    7375   withval=$with_matlab; rp_with_matlab=$withval
    7376 else
    7377   rp_with_matlab=yes
     7375  withval=$with_matlab;
     7376else
     7377  with_matlab=yes
    73787378fi
    73797379
     
    73847384MEXEXT=""
    73857385MATLAB=
    7386 if test "$rp_with_matlab" != "no" ; then
    7387   if test "$rp_with_matlab" = "yes" ; then
     7386if test "$with_matlab" != "no" ; then
     7387  if test "$with_matlab" = "yes" ; then
    73887388    # Extract the first word of "matlab", so it can be a program name with args.
    73897389set dummy matlab; ac_word=$2
     
    74407440  *)
    74417441  as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
    7442 as_dummy="${rp_with_matlab}/bin:${rp_with_matlab}"
     7442as_dummy="${with_matlab}/bin:${with_matlab}"
    74437443for as_dir in $as_dummy
    74447444do
     
    76147614
    76157615
    7616 rp_with_octave="yes"
    76177616
    76187617# Check whether --with-octave was given.
    76197618if test "${with_octave+set}" = set; then :
    7620   withval=$with_octave; rp_with_octave=$withval
    7621 else
    7622   rp_with_octave=yes
     7619  withval=$with_octave;
     7620else
     7621  with_octave=yes
    76237622fi
    76247623
     
    76307629MKOCTFILE3=
    76317630
    7632 if test "$rp_with_octave" != "no" ; then
    7633   if test "$rp_with_octave" = "yes" ; then
     7631if test "$with_octave" != "no" ; then
     7632  if test "$with_octave" = "yes" ; then
    76347633    # Extract the first word of "octave", so it can be a program name with args.
    76357634set dummy octave; ac_word=$2
     
    77137712
    77147713  else
    7715     OCTAVE=$rp_with_octave
    7716     MKOCTFILE=`dirname $rp_with_octave`/mkoctfile
     7714    OCTAVE=$with_octave
     7715    MKOCTFILE=`dirname $with_octave`/mkoctfile
    77177716  fi
    77187717fi
     
    77517750# Check whether --with-mkoctfile3 was given.
    77527751if test "${with_mkoctfile3+set}" = set; then :
    7753   withval=$with_mkoctfile3; rp_with_mkoctfile3=$withval
    7754 else
    7755   rp_with_mkoctfile3=no
    7756 fi
    7757 
    7758 
    7759 if test "$rp_with_mkoctfile3" != "no" ; then
    7760   if test "$rp_with_mkoctfile3" = "yes" ; then
     7752  withval=$with_mkoctfile3;
     7753else
     7754  with_mkoctfile3=no
     7755fi
     7756
     7757
     7758if test "$with_mkoctfile3" != "no" ; then
     7759  if test "$with_mkoctfile3" = "yes" ; then
    77617760    # Extract the first word of "mkoctfile", so it can be a program name with args.
    77627761set dummy mkoctfile; ac_word=$2
     
    78007799
    78017800  else
    7802     MKOCTFILE3=$rp_with_mkoctfile3
     7801    MKOCTFILE3=$with_mkoctfile3
    78037802  fi
    78047803  OCTAVE_VERSION=`${MKOCTFILE3} --version 2>&1 | cut -d' ' -f3`
     
    78117810# Check whether --with-mkoctfile2 was given.
    78127811if test "${with_mkoctfile2+set}" = set; then :
    7813   withval=$with_mkoctfile2; rp_with_mkoctfile2=$withval
    7814 else
    7815   rp_with_mkoctfile2=no
    7816 fi
    7817 
    7818 
    7819 if test "$rp_with_mkoctfile2" != "no" ; then
    7820   if test "$rp_with_mkoctfile2" = "yes" ; then
     7812  withval=$with_mkoctfile2;
     7813else
     7814  with_mkoctfile2=no
     7815fi
     7816
     7817
     7818if test "$with_mkoctfile2" != "no" ; then
     7819  if test "$with_mkoctfile2" = "yes" ; then
    78217820    # Extract the first word of "mkoctfile", so it can be a program name with args.
    78227821set dummy mkoctfile; ac_word=$2
     
    78607859
    78617860  else
    7862     MKOCTFILE2=$rp_with_mkoctfile2
     7861    MKOCTFILE2=$with_mkoctfile2
    78637862  fi
    78647863  # Have to use octave to get a version, instead of mkoctfile.
     
    78697868
    78707869
    7871 echo "MKOCTFILE2 = $MKOCTFILE2"
    7872 echo "MKOCTFILE3 = $MKOCTFILE3"
    7873 echo "OCTAVE_VERSION_MAJOR = $OCTAVE_VERSION_MAJOR"
    7874 echo "OCTAVE_VERSION = $OCTAVE_VERSION"
    7875 
    7876 
    78777870
    78787871# Check whether --with-perl was given.
     
    78807873  withval=$with_perl;
    78817874else
    7882   rp_with_perl=yes
     7875  with_perl=yes
    78837876fi
    78847877
     
    78957888PERL_VERSION_RV=
    78967889PERL_LIBSPEC=
    7897 if test "$rp_with_perl" != "no" ; then
    7898   if test "$rp_with_perl" != "yes" ; then
     7890if test "$with_perl" != "no" ; then
     7891  if test "$with_perl" != "yes" ; then
    78997892    # Extract the first word of "perl", so it can be a program name with args.
    79007893set dummy perl; ac_word=$2
     
    79107903  *)
    79117904  as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
    7912 as_dummy="$rp_with_perl/bin:$rp_with_perl"
     7905as_dummy="$with_perl/bin:$with_perl"
    79137906for as_dir in $as_dummy
    79147907do
     
    80108003PYTHON_VERSION=""
    80118004pythondir=""
    8012 rp_with_python="yes"
    80138005
    80148006# Check whether --with-python was given.
    80158007if test "${with_python+set}" = set; then :
    8016   withval=$with_python; rp_with_python=$withval
    8017 else
    8018   rp_with_python=yes
    8019 fi
    8020 
    8021 
    8022 if test "$rp_with_python" != "no" ; then
    8023   if test "$rp_with_python" = "yes" ; then
     8008  withval=$with_python;
     8009else
     8010  with_python=yes
     8011fi
     8012
     8013
     8014if test "$with_python" != "no" ; then
     8015  if test "$with_python" = "yes" ; then
    80248016    # 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.
    80258017set dummy python python2.5 python2.4 python2.3 python2.2 python2.1 python2.0 python1.6 python1.5; ac_word=$2
     
    80768068  *)
    80778069  as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
    8078 as_dummy="${rp_with_python}/bin:${rp_with_python}"
     8070as_dummy="${with_python}/bin:${with_python}"
    80798071for as_dir in $as_dummy
    80808072do
     
    81708162
    81718163
    8172 rp_with_java="yes"
    81738164
    81748165# Check whether --with-java was given.
    81758166if test "${with_java+set}" = set; then :
    8176   withval=$with_java; rp_with_java=$withval
    8177 else
    8178   rp_with_java=yes
     8167  withval=$with_java;
     8168else
     8169  with_java=yes
    81798170fi
    81808171
     
    81848175JAVA_DEV_PKG="no"
    81858176
    8186 # Check whether --with-java was given.
    8187 if test "${with_java+set}" = set; then :
    8188   withval=$with_java; rp_with_java=$withval
    8189 fi
    8190 
    8191 
    8192 if test "${rp_with_java}" != "no" ; then
    8193   if test "${rp_with_java}" = "yes" ; then
     8177if test "${with_java}" != "no" ; then
     8178  if test "${with_java}" = "yes" ; then
    81948179    # Extract the first word of "java", so it can be a program name with args.
    81958180set dummy java; ac_word=$2
     
    83268311  *)
    83278312  as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
    8328 as_dummy="${rp_with_java}/bin:${rp_with_java}"
     8313as_dummy="${with_java}/bin:${with_java}"
    83298314for as_dir in $as_dummy
    83308315do
     
    83678352  *)
    83688353  as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
    8369 as_dummy="${rp_with_java}/bin:${rp_with_java}"
     8354as_dummy="${with_java}/bin:${with_java}"
    83708355for as_dir in $as_dummy
    83718356do
     
    84088393  *)
    84098394  as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
    8410 as_dummy="${rp_with_java}/bin:${rp_with_java}"
     8395as_dummy="${with_java}/bin:${with_java}"
    84118396for as_dir in $as_dummy
    84128397do
     
    84458430if test "x${JAVA}" != "x" ; then
    84468431  for d in \
    8447    ${rp_with_java} \
     8432   ${with_java} \
    84488433   ${JAVA_HOME} \
    84498434   /apps/java/jdk1.6* \
Note: See TracChangeset for help on using the changeset viewer.