Changeset 2208 for branches/blt4
- Timestamp:
- Apr 18, 2011, 11:45:10 AM (13 years ago)
- Location:
- branches/blt4
- Files:
-
- 5 edited
Legend:
- Unmodified
- Added
- Removed
-
branches/blt4/configure.in
r2179 r2208 29 29 INSTALL_PREFIX=$prefix 30 30 fi 31 AC_SUBST(INSTALL_PREFIX)32 31 33 32 … … 38 37 fi 39 38 40 AC_SUBST(LIB_SEARCH_DIRS)41 39 42 40 AC_PROG_INSTALL … … 101 99 HAVE_INTTYPES_H=0 102 100 fi 103 AC_SUBST(HAVE_INTTYPES_H)104 101 105 102 … … 117 114 AC_MSG_ERROR([Requires GNU make. You can specify a version with \$MAKE]) 118 115 fi 119 AC_SUBST(MAKE, ${make_command})120 116 121 117 AC_ARG_ENABLE( … … 129 125 ENABLE_GUI="yes" 130 126 fi 131 AC_SUBST(ENABLE_GUI)132 127 133 128 TCL_VERSION="8.4" … … 163 158 fi 164 159 fi 165 AC_SUBST(TCLSH)166 160 167 161 168 162 TCL_INC_SPEC="$TCL_INCLUDE_SPEC" 169 170 AC_SUBST(TCL_VERSION)171 AC_SUBST(TCL_INC_SPEC)172 AC_SUBST(TCL_LIB_SPEC)173 163 174 164 AC_ARG_WITH( … … 200 190 fi 201 191 fi 202 AC_SUBST(VTKDIR)203 192 AC_MSG_RESULT([$VTKDIR]) 204 193 … … 245 234 AC_MSG_CHECKING([for mcc extension]) 246 235 fi 247 248 AC_SUBST(MCC)249 AC_SUBST(MEX)250 AC_SUBST(MATLAB)251 AC_SUBST(MEX_ARCH)252 AC_SUBST(MEXEXT)253 236 254 237 # Standard octave search (use the installed version of octave) … … 344 327 fi 345 328 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)354 329 355 330 AC_ARG_WITH( … … 392 367 fi 393 368 fi 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)406 369 407 370 PYTHON="" … … 474 437 fi 475 438 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 488 439 rp_with_ruby="yes" 489 440 … … 503 454 fi 504 455 fi 505 AC_SUBST(RUBY)506 456 507 457 RUBY_VERSION_RV= … … 517 467 fi 518 468 fi 519 AC_SUBST(HAVE_RUBY_DEVEL)520 AC_SUBST(RUBY_VERSION_RV)521 AC_SUBST(RUBY_PLATFORM)522 469 523 470 rp_with_java="yes" … … 567 514 fi 568 515 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)575 516 576 517 RP_BASE=`pwd` 577 AC_SUBST(RP_BASE)578 518 579 519 SC_ENABLE_SHARED … … 585 525 #-------------------------------------------------------------------- 586 526 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 595 527 if test -f "${exec_prefix}/lib/tclConfig.sh" ; then 596 528 . ${exec_prefix}/lib/tclConfig.sh 597 529 fi 598 if test -f "${exec_prefix}/lib/t clConfig.sh" ; then530 if test -f "${exec_prefix}/lib/tkConfig.sh" ; then 599 531 . ${exec_prefix}/lib/tkConfig.sh 600 532 fi 601 AC_SUBST(TCL_VERSION)602 AC_SUBST(TK_VERSION)603 AC_SUBST(TK_LIB_SPEC)604 AC_SUBST(TK_INC_SPEC)605 533 606 534 # ----------------------------------------------------------------------- … … 621 549 SIZEOF_VOID_P="${ac_cv_sizeof_void_p}" 622 550 SIZEOF_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)627 551 628 552 … … 712 636 AC_CHECK_FUNCS(img_convert) 713 637 AC_CHECK_FUNCS(sws_scale) 638 639 AC_SUBST(CFLAGS_DEBUG) 640 AC_SUBST(CFLAGS_OPTIMIZE) 641 AC_SUBST(ENABLE_GUI) 714 642 AC_SUBST(HAVE_FFMPEG_LIBS) 643 AC_SUBST(HAVE_INTTYPES_H) 644 AC_SUBST(HAVE_RUBY_DEVEL) 645 AC_SUBST(INSTALL_PREFIX) 646 AC_SUBST(JAVA) 647 AC_SUBST(JAVAC) 648 AC_SUBST(JAVAH) 649 AC_SUBST(JAVA_HOME) 650 AC_SUBST(JAVA_INC_DIR) 651 AC_SUBST(JAVA_INC_SPEC) 652 AC_SUBST(LIB_SEARCH_DIRS) 653 AC_SUBST(MAKE, ${make_command}) 654 AC_SUBST(MATLAB) 655 AC_SUBST(MCC) 656 AC_SUBST(MEX) 657 AC_SUBST(MEXEXT) 658 AC_SUBST(MEX_ARCH) 659 AC_SUBST(MKOCTFILE) 660 AC_SUBST(MKOCTFILE2) 661 AC_SUBST(MKOCTFILE3) 662 AC_SUBST(OCTAVE) 663 AC_SUBST(OCTAVE2) 664 AC_SUBST(OCTAVE3) 665 AC_SUBST(OCTAVE_VERSION) 666 AC_SUBST(OCTAVE_VERSION_MAJOR) 667 AC_SUBST(PERL) 668 AC_SUBST(PERL_ARCHLIB) 669 AC_SUBST(PERL_ARCHLIBEXP) 670 AC_SUBST(PERL_CCFLAGS) 671 AC_SUBST(PERL_CPPFLAGS) 672 AC_SUBST(PERL_INCLUDES) 673 AC_SUBST(PERL_INSTALLARCHLIB) 674 AC_SUBST(PERL_LIBSPEC) 675 AC_SUBST(PERL_PRIVLIB) 676 AC_SUBST(PERL_VENDORLIB) 677 AC_SUBST(PERL_VERSION) 678 AC_SUBST(PERL_VERSION_RV) 679 AC_SUBST(PYTHON) 680 AC_SUBST(PYTHON_CFLAGS) 681 AC_SUBST(PYTHON_DISTUTILS) 682 AC_SUBST(PYTHON_INCDIR) 683 AC_SUBST(PYTHON_INCLUDES) 684 AC_SUBST(PYTHON_LDFLAGS) 685 AC_SUBST(PYTHON_LIB) 686 AC_SUBST(PYTHON_LIBDIR) 687 AC_SUBST(PYTHON_SITE_DIR) 688 AC_SUBST(PYTHON_SITE_PACKAGES) 689 AC_SUBST(PYTHON_VERSION) 690 AC_SUBST(RP_BASE) 691 AC_SUBST(RUBY) 692 AC_SUBST(RUBY_PLATFORM) 693 AC_SUBST(RUBY_VERSION_RV) 694 AC_SUBST(SHLIB_CFLAGS) 695 AC_SUBST(SHLIB_LD) 696 AC_SUBST(SHLIB_LDFLAGS) 697 AC_SUBST(SHLIB_SUFFIX) 698 AC_SUBST(SIZEOF_INT) 699 AC_SUBST(SIZEOF_LONG) 700 AC_SUBST(SIZEOF_LONG_LONG) 701 AC_SUBST(SIZEOF_VOID_P) 702 AC_SUBST(STLIB_LD) 703 AC_SUBST(TCLSH) 704 AC_SUBST(TCL_INC_SPEC) 705 AC_SUBST(TCL_LIB_SPEC) 706 AC_SUBST(TCL_VERSION) 707 AC_SUBST(TCL_VERSION) 708 AC_SUBST(TK_INC_SPEC) 709 AC_SUBST(TK_LIB_SPEC) 710 AC_SUBST(TK_XLIBSW) 711 AC_SUBST(TK_VERSION) 712 AC_SUBST(VTKDIR) 715 713 716 714 ac_configure_args="--disable-threads --enable-shared" -
branches/blt4/gui/scripts/field2dresult.tcl
r2173 r2208 63 63 "vtkcontour" { 64 64 set servers [Rappture::VisViewer::GetServerList "vtkvis"] 65 } 66 "vtk" { 67 # Old vtk contour widget 65 68 } 66 69 default { -
branches/blt4/gui/src/Makefile.in
r2179 r2208 29 29 TCL_LIB_SPEC = @TCL_LIB_SPEC@ 30 30 TK_LIB_SPEC = @TK_LIB_SPEC@ 31 TK_XLIBSW = @TK_XLIBSW@ 31 32 32 33 CC_SWITCHES = $(SHLIB_CFLAGS) $(CFLAGS) $(CFLAGS_DEBUG) $(INCLUDES) $(DEFINES) … … 47 48 LIBS = \ 48 49 -L../../src/core -lrappture \ 49 -L$(libdir) $(TCL_LIB_SPEC) $(TK_LIB_SPEC) -lm50 -L$(libdir) $(TCL_LIB_SPEC) $(TK_LIB_SPEC) $(TK_XLIBSW) -lm 50 51 51 52 OBJS = \ -
branches/blt4/lang/tcl/src/Makefile.in
r1948 r2208 37 37 -I$(srcdir)/../../../src/objects \ 38 38 -I$(includedir) 39 39 40 version = @PACKAGE_VERSION@ 40 41 DEFINES = -DPACKAGE_VERSION=\"$(version)\" -
branches/blt4/lang/tcl/src/RpRusage.c
r2170 r2208 380 380 */ 381 381 static 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 ;382 RpDestroyMarkNames( 383 ClientData cdata, /* data being destroyed */ 384 Tcl_Interp *interp) /* Interpreter that owned the data */ 385 { 386 Tcl_HashTable *markNamesPtr = cdata; 387 387 Tcl_HashEntry *entryPtr; 388 388 Tcl_HashSearch search;
Note: See TracChangeset
for help on using the changeset viewer.