- Timestamp:
- Sep 21, 2006, 6:39:44 PM (18 years ago)
- Location:
- trunk/src/tcl
- Files:
-
- 6 edited
-
Makefile.in (modified) (2 diffs)
-
configure (modified) (81 diffs)
-
configure.in (modified) (8 diffs)
-
src/Rappture_Init.cc (modified) (1 diff)
-
src/RpLibraryTclInterface.cc (modified) (1 diff)
-
src/RpUnitsTclInterface.cc (modified) (1 diff)
Legend:
- Unmodified
- Added
- Removed
-
trunk/src/tcl/Makefile.in
r527 r528 150 150 SHARED_BUILD = @SHARED_BUILD@ 151 151 152 INCLUDES = @PKG_INCLUDES@ @TCL_INCLUDES@ -I$(BLT_SRC_DIR) -I$(ALT_DIR)/include -I$(RAPPTURE_DIR)/include -EHsc152 INCLUDES = @PKG_INCLUDES@ @TCL_INCLUDES@ -I$(BLT_SRC_DIR) -I$(ALT_DIR)/include -I$(RAPPTURE_DIR)/include 153 153 #INCLUDES = @PKG_INCLUDES@ @TCL_INCLUDES@ @TK_INCLUDES@ @TK_XINCLUDES@ 154 154 … … 392 392 fi; \ 393 393 done 394 @mkdir -p $(DESTDIR)$(pkglibdir)/scripts 395 @list='$(PKG_TCL_SOURCES)'; for p in $$list; do \ 396 if test -f $(srcdir)/$$p; then \ 397 destp=`basename $$p`; \ 398 echo " Install $$destp $(DESTDIR)$(pkglibdir)/scripts/$$destp"; \ 399 $(INSTALL_DATA) $(srcdir)/$$p $(DESTDIR)$(pkglibdir)/scripts/$$destp; \ 400 fi; \ 401 done 402 $(TCLSH_PROG) $(srcdir)/tclconfig/mkindex.tcl $(DESTDIR)$(pkglibdir)/scripts 403 $(INSTALL_DATA) init.tcl $(DESTDIR)$(pkglibdir)/init.tcl 394 404 @list='$(PKG_TCL_SOURCES)'; for p in $$list; do \ 395 405 if test -f $(srcdir)/$$p; then \ -
trunk/src/tcl/configure
r527 r528 1 1 #! /bin/sh 2 2 # Guess values for system-dependent variables and create Makefiles. 3 # Generated by GNU Autoconf 2.59 for Rappture 1. 1.3 # Generated by GNU Autoconf 2.59 for Rappture 1.0. 4 4 # 5 5 # Copyright (C) 2003 Free Software Foundation, Inc. … … 268 268 PACKAGE_NAME='Rappture' 269 269 PACKAGE_TARNAME='rappture' 270 PACKAGE_VERSION='1. 1'271 PACKAGE_STRING='Rappture 1. 1'270 PACKAGE_VERSION='1.0' 271 PACKAGE_STRING='Rappture 1.0' 272 272 PACKAGE_BUGREPORT='' 273 273 … … 786 786 # This message is too long to be a string in the A/UX 3.1 sh. 787 787 cat <<_ACEOF 788 \`configure' configures Rappture 1. 1to adapt to many kinds of systems.788 \`configure' configures Rappture 1.0 to adapt to many kinds of systems. 789 789 790 790 Usage: $0 [OPTION]... [VAR=VALUE]... … … 843 843 if test -n "$ac_init_help"; then 844 844 case $ac_init_help in 845 short | recursive ) echo "Configuration of Rappture 1. 1:";;845 short | recursive ) echo "Configuration of Rappture 1.0:";; 846 846 esac 847 847 cat <<\_ACEOF … … 863 863 --without-PACKAGE do not use PACKAGE (same as --with-PACKAGE=no) 864 864 --with-blt=DIR Find bltInt.h in DIR 865 --with-rappture=DIR Find include/ core/rappture.h in DIR865 --with-rappture=DIR Find include/rappture.h in DIR 866 866 --with-altpath=DIR Alternate path to search for required packages 867 867 --with-tcl directory containing tcl configuration … … 972 972 echo "$as_me: WARNING: no configuration information is in $ac_dir" >&2 973 973 fi 974 cd $ac_popdir974 cd "$ac_popdir" 975 975 done 976 976 fi … … 979 979 if $ac_init_version; then 980 980 cat <<\_ACEOF 981 Rappture configure 1. 1981 Rappture configure 1.0 982 982 generated by GNU Autoconf 2.59 983 983 … … 993 993 running configure, to aid debugging if configure makes a mistake. 994 994 995 It was created by Rappture $as_me 1. 1, which was995 It was created by Rappture $as_me 1.0, which was 996 996 generated by GNU Autoconf 2.59. Invocation command line was 997 997 … … 2330 2330 echo "$as_me:$LINENO: \$? = $ac_status" >&5 2331 2331 (exit $ac_status); } && 2332 { ac_try='test -z "$ac_c_werror_flag" 2333 || test ! -s conftest.err' 2332 { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err' 2334 2333 { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 2335 2334 (eval $ac_try) 2>&5 … … 2389 2388 echo "$as_me:$LINENO: \$? = $ac_status" >&5 2390 2389 (exit $ac_status); } && 2391 { ac_try='test -z "$ac_c_werror_flag" 2392 || test ! -s conftest.err' 2390 { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err' 2393 2391 { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 2394 2392 (eval $ac_try) 2>&5 … … 2506 2504 echo "$as_me:$LINENO: \$? = $ac_status" >&5 2507 2505 (exit $ac_status); } && 2508 { ac_try='test -z "$ac_c_werror_flag" 2509 || test ! -s conftest.err' 2506 { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err' 2510 2507 { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 2511 2508 (eval $ac_try) 2>&5 … … 2561 2558 echo "$as_me:$LINENO: \$? = $ac_status" >&5 2562 2559 (exit $ac_status); } && 2563 { ac_try='test -z "$ac_c_werror_flag" 2564 || test ! -s conftest.err' 2560 { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err' 2565 2561 { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 2566 2562 (eval $ac_try) 2>&5 … … 2607 2603 echo "$as_me:$LINENO: \$? = $ac_status" >&5 2608 2604 (exit $ac_status); } && 2609 { ac_try='test -z "$ac_c_werror_flag" 2610 || test ! -s conftest.err' 2605 { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err' 2611 2606 { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 2612 2607 (eval $ac_try) 2>&5 … … 2652 2647 echo "$as_me:$LINENO: \$? = $ac_status" >&5 2653 2648 (exit $ac_status); } && 2654 { ac_try='test -z "$ac_c_werror_flag" 2655 || test ! -s conftest.err' 2649 { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err' 2656 2650 { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 2657 2651 (eval $ac_try) 2>&5 … … 2837 2831 echo "$as_me:$LINENO: \$? = $ac_status" >&5 2838 2832 (exit $ac_status); } && 2839 { ac_try='test -z "$ac_cxx_werror_flag" 2840 || test ! -s conftest.err' 2833 { ac_try='test -z "$ac_cxx_werror_flag" || test ! -s conftest.err' 2841 2834 { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 2842 2835 (eval $ac_try) 2>&5 … … 2896 2889 echo "$as_me:$LINENO: \$? = $ac_status" >&5 2897 2890 (exit $ac_status); } && 2898 { ac_try='test -z "$ac_cxx_werror_flag" 2899 || test ! -s conftest.err' 2891 { ac_try='test -z "$ac_cxx_werror_flag" || test ! -s conftest.err' 2900 2892 { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 2901 2893 (eval $ac_try) 2>&5 … … 2968 2960 echo "$as_me:$LINENO: \$? = $ac_status" >&5 2969 2961 (exit $ac_status); } && 2970 { ac_try='test -z "$ac_cxx_werror_flag" 2971 || test ! -s conftest.err' 2962 { ac_try='test -z "$ac_cxx_werror_flag" || test ! -s conftest.err' 2972 2963 { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 2973 2964 (eval $ac_try) 2>&5 … … 3013 3004 echo "$as_me:$LINENO: \$? = $ac_status" >&5 3014 3005 (exit $ac_status); } && 3015 { ac_try='test -z "$ac_cxx_werror_flag" 3016 || test ! -s conftest.err' 3006 { ac_try='test -z "$ac_cxx_werror_flag" || test ! -s conftest.err' 3017 3007 { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 3018 3008 (eval $ac_try) 2>&5 … … 3538 3528 echo "$as_me:$LINENO: \$? = $ac_status" >&5 3539 3529 (exit $ac_status); } && 3540 { ac_try='test -z "$ac_c_werror_flag" 3541 || test ! -s conftest.err' 3530 { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err' 3542 3531 { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 3543 3532 (eval $ac_try) 2>&5 … … 3709 3698 echo "$as_me:$LINENO: \$? = $ac_status" >&5 3710 3699 (exit $ac_status); } && 3711 { ac_try='test -z "$ac_c_werror_flag" 3712 || test ! -s conftest.err' 3700 { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err' 3713 3701 { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 3714 3702 (eval $ac_try) 2>&5 … … 3781 3769 echo "$as_me:$LINENO: \$? = $ac_status" >&5 3782 3770 (exit $ac_status); } && 3783 { ac_try='test -z "$ac_c_werror_flag" 3784 || test ! -s conftest.err' 3771 { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err' 3785 3772 { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 3786 3773 (eval $ac_try) 2>&5 … … 3846 3833 echo "$as_me:$LINENO: \$? = $ac_status" >&5 3847 3834 (exit $ac_status); } && 3848 { ac_try='test -z "$ac_c_werror_flag" 3849 || test ! -s conftest.err' 3835 { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err' 3850 3836 { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 3851 3837 (eval $ac_try) 2>&5 … … 3889 3875 echo "$as_me:$LINENO: \$? = $ac_status" >&5 3890 3876 (exit $ac_status); } && 3891 { ac_try='test -z "$ac_c_werror_flag" 3892 || test ! -s conftest.err' 3877 { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err' 3893 3878 { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 3894 3879 (eval $ac_try) 2>&5 … … 3947 3932 echo "$as_me:$LINENO: \$? = $ac_status" >&5 3948 3933 (exit $ac_status); } && 3949 { ac_try='test -z "$ac_c_werror_flag" 3950 || test ! -s conftest.err' 3934 { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err' 3951 3935 { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 3952 3936 (eval $ac_try) 2>&5 … … 4115 4099 echo "$as_me:$LINENO: \$? = $ac_status" >&5 4116 4100 (exit $ac_status); } && 4117 { ac_try='test -z "$ac_c_werror_flag" 4118 || test ! -s conftest.err' 4101 { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err' 4119 4102 { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 4120 4103 (eval $ac_try) 2>&5 … … 4178 4161 echo "$as_me:$LINENO: \$? = $ac_status" >&5 4179 4162 (exit $ac_status); } && 4180 { ac_try='test -z "$ac_c_werror_flag" 4181 || test ! -s conftest.err' 4163 { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err' 4182 4164 { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 4183 4165 (eval $ac_try) 2>&5 … … 4246 4228 echo "$as_me:$LINENO: \$? = $ac_status" >&5 4247 4229 (exit $ac_status); } && 4248 { ac_try='test -z "$ac_c_werror_flag" 4249 || test ! -s conftest.err' 4230 { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err' 4250 4231 { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 4251 4232 (eval $ac_try) 2>&5 … … 4306 4287 echo "$as_me:$LINENO: \$? = $ac_status" >&5 4307 4288 (exit $ac_status); } && 4308 { ac_try='test -z "$ac_c_werror_flag" 4309 || test ! -s conftest.err' 4289 { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err' 4310 4290 { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 4311 4291 (eval $ac_try) 2>&5 … … 4508 4488 echo "$as_me:$LINENO: \$? = $ac_status" >&5 4509 4489 (exit $ac_status); } && 4510 { ac_try='test -z "$ac_c_werror_flag" 4511 || test ! -s conftest.err' 4490 { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err' 4512 4491 { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 4513 4492 (eval $ac_try) 2>&5 … … 4605 4584 echo "$as_me:$LINENO: \$? = $ac_status" >&5 4606 4585 (exit $ac_status); } && 4607 { ac_try='test -z "$ac_c_werror_flag" 4608 || test ! -s conftest.err' 4586 { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err' 4609 4587 { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 4610 4588 (eval $ac_try) 2>&5 … … 4671 4649 echo "$as_me:$LINENO: \$? = $ac_status" >&5 4672 4650 (exit $ac_status); } && 4673 { ac_try='test -z "$ac_c_werror_flag" 4674 || test ! -s conftest.err' 4651 { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err' 4675 4652 { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 4676 4653 (eval $ac_try) 2>&5 … … 4774 4751 echo "$as_me:$LINENO: \$? = $ac_status" >&5 4775 4752 (exit $ac_status); } && 4776 { ac_try='test -z "$ac_c_werror_flag" 4777 || test ! -s conftest.err' 4753 { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err' 4778 4754 { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 4779 4755 (eval $ac_try) 2>&5 … … 4871 4847 echo "$as_me:$LINENO: \$? = $ac_status" >&5 4872 4848 (exit $ac_status); } && 4873 { ac_try='test -z "$ac_c_werror_flag" 4874 || test ! -s conftest.err' 4849 { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err' 4875 4850 { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 4876 4851 (eval $ac_try) 2>&5 … … 4937 4912 echo "$as_me:$LINENO: \$? = $ac_status" >&5 4938 4913 (exit $ac_status); } && 4939 { ac_try='test -z "$ac_c_werror_flag" 4940 || test ! -s conftest.err' 4914 { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err' 4941 4915 { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 4942 4916 (eval $ac_try) 2>&5 … … 5026 5000 echo "$as_me:$LINENO: \$? = $ac_status" >&5 5027 5001 (exit $ac_status); } && 5028 { ac_try='test -z "$ac_c_werror_flag" 5029 || test ! -s conftest.err' 5002 { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err' 5030 5003 { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 5031 5004 (eval $ac_try) 2>&5 … … 5090 5063 echo "$as_me:$LINENO: \$? = $ac_status" >&5 5091 5064 (exit $ac_status); } && 5092 { ac_try='test -z "$ac_c_werror_flag" 5093 || test ! -s conftest.err' 5065 { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err' 5094 5066 { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 5095 5067 (eval $ac_try) 2>&5 … … 5238 5210 echo "$as_me:$LINENO: \$? = $ac_status" >&5 5239 5211 (exit $ac_status); } && 5240 { ac_try='test -z "$ac_c_werror_flag" 5241 || test ! -s conftest.err' 5212 { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err' 5242 5213 { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 5243 5214 (eval $ac_try) 2>&5 … … 5386 5357 echo "$as_me:$LINENO: \$? = $ac_status" >&5 5387 5358 (exit $ac_status); } && 5388 { ac_try='test -z "$ac_c_werror_flag" 5389 || test ! -s conftest.err' 5359 { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err' 5390 5360 { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 5391 5361 (eval $ac_try) 2>&5 … … 5534 5504 echo "$as_me:$LINENO: \$? = $ac_status" >&5 5535 5505 (exit $ac_status); } && 5536 { ac_try='test -z "$ac_c_werror_flag" 5537 || test ! -s conftest.err' 5506 { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err' 5538 5507 { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 5539 5508 (eval $ac_try) 2>&5 … … 5686 5655 echo "$as_me:$LINENO: \$? = $ac_status" >&5 5687 5656 (exit $ac_status); } && 5688 { ac_try='test -z "$ac_c_werror_flag" 5689 || test ! -s conftest.err' 5657 { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err' 5690 5658 { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 5691 5659 (eval $ac_try) 2>&5 … … 5888 5856 echo "$as_me:$LINENO: \$? = $ac_status" >&5 5889 5857 (exit $ac_status); } && 5890 { ac_try='test -z "$ac_c_werror_flag" 5891 || test ! -s conftest.err' 5858 { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err' 5892 5859 { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 5893 5860 (eval $ac_try) 2>&5 … … 6078 6045 echo "$as_me:$LINENO: \$? = $ac_status" >&5 6079 6046 (exit $ac_status); } && 6080 { ac_try='test -z "$ac_c_werror_flag" 6081 || test ! -s conftest.err' 6047 { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err' 6082 6048 { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 6083 6049 (eval $ac_try) 2>&5 … … 6226 6192 echo "$as_me:$LINENO: \$? = $ac_status" >&5 6227 6193 (exit $ac_status); } && 6228 { ac_try='test -z "$ac_c_werror_flag" 6229 || test ! -s conftest.err' 6194 { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err' 6230 6195 { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 6231 6196 (eval $ac_try) 2>&5 … … 6380 6345 echo "$as_me:$LINENO: \$? = $ac_status" >&5 6381 6346 (exit $ac_status); } && 6382 { ac_try='test -z "$ac_c_werror_flag" 6383 || test ! -s conftest.err' 6347 { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err' 6384 6348 { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 6385 6349 (eval $ac_try) 2>&5 … … 6514 6478 #----------------------------------------------------------------------- 6515 6479 6516 6517 vars="Rappture_Init.cc RpLibraryTclInterface.cc RpUnitsTclInterface.cc " 6480 #TEA_ADD_SOURCES([Rappture_Init.cc RpLibraryTclInterface.cc RpUnitsTclInterface.cc ]) 6481 6482 vars="Rappture_Init.cc RpUnitsTclInterface.cc" 6518 6483 for i in $vars; do 6519 6484 case $i in … … 6569 6534 6570 6535 6571 vars="BLT24.lib libexpat.lib ../librappture.lib"6572 for i in $vars; do6573 if test "${TEA_PLATFORM}" = "windows" -a "$GCC" = "yes" ; then6574 # Convert foo.lib to -lfoo for GCC. No-op if not *.lib6575 i=`echo "$i" | sed -e 's/^\([^-].*\)\.lib$/-l\1/i'`6576 fi6577 PKG_LIBS="$PKG_LIBS $i"6578 done6579 6580 6581 6582 6536 PKG_CFLAGS="$PKG_CFLAGS " 6583 6537 … … 6608 6562 6609 6563 6610 6611 vars="scripts/exec.tcl scripts/value.tcl init.tcl ../../tcl/scripts/library.tcl ../../tcl/scripts/result.tcl" 6564 #TEA_ADD_TCL_SOURCES([scripts/exec.tcl scripts/value.tcl init.tcl ../../tcl/scripts/library.tcl ../../tcl/scripts/result.tcl]) 6565 6566 vars="" 6612 6567 for i in $vars; do 6613 6568 # check for existence, be strict because it is installed … … 6654 6609 6655 6610 6611 6612 vars="BLT24.lib libexpat.lib ../librappture.lib" 6613 for i in $vars; do 6614 if test "${TEA_PLATFORM}" = "windows" -a "$GCC" = "yes" ; then 6615 # Convert foo.lib to -lfoo for GCC. No-op if not *.lib 6616 i=`echo "$i" | sed -e 's/^\([^-].*\)\.lib$/-l\1/i'` 6617 fi 6618 PKG_LIBS="$PKG_LIBS $i" 6619 done 6620 6621 6656 6622 #TEA_ADD_SOURCES([win/winFile.c]) 6657 6623 #TEA_ADD_INCLUDES([-I\"$(${CYGPATH} ${srcdir}/win)\"]) 6658 6624 else 6625 # CLEANFILES="*core *.o *.so *.a" 6659 6626 CLEANFILES="" 6660 6627 #TEA_ADD_SOURCES([unix/unixFile.c]) 6661 6628 6662 vars="scew.lib" 6629 vars="-L@RAPPTURE_DIR@/lib" 6630 for i in $vars; do 6631 if test "${TEA_PLATFORM}" = "windows" -a "$GCC" = "yes" ; then 6632 # Convert foo.lib to -lfoo for GCC. No-op if not *.lib 6633 i=`echo "$i" | sed -e 's/^\([^-].*\)\.lib$/-l\1/i'` 6634 fi 6635 PKG_LIBS="$PKG_LIBS $i" 6636 done 6637 6638 6639 6640 vars="-lexpat -lscew -lrappture" 6663 6641 for i in $vars; do 6664 6642 if test "${TEA_PLATFORM}" = "windows" -a "$GCC" = "yes" ; then … … 6864 6842 echo "$as_me:$LINENO: \$? = $ac_status" >&5 6865 6843 (exit $ac_status); } && 6866 { ac_try='test -z "$ac_c_werror_flag" 6867 || test ! -s conftest.err' 6844 { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err' 6868 6845 { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 6869 6846 (eval $ac_try) 2>&5 … … 6940 6917 echo "$as_me:$LINENO: \$? = $ac_status" >&5 6941 6918 (exit $ac_status); } && 6942 { ac_try='test -z "$ac_c_werror_flag" 6943 || test ! -s conftest.err' 6919 { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err' 6944 6920 { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 6945 6921 (eval $ac_try) 2>&5 … … 7016 6992 echo "$as_me:$LINENO: \$? = $ac_status" >&5 7017 6993 (exit $ac_status); } && 7018 { ac_try='test -z "$ac_c_werror_flag" 7019 || test ! -s conftest.err' 6994 { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err' 7020 6995 { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 7021 6996 (eval $ac_try) 2>&5 … … 7090 7065 echo "$as_me:$LINENO: \$? = $ac_status" >&5 7091 7066 (exit $ac_status); } && 7092 { ac_try='test -z "$ac_c_werror_flag" 7093 || test ! -s conftest.err' 7067 { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err' 7094 7068 { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 7095 7069 (eval $ac_try) 2>&5 … … 7161 7135 echo "$as_me:$LINENO: \$? = $ac_status" >&5 7162 7136 (exit $ac_status); } && 7163 { ac_try='test -z "$ac_c_werror_flag" 7164 || test ! -s conftest.err' 7137 { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err' 7165 7138 { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 7166 7139 (eval $ac_try) 2>&5 … … 7430 7403 echo "$as_me:$LINENO: \$? = $ac_status" >&5 7431 7404 (exit $ac_status); } && 7432 { ac_try='test -z "$ac_c_werror_flag" 7433 || test ! -s conftest.err' 7405 { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err' 7434 7406 { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 7435 7407 (eval $ac_try) 2>&5 … … 7933 7905 echo "$as_me:$LINENO: \$? = $ac_status" >&5 7934 7906 (exit $ac_status); } && 7935 { ac_try='test -z "$ac_c_werror_flag" 7936 || test ! -s conftest.err' 7907 { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err' 7937 7908 { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 7938 7909 (eval $ac_try) 2>&5 … … 8025 7996 echo "$as_me:$LINENO: \$? = $ac_status" >&5 8026 7997 (exit $ac_status); } && 8027 { ac_try='test -z "$ac_c_werror_flag" 8028 || test ! -s conftest.err' 7998 { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err' 8029 7999 { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 8030 8000 (eval $ac_try) 2>&5 … … 8137 8107 echo "$as_me:$LINENO: \$? = $ac_status" >&5 8138 8108 (exit $ac_status); } && 8139 { ac_try='test -z "$ac_c_werror_flag" 8140 || test ! -s conftest.err' 8109 { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err' 8141 8110 { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 8142 8111 (eval $ac_try) 2>&5 … … 8254 8223 echo "$as_me:$LINENO: \$? = $ac_status" >&5 8255 8224 (exit $ac_status); } && 8256 { ac_try='test -z "$ac_c_werror_flag" 8257 || test ! -s conftest.err' 8225 { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err' 8258 8226 { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 8259 8227 (eval $ac_try) 2>&5 … … 8610 8578 echo "$as_me:$LINENO: \$? = $ac_status" >&5 8611 8579 (exit $ac_status); } && 8612 { ac_try='test -z "$ac_c_werror_flag" 8613 || test ! -s conftest.err' 8580 { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err' 8614 8581 { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 8615 8582 (eval $ac_try) 2>&5 … … 8680 8647 echo "$as_me:$LINENO: \$? = $ac_status" >&5 8681 8648 (exit $ac_status); } && 8682 { ac_try='test -z "$ac_c_werror_flag" 8683 || test ! -s conftest.err' 8649 { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err' 8684 8650 { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 8685 8651 (eval $ac_try) 2>&5 … … 9021 8987 echo "$as_me:$LINENO: \$? = $ac_status" >&5 9022 8988 (exit $ac_status); } && 9023 { ac_try='test -z "$ac_c_werror_flag" 9024 || test ! -s conftest.err' 8989 { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err' 9025 8990 { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 9026 8991 (eval $ac_try) 2>&5 … … 9173 9138 echo "$as_me:$LINENO: \$? = $ac_status" >&5 9174 9139 (exit $ac_status); } && 9175 { ac_try='test -z "$ac_c_werror_flag" 9176 || test ! -s conftest.err' 9140 { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err' 9177 9141 { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 9178 9142 (eval $ac_try) 2>&5 … … 9216 9180 echo "$as_me:$LINENO: \$? = $ac_status" >&5 9217 9181 (exit $ac_status); } && 9218 { ac_try='test -z "$ac_c_werror_flag" 9219 || test ! -s conftest.err' 9182 { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err' 9220 9183 { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 9221 9184 (eval $ac_try) 2>&5 … … 9278 9241 echo "$as_me:$LINENO: \$? = $ac_status" >&5 9279 9242 (exit $ac_status); } && 9280 { ac_try='test -z "$ac_c_werror_flag" 9281 || test ! -s conftest.err' 9243 { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err' 9282 9244 { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 9283 9245 (eval $ac_try) 2>&5 … … 9321 9283 echo "$as_me:$LINENO: \$? = $ac_status" >&5 9322 9284 (exit $ac_status); } && 9323 { ac_try='test -z "$ac_c_werror_flag" 9324 || test ! -s conftest.err' 9285 { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err' 9325 9286 { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 9326 9287 (eval $ac_try) 2>&5 … … 9383 9344 echo "$as_me:$LINENO: \$? = $ac_status" >&5 9384 9345 (exit $ac_status); } && 9385 { ac_try='test -z "$ac_c_werror_flag" 9386 || test ! -s conftest.err' 9346 { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err' 9387 9347 { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 9388 9348 (eval $ac_try) 2>&5 … … 9426 9386 echo "$as_me:$LINENO: \$? = $ac_status" >&5 9427 9387 (exit $ac_status); } && 9428 { ac_try='test -z "$ac_c_werror_flag" 9429 || test ! -s conftest.err' 9388 { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err' 9430 9389 { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 9431 9390 (eval $ac_try) 2>&5 … … 9501 9460 echo "$as_me:$LINENO: \$? = $ac_status" >&5 9502 9461 (exit $ac_status); } && 9503 { ac_try='test -z "$ac_c_werror_flag" 9504 || test ! -s conftest.err' 9462 { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err' 9505 9463 { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 9506 9464 (eval $ac_try) 2>&5 … … 9551 9509 echo "$as_me:$LINENO: \$? = $ac_status" >&5 9552 9510 (exit $ac_status); } && 9553 { ac_try='test -z "$ac_c_werror_flag" 9554 || test ! -s conftest.err' 9511 { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err' 9555 9512 { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 9556 9513 (eval $ac_try) 2>&5 … … 9628 9585 echo "$as_me:$LINENO: \$? = $ac_status" >&5 9629 9586 (exit $ac_status); } && 9630 { ac_try='test -z "$ac_c_werror_flag" 9631 || test ! -s conftest.err' 9587 { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err' 9632 9588 { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 9633 9589 (eval $ac_try) 2>&5 … … 9691 9647 echo "$as_me:$LINENO: \$? = $ac_status" >&5 9692 9648 (exit $ac_status); } && 9693 { ac_try='test -z "$ac_c_werror_flag" 9694 || test ! -s conftest.err' 9649 { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err' 9695 9650 { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 9696 9651 (eval $ac_try) 2>&5 … … 9793 9748 echo "$as_me:$LINENO: \$? = $ac_status" >&5 9794 9749 (exit $ac_status); } && 9795 { ac_try='test -z "$ac_c_werror_flag" 9796 || test ! -s conftest.err' 9750 { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err' 9797 9751 { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 9798 9752 (eval $ac_try) 2>&5 … … 9857 9811 echo "$as_me:$LINENO: \$? = $ac_status" >&5 9858 9812 (exit $ac_status); } && 9859 { ac_try='test -z "$ac_c_werror_flag" 9860 || test ! -s conftest.err' 9813 { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err' 9861 9814 { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 9862 9815 (eval $ac_try) 2>&5 … … 10163 10116 echo $ECHO_N "checking for rappture.h... $ECHO_C" >&6 10164 10117 RAPPTURE_DIR="" 10165 if test "x$rappture_ source_dir" != "x" ; then10118 if test "x$rappture_dir" != "x" ; then 10166 10119 # 10167 10120 # Verify that a rappture.h file exists in the directory specified 10168 10121 # by --with-rappture. 10169 10122 # 10170 if test -r "$rappture_dir/include/ core/rappture.h" ; then10123 if test -r "$rappture_dir/include/rappture.h" ; then 10171 10124 RAPPTURE_DIR="$rappture_dir" 10172 10125 fi … … 10180 10133 $exec_prefix 10181 10134 do 10182 if test -r "$dir/include/ core/rappture.h" ; then10135 if test -r "$dir/include/rappture.h" ; then 10183 10136 RAPPTURE_DIR="$dir" 10184 10137 break … … 10196 10149 `ls -dr /opt/rappture 2>/dev/null` 10197 10150 do 10198 if test -r "$dir/include/ core/rappture.h" ; then10151 if test -r "$dir/include/rappture.h" ; then 10199 10152 RAPPTURE_DIR="$dir" 10200 10153 break … … 10251 10204 10252 10205 10253 PATCHLEVEL=`${TCLSH_PROG} cf/patchlevel.tcl`10206 PATCHLEVEL=`${TCLSH_PROG} tclconfig/patchlevel.tcl` 10254 10207 EXACT_VERSION=${MAJOR_VERSION}.${MINOR_VERSION}-${PATCHLEVEL} 10255 10208 NODOT_VERSION=${MAJOR_VERSION}${MINOR_VERSION} … … 10659 10612 cat >&5 <<_CSEOF 10660 10613 10661 This file was extended by Rappture $as_me 1. 1, which was10614 This file was extended by Rappture $as_me 1.0, which was 10662 10615 generated by GNU Autoconf 2.59. Invocation command line was 10663 10616 … … 10714 10667 cat >>$CONFIG_STATUS <<_ACEOF 10715 10668 ac_cs_version="\\ 10716 Rappture config.status 1. 110669 Rappture config.status 1.0 10717 10670 configured by $0, generated by GNU Autoconf 2.59, 10718 10671 with options \\"`echo "$ac_configure_args" | sed 's/[\\""\`\$]/\\\\&/g'`\\" … … 11146 11099 esac 11147 11100 11148 if test x"$ac_file" != x-; then11149 { echo "$as_me:$LINENO: creating $ac_file" >&511150 echo "$as_me: creating $ac_file" >&6;}11151 rm -f "$ac_file"11152 fi11153 11101 # Let's still pretend it is `configure' which instantiates (i.e., don't 11154 11102 # use $as_me), people would be surprised to read: … … 11189 11137 esac 11190 11138 done` || { (exit 1); exit 1; } 11139 11140 if test x"$ac_file" != x-; then 11141 { echo "$as_me:$LINENO: creating $ac_file" >&5 11142 echo "$as_me: creating $ac_file" >&6;} 11143 rm -f "$ac_file" 11144 fi 11191 11145 _ACEOF 11192 11146 cat >>$CONFIG_STATUS <<_ACEOF -
trunk/src/tcl/configure.in
r527 r528 20 20 #----------------------------------------------------------------------- 21 21 22 AC_INIT([Rappture], [1. 1])22 AC_INIT([Rappture], [1.0]) 23 23 24 24 #-------------------------------------------------------------------- … … 38 38 blt_source_dir=$withval) 39 39 40 AC_ARG_WITH(rappture, [ --with-rappture=DIR Find include/ core/rappture.h in DIR],40 AC_ARG_WITH(rappture, [ --with-rappture=DIR Find include/rappture.h in DIR], 41 41 rappture_dir=$withval) 42 42 … … 84 84 #----------------------------------------------------------------------- 85 85 86 TEA_ADD_SOURCES([Rappture_Init.cc RpLibraryTclInterface.cc RpUnitsTclInterface.cc ]) 86 #TEA_ADD_SOURCES([Rappture_Init.cc RpLibraryTclInterface.cc RpUnitsTclInterface.cc ]) 87 TEA_ADD_SOURCES([Rappture_Init.cc RpUnitsTclInterface.cc]) 87 88 TEA_ADD_HEADERS([]) 88 89 TEA_ADD_INCLUDES([]) 89 TEA_ADD_LIBS(BLT24.lib libexpat.lib ../librappture.lib)90 90 TEA_ADD_CFLAGS([]) 91 91 TEA_ADD_STUB_SOURCES([]) 92 TEA_ADD_TCL_SOURCES([scripts/exec.tcl scripts/value.tcl init.tcl ../../tcl/scripts/library.tcl ../../tcl/scripts/result.tcl]) 92 #TEA_ADD_TCL_SOURCES([scripts/exec.tcl scripts/value.tcl init.tcl ../../tcl/scripts/library.tcl ../../tcl/scripts/result.tcl]) 93 TEA_ADD_TCL_SOURCES([]) 93 94 94 95 #-------------------------------------------------------------------- … … 110 111 CLEANFILES="*.lib *.dll *.exp *.ilk *.pdb vc*.pch" 111 112 TEA_ADD_LIBS(/LIBPATH:C:/opt/lib /LIBPATH:C:/Tcl/lib scew_s.lib) 113 TEA_ADD_LIBS(BLT24.lib libexpat.lib ../librappture.lib) 112 114 #TEA_ADD_SOURCES([win/winFile.c]) 113 115 #TEA_ADD_INCLUDES([-I\"$(${CYGPATH} ${srcdir}/win)\"]) 114 116 else 117 # CLEANFILES="*core *.o *.so *.a" 115 118 CLEANFILES="" 116 119 #TEA_ADD_SOURCES([unix/unixFile.c]) 117 TEA_ADD_LIBS([scew.lib]) 120 TEA_ADD_LIBS([-L@RAPPTURE_DIR@/lib]) 121 TEA_ADD_LIBS([-lexpat -lscew -lrappture]) 118 122 fi 119 123 AC_SUBST(CLEANFILES) … … 262 266 AC_MSG_CHECKING([for rappture.h]) 263 267 RAPPTURE_DIR="" 264 if test "x$rappture_ source_dir" != "x" ; then268 if test "x$rappture_dir" != "x" ; then 265 269 # 266 270 # Verify that a rappture.h file exists in the directory specified 267 271 # by --with-rappture. 268 272 # 269 if test -r "$rappture_dir/include/ core/rappture.h" ; then273 if test -r "$rappture_dir/include/rappture.h" ; then 270 274 RAPPTURE_DIR="$rappture_dir" 271 275 fi … … 279 283 $exec_prefix 280 284 do 281 if test -r "$dir/include/ core/rappture.h" ; then285 if test -r "$dir/include/rappture.h" ; then 282 286 RAPPTURE_DIR="$dir" 283 287 break … … 295 299 `ls -dr /opt/rappture 2>/dev/null` 296 300 do 297 if test -r "$dir/include/ core/rappture.h" ; then301 if test -r "$dir/include/rappture.h" ; then 298 302 RAPPTURE_DIR="$dir" 299 303 break … … 346 350 AC_SUBST(ALT_DIR) 347 351 348 PATCHLEVEL=`${TCLSH_PROG} cf/patchlevel.tcl`352 PATCHLEVEL=`${TCLSH_PROG} tclconfig/patchlevel.tcl` 349 353 EXACT_VERSION=${MAJOR_VERSION}.${MINOR_VERSION}-${PATCHLEVEL} 350 354 NODOT_VERSION=${MAJOR_VERSION}${MINOR_VERSION} -
trunk/src/tcl/src/Rappture_Init.cc
r527 r528 37 37 { 38 38 if (Tcl_InitStubs(interp, "8.4", 0) == NULL) { 39 39 return TCL_ERROR; 40 40 } 41 41 42 42 if (Tcl_PkgProvide(interp, "Rappture", PACKAGE_VERSION) != TCL_OK) { 43 43 return TCL_ERROR; 44 44 } 45 45 46 /* 46 47 if (Rappturelibrary_Init(interp) != TCL_OK) { 47 48 return TCL_ERROR; 48 49 } 50 */ 49 51 50 52 if (Rapptureunits_Init(interp) != TCL_OK) { -
trunk/src/tcl/src/RpLibraryTclInterface.cc
r527 r528 16 16 #include <sstream> 17 17 #include <string> 18 #include " core/RpLibrary.h"18 #include "RpLibrary.h" 19 19 #include "RpLibraryTclInterface.h" 20 20 -
trunk/src/tcl/src/RpUnitsTclInterface.cc
r403 r528 14 14 */ 15 15 #include <tcl.h> 16 #include " core/RpUnits.h"16 #include "RpUnits.h" 17 17 #include "RpUnitsTclInterface.h" 18 18
Note: See TracChangeset
for help on using the changeset viewer.
