Changeset 2080
- Timestamp:
- Feb 2, 2011, 4:51:29 PM (13 years ago)
- Location:
- trunk
- Files:
-
- 18 added
- 1 deleted
- 20 edited
- 30 copied
- 2 moved
-
Makefile.in (modified) (1 diff)
-
builder (moved) (moved from trunk/instant)
-
builder/Makefile.in (modified) (3 diffs)
-
builder/main.tcl (modified) (1 diff)
-
builder/pkgIndex.tcl.in (added)
-
configure (modified) (263 diffs)
-
configure.in (modified) (1 diff)
-
gui/apps/Makefile.in (modified) (1 diff)
-
gui/apps/launcher.tcl (added)
-
gui/apps/rappture.in (modified) (2 diffs)
-
gui/scripts/main.tcl (moved) (moved from trunk/gui/apps/driver) (2 diffs)
-
lang/tcl/scripts/Makefile.in (modified) (2 diffs)
-
lang/tcl/scripts/library.tcl (modified) (1 diff)
-
lang/tcl/scripts/objects (added)
-
lang/tcl/scripts/objects.tcl (copied) (copied from trunk/instant/objects.tcl) (3 diffs)
-
lang/tcl/scripts/objects/base.rp (copied) (copied from trunk/instant/objects/base.rp)
-
lang/tcl/scripts/objects/boolean (added)
-
lang/tcl/scripts/objects/boolean/boolean.png (copied) (copied from trunk/instant/objects/boolean.png)
-
lang/tcl/scripts/objects/boolean/boolean.rp (copied) (copied from trunk/instant/objects/boolean.rp)
-
lang/tcl/scripts/objects/choice (added)
-
lang/tcl/scripts/objects/choice/choice.png (copied) (copied from trunk/instant/objects/choice.png)
-
lang/tcl/scripts/objects/curve (added)
-
lang/tcl/scripts/objects/curve/curve.png (copied) (copied from trunk/instant/objects/curve.png)
-
lang/tcl/scripts/objects/curve/curve.rp (copied) (copied from trunk/instant/objects/curve.rp)
-
lang/tcl/scripts/objects/group (added)
-
lang/tcl/scripts/objects/group/group.png (copied) (copied from trunk/instant/objects/group.png)
-
lang/tcl/scripts/objects/group/group.rp (copied) (copied from trunk/instant/objects/group.rp)
-
lang/tcl/scripts/objects/histogram (added)
-
lang/tcl/scripts/objects/histogram/histogram.png (copied) (copied from trunk/instant/objects/histogram.png)
-
lang/tcl/scripts/objects/histogram/histogram.rp (copied) (copied from trunk/instant/objects/histogram.rp)
-
lang/tcl/scripts/objects/integer (added)
-
lang/tcl/scripts/objects/integer/integer.png (copied) (copied from trunk/instant/objects/integer.png)
-
lang/tcl/scripts/objects/integer/integer.rp (copied) (copied from trunk/instant/objects/integer.rp)
-
lang/tcl/scripts/objects/note (added)
-
lang/tcl/scripts/objects/note/note.png (copied) (copied from trunk/instant/objects/note.png)
-
lang/tcl/scripts/objects/note/note.rp (copied) (copied from trunk/instant/objects/note.rp)
-
lang/tcl/scripts/objects/number (added)
-
lang/tcl/scripts/objects/number/number.png (copied) (copied from trunk/instant/objects/number.png)
-
lang/tcl/scripts/objects/number/number.rp (copied) (copied from trunk/instant/objects/number.rp)
-
lang/tcl/scripts/objects/phase (added)
-
lang/tcl/scripts/objects/phase/phase.png (copied) (copied from trunk/instant/objects/phase.png)
-
lang/tcl/scripts/objects/phase/phase.rp (copied) (copied from trunk/instant/objects/phase.rp)
-
lang/tcl/scripts/objects/string (added)
-
lang/tcl/scripts/objects/string/string.png (copied) (copied from trunk/instant/objects/string.png)
-
lang/tcl/scripts/objects/string/string.rp (copied) (copied from trunk/instant/objects/string.rp)
-
lang/tcl/scripts/types (added)
-
lang/tcl/scripts/types/boolean.tcl (copied) (copied from trunk/instant/types/boolean.tcl)
-
lang/tcl/scripts/types/color.tcl (copied) (copied from trunk/instant/types/color.tcl)
-
lang/tcl/scripts/types/file.tcl (copied) (copied from trunk/instant/types/file.tcl)
-
lang/tcl/scripts/types/string.tcl (copied) (copied from trunk/instant/types/string.tcl)
-
lang/tcl/scripts/types/units.tcl (copied) (copied from trunk/instant/types/units.tcl)
-
lang/tcl/scripts/validations (added)
-
lang/tcl/scripts/validations/enable.tcl (copied) (copied from trunk/instant/validations/enable.tcl)
-
lang/tcl/scripts/validations/int.tcl (copied) (copied from trunk/instant/validations/int.tcl)
-
lang/tcl/scripts/validations/number.tcl (copied) (copied from trunk/instant/validations/number.tcl)
-
lang/tcl/scripts/validations/size.tcl (copied) (copied from trunk/instant/validations/size.tcl)
-
p2p/client.tcl (modified) (3 diffs)
-
p2p/foreman.tcl (modified) (2 diffs)
-
p2p/handler.tcl (modified) (3 diffs)
-
p2p/protocols.tcl (modified) (1 diff)
-
p2p/server.tcl (modified) (2 diffs)
-
p2p/test.tcl (modified) (15 diffs)
-
p2p/worker.tcl (modified) (9 diffs)
-
tester/images/wait.png (deleted)
-
tester/images/wait16.png (added)
-
tester/images/wait64.png (added)
-
tester/pkgIndex.tcl.in (added)
-
tester/test.tcl (modified) (8 diffs)
-
tester/tester.tcl (modified) (5 diffs)
-
tester/testtree.tcl (modified) (2 diffs)
-
tester/testview.tcl (modified) (2 diffs)
Legend:
- Unmodified
- Added
- Removed
-
trunk/Makefile.in
r1944 r2080 35 35 36 36 ifneq ($(ENABLE_GUI),) 37 TARGETS += gui lang lib instantexamples37 TARGETS += gui lang lib builder examples 38 38 endif 39 39 -
trunk/builder/Makefile.in
r1944 r2080 22 22 INSTALL = @INSTALL@ 23 23 24 SCRIPTS = \25 irappture26 27 24 FILES = \ 28 25 $(srcdir)/dragdrop.tcl \ … … 30 27 $(srcdir)/hierlist.tcl \ 31 28 $(srcdir)/main.tcl \ 32 $(srcdir)/objects.tcl \33 29 $(srcdir)/objpath.tcl \ 34 30 $(srcdir)/slideframes.tcl \ … … 43 39 $(srcdir)/images/err24.png 44 40 45 OBJECTFILES = \ 46 $(srcdir)/objects/base.rp \ 47 $(srcdir)/objects/boolean.rp \ 48 $(srcdir)/objects/boolean.png \ 49 $(srcdir)/objects/curve.rp \ 50 $(srcdir)/objects/curve.png \ 51 $(srcdir)/objects/group.rp \ 52 $(srcdir)/objects/group.png \ 53 $(srcdir)/objects/histogram.rp \ 54 $(srcdir)/objects/histogram.png \ 55 $(srcdir)/objects/integer.rp \ 56 $(srcdir)/objects/integer.png \ 57 $(srcdir)/objects/note.rp \ 58 $(srcdir)/objects/note.png \ 59 $(srcdir)/objects/number.rp \ 60 $(srcdir)/objects/number.png \ 61 $(srcdir)/objects/phase.rp \ 62 $(srcdir)/objects/phase.png \ 63 $(srcdir)/objects/string.rp \ 64 $(srcdir)/objects/string.png \ 65 $(srcdir)/objects/tool.rp 41 PACKAGE_VERSION = @PACKAGE_VERSION@ 66 42 67 TYPEFILES = \ 68 $(srcdir)/types/boolean.tcl \ 69 $(srcdir)/types/color.tcl \ 70 $(srcdir)/types/file.tcl \ 71 $(srcdir)/types/string.tcl \ 72 $(srcdir)/types/units.tcl 43 version = $(PACKAGE_VERSION) 44 name = RapptureBuilder$(version) 73 45 74 VALIDATEFILES = \ 75 $(srcdir)/validations/enable.tcl \ 76 $(srcdir)/validations/int.tcl \ 77 $(srcdir)/validations/number.tcl \ 78 $(srcdir)/validations/size.tcl 46 destdir = $(libdir)/$(name) 79 47 80 destdir = $(libdir)/instant 48 all: 81 49 82 all: tclIndex 50 install: install-pkg install-scripts 83 51 84 tclIndex: $(FILES) 85 $( TCLSH) $(srcdir)/../gui/tclconfig/mkindex.tcl --srcdir $(srcdir) \86 --outfile tclIndex52 install-pkg: 53 $(MKDIR_P) -m 0755 $(destdir) 54 $(INSTALL) -m 444 pkgIndex.tcl $(destdir) 87 55 88 install: install-scripts install-files install-images install-objects \ 89 install-types install-validations 90 91 install-scripts: tclIndex 92 $(MKDIR_P) -m 0755 $(destdir) 93 $(INSTALL) -m 0444 tclIndex $(destdir) 94 $(MKDIR_P) -m 0755 $(bindir) 95 @for i in $(SCRIPTS); do \ 96 echo "Installing $$i" ; \ 97 $(INSTALL) -m 555 $$i $(bindir) ; \ 98 done 99 100 install-files: $(FILES) 101 $(MKDIR_P) -m 0755 $(destdir) 102 @for i in $(FILES); do \ 103 echo "Installing $$i" ; \ 104 $(INSTALL) -m 0555 $$i $(destdir) ; \ 105 done 106 107 install-images: $(IMAGEFILES) 108 $(MKDIR_P) -m 0755 $(destdir)/images 109 @for i in $(IMAGEFILES); do \ 110 echo "Installing $$i" ; \ 111 $(INSTALL) -m 0444 $$i $(destdir)/images ; \ 112 done 113 114 install-objects: $(OBJECTFILES) 115 $(MKDIR_P) -m 0755 $(destdir)/objects 116 @for i in $(OBJECTFILES); do \ 117 echo "Installing $$i" ; \ 118 $(INSTALL) -m 555 $$i $(destdir)/objects ; \ 119 done 120 121 install-types: $(TYPEFILES) 122 $(MKDIR_P) -m 0755 $(destdir)/types 123 @for i in $(TYPEFILES); do \ 124 echo "Installing $$i" ; \ 125 $(INSTALL) -m 555 $$i $(destdir)/types ; \ 126 done 127 128 install-validations: $(VALIDATEFILES) 129 $(MKDIR_P) -m 0755 $(destdir)/validations 130 @for i in $(VALIDATEFILES); do \ 131 echo "Installing $$i" ; \ 132 $(INSTALL) -m 555 $$i $(destdir)/validations ; \ 133 done 56 install-scripts: scripts 57 $(MAKE) -C scripts install 134 58 135 59 clean: 136 $(RM) t clIndex tool.xml60 $(RM) tool.xml 137 61 138 62 distclean: clean 139 $(RM) irappture140 63 $(RM) Makefile *~ 141 64 -
trunk/builder/main.tcl
r1742 r2080 106 106 set auto_path [linsert $auto_path 0 $dir] 107 107 108 foreach fname [glob [file join $dir types *.tcl]] {109 source $fname110 }111 112 foreach fname [glob [file join $dir validations *.tcl]] {113 source $fname114 }115 116 if {[catch {Rappture::objects::load [file join $dir objects *.rp]} err]} {117 puts stderr "Error loading object definitions:\n$err"118 exit 1119 }120 121 108 Rappture::icon foo ;# force loading of this module 122 109 lappend Rappture::icon::iconpath [file join $dir images] -
trunk/configure
r2065 r2080 1 1 #! /bin/sh 2 2 # Guess values for system-dependent variables and create Makefiles. 3 # Generated by GNU Autoconf 2.6 8for Rappture 1.1.3 # Generated by GNU Autoconf 2.64 for Rappture 1.1. 4 4 # 5 5 # Report bugs to <rappture@nanohub.org>. 6 6 # 7 #8 7 # Copyright (C) 1992, 1993, 1994, 1995, 1996, 1998, 1999, 2000, 2001, 9 # 2002, 2003, 2004, 2005, 2006, 2007, 2008, 2009 , 2010Free Software8 # 2002, 2003, 2004, 2005, 2006, 2007, 2008, 2009 Free Software 10 9 # Foundation, Inc. 11 #12 10 # 13 11 # This configure script is free software; the Free Software Foundation … … 92 90 93 91 # Find who we are. Look in the path if we contain no directory separator. 94 as_myself=95 92 case $0 in #(( 96 93 *[\\/]* ) as_myself=$0 ;; … … 218 215 # neutralization value for shells without unset; and this also 219 216 # works around shells that cannot unset nonexistent variables. 220 # Preserve -v and -x to the replacement shell.221 217 BASH_ENV=/dev/null 222 218 ENV=/dev/null 223 219 (unset BASH_ENV) >/dev/null 2>&1 && unset BASH_ENV ENV 224 220 export CONFIG_SHELL 225 case $- in # (((( 226 *v*x* | *x*v* ) as_opts=-vx ;; 227 *v* ) as_opts=-v ;; 228 *x* ) as_opts=-x ;; 229 * ) as_opts= ;; 230 esac 231 exec "$CONFIG_SHELL" $as_opts "$as_myself" ${1+"$@"} 221 exec "$CONFIG_SHELL" "$as_myself" ${1+"$@"} 232 222 fi 233 223 … … 328 318 done 329 319 test -z "$as_dirs" || eval "mkdir $as_dirs" 330 } || test -d "$as_dir" || as_fn_error $?"cannot create directory $as_dir"320 } || test -d "$as_dir" || as_fn_error "cannot create directory $as_dir" 331 321 332 322 … … 368 358 369 359 370 # as_fn_error STATUSERROR [LINENO LOG_FD]371 # --------------------------------- -------360 # as_fn_error ERROR [LINENO LOG_FD] 361 # --------------------------------- 372 362 # Output "`basename $0`: error: ERROR" to stderr. If LINENO and LOG_FD are 373 363 # provided, also output the error to LOG_FD, referencing LINENO. Then exit the 374 # script with STATUS, using 1 if that was 0.364 # script with status $?, using 1 if that was 0. 375 365 as_fn_error () 376 366 { 377 as_status=$ 1; test $as_status -eq 0 && as_status=1378 if test "$ 4"; then379 as_lineno=${as_lineno-"$ 3"} as_lineno_stack=as_lineno_stack=$as_lineno_stack380 $as_echo "$as_me:${as_lineno-$LINENO}: error: $ 2" >&$4381 fi 382 $as_echo "$as_me: error: $ 2" >&2367 as_status=$?; test $as_status -eq 0 && as_status=1 368 if test "$3"; then 369 as_lineno=${as_lineno-"$2"} as_lineno_stack=as_lineno_stack=$as_lineno_stack 370 $as_echo "$as_me:${as_lineno-$LINENO}: error: $1" >&$3 371 fi 372 $as_echo "$as_me: error: $1" >&2 383 373 as_fn_exit $as_status 384 374 } # as_fn_error … … 538 528 539 529 540 test -n "$DJDIR" || exec 7<&0 </dev/null 541 exec 6>&1 530 exec 7<&0 </dev/null 6>&1 542 531 543 532 # Name of the host. 544 # hostname on some systems (SVR3.2, old GNU/Linux) returns a bogus exit status,533 # hostname on some systems (SVR3.2, Linux) returns a bogus exit status, 545 534 # so uname gets run too. 546 535 ac_hostname=`(hostname || uname -n) 2>/dev/null | sed 1q` … … 865 854 866 855 case $ac_option in 867 *=?*) ac_optarg=`expr "X$ac_option" : '[^=]*=\(.*\)'` ;; 868 *=) ac_optarg= ;; 869 *) ac_optarg=yes ;; 856 *=*) ac_optarg=`expr "X$ac_option" : '[^=]*=\(.*\)'` ;; 857 *) ac_optarg=yes ;; 870 858 esac 871 859 … … 912 900 # Reject names that are not valid shell variable names. 913 901 expr "x$ac_useropt" : ".*[^-+._$as_cr_alnum]" >/dev/null && 914 as_fn_error $?"invalid feature name: $ac_useropt"902 as_fn_error "invalid feature name: $ac_useropt" 915 903 ac_useropt_orig=$ac_useropt 916 904 ac_useropt=`$as_echo "$ac_useropt" | sed 's/[-+.]/_/g'` … … 938 926 # Reject names that are not valid shell variable names. 939 927 expr "x$ac_useropt" : ".*[^-+._$as_cr_alnum]" >/dev/null && 940 as_fn_error $?"invalid feature name: $ac_useropt"928 as_fn_error "invalid feature name: $ac_useropt" 941 929 ac_useropt_orig=$ac_useropt 942 930 ac_useropt=`$as_echo "$ac_useropt" | sed 's/[-+.]/_/g'` … … 1142 1130 # Reject names that are not valid shell variable names. 1143 1131 expr "x$ac_useropt" : ".*[^-+._$as_cr_alnum]" >/dev/null && 1144 as_fn_error $?"invalid package name: $ac_useropt"1132 as_fn_error "invalid package name: $ac_useropt" 1145 1133 ac_useropt_orig=$ac_useropt 1146 1134 ac_useropt=`$as_echo "$ac_useropt" | sed 's/[-+.]/_/g'` … … 1158 1146 # Reject names that are not valid shell variable names. 1159 1147 expr "x$ac_useropt" : ".*[^-+._$as_cr_alnum]" >/dev/null && 1160 as_fn_error $?"invalid package name: $ac_useropt"1148 as_fn_error "invalid package name: $ac_useropt" 1161 1149 ac_useropt_orig=$ac_useropt 1162 1150 ac_useropt=`$as_echo "$ac_useropt" | sed 's/[-+.]/_/g'` … … 1188 1176 x_libraries=$ac_optarg ;; 1189 1177 1190 -*) as_fn_error $?"unrecognized option: \`$ac_option'1191 Try \`$0 --help' for more information "1178 -*) as_fn_error "unrecognized option: \`$ac_option' 1179 Try \`$0 --help' for more information." 1192 1180 ;; 1193 1181 … … 1197 1185 case $ac_envvar in #( 1198 1186 '' | [0-9]* | *[!_$as_cr_alnum]* ) 1199 as_fn_error $?"invalid variable name: \`$ac_envvar'" ;;1187 as_fn_error "invalid variable name: \`$ac_envvar'" ;; 1200 1188 esac 1201 1189 eval $ac_envvar=\$ac_optarg … … 1207 1195 expr "x$ac_option" : ".*[^-._$as_cr_alnum]" >/dev/null && 1208 1196 $as_echo "$as_me: WARNING: invalid host type: $ac_option" >&2 1209 : "${build_alias=$ac_option} ${host_alias=$ac_option} ${target_alias=$ac_option}"1197 : ${build_alias=$ac_option} ${host_alias=$ac_option} ${target_alias=$ac_option} 1210 1198 ;; 1211 1199 … … 1215 1203 if test -n "$ac_prev"; then 1216 1204 ac_option=--`echo $ac_prev | sed 's/_/-/g'` 1217 as_fn_error $?"missing argument to $ac_option"1205 as_fn_error "missing argument to $ac_option" 1218 1206 fi 1219 1207 … … 1221 1209 case $enable_option_checking in 1222 1210 no) ;; 1223 fatal) as_fn_error $?"unrecognized options: $ac_unrecognized_opts" ;;1211 fatal) as_fn_error "unrecognized options: $ac_unrecognized_opts" ;; 1224 1212 *) $as_echo "$as_me: WARNING: unrecognized options: $ac_unrecognized_opts" >&2 ;; 1225 1213 esac … … 1244 1232 NONE | '' ) case $ac_var in *prefix ) continue;; esac;; 1245 1233 esac 1246 as_fn_error $?"expected an absolute directory name for --$ac_var: $ac_val"1234 as_fn_error "expected an absolute directory name for --$ac_var: $ac_val" 1247 1235 done 1248 1236 … … 1258 1246 if test "x$build_alias" = x; then 1259 1247 cross_compiling=maybe 1260 $as_echo "$as_me: WARNING: if you wanted to set the --build type, don't use --host.1261 If a cross compiler is detected then cross compile mode will be used " >&21248 $as_echo "$as_me: WARNING: If you wanted to set the --build type, don't use --host. 1249 If a cross compiler is detected then cross compile mode will be used." >&2 1262 1250 elif test "x$build_alias" != "x$host_alias"; then 1263 1251 cross_compiling=yes … … 1274 1262 ac_ls_di=`ls -di .` && 1275 1263 ac_pwd_ls_di=`cd "$ac_pwd" && ls -di .` || 1276 as_fn_error $?"working directory cannot be determined"1264 as_fn_error "working directory cannot be determined" 1277 1265 test "X$ac_ls_di" = "X$ac_pwd_ls_di" || 1278 as_fn_error $?"pwd does not report name of working directory"1266 as_fn_error "pwd does not report name of working directory" 1279 1267 1280 1268 … … 1315 1303 if test ! -r "$srcdir/$ac_unique_file"; then 1316 1304 test "$ac_srcdir_defaulted" = yes && srcdir="$ac_confdir or .." 1317 as_fn_error $?"cannot find sources ($ac_unique_file) in $srcdir"1305 as_fn_error "cannot find sources ($ac_unique_file) in $srcdir" 1318 1306 fi 1319 1307 ac_msg="sources are in $srcdir, but \`cd $srcdir' does not work" 1320 1308 ac_abs_confdir=`( 1321 cd "$srcdir" && test -r "./$ac_unique_file" || as_fn_error $?"$ac_msg"1309 cd "$srcdir" && test -r "./$ac_unique_file" || as_fn_error "$ac_msg" 1322 1310 pwd)` 1323 1311 # When building in place, set srcdir=. … … 1359 1347 --help=recursive display the short help of all the included packages 1360 1348 -V, --version display version information and exit 1361 -q, --quiet, --silent do not print \`checking 1349 -q, --quiet, --silent do not print \`checking...' messages 1362 1350 --cache-file=FILE cache test results in FILE [disabled] 1363 1351 -C, --config-cache alias for \`--cache-file=config.cache' … … 1443 1431 nonstandard directory <lib dir> 1444 1432 LIBS libraries to pass to the linker, e.g. -l<library> 1445 CPPFLAGS (Objective) C/C++preprocessor flags, e.g. -I<include dir> if1433 CPPFLAGS C/C++/Objective C preprocessor flags, e.g. -I<include dir> if 1446 1434 you have headers in a nonstandard directory <include dir> 1447 1435 CXX C++ compiler command … … 1519 1507 cat <<\_ACEOF 1520 1508 Rappture configure 1.1 1521 generated by GNU Autoconf 2.6 81522 1523 Copyright (C) 20 10Free Software Foundation, Inc.1509 generated by GNU Autoconf 2.64 1510 1511 Copyright (C) 2009 Free Software Foundation, Inc. 1524 1512 This configure script is free software; the Free Software Foundation 1525 1513 gives unlimited permission to copy, distribute and modify it. … … 1565 1553 ac_retval=1 1566 1554 fi 1567 eval $as_lineno_stack; ${as_lineno_stack:+:} unset as_lineno1568 as_fn_set_status$ac_retval1555 eval $as_lineno_stack; test "x$as_lineno_stack" = x && { as_lineno=; unset as_lineno;} 1556 return $ac_retval 1569 1557 1570 1558 } # ac_fn_c_try_compile … … 1603 1591 ac_retval=1 1604 1592 fi 1605 eval $as_lineno_stack; ${as_lineno_stack:+:} unset as_lineno1606 as_fn_set_status$ac_retval1593 eval $as_lineno_stack; test "x$as_lineno_stack" = x && { as_lineno=; unset as_lineno;} 1594 return $ac_retval 1607 1595 1608 1596 } # ac_fn_cxx_try_compile … … 1641 1629 ac_retval=1 1642 1630 fi 1643 eval $as_lineno_stack; ${as_lineno_stack:+:} unset as_lineno1644 as_fn_set_status$ac_retval1631 eval $as_lineno_stack; test "x$as_lineno_stack" = x && { as_lineno=; unset as_lineno;} 1632 return $ac_retval 1645 1633 1646 1634 } # ac_fn_f77_try_compile … … 1667 1655 fi 1668 1656 $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5 1669 test $ac_status = 0; } > conftest.i&& {1657 test $ac_status = 0; } >/dev/null && { 1670 1658 test -z "$ac_c_preproc_warn_flag$ac_c_werror_flag" || 1671 1659 test ! -s conftest.err … … 1678 1666 ac_retval=1 1679 1667 fi 1680 eval $as_lineno_stack; ${as_lineno_stack:+:} unset as_lineno1681 as_fn_set_status$ac_retval1668 eval $as_lineno_stack; test "x$as_lineno_stack" = x && { as_lineno=; unset as_lineno;} 1669 return $ac_retval 1682 1670 1683 1671 } # ac_fn_c_try_cpp … … 1720 1708 fi 1721 1709 rm -rf conftest.dSYM conftest_ipa8_conftest.oo 1722 eval $as_lineno_stack; ${as_lineno_stack:+:} unset as_lineno1723 as_fn_set_status$ac_retval1710 eval $as_lineno_stack; test "x$as_lineno_stack" = x && { as_lineno=; unset as_lineno;} 1711 return $ac_retval 1724 1712 1725 1713 } # ac_fn_c_try_run … … 1766 1754 # left behind by Apple's compiler. We do this before executing the actions. 1767 1755 rm -rf conftest.dSYM conftest_ipa8_conftest.oo 1768 eval $as_lineno_stack; ${as_lineno_stack:+:} unset as_lineno1769 as_fn_set_status$ac_retval1756 eval $as_lineno_stack; test "x$as_lineno_stack" = x && { as_lineno=; unset as_lineno;} 1757 return $ac_retval 1770 1758 1771 1759 } # ac_fn_c_try_link … … 1779 1767 { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $2" >&5 1780 1768 $as_echo_n "checking for $2... " >&6; } 1781 if eval \${$3+:} false; then :1769 if { as_var=$3; eval "test \"\${$as_var+set}\" = set"; }; then : 1782 1770 $as_echo_n "(cached) " >&6 1783 1771 else … … 1834 1822 { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_res" >&5 1835 1823 $as_echo "$ac_res" >&6; } 1836 eval $as_lineno_stack; ${as_lineno_stack:+:} unset as_lineno1824 eval $as_lineno_stack; test "x$as_lineno_stack" = x && { as_lineno=; unset as_lineno;} 1837 1825 1838 1826 } # ac_fn_c_check_func … … 1879 1867 # left behind by Apple's compiler. We do this before executing the actions. 1880 1868 rm -rf conftest.dSYM conftest_ipa8_conftest.oo 1881 eval $as_lineno_stack; ${as_lineno_stack:+:} unset as_lineno1882 as_fn_set_status$ac_retval1869 eval $as_lineno_stack; test "x$as_lineno_stack" = x && { as_lineno=; unset as_lineno;} 1870 return $ac_retval 1883 1871 1884 1872 } # ac_fn_cxx_try_link … … 1892 1880 { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $2" >&5 1893 1881 $as_echo_n "checking for $2... " >&6; } 1894 if eval \${$3+:} false; then :1882 if { as_var=$3; eval "test \"\${$as_var+set}\" = set"; }; then : 1895 1883 $as_echo_n "(cached) " >&6 1896 1884 else … … 1947 1935 { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_res" >&5 1948 1936 $as_echo "$ac_res" >&6; } 1949 eval $as_lineno_stack; ${as_lineno_stack:+:} unset as_lineno1937 eval $as_lineno_stack; test "x$as_lineno_stack" = x && { as_lineno=; unset as_lineno;} 1950 1938 1951 1939 } # ac_fn_cxx_check_func … … 1972 1960 fi 1973 1961 $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5 1974 test $ac_status = 0; } > conftest.i&& {1962 test $ac_status = 0; } >/dev/null && { 1975 1963 test -z "$ac_cxx_preproc_warn_flag$ac_cxx_werror_flag" || 1976 1964 test ! -s conftest.err … … 1983 1971 ac_retval=1 1984 1972 fi 1985 eval $as_lineno_stack; ${as_lineno_stack:+:} unset as_lineno1986 as_fn_set_status$ac_retval1973 eval $as_lineno_stack; test "x$as_lineno_stack" = x && { as_lineno=; unset as_lineno;} 1974 return $ac_retval 1987 1975 1988 1976 } # ac_fn_cxx_try_cpp … … 1996 1984 { 1997 1985 as_lineno=${as_lineno-"$1"} as_lineno_stack=as_lineno_stack=$as_lineno_stack 1998 if eval \${$3+:} false; then :1986 if { as_var=$3; eval "test \"\${$as_var+set}\" = set"; }; then : 1999 1987 { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $2" >&5 2000 1988 $as_echo_n "checking for $2... " >&6; } 2001 if eval \${$3+:} false; then :1989 if { as_var=$3; eval "test \"\${$as_var+set}\" = set"; }; then : 2002 1990 $as_echo_n "(cached) " >&6 2003 1991 fi … … 2035 2023 ac_header_preproc=no 2036 2024 fi 2037 rm -f conftest.err conftest. i conftest.$ac_ext2025 rm -f conftest.err conftest.$ac_ext 2038 2026 { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_header_preproc" >&5 2039 2027 $as_echo "$ac_header_preproc" >&6; } … … 2058 2046 { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: $2: proceeding with the compiler's result" >&5 2059 2047 $as_echo "$as_me: WARNING: $2: proceeding with the compiler's result" >&2;} 2060 ( $as_echo "## ----------------------------------- ## 2048 ( cat <<\_ASBOX 2049 ## ----------------------------------- ## 2061 2050 ## Report this to rappture@nanohub.org ## 2062 ## ----------------------------------- ##" 2051 ## ----------------------------------- ## 2052 _ASBOX 2063 2053 ) | sed "s/^/$as_me: WARNING: /" >&2 2064 2054 ;; … … 2066 2056 { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $2" >&5 2067 2057 $as_echo_n "checking for $2... " >&6; } 2068 if eval \${$3+:} false; then :2058 if { as_var=$3; eval "test \"\${$as_var+set}\" = set"; }; then : 2069 2059 $as_echo_n "(cached) " >&6 2070 2060 else … … 2075 2065 $as_echo "$ac_res" >&6; } 2076 2066 fi 2077 eval $as_lineno_stack; ${as_lineno_stack:+:} unset as_lineno2067 eval $as_lineno_stack; test "x$as_lineno_stack" = x && { as_lineno=; unset as_lineno;} 2078 2068 2079 2069 } # ac_fn_cxx_check_header_mongrel … … 2088 2078 { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $2" >&5 2089 2079 $as_echo_n "checking for $2... " >&6; } 2090 if eval \${$3+:} false; then :2080 if { as_var=$3; eval "test \"\${$as_var+set}\" = set"; }; then : 2091 2081 $as_echo_n "(cached) " >&6 2092 2082 else … … 2106 2096 { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_res" >&5 2107 2097 $as_echo "$ac_res" >&6; } 2108 eval $as_lineno_stack; ${as_lineno_stack:+:} unset as_lineno2098 eval $as_lineno_stack; test "x$as_lineno_stack" = x && { as_lineno=; unset as_lineno;} 2109 2099 2110 2100 } # ac_fn_cxx_check_header_compile … … 2147 2137 fi 2148 2138 rm -rf conftest.dSYM conftest_ipa8_conftest.oo 2149 eval $as_lineno_stack; ${as_lineno_stack:+:} unset as_lineno2150 as_fn_set_status$ac_retval2139 eval $as_lineno_stack; test "x$as_lineno_stack" = x && { as_lineno=; unset as_lineno;} 2140 return $ac_retval 2151 2141 2152 2142 } # ac_fn_cxx_try_run … … 2325 2315 2326 2316 fi 2327 eval $as_lineno_stack; ${as_lineno_stack:+:} unset as_lineno2328 as_fn_set_status$ac_retval2317 eval $as_lineno_stack; test "x$as_lineno_stack" = x && { as_lineno=; unset as_lineno;} 2318 return $ac_retval 2329 2319 2330 2320 } # ac_fn_cxx_compute_int … … 2334 2324 2335 2325 It was created by Rappture $as_me 1.1, which was 2336 generated by GNU Autoconf 2.6 8. Invocation command line was2326 generated by GNU Autoconf 2.64. Invocation command line was 2337 2327 2338 2328 $ $0 $@ … … 2444 2434 echo 2445 2435 2446 $as_echo "## ---------------- ## 2436 cat <<\_ASBOX 2437 ## ---------------- ## 2447 2438 ## Cache variables. ## 2448 ## ---------------- ##" 2439 ## ---------------- ## 2440 _ASBOX 2449 2441 echo 2450 2442 # The following way of writing the cache mishandles newlines in values, … … 2480 2472 echo 2481 2473 2482 $as_echo "## ----------------- ## 2474 cat <<\_ASBOX 2475 ## ----------------- ## 2483 2476 ## Output variables. ## 2484 ## ----------------- ##" 2477 ## ----------------- ## 2478 _ASBOX 2485 2479 echo 2486 2480 for ac_var in $ac_subst_vars … … 2495 2489 2496 2490 if test -n "$ac_subst_files"; then 2497 $as_echo "## ------------------- ## 2491 cat <<\_ASBOX 2492 ## ------------------- ## 2498 2493 ## File substitutions. ## 2499 ## ------------------- ##" 2494 ## ------------------- ## 2495 _ASBOX 2500 2496 echo 2501 2497 for ac_var in $ac_subst_files … … 2511 2507 2512 2508 if test -s confdefs.h; then 2513 $as_echo "## ----------- ## 2509 cat <<\_ASBOX 2510 ## ----------- ## 2514 2511 ## confdefs.h. ## 2515 ## ----------- ##" 2512 ## ----------- ## 2513 _ASBOX 2516 2514 echo 2517 2515 cat confdefs.h … … 2568 2566 ac_site_file2=NONE 2569 2567 if test -n "$CONFIG_SITE"; then 2570 # We do not want a PATH search for config.site. 2571 case $CONFIG_SITE in #(( 2572 -*) ac_site_file1=./$CONFIG_SITE;; 2573 */*) ac_site_file1=$CONFIG_SITE;; 2574 *) ac_site_file1=./$CONFIG_SITE;; 2575 esac 2568 ac_site_file1=$CONFIG_SITE 2576 2569 elif test "x$prefix" != xNONE; then 2577 2570 ac_site_file1=$prefix/share/config.site … … 2584 2577 do 2585 2578 test "x$ac_site_file" = xNONE && continue 2586 if test /dev/null != "$ac_site_file" && test-r "$ac_site_file"; then2579 if test -r "$ac_site_file"; then 2587 2580 { $as_echo "$as_me:${as_lineno-$LINENO}: loading site script $ac_site_file" >&5 2588 2581 $as_echo "$as_me: loading site script $ac_site_file" >&6;} 2589 2582 sed 's/^/| /' "$ac_site_file" >&5 2590 . "$ac_site_file" \ 2591 || { { $as_echo "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5 2592 $as_echo "$as_me: error: in \`$ac_pwd':" >&2;} 2593 as_fn_error $? "failed to load site script $ac_site_file 2594 See \`config.log' for more details" "$LINENO" 5; } 2583 . "$ac_site_file" 2595 2584 fi 2596 2585 done 2597 2586 2598 2587 if test -r "$cache_file"; then 2599 # Some versions of bash will fail to source /dev/null (special files2600 # actually), so we avoid doing that. DJGPP emulates it as a regular file.2601 if test /dev/null != "$cache_file" && test-f "$cache_file"; then2588 # Some versions of bash will fail to source /dev/null (special 2589 # files actually), so we avoid doing that. 2590 if test -f "$cache_file"; then 2602 2591 { $as_echo "$as_me:${as_lineno-$LINENO}: loading cache $cache_file" >&5 2603 2592 $as_echo "$as_me: loading cache $cache_file" >&6;} … … 2668 2657 { $as_echo "$as_me:${as_lineno-$LINENO}: error: changes in the environment can compromise the build" >&5 2669 2658 $as_echo "$as_me: error: changes in the environment can compromise the build" >&2;} 2670 as_fn_error $?"run \`make distclean' and/or \`rm $cache_file' and start over" "$LINENO" 52659 as_fn_error "run \`make distclean' and/or \`rm $cache_file' and start over" "$LINENO" 5 2671 2660 fi 2672 2661 ## -------------------- ## … … 2683 2672 ac_aux_dir= 2684 2673 for ac_dir in cf "$srcdir"/cf; do 2685 if test -f "$ac_dir/install-sh"; then 2686 ac_aux_dir=$ac_dir 2687 ac_install_sh="$ac_aux_dir/install-sh -c" 2688 break 2689 elif test -f "$ac_dir/install.sh"; then 2690 ac_aux_dir=$ac_dir 2691 ac_install_sh="$ac_aux_dir/install.sh -c" 2692 break 2693 elif test -f "$ac_dir/shtool"; then 2694 ac_aux_dir=$ac_dir 2695 ac_install_sh="$ac_aux_dir/shtool install -c" 2696 break 2697 fi 2674 for ac_t in install-sh install.sh shtool; do 2675 if test -f "$ac_dir/$ac_t"; then 2676 ac_aux_dir=$ac_dir 2677 ac_install_sh="$ac_aux_dir/$ac_t -c" 2678 break 2 2679 fi 2680 done 2698 2681 done 2699 2682 if test -z "$ac_aux_dir"; then 2700 as_fn_error $?"cannot find install-sh, install.sh, or shtool in cf \"$srcdir\"/cf" "$LINENO" 52683 as_fn_error "cannot find install-sh, install.sh, or shtool in cf \"$srcdir\"/cf" "$LINENO" 5 2701 2684 fi 2702 2685 … … 2751 2734 $as_echo_n "checking for a BSD-compatible install... " >&6; } 2752 2735 if test -z "$INSTALL"; then 2753 if ${ac_cv_path_install+:} false; then :2736 if test "${ac_cv_path_install+set}" = set; then : 2754 2737 $as_echo_n "(cached) " >&6 2755 2738 else … … 2833 2816 { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 2834 2817 $as_echo_n "checking for $ac_word... " >&6; } 2835 if ${ac_cv_prog_RANLIB+:} false; then :2818 if test "${ac_cv_prog_RANLIB+set}" = set; then : 2836 2819 $as_echo_n "(cached) " >&6 2837 2820 else … … 2873 2856 { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 2874 2857 $as_echo_n "checking for $ac_word... " >&6; } 2875 if ${ac_cv_prog_ac_ct_RANLIB+:} false; then :2858 if test "${ac_cv_prog_ac_ct_RANLIB+set}" = set; then : 2876 2859 $as_echo_n "(cached) " >&6 2877 2860 else … … 2934 2917 $as_echo_n "checking for a thread-safe mkdir -p... " >&6; } 2935 2918 if test -z "$MKDIR_P"; then 2936 if ${ac_cv_path_mkdir+:} false; then :2919 if test "${ac_cv_path_mkdir+set}" = set; then : 2937 2920 $as_echo_n "(cached) " >&6 2938 2921 else … … 2959 2942 fi 2960 2943 2961 test -d ./--version && rmdir ./--version2962 2944 if test "${ac_cv_path_mkdir+set}" = set; then 2963 2945 MKDIR_P="$ac_cv_path_mkdir -p" … … 2967 2949 # break other packages using the cache if that directory is 2968 2950 # removed, or if the value is a relative name. 2951 test -d ./--version && rmdir ./--version 2969 2952 MKDIR_P="$ac_install_sh -d" 2970 2953 fi … … 2977 2960 set x ${MAKE-make} 2978 2961 ac_make=`$as_echo "$2" | sed 's/+/p/g; s/[^a-zA-Z0-9_]/_/g'` 2979 if eval \${ac_cv_prog_make_${ac_make}_set+:} false; then :2962 if { as_var=ac_cv_prog_make_${ac_make}_set; eval "test \"\${$as_var+set}\" = set"; }; then : 2980 2963 $as_echo_n "(cached) " >&6 2981 2964 else … … 2985 2968 @echo '@@@%%%=$(MAKE)=@@@%%%' 2986 2969 _ACEOF 2987 # GNU make sometimes prints "make[1]: Entering 2970 # GNU make sometimes prints "make[1]: Entering...", which would confuse us. 2988 2971 case `${MAKE-make} -f conftest.make 2>/dev/null` in 2989 2972 *@@@%%%=?*=@@@%%%*) … … 3016 2999 { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 3017 3000 $as_echo_n "checking for $ac_word... " >&6; } 3018 if ${ac_cv_prog_CC+:} false; then :3001 if test "${ac_cv_prog_CC+set}" = set; then : 3019 3002 $as_echo_n "(cached) " >&6 3020 3003 else … … 3056 3039 { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 3057 3040 $as_echo_n "checking for $ac_word... " >&6; } 3058 if ${ac_cv_prog_ac_ct_CC+:} false; then :3041 if test "${ac_cv_prog_ac_ct_CC+set}" = set; then : 3059 3042 $as_echo_n "(cached) " >&6 3060 3043 else … … 3109 3092 { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 3110 3093 $as_echo_n "checking for $ac_word... " >&6; } 3111 if ${ac_cv_prog_CC+:} false; then :3094 if test "${ac_cv_prog_CC+set}" = set; then : 3112 3095 $as_echo_n "(cached) " >&6 3113 3096 else … … 3149 3132 { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 3150 3133 $as_echo_n "checking for $ac_word... " >&6; } 3151 if ${ac_cv_prog_CC+:} false; then :3134 if test "${ac_cv_prog_CC+set}" = set; then : 3152 3135 $as_echo_n "(cached) " >&6 3153 3136 else … … 3208 3191 { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 3209 3192 $as_echo_n "checking for $ac_word... " >&6; } 3210 if ${ac_cv_prog_CC+:} false; then :3193 if test "${ac_cv_prog_CC+set}" = set; then : 3211 3194 $as_echo_n "(cached) " >&6 3212 3195 else … … 3252 3235 { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 3253 3236 $as_echo_n "checking for $ac_word... " >&6; } 3254 if ${ac_cv_prog_ac_ct_CC+:} false; then :3237 if test "${ac_cv_prog_ac_ct_CC+set}" = set; then : 3255 3238 $as_echo_n "(cached) " >&6 3256 3239 else … … 3306 3289 test -z "$CC" && { { $as_echo "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5 3307 3290 $as_echo "$as_me: error: in \`$ac_pwd':" >&2;} 3308 as_fn_error $?"no acceptable C compiler found in \$PATH3309 See \`config.log' for more details " "$LINENO" 5; }3291 as_fn_error "no acceptable C compiler found in \$PATH 3292 See \`config.log' for more details." "$LINENO" 5; } 3310 3293 3311 3294 # Provide some information about the compiler. … … 3328 3311 10q' conftest.err >conftest.er1 3329 3312 cat conftest.er1 >&5 3330 fi3331 rm -f conftest.er1 conftest.err3313 rm -f conftest.er1 conftest.err 3314 fi 3332 3315 $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5 3333 3316 test $ac_status = 0; } … … 3336 3319 cat confdefs.h - <<_ACEOF >conftest.$ac_ext 3337 3320 /* end confdefs.h. */ 3338 3321 #include <stdio.h> 3339 3322 int 3340 3323 main () 3341 3324 { 3325 FILE *f = fopen ("conftest.out", "w"); 3326 return ferror (f) || fclose (f) != 0; 3342 3327 3343 3328 ; … … 3346 3331 _ACEOF 3347 3332 ac_clean_files_save=$ac_clean_files 3348 ac_clean_files="$ac_clean_files a.out a.out.dSYM a.exe b.out "3333 ac_clean_files="$ac_clean_files a.out a.out.dSYM a.exe b.out conftest.out" 3349 3334 # Try to create an executable without -o first, disregard a.out. 3350 3335 # It will help us diagnose broken compilers, and finding out an intuition 3351 3336 # of exeext. 3352 { $as_echo "$as_me:${as_lineno-$LINENO}: checking whether the C compiler works" >&53353 $as_echo_n "checking whether the C compiler works... " >&6; }3337 { $as_echo "$as_me:${as_lineno-$LINENO}: checking for C compiler default output file name" >&5 3338 $as_echo_n "checking for C compiler default output file name... " >&6; } 3354 3339 ac_link_default=`$as_echo "$ac_link" | sed 's/ -o *conftest[^ ]*//'` 3355 3340 … … 3413 3398 ac_file='' 3414 3399 fi 3400 { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_file" >&5 3401 $as_echo "$ac_file" >&6; } 3415 3402 if test -z "$ac_file"; then : 3416 { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 3417 $as_echo "no" >&6; } 3418 $as_echo "$as_me: failed program was:" >&5 3403 $as_echo "$as_me: failed program was:" >&5 3419 3404 sed 's/^/| /' conftest.$ac_ext >&5 3420 3405 3421 3406 { { $as_echo "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5 3422 3407 $as_echo "$as_me: error: in \`$ac_pwd':" >&2;} 3423 as_fn_error 77 "C compiler cannot create executables 3424 See \`config.log' for more details" "$LINENO" 5; } 3425 else 3426 { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5 3408 { as_fn_set_status 77 3409 as_fn_error "C compiler cannot create executables 3410 See \`config.log' for more details." "$LINENO" 5; }; } 3411 fi 3412 ac_exeext=$ac_cv_exeext 3413 3414 # Check that the compiler produces executables we can run. If not, either 3415 # the compiler is broken, or we cross compile. 3416 { $as_echo "$as_me:${as_lineno-$LINENO}: checking whether the C compiler works" >&5 3417 $as_echo_n "checking whether the C compiler works... " >&6; } 3418 # If not cross compiling, check that we can run a simple program. 3419 if test "$cross_compiling" != yes; then 3420 if { ac_try='./$ac_file' 3421 { { case "(($ac_try" in 3422 *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; 3423 *) ac_try_echo=$ac_try;; 3424 esac 3425 eval ac_try_echo="\"\$as_me:${as_lineno-$LINENO}: $ac_try_echo\"" 3426 $as_echo "$ac_try_echo"; } >&5 3427 (eval "$ac_try") 2>&5 3428 ac_status=$? 3429 $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5 3430 test $ac_status = 0; }; }; then 3431 cross_compiling=no 3432 else 3433 if test "$cross_compiling" = maybe; then 3434 cross_compiling=yes 3435 else 3436 { { $as_echo "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5 3437 $as_echo "$as_me: error: in \`$ac_pwd':" >&2;} 3438 as_fn_error "cannot run C compiled programs. 3439 If you meant to cross compile, use \`--host'. 3440 See \`config.log' for more details." "$LINENO" 5; } 3441 fi 3442 fi 3443 fi 3444 { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5 3427 3445 $as_echo "yes" >&6; } 3428 fi 3429 { $as_echo "$as_me:${as_lineno-$LINENO}: checking for C compiler default output file name" >&5 3430 $as_echo_n "checking for C compiler default output file name... " >&6; } 3431 { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_file" >&5 3432 $as_echo "$ac_file" >&6; } 3433 ac_exeext=$ac_cv_exeext 3434 3435 rm -f -r a.out a.out.dSYM a.exe conftest$ac_cv_exeext b.out 3446 3447 rm -f -r a.out a.out.dSYM a.exe conftest$ac_cv_exeext b.out conftest.out 3436 3448 ac_clean_files=$ac_clean_files_save 3449 # Check that the compiler produces executables we can run. If not, either 3450 # the compiler is broken, or we cross compile. 3451 { $as_echo "$as_me:${as_lineno-$LINENO}: checking whether we are cross compiling" >&5 3452 $as_echo_n "checking whether we are cross compiling... " >&6; } 3453 { $as_echo "$as_me:${as_lineno-$LINENO}: result: $cross_compiling" >&5 3454 $as_echo "$cross_compiling" >&6; } 3455 3437 3456 { $as_echo "$as_me:${as_lineno-$LINENO}: checking for suffix of executables" >&5 3438 3457 $as_echo_n "checking for suffix of executables... " >&6; } … … 3464 3483 { { $as_echo "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5 3465 3484 $as_echo "$as_me: error: in \`$ac_pwd':" >&2;} 3466 as_fn_error $?"cannot compute suffix of executables: cannot compile and link3467 See \`config.log' for more details " "$LINENO" 5; }3468 fi 3469 rm -f conftest conftest$ac_cv_exeext3485 as_fn_error "cannot compute suffix of executables: cannot compile and link 3486 See \`config.log' for more details." "$LINENO" 5; } 3487 fi 3488 rm -f conftest$ac_cv_exeext 3470 3489 { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_exeext" >&5 3471 3490 $as_echo "$ac_cv_exeext" >&6; } … … 3474 3493 EXEEXT=$ac_cv_exeext 3475 3494 ac_exeext=$EXEEXT 3476 cat confdefs.h - <<_ACEOF >conftest.$ac_ext3477 /* end confdefs.h. */3478 #include <stdio.h>3479 int3480 main ()3481 {3482 FILE *f = fopen ("conftest.out", "w");3483 return ferror (f) || fclose (f) != 0;3484 3485 ;3486 return 0;3487 }3488 _ACEOF3489 ac_clean_files="$ac_clean_files conftest.out"3490 # Check that the compiler produces executables we can run. If not, either3491 # the compiler is broken, or we cross compile.3492 { $as_echo "$as_me:${as_lineno-$LINENO}: checking whether we are cross compiling" >&53493 $as_echo_n "checking whether we are cross compiling... " >&6; }3494 if test "$cross_compiling" != yes; then3495 { { ac_try="$ac_link"3496 case "(($ac_try" in3497 *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;3498 *) ac_try_echo=$ac_try;;3499 esac3500 eval ac_try_echo="\"\$as_me:${as_lineno-$LINENO}: $ac_try_echo\""3501 $as_echo "$ac_try_echo"; } >&53502 (eval "$ac_link") 2>&53503 ac_status=$?3504 $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&53505 test $ac_status = 0; }3506 if { ac_try='./conftest$ac_cv_exeext'3507 { { case "(($ac_try" in3508 *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;3509 *) ac_try_echo=$ac_try;;3510 esac3511 eval ac_try_echo="\"\$as_me:${as_lineno-$LINENO}: $ac_try_echo\""3512 $as_echo "$ac_try_echo"; } >&53513 (eval "$ac_try") 2>&53514 ac_status=$?3515 $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&53516 test $ac_status = 0; }; }; then3517 cross_compiling=no3518 else3519 if test "$cross_compiling" = maybe; then3520 cross_compiling=yes3521 else3522 { { $as_echo "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&53523 $as_echo "$as_me: error: in \`$ac_pwd':" >&2;}3524 as_fn_error $? "cannot run C compiled programs.3525 If you meant to cross compile, use \`--host'.3526 See \`config.log' for more details" "$LINENO" 5; }3527 fi3528 fi3529 fi3530 { $as_echo "$as_me:${as_lineno-$LINENO}: result: $cross_compiling" >&53531 $as_echo "$cross_compiling" >&6; }3532 3533 rm -f conftest.$ac_ext conftest$ac_cv_exeext conftest.out3534 ac_clean_files=$ac_clean_files_save3535 3495 { $as_echo "$as_me:${as_lineno-$LINENO}: checking for suffix of object files" >&5 3536 3496 $as_echo_n "checking for suffix of object files... " >&6; } 3537 if ${ac_cv_objext+:} false; then :3497 if test "${ac_cv_objext+set}" = set; then : 3538 3498 $as_echo_n "(cached) " >&6 3539 3499 else … … 3575 3535 { { $as_echo "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5 3576 3536 $as_echo "$as_me: error: in \`$ac_pwd':" >&2;} 3577 as_fn_error $?"cannot compute suffix of object files: cannot compile3578 See \`config.log' for more details " "$LINENO" 5; }3537 as_fn_error "cannot compute suffix of object files: cannot compile 3538 See \`config.log' for more details." "$LINENO" 5; } 3579 3539 fi 3580 3540 rm -f conftest.$ac_cv_objext conftest.$ac_ext … … 3586 3546 { $as_echo "$as_me:${as_lineno-$LINENO}: checking whether we are using the GNU C compiler" >&5 3587 3547 $as_echo_n "checking whether we are using the GNU C compiler... " >&6; } 3588 if ${ac_cv_c_compiler_gnu+:} false; then :3548 if test "${ac_cv_c_compiler_gnu+set}" = set; then : 3589 3549 $as_echo_n "(cached) " >&6 3590 3550 else … … 3623 3583 { $as_echo "$as_me:${as_lineno-$LINENO}: checking whether $CC accepts -g" >&5 3624 3584 $as_echo_n "checking whether $CC accepts -g... " >&6; } 3625 if ${ac_cv_prog_cc_g+:} false; then :3585 if test "${ac_cv_prog_cc_g+set}" = set; then : 3626 3586 $as_echo_n "(cached) " >&6 3627 3587 else … … 3701 3661 { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $CC option to accept ISO C89" >&5 3702 3662 $as_echo_n "checking for $CC option to accept ISO C89... " >&6; } 3703 if ${ac_cv_prog_cc_c89+:} false; then :3663 if test "${ac_cv_prog_cc_c89+set}" = set; then : 3704 3664 $as_echo_n "(cached) " >&6 3705 3665 else … … 3812 3772 { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 3813 3773 $as_echo_n "checking for $ac_word... " >&6; } 3814 if ${ac_cv_prog_CXX+:} false; then :3774 if test "${ac_cv_prog_CXX+set}" = set; then : 3815 3775 $as_echo_n "(cached) " >&6 3816 3776 else … … 3856 3816 { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 3857 3817 $as_echo_n "checking for $ac_word... " >&6; } 3858 if ${ac_cv_prog_ac_ct_CXX+:} false; then :3818 if test "${ac_cv_prog_ac_ct_CXX+set}" = set; then : 3859 3819 $as_echo_n "(cached) " >&6 3860 3820 else … … 3926 3886 10q' conftest.err >conftest.er1 3927 3887 cat conftest.er1 >&5 3928 fi3929 rm -f conftest.er1 conftest.err3888 rm -f conftest.er1 conftest.err 3889 fi 3930 3890 $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5 3931 3891 test $ac_status = 0; } … … 3934 3894 { $as_echo "$as_me:${as_lineno-$LINENO}: checking whether we are using the GNU C++ compiler" >&5 3935 3895 $as_echo_n "checking whether we are using the GNU C++ compiler... " >&6; } 3936 if ${ac_cv_cxx_compiler_gnu+:} false; then :3896 if test "${ac_cv_cxx_compiler_gnu+set}" = set; then : 3937 3897 $as_echo_n "(cached) " >&6 3938 3898 else … … 3971 3931 { $as_echo "$as_me:${as_lineno-$LINENO}: checking whether $CXX accepts -g" >&5 3972 3932 $as_echo_n "checking whether $CXX accepts -g... " >&6; } 3973 if ${ac_cv_prog_cxx_g+:} false; then :3933 if test "${ac_cv_prog_cxx_g+set}" = set; then : 3974 3934 $as_echo_n "(cached) " >&6 3975 3935 else … … 4065 4025 { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 4066 4026 $as_echo_n "checking for $ac_word... " >&6; } 4067 if ${ac_cv_prog_F77+:} false; then :4027 if test "${ac_cv_prog_F77+set}" = set; then : 4068 4028 $as_echo_n "(cached) " >&6 4069 4029 else … … 4109 4069 { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 4110 4070 $as_echo_n "checking for $ac_word... " >&6; } 4111 if ${ac_cv_prog_ac_ct_F77+:} false; then :4071 if test "${ac_cv_prog_ac_ct_F77+set}" = set; then : 4112 4072 $as_echo_n "(cached) " >&6 4113 4073 else … … 4178 4138 10q' conftest.err >conftest.er1 4179 4139 cat conftest.er1 >&5 4180 fi4181 rm -f conftest.er1 conftest.err4140 rm -f conftest.er1 conftest.err 4141 fi 4182 4142 $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5 4183 4143 test $ac_status = 0; } … … 4191 4151 { $as_echo "$as_me:${as_lineno-$LINENO}: checking whether we are using the GNU Fortran 77 compiler" >&5 4192 4152 $as_echo_n "checking whether we are using the GNU Fortran 77 compiler... " >&6; } 4193 if ${ac_cv_f77_compiler_gnu+:} false; then :4153 if test "${ac_cv_f77_compiler_gnu+set}" = set; then : 4194 4154 $as_echo_n "(cached) " >&6 4195 4155 else … … 4219 4179 { $as_echo "$as_me:${as_lineno-$LINENO}: checking whether $F77 accepts -g" >&5 4220 4180 $as_echo_n "checking whether $F77 accepts -g... " >&6; } 4221 if ${ac_cv_prog_f77_g+:} false; then :4181 if test "${ac_cv_prog_f77_g+set}" = set; then : 4222 4182 $as_echo_n "(cached) " >&6 4223 4183 else … … 4286 4246 fi 4287 4247 if test -z "$CPP"; then 4288 if ${ac_cv_prog_CPP+:} false; then :4248 if test "${ac_cv_prog_CPP+set}" = set; then : 4289 4249 $as_echo_n "(cached) " >&6 4290 4250 else … … 4316 4276 continue 4317 4277 fi 4318 rm -f conftest.err conftest. i conftest.$ac_ext4278 rm -f conftest.err conftest.$ac_ext 4319 4279 4320 4280 # OK, works on sane cases. Now check whether nonexistent headers … … 4332 4292 break 4333 4293 fi 4334 rm -f conftest.err conftest. i conftest.$ac_ext4294 rm -f conftest.err conftest.$ac_ext 4335 4295 4336 4296 done 4337 4297 # Because of `break', _AC_PREPROC_IFELSE's cleaning code was skipped. 4338 rm -f conftest. i conftest.err conftest.$ac_ext4298 rm -f conftest.err conftest.$ac_ext 4339 4299 if $ac_preproc_ok; then : 4340 4300 break … … 4375 4335 continue 4376 4336 fi 4377 rm -f conftest.err conftest. i conftest.$ac_ext4337 rm -f conftest.err conftest.$ac_ext 4378 4338 4379 4339 # OK, works on sane cases. Now check whether nonexistent headers … … 4391 4351 break 4392 4352 fi 4393 rm -f conftest.err conftest. i conftest.$ac_ext4353 rm -f conftest.err conftest.$ac_ext 4394 4354 4395 4355 done 4396 4356 # Because of `break', _AC_PREPROC_IFELSE's cleaning code was skipped. 4397 rm -f conftest. i conftest.err conftest.$ac_ext4357 rm -f conftest.err conftest.$ac_ext 4398 4358 if $ac_preproc_ok; then : 4399 4359 … … 4401 4361 { { $as_echo "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5 4402 4362 $as_echo "$as_me: error: in \`$ac_pwd':" >&2;} 4403 as_fn_error $?"C preprocessor \"$CPP\" fails sanity check4404 See \`config.log' for more details " "$LINENO" 5; }4363 as_fn_error "C preprocessor \"$CPP\" fails sanity check 4364 See \`config.log' for more details." "$LINENO" 5; } 4405 4365 fi 4406 4366 … … 4414 4374 { $as_echo "$as_me:${as_lineno-$LINENO}: checking for grep that handles long lines and -e" >&5 4415 4375 $as_echo_n "checking for grep that handles long lines and -e... " >&6; } 4416 if ${ac_cv_path_GREP+:} false; then :4376 if test "${ac_cv_path_GREP+set}" = set; then : 4417 4377 $as_echo_n "(cached) " >&6 4418 4378 else … … 4463 4423 IFS=$as_save_IFS 4464 4424 if test -z "$ac_cv_path_GREP"; then 4465 as_fn_error $?"no acceptable grep could be found in $PATH$PATH_SEPARATOR/usr/xpg4/bin" "$LINENO" 54425 as_fn_error "no acceptable grep could be found in $PATH$PATH_SEPARATOR/usr/xpg4/bin" "$LINENO" 5 4466 4426 fi 4467 4427 else … … 4477 4437 { $as_echo "$as_me:${as_lineno-$LINENO}: checking for egrep" >&5 4478 4438 $as_echo_n "checking for egrep... " >&6; } 4479 if ${ac_cv_path_EGREP+:} false; then :4439 if test "${ac_cv_path_EGREP+set}" = set; then : 4480 4440 $as_echo_n "(cached) " >&6 4481 4441 else … … 4529 4489 IFS=$as_save_IFS 4530 4490 if test -z "$ac_cv_path_EGREP"; then 4531 as_fn_error $?"no acceptable egrep could be found in $PATH$PATH_SEPARATOR/usr/xpg4/bin" "$LINENO" 54491 as_fn_error "no acceptable egrep could be found in $PATH$PATH_SEPARATOR/usr/xpg4/bin" "$LINENO" 5 4532 4492 fi 4533 4493 else … … 4544 4504 { $as_echo "$as_me:${as_lineno-$LINENO}: checking for ANSI C header files" >&5 4545 4505 $as_echo_n "checking for ANSI C header files... " >&6; } 4546 if ${ac_cv_header_stdc+:} false; then :4506 if test "${ac_cv_header_stdc+set}" = set; then : 4547 4507 $as_echo_n "(cached) " >&6 4548 4508 else … … 4655 4615 4656 4616 ac_fn_c_check_func "$LINENO" "atol" "ac_cv_func_atol" 4657 if test "x$ac_cv_func_atol" = x yes; then :4658 4659 else 4660 as_fn_error $?"oops! no atol ?!?" "$LINENO" 54617 if test "x$ac_cv_func_atol" = x""yes; then : 4618 4619 else 4620 as_fn_error "oops! no atol ?!?" "$LINENO" 5 4661 4621 fi 4662 4622 … … 4673 4633 do : 4674 4634 ac_fn_cxx_check_func "$LINENO" "sysinfo" "ac_cv_func_sysinfo" 4675 if test "x$ac_cv_func_sysinfo" = x yes; then :4635 if test "x$ac_cv_func_sysinfo" = x""yes; then : 4676 4636 cat >>confdefs.h <<_ACEOF 4677 4637 #define HAVE_SYSINFO 1 … … 4689 4649 $as_echo_n "checking how to run the C++ preprocessor... " >&6; } 4690 4650 if test -z "$CXXCPP"; then 4691 if ${ac_cv_prog_CXXCPP+:} false; then :4651 if test "${ac_cv_prog_CXXCPP+set}" = set; then : 4692 4652 $as_echo_n "(cached) " >&6 4693 4653 else … … 4719 4679 continue 4720 4680 fi 4721 rm -f conftest.err conftest. i conftest.$ac_ext4681 rm -f conftest.err conftest.$ac_ext 4722 4682 4723 4683 # OK, works on sane cases. Now check whether nonexistent headers … … 4735 4695 break 4736 4696 fi 4737 rm -f conftest.err conftest. i conftest.$ac_ext4697 rm -f conftest.err conftest.$ac_ext 4738 4698 4739 4699 done 4740 4700 # Because of `break', _AC_PREPROC_IFELSE's cleaning code was skipped. 4741 rm -f conftest. i conftest.err conftest.$ac_ext4701 rm -f conftest.err conftest.$ac_ext 4742 4702 if $ac_preproc_ok; then : 4743 4703 break … … 4778 4738 continue 4779 4739 fi 4780 rm -f conftest.err conftest. i conftest.$ac_ext4740 rm -f conftest.err conftest.$ac_ext 4781 4741 4782 4742 # OK, works on sane cases. Now check whether nonexistent headers … … 4794 4754 break 4795 4755 fi 4796 rm -f conftest.err conftest. i conftest.$ac_ext4756 rm -f conftest.err conftest.$ac_ext 4797 4757 4798 4758 done 4799 4759 # Because of `break', _AC_PREPROC_IFELSE's cleaning code was skipped. 4800 rm -f conftest. i conftest.err conftest.$ac_ext4760 rm -f conftest.err conftest.$ac_ext 4801 4761 if $ac_preproc_ok; then : 4802 4762 … … 4804 4764 { { $as_echo "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5 4805 4765 $as_echo "$as_me: error: in \`$ac_pwd':" >&2;} 4806 as_fn_error $?"C++ preprocessor \"$CXXCPP\" fails sanity check4807 See \`config.log' for more details " "$LINENO" 5; }4766 as_fn_error "C++ preprocessor \"$CXXCPP\" fails sanity check 4767 See \`config.log' for more details." "$LINENO" 5; } 4808 4768 fi 4809 4769 … … 4822 4782 ac_fn_cxx_check_header_compile "$LINENO" "$ac_header" "$as_ac_Header" "$ac_includes_default 4823 4783 " 4824 if eval test \"x\$"$as_ac_Header"\" = x"yes"; then : 4784 eval as_val=\$$as_ac_Header 4785 if test "x$as_val" = x""yes; then : 4825 4786 cat >>confdefs.h <<_ACEOF 4826 4787 #define `$as_echo "HAVE_$ac_header" | $as_tr_cpp` 1 … … 4835 4796 do : 4836 4797 ac_fn_cxx_check_header_mongrel "$LINENO" "sys/sysinfo.h" "ac_cv_header_sys_sysinfo_h" "$ac_includes_default" 4837 if test "x$ac_cv_header_sys_sysinfo_h" = x yes; then :4798 if test "x$ac_cv_header_sys_sysinfo_h" = x""yes; then : 4838 4799 cat >>confdefs.h <<_ACEOF 4839 4800 #define HAVE_SYS_SYSINFO_H 1 … … 4847 4808 { $as_echo "$as_me:${as_lineno-$LINENO}: checking for main in -lm" >&5 4848 4809 $as_echo_n "checking for main in -lm... " >&6; } 4849 if ${ac_cv_lib_m_main+:} false; then :4810 if test "${ac_cv_lib_m_main+set}" = set; then : 4850 4811 $as_echo_n "(cached) " >&6 4851 4812 else … … 4875 4836 { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_m_main" >&5 4876 4837 $as_echo "$ac_cv_lib_m_main" >&6; } 4877 if test "x$ac_cv_lib_m_main" = x yes; then :4838 if test "x$ac_cv_lib_m_main" = x""yes; then : 4878 4839 cat >>confdefs.h <<_ACEOF 4879 4840 #define HAVE_LIBM 1 … … 4883 4844 4884 4845 else 4885 as_fn_error $?"librappture requires libm" "$LINENO" 54846 as_fn_error "librappture requires libm" "$LINENO" 5 4886 4847 fi 4887 4848 4888 4849 { $as_echo "$as_me:${as_lineno-$LINENO}: checking for main in -lstdc++" >&5 4889 4850 $as_echo_n "checking for main in -lstdc++... " >&6; } 4890 if ${ac_cv_lib_stdcpp_main+:} false; then :4851 if test "${ac_cv_lib_stdcpp_main+set}" = set; then : 4891 4852 $as_echo_n "(cached) " >&6 4892 4853 else … … 4916 4877 { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_stdcpp_main" >&5 4917 4878 $as_echo "$ac_cv_lib_stdcpp_main" >&6; } 4918 if test "x$ac_cv_lib_stdcpp_main" = x yes; then :4879 if test "x$ac_cv_lib_stdcpp_main" = x""yes; then : 4919 4880 cat >>confdefs.h <<_ACEOF 4920 4881 #define HAVE_LIBSTDC__ 1 … … 4924 4885 4925 4886 else 4926 as_fn_error $?"librappture requires libstdc++" "$LINENO" 54887 as_fn_error "librappture requires libstdc++" "$LINENO" 5 4927 4888 fi 4928 4889 … … 4930 4891 do : 4931 4892 ac_fn_cxx_check_header_mongrel "$LINENO" "algorithm" "ac_cv_header_algorithm" "$ac_includes_default" 4932 if test "x$ac_cv_header_algorithm" = x yes; then :4893 if test "x$ac_cv_header_algorithm" = x""yes; then : 4933 4894 cat >>confdefs.h <<_ACEOF 4934 4895 #define HAVE_ALGORITHM 1 … … 4945 4906 do : 4946 4907 ac_fn_cxx_check_header_mongrel "$LINENO" "cctype" "ac_cv_header_cctype" "$ac_includes_default" 4947 if test "x$ac_cv_header_cctype" = x yes; then :4908 if test "x$ac_cv_header_cctype" = x""yes; then : 4948 4909 cat >>confdefs.h <<_ACEOF 4949 4910 #define HAVE_CCTYPE 1 … … 4960 4921 do : 4961 4922 ac_fn_cxx_check_header_mongrel "$LINENO" "cfloat" "ac_cv_header_cfloat" "$ac_includes_default" 4962 if test "x$ac_cv_header_cfloat" = x yes; then :4923 if test "x$ac_cv_header_cfloat" = x""yes; then : 4963 4924 cat >>confdefs.h <<_ACEOF 4964 4925 #define HAVE_CFLOAT 1 … … 4975 4936 do : 4976 4937 ac_fn_cxx_check_header_mongrel "$LINENO" "cmath" "ac_cv_header_cmath" "$ac_includes_default" 4977 if test "x$ac_cv_header_cmath" = x yes; then :4938 if test "x$ac_cv_header_cmath" = x""yes; then : 4978 4939 cat >>confdefs.h <<_ACEOF 4979 4940 #define HAVE_CMATH 1 … … 4990 4951 do : 4991 4952 ac_fn_cxx_check_header_mongrel "$LINENO" "cstdio" "ac_cv_header_cstdio" "$ac_includes_default" 4992 if test "x$ac_cv_header_cstdio" = x yes; then :4953 if test "x$ac_cv_header_cstdio" = x""yes; then : 4993 4954 cat >>confdefs.h <<_ACEOF 4994 4955 #define HAVE_CSTDIO 1 … … 5005 4966 do : 5006 4967 ac_fn_cxx_check_header_mongrel "$LINENO" "cstdlib" "ac_cv_header_cstdlib" "$ac_includes_default" 5007 if test "x$ac_cv_header_cstdlib" = x yes; then :4968 if test "x$ac_cv_header_cstdlib" = x""yes; then : 5008 4969 cat >>confdefs.h <<_ACEOF 5009 4970 #define HAVE_CSTDLIB 1 … … 5020 4981 do : 5021 4982 ac_fn_cxx_check_header_mongrel "$LINENO" "cstring" "ac_cv_header_cstring" "$ac_includes_default" 5022 if test "x$ac_cv_header_cstring" = x yes; then :4983 if test "x$ac_cv_header_cstring" = x""yes; then : 5023 4984 cat >>confdefs.h <<_ACEOF 5024 4985 #define HAVE_CSTRING 1 … … 5035 4996 do : 5036 4997 ac_fn_cxx_check_header_mongrel "$LINENO" "fstream" "ac_cv_header_fstream" "$ac_includes_default" 5037 if test "x$ac_cv_header_fstream" = x yes; then :4998 if test "x$ac_cv_header_fstream" = x""yes; then : 5038 4999 cat >>confdefs.h <<_ACEOF 5039 5000 #define HAVE_FSTREAM 1 … … 5050 5011 do : 5051 5012 ac_fn_cxx_check_header_mongrel "$LINENO" "list" "ac_cv_header_list" "$ac_includes_default" 5052 if test "x$ac_cv_header_list" = x yes; then :5013 if test "x$ac_cv_header_list" = x""yes; then : 5053 5014 cat >>confdefs.h <<_ACEOF 5054 5015 #define HAVE_LIST 1 … … 5065 5026 do : 5066 5027 ac_fn_cxx_check_header_mongrel "$LINENO" "iostream" "ac_cv_header_iostream" "$ac_includes_default" 5067 if test "x$ac_cv_header_iostream" = x yes; then :5028 if test "x$ac_cv_header_iostream" = x""yes; then : 5068 5029 cat >>confdefs.h <<_ACEOF 5069 5030 #define HAVE_IOSTREAM 1 … … 5080 5041 do : 5081 5042 ac_fn_cxx_check_header_mongrel "$LINENO" "iterator" "ac_cv_header_iterator" "$ac_includes_default" 5082 if test "x$ac_cv_header_iterator" = x yes; then :5043 if test "x$ac_cv_header_iterator" = x""yes; then : 5083 5044 cat >>confdefs.h <<_ACEOF 5084 5045 #define HAVE_ITERATOR 1 … … 5095 5056 do : 5096 5057 ac_fn_cxx_check_header_mongrel "$LINENO" "sstream" "ac_cv_header_sstream" "$ac_includes_default" 5097 if test "x$ac_cv_header_sstream" = x yes; then :5058 if test "x$ac_cv_header_sstream" = x""yes; then : 5098 5059 cat >>confdefs.h <<_ACEOF 5099 5060 #define HAVE_SSTREAM 1 … … 5110 5071 do : 5111 5072 ac_fn_cxx_check_header_mongrel "$LINENO" "stack" "ac_cv_header_stack" "$ac_includes_default" 5112 if test "x$ac_cv_header_stack" = x yes; then :5073 if test "x$ac_cv_header_stack" = x""yes; then : 5113 5074 cat >>confdefs.h <<_ACEOF 5114 5075 #define HAVE_STACK 1 … … 5125 5086 do : 5126 5087 ac_fn_cxx_check_header_mongrel "$LINENO" "string" "ac_cv_header_string" "$ac_includes_default" 5127 if test "x$ac_cv_header_string" = x yes; then :5088 if test "x$ac_cv_header_string" = x""yes; then : 5128 5089 cat >>confdefs.h <<_ACEOF 5129 5090 #define HAVE_STRING 1 … … 5140 5101 do : 5141 5102 ac_fn_cxx_check_header_mongrel "$LINENO" "vector" "ac_cv_header_vector" "$ac_includes_default" 5142 if test "x$ac_cv_header_vector" = x yes; then :5103 if test "x$ac_cv_header_vector" = x""yes; then : 5143 5104 cat >>confdefs.h <<_ACEOF 5144 5105 #define HAVE_VECTOR 1 … … 5156 5117 do : 5157 5118 ac_fn_cxx_check_header_mongrel "$LINENO" "assert.h" "ac_cv_header_assert_h" "$ac_includes_default" 5158 if test "x$ac_cv_header_assert_h" = x yes; then :5119 if test "x$ac_cv_header_assert_h" = x""yes; then : 5159 5120 cat >>confdefs.h <<_ACEOF 5160 5121 #define HAVE_ASSERT_H 1 … … 5171 5132 do : 5172 5133 ac_fn_cxx_check_header_mongrel "$LINENO" "ctype.h" "ac_cv_header_ctype_h" "$ac_includes_default" 5173 if test "x$ac_cv_header_ctype_h" = x yes; then :5134 if test "x$ac_cv_header_ctype_h" = x""yes; then : 5174 5135 cat >>confdefs.h <<_ACEOF 5175 5136 #define HAVE_CTYPE_H 1 … … 5186 5147 do : 5187 5148 ac_fn_cxx_check_header_mongrel "$LINENO" "errno.h" "ac_cv_header_errno_h" "$ac_includes_default" 5188 if test "x$ac_cv_header_errno_h" = x yes; then :5149 if test "x$ac_cv_header_errno_h" = x""yes; then : 5189 5150 cat >>confdefs.h <<_ACEOF 5190 5151 #define HAVE_ERRNO_H 1 … … 5201 5162 do : 5202 5163 ac_fn_cxx_check_header_mongrel "$LINENO" "limits.h" "ac_cv_header_limits_h" "$ac_includes_default" 5203 if test "x$ac_cv_header_limits_h" = x yes; then :5164 if test "x$ac_cv_header_limits_h" = x""yes; then : 5204 5165 cat >>confdefs.h <<_ACEOF 5205 5166 #define HAVE_LIMITS_H 1 … … 5216 5177 do : 5217 5178 ac_fn_cxx_check_header_mongrel "$LINENO" "string.h" "ac_cv_header_string_h" "$ac_includes_default" 5218 if test "x$ac_cv_header_string_h" = x yes; then :5179 if test "x$ac_cv_header_string_h" = x""yes; then : 5219 5180 cat >>confdefs.h <<_ACEOF 5220 5181 #define HAVE_STRING_H 1 … … 5231 5192 do : 5232 5193 ac_fn_cxx_check_header_mongrel "$LINENO" "stdlib.h" "ac_cv_header_stdlib_h" "$ac_includes_default" 5233 if test "x$ac_cv_header_stdlib_h" = x yes; then :5194 if test "x$ac_cv_header_stdlib_h" = x""yes; then : 5234 5195 cat >>confdefs.h <<_ACEOF 5235 5196 #define HAVE_STDLIB_H 1 … … 5246 5207 do : 5247 5208 ac_fn_cxx_check_header_mongrel "$LINENO" "stddef.h" "ac_cv_header_stddef_h" "$ac_includes_default" 5248 if test "x$ac_cv_header_stddef_h" = x yes; then :5209 if test "x$ac_cv_header_stddef_h" = x""yes; then : 5249 5210 cat >>confdefs.h <<_ACEOF 5250 5211 #define HAVE_STDDEF_H 1 … … 5261 5222 do : 5262 5223 ac_fn_cxx_check_header_mongrel "$LINENO" "float.h" "ac_cv_header_float_h" "$ac_includes_default" 5263 if test "x$ac_cv_header_float_h" = x yes; then :5224 if test "x$ac_cv_header_float_h" = x""yes; then : 5264 5225 cat >>confdefs.h <<_ACEOF 5265 5226 #define HAVE_FLOAT_H 1 … … 5276 5237 do : 5277 5238 ac_fn_cxx_check_header_mongrel "$LINENO" "math.h" "ac_cv_header_math_h" "$ac_includes_default" 5278 if test "x$ac_cv_header_math_h" = x yes; then :5239 if test "x$ac_cv_header_math_h" = x""yes; then : 5279 5240 cat >>confdefs.h <<_ACEOF 5280 5241 #define HAVE_MATH_H 1 … … 5291 5252 do : 5292 5253 ac_fn_cxx_check_header_mongrel "$LINENO" "malloc.h" "ac_cv_header_malloc_h" "$ac_includes_default" 5293 if test "x$ac_cv_header_malloc_h" = x yes; then :5254 if test "x$ac_cv_header_malloc_h" = x""yes; then : 5294 5255 cat >>confdefs.h <<_ACEOF 5295 5256 #define HAVE_MALLOC_H 1 … … 5306 5267 do : 5307 5268 ac_fn_cxx_check_header_mongrel "$LINENO" "memory.h" "ac_cv_header_memory_h" "$ac_includes_default" 5308 if test "x$ac_cv_header_memory_h" = x yes; then :5269 if test "x$ac_cv_header_memory_h" = x""yes; then : 5309 5270 cat >>confdefs.h <<_ACEOF 5310 5271 #define HAVE_MEMORY_H 1 … … 5321 5282 do : 5322 5283 ac_fn_cxx_check_header_mongrel "$LINENO" "unistd.h" "ac_cv_header_unistd_h" "$ac_includes_default" 5323 if test "x$ac_cv_header_unistd_h" = x yes; then :5284 if test "x$ac_cv_header_unistd_h" = x""yes; then : 5324 5285 cat >>confdefs.h <<_ACEOF 5325 5286 #define HAVE_UNISTD_H 1 … … 5337 5298 do : 5338 5299 ac_fn_cxx_check_header_mongrel "$LINENO" "inttypes.h" "ac_cv_header_inttypes_h" "$ac_includes_default" 5339 if test "x$ac_cv_header_inttypes_h" = x yes; then :5300 if test "x$ac_cv_header_inttypes_h" = x""yes; then : 5340 5301 cat >>confdefs.h <<_ACEOF 5341 5302 #define HAVE_INTTYPES_H 1 … … 5398 5359 { $as_echo "$as_me:${as_lineno-$LINENO}: checking system version" >&5 5399 5360 $as_echo_n "checking system version... " >&6; } 5400 if ${tcl_cv_sys_version+:} false; then :5361 if test "${tcl_cv_sys_version+set}" = set; then : 5401 5362 $as_echo_n "(cached) " >&6 5402 5363 else … … 5434 5395 { $as_echo "$as_me:${as_lineno-$LINENO}: checking for dlopen in -ldl" >&5 5435 5396 $as_echo_n "checking for dlopen in -ldl... " >&6; } 5436 if ${ac_cv_lib_dl_dlopen+:} false; then :5397 if test "${ac_cv_lib_dl_dlopen+set}" = set; then : 5437 5398 $as_echo_n "(cached) " >&6 5438 5399 else … … 5468 5429 { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_dl_dlopen" >&5 5469 5430 $as_echo "$ac_cv_lib_dl_dlopen" >&6; } 5470 if test "x$ac_cv_lib_dl_dlopen" = x yes; then :5431 if test "x$ac_cv_lib_dl_dlopen" = x""yes; then : 5471 5432 have_dl=yes 5472 5433 else … … 5502 5463 { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 5503 5464 $as_echo_n "checking for $ac_word... " >&6; } 5504 if ${ac_cv_prog_AR+:} false; then :5465 if test "${ac_cv_prog_AR+set}" = set; then : 5505 5466 $as_echo_n "(cached) " >&6 5506 5467 else … … 5536 5497 5537 5498 if test "${AR}" = "" ; then 5538 as_fn_error $?"Required archive tool 'ar' not found on PATH." "$LINENO" 55499 as_fn_error "Required archive tool 'ar' not found on PATH." "$LINENO" 5 5539 5500 fi 5540 5501 STLIB_LD='${AR} cr' … … 5627 5588 { $as_echo "$as_me:${as_lineno-$LINENO}: checking for gettimeofday in -lbsd" >&5 5628 5589 $as_echo_n "checking for gettimeofday in -lbsd... " >&6; } 5629 if ${ac_cv_lib_bsd_gettimeofday+:} false; then :5590 if test "${ac_cv_lib_bsd_gettimeofday+set}" = set; then : 5630 5591 $as_echo_n "(cached) " >&6 5631 5592 else … … 5661 5622 { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_bsd_gettimeofday" >&5 5662 5623 $as_echo "$ac_cv_lib_bsd_gettimeofday" >&6; } 5663 if test "x$ac_cv_lib_bsd_gettimeofday" = x yes; then :5624 if test "x$ac_cv_lib_bsd_gettimeofday" = x""yes; then : 5664 5625 libbsd=yes 5665 5626 else … … 5688 5649 { $as_echo "$as_me:${as_lineno-$LINENO}: checking for inet_ntoa in -lbind" >&5 5689 5650 $as_echo_n "checking for inet_ntoa in -lbind... " >&6; } 5690 if ${ac_cv_lib_bind_inet_ntoa+:} false; then :5651 if test "${ac_cv_lib_bind_inet_ntoa+set}" = set; then : 5691 5652 $as_echo_n "(cached) " >&6 5692 5653 else … … 5722 5683 { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_bind_inet_ntoa" >&5 5723 5684 $as_echo "$ac_cv_lib_bind_inet_ntoa" >&6; } 5724 if test "x$ac_cv_lib_bind_inet_ntoa" = x yes; then :5685 if test "x$ac_cv_lib_bind_inet_ntoa" = x""yes; then : 5725 5686 LIBS="$LIBS -lbind -lsocket" 5726 5687 fi … … 5773 5734 { $as_echo "$as_me:${as_lineno-$LINENO}: checking for shl_load in -ldld" >&5 5774 5735 $as_echo_n "checking for shl_load in -ldld... " >&6; } 5775 if ${ac_cv_lib_dld_shl_load+:} false; then :5736 if test "${ac_cv_lib_dld_shl_load+set}" = set; then : 5776 5737 $as_echo_n "(cached) " >&6 5777 5738 else … … 5807 5768 { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_dld_shl_load" >&5 5808 5769 $as_echo "$ac_cv_lib_dld_shl_load" >&6; } 5809 if test "x$ac_cv_lib_dld_shl_load" = x yes; then :5770 if test "x$ac_cv_lib_dld_shl_load" = x""yes; then : 5810 5771 tcl_ok=yes 5811 5772 else … … 5862 5823 { $as_echo "$as_me:${as_lineno-$LINENO}: checking for shl_load in -ldld" >&5 5863 5824 $as_echo_n "checking for shl_load in -ldld... " >&6; } 5864 if ${ac_cv_lib_dld_shl_load+:} false; then :5825 if test "${ac_cv_lib_dld_shl_load+set}" = set; then : 5865 5826 $as_echo_n "(cached) " >&6 5866 5827 else … … 5896 5857 { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_dld_shl_load" >&5 5897 5858 $as_echo "$ac_cv_lib_dld_shl_load" >&6; } 5898 if test "x$ac_cv_lib_dld_shl_load" = x yes; then :5859 if test "x$ac_cv_lib_dld_shl_load" = x""yes; then : 5899 5860 tcl_ok=yes 5900 5861 else … … 6005 5966 else 6006 5967 ac_fn_cxx_check_header_mongrel "$LINENO" "dld.h" "ac_cv_header_dld_h" "$ac_includes_default" 6007 if test "x$ac_cv_header_dld_h" = x yes; then :5968 if test "x$ac_cv_header_dld_h" = x""yes; then : 6008 5969 6009 5970 SHLIB_LD="ld -shared" … … 6022 5983 { $as_echo "$as_me:${as_lineno-$LINENO}: checking if compiler accepts -m64 flag" >&5 6023 5984 $as_echo_n "checking if compiler accepts -m64 flag... " >&6; } 6024 if ${tcl_cv_cc_m64+:} false; then :5985 if test "${tcl_cv_cc_m64+set}" = set; then : 6025 5986 $as_echo_n "(cached) " >&6 6026 5987 else … … 6086 6047 else 6087 6048 ac_fn_cxx_check_header_mongrel "$LINENO" "dld.h" "ac_cv_header_dld_h" "$ac_includes_default" 6088 if test "x$ac_cv_header_dld_h" = x yes; then :6049 if test "x$ac_cv_header_dld_h" = x""yes; then : 6089 6050 6090 6051 SHLIB_LD="ld -shared" … … 6137 6098 # Not available on all versions: check for include file. 6138 6099 ac_fn_cxx_check_header_mongrel "$LINENO" "dlfcn.h" "ac_cv_header_dlfcn_h" "$ac_includes_default" 6139 if test "x$ac_cv_header_dlfcn_h" = x yes; then :6100 if test "x$ac_cv_header_dlfcn_h" = x""yes; then : 6140 6101 6141 6102 # NetBSD/SPARC needs -fPIC, -fpic will not do. … … 6150 6111 { $as_echo "$as_me:${as_lineno-$LINENO}: checking for ELF" >&5 6151 6112 $as_echo_n "checking for ELF... " >&6; } 6152 if ${tcl_cv_ld_elf+:} false; then :6113 if test "${tcl_cv_ld_elf+set}" = set; then : 6153 6114 $as_echo_n "(cached) " >&6 6154 6115 else … … 6232 6193 { $as_echo "$as_me:${as_lineno-$LINENO}: checking for ELF" >&5 6233 6194 $as_echo_n "checking for ELF... " >&6; } 6234 if ${tcl_cv_ld_elf+:} false; then :6195 if test "${tcl_cv_ld_elf+set}" = set; then : 6235 6196 $as_echo_n "(cached) " >&6 6236 6197 else … … 6310 6271 { $as_echo "$as_me:${as_lineno-$LINENO}: checking if compiler accepts -arch ppc64 flag" >&5 6311 6272 $as_echo_n "checking if compiler accepts -arch ppc64 flag... " >&6; } 6312 if ${tcl_cv_cc_arch_ppc64+:} false; then :6273 if test "${tcl_cv_cc_arch_ppc64+set}" = set; then : 6313 6274 $as_echo_n "(cached) " >&6 6314 6275 else … … 6345 6306 { $as_echo "$as_me:${as_lineno-$LINENO}: checking if compiler accepts -arch x86_64 flag" >&5 6346 6307 $as_echo_n "checking if compiler accepts -arch x86_64 flag... " >&6; } 6347 if ${tcl_cv_cc_arch_x86_64+:} false; then :6308 if test "${tcl_cv_cc_arch_x86_64+set}" = set; then : 6348 6309 $as_echo_n "(cached) " >&6 6349 6310 else … … 6390 6351 { $as_echo "$as_me:${as_lineno-$LINENO}: checking if ld accepts -single_module flag" >&5 6391 6352 $as_echo_n "checking if ld accepts -single_module flag... " >&6; } 6392 if ${tcl_cv_ld_single_module+:} false; then :6353 if test "${tcl_cv_ld_single_module+set}" = set; then : 6393 6354 $as_echo_n "(cached) " >&6 6394 6355 else … … 6432 6393 { $as_echo "$as_me:${as_lineno-$LINENO}: checking if ld accepts -search_paths_first flag" >&5 6433 6394 $as_echo_n "checking if ld accepts -search_paths_first flag... " >&6; } 6434 if ${tcl_cv_ld_search_paths_first+:} false; then :6395 if test "${tcl_cv_ld_search_paths_first+set}" = set; then : 6435 6396 $as_echo_n "(cached) " >&6 6436 6397 else … … 6482 6443 { $as_echo "$as_me:${as_lineno-$LINENO}: checking for CoreFoundation.framework" >&5 6483 6444 $as_echo_n "checking for CoreFoundation.framework... " >&6; } 6484 if ${tcl_cv_lib_corefoundation+:} false; then :6445 if test "${tcl_cv_lib_corefoundation+set}" = set; then : 6485 6446 $as_echo_n "(cached) " >&6 6486 6447 else … … 6528 6489 { $as_echo "$as_me:${as_lineno-$LINENO}: checking for 64-bit CoreFoundation" >&5 6529 6490 $as_echo_n "checking for 64-bit CoreFoundation... " >&6; } 6530 if ${tcl_cv_lib_corefoundation_64+:} false; then :6491 if test "${tcl_cv_lib_corefoundation_64+set}" = set; then : 6531 6492 $as_echo_n "(cached) " >&6 6532 6493 else … … 6853 6814 { $as_echo "$as_me:${as_lineno-$LINENO}: checking for ld accepts -Bexport flag" >&5 6854 6815 $as_echo_n "checking for ld accepts -Bexport flag... " >&6; } 6855 if ${tcl_cv_ld_Bexport+:} false; then :6816 if test "${tcl_cv_ld_Bexport+set}" = set; then : 6856 6817 $as_echo_n "(cached) " >&6 6857 6818 else … … 6919 6880 { $as_echo "$as_me:${as_lineno-$LINENO}: checking sys/exec.h" >&5 6920 6881 $as_echo_n "checking sys/exec.h... " >&6; } 6921 if ${tcl_cv_sysexec_h+:} false; then :6882 if test "${tcl_cv_sysexec_h+set}" = set; then : 6922 6883 $as_echo_n "(cached) " >&6 6923 6884 else … … 6960 6921 { $as_echo "$as_me:${as_lineno-$LINENO}: checking a.out.h" >&5 6961 6922 $as_echo_n "checking a.out.h... " >&6; } 6962 if ${tcl_cv_aout_h+:} false; then :6923 if test "${tcl_cv_aout_h+set}" = set; then : 6963 6924 $as_echo_n "(cached) " >&6 6964 6925 else … … 7001 6962 { $as_echo "$as_me:${as_lineno-$LINENO}: checking sys/exec_aout.h" >&5 7002 6963 $as_echo_n "checking sys/exec_aout.h... " >&6; } 7003 if ${tcl_cv_sysexecaout_h+:} false; then :6964 if test "${tcl_cv_sysexecaout_h+set}" = set; then : 7004 6965 $as_echo_n "(cached) " >&6 7005 6966 else … … 7180 7141 done 7181 7142 if test "x${make_command}" = "x" ; then 7182 as_fn_error $?"Requires GNU make. You can specify a version with \$MAKE" "$LINENO" 57143 as_fn_error "Requires GNU make. You can specify a version with \$MAKE" "$LINENO" 5 7183 7144 fi 7184 7145 MAKE=${make_command} … … 7229 7190 { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 7230 7191 $as_echo_n "checking for $ac_word... " >&6; } 7231 if ${ac_cv_path_TCLSH+:} false; then :7192 if test "${ac_cv_path_TCLSH+set}" = set; then : 7232 7193 $as_echo_n "(cached) " >&6 7233 7194 else … … 7271 7232 { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 7272 7233 $as_echo_n "checking for $ac_word... " >&6; } 7273 if ${ac_cv_path_TCLSH+:} false; then :7234 if test "${ac_cv_path_TCLSH+set}" = set; then : 7274 7235 $as_echo_n "(cached) " >&6 7275 7236 else … … 7310 7271 fi 7311 7272 if test "x${TCLSH}" = "x" ; then 7312 as_fn_error $?"can't find tclsh" "$LINENO" 57273 as_fn_error "can't find tclsh" "$LINENO" 5 7313 7274 fi 7314 7275 fi … … 7379 7340 { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 7380 7341 $as_echo_n "checking for $ac_word... " >&6; } 7381 if ${ac_cv_path_MATLAB+:} false; then :7342 if test "${ac_cv_path_MATLAB+set}" = set; then : 7382 7343 $as_echo_n "(cached) " >&6 7383 7344 else … … 7420 7381 { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 7421 7382 $as_echo_n "checking for $ac_word... " >&6; } 7422 if ${ac_cv_path_MATLAB+:} false; then :7383 if test "${ac_cv_path_MATLAB+set}" = set; then : 7423 7384 $as_echo_n "(cached) " >&6 7424 7385 else … … 7471 7432 { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 7472 7433 $as_echo_n "checking for $ac_word... " >&6; } 7473 if ${ac_cv_path_MEX+:} false; then :7434 if test "${ac_cv_path_MEX+set}" = set; then : 7474 7435 $as_echo_n "(cached) " >&6 7475 7436 else … … 7511 7472 { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 7512 7473 $as_echo_n "checking for $ac_word... " >&6; } 7513 if ${ac_cv_path_MEXEXT+:} false; then :7474 if test "${ac_cv_path_MEXEXT+set}" = set; then : 7514 7475 $as_echo_n "(cached) " >&6 7515 7476 else … … 7562 7523 { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 7563 7524 $as_echo_n "checking for $ac_word... " >&6; } 7564 if ${ac_cv_path_MCC+:} false; then :7525 if test "${ac_cv_path_MCC+set}" = set; then : 7565 7526 $as_echo_n "(cached) " >&6 7566 7527 else … … 7632 7593 { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 7633 7594 $as_echo_n "checking for $ac_word... " >&6; } 7634 if ${ac_cv_path_OCTAVE+:} false; then :7595 if test "${ac_cv_path_OCTAVE+set}" = set; then : 7635 7596 $as_echo_n "(cached) " >&6 7636 7597 else … … 7672 7633 { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 7673 7634 $as_echo_n "checking for $ac_word... " >&6; } 7674 if ${ac_cv_path_MKOCTFILE+:} false; then :7635 if test "${ac_cv_path_MKOCTFILE+set}" = set; then : 7675 7636 $as_echo_n "(cached) " >&6 7676 7637 else … … 7742 7703 { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 7743 7704 $as_echo_n "checking for $ac_word... " >&6; } 7744 if ${ac_cv_path_octave2+:} false; then :7705 if test "${ac_cv_path_octave2+set}" = set; then : 7745 7706 $as_echo_n "(cached) " >&6 7746 7707 else … … 7782 7743 { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 7783 7744 $as_echo_n "checking for $ac_word... " >&6; } 7784 if ${ac_cv_path_mkoctfile2+:} false; then :7745 if test "${ac_cv_path_mkoctfile2+set}" = set; then : 7785 7746 $as_echo_n "(cached) " >&6 7786 7747 else … … 7849 7810 { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 7850 7811 $as_echo_n "checking for $ac_word... " >&6; } 7851 if ${ac_cv_path_octave3+:} false; then :7812 if test "${ac_cv_path_octave3+set}" = set; then : 7852 7813 $as_echo_n "(cached) " >&6 7853 7814 else … … 7889 7850 { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 7890 7851 $as_echo_n "checking for $ac_word... " >&6; } 7891 if ${ac_cv_path_mkoctfile3+:} false; then :7852 if test "${ac_cv_path_mkoctfile3+set}" = set; then : 7892 7853 $as_echo_n "(cached) " >&6 7893 7854 else … … 7975 7936 { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 7976 7937 $as_echo_n "checking for $ac_word... " >&6; } 7977 if ${ac_cv_path_PERL+:} false; then :7938 if test "${ac_cv_path_PERL+set}" = set; then : 7978 7939 $as_echo_n "(cached) " >&6 7979 7940 else … … 8017 7978 { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 8018 7979 $as_echo_n "checking for $ac_word... " >&6; } 8019 if ${ac_cv_path_PERL+:} false; then :7980 if test "${ac_cv_path_PERL+set}" = set; then : 8020 7981 $as_echo_n "(cached) " >&6 8021 7982 else … … 8111 8072 { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 8112 8073 $as_echo_n "checking for $ac_word... " >&6; } 8113 if ${ac_cv_path_PYTHON+:} false; then :8074 if test "${ac_cv_path_PYTHON+set}" = set; then : 8114 8075 $as_echo_n "(cached) " >&6 8115 8076 else … … 8152 8113 { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 8153 8114 $as_echo_n "checking for $ac_word... " >&6; } 8154 if ${ac_cv_path_PYTHON+:} false; then :8115 if test "${ac_cv_path_PYTHON+set}" = set; then : 8155 8116 $as_echo_n "(cached) " >&6 8156 8117 else … … 8236 8197 do : 8237 8198 ac_fn_cxx_check_header_mongrel "$LINENO" "Python.h" "ac_cv_header_Python_h" "$ac_includes_default" 8238 if test "x$ac_cv_header_Python_h" = x yes; then :8199 if test "x$ac_cv_header_Python_h" = x""yes; then : 8239 8200 cat >>confdefs.h <<_ACEOF 8240 8201 #define HAVE_PYTHON_H 1 … … 8284 8245 { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 8285 8246 $as_echo_n "checking for $ac_word... " >&6; } 8286 if ${ac_cv_path_RUBY+:} false; then :8247 if test "${ac_cv_path_RUBY+set}" = set; then : 8287 8248 $as_echo_n "(cached) " >&6 8288 8249 else … … 8325 8286 { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 8326 8287 $as_echo_n "checking for $ac_word... " >&6; } 8327 if ${ac_cv_path_RUBY+:} false; then :8288 if test "${ac_cv_path_RUBY+set}" = set; then : 8328 8289 $as_echo_n "(cached) " >&6 8329 8290 else … … 8371 8332 { $as_echo "$as_me:${as_lineno-$LINENO}: checking for a sed that does not truncate output" >&5 8372 8333 $as_echo_n "checking for a sed that does not truncate output... " >&6; } 8373 if ${ac_cv_path_SED+:} false; then :8334 if test "${ac_cv_path_SED+set}" = set; then : 8374 8335 $as_echo_n "(cached) " >&6 8375 8336 else … … 8426 8387 IFS=$as_save_IFS 8427 8388 if test -z "$ac_cv_path_SED"; then 8428 as_fn_error $?"no acceptable sed could be found in \$PATH" "$LINENO" 58389 as_fn_error "no acceptable sed could be found in \$PATH" "$LINENO" 5 8429 8390 fi 8430 8391 else … … 8464 8425 { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 8465 8426 $as_echo_n "checking for $ac_word... " >&6; } 8466 if ${ac_cv_prog_AWK+:} false; then :8427 if test "${ac_cv_prog_AWK+set}" = set; then : 8467 8428 $as_echo_n "(cached) " >&6 8468 8429 else … … 8703 8664 { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 8704 8665 $as_echo_n "checking for $ac_word... " >&6; } 8705 if ${ac_cv_path_JAVA+:} false; then :8666 if test "${ac_cv_path_JAVA+set}" = set; then : 8706 8667 $as_echo_n "(cached) " >&6 8707 8668 else … … 8743 8704 { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 8744 8705 $as_echo_n "checking for $ac_word... " >&6; } 8745 if ${ac_cv_path_JAVAC+:} false; then :8706 if test "${ac_cv_path_JAVAC+set}" = set; then : 8746 8707 $as_echo_n "(cached) " >&6 8747 8708 else … … 8783 8744 { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 8784 8745 $as_echo_n "checking for $ac_word... " >&6; } 8785 if ${ac_cv_path_JAVAH+:} false; then :8746 if test "${ac_cv_path_JAVAH+set}" = set; then : 8786 8747 $as_echo_n "(cached) " >&6 8787 8748 else … … 8824 8785 { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 8825 8786 $as_echo_n "checking for $ac_word... " >&6; } 8826 if ${ac_cv_path_JAVA+:} false; then :8787 if test "${ac_cv_path_JAVA+set}" = set; then : 8827 8788 $as_echo_n "(cached) " >&6 8828 8789 else … … 8865 8826 { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 8866 8827 $as_echo_n "checking for $ac_word... " >&6; } 8867 if ${ac_cv_path_JAVAC+:} false; then :8828 if test "${ac_cv_path_JAVAC+set}" = set; then : 8868 8829 $as_echo_n "(cached) " >&6 8869 8830 else … … 8906 8867 { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 8907 8868 $as_echo_n "checking for $ac_word... " >&6; } 8908 if ${ac_cv_path_JAVAH+:} false; then :8869 if test "${ac_cv_path_JAVAH+set}" = set; then : 8909 8870 $as_echo_n "(cached) " >&6 8910 8871 else … … 9043 9004 { $as_echo "$as_me:${as_lineno-$LINENO}: checking whether byte ordering is bigendian" >&5 9044 9005 $as_echo_n "checking whether byte ordering is bigendian... " >&6; } 9045 if ${ac_cv_c_bigendian+:} false; then :9006 if test "${ac_cv_c_bigendian+set}" = set; then : 9046 9007 $as_echo_n "(cached) " >&6 9047 9008 else … … 9261 9222 ;; #( 9262 9223 *) 9263 as_fn_error $?"unknown endianness9224 as_fn_error "unknown endianness 9264 9225 presetting ac_cv_c_bigendian=no (or yes) will help" "$LINENO" 5 ;; 9265 9226 esac … … 9271 9232 { $as_echo "$as_me:${as_lineno-$LINENO}: checking size of int" >&5 9272 9233 $as_echo_n "checking size of int... " >&6; } 9273 if ${ac_cv_sizeof_int+:} false; then :9234 if test "${ac_cv_sizeof_int+set}" = set; then : 9274 9235 $as_echo_n "(cached) " >&6 9275 9236 else … … 9280 9241 { { $as_echo "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5 9281 9242 $as_echo "$as_me: error: in \`$ac_pwd':" >&2;} 9282 as_fn_error 77 "cannot compute sizeof (int) 9283 See \`config.log' for more details" "$LINENO" 5; } 9243 { as_fn_set_status 77 9244 as_fn_error "cannot compute sizeof (int) 9245 See \`config.log' for more details." "$LINENO" 5; }; } 9284 9246 else 9285 9247 ac_cv_sizeof_int=0 … … 9304 9266 { $as_echo "$as_me:${as_lineno-$LINENO}: checking size of long" >&5 9305 9267 $as_echo_n "checking size of long... " >&6; } 9306 if ${ac_cv_sizeof_long+:} false; then :9268 if test "${ac_cv_sizeof_long+set}" = set; then : 9307 9269 $as_echo_n "(cached) " >&6 9308 9270 else … … 9313 9275 { { $as_echo "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5 9314 9276 $as_echo "$as_me: error: in \`$ac_pwd':" >&2;} 9315 as_fn_error 77 "cannot compute sizeof (long) 9316 See \`config.log' for more details" "$LINENO" 5; } 9277 { as_fn_set_status 77 9278 as_fn_error "cannot compute sizeof (long) 9279 See \`config.log' for more details." "$LINENO" 5; }; } 9317 9280 else 9318 9281 ac_cv_sizeof_long=0 … … 9337 9300 { $as_echo "$as_me:${as_lineno-$LINENO}: checking size of long long" >&5 9338 9301 $as_echo_n "checking size of long long... " >&6; } 9339 if ${ac_cv_sizeof_long_long+:} false; then :9302 if test "${ac_cv_sizeof_long_long+set}" = set; then : 9340 9303 $as_echo_n "(cached) " >&6 9341 9304 else … … 9346 9309 { { $as_echo "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5 9347 9310 $as_echo "$as_me: error: in \`$ac_pwd':" >&2;} 9348 as_fn_error 77 "cannot compute sizeof (long long) 9349 See \`config.log' for more details" "$LINENO" 5; } 9311 { as_fn_set_status 77 9312 as_fn_error "cannot compute sizeof (long long) 9313 See \`config.log' for more details." "$LINENO" 5; }; } 9350 9314 else 9351 9315 ac_cv_sizeof_long_long=0 … … 9370 9334 { $as_echo "$as_me:${as_lineno-$LINENO}: checking size of void *" >&5 9371 9335 $as_echo_n "checking size of void *... " >&6; } 9372 if ${ac_cv_sizeof_void_p+:} false; then :9336 if test "${ac_cv_sizeof_void_p+set}" = set; then : 9373 9337 $as_echo_n "(cached) " >&6 9374 9338 else … … 9379 9343 { { $as_echo "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5 9380 9344 $as_echo "$as_me: error: in \`$ac_pwd':" >&2;} 9381 as_fn_error 77 "cannot compute sizeof (void *) 9382 See \`config.log' for more details" "$LINENO" 5; } 9345 { as_fn_set_status 77 9346 as_fn_error "cannot compute sizeof (void *) 9347 See \`config.log' for more details." "$LINENO" 5; }; } 9383 9348 else 9384 9349 ac_cv_sizeof_void_p=0 … … 9478 9443 9479 9444 " 9480 if test "x$ac_cv_header_ffmpeg_avcodec_h" = x yes; then :9445 if test "x$ac_cv_header_ffmpeg_avcodec_h" = x""yes; then : 9481 9446 cat >>confdefs.h <<_ACEOF 9482 9447 #define HAVE_FFMPEG_AVCODEC_H 1 … … 9496 9461 9497 9462 " 9498 if test "x$ac_cv_header_libavcodec_avcodec_h" = x yes; then :9463 if test "x$ac_cv_header_libavcodec_avcodec_h" = x""yes; then : 9499 9464 cat >>confdefs.h <<_ACEOF 9500 9465 #define HAVE_LIBAVCODEC_AVCODEC_H 1 … … 9514 9479 9515 9480 " 9516 if test "x$ac_cv_header_ffmpeg_avformat_h" = x yes; then :9481 if test "x$ac_cv_header_ffmpeg_avformat_h" = x""yes; then : 9517 9482 cat >>confdefs.h <<_ACEOF 9518 9483 #define HAVE_FFMPEG_AVFORMAT_H 1 … … 9532 9497 9533 9498 " 9534 if test "x$ac_cv_header_libavformat_avformat_h" = x yes; then :9499 if test "x$ac_cv_header_libavformat_avformat_h" = x""yes; then : 9535 9500 cat >>confdefs.h <<_ACEOF 9536 9501 #define HAVE_LIBAVFORMAT_AVFORMAT_H 1 … … 9550 9515 9551 9516 " 9552 if test "x$ac_cv_header_ffmpeg_avutil_h" = x yes; then :9517 if test "x$ac_cv_header_ffmpeg_avutil_h" = x""yes; then : 9553 9518 cat >>confdefs.h <<_ACEOF 9554 9519 #define HAVE_FFMPEG_AVUTIL_H 1 … … 9568 9533 9569 9534 " 9570 if test "x$ac_cv_header_libavutil_avutil_h" = x yes; then :9535 if test "x$ac_cv_header_libavutil_avutil_h" = x""yes; then : 9571 9536 cat >>confdefs.h <<_ACEOF 9572 9537 #define HAVE_LIBAVUTIL_AVUTIL_H 1 … … 9586 9551 9587 9552 " 9588 if test "x$ac_cv_header_ffmpeg_swscale_h" = x yes; then :9553 if test "x$ac_cv_header_ffmpeg_swscale_h" = x""yes; then : 9589 9554 cat >>confdefs.h <<_ACEOF 9590 9555 #define HAVE_FFMPEG_SWSCALE_H 1 … … 9604 9569 9605 9570 " 9606 if test "x$ac_cv_header_libswscale_swscale_h" = x yes; then :9571 if test "x$ac_cv_header_libswscale_swscale_h" = x""yes; then : 9607 9572 cat >>confdefs.h <<_ACEOF 9608 9573 #define HAVE_LIBSWSCALE_SWSCALE_H 1 … … 9634 9599 do : 9635 9600 ac_fn_cxx_check_func "$LINENO" "img_convert" "ac_cv_func_img_convert" 9636 if test "x$ac_cv_func_img_convert" = x yes; then :9601 if test "x$ac_cv_func_img_convert" = x""yes; then : 9637 9602 cat >>confdefs.h <<_ACEOF 9638 9603 #define HAVE_IMG_CONVERT 1 … … 9645 9610 do : 9646 9611 ac_fn_cxx_check_func "$LINENO" "sws_scale" "ac_cv_func_sws_scale" 9647 if test "x$ac_cv_func_sws_scale" = x yes; then :9612 if test "x$ac_cv_func_sws_scale" = x""yes; then : 9648 9613 cat >>confdefs.h <<_ACEOF 9649 9614 #define HAVE_SWS_SCALE 1 … … 9661 9626 9662 9627 9663 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/irappturelang/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"9628 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 builder/Makefile builder/pkgIndex.tcl tester/Makefile tester/pkgIndex.tcl 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" 9664 9629 9665 9630 cat >confcache <<\_ACEOF … … 9727 9692 if diff "$cache_file" confcache >/dev/null 2>&1; then :; else 9728 9693 if test -w "$cache_file"; then 9729 if test "x$cache_file" != "x/dev/null"; then9694 test "x$cache_file" != "x/dev/null" && 9730 9695 { $as_echo "$as_me:${as_lineno-$LINENO}: updating cache $cache_file" >&5 9731 9696 $as_echo "$as_me: updating cache $cache_file" >&6;} 9732 if test ! -f "$cache_file" || test -h "$cache_file"; then 9733 cat confcache >"$cache_file" 9734 else 9735 case $cache_file in #( 9736 */* | ?:*) 9737 mv -f confcache "$cache_file"$$ && 9738 mv -f "$cache_file"$$ "$cache_file" ;; #( 9739 *) 9740 mv -f confcache "$cache_file" ;; 9741 esac 9742 fi 9743 fi 9697 cat confcache >$cache_file 9744 9698 else 9745 9699 { $as_echo "$as_me:${as_lineno-$LINENO}: not updating unwritable cache $cache_file" >&5 … … 9757 9711 ac_libobjs= 9758 9712 ac_ltlibobjs= 9759 U=9760 9713 for ac_i in : $LIBOBJS; do test "x$ac_i" = x: && continue 9761 9714 # 1. Remove the extension, and $U if already installed. … … 9774 9727 9775 9728 9776 : "${CONFIG_STATUS=./config.status}"9729 : ${CONFIG_STATUS=./config.status} 9777 9730 ac_write_fail=0 9778 9731 ac_clean_files_save=$ac_clean_files … … 9875 9828 9876 9829 # Find who we are. Look in the path if we contain no directory separator. 9877 as_myself=9878 9830 case $0 in #(( 9879 9831 *[\\/]* ) as_myself=$0 ;; … … 9921 9873 9922 9874 9923 # as_fn_error STATUSERROR [LINENO LOG_FD]9924 # --------------------------------- -------9875 # as_fn_error ERROR [LINENO LOG_FD] 9876 # --------------------------------- 9925 9877 # Output "`basename $0`: error: ERROR" to stderr. If LINENO and LOG_FD are 9926 9878 # provided, also output the error to LOG_FD, referencing LINENO. Then exit the 9927 # script with STATUS, using 1 if that was 0.9879 # script with status $?, using 1 if that was 0. 9928 9880 as_fn_error () 9929 9881 { 9930 as_status=$ 1; test $as_status -eq 0 && as_status=19931 if test "$ 4"; then9932 as_lineno=${as_lineno-"$ 3"} as_lineno_stack=as_lineno_stack=$as_lineno_stack9933 $as_echo "$as_me:${as_lineno-$LINENO}: error: $ 2" >&$49934 fi 9935 $as_echo "$as_me: error: $ 2" >&29882 as_status=$?; test $as_status -eq 0 && as_status=1 9883 if test "$3"; then 9884 as_lineno=${as_lineno-"$2"} as_lineno_stack=as_lineno_stack=$as_lineno_stack 9885 $as_echo "$as_me:${as_lineno-$LINENO}: error: $1" >&$3 9886 fi 9887 $as_echo "$as_me: error: $1" >&2 9936 9888 as_fn_exit $as_status 9937 9889 } # as_fn_error … … 10129 10081 done 10130 10082 test -z "$as_dirs" || eval "mkdir $as_dirs" 10131 } || test -d "$as_dir" || as_fn_error $?"cannot create directory $as_dir"10083 } || test -d "$as_dir" || as_fn_error "cannot create directory $as_dir" 10132 10084 10133 10085 … … 10183 10135 ac_log=" 10184 10136 This file was extended by Rappture $as_me 1.1, which was 10185 generated by GNU Autoconf 2.6 8. Invocation command line was10137 generated by GNU Autoconf 2.64. Invocation command line was 10186 10138 10187 10139 CONFIG_FILES = $CONFIG_FILES … … 10222 10174 -h, --help print this help, then exit 10223 10175 -V, --version print version number and configuration settings, then exit 10224 --config print configuration, then exit10225 10176 -q, --quiet, --silent 10226 10177 do not print progress messages … … 10242 10193 _ACEOF 10243 10194 cat >>$CONFIG_STATUS <<_ACEOF || ac_write_fail=1 10244 ac_cs_config="`$as_echo "$ac_configure_args" | sed 's/^ //; s/[\\""\`\$]/\\\\&/g'`"10245 10195 ac_cs_version="\\ 10246 10196 Rappture config.status 1.1 10247 configured by $0, generated by GNU Autoconf 2.6 8,10248 with options \\" \$ac_cs_config\\"10249 10250 Copyright (C) 20 10Free Software Foundation, Inc.10197 configured by $0, generated by GNU Autoconf 2.64, 10198 with options \\"`$as_echo "$ac_configure_args" | sed 's/^ //; s/[\\""\`\$]/\\\\&/g'`\\" 10199 10200 Copyright (C) 2009 Free Software Foundation, Inc. 10251 10201 This config.status script is free software; the Free Software Foundation 10252 10202 gives unlimited permission to copy, distribute and modify it." … … 10266 10216 do 10267 10217 case $1 in 10268 --*= ?*)10218 --*=*) 10269 10219 ac_option=`expr "X$1" : 'X\([^=]*\)='` 10270 10220 ac_optarg=`expr "X$1" : 'X[^=]*=\(.*\)'` 10271 ac_shift=:10272 ;;10273 --*=)10274 ac_option=`expr "X$1" : 'X\([^=]*\)='`10275 ac_optarg=10276 10221 ac_shift=: 10277 10222 ;; … … 10289 10234 --version | --versio | --versi | --vers | --ver | --ve | --v | -V ) 10290 10235 $as_echo "$ac_cs_version"; exit ;; 10291 --config | --confi | --conf | --con | --co | --c )10292 $as_echo "$ac_cs_config"; exit ;;10293 10236 --debug | --debu | --deb | --de | --d | -d ) 10294 10237 debug=: ;; … … 10297 10240 case $ac_optarg in 10298 10241 *\'*) ac_optarg=`$as_echo "$ac_optarg" | sed "s/'/'\\\\\\\\''/g"` ;; 10299 '') as_fn_error $? "missing file argument" ;;10300 10242 esac 10301 10243 as_fn_append CONFIG_FILES " '$ac_optarg'" … … 10310 10252 --he | --h) 10311 10253 # Conflict between --help and --header 10312 as_fn_error $?"ambiguous option: \`$1'10254 as_fn_error "ambiguous option: \`$1' 10313 10255 Try \`$0 --help' for more information.";; 10314 10256 --help | --hel | -h ) … … 10319 10261 10320 10262 # This is an error. 10321 -*) as_fn_error $?"unrecognized option: \`$1'10263 -*) as_fn_error "unrecognized option: \`$1' 10322 10264 Try \`$0 --help' for more information." ;; 10323 10265 … … 10389 10331 "gui/pkgIndex.tcl") CONFIG_FILES="$CONFIG_FILES gui/pkgIndex.tcl" ;; 10390 10332 "gui/scripts/Makefile") CONFIG_FILES="$CONFIG_FILES gui/scripts/Makefile" ;; 10391 "instant/Makefile") CONFIG_FILES="$CONFIG_FILES instant/Makefile" ;; 10392 "instant/irappture") CONFIG_FILES="$CONFIG_FILES instant/irappture" ;; 10333 "builder/Makefile") CONFIG_FILES="$CONFIG_FILES builder/Makefile" ;; 10334 "builder/pkgIndex.tcl") CONFIG_FILES="$CONFIG_FILES builder/pkgIndex.tcl" ;; 10335 "tester/Makefile") CONFIG_FILES="$CONFIG_FILES tester/Makefile" ;; 10336 "tester/pkgIndex.tcl") CONFIG_FILES="$CONFIG_FILES tester/pkgIndex.tcl" ;; 10393 10337 "lang/Makefile") CONFIG_FILES="$CONFIG_FILES lang/Makefile" ;; 10394 10338 "lang/java/Makefile") CONFIG_FILES="$CONFIG_FILES lang/java/Makefile" ;; … … 10491 10435 "oldtest/src/Makefile") CONFIG_FILES="$CONFIG_FILES oldtest/src/Makefile" ;; 10492 10436 10493 *) as_fn_error $?"invalid argument: \`$ac_config_target'" "$LINENO" 5;;10437 *) as_fn_error "invalid argument: \`$ac_config_target'" "$LINENO" 5;; 10494 10438 esac 10495 10439 done … … 10513 10457 $debug || 10514 10458 { 10515 tmp= ac_tmp=10459 tmp= 10516 10460 trap 'exit_status=$? 10517 : "${ac_tmp:=$tmp}" 10518 { test ! -d "$ac_tmp" || rm -fr "$ac_tmp"; } && exit $exit_status 10461 { test -z "$tmp" || test ! -d "$tmp" || rm -fr "$tmp"; } && exit $exit_status 10519 10462 ' 0 10520 10463 trap 'as_fn_exit 1' 1 2 13 15 … … 10524 10467 { 10525 10468 tmp=`(umask 077 && mktemp -d "./confXXXXXX") 2>/dev/null` && 10526 test - d "$tmp"10469 test -n "$tmp" && test -d "$tmp" 10527 10470 } || 10528 10471 { 10529 10472 tmp=./conf$$-$RANDOM 10530 10473 (umask 077 && mkdir "$tmp") 10531 } || as_fn_error $? "cannot create a temporary directory in ." "$LINENO" 5 10532 ac_tmp=$tmp 10474 } || as_fn_error "cannot create a temporary directory in ." "$LINENO" 5 10533 10475 10534 10476 # Set up the scripts for CONFIG_FILES section. … … 10547 10489 ac_cs_awk_cr=`$AWK 'BEGIN { print "a\rb" }' </dev/null 2>/dev/null` 10548 10490 if test "$ac_cs_awk_cr" = "a${ac_cr}b"; then 10549 ac_cs_awk_cr='\ \r'10491 ac_cs_awk_cr='\r' 10550 10492 else 10551 10493 ac_cs_awk_cr=$ac_cr 10552 10494 fi 10553 10495 10554 echo 'BEGIN {' >"$ ac_tmp/subs1.awk" &&10496 echo 'BEGIN {' >"$tmp/subs1.awk" && 10555 10497 _ACEOF 10556 10498 … … 10561 10503 echo "_ACEOF" 10562 10504 } >conf$$subs.sh || 10563 as_fn_error $?"could not make $CONFIG_STATUS" "$LINENO" 510564 ac_delim_num=`echo "$ac_subst_vars" | grep -c ' ^'`10505 as_fn_error "could not make $CONFIG_STATUS" "$LINENO" 5 10506 ac_delim_num=`echo "$ac_subst_vars" | grep -c '$'` 10565 10507 ac_delim='%!_!# ' 10566 10508 for ac_last_try in false false false false false :; do 10567 10509 . ./conf$$subs.sh || 10568 as_fn_error $?"could not make $CONFIG_STATUS" "$LINENO" 510510 as_fn_error "could not make $CONFIG_STATUS" "$LINENO" 5 10569 10511 10570 10512 ac_delim_n=`sed -n "s/.*$ac_delim\$/X/p" conf$$subs.awk | grep -c X` … … 10572 10514 break 10573 10515 elif $ac_last_try; then 10574 as_fn_error $?"could not make $CONFIG_STATUS" "$LINENO" 510516 as_fn_error "could not make $CONFIG_STATUS" "$LINENO" 5 10575 10517 else 10576 10518 ac_delim="$ac_delim!$ac_delim _$ac_delim!! " … … 10580 10522 10581 10523 cat >>$CONFIG_STATUS <<_ACEOF || ac_write_fail=1 10582 cat >>"\$ ac_tmp/subs1.awk" <<\\_ACAWK &&10524 cat >>"\$tmp/subs1.awk" <<\\_ACAWK && 10583 10525 _ACEOF 10584 10526 sed -n ' … … 10594 10536 :nl 10595 10537 h 10596 s/\(.\{148\}\). .*/\1/10538 s/\(.\{148\}\).*/\1/ 10597 10539 t more1 10598 10540 s/["\\]/\\&/g; s/^/"/; s/$/\\n"\\/ … … 10608 10550 :delim 10609 10551 h 10610 s/\(.\{148\}\). .*/\1/10552 s/\(.\{148\}\).*/\1/ 10611 10553 t more2 10612 10554 s/["\\]/\\&/g; s/^/"/; s/$/"/ … … 10628 10570 cat >>$CONFIG_STATUS <<_ACEOF || ac_write_fail=1 10629 10571 _ACAWK 10630 cat >>"\$ ac_tmp/subs1.awk" <<_ACAWK &&10572 cat >>"\$tmp/subs1.awk" <<_ACAWK && 10631 10573 for (key in S) S_is_set[key] = 1 10632 10574 FS = "" … … 10660 10602 else 10661 10603 cat 10662 fi < "$ ac_tmp/subs1.awk" > "$ac_tmp/subs.awk" \10663 || as_fn_error $?"could not setup config files machinery" "$LINENO" 510664 _ACEOF 10665 10666 # VPATH may cause trouble with some makes, so we remove sole$(srcdir),10667 # ${srcdir} and @srcdir@ entriesfrom VPATH if srcdir is ".", strip leading and10604 fi < "$tmp/subs1.awk" > "$tmp/subs.awk" \ 10605 || as_fn_error "could not setup config files machinery" "$LINENO" 5 10606 _ACEOF 10607 10608 # VPATH may cause trouble with some makes, so we remove $(srcdir), 10609 # ${srcdir} and @srcdir@ from VPATH if srcdir is ".", strip leading and 10668 10610 # trailing colons and then remove the whole line if VPATH becomes empty 10669 10611 # (actually we leave an empty line to preserve line numbers). 10670 10612 if test "x$srcdir" = x.; then 10671 ac_vpsub='/^[ ]*VPATH[ ]*=[ ]*/{ 10672 h 10673 s/// 10674 s/^/:/ 10675 s/[ ]*$/:/ 10676 s/:\$(srcdir):/:/g 10677 s/:\${srcdir}:/:/g 10678 s/:@srcdir@:/:/g 10679 s/^:*// 10613 ac_vpsub='/^[ ]*VPATH[ ]*=/{ 10614 s/:*\$(srcdir):*/:/ 10615 s/:*\${srcdir}:*/:/ 10616 s/:*@srcdir@:*/:/ 10617 s/^\([^=]*=[ ]*\):*/\1/ 10680 10618 s/:*$// 10681 x10682 s/\(=[ ]*\).*/\1/10683 G10684 s/\n//10685 10619 s/^[^=]*=[ ]*$// 10686 10620 }' … … 10694 10628 # This happens for instance with `./config.status Makefile'. 10695 10629 if test -n "$CONFIG_HEADERS"; then 10696 cat >"$ ac_tmp/defines.awk" <<\_ACAWK ||10630 cat >"$tmp/defines.awk" <<\_ACAWK || 10697 10631 BEGIN { 10698 10632 _ACEOF … … 10706 10640 ac_delim='%!_!# ' 10707 10641 for ac_last_try in false false :; do 10708 ac_t t=`sed -n "/$ac_delim/p" confdefs.h`10709 if test -z "$ac_t t"; then10642 ac_t=`sed -n "/$ac_delim/p" confdefs.h` 10643 if test -z "$ac_t"; then 10710 10644 break 10711 10645 elif $ac_last_try; then 10712 as_fn_error $?"could not make $CONFIG_HEADERS" "$LINENO" 510646 as_fn_error "could not make $CONFIG_HEADERS" "$LINENO" 5 10713 10647 else 10714 10648 ac_delim="$ac_delim!$ac_delim _$ac_delim!! " … … 10795 10729 _ACEOF 10796 10730 cat >>$CONFIG_STATUS <<\_ACEOF || ac_write_fail=1 10797 as_fn_error $?"could not setup config headers machinery" "$LINENO" 510731 as_fn_error "could not setup config headers machinery" "$LINENO" 5 10798 10732 fi # test -n "$CONFIG_HEADERS" 10799 10733 … … 10808 10742 case $ac_mode$ac_tag in 10809 10743 :[FHL]*:*);; 10810 :L* | :C*:*) as_fn_error $?"invalid tag \`$ac_tag'" "$LINENO" 5;;10744 :L* | :C*:*) as_fn_error "invalid tag \`$ac_tag'" "$LINENO" 5;; 10811 10745 :[FH]-) ac_tag=-:-;; 10812 10746 :[FH]*) ac_tag=$ac_tag:$ac_tag.in;; … … 10827 10761 do 10828 10762 case $ac_f in 10829 -) ac_f="$ ac_tmp/stdin";;10763 -) ac_f="$tmp/stdin";; 10830 10764 *) # Look for the file first in the build tree, then in the source tree 10831 10765 # (if the path is not absolute). The absolute path cannot be DOS-style, … … 10836 10770 *) test -f "$srcdir/$ac_f" && ac_f="$srcdir/$ac_f";; 10837 10771 esac || 10838 as_fn_error 1"cannot find input file: \`$ac_f'" "$LINENO" 5;;10772 as_fn_error "cannot find input file: \`$ac_f'" "$LINENO" 5;; 10839 10773 esac 10840 10774 case $ac_f in *\'*) ac_f=`$as_echo "$ac_f" | sed "s/'/'\\\\\\\\''/g"`;; esac … … 10862 10796 10863 10797 case $ac_tag in 10864 *:-:* | *:-) cat >"$ ac_tmp/stdin" \10865 || as_fn_error $?"could not create $ac_file" "$LINENO" 5 ;;10798 *:-:* | *:-) cat >"$tmp/stdin" \ 10799 || as_fn_error "could not create $ac_file" "$LINENO" 5 ;; 10866 10800 esac 10867 10801 ;; … … 10999 10933 $ac_datarootdir_hack 11000 10934 " 11001 eval sed \"\$ac_sed_extra\" "$ac_file_inputs" | $AWK -f "$ ac_tmp/subs.awk"\11002 >$ac_tmp/out || as_fn_error $?"could not create $ac_file" "$LINENO" 510935 eval sed \"\$ac_sed_extra\" "$ac_file_inputs" | $AWK -f "$tmp/subs.awk" >$tmp/out \ 10936 || as_fn_error "could not create $ac_file" "$LINENO" 5 11003 10937 11004 10938 test -z "$ac_datarootdir_hack$ac_datarootdir_seen" && 11005 { ac_out=`sed -n '/\${datarootdir}/p' "$ac_tmp/out"`; test -n "$ac_out"; } && 11006 { ac_out=`sed -n '/^[ ]*datarootdir[ ]*:*=/p' \ 11007 "$ac_tmp/out"`; test -z "$ac_out"; } && 10939 { ac_out=`sed -n '/\${datarootdir}/p' "$tmp/out"`; test -n "$ac_out"; } && 10940 { ac_out=`sed -n '/^[ ]*datarootdir[ ]*:*=/p' "$tmp/out"`; test -z "$ac_out"; } && 11008 10941 { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: $ac_file contains a reference to the variable \`datarootdir' 11009 which seems to be undefined. Please make sure it is defined " >&510942 which seems to be undefined. Please make sure it is defined." >&5 11010 10943 $as_echo "$as_me: WARNING: $ac_file contains a reference to the variable \`datarootdir' 11011 which seems to be undefined. Please make sure it is defined " >&2;}11012 11013 rm -f "$ ac_tmp/stdin"10944 which seems to be undefined. Please make sure it is defined." >&2;} 10945 10946 rm -f "$tmp/stdin" 11014 10947 case $ac_file in 11015 -) cat "$ ac_tmp/out" && rm -f "$ac_tmp/out";;11016 *) rm -f "$ac_file" && mv "$ ac_tmp/out" "$ac_file";;10948 -) cat "$tmp/out" && rm -f "$tmp/out";; 10949 *) rm -f "$ac_file" && mv "$tmp/out" "$ac_file";; 11017 10950 esac \ 11018 || as_fn_error $?"could not create $ac_file" "$LINENO" 510951 || as_fn_error "could not create $ac_file" "$LINENO" 5 11019 10952 ;; 11020 10953 :H) … … 11025 10958 { 11026 10959 $as_echo "/* $configure_input */" \ 11027 && eval '$AWK -f "$ ac_tmp/defines.awk"' "$ac_file_inputs"11028 } >"$ ac_tmp/config.h" \11029 || as_fn_error $?"could not create $ac_file" "$LINENO" 511030 if diff "$ac_file" "$ ac_tmp/config.h" >/dev/null 2>&1; then10960 && eval '$AWK -f "$tmp/defines.awk"' "$ac_file_inputs" 10961 } >"$tmp/config.h" \ 10962 || as_fn_error "could not create $ac_file" "$LINENO" 5 10963 if diff "$ac_file" "$tmp/config.h" >/dev/null 2>&1; then 11031 10964 { $as_echo "$as_me:${as_lineno-$LINENO}: $ac_file is unchanged" >&5 11032 10965 $as_echo "$as_me: $ac_file is unchanged" >&6;} 11033 10966 else 11034 10967 rm -f "$ac_file" 11035 mv "$ ac_tmp/config.h" "$ac_file" \11036 || as_fn_error $?"could not create $ac_file" "$LINENO" 510968 mv "$tmp/config.h" "$ac_file" \ 10969 || as_fn_error "could not create $ac_file" "$LINENO" 5 11037 10970 fi 11038 10971 else 11039 10972 $as_echo "/* $configure_input */" \ 11040 && eval '$AWK -f "$ ac_tmp/defines.awk"' "$ac_file_inputs" \11041 || as_fn_error $?"could not create -" "$LINENO" 510973 && eval '$AWK -f "$tmp/defines.awk"' "$ac_file_inputs" \ 10974 || as_fn_error "could not create -" "$LINENO" 5 11042 10975 fi 11043 10976 ;; … … 11054 10987 11055 10988 test $ac_write_fail = 0 || 11056 as_fn_error $?"write failure creating $CONFIG_STATUS" "$LINENO" 510989 as_fn_error "write failure creating $CONFIG_STATUS" "$LINENO" 5 11057 10990 11058 10991 … … 11075 11008 # Use ||, not &&, to avoid exiting from the if with $? = 1, which 11076 11009 # would make configure fail if this is the last instruction. 11077 $ac_cs_success || as_fn_exit 111010 $ac_cs_success || as_fn_exit $? 11078 11011 fi 11079 11012 … … 11216 11149 eval "\$SHELL \"\$ac_sub_configure\" $ac_sub_configure_args \ 11217 11150 --cache-file=\"\$ac_sub_cache_file\" --srcdir=\"\$ac_srcdir\"" || 11218 as_fn_error $?"$ac_sub_configure failed for $ac_dir" "$LINENO" 511151 as_fn_error "$ac_sub_configure failed for $ac_dir" "$LINENO" 5 11219 11152 fi 11220 11153 -
trunk/configure.in
r2065 r2080 723 723 gui/pkgIndex.tcl 724 724 gui/scripts/Makefile 725 instant/Makefile 726 instant/irappture 725 builder/Makefile 726 builder/pkgIndex.tcl 727 tester/Makefile 728 tester/pkgIndex.tcl 727 729 lang/Makefile 728 730 lang/java/Makefile -
trunk/gui/apps/Makefile.in
r1944 r2080 22 22 SCRIPTS = \ 23 23 encodedata \ 24 $(srcdir)/ driver\24 $(srcdir)/launcher.tcl \ 25 25 $(srcdir)/grabdata \ 26 26 $(srcdir)/nanovis-test \ -
trunk/gui/apps/rappture.in
r1981 r2080 9 9 # ====================================================================== 10 10 # AUTHOR: Michael McLennan, Purdue University 11 # Copyright (c) 2004-20 07Purdue Research Foundation11 # Copyright (c) 2004-2011 Purdue Research Foundation 12 12 # 13 13 # See the file "license.terms" for information on usage and … … 16 16 dir=`dirname $0` 17 17 . $dir/rappture.env 18 exec $dir/ driver$*18 exec $dir/launcher.tcl $* -
trunk/gui/scripts/main.tcl
r2076 r2080 9 9 # 10 10 # RUN AS FOLLOWS: 11 # driver?-tool <toolfile>?11 # wish main.tcl ?-tool <toolfile>? 12 12 # 13 13 # If the <toolfile> is not specified, it defaults to "tool.xml" in … … 16 16 # ====================================================================== 17 17 # AUTHOR: Michael McLennan, Purdue University 18 # Copyright (c) 2004-20 05Purdue Research Foundation18 # Copyright (c) 2004-2011 Purdue Research Foundation 19 19 # 20 20 # See the file "license.terms" for information on usage and 21 21 # redistribution of this file, and for a DISCLAIMER OF ALL WARRANTIES. 22 22 # ====================================================================== 23 #\24 exec wish "$0" $*25 # ----------------------------------------------------------------------26 # wish executes everything from here on...27 28 23 package require Itcl 29 24 package require Rappture -
trunk/lang/tcl/scripts/Makefile.in
r2061 r2080 41 41 $(srcdir)/exec.tcl \ 42 42 $(srcdir)/library.tcl \ 43 $(srcdir)/objects.tcl \ 44 $(srcdir)/objects/base.rp \ 43 45 $(srcdir)/result.tcl \ 44 46 $(srcdir)/units.tcl 45 47 48 OBJECTS = \ 49 boolean \ 50 choice \ 51 curve \ 52 group \ 53 histogram \ 54 integer \ 55 note \ 56 number \ 57 phase \ 58 string 59 60 TYPEFILES = \ 61 $(srcdir)/types/boolean.tcl \ 62 $(srcdir)/types/color.tcl \ 63 $(srcdir)/types/file.tcl \ 64 $(srcdir)/types/string.tcl \ 65 $(srcdir)/types/units.tcl 66 67 VALIDATEFILES = \ 68 $(srcdir)/validations/enable.tcl \ 69 $(srcdir)/validations/int.tcl \ 70 $(srcdir)/validations/number.tcl \ 71 $(srcdir)/validations/size.tcl 72 46 73 all: tclIndex 47 74 48 tclIndex: $(FILES)75 tclIndex: install-objects install-types install-validations $(FILES) 49 76 $(TCLSH) $(srcdir)/../tclconfig/mkindex.tcl --srcdir $(srcdir) \ 50 77 --outfile tclIndex … … 57 84 $(INSTALL) -m 0444 tclIndex $(destdir) 58 85 86 install-objects: 87 $(MKDIR_P) -m 0755 $(destdir)/objects 88 for i in $(OBJECTS); do \ 89 echo "Installing object definition: $$i" ; \ 90 $(MKDIR_P) -m 0755 $(destdir)/objects/$$i ; \ 91 for j in $(srcdir)/objects/$$i/*; do \ 92 $(INSTALL) -m 0444 $$j $(destdir)/objects/$$i ; \ 93 done 94 done 95 96 install-types: $(TYPEFILES) 97 $(MKDIR_P) -m 0755 $(destdir)/types 98 @for i in $(TYPEFILES); do \ 99 echo "Installing $$i" ; \ 100 $(INSTALL) -m 555 $$i $(destdir)/types ; \ 101 done 102 103 install-validations: $(VALIDATEFILES) 104 $(MKDIR_P) -m 0755 $(destdir)/validations 105 @for i in $(VALIDATEFILES); do \ 106 echo "Installing $$i" ; \ 107 $(INSTALL) -m 555 $$i $(destdir)/validations ; \ 108 done 109 59 110 clean: 60 111 $(RM) tclIndex -
trunk/lang/tcl/scripts/library.tcl
r2079 r2080 16 16 namespace eval Rappture { 17 17 variable stdlib "" 18 } 19 20 # automatically load all Rappture object types 21 if {[catch {Rappture::objects::init} err]} { 22 puts stderr "Error loading object definitions:\n$err" 23 exit 1 18 24 } 19 25 -
trunk/lang/tcl/scripts/objects.tcl
r2076 r2080 17 17 # ====================================================================== 18 18 # AUTHOR: Michael McLennan, Purdue University 19 # Copyright (c) 2004-201 0Purdue Research Foundation19 # Copyright (c) 2004-2011 Purdue Research Foundation 20 20 # 21 21 # See the file "license.terms" for information on usage and … … 26 26 namespace eval Rappture { # forward declaration } 27 27 namespace eval Rappture::objects { 28 # location of system object info 29 variable installdir [file dirname [file normalize [info script]]] 30 28 31 # 29 32 # Set up a safe interpreter for loading object defn files... … … 61 64 # this variable will hold the name of the object file being parsed 62 65 variable currFile "" 66 } 67 68 # ---------------------------------------------------------------------- 69 # USAGE: Rappture::objects::init 70 # 71 # Called at the beginning of a Rappture program to initialize the 72 # object system. Loads all object definitions in the "objects" 73 # directory found at the system location. Object types can be 74 # queried by calling Rappture::objects::get. 75 # ---------------------------------------------------------------------- 76 proc Rappture::objects::init {} { 77 variable installdir 78 79 # load supporting type definitions 80 foreach fname [glob [file join $installdir types *.tcl]] { 81 source $fname 82 } 83 84 # load supporting validation procs 85 foreach fname [glob [file join $installdir validations *.tcl]] { 86 source $fname 87 } 88 89 # load the base class 90 Rappture::objects::load [file join $installdir objects base.rp] 91 92 # load any other classes found 93 foreach dir [glob -nocomplain -types d [file join $installdir objects *]] { 94 Rappture::objects::load [file join $dir *.rp] 95 } 63 96 } 64 97 -
trunk/p2p/client.tcl
r1273 r2080 86 86 public method send {message} 87 87 public method address {} 88 89 protected method handlerType {}90 88 } 91 89 … … 101 99 set _sid "" 102 100 } else { 103 log debug " sending: $message"101 log debug "outgoing message to [address]: $message" 104 102 puts $_sid $message 105 103 } … … 116 114 return $_addr 117 115 } 118 119 # ----------------------------------------------------------------------120 # USAGE: handlerType121 #122 # Returns a descriptive string describing this handler. Derived123 # classes override this method to provide their own string. Used124 # for debug messages.125 # ----------------------------------------------------------------------126 itcl::body Client::handlerType {} {127 return "client"128 } -
trunk/p2p/foreman.tcl
r1273 r2080 119 119 120 120 if {"" != [statedata authoritycnx]} { 121 [statedata authoritycnx] send "identity foreman" 121 122 [statedata authoritycnx] send "workers" 122 123 } else { … … 160 161 161 162 if {"" != [statedata workercnx]} { 163 [statedata workercnx] send "identity foreman" 162 164 [statedata workercnx] send "solicit -job [expr {rand()}]" 163 165 } else { -
trunk/p2p/handler.tcl
r1273 r2080 59 59 protected method finalize {protocol} 60 60 protected method dropped {cid} 61 protected method handlerType {}62 61 } 63 62 … … 196 195 append mesg "exception: $result" 197 196 } 198 log debug " [handlerType]message from [connectionName $cid]: [string trimright $request \n] $mesg"197 log debug "incoming message from [connectionName $cid]: [string trimright $request \n] $mesg" 199 198 } 200 199 } … … 237 236 catch {unset _cname($cid)} 238 237 } 239 240 # ----------------------------------------------------------------------241 # USAGE: handlerType242 #243 # Returns a descriptive string describing this handler. Derived244 # classes override this method to provide their own string. Used245 # for debug messages.246 # ----------------------------------------------------------------------247 itcl::body Handler::handlerType {} {248 return "handler"249 } -
trunk/p2p/protocols.tcl
r1273 r2080 81 81 $obj protocol $name 82 82 $obj define $name exception {message} { 83 log error "ERROR from client: $message" 83 variable cid 84 variable handler 85 log error "ERROR from client [$handler connectionName $cid]: $message" 86 } 87 $obj define $name identity {name} { 88 variable cid 89 variable handler 90 $handler connectionName $cid $name 91 return "" 84 92 } 85 93 -
trunk/p2p/server.tcl
r1273 r2080 106 106 107 107 protected method dropped {cid} 108 protected method handlerType {}109 110 108 private method accept {cid addr port} 111 109 } … … 235 233 chain $cid 236 234 } 237 238 # ----------------------------------------------------------------------239 # USAGE: handlerType240 #241 # Returns a descriptive string describing this handler. Derived242 # classes override this method to provide their own string. Used243 # for debug messages.244 # ----------------------------------------------------------------------245 itcl::body Server::handlerType {} {246 return "server"247 } -
trunk/p2p/test.tcl
r1273 r2080 142 142 # ------------------------------------------------------------------ 143 143 public proc draw {canvas time} { 144 global times 144 145 if {[info exists _shapesOnCanvas($canvas)]} { 146 set y0 5 147 if {[info exists times($time)]} { 148 $canvas create text 5 $y0 -anchor nw -text $times($time) 149 incr y0 15 150 } 151 $canvas create text 5 $y0 -anchor nw -tags entity 152 145 153 foreach obj $_shapesOnCanvas($canvas) { 146 154 if {[$obj exists $time]} { … … 222 230 pack .player.fwd -side left -padx 4 -pady 2 223 231 232 button .player.err -text "0 errors" -command {wm deiconify .errors; raise .errors} 233 pack .player.err -side right -padx 4 -pady 2 234 .player.err configure -state disabled 235 224 236 scale .player.scale -label "Frame" -orient horizontal \ 225 237 -from 0 -to 1 -showvalue 0 -command {test_frame_go 1} … … 242 254 after idle .view.traffic invoke 243 255 256 toplevel .errors 257 wm title .errors "Error Messages" 258 wm withdraw .errors 259 wm protocol .errors WM_DELETE_WINDOW {wm withdraw .errors} 260 scrollbar .errors.ysbar -orient vertical -command {.errors.info yview} 261 pack .errors.ysbar -side right -fill y 262 text .errors.info -yscrollcommand {.errors.ysbar set} -font {Courier 12} 263 pack .errors.info -expand yes -fill both 264 .errors.info tag configure timecode -foreground gray 265 .errors.info tag configure error -foreground red -font {Courier 12 bold} 266 244 267 proc test_stop {} { 245 268 global processes … … 279 302 280 303 proc test_reload {} { 281 global time0 nodes actions nodeRadius304 global time0 nodes actions times nodeRadius 282 305 283 306 array set colors { 284 307 authority blue 285 308 worker gray 309 foreman red 286 310 } 287 311 288 312 Shape::clear .diagram.network 289 313 Shape::clear .diagram.traffic 314 .errors.info configure -state normal 315 .errors.info delete 1.0 end 290 316 set tmax 0 317 set errs 0 291 318 292 319 # … … 298 325 close $fid 299 326 300 if {[regexp -- {foreman<-} $info]} { 301 # skip log file from foreman 327 set lasttime "" 328 set t0val ""; set first "" 329 set t1val ""; set last "" 330 set info [split $info \n] 331 foreach line $info { 332 if {[regexp {^([0-9]+/[0-9]+/[0-9]+ [0-9]+:[0-9]+:[0-9]+)} $line match tval]} { 333 if {"" == $t0val} { 334 set first $line 335 set t0val [expr {([clock scan $tval]-$time0)*100}] 336 } else { 337 set last $line 338 set t1val [expr {([clock scan $tval]-$time0)*100 + 99}] 339 } 340 } 341 } 342 343 if {"" == $t0val || "" == $t1val} { 344 # can't find any log statements -- skip this file! 302 345 continue 303 346 } 304 347 305 348 # get the address for this host 306 regexp {started at port ([0-9]+)} $info match port 307 if {[regexp {options [^\n]+ ip ([^ ]+)} $info match ip]} { 308 set addr $ip:$port 349 if {[regexp {started at port ([0-9]+)} $info match port]} { 350 if {[regexp {options [^\n]+ ip ([^ ]+)} $info match ip]} { 351 set addr $ip:$port 352 } else { 353 set addr 127.0.0.1:$port 354 } 355 set shape oval 356 regexp {^([0-9]+/[0-9]+/[0-9]+ [0-9]+:[0-9]+:[0-9]+) +(authority|worker)} $first match t0 type 357 } elseif {[regexp -- {foreman<-} $info]} { 358 set shape rectangle 359 set addr "foreman" 360 set type "foreman" 309 361 } else { 310 set addr 127.0.0.1:$port 311 } 312 313 set lasttime "" 314 set info [split $info \n] 315 set first [lindex $info 0] 316 regexp {^([0-9]+/[0-9]+/[0-9]+ [0-9]+:[0-9]+:[0-9]+) +(authority|worker)} $first match t0 type 317 set t0val [expr {([clock scan $t0]-$time0)*100}] 318 319 set last [lindex $info end-1] 320 regexp {^([0-9]+/[0-9]+/[0-9]+ [0-9]+:[0-9]+:[0-9]+)} $last match t1 321 set t1val [expr {([clock scan $t1]-$time0)*100 + 99}] 362 # unknown log file -- skip it 363 continue 364 } 322 365 set margin 20 323 366 set r $nodeRadius … … 337 380 foreach canv {.diagram.traffic .diagram.network} { 338 381 set s [Shape ::#auto $canv -command \ 339 [list %c create oval[expr {$x-$r}] [expr {$y-$r}] \382 [list %c create $shape [expr {$x-$r}] [expr {$y-$r}] \ 340 383 [expr {$x+$r}] [expr {$y+$r}] \ 341 384 -outline black -fill $colors($type) \ … … 359 402 puts "\nscanning $fname" 360 403 361 if {[regexp -- {foreman<-} $info]} {362 # skip log file from foreman363 continue364 }365 366 404 catch {unset started} 367 405 set peerlist(addrs) "" … … 380 418 if {$tval > $tmax} { set tmax $tval } 381 419 420 set cid "" 382 421 if {[regexp {accepted: +([^ ]+) +\((.+)\)} $mesg match addr cid]} { 383 422 append actions($tval) $mesg \n … … 386 425 387 426 } elseif {[regexp {dropped: +([^ ]+) +\((.+)\)} $mesg match addr cid] && [info exists started(connect$cid-time)]} { 427 incr tval 99 ;# end of this second 388 428 append actions($tval) $mesg \n 389 429 set from $nodes($fname) … … 399 439 unset started(connect$cid-addr) 400 440 401 } elseif {[regexp {(server|client) message from ([a-zA-Z0-9\.]+:[0-9]+) \(([a-z0-9]+)\): +(.+) => (.*)} $mesg match which addr cid cmd result]} { 402 if {![string match identity* $cmd]} { 403 append actions($tval) $mesg \n 404 set from $nodes($fname) 405 set x0 $nodes($from-x) 406 set y0 $nodes($from-y) 407 set x1 $nodes($addr-x) 408 set y1 $nodes($addr-y) 409 set w [expr {[winfo width .diagram]/2}] 410 411 set s [Shape ::#auto .diagram.traffic -command \ 412 [list %c create line [expr $x0-3] [expr $y0-3] [expr $x1-3] [expr $y1-3] -fill black -arrow first -tags transient]] 413 $s addRange $tval $tval 414 415 set s [Shape ::#auto .diagram.traffic -command \ 416 [list %c create text [expr {0.5*($x0+$x1)}] [expr {0.5*($y0+$y1)-1}] -width $w -fill black -anchor s -text $cmd -tags transient]] 417 $s addRange $tval $tval 418 419 if {"" != [string trim $result]} { 420 if {[regexp {^ok:} $result]} { 421 set color black 422 } else { 423 set color red 424 } 425 set s [Shape ::#auto .diagram.traffic -command \ 426 [list %c create line [expr $x0+3] [expr $y0+3] [expr $x1+3] [expr $y1+3] -fill $color -arrow last -tags transient]] 427 $s addRange $tval $tval 428 429 set s [Shape ::#auto .diagram.traffic -command \ 430 [list %c create text [expr {0.5*($x0+$x1)}] [expr {0.5*($y0+$y1)+1}] -width $w -fill $color -anchor n -text $result -tags transient]] 431 $s addRange $tval $tval 441 } elseif {[regexp {(incoming) message from ([^ ]+) \((sock[0-9]+)\): +(.+) => (.*)} $mesg match which addr cid cmd result] 442 || [regexp {(outgoing) message to ([^ ]+): +(.+)} $mesg match which addr cmd]} { 443 switch -- $which { 444 outgoing { 445 set from $addr 446 set to $nodes($fname) 447 } 448 incoming { 449 set from $nodes($fname) 450 set to $addr 451 # show incoming messages later in time 452 incr tval 50 432 453 } 433 454 } 455 append actions($tval) $mesg \n 456 set x0 $nodes($from-x) 457 set y0 $nodes($from-y) 458 set x1 $nodes($to-x) 459 set y1 $nodes($to-y) 460 set w [expr {[winfo width .diagram]/2}] 461 462 set s [Shape ::#auto .diagram.traffic -command \ 463 [list %c create line [expr $x0-3] [expr $y0-3] [expr $x1-3] [expr $y1-3] -fill black -arrow first -tags transient]] 464 $s addRange $tval $tval 465 466 set s [Shape ::#auto .diagram.traffic -command \ 467 [list %c create text [expr {0.5*($x0+$x1)}] [expr {0.5*($y0+$y1)-1}] -width $w -fill black -anchor s -text $cmd -tags transient]] 468 $s addRange $tval $tval 469 470 if {$which == "incoming" && "" != [string trim $result]} { 471 if {[regexp {^ok:} $result]} { 472 set color black 473 } else { 474 set color red 475 } 476 set s [Shape ::#auto .diagram.traffic -command \ 477 [list %c create line [expr $x0+3] [expr $y0+3] [expr $x1+3] [expr $y1+3] -fill $color -arrow last -tags transient]] 478 $s addRange $tval $tval 479 480 set s [Shape ::#auto .diagram.traffic -command \ 481 [list %c create text [expr {0.5*($x0+$x1)}] [expr {0.5*($y0+$y1)+1}] -width $w -fill $color -anchor n -text $result -tags transient]] 482 $s addRange $tval $tval 483 } 434 484 435 485 # no address for this client yet? then save this info 436 if {[info exists started(connect$cid-addr)] 486 if {"" != $cid 487 && [info exists started(connect$cid-addr)] 437 488 && $started(connect$cid-addr) == "?"} { 438 489 set started(connect$cid-addr) $addr … … 466 517 set peerlist(addrs) $plist 467 518 set peerlist(time) $tval 519 } elseif {[regexp {ERROR} $mesg match addr]} { 520 .errors.info insert end $time timecode $mesg error "\n" 521 incr errs 468 522 } 523 set times($tval) $time 469 524 } 470 525 } … … 497 552 %W itemconfigure $fname-cnx -fill red 498 553 %W raise $fname-cnx 554 %W itemconfigure entity -text {$nodes($fname)} 499 555 " 500 556 .diagram.traffic bind $fname <Leave> " … … 502 558 %W itemconfigure $fname-cnx -fill gray 503 559 %W raise transient 560 %W itemconfigure entity -text {} 504 561 " 505 562 … … 537 594 } 538 595 .player.scale configure -to $tmax 596 .errors.info configure -state disabled 597 if {$errs == 0} { 598 .player.err configure -state normal -text "0 errors" 599 .player.err configure -state disabled 600 } else { 601 .player.err configure -state normal -text "$errs error[expr {($errs == 1) ? {} : {s}}]" 602 } 539 603 540 604 after cancel test_visualize … … 565 629 566 630 proc test_frame_go {dir position} { 567 global actions 631 global actions times 568 632 569 633 set tmax [.player.scale cget -to] -
trunk/p2p/worker.tcl
r1273 r2080 118 118 # ------------------------------------------------------------------ 119 119 define solicit {args} { 120 log debug "SOLICIT from foreman: $args"121 120 variable cid 122 121 log debug "solicitation request from foreman: $args" … … 161 160 # ------------------------------------------------------------------ 162 161 define solicit {args} { 163 log debug "SOLICIT from peer: $args"164 162 variable cid 165 163 log debug "solicitation request from peer: $args" … … 177 175 # ------------------------------------------------------------------ 178 176 define proffer {token details} { 179 log debug "PROFFER from peer: $token $details"180 177 Solicitation::proffer $token $details 181 178 return "" … … 226 223 # ------------------------------------------------------------------ 227 224 define solicit {args} { 228 log debug "SOLICIT from peer: $args"229 225 variable cid 230 226 log debug "solicitation request from peer: $args" … … 242 238 # ------------------------------------------------------------------ 243 239 define proffer {token details} { 244 log debug "PROFFER from peer: $token $details"245 240 Solicitation::proffer $token $details 246 241 return "" … … 636 631 set mesg [list solicit -job $job -path $path -avoid "$avoid @RECIPIENTS" -token $_serial] 637 632 set _waitfor [broadcast_to_peers $mesg $avoid] 638 log debug "WAIT FOR: $_waitfor"639 633 640 634 if {$_waitfor > 0} { … … 643 637 } 644 638 } 645 log debug "TIMEOUT: $delay"646 639 set _timeout [after $delay [itcl::code $this finalize]] 647 640 } … … 656 649 append _response $details "\n" 657 650 if {[incr _waitfor -1] <= 0} { 658 log debug "ALL RESPONSES"659 651 finalize 660 652 } … … 676 668 # add details about this client to the message 677 669 append block "$myaddress -job $job -cost 1 -wonks [p2p::wonks::current]" 678 log debug "FINALIZE {$block}"679 670 680 671 # send the composite results back to the caller -
trunk/tester/test.tcl
r2077 r2080 24 24 public method getResult {} 25 25 public method getTestInfo {path} 26 public method getDiffs {} 26 27 27 28 public method run {args} … … 32 33 private variable _testobj "" ;# Rappture::Library object for _testxml 33 34 34 private variable _added "" 35 private variable _diffs "" 36 private variable _missing "" 37 private variable _result "?" 38 private variable _runobj "" 35 private variable _result "?" ;# current status of this test 36 private variable _runobj "" ;# results from last run 37 private variable _diffs "" ;# diffs with respect to _runobj 39 38 40 39 # don't need this? 41 public method getAdded {}42 public method getDiffs {}43 public method getInputs {{path input}}44 public method getMissing {}45 public method getOutputs {{path output}}46 40 public method getRunobj {} 47 public method getTestobj {} 48 41 42 private method _setWaiting {{newval ""}} 49 43 private method _setResult {name} 50 private method added {lib1 lib2 {path output}} 51 private method compareElements {lib1 lib2 path} 52 private method diffs {lib1 lib2 {path output}} 53 private method merge {toolobj golden driver {path input}} 54 private method missing {lib1 lib2 {path output}} 44 private method _computeDiffs {obj1 obj2 args} 45 private method _getStructure {xmlobj path} 46 47 # use this to add tests to the "run" queue 48 public proc queue {op args} 49 50 private common _queue ;# queue of objects waiting to run 51 set _queue(tests) "" ;# list of tests in the queue 52 set _queue(pending) "" ;# after event for "next" call 53 set _queue(running) "" ;# test object currently running 54 set _queue(outputcmd) "" ;# callback for reporting output 55 55 } 56 56 … … 118 118 itcl::delete object $_runobj 119 119 set _runobj "" 120 set _diffs "" 120 121 } 121 122 122 123 # copy inputs from the test into the run file 124 $_toolobj reset 123 125 foreach path [Rappture::entities -as path $_testobj input] { 124 126 if {[$_testobj element -as type $path.current] ne ""} { … … 130 132 # run the test case... 131 133 _setResult "Running" 132 foreach {status _runobj} [eval $_toolobj run $args] break 133 134 if {$status == 0 && [Rappture::library isvalid $_runobj]} { 135 # HACK: Add a new input to differentiate between results 136 $_runobj put input.TestRun.current "Test result" 137 set _diffs [diffs $_testobj $_runobj] 138 set _missing [missing $_testobj $_runobj] 139 set _added [added $_testobj $_runobj] 140 if {$_diffs == "" && $_missing == "" && $_added == ""} { 141 _setResult "Pass" 134 foreach {status result} [eval $_toolobj run $args] break 135 136 if {$status == 0} { 137 if {$result eq "ABORT"} { 138 _setResult "?" 139 return "aborted" 140 } elseif {[Rappture::library isvalid $result]} { 141 set _runobj $result 142 set _diffs [_computeDiffs $_testobj $_runobj -section output] 143 puts "DIFFS:" 144 foreach {op path what v1 v2} $_diffs { 145 puts " $op $path ($what) $v1 $v2" 146 } 147 148 # HACK: Add a new input to differentiate between results 149 $_runobj put input.TestRun.current "Test result" 150 151 # any differences from expected result mean test failed 152 if {[llength $_diffs] == 0} { 153 _setResult "Pass" 154 } else { 155 _setResult "Fail" 156 } 157 return "finished" 142 158 } else { 143 159 _setResult "Fail" 160 return "failed: $result" 144 161 } 145 162 } else { 146 set _runobj "" 147 set _setResult "Error" 163 _setResult "Fail" 164 tk_messageBox -icon error -message "Tool failed: $result" 165 return "finished" 148 166 } 149 167 } … … 160 178 itcl::body Rappture::Tester::Test::regoldenize {} { 161 179 if {$_runobj eq ""} { 162 error " Test has not yet been run."180 error "no test result to goldenize" 163 181 } 164 182 $_runobj put test.label [$_testobj get test.label] 165 183 $_runobj put test.description [$_testobj get test.description] 184 166 185 set fid [open $_testxml w] 167 186 puts $fid "<?xml version=\"1.0\"?>" 168 187 puts $fid [$_runobj xml] 169 188 close $fid 189 190 itcl::delete object $_testobj 170 191 set _testobj $_runobj 192 193 set _runobj "" 171 194 set _diffs "" 172 set _added ""173 set _missing ""174 195 _setResult Pass 175 }176 177 # ----------------------------------------------------------------------178 # USAGE: getAdded179 #180 # Return a list of paths that have been added that do not exist in the181 # golden results. Throws an error if the test has not been ran.182 # ----------------------------------------------------------------------183 itcl::body Rappture::Tester::Test::getAdded {} {184 if {$_runobj eq ""} {185 error "Test has not yet been run."186 }187 return $_added188 196 } 189 197 … … 196 204 # ---------------------------------------------------------------------- 197 205 itcl::body Rappture::Tester::Test::getDiffs {} { 198 return [list \ 199 input.number(temperature) label \ 200 output.curve(f12) units \ 201 output.curve(f12) result] 202 } 203 204 # ----------------------------------------------------------------------- 205 # USAGE: getInputs 206 # 207 # Returns a list of key value pairs for all inputs given in the test xml. 208 # Each key is the path to the input element, and each key is its current 209 # value. 210 # ----------------------------------------------------------------------- 211 itcl::body Rappture::Tester::Test::getInputs {{path input}} { 212 set retval [list] 213 foreach child [$_testobj children $path] { 214 set fullpath $path.$child 215 if {$fullpath != "input.TestRun"} { 216 set val [$_testobj get $fullpath.current] 217 if {$val != ""} { 218 lappend retval $fullpath $val 219 } 220 } 221 append retval [getInputs $fullpath] 222 } 223 return $retval 224 } 225 226 # ---------------------------------------------------------------------- 227 # USAGE: getMissing 228 # 229 # Return a list of paths that are present in the golden results, but are 230 # missing in the new test results. Throws an error if the test has not 231 # been ran. 232 # ---------------------------------------------------------------------- 233 itcl::body Rappture::Tester::Test::getMissing {} { 234 if {$_runobj eq ""} { 235 error "Test has not yet been run." 236 } 237 return $_missing 238 } 239 240 # ---------------------------------------------------------------------- 241 # USAGE: getOutputs 242 # 243 # Returns a list of key value pairs for all outputs in the runfile 244 # generated by the last run of the test. Each key is the path to the 245 # element, and each value is its status (ok, diff, added, or missing). 246 # Throws an error if the test has not been run. 247 # ---------------------------------------------------------------------- 248 itcl::body Rappture::Tester::Test::getOutputs {{path output}} { 249 if {$_runobj eq ""} { 250 error "Test has not yet been run." 251 } 252 set retval [list] 253 foreach child [$_runobj children $path] { 254 set fullpath $path.$child 255 if {$fullpath != "output.time" && $fullpath != "output.user" \ 256 && $fullpath != "output.status"} { 257 if {[lsearch $fullpath [getDiffs]] != -1} { 258 set status diff 259 } elseif {[lsearch $fullpath [getAdded]] != -1} { 260 set status added 261 } else { 262 if {[$_runobj get $fullpath] != ""} { 263 set status ok 264 } else { 265 set status "" 266 } 267 } 268 lappend retval $fullpath $status 269 } 270 append retval " [getOutputs $fullpath]" 271 } 272 # We won't find missing elements by searching through runobj. Instead, 273 # tack on all missing items at the end (only do this once) 274 if {$path == "output"} { 275 foreach item $_missing { 276 lappend retval $item missing 277 } 278 } 279 return $retval 206 return $_diffs 280 207 } 281 208 … … 294 221 295 222 # ---------------------------------------------------------------------- 296 # USAGE: getTestobj297 #298 # Returns the test library object containing the set of golden results.299 # ----------------------------------------------------------------------300 itcl::body Rappture::Tester::Test::getTestobj {} {301 return $_testobj302 }303 304 # ----------------------------------------------------------------------305 # USAGE: added lib1 lib2 ?path?306 #307 # Compares two library objects and returns a list of paths that have308 # been added in the second library and do not exist in the first.309 # Return value will contain all differences that occur as descendants of310 # an optional starting path. If the path argument is not given, then311 # only the output sections will be compared.312 # ----------------------------------------------------------------------313 itcl::body Rappture::Tester::Test::added {lib1 lib2 {path output}} {314 set paths [list]315 foreach child [$lib2 children $path] {316 foreach p [added $lib1 $lib2 $path.$child] {317 lappend paths $p318 }319 }320 if {[$lib1 get $path] == "" && [$lib2 get $path] != ""} {321 lappend paths $path322 }323 return $paths324 }325 326 # ----------------------------------------------------------------------327 # USAGE: compareElements <lib1> <lib2> <path>328 #329 # Compare data found in two library objects at the given path. Returns330 # 1 if match, 0 if no match. For now, just check if ascii identical.331 # Later, we can do something more sophisticated for different types of332 # elements.333 # ----------------------------------------------------------------------334 itcl::body Rappture::Tester::Test::compareElements {lib1 lib2 path} {335 set val1 [$lib1 get $path]336 set val2 [$lib2 get $path]337 return [expr {$val1} != {$val2}]338 }339 340 # ----------------------------------------------------------------------341 # USAGE: diffs <lib1> <lib2> ?path?342 #343 # Compares two library objects and returns a list of paths that do not344 # match. Only paths which exist in both libraries are considered.345 # Return value will contain all differences that occur as descendants of346 # an optional starting path. If the path argument is not given, then347 # only the output sections will be compared.348 # ----------------------------------------------------------------------349 itcl::body Rappture::Tester::Test::diffs {lib1 lib2 {path output}} {350 set paths [list]351 set clist1 [$lib1 children $path]352 set clist2 [$lib2 children $path]353 foreach child $clist1 {354 # Ignore if not present in both libraries355 if {[lsearch -exact $clist2 $child] != -1} {356 foreach p [diffs $lib1 $lib2 $path.$child] {357 lappend paths $p358 }359 }360 }361 if {[compareElements $lib1 $lib2 $path]} {362 # Ignore output.time and output.user363 if {$path != "output.time" && $path != "output.user"} {364 lappend paths $path365 }366 }367 return $paths368 }369 370 # ----------------------------------------------------------------------371 # USAGE: merge <toolobj> <golden> <driver> ?path?372 #373 # Used to recursively build up a driver library object for running a374 # test. Should not be called directly - see makeDriver.375 # ----------------------------------------------------------------------376 itcl::body Rappture::Tester::Test::merge {toolobj golden driver {path input}} {377 foreach child [$toolobj children $path] {378 set val [$golden get $path.$child.current]379 if {$val != ""} {380 $driver put $path.$child.current $val381 } else {382 set def [$toolobj get $path.$child.default]383 if {$def != ""} {384 $driver put $path.$child.current $def385 }386 }387 merge $toolobj $golden $driver $path.$child388 }389 return $driver390 }391 392 # ----------------------------------------------------------------------393 # USAGE: added lib1 lib2 ?path?394 #395 # Compares two library objects and returns a list of paths that do not396 # exist in the first library and have been added in the second.397 # Return value will contain all differences that occur as descendants of398 # an optional starting path. If the path argument is not given, then399 # only the output sections will be compared.400 # ----------------------------------------------------------------------401 itcl::body Rappture::Tester::Test::missing {lib1 lib2 {path output}} {402 set paths [list]403 foreach child [$lib1 children $path] {404 foreach p [missing $lib1 $lib2 $path.$child] {405 lappend paths $p406 }407 }408 if {[$lib1 get $path] != "" && [$lib2 get $path] == ""} {409 lappend paths $path410 }411 return $paths412 }413 414 # ----------------------------------------------------------------------415 223 # USAGE: _setResult ?|Pass|Fail|Waiting|Running 416 224 # … … 420 228 # ---------------------------------------------------------------------- 421 229 itcl::body Rappture::Tester::Test::_setResult {name} { 422 puts "CHANGED: $this => $name"423 230 set _result $name 424 231 if {[string length $notifycommand] > 0} { 425 puts " notified $notifycommand"426 232 uplevel #0 $notifycommand $this 427 233 } 428 234 } 235 236 # ---------------------------------------------------------------------- 237 # USAGE: _setWaiting ?boolean? 238 # 239 # Used to mark a Test as "waiting". This usually happens when a test 240 # is added to the queue, about to be run. 241 # ---------------------------------------------------------------------- 242 itcl::body Rappture::Tester::Test::_setWaiting {{newval ""}} { 243 if {$newval ne "" && [string is boolean $newval]} { 244 if {$newval} { 245 _setResult "Waiting" 246 } else { 247 _setResult "?" 248 } 249 } 250 return $_result 251 } 252 253 # ---------------------------------------------------------------------- 254 # USAGE: _computeDiffs <xmlObj1> <xmlObj2> ?-section xxx? \ 255 # ?-what value|structure|all? 256 # 257 # Used internally to compute differences between two different XML 258 # objects. This is normally used to look for differences in the 259 # output section between a test case and a new run, but can also 260 # be used to look for differences in other sections via the -section 261 # flag. 262 # 263 # Returns a list of the following form: 264 # <op> <path> <what> <val1> <val2> 265 # 266 # where <op> is one of: 267 # - ...... element is missing from <xmlObj2> 268 # c ...... element changed between <xmlObj1> and <xmlObj2> 269 # + ...... element is missing from <xmlObj1> 270 # 271 # and <what> is something like: 272 # value .............. difference affects "current" value 273 # structure <path> ... affects structure of parent at <path> 274 # ---------------------------------------------------------------------- 275 itcl::body Rappture::Tester::Test::_computeDiffs {obj1 obj2 args} { 276 Rappture::getopts args params { 277 value -section output 278 value -what all 279 } 280 if {$params(-what) == "all"} { 281 set params(-what) "structure value" 282 } 283 284 # query the values for all entities in both objects 285 set v1paths [Rappture::entities $obj1 $params(-section)] 286 set v2paths [Rappture::entities $obj2 $params(-section)] 287 288 # scan through values for obj1 and compare against obj2 289 set rlist "" 290 foreach path $v1paths { 291 puts "checking $path" 292 set i [lsearch -exact $v2paths $path] 293 if {$i < 0} { 294 puts " missing from $obj2" 295 # missing from obj2 296 foreach {raw norm} [Rappture::LibraryObj::value $obj1 $path] break 297 lappend rlist - $path value $raw "" 298 } else { 299 foreach part $params(-what) { 300 switch -- $part { 301 value { 302 foreach {raw1 norm1} \ 303 [Rappture::LibraryObj::value $obj1 $path] break 304 foreach {raw2 norm2} \ 305 [Rappture::LibraryObj::value $obj2 $path] break 306 puts " checking values $norm1 vs $norm2" 307 if {![string equal $norm1 $norm2]} { 308 puts " => different!" 309 # different from obj2 310 lappend rlist c $path value $raw1 $raw2 311 } 312 # handled this comparison 313 set v2paths [lreplace $v2paths $i $i] 314 } 315 structure { 316 set what [list structure $path] 317 set s1paths [_getStructure $obj1 $path] 318 set s2paths [_getStructure $obj2 $path] 319 foreach spath $s1paths { 320 puts " checking internal structure $spath" 321 set i [lsearch -exact $s2paths $spath] 322 if {$i < 0} { 323 puts " missing from $obj2" 324 # missing from obj2 325 set val1 [$obj1 get $spath] 326 lappend rlist - $spath $what $val1 "" 327 } else { 328 set val1 [$obj1 get $spath] 329 set val2 [$obj2 get $spath] 330 if {![string match $val1 $val2]} { 331 puts " different from $obj2 ($val1 vs $val2)" 332 # different from obj2 333 lappend rlist c $spath $what $val1 $val2 334 } 335 # handled this comparison 336 set s2paths [lreplace $s2paths $i $i] 337 } 338 } 339 340 # look for leftover values 341 foreach spath $s2paths { 342 set val2 [$obj2 get $spath] 343 puts " extra $spath in $obj2" 344 lappend rlist + $spath $what "" $val2 345 } 346 } 347 default { 348 error "bad part \"$part\": should be structure, value" 349 } 350 } 351 } 352 } 353 } 354 355 # add any values left over in the obj2 356 foreach path $v2paths { 357 puts " extra $path in $obj2" 358 foreach {raw2 norm2} [Rappture::LibraryObj::value $obj2 $path] break 359 lappend rlist + $path value "" $raw2 360 } 361 return $rlist 362 } 363 364 # ---------------------------------------------------------------------- 365 # USAGE: _getStructure <xmlObj> <path> 366 # 367 # Used internally by _computeDiffs to get a list of paths for important 368 # parts of the internal structure of an object. Avoids the "current" 369 # element, but includes "default", "units", etc. 370 # ---------------------------------------------------------------------- 371 itcl::body Rappture::Tester::Test::_getStructure {xmlobj path} { 372 set rlist "" 373 set queue $path 374 while {[llength $queue] > 0} { 375 set qpath [lindex $queue 0] 376 set queue [lrange $queue 1 end] 377 378 foreach p [$xmlobj children -as path $qpath] { 379 if {[string match *.current $p]} { 380 continue 381 } 382 if {[llength [$xmlobj children $p]] > 0} { 383 # continue exploring nodes with children 384 lappend queue $p 385 } else { 386 # return the terminal nodes 387 lappend rlist $p 388 } 389 } 390 } 391 return $rlist 392 } 393 394 # ====================================================================== 395 # RUN QUEUE 396 # ====================================================================== 397 # USAGE: queue add <testObj> <testObj>... 398 # USAGE: queue clear ?<testObj> <testObj>...? 399 # USAGE: queue status <command> 400 # USAGE: queue next 401 # USAGE: queue output <string> 402 # 403 # Used to manipulate the run queue for the program as a whole. 404 # 405 # The "queue add" option adds the given <testObj> objects to the run 406 # queue. As soon as an object is added to the queue, it is marked 407 # "waiting". When it runs, it is marked "running", and it finally 408 # goes to the "pass" or "fail" state. If an object is already in 409 # the queue, then this operation does nothing. 410 # 411 # The "queue clear" option clears specific objects from the queue. 412 # If no objects are specified, then it clears all remaining objects. 413 # 414 # The "queue status" option is used to set the callback for handling 415 # output from runs. This command is called two ways: 416 # command start <testObj> 417 # command add <testObj> "string of output" 418 # 419 # The "queue next" option is used internally to run the next object 420 # in the queue. The "queue output" option is also used internally 421 # to handle the output coming back from a run. The output gets 422 # shuttled along to the callback specified by "queue status". 423 # ---------------------------------------------------------------------- 424 itcl::body Rappture::Tester::Test::queue {option args} { 425 switch -- $option { 426 add { 427 # add these tests to the run queue 428 foreach obj $args { 429 if {[catch {$obj isa Rappture::Tester::Test} valid] || !$valid} { 430 error "bad value \"$obj\": should be Test object" 431 } 432 if {[lsearch $_queue(tests) $obj] < 0} { 433 $obj _setWaiting 1 434 lappend _queue(tests) $obj 435 } 436 } 437 if {$_queue(running) eq "" && $_queue(pending) eq ""} { 438 set _queue(pending) [after idle \ 439 Rappture::Tester::Test::queue next] 440 } 441 } 442 clear { 443 # remove these tests from the run queue 444 foreach obj $args { 445 if {[catch {$obj isa Rappture::Tester::Test} valid] || !$valid} { 446 error "bad value \"$obj\": should be Test object" 447 } 448 449 # remove the test from the queue 450 set i [lsearch $_queue(tests) $obj] 451 if {$i >= 0} { 452 set _queue(tests) [lreplace $_queue(tests) $i $i] 453 } 454 455 # mark object as no longer "waiting" 456 if {[$obj _setWaiting]} { 457 $obj _setWaiting 0 458 } 459 } 460 } 461 status { 462 if {[llength $args] != 1} { 463 error "wrong # args: should be \"status command\"" 464 } 465 set _queue(outputcmd) [lindex $args 0] 466 } 467 next { 468 set _queue(pending) "" 469 470 # get the next object from the queue 471 set obj [lindex $_queue(tests) 0] 472 set _queue(tests) [lrange $_queue(tests) 1 end] 473 474 if {$obj ne ""} { 475 set _queue(running) $obj 476 # invoke the callback to signal start of a run 477 if {[string length $_queue(outputcmd)] > 0} { 478 uplevel #0 $_queue(outputcmd) start $obj 479 } 480 481 # run the test 482 set callback "Rappture::Tester::Test::queue output" 483 set status [$obj run -output $callback] 484 set _queue(running) "" 485 486 if {$status == "aborted"} { 487 # if the test was aborted, clear any waiting tests 488 Rappture::Tester::Test::queue clear 489 } elseif {[string match failed:* $status]} { 490 bgerror $status 491 } 492 493 # set up to run the next test in the queue 494 set _queue(pending) [after idle \ 495 Rappture::Tester::Test::queue next] 496 } 497 } 498 output { 499 if {[llength $args] != 1} { 500 error "wrong # args: should be \"output string\"" 501 } 502 if {[string length $_queue(outputcmd)] > 0} { 503 uplevel #0 $_queue(outputcmd) add $_queue(running) $args 504 } 505 } 506 default { 507 error "bad option \"$option\": should be add, clear, status, output, next" 508 } 509 } 510 } -
trunk/tester/tester.tcl
r2077 r2080 77 77 set Rappture::icon::iconpath [linsert $Rappture::icon::iconpath 0 [file join $testerdir images]] 78 78 79 # current list of running tests80 set RunQueue ""81 82 79 83 80 Rappture::getopts argv params { … … 161 158 # ---------------------------------------------------------------------- 162 159 frame $win.testrun 160 label $win.testrun.title -text "Output from test run:" -anchor w 161 pack $win.testrun.title -side top -anchor w 162 163 163 button $win.testrun.abort -text "Abort" 164 pack $win.testrun.abort -side bottom 164 pack $win.testrun.abort -side bottom -pady {8 0} 165 165 166 166 Rappture::Scroller $win.testrun.scrl -xscrollmode auto -yscrollmode auto … … 213 213 pack forget $win 214 214 } 215 pack $detailwidget -expand yes -fill both 215 if {$detailwidget ne ""} { 216 pack $detailwidget -expand yes -fill both -padx 8 -pady 8 217 } 216 218 } 217 219 218 220 if {[llength $tests] > 0} { 219 221 eval $testview.overview show $tests 220 pack $testview -expand yes -fill both -padx 8 -pady 8221 222 if {[llength $tests] == 1 && [$tests getResult] eq "Fail"} { 222 223 pack $testview.regoldenize -side bottom -anchor w … … 228 229 set testobj [lindex $tests 0] 229 230 $testview.details.scrl.list delete 0 end 230 foreach {path info} [$testobj getDiffs] { 231 set title [$testobj getTestInfo $path.about.label] 232 if {[string match output.* $path]} { 233 set title "Output: $title" 234 } 235 switch -- [lindex $info 0] { 236 result { 237 set desc "Result differs from expected value" 238 set icon [Rappture::icon fail16] 231 foreach {op path what v1 v2} [$testobj getDiffs] { 232 switch -- [lindex $what 0] { 233 value { 234 set title "Output: [$testobj getTestInfo $path.about.label]" 235 set icon [Rappture::icon fail16] 236 switch -- $op { 237 - { set desc "Result is missing from current output" } 238 + { set desc "Result was not expected to appear" } 239 c { set desc "Result differs from expected value" } 240 default { 241 error "don't know how to handle difference $op" 242 } 239 243 } 240 default { 241 set desc $info 242 set icon [Rappture::icon warn16] 244 } 245 structure { 246 set ppath [lindex $what 1] 247 set title "Output: [$testobj getTestInfo $ppath.about.label]" 248 set icon [Rappture::icon warn16] 249 set pplen [string length $ppath] 250 set tail [string range $path [expr {$pplen+1}] end] 251 switch -- $op { 252 - { set desc "Missing value \"$v1\" at $tail" } 253 + { set desc "Extra value \"$v2\" at $tail" } 254 c { set desc "Details at $tail have changed:\n got: $v2\n expected: $v1" } 255 default { 256 error "don't know how to handle difference $op" 257 } 243 258 } 259 } 260 default { 261 error "don't know how to handle difference \"$what\"" 262 } 244 263 } 245 264 … … 265 284 # ---------------------------------------------------------------------- 266 285 proc tester_run {args} { 267 global RunQueue268 set testtree [.pw pane 0].tree286 # set up a callback for handling output from runs 287 Rappture::Tester::Test::queue status tester_run_output 269 288 270 289 # add these tests to the run queue 271 foreach obj $args { 272 if {[lsearch $RunQueue $obj] < 0} { 273 lappend RunQueue $obj 274 } 275 } 276 277 after idle tester_run_next 278 } 279 280 # ---------------------------------------------------------------------- 281 # USAGE: tester_run_next 282 # 283 # Takes the next test from the queue and runs it. Displays any 284 # output during the run, then compares results and shows a final 285 # pass/fail status. 286 # ---------------------------------------------------------------------- 287 proc tester_run_next {} { 288 global RunQueue 289 290 set obj [lindex $RunQueue 0] 291 set RunQueue [lrange $RunQueue 1 end] 292 293 if {$obj ne ""} { 294 puts "RUNNING: $obj" 295 set testrun [.pw pane 1].testrun 296 $testrun.abort configure -command [list $obj abort] 297 $obj run -output tester_run_output 298 } 299 300 # keep running remaining tests 301 after idle tester_run_next 302 } 303 304 # ---------------------------------------------------------------------- 305 # USAGE: tester_run_output <string> 306 # 307 # Adds the <string> output from running a test case into the viewer 308 # for that test. 309 # ---------------------------------------------------------------------- 310 proc tester_run_output {string} { 290 eval Rappture::Tester::Test::queue add $args 291 292 # show the run output window 293 set rhs [.pw pane 1] 294 foreach win [pack slaves $rhs] { 295 pack forget $win 296 } 297 pack $rhs.testrun -expand yes -fill both -padx 8 -pady 8 298 } 299 300 # ---------------------------------------------------------------------- 301 # USAGE: tester_run_output start <testObj> 302 # USAGE: tester_run_output add <testObj> <string> 303 # 304 # Handles the output from running tests. The "start" option clears 305 # the current output area. The "add" option adds output from a run. 306 # ---------------------------------------------------------------------- 307 proc tester_run_output {option testobj args} { 311 308 set testrun [.pw pane 1].testrun 312 $testrun.scrl.info configure -state normal 313 $testrun.scrl.info insert end $string 314 315 # if there are too many lines, delete some 316 set lines [lindex [split [$testrun.scrl.info index end-2char] .] 0] 317 if {$lines > 500} { 318 set extra [expr {$lines-500+1}] 319 $testrun.scrl.info delete 1.0 $extra.0 320 } 321 322 # show the newest stuff 323 $testrun.scrl.info see end 324 $testrun.scrl.info configure -state disabled 309 310 switch -- $option { 311 start { 312 # clear out any previous output 313 $testrun.scrl.info configure -state normal 314 $testrun.scrl.info delete 1.0 end 315 $testrun.scrl.info configure -state disabled 316 317 # plug this object into the "Abort" button 318 $testrun.abort configure -command [list $testobj abort] 319 } 320 add { 321 $testrun.scrl.info configure -state normal 322 $testrun.scrl.info insert end [lindex $args 0] 323 324 # if there are too many lines, delete some 325 set lines [lindex [split [$testrun.scrl.info index end-2char] .] 0] 326 if {$lines > 500} { 327 set extra [expr {$lines-500+1}] 328 $testrun.scrl.info delete 1.0 $extra.0 329 } 330 331 # show the newest stuff 332 $testrun.scrl.info see end 333 $testrun.scrl.info configure -state disabled 334 } 335 default { 336 error "bad option \"$option\": should be start, add" 337 } 338 } 325 339 } 326 340 -
trunk/tester/testtree.tcl
r2077 r2080 225 225 Pass { set data(result) "@[Rappture::icon pass16]" } 226 226 Fail { set data(result) "@[Rappture::icon fail16]" } 227 Waiting { set data(result) "@[Rappture::icon wait ]" }227 Waiting { set data(result) "@[Rappture::icon wait16]" } 228 228 Running { set data(result) "@[spinner use]" } 229 229 default { set data(result) "" } … … 231 231 puts "ICON: $data(result)" 232 232 $itk_component(treeview) entry configure $n -data [array get data] 233 234 # if the node that's changed is selected, invoke the 235 # -selectcommand code so the GUI will react to the new state 236 if {[$itk_component(treeview) selection includes $n]} { 237 set cmd [$itk_component(treeview) cget -selectcommand] 238 if {[string length $cmd] > 0} { 239 uplevel #0 $cmd 240 } 241 } 233 242 } 234 243 } -
trunk/tester/testview.tcl
r2077 r2080 144 144 set color $itk_option(-statusfailcolor) 145 145 } 146 Running - Waiting { 147 set smesg "Test waiting to run" 148 set sicon [Rappture::icon wait64] 149 set color $itk_option(-statuspasscolor) 150 } 146 151 default { error "unknown test state \"[$obj getResult]\"" } 147 152 } … … 161 166 } 162 167 default { 163 array set states { ? 0 Pass 0 Fail 0 total 0 }168 array set states { ? 0 Pass 0 Fail 0 Running 0 Waiting 0 total 0 } 164 169 foreach obj $_testobjs { 165 170 incr states(total)
Note: See TracChangeset
for help on using the changeset viewer.
