Changeset 2208


Ignore:
Timestamp:
Apr 18, 2011 11:45:10 AM (11 years ago)
Author:
gah
Message:
 
Location:
branches/blt4
Files:
5 edited

Legend:

Unmodified
Added
Removed
  • branches/blt4/configure.in

    r2179 r2208  
    2929    INSTALL_PREFIX=$prefix
    3030fi
    31 AC_SUBST(INSTALL_PREFIX)
    3231
    3332
     
    3837fi
    3938
    40 AC_SUBST(LIB_SEARCH_DIRS)
    4139
    4240AC_PROG_INSTALL
     
    10199  HAVE_INTTYPES_H=0
    102100fi
    103 AC_SUBST(HAVE_INTTYPES_H)
    104101
    105102
     
    117114  AC_MSG_ERROR([Requires GNU make. You can specify a version with \$MAKE])
    118115fi
    119 AC_SUBST(MAKE, ${make_command})
    120116
    121117AC_ARG_ENABLE(
     
    129125    ENABLE_GUI="yes"
    130126fi
    131 AC_SUBST(ENABLE_GUI)
    132127
    133128TCL_VERSION="8.4"
     
    163158  fi
    164159fi
    165 AC_SUBST(TCLSH)
    166160
    167161 
    168162TCL_INC_SPEC="$TCL_INCLUDE_SPEC"
    169 
    170 AC_SUBST(TCL_VERSION)
    171 AC_SUBST(TCL_INC_SPEC)
    172 AC_SUBST(TCL_LIB_SPEC)
    173163
    174164AC_ARG_WITH(
     
    200190  fi
    201191fi
    202 AC_SUBST(VTKDIR)
    203192AC_MSG_RESULT([$VTKDIR])
    204193
     
    245234  AC_MSG_CHECKING([for mcc extension])
    246235fi
    247 
    248 AC_SUBST(MCC)
    249 AC_SUBST(MEX)
    250 AC_SUBST(MATLAB)
    251 AC_SUBST(MEX_ARCH)
    252 AC_SUBST(MEXEXT)
    253236
    254237# Standard octave search (use the installed version of octave)
     
    344327fi
    345328
    346 AC_SUBST(OCTAVE2)
    347 AC_SUBST(OCTAVE3)
    348 AC_SUBST(OCTAVE)
    349 AC_SUBST(OCTAVE_VERSION)
    350 AC_SUBST(OCTAVE_VERSION_MAJOR)
    351 AC_SUBST(MKOCTFILE)
    352 AC_SUBST(MKOCTFILE2)
    353 AC_SUBST(MKOCTFILE3)
    354329
    355330AC_ARG_WITH(
     
    392367  fi
    393368fi
    394 AC_SUBST(PERL)
    395 AC_SUBST(PERL_INCLUDES)
    396 AC_SUBST(PERL_ARCHLIB)
    397 AC_SUBST(PERL_ARCHLIBEXP)
    398 AC_SUBST(PERL_VERSION)
    399 AC_SUBST(PERL_CCFLAGS)
    400 AC_SUBST(PERL_CPPFLAGS)
    401 AC_SUBST(PERL_VENDORLIB)
    402 AC_SUBST(PERL_PRIVLIB)
    403 AC_SUBST(PERL_INSTALLARCHLIB)
    404 AC_SUBST(PERL_VERSION_RV)
    405 AC_SUBST(PERL_LIBSPEC)
    406369
    407370PYTHON=""
     
    474437fi
    475438
    476 AC_SUBST(PYTHON)
    477 AC_SUBST(PYTHON_VERSION)
    478 AC_SUBST(PYTHON_INCLUDES)
    479 AC_SUBST(PYTHON_CFLAGS)
    480 AC_SUBST(PYTHON_INCDIR)
    481 AC_SUBST(PYTHON_LDFLAGS)
    482 AC_SUBST(PYTHON_LIB)
    483 AC_SUBST(PYTHON_SITE_DIR)
    484 AC_SUBST(PYTHON_LIBDIR)
    485 AC_SUBST(PYTHON_SITE_PACKAGES)
    486 AC_SUBST(PYTHON_DISTUTILS)
    487 
    488439rp_with_ruby="yes"
    489440
     
    503454  fi
    504455fi
    505 AC_SUBST(RUBY)
    506456
    507457RUBY_VERSION_RV=
     
    517467  fi
    518468fi
    519 AC_SUBST(HAVE_RUBY_DEVEL)
    520 AC_SUBST(RUBY_VERSION_RV)
    521 AC_SUBST(RUBY_PLATFORM)
    522469
    523470rp_with_java="yes"
     
    567514fi
    568515
    569 AC_SUBST(JAVA)
    570 AC_SUBST(JAVAC)
    571 AC_SUBST(JAVAH)
    572 AC_SUBST(JAVA_HOME)
    573 AC_SUBST(JAVA_INC_DIR)
    574 AC_SUBST(JAVA_INC_SPEC)
    575516
    576517RP_BASE=`pwd`
    577 AC_SUBST(RP_BASE)
    578518
    579519SC_ENABLE_SHARED
     
    585525#--------------------------------------------------------------------
    586526
    587 AC_SUBST(CFLAGS_DEBUG)
    588 AC_SUBST(CFLAGS_OPTIMIZE)
    589 AC_SUBST(STLIB_LD)
    590 AC_SUBST(SHLIB_LD)
    591 AC_SUBST(SHLIB_CFLAGS)
    592 AC_SUBST(SHLIB_LDFLAGS)
    593 AC_SUBST(SHLIB_SUFFIX)
    594 
    595527if test -f "${exec_prefix}/lib/tclConfig.sh" ; then
    596528  . ${exec_prefix}/lib/tclConfig.sh
    597529fi
    598 if test -f "${exec_prefix}/lib/tclConfig.sh" ; then
     530if test -f "${exec_prefix}/lib/tkConfig.sh" ; then
    599531  . ${exec_prefix}/lib/tkConfig.sh
    600532fi
    601 AC_SUBST(TCL_VERSION)
    602 AC_SUBST(TK_VERSION)
    603 AC_SUBST(TK_LIB_SPEC)
    604 AC_SUBST(TK_INC_SPEC)
    605533
    606534# -----------------------------------------------------------------------
     
    621549SIZEOF_VOID_P="${ac_cv_sizeof_void_p}"
    622550SIZEOF_INT="${ac_cv_sizeof_int}"
    623 AC_SUBST(SIZEOF_INT)
    624 AC_SUBST(SIZEOF_LONG)
    625 AC_SUBST(SIZEOF_LONG_LONG)
    626 AC_SUBST(SIZEOF_VOID_P)
    627551
    628552
     
    712636AC_CHECK_FUNCS(img_convert)
    713637AC_CHECK_FUNCS(sws_scale)
     638
     639AC_SUBST(CFLAGS_DEBUG)
     640AC_SUBST(CFLAGS_OPTIMIZE)
     641AC_SUBST(ENABLE_GUI)
    714642AC_SUBST(HAVE_FFMPEG_LIBS)
     643AC_SUBST(HAVE_INTTYPES_H)
     644AC_SUBST(HAVE_RUBY_DEVEL)
     645AC_SUBST(INSTALL_PREFIX)
     646AC_SUBST(JAVA)
     647AC_SUBST(JAVAC)
     648AC_SUBST(JAVAH)
     649AC_SUBST(JAVA_HOME)
     650AC_SUBST(JAVA_INC_DIR)
     651AC_SUBST(JAVA_INC_SPEC)
     652AC_SUBST(LIB_SEARCH_DIRS)
     653AC_SUBST(MAKE, ${make_command})
     654AC_SUBST(MATLAB)
     655AC_SUBST(MCC)
     656AC_SUBST(MEX)
     657AC_SUBST(MEXEXT)
     658AC_SUBST(MEX_ARCH)
     659AC_SUBST(MKOCTFILE)
     660AC_SUBST(MKOCTFILE2)
     661AC_SUBST(MKOCTFILE3)
     662AC_SUBST(OCTAVE)
     663AC_SUBST(OCTAVE2)
     664AC_SUBST(OCTAVE3)
     665AC_SUBST(OCTAVE_VERSION)
     666AC_SUBST(OCTAVE_VERSION_MAJOR)
     667AC_SUBST(PERL)
     668AC_SUBST(PERL_ARCHLIB)
     669AC_SUBST(PERL_ARCHLIBEXP)
     670AC_SUBST(PERL_CCFLAGS)
     671AC_SUBST(PERL_CPPFLAGS)
     672AC_SUBST(PERL_INCLUDES)
     673AC_SUBST(PERL_INSTALLARCHLIB)
     674AC_SUBST(PERL_LIBSPEC)
     675AC_SUBST(PERL_PRIVLIB)
     676AC_SUBST(PERL_VENDORLIB)
     677AC_SUBST(PERL_VERSION)
     678AC_SUBST(PERL_VERSION_RV)
     679AC_SUBST(PYTHON)
     680AC_SUBST(PYTHON_CFLAGS)
     681AC_SUBST(PYTHON_DISTUTILS)
     682AC_SUBST(PYTHON_INCDIR)
     683AC_SUBST(PYTHON_INCLUDES)
     684AC_SUBST(PYTHON_LDFLAGS)
     685AC_SUBST(PYTHON_LIB)
     686AC_SUBST(PYTHON_LIBDIR)
     687AC_SUBST(PYTHON_SITE_DIR)
     688AC_SUBST(PYTHON_SITE_PACKAGES)
     689AC_SUBST(PYTHON_VERSION)
     690AC_SUBST(RP_BASE)
     691AC_SUBST(RUBY)
     692AC_SUBST(RUBY_PLATFORM)
     693AC_SUBST(RUBY_VERSION_RV)
     694AC_SUBST(SHLIB_CFLAGS)
     695AC_SUBST(SHLIB_LD)
     696AC_SUBST(SHLIB_LDFLAGS)
     697AC_SUBST(SHLIB_SUFFIX)
     698AC_SUBST(SIZEOF_INT)
     699AC_SUBST(SIZEOF_LONG)
     700AC_SUBST(SIZEOF_LONG_LONG)
     701AC_SUBST(SIZEOF_VOID_P)
     702AC_SUBST(STLIB_LD)
     703AC_SUBST(TCLSH)
     704AC_SUBST(TCL_INC_SPEC)
     705AC_SUBST(TCL_LIB_SPEC)
     706AC_SUBST(TCL_VERSION)
     707AC_SUBST(TCL_VERSION)
     708AC_SUBST(TK_INC_SPEC)
     709AC_SUBST(TK_LIB_SPEC)
     710AC_SUBST(TK_XLIBSW)
     711AC_SUBST(TK_VERSION)
     712AC_SUBST(VTKDIR)
    715713
    716714ac_configure_args="--disable-threads --enable-shared"
  • branches/blt4/gui/scripts/field2dresult.tcl

    r2173 r2208  
    6363        "vtkcontour" {
    6464            set servers [Rappture::VisViewer::GetServerList "vtkvis"]
     65        }
     66        "vtk" {
     67            # Old vtk contour widget
    6568        }
    6669        default {
  • branches/blt4/gui/src/Makefile.in

    r2179 r2208  
    2929TCL_LIB_SPEC    = @TCL_LIB_SPEC@
    3030TK_LIB_SPEC     = @TK_LIB_SPEC@
     31TK_XLIBSW       = @TK_XLIBSW@
    3132
    3233CC_SWITCHES     = $(SHLIB_CFLAGS) $(CFLAGS) $(CFLAGS_DEBUG) $(INCLUDES) $(DEFINES)
     
    4748LIBS            = \
    4849                -L../../src/core -lrappture \
    49                 -L$(libdir) $(TCL_LIB_SPEC) $(TK_LIB_SPEC) -lm
     50                -L$(libdir) $(TCL_LIB_SPEC) $(TK_LIB_SPEC) $(TK_XLIBSW) -lm
    5051
    5152OBJS            = \
  • branches/blt4/lang/tcl/src/Makefile.in

    r1948 r2208  
    3737  -I$(srcdir)/../../../src/objects \
    3838  -I$(includedir)
     39
    3940version         = @PACKAGE_VERSION@
    4041DEFINES         = -DPACKAGE_VERSION=\"$(version)\"
  • branches/blt4/lang/tcl/src/RpRusage.c

    r2170 r2208  
    380380 */
    381381static void
    382 RpDestroyMarkNames(cdata, interp)
    383     ClientData cdata;         /* data being destroyed */
    384     Tcl_Interp *interp;       /* interpreter that owned the data */
    385 {
    386     Tcl_HashTable *markNamesPtr;
     382RpDestroyMarkNames(
     383    ClientData cdata,                   /* data being destroyed */
     384    Tcl_Interp *interp)                 /* Interpreter that owned the data */
     385{
     386    Tcl_HashTable *markNamesPtr = cdata;
    387387    Tcl_HashEntry *entryPtr;
    388388    Tcl_HashSearch search;
Note: See TracChangeset for help on using the changeset viewer.