Changeset 1844 for trunk/configure


Ignore:
Timestamp:
Jul 21, 2010, 1:18:04 PM (9 years ago)
Author:
gah
Message:

allow both octave2 and octave3 builds simultaneously

File:
1 edited

Legend:

Unmodified
Added
Removed
  • trunk/configure

    r1751 r1844  
    643643PERL_INCLUDES
    644644PERL
     645MKOCTFILE3
     646MKOCTFILE2
    645647OCTAVE_VERSION_MAJOR
    646648OCTAVE_VERSION
     649OCTAVE3
     650OCTAVE2
     651mkoctfile3
     652octave3
     653mkoctfile
     654octave2
    647655MKOCTFILE
    648656OCTAVE
     
    758766with_matlab
    759767with_octave
     768with_octave2
     769with_octave3
    760770with_perl
    761771with_python
     
    14061416  --with-matlab=DIR       location of matlab and mex compiler [default=yes]
    14071417  --with-octave=DIR       location of octave compiler MKOCTFILE [default=yes]
     1418  --with-octave2=DIR      location of octave compiler MKOCTFILE [default=no]
     1419  --with-octave3=DIR      location of octave compiler MKOCTFILE [default=no]
    14081420  --with-perl=DIR         location of perl [default=yes]
    14091421  --with-python=DIR       location of python [default=yes]
     
    75527564
    75537565
     7566# Standard octave search (use the installed version of octave)
    75547567
    75557568# Check whether --with-octave was given.
     
    75627575
    75637576OCTAVE=
     7577OCTAVE2=
     7578OCTAVE3=
    75647579OCTAVE_VERSION=
    75657580OCTAVE_VERSION_MAJOR=
    75667581MKOCTFILE=
     7582MKOCTFILE2=
     7583MKOCTFILE3=
    75677584if test "$with_octave" != "no" ; then
    75687585  { $as_echo "$as_me:${as_lineno-$LINENO}: checking for octave and mkoctfile" >&5
     
    77367753    OCTAVE_VERSION=`${OCTAVE} -v | grep version | cut -d' ' -f4`
    77377754    OCTAVE_VERSION_MAJOR=`echo ${OCTAVE_VERSION} | cut -d'.' -f1`
     7755    if test "${OCTAVE_VERSION_MAJOR}" == "3" ; then
     7756      OCTAVE3=$OCTAVE
     7757      MKOCTFILE3=$MKOCTFILE
     7758    fi
     7759    if test "${OCTAVE_VERSION_MAJOR}" == "2" ; then
     7760      OCTAVE2=$OCTAVE
     7761      MKOCTFILE2=$MKOCTFILE
     7762    fi
    77387763  fi
    77397764fi
     7765
     7766# Check if octave2 was designated *in addition* to the installed version.
     7767
     7768# Check whether --with-octave2 was given.
     7769if test "${with_octave2+set}" = set; then :
     7770  withval=$with_octave2; with_octave2=$withval
     7771else
     7772  with_octave2=no
     7773fi
     7774
     7775
     7776if test "$with_octave2" != "no" ; then
     7777  { $as_echo "$as_me:${as_lineno-$LINENO}: checking for octave and mkoctfile" >&5
     7778$as_echo_n "checking for octave and mkoctfile... " >&6; }
     7779  # Extract the first word of "octave", so it can be a program name with args.
     7780set dummy octave; ac_word=$2
     7781{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
     7782$as_echo_n "checking for $ac_word... " >&6; }
     7783if test "${ac_cv_path_octave2+set}" = set; then :
     7784  $as_echo_n "(cached) " >&6
     7785else
     7786  case $octave2 in
     7787  [\\/]* | ?:[\\/]*)
     7788  ac_cv_path_octave2="$octave2" # Let the user override the test with a path.
     7789  ;;
     7790  *)
     7791  as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
     7792as_dummy="$with_octave2/bin:$with_octave2"
     7793for as_dir in $as_dummy
     7794do
     7795  IFS=$as_save_IFS
     7796  test -z "$as_dir" && as_dir=.
     7797    for ac_exec_ext in '' $ac_executable_extensions; do
     7798  if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
     7799    ac_cv_path_octave2="$as_dir/$ac_word$ac_exec_ext"
     7800    $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
     7801    break 2
     7802  fi
     7803done
     7804  done
     7805IFS=$as_save_IFS
     7806
     7807  ;;
     7808esac
     7809fi
     7810octave2=$ac_cv_path_octave2
     7811if test -n "$octave2"; then
     7812  { $as_echo "$as_me:${as_lineno-$LINENO}: result: $octave2" >&5
     7813$as_echo "$octave2" >&6; }
     7814else
     7815  { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
     7816$as_echo "no" >&6; }
     7817fi
     7818
     7819
     7820  # Extract the first word of "mkoctfile", so it can be a program name with args.
     7821set dummy mkoctfile; ac_word=$2
     7822{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
     7823$as_echo_n "checking for $ac_word... " >&6; }
     7824if test "${ac_cv_path_mkoctfile+set}" = set; then :
     7825  $as_echo_n "(cached) " >&6
     7826else
     7827  case $mkoctfile in
     7828  [\\/]* | ?:[\\/]*)
     7829  ac_cv_path_mkoctfile="$mkoctfile" # Let the user override the test with a path.
     7830  ;;
     7831  *)
     7832  as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
     7833as_dummy="${with_octave2}/bin/mkoctfile:${with_octave2}"
     7834for as_dir in $as_dummy
     7835do
     7836  IFS=$as_save_IFS
     7837  test -z "$as_dir" && as_dir=.
     7838    for ac_exec_ext in '' $ac_executable_extensions; do
     7839  if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
     7840    ac_cv_path_mkoctfile="$as_dir/$ac_word$ac_exec_ext"
     7841    $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
     7842    break 2
     7843  fi
     7844done
     7845  done
     7846IFS=$as_save_IFS
     7847
     7848  ;;
     7849esac
     7850fi
     7851mkoctfile=$ac_cv_path_mkoctfile
     7852if test -n "$mkoctfile"; then
     7853  { $as_echo "$as_me:${as_lineno-$LINENO}: result: $mkoctfile" >&5
     7854$as_echo "$mkoctfile" >&6; }
     7855else
     7856  { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
     7857$as_echo "no" >&6; }
     7858fi
     7859
     7860
     7861  if test "x${octave2}" != "x" ; then
     7862    version=`${octave2} -v | grep version | cut -d' ' -f4`
     7863    version_major=`echo ${version} | cut -d'.' -f1`
     7864    if test "$version_major" = "2" ; then
     7865      OCTAVE2=$octave2
     7866      MKOCTFILE2=$mkoctfile2
     7867    fi
     7868  fi
     7869fi
     7870# Check if octave3 was designated *in addition* to the installed version.
     7871
     7872# Check whether --with-octave3 was given.
     7873if test "${with_octave3+set}" = set; then :
     7874  withval=$with_octave3; with_octave3=$withval
     7875else
     7876  with_octave3=no
     7877fi
     7878
     7879if test "$with_octave3" != "no" ; then
     7880  { $as_echo "$as_me:${as_lineno-$LINENO}: checking for octave and mkoctfile" >&5
     7881$as_echo_n "checking for octave and mkoctfile... " >&6; }
     7882  # Extract the first word of "octave", so it can be a program name with args.
     7883set dummy octave; ac_word=$2
     7884{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
     7885$as_echo_n "checking for $ac_word... " >&6; }
     7886if test "${ac_cv_path_octave3+set}" = set; then :
     7887  $as_echo_n "(cached) " >&6
     7888else
     7889  case $octave3 in
     7890  [\\/]* | ?:[\\/]*)
     7891  ac_cv_path_octave3="$octave3" # Let the user override the test with a path.
     7892  ;;
     7893  *)
     7894  as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
     7895as_dummy="$with_octave3/bin:$with_octave3"
     7896for as_dir in $as_dummy
     7897do
     7898  IFS=$as_save_IFS
     7899  test -z "$as_dir" && as_dir=.
     7900    for ac_exec_ext in '' $ac_executable_extensions; do
     7901  if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
     7902    ac_cv_path_octave3="$as_dir/$ac_word$ac_exec_ext"
     7903    $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
     7904    break 2
     7905  fi
     7906done
     7907  done
     7908IFS=$as_save_IFS
     7909
     7910  ;;
     7911esac
     7912fi
     7913octave3=$ac_cv_path_octave3
     7914if test -n "$octave3"; then
     7915  { $as_echo "$as_me:${as_lineno-$LINENO}: result: $octave3" >&5
     7916$as_echo "$octave3" >&6; }
     7917else
     7918  { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
     7919$as_echo "no" >&6; }
     7920fi
     7921
     7922
     7923  # Extract the first word of "mkoctfile", so it can be a program name with args.
     7924set dummy mkoctfile; ac_word=$2
     7925{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
     7926$as_echo_n "checking for $ac_word... " >&6; }
     7927if test "${ac_cv_path_mkoctfile3+set}" = set; then :
     7928  $as_echo_n "(cached) " >&6
     7929else
     7930  case $mkoctfile3 in
     7931  [\\/]* | ?:[\\/]*)
     7932  ac_cv_path_mkoctfile3="$mkoctfile3" # Let the user override the test with a path.
     7933  ;;
     7934  *)
     7935  as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
     7936as_dummy="${with_octave3}/bin/mkoctfile:${with_octave3}"
     7937for as_dir in $as_dummy
     7938do
     7939  IFS=$as_save_IFS
     7940  test -z "$as_dir" && as_dir=.
     7941    for ac_exec_ext in '' $ac_executable_extensions; do
     7942  if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
     7943    ac_cv_path_mkoctfile3="$as_dir/$ac_word$ac_exec_ext"
     7944    $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
     7945    break 2
     7946  fi
     7947done
     7948  done
     7949IFS=$as_save_IFS
     7950
     7951  ;;
     7952esac
     7953fi
     7954mkoctfile3=$ac_cv_path_mkoctfile3
     7955if test -n "$mkoctfile3"; then
     7956  { $as_echo "$as_me:${as_lineno-$LINENO}: result: $mkoctfile3" >&5
     7957$as_echo "$mkoctfile3" >&6; }
     7958else
     7959  { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
     7960$as_echo "no" >&6; }
     7961fi
     7962
     7963
     7964  if test "x${octave3}" != "x" ; then
     7965    version=`${octave3} -v | grep version | cut -d' ' -f4`
     7966    version_major=`echo ${version} | cut -d'.' -f1`
     7967    if test "$version_major" = "3" ; then
     7968      OCTAVE3=$octave3
     7969      MKOCTFILE3=$mkoctfile3
     7970    fi
     7971  fi
     7972fi
     7973
     7974
     7975
     7976
     7977
    77407978
    77417979
     
    92529490
    92539491
    9254 ac_config_files="$ac_config_files Makefile packages/Makefile src/Makefile src/core/Makefile src/core2/Makefile src/objects/Makefile src/objects/RpHash.h gui/Makefile gui/apps/Makefile gui/apps/about gui/apps/encodedata gui/apps/rappture gui/apps/rappture-csh.env gui/apps/rappture.env gui/apps/rappture.use gui/apps/rerun gui/apps/simsim gui/apps/xmldiff gui/pkgIndex.tcl gui/scripts/Makefile instant/Makefile instant/irappture lang/Makefile lang/java/Makefile lang/java/rappture/Makefile lang/perl/Makefile lang/perl/Makefile.PL lang/python/Makefile lang/python/setup.py lang/matlab/Makefile lang/octave/Makefile lang/octave/RpOctaveInterface.h lang/ruby/Makefile lang/ruby/build.rb lang/tcl/Makefile lang/tcl/pkgIndex.tcl lang/tcl/src/Makefile lang/tcl/scripts/Makefile lang/tcl/tests/Makefile lib/Makefile examples/3D/Makefile examples/Makefile examples/app-fermi/2.0/Makefile examples/app-fermi/Makefile examples/app-fermi/cee/Makefile examples/app-fermi/fortran/Makefile examples/app-fermi/java/Makefile examples/app-fermi/matlab/Makefile examples/app-fermi/matlab/compiled/Makefile examples/app-fermi/matlab/uncompiled/Makefile examples/app-fermi/octave/Makefile examples/app-fermi/octave/2/Makefile examples/app-fermi/octave/3/Makefile examples/app-fermi/perl/Makefile examples/app-fermi/python/Makefile examples/app-fermi/ruby/Makefile examples/app-fermi/tcl/Makefile examples/app-fermi/wrapper/Makefile examples/app-fermi/wrapper/cee/Makefile examples/app-fermi/wrapper/python/Makefile examples/app-fermi/wrapper/tcl/Makefile examples/c-example/Makefile examples/canvas/Makefile examples/demo.bash examples/flow/Makefile examples/flow/demo1/Makefile examples/flow/demo2/Makefile examples/flow/demo3/Makefile examples/graph/Makefile examples/objects/Makefile examples/objects/axis/Makefile examples/objects/contour/Makefile examples/objects/curve/Makefile examples/objects/dxWriter/Makefile examples/objects/floatBuffer/Makefile examples/objects/histogram/Makefile examples/objects/library/Makefile examples/objects/number/Makefile examples/objects/path/Makefile examples/objects/plot/Makefile examples/objects/scatter/Makefile examples/objects/string/Makefile examples/objects/tree/Makefile examples/objects/xmlparser/Makefile examples/zoo/Makefile examples/zoo/binary/Makefile examples/zoo/boolean/Makefile examples/zoo/choice/Makefile examples/zoo/cloud/Makefile examples/zoo/cloud/matlab/Makefile examples/zoo/curve/Makefile examples/zoo/enable/Makefile examples/zoo/field/Makefile examples/zoo/group/Makefile examples/zoo/image/Makefile examples/zoo/image/docs/Makefile examples/zoo/image/examples/Makefile examples/zoo/integer/Makefile examples/zoo/integer2/Makefile examples/zoo/loader/Makefile examples/zoo/loader/examples/Makefile examples/zoo/loadrun/Makefile examples/zoo/log/Makefile examples/zoo/note/Makefile examples/zoo/note/docs/Makefile examples/zoo/number/Makefile examples/zoo/number2/Makefile examples/zoo/periodicelement/Makefile examples/zoo/phase/Makefile examples/zoo/sequence/Makefile examples/zoo/sequence/examples/Makefile examples/zoo/string/Makefile examples/zoo/structure/Makefile examples/zoo/structure/examples/Makefile examples/zoo/table/Makefile examples/zoo/unirect2d/Makefile test/Makefile test/src/Makefile"
     9492ac_config_files="$ac_config_files Makefile packages/Makefile src/Makefile src/core/Makefile src/core2/Makefile src/objects/Makefile src/objects/RpHash.h gui/Makefile gui/apps/Makefile gui/apps/about gui/apps/encodedata gui/apps/rappture gui/apps/rappture-csh.env gui/apps/rappture.env gui/apps/rappture.use gui/apps/rerun gui/apps/simsim gui/apps/xmldiff gui/pkgIndex.tcl gui/scripts/Makefile instant/Makefile instant/irappture lang/Makefile lang/java/Makefile lang/java/rappture/Makefile lang/perl/Makefile lang/perl/Makefile.PL lang/python/Makefile lang/python/setup.py lang/matlab/Makefile lang/octave/Makefile lang/octave/octave2/Makefile lang/octave/octave3/Makefile lang/ruby/Makefile lang/ruby/build.rb lang/tcl/Makefile lang/tcl/pkgIndex.tcl lang/tcl/src/Makefile lang/tcl/scripts/Makefile lang/tcl/tests/Makefile lib/Makefile examples/3D/Makefile examples/Makefile examples/app-fermi/2.0/Makefile examples/app-fermi/Makefile examples/app-fermi/cee/Makefile examples/app-fermi/fortran/Makefile examples/app-fermi/java/Makefile examples/app-fermi/matlab/Makefile examples/app-fermi/matlab/compiled/Makefile examples/app-fermi/matlab/uncompiled/Makefile examples/app-fermi/octave/Makefile examples/app-fermi/octave/2/Makefile examples/app-fermi/octave/3/Makefile examples/app-fermi/perl/Makefile examples/app-fermi/python/Makefile examples/app-fermi/ruby/Makefile examples/app-fermi/tcl/Makefile examples/app-fermi/wrapper/Makefile examples/app-fermi/wrapper/cee/Makefile examples/app-fermi/wrapper/python/Makefile examples/app-fermi/wrapper/tcl/Makefile examples/c-example/Makefile examples/canvas/Makefile examples/demo.bash examples/flow/Makefile examples/flow/demo1/Makefile examples/flow/demo2/Makefile examples/flow/demo3/Makefile examples/graph/Makefile examples/objects/Makefile examples/objects/axis/Makefile examples/objects/contour/Makefile examples/objects/curve/Makefile examples/objects/dxWriter/Makefile examples/objects/floatBuffer/Makefile examples/objects/histogram/Makefile examples/objects/library/Makefile examples/objects/number/Makefile examples/objects/path/Makefile examples/objects/plot/Makefile examples/objects/scatter/Makefile examples/objects/string/Makefile examples/objects/tree/Makefile examples/objects/xmlparser/Makefile examples/zoo/Makefile examples/zoo/binary/Makefile examples/zoo/boolean/Makefile examples/zoo/choice/Makefile examples/zoo/cloud/Makefile examples/zoo/cloud/matlab/Makefile examples/zoo/curve/Makefile examples/zoo/enable/Makefile examples/zoo/field/Makefile examples/zoo/group/Makefile examples/zoo/image/Makefile examples/zoo/image/docs/Makefile examples/zoo/image/examples/Makefile examples/zoo/integer/Makefile examples/zoo/integer2/Makefile examples/zoo/loader/Makefile examples/zoo/loader/examples/Makefile examples/zoo/loadrun/Makefile examples/zoo/log/Makefile examples/zoo/note/Makefile examples/zoo/note/docs/Makefile examples/zoo/number/Makefile examples/zoo/number2/Makefile examples/zoo/periodicelement/Makefile examples/zoo/phase/Makefile examples/zoo/sequence/Makefile examples/zoo/sequence/examples/Makefile examples/zoo/string/Makefile examples/zoo/structure/Makefile examples/zoo/structure/examples/Makefile examples/zoo/table/Makefile examples/zoo/unirect2d/Makefile test/Makefile test/src/Makefile"
    92559493
    92569494cat >confcache <<\_ACEOF
     
    997210210    "lang/matlab/Makefile") CONFIG_FILES="$CONFIG_FILES lang/matlab/Makefile" ;;
    997310211    "lang/octave/Makefile") CONFIG_FILES="$CONFIG_FILES lang/octave/Makefile" ;;
    9974     "lang/octave/RpOctaveInterface.h") CONFIG_FILES="$CONFIG_FILES lang/octave/RpOctaveInterface.h" ;;
     10212    "lang/octave/octave2/Makefile") CONFIG_FILES="$CONFIG_FILES lang/octave/octave2/Makefile" ;;
     10213    "lang/octave/octave3/Makefile") CONFIG_FILES="$CONFIG_FILES lang/octave/octave3/Makefile" ;;
    997510214    "lang/ruby/Makefile") CONFIG_FILES="$CONFIG_FILES lang/ruby/Makefile" ;;
    997610215    "lang/ruby/build.rb") CONFIG_FILES="$CONFIG_FILES lang/ruby/build.rb" ;;
Note: See TracChangeset for help on using the changeset viewer.