Changeset 2310 for trunk/configure


Ignore:
Timestamp:
Jul 10, 2011, 9:47:35 PM (8 years ago)
Author:
gah
Message:

update from trunk

File:
1 edited

Legend:

Unmodified
Added
Removed
  • trunk/configure

    r2298 r2310  
    607607subdirs
    608608VTKDIR
     609TK_VERSION
    609610TK_XLIBSW
    610611TK_LIB_SPEC
    611 TK_VERSION
     612TK_INC_SPEC
    612613TCL_VERSION
    613614TCL_LIB_SPEC
     
    27152716
    27162717
    2717 with_tclsh=yes
    2718 rp_with_tclsh="yes"
    2719 rp_with_mkoctfile2="no"
    2720 rp_with_mkoctfile3="no"
    2721 rp_with_octave="yes"
    2722 rp_with_vtk="yes"
    2723 rp_with_matlab="yes"
    2724 rp_with_perl="yes"
    2725 rp_with_python="yes"
    2726 rp_with_ruby="yes"
    2727 rp_with_java="yes"
    2728 with_install="yes"
    2729 
    27302718#------------------------------------------------------------------------
    27312719# Handle the --prefix=... option
     
    27462734  with_install=yes
    27472735fi
     2736
    27482737
    27492738if test "$with_install" != "yes"; then
     
    72377226# Check whether --with-tclsh was given.
    72387227if test "${with_tclsh+set}" = set; then :
    7239   withval=$with_tclsh; rp_with_tclsh=$withval
    7240 else
    7241   rp_with_tclsh=yes
     7228  withval=$with_tclsh;
     7229else
     7230  with_tclsh=yes
    72427231fi
    72437232
    72447233
    72457234TCLSH=""
    7246 if test "${rp_with_tclsh}" != "no" ; then
     7235if test "${with_tclsh}" != "no" ; then
    72477236  tclsh="tclsh${TCL_VERSION}"
    7248   if test "${rp_with_tclsh}" = "yes" ; then
     7237  if test "${with_tclsh}" = "yes" ; then
    72497238    # Extract the first word of "${tclsh}", so it can be a program name with args.
    72507239set dummy ${tclsh}; ac_word=$2
     
    73027291  *)
    73037292  as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
    7304 as_dummy="${rp_with_tclsh}/bin:${rp_with_tclsh}"
     7293as_dummy="${with_tclsh}/bin:${with_tclsh}"
    73057294for as_dir in $as_dummy
    73067295do
     
    73437332# Check whether --with-vtk was given.
    73447333if test "${with_vtk+set}" = set; then :
    7345   withval=$with_vtk; rp_with_vtk=$withval
    7346 else
    7347   rp_with_vtk=yes
     7334  withval=$with_vtk;
     7335else
     7336  with_vtk=yes
    73487337fi
    73497338
     
    73537342VTKDIR=""
    73547343
    7355 if test "$rp_with_vtk" != "no" ; then
    7356   if test "$rp_with_vtk" = "yes" ; then
     7344if test "$with_vtk" != "no" ; then
     7345  if test "$with_vtk" = "yes" ; then
    73577346    for path in \
    73587347     $libdir \
     
    84648453
    84658454
    8466 rp_with_ruby="yes"
    8467 
    84688455RUBY=""
    84698456RUBY_DEV_PKG="no"
     
    84728459# Check whether --with-ruby was given.
    84738460if test "${with_ruby+set}" = set; then :
    8474   withval=$with_ruby; rp_with_ruby=$withval
    8475 fi
    8476 
    8477 
    8478 if test "${rp_with_ruby}" != "no" ; then
    8479   if test "${rp_with_ruby}" = "yes" ; then
     8461  withval=$with_ruby;
     8462else
     8463  with_ruby="yes"
     8464fi
     8465
     8466
     8467if test "${with_ruby}" != "no" ; then
     8468  if test "${with_ruby}" = "yes" ; then
    84808469    # Extract the first word of "ruby", so it can be a program name with args.
    84818470set dummy ruby; ac_word=$2
     
    85328521  *)
    85338522  as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
    8534 as_dummy="${rp_with_ruby}/bin:${rp_with_ruby}"
     8523as_dummy="${with_ruby}/bin:${with_ruby}"
    85358524for as_dir in $as_dummy
    85368525do
     
    96149603
    96159604
     9605
    96169606ac_configure_args="--disable-threads --enable-shared"
    96179607
     
    96209610
    96219611
    9622 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 gui/src/Makefile builder/Makefile builder/pkgIndex.tcl builder/scripts/Makefile tester/Makefile tester/pkgIndex.tcl tester/scripts/Makefile 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/2/Makefile examples/app-fermi/octave/3/Makefile examples/app-fermi/octave/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/perl/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/parallelepiped/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 oldtest/Makefile oldtest/src/Makefile"
     9612ac_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 gui/src/Makefile builder/Makefile builder/pkgIndex.tcl builder/scripts/Makefile tester/Makefile tester/pkgIndex.tcl tester/scripts/Makefile 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/octave2/Makefile examples/app-fermi/octave/octave3/Makefile examples/app-fermi/octave/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/perl/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/Makefilexs 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/parallelepiped/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 oldtest/Makefile oldtest/src/Makefile"
    96239613
    96249614cat >confcache <<\_ACEOF
     
    1038410374    "examples/app-fermi/matlab/compiled/Makefile") CONFIG_FILES="$CONFIG_FILES examples/app-fermi/matlab/compiled/Makefile" ;;
    1038510375    "examples/app-fermi/matlab/uncompiled/Makefile") CONFIG_FILES="$CONFIG_FILES examples/app-fermi/matlab/uncompiled/Makefile" ;;
    10386     "examples/app-fermi/octave/2/Makefile") CONFIG_FILES="$CONFIG_FILES examples/app-fermi/octave/2/Makefile" ;;
    10387     "examples/app-fermi/octave/3/Makefile") CONFIG_FILES="$CONFIG_FILES examples/app-fermi/octave/3/Makefile" ;;
     10376    "examples/app-fermi/octave/octave2/Makefile") CONFIG_FILES="$CONFIG_FILES examples/app-fermi/octave/octave2/Makefile" ;;
     10377    "examples/app-fermi/octave/octave3/Makefile") CONFIG_FILES="$CONFIG_FILES examples/app-fermi/octave/octave3/Makefile" ;;
    1038810378    "examples/app-fermi/octave/Makefile") CONFIG_FILES="$CONFIG_FILES examples/app-fermi/octave/Makefile" ;;
    1038910379    "examples/app-fermi/perl/Makefile") CONFIG_FILES="$CONFIG_FILES examples/app-fermi/perl/Makefile" ;;
     
    1042910419    "examples/zoo/field/Makefile") CONFIG_FILES="$CONFIG_FILES examples/zoo/field/Makefile" ;;
    1043010420    "examples/zoo/group/Makefile") CONFIG_FILES="$CONFIG_FILES examples/zoo/group/Makefile" ;;
    10431     "examples/zoo/image/Makefile") CONFIG_FILES="$CONFIG_FILES examples/zoo/image/Makefile" ;;
     10421    "examples/zoo/image/Makefilexs") CONFIG_FILES="$CONFIG_FILES examples/zoo/image/Makefilexs" ;;
    1043210422    "examples/zoo/image/docs/Makefile") CONFIG_FILES="$CONFIG_FILES examples/zoo/image/docs/Makefile" ;;
    1043310423    "examples/zoo/image/examples/Makefile") CONFIG_FILES="$CONFIG_FILES examples/zoo/image/examples/Makefile" ;;
Note: See TracChangeset for help on using the changeset viewer.