Changeset 2890

Timestamp:

Mar 27, 2012 11:47:22 PM (12 years ago)

Author:

gah

Message:

created video package

Location:

trunk

Files:

• Makefile.in (modified) (1 diff)
• configure (modified) (214 diffs)
• configure.in (modified) (4 diffs)
• gui/scripts/field3dresult.tcl (modified) (2 diffs)
• lang/tcl/src/Makefile.in (modified) (1 diff)
• src/core/config.h.in (modified) (5 diffs)
• src/objects/Makefile.in (modified) (1 diff)
• video (added)
• video/Makefile-lib.in (added)
• video/Makefile.in (added)
• video/RpOp.c (added)
• video/RpOp.h (added)
• video/RpVideo.c (added)
• video/RpVideo.h (added)
• video/RpVideoTclInterface.cc (added)
• video/hold (added)
• video/hold/RpMediaPlayerTclInterface.cc (added)
• video/pkgIndex.tcl.in (added)

trunk/Makefile.in

@@ -31 +31 @@
 
 ENABLE_GUI      = @ENABLE_GUI@
-
+HAVE_FFMPEG     = @HAVE_FFMPEG_LIBS@
 TARGETS         = src lang lib
 
 ifneq ($(ENABLE_GUI),)
   TARGETS += gui builder tester examples 
+endif
+ifeq ($(HAVE_FFMEG),)
+  TARGETS += video
 endif
 

trunk/configure

@@ -1 +1 @@
 #! /bin/sh
 # Guess values for system-dependent variables and create Makefiles.
-# Generated by GNU Autoconf 2.67 for Rappture 1.1.
+# Generated by GNU Autoconf 2.68 for Rappture 1.1.
 #
 # Report bugs to <rappture@nanohub.org>.
@@ -92 +92 @@
 
 # Find who we are.  Look in the path if we contain no directory separator.
+as_myself=
 case $0 in #((
   *[\\/]* ) as_myself=$0 ;;
@@ -217 +218 @@
         # neutralization value for shells without unset; and this also
         # works around shells that cannot unset nonexistent variables.
+        # Preserve -v and -x to the replacement shell.
         BASH_ENV=/dev/null
         ENV=/dev/null
         (unset BASH_ENV) >/dev/null 2>&1 && unset BASH_ENV ENV
         export CONFIG_SHELL
-        exec "$CONFIG_SHELL" "$as_myself" ${1+"$@"}
+        case $- in # ((((
+          *v*x* | *x*v* ) as_opts=-vx ;;
+          *v* ) as_opts=-v ;;
+          *x* ) as_opts=-x ;;
+          * ) as_opts= ;;
+        esac
+        exec "$CONFIG_SHELL" $as_opts "$as_myself" ${1+"$@"}
 fi
 
@@ -1210 +1218 @@
     expr "x$ac_option" : ".*[^-._$as_cr_alnum]" >/dev/null &&
       $as_echo "$as_me: WARNING: invalid host type: $ac_option" >&2
-    : ${build_alias=$ac_option} ${host_alias=$ac_option} ${target_alias=$ac_option}
+    : "${build_alias=$ac_option} ${host_alias=$ac_option} ${target_alias=$ac_option}"
     ;;
 
@@ -1526 +1534 @@
   cat <<\_ACEOF
 Rappture configure 1.1
-generated by GNU Autoconf 2.67
+generated by GNU Autoconf 2.68
 
 Copyright (C) 2010 Free Software Foundation, Inc.
@@ -1572 +1580 @@
         ac_retval=1
 fi
-  eval $as_lineno_stack; test "x$as_lineno_stack" = x && { as_lineno=; unset as_lineno;}
+  eval $as_lineno_stack; ${as_lineno_stack:+:} unset as_lineno
   as_fn_set_status $ac_retval
 
@@ -1610 +1618 @@
         ac_retval=1
 fi
-  eval $as_lineno_stack; test "x$as_lineno_stack" = x && { as_lineno=; unset as_lineno;}
+  eval $as_lineno_stack; ${as_lineno_stack:+:} unset as_lineno
   as_fn_set_status $ac_retval
 
@@ -1648 +1656 @@
         ac_retval=1
 fi
-  eval $as_lineno_stack; test "x$as_lineno_stack" = x && { as_lineno=; unset as_lineno;}
+  eval $as_lineno_stack; ${as_lineno_stack:+:} unset as_lineno
   as_fn_set_status $ac_retval
 
@@ -1685 +1693 @@
     ac_retval=1
 fi
-  eval $as_lineno_stack; test "x$as_lineno_stack" = x && { as_lineno=; unset as_lineno;}
+  eval $as_lineno_stack; ${as_lineno_stack:+:} unset as_lineno
   as_fn_set_status $ac_retval
 
@@ -1727 +1735 @@
 fi
   rm -rf conftest.dSYM conftest_ipa8_conftest.oo
-  eval $as_lineno_stack; test "x$as_lineno_stack" = x && { as_lineno=; unset as_lineno;}
+  eval $as_lineno_stack; ${as_lineno_stack:+:} unset as_lineno
   as_fn_set_status $ac_retval
 
@@ -1773 +1781 @@
   # left behind by Apple's compiler.  We do this before executing the actions.
   rm -rf conftest.dSYM conftest_ipa8_conftest.oo
-  eval $as_lineno_stack; test "x$as_lineno_stack" = x && { as_lineno=; unset as_lineno;}
+  eval $as_lineno_stack; ${as_lineno_stack:+:} unset as_lineno
   as_fn_set_status $ac_retval
 
@@ -1786 +1794 @@
   { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $2" >&5
 $as_echo_n "checking for $2... " >&6; }
-if eval "test \"\${$3+set}\"" = set; then :
+if eval \${$3+:} false; then :
   $as_echo_n "(cached) " >&6
 else
@@ -1841 +1849 @@
                { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_res" >&5
 $as_echo "$ac_res" >&6; }
-  eval $as_lineno_stack; test "x$as_lineno_stack" = x && { as_lineno=; unset as_lineno;}
+  eval $as_lineno_stack; ${as_lineno_stack:+:} unset as_lineno
 
 } # ac_fn_c_check_func
@@ -1886 +1894 @@
   # left behind by Apple's compiler.  We do this before executing the actions.
   rm -rf conftest.dSYM conftest_ipa8_conftest.oo
-  eval $as_lineno_stack; test "x$as_lineno_stack" = x && { as_lineno=; unset as_lineno;}
+  eval $as_lineno_stack; ${as_lineno_stack:+:} unset as_lineno
   as_fn_set_status $ac_retval
 
@@ -1899 +1907 @@
   { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $2" >&5
 $as_echo_n "checking for $2... " >&6; }
-if eval "test \"\${$3+set}\"" = set; then :
+if eval \${$3+:} false; then :
   $as_echo_n "(cached) " >&6
 else
@@ -1954 +1962 @@
                { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_res" >&5
 $as_echo "$ac_res" >&6; }
-  eval $as_lineno_stack; test "x$as_lineno_stack" = x && { as_lineno=; unset as_lineno;}
+  eval $as_lineno_stack; ${as_lineno_stack:+:} unset as_lineno
 
 } # ac_fn_cxx_check_func
@@ -1990 +1998 @@
     ac_retval=1
 fi
-  eval $as_lineno_stack; test "x$as_lineno_stack" = x && { as_lineno=; unset as_lineno;}
+  eval $as_lineno_stack; ${as_lineno_stack:+:} unset as_lineno
   as_fn_set_status $ac_retval
 
@@ -2003 +2011 @@
 {
   as_lineno=${as_lineno-"$1"} as_lineno_stack=as_lineno_stack=$as_lineno_stack
-  if eval "test \"\${$3+set}\"" = set; then :
+  if eval \${$3+:} false; then :
   { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $2" >&5
 $as_echo_n "checking for $2... " >&6; }
-if eval "test \"\${$3+set}\"" = set; then :
+if eval \${$3+:} false; then :
   $as_echo_n "(cached) " >&6
 fi
@@ -2073 +2081 @@
   { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $2" >&5
 $as_echo_n "checking for $2... " >&6; }
-if eval "test \"\${$3+set}\"" = set; then :
+if eval \${$3+:} false; then :
   $as_echo_n "(cached) " >&6
 else
@@ -2082 +2090 @@
 $as_echo "$ac_res" >&6; }
 fi
-  eval $as_lineno_stack; test "x$as_lineno_stack" = x && { as_lineno=; unset as_lineno;}
+  eval $as_lineno_stack; ${as_lineno_stack:+:} unset as_lineno
 
 } # ac_fn_cxx_check_header_mongrel
@@ -2095 +2103 @@
   { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $2" >&5
 $as_echo_n "checking for $2... " >&6; }
-if eval "test \"\${$3+set}\"" = set; then :
+if eval \${$3+:} false; then :
   $as_echo_n "(cached) " >&6
 else
@@ -2113 +2121 @@
                { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_res" >&5
 $as_echo "$ac_res" >&6; }
-  eval $as_lineno_stack; test "x$as_lineno_stack" = x && { as_lineno=; unset as_lineno;}
+  eval $as_lineno_stack; ${as_lineno_stack:+:} unset as_lineno
 
 } # ac_fn_cxx_check_header_compile
@@ -2154 +2162 @@
 fi
   rm -rf conftest.dSYM conftest_ipa8_conftest.oo
-  eval $as_lineno_stack; test "x$as_lineno_stack" = x && { as_lineno=; unset as_lineno;}
+  eval $as_lineno_stack; ${as_lineno_stack:+:} unset as_lineno
   as_fn_set_status $ac_retval
 
@@ -2332 +2340 @@
 
   fi
-  eval $as_lineno_stack; test "x$as_lineno_stack" = x && { as_lineno=; unset as_lineno;}
+  eval $as_lineno_stack; ${as_lineno_stack:+:} unset as_lineno
   as_fn_set_status $ac_retval
 
@@ -2341 +2349 @@
 
 It was created by Rappture $as_me 1.1, which was
-generated by GNU Autoconf 2.67.  Invocation command line was
+generated by GNU Autoconf 2.68.  Invocation command line was
 
   $ $0 $@
@@ -2599 +2607 @@
 $as_echo "$as_me: error: in \`$ac_pwd':" >&2;}
 as_fn_error $? "failed to load site script $ac_site_file
-See \`config.log' for more details" "$LINENO" 5 ; }
+See \`config.log' for more details" "$LINENO" 5; }
   fi
 done
@@ -2771 +2779 @@
 $as_echo_n "checking for a BSD-compatible install... " >&6; }
 if test -z "$INSTALL"; then
-if test "${ac_cv_path_install+set}" = set; then :
+if ${ac_cv_path_install+:} false; then :
   $as_echo_n "(cached) " >&6
 else
@@ -2853 +2861 @@
 { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
 $as_echo_n "checking for $ac_word... " >&6; }
-if test "${ac_cv_prog_RANLIB+set}" = set; then :
+if ${ac_cv_prog_RANLIB+:} false; then :
   $as_echo_n "(cached) " >&6
 else
@@ -2893 +2901 @@
 { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
 $as_echo_n "checking for $ac_word... " >&6; }
-if test "${ac_cv_prog_ac_ct_RANLIB+set}" = set; then :
+if ${ac_cv_prog_ac_ct_RANLIB+:} false; then :
   $as_echo_n "(cached) " >&6
 else
@@ -2954 +2962 @@
 $as_echo_n "checking for a thread-safe mkdir -p... " >&6; }
 if test -z "$MKDIR_P"; then
-  if test "${ac_cv_path_mkdir+set}" = set; then :
+  if ${ac_cv_path_mkdir+:} false; then :
   $as_echo_n "(cached) " >&6
 else
@@ -2997 +3005 @@
 set x ${MAKE-make}
 ac_make=`$as_echo "$2" | sed 's/+/p/g; s/[^a-zA-Z0-9_]/_/g'`
-if eval "test \"\${ac_cv_prog_make_${ac_make}_set+set}\"" = set; then :
+if eval \${ac_cv_prog_make_${ac_make}_set+:} false; then :
   $as_echo_n "(cached) " >&6
 else
@@ -3036 +3044 @@
 { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
 $as_echo_n "checking for $ac_word... " >&6; }
-if test "${ac_cv_prog_CC+set}" = set; then :
+if ${ac_cv_prog_CC+:} false; then :
   $as_echo_n "(cached) " >&6
 else
@@ -3076 +3084 @@
 { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
 $as_echo_n "checking for $ac_word... " >&6; }
-if test "${ac_cv_prog_ac_ct_CC+set}" = set; then :
+if ${ac_cv_prog_ac_ct_CC+:} false; then :
   $as_echo_n "(cached) " >&6
 else
@@ -3129 +3137 @@
 { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
 $as_echo_n "checking for $ac_word... " >&6; }
-if test "${ac_cv_prog_CC+set}" = set; then :
+if ${ac_cv_prog_CC+:} false; then :
   $as_echo_n "(cached) " >&6
 else
@@ -3169 +3177 @@
 { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
 $as_echo_n "checking for $ac_word... " >&6; }
-if test "${ac_cv_prog_CC+set}" = set; then :
+if ${ac_cv_prog_CC+:} false; then :
   $as_echo_n "(cached) " >&6
 else
@@ -3228 +3236 @@
 { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
 $as_echo_n "checking for $ac_word... " >&6; }
-if test "${ac_cv_prog_CC+set}" = set; then :
+if ${ac_cv_prog_CC+:} false; then :
   $as_echo_n "(cached) " >&6
 else
@@ -3272 +3280 @@
 { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
 $as_echo_n "checking for $ac_word... " >&6; }
-if test "${ac_cv_prog_ac_ct_CC+set}" = set; then :
+if ${ac_cv_prog_ac_ct_CC+:} false; then :
   $as_echo_n "(cached) " >&6
 else
@@ -3327 +3335 @@
 $as_echo "$as_me: error: in \`$ac_pwd':" >&2;}
 as_fn_error $? "no acceptable C compiler found in \$PATH
-See \`config.log' for more details" "$LINENO" 5 ; }
+See \`config.log' for more details" "$LINENO" 5; }
 
 # Provide some information about the compiler.
@@ -3442 +3450 @@
 $as_echo "$as_me: error: in \`$ac_pwd':" >&2;}
 as_fn_error 77 "C compiler cannot create executables
-See \`config.log' for more details" "$LINENO" 5 ; }
+See \`config.log' for more details" "$LINENO" 5; }
 else
   { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5
@@ -3485 +3493 @@
 $as_echo "$as_me: error: in \`$ac_pwd':" >&2;}
 as_fn_error $? "cannot compute suffix of executables: cannot compile and link
-See \`config.log' for more details" "$LINENO" 5 ; }
+See \`config.log' for more details" "$LINENO" 5; }
 fi
 rm -f conftest conftest$ac_cv_exeext
@@ -3544 +3552 @@
 as_fn_error $? "cannot run C compiled programs.
 If you meant to cross compile, use \`--host'.
-See \`config.log' for more details" "$LINENO" 5 ; }
+See \`config.log' for more details" "$LINENO" 5; }
     fi
   fi
@@ -3555 +3563 @@
 { $as_echo "$as_me:${as_lineno-$LINENO}: checking for suffix of object files" >&5
 $as_echo_n "checking for suffix of object files... " >&6; }
-if test "${ac_cv_objext+set}" = set; then :
+if ${ac_cv_objext+:} false; then :
   $as_echo_n "(cached) " >&6
 else
@@ -3596 +3604 @@
 $as_echo "$as_me: error: in \`$ac_pwd':" >&2;}
 as_fn_error $? "cannot compute suffix of object files: cannot compile
-See \`config.log' for more details" "$LINENO" 5 ; }
+See \`config.log' for more details" "$LINENO" 5; }
 fi
 rm -f conftest.$ac_cv_objext conftest.$ac_ext
@@ -3606 +3614 @@
 { $as_echo "$as_me:${as_lineno-$LINENO}: checking whether we are using the GNU C compiler" >&5
 $as_echo_n "checking whether we are using the GNU C compiler... " >&6; }
-if test "${ac_cv_c_compiler_gnu+set}" = set; then :
+if ${ac_cv_c_compiler_gnu+:} false; then :
   $as_echo_n "(cached) " >&6
 else
@@ -3643 +3651 @@
 { $as_echo "$as_me:${as_lineno-$LINENO}: checking whether $CC accepts -g" >&5
 $as_echo_n "checking whether $CC accepts -g... " >&6; }
-if test "${ac_cv_prog_cc_g+set}" = set; then :
+if ${ac_cv_prog_cc_g+:} false; then :
   $as_echo_n "(cached) " >&6
 else
@@ -3721 +3729 @@
 { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $CC option to accept ISO C89" >&5
 $as_echo_n "checking for $CC option to accept ISO C89... " >&6; }
-if test "${ac_cv_prog_cc_c89+set}" = set; then :
+if ${ac_cv_prog_cc_c89+:} false; then :
   $as_echo_n "(cached) " >&6
 else
@@ -3832 +3840 @@
 { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
 $as_echo_n "checking for $ac_word... " >&6; }
-if test "${ac_cv_prog_CXX+set}" = set; then :
+if ${ac_cv_prog_CXX+:} false; then :
   $as_echo_n "(cached) " >&6
 else
@@ -3876 +3884 @@
 { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
 $as_echo_n "checking for $ac_word... " >&6; }
-if test "${ac_cv_prog_ac_ct_CXX+set}" = set; then :
+if ${ac_cv_prog_ac_ct_CXX+:} false; then :
   $as_echo_n "(cached) " >&6
 else
@@ -3954 +3962 @@
 { $as_echo "$as_me:${as_lineno-$LINENO}: checking whether we are using the GNU C++ compiler" >&5
 $as_echo_n "checking whether we are using the GNU C++ compiler... " >&6; }
-if test "${ac_cv_cxx_compiler_gnu+set}" = set; then :
+if ${ac_cv_cxx_compiler_gnu+:} false; then :
   $as_echo_n "(cached) " >&6
 else
@@ -3991 +3999 @@
 { $as_echo "$as_me:${as_lineno-$LINENO}: checking whether $CXX accepts -g" >&5
 $as_echo_n "checking whether $CXX accepts -g... " >&6; }
-if test "${ac_cv_prog_cxx_g+set}" = set; then :
+if ${ac_cv_prog_cxx_g+:} false; then :
   $as_echo_n "(cached) " >&6
 else
@@ -4085 +4093 @@
 { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
 $as_echo_n "checking for $ac_word... " >&6; }
-if test "${ac_cv_prog_F77+set}" = set; then :
+if ${ac_cv_prog_F77+:} false; then :
   $as_echo_n "(cached) " >&6
 else
@@ -4129 +4137 @@
 { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
 $as_echo_n "checking for $ac_word... " >&6; }
-if test "${ac_cv_prog_ac_ct_F77+set}" = set; then :
+if ${ac_cv_prog_ac_ct_F77+:} false; then :
   $as_echo_n "(cached) " >&6
 else
@@ -4211 +4219 @@
 { $as_echo "$as_me:${as_lineno-$LINENO}: checking whether we are using the GNU Fortran 77 compiler" >&5
 $as_echo_n "checking whether we are using the GNU Fortran 77 compiler... " >&6; }
-if test "${ac_cv_f77_compiler_gnu+set}" = set; then :
+if ${ac_cv_f77_compiler_gnu+:} false; then :
   $as_echo_n "(cached) " >&6
 else
@@ -4239 +4247 @@
 { $as_echo "$as_me:${as_lineno-$LINENO}: checking whether $F77 accepts -g" >&5
 $as_echo_n "checking whether $F77 accepts -g... " >&6; }
-if test "${ac_cv_prog_f77_g+set}" = set; then :
+if ${ac_cv_prog_f77_g+:} false; then :
   $as_echo_n "(cached) " >&6
 else
@@ -4306 +4314 @@
 fi
 if test -z "$CPP"; then
-  if test "${ac_cv_prog_CPP+set}" = set; then :
+  if ${ac_cv_prog_CPP+:} false; then :
   $as_echo_n "(cached) " >&6
 else
@@ -4422 +4430 @@
 $as_echo "$as_me: error: in \`$ac_pwd':" >&2;}
 as_fn_error $? "C preprocessor \"$CPP\" fails sanity check
-See \`config.log' for more details" "$LINENO" 5 ; }
+See \`config.log' for more details" "$LINENO" 5; }
 fi
 
@@ -4434 +4442 @@
 { $as_echo "$as_me:${as_lineno-$LINENO}: checking for grep that handles long lines and -e" >&5
 $as_echo_n "checking for grep that handles long lines and -e... " >&6; }
-if test "${ac_cv_path_GREP+set}" = set; then :
+if ${ac_cv_path_GREP+:} false; then :
   $as_echo_n "(cached) " >&6
 else
@@ -4497 +4505 @@
 { $as_echo "$as_me:${as_lineno-$LINENO}: checking for egrep" >&5
 $as_echo_n "checking for egrep... " >&6; }
-if test "${ac_cv_path_EGREP+set}" = set; then :
+if ${ac_cv_path_EGREP+:} false; then :
   $as_echo_n "(cached) " >&6
 else
@@ -4564 +4572 @@
 { $as_echo "$as_me:${as_lineno-$LINENO}: checking for ANSI C header files" >&5
 $as_echo_n "checking for ANSI C header files... " >&6; }
-if test "${ac_cv_header_stdc+set}" = set; then :
+if ${ac_cv_header_stdc+:} false; then :
   $as_echo_n "(cached) " >&6
 else
@@ -4675 +4683 @@
 
 ac_fn_c_check_func "$LINENO" "atol" "ac_cv_func_atol"
-if test "x$ac_cv_func_atol" = x""yes; then :
+if test "x$ac_cv_func_atol" = xyes; then :
 
 else
@@ -4693 +4701 @@
 do :
   ac_fn_cxx_check_func "$LINENO" "sysinfo" "ac_cv_func_sysinfo"
-if test "x$ac_cv_func_sysinfo" = x""yes; then :
+if test "x$ac_cv_func_sysinfo" = xyes; then :
   cat >>confdefs.h <<_ACEOF
 #define HAVE_SYSINFO 1
@@ -4709 +4717 @@
 $as_echo_n "checking how to run the C++ preprocessor... " >&6; }
 if test -z "$CXXCPP"; then
-  if test "${ac_cv_prog_CXXCPP+set}" = set; then :
+  if ${ac_cv_prog_CXXCPP+:} false; then :
   $as_echo_n "(cached) " >&6
 else
@@ -4825 +4833 @@
 $as_echo "$as_me: error: in \`$ac_pwd':" >&2;}
 as_fn_error $? "C++ preprocessor \"$CXXCPP\" fails sanity check
-See \`config.log' for more details" "$LINENO" 5 ; }
+See \`config.log' for more details" "$LINENO" 5; }
 fi
 
@@ -4855 +4863 @@
 do :
   ac_fn_cxx_check_header_mongrel "$LINENO" "sys/sysinfo.h" "ac_cv_header_sys_sysinfo_h" "$ac_includes_default"
-if test "x$ac_cv_header_sys_sysinfo_h" = x""yes; then :
+if test "x$ac_cv_header_sys_sysinfo_h" = xyes; then :
   cat >>confdefs.h <<_ACEOF
 #define HAVE_SYS_SYSINFO_H 1
@@ -4867 +4875 @@
 { $as_echo "$as_me:${as_lineno-$LINENO}: checking for main in -lm" >&5
 $as_echo_n "checking for main in -lm... " >&6; }
-if test "${ac_cv_lib_m_main+set}" = set; then :
+if ${ac_cv_lib_m_main+:} false; then :
   $as_echo_n "(cached) " >&6
 else
@@ -4895 +4903 @@
 { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_m_main" >&5
 $as_echo "$ac_cv_lib_m_main" >&6; }
-if test "x$ac_cv_lib_m_main" = x""yes; then :
+if test "x$ac_cv_lib_m_main" = xyes; then :
   cat >>confdefs.h <<_ACEOF
 #define HAVE_LIBM 1
@@ -4909 +4917 @@
 { $as_echo "$as_me:${as_lineno-$LINENO}: checking for clrtoeol in -lncurses" >&5
 $as_echo_n "checking for clrtoeol in -lncurses... " >&6; }
-if test "${ac_cv_lib_ncurses_clrtoeol+set}" = set; then :
+if ${ac_cv_lib_ncurses_clrtoeol+:} false; then :
   $as_echo_n "(cached) " >&6
 else
@@ -4943 +4951 @@
 { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_ncurses_clrtoeol" >&5
 $as_echo "$ac_cv_lib_ncurses_clrtoeol" >&6; }
-if test "x$ac_cv_lib_ncurses_clrtoeol" = x""yes; then :
+if test "x$ac_cv_lib_ncurses_clrtoeol" = xyes; then :
   cat >>confdefs.h <<_ACEOF
 #define HAVE_LIBNCURSES 1
@@ -4957 +4965 @@
 do :
   ac_fn_cxx_check_header_mongrel "$LINENO" "ncurses.h" "ac_cv_header_ncurses_h" "$ac_includes_default"
-if test "x$ac_cv_header_ncurses_h" = x""yes; then :
+if test "x$ac_cv_header_ncurses_h" = xyes; then :
   cat >>confdefs.h <<_ACEOF
 #define HAVE_NCURSES_H 1
@@ -4972 +4980 @@
 { $as_echo "$as_me:${as_lineno-$LINENO}: checking for main in -lstdc++" >&5
 $as_echo_n "checking for main in -lstdc++... " >&6; }
-if test "${ac_cv_lib_stdcpp_main+set}" = set; then :
+if ${ac_cv_lib_stdcpp_main+:} false; then :
   $as_echo_n "(cached) " >&6
 else
@@ -5000 +5008 @@
 { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_stdcpp_main" >&5
 $as_echo "$ac_cv_lib_stdcpp_main" >&6; }
-if test "x$ac_cv_lib_stdcpp_main" = x""yes; then :
+if test "x$ac_cv_lib_stdcpp_main" = xyes; then :
   cat >>confdefs.h <<_ACEOF
 #define HAVE_LIBSTDC__ 1
@@ -5014 +5022 @@
 do :
   ac_fn_cxx_check_header_mongrel "$LINENO" "algorithm" "ac_cv_header_algorithm" "$ac_includes_default"
-if test "x$ac_cv_header_algorithm" = x""yes; then :
+if test "x$ac_cv_header_algorithm" = xyes; then :
   cat >>confdefs.h <<_ACEOF
 #define HAVE_ALGORITHM 1
@@ -5029 +5037 @@
 do :
   ac_fn_cxx_check_header_mongrel "$LINENO" "cctype" "ac_cv_header_cctype" "$ac_includes_default"
-if test "x$ac_cv_header_cctype" = x""yes; then :
+if test "x$ac_cv_header_cctype" = xyes; then :
   cat >>confdefs.h <<_ACEOF
 #define HAVE_CCTYPE 1
@@ -5044 +5052 @@
 do :
   ac_fn_cxx_check_header_mongrel "$LINENO" "cfloat" "ac_cv_header_cfloat" "$ac_includes_default"
-if test "x$ac_cv_header_cfloat" = x""yes; then :
+if test "x$ac_cv_header_cfloat" = xyes; then :
   cat >>confdefs.h <<_ACEOF
 #define HAVE_CFLOAT 1
@@ -5059 +5067 @@
 do :
   ac_fn_cxx_check_header_mongrel "$LINENO" "cmath" "ac_cv_header_cmath" "$ac_includes_default"
-if test "x$ac_cv_header_cmath" = x""yes; then :
+if test "x$ac_cv_header_cmath" = xyes; then :
   cat >>confdefs.h <<_ACEOF
 #define HAVE_CMATH 1
@@ -5074 +5082 @@
 do :
   ac_fn_cxx_check_header_mongrel "$LINENO" "cstdio" "ac_cv_header_cstdio" "$ac_includes_default"
-if test "x$ac_cv_header_cstdio" = x""yes; then :
+if test "x$ac_cv_header_cstdio" = xyes; then :
   cat >>confdefs.h <<_ACEOF
 #define HAVE_CSTDIO 1
@@ -5089 +5097 @@
 do :
   ac_fn_cxx_check_header_mongrel "$LINENO" "cstdlib" "ac_cv_header_cstdlib" "$ac_includes_default"
-if test "x$ac_cv_header_cstdlib" = x""yes; then :
+if test "x$ac_cv_header_cstdlib" = xyes; then :
   cat >>confdefs.h <<_ACEOF
 #define HAVE_CSTDLIB 1
@@ -5104 +5112 @@
 do :
   ac_fn_cxx_check_header_mongrel "$LINENO" "cstring" "ac_cv_header_cstring" "$ac_includes_default"
-if test "x$ac_cv_header_cstring" = x""yes; then :
+if test "x$ac_cv_header_cstring" = xyes; then :
   cat >>confdefs.h <<_ACEOF
 #define HAVE_CSTRING 1
@@ -5119 +5127 @@
 do :
   ac_fn_cxx_check_header_mongrel "$LINENO" "fstream" "ac_cv_header_fstream" "$ac_includes_default"
-if test "x$ac_cv_header_fstream" = x""yes; then :
+if test "x$ac_cv_header_fstream" = xyes; then :
   cat >>confdefs.h <<_ACEOF
 #define HAVE_FSTREAM 1
@@ -5134 +5142 @@
 do :
   ac_fn_cxx_check_header_mongrel "$LINENO" "list" "ac_cv_header_list" "$ac_includes_default"
-if test "x$ac_cv_header_list" = x""yes; then :
+if test "x$ac_cv_header_list" = xyes; then :
   cat >>confdefs.h <<_ACEOF
 #define HAVE_LIST 1
@@ -5149 +5157 @@
 do :
   ac_fn_cxx_check_header_mongrel "$LINENO" "iostream" "ac_cv_header_iostream" "$ac_includes_default"
-if test "x$ac_cv_header_iostream" = x""yes; then :
+if test "x$ac_cv_header_iostream" = xyes; then :
   cat >>confdefs.h <<_ACEOF
 #define HAVE_IOSTREAM 1
@@ -5164 +5172 @@
 do :
   ac_fn_cxx_check_header_mongrel "$LINENO" "iterator" "ac_cv_header_iterator" "$ac_includes_default"
-if test "x$ac_cv_header_iterator" = x""yes; then :
+if test "x$ac_cv_header_iterator" = xyes; then :
   cat >>confdefs.h <<_ACEOF
 #define HAVE_ITERATOR 1
@@ -5179 +5187 @@
 do :
   ac_fn_cxx_check_header_mongrel "$LINENO" "sstream" "ac_cv_header_sstream" "$ac_includes_default"
-if test "x$ac_cv_header_sstream" = x""yes; then :
+if test "x$ac_cv_header_sstream" = xyes; then :
   cat >>confdefs.h <<_ACEOF
 #define HAVE_SSTREAM 1
@@ -5194 +5202 @@
 do :
   ac_fn_cxx_check_header_mongrel "$LINENO" "stack" "ac_cv_header_stack" "$ac_includes_default"
-if test "x$ac_cv_header_stack" = x""yes; then :
+if test "x$ac_cv_header_stack" = xyes; then :
   cat >>confdefs.h <<_ACEOF
 #define HAVE_STACK 1
@@ -5209 +5217 @@
 do :
   ac_fn_cxx_check_header_mongrel "$LINENO" "string" "ac_cv_header_string" "$ac_includes_default"
-if test "x$ac_cv_header_string" = x""yes; then :
+if test "x$ac_cv_header_string" = xyes; then :
   cat >>confdefs.h <<_ACEOF
 #define HAVE_STRING 1
@@ -5224 +5232 @@
 do :
   ac_fn_cxx_check_header_mongrel "$LINENO" "vector" "ac_cv_header_vector" "$ac_includes_default"
-if test "x$ac_cv_header_vector" = x""yes; then :
+if test "x$ac_cv_header_vector" = xyes; then :
   cat >>confdefs.h <<_ACEOF
 #define HAVE_VECTOR 1
@@ -5240 +5248 @@
 do :
   ac_fn_cxx_check_header_mongrel "$LINENO" "assert.h" "ac_cv_header_assert_h" "$ac_includes_default"
-if test "x$ac_cv_header_assert_h" = x""yes; then :
+if test "x$ac_cv_header_assert_h" = xyes; then :
   cat >>confdefs.h <<_ACEOF
 #define HAVE_ASSERT_H 1
@@ -5255 +5263 @@
 do :
   ac_fn_cxx_check_header_mongrel "$LINENO" "ctype.h" "ac_cv_header_ctype_h" "$ac_includes_default"
-if test "x$ac_cv_header_ctype_h" = x""yes; then :
+if test "x$ac_cv_header_ctype_h" = xyes; then :
   cat >>confdefs.h <<_ACEOF
 #define HAVE_CTYPE_H 1
@@ -5270 +5278 @@
 do :
   ac_fn_cxx_check_header_mongrel "$LINENO" "errno.h" "ac_cv_header_errno_h" "$ac_includes_default"
-if test "x$ac_cv_header_errno_h" = x""yes; then :
+if test "x$ac_cv_header_errno_h" = xyes; then :
   cat >>confdefs.h <<_ACEOF
 #define HAVE_ERRNO_H 1
@@ -5285 +5293 @@
 do :
   ac_fn_cxx_check_header_mongrel "$LINENO" "limits.h" "ac_cv_header_limits_h" "$ac_includes_default"
-if test "x$ac_cv_header_limits_h" = x""yes; then :
+if test "x$ac_cv_header_limits_h" = xyes; then :
   cat >>confdefs.h <<_ACEOF
 #define HAVE_LIMITS_H 1
@@ -5300 +5308 @@
 do :
   ac_fn_cxx_check_header_mongrel "$LINENO" "string.h" "ac_cv_header_string_h" "$ac_includes_default"
-if test "x$ac_cv_header_string_h" = x""yes; then :
+if test "x$ac_cv_header_string_h" = xyes; then :
   cat >>confdefs.h <<_ACEOF
 #define HAVE_STRING_H 1
@@ -5315 +5323 @@
 do :
   ac_fn_cxx_check_header_mongrel "$LINENO" "stdlib.h" "ac_cv_header_stdlib_h" "$ac_includes_default"
-if test "x$ac_cv_header_stdlib_h" = x""yes; then :
+if test "x$ac_cv_header_stdlib_h" = xyes; then :
   cat >>confdefs.h <<_ACEOF
 #define HAVE_STDLIB_H 1
@@ -5330 +5338 @@
 do :
   ac_fn_cxx_check_header_mongrel "$LINENO" "stddef.h" "ac_cv_header_stddef_h" "$ac_includes_default"
-if test "x$ac_cv_header_stddef_h" = x""yes; then :
+if test "x$ac_cv_header_stddef_h" = xyes; then :
   cat >>confdefs.h <<_ACEOF
 #define HAVE_STDDEF_H 1
@@ -5345 +5353 @@
 do :
   ac_fn_cxx_check_header_mongrel "$LINENO" "float.h" "ac_cv_header_float_h" "$ac_includes_default"
-if test "x$ac_cv_header_float_h" = x""yes; then :
+if test "x$ac_cv_header_float_h" = xyes; then :
   cat >>confdefs.h <<_ACEOF
 #define HAVE_FLOAT_H 1
@@ -5360 +5368 @@
 do :
   ac_fn_cxx_check_header_mongrel "$LINENO" "math.h" "ac_cv_header_math_h" "$ac_includes_default"
-if test "x$ac_cv_header_math_h" = x""yes; then :
+if test "x$ac_cv_header_math_h" = xyes; then :
   cat >>confdefs.h <<_ACEOF
 #define HAVE_MATH_H 1
@@ -5375 +5383 @@
 do :
   ac_fn_cxx_check_header_mongrel "$LINENO" "malloc.h" "ac_cv_header_malloc_h" "$ac_includes_default"
-if test "x$ac_cv_header_malloc_h" = x""yes; then :
+if test "x$ac_cv_header_malloc_h" = xyes; then :
   cat >>confdefs.h <<_ACEOF
 #define HAVE_MALLOC_H 1
@@ -5390 +5398 @@
 do :
   ac_fn_cxx_check_header_mongrel "$LINENO" "memory.h" "ac_cv_header_memory_h" "$ac_includes_default"
-if test "x$ac_cv_header_memory_h" = x""yes; then :
+if test "x$ac_cv_header_memory_h" = xyes; then :
   cat >>confdefs.h <<_ACEOF
 #define HAVE_MEMORY_H 1
@@ -5405 +5413 @@
 do :
   ac_fn_cxx_check_header_mongrel "$LINENO" "unistd.h" "ac_cv_header_unistd_h" "$ac_includes_default"
-if test "x$ac_cv_header_unistd_h" = x""yes; then :
+if test "x$ac_cv_header_unistd_h" = xyes; then :
   cat >>confdefs.h <<_ACEOF
 #define HAVE_UNISTD_H 1
@@ -5421 +5429 @@
 do :
   ac_fn_cxx_check_header_mongrel "$LINENO" "inttypes.h" "ac_cv_header_inttypes_h" "$ac_includes_default"
-if test "x$ac_cv_header_inttypes_h" = x""yes; then :
+if test "x$ac_cv_header_inttypes_h" = xyes; then :
   cat >>confdefs.h <<_ACEOF
 #define HAVE_INTTYPES_H 1
@@ -5481 +5489 @@
     { $as_echo "$as_me:${as_lineno-$LINENO}: checking system version" >&5
 $as_echo_n "checking system version... " >&6; }
-if test "${tcl_cv_sys_version+set}" = set; then :
+if ${tcl_cv_sys_version+:} false; then :
   $as_echo_n "(cached) " >&6
 else
@@ -5517 +5525 @@
     { $as_echo "$as_me:${as_lineno-$LINENO}: checking for dlopen in -ldl" >&5
 $as_echo_n "checking for dlopen in -ldl... " >&6; }
-if test "${ac_cv_lib_dl_dlopen+set}" = set; then :
+if ${ac_cv_lib_dl_dlopen+:} false; then :
   $as_echo_n "(cached) " >&6
 else
@@ -5551 +5559 @@
 { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_dl_dlopen" >&5
 $as_echo "$ac_cv_lib_dl_dlopen" >&6; }
-if test "x$ac_cv_lib_dl_dlopen" = x""yes; then :
+if test "x$ac_cv_lib_dl_dlopen" = xyes; then :
   have_dl=yes
 else
@@ -5585 +5593 @@
 { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
 $as_echo_n "checking for $ac_word... " >&6; }
-if test "${ac_cv_prog_AR+set}" = set; then :
+if ${ac_cv_prog_AR+:} false; then :
   $as_echo_n "(cached) " >&6
 else
@@ -5710 +5718 @@
             { $as_echo "$as_me:${as_lineno-$LINENO}: checking for gettimeofday in -lbsd" >&5
 $as_echo_n "checking for gettimeofday in -lbsd... " >&6; }
-if test "${ac_cv_lib_bsd_gettimeofday+set}" = set; then :
+if ${ac_cv_lib_bsd_gettimeofday+:} false; then :
   $as_echo_n "(cached) " >&6
 else
@@ -5744 +5752 @@
 { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_bsd_gettimeofday" >&5
 $as_echo "$ac_cv_lib_bsd_gettimeofday" >&6; }
-if test "x$ac_cv_lib_bsd_gettimeofday" = x""yes; then :
+if test "x$ac_cv_lib_bsd_gettimeofday" = xyes; then :
   libbsd=yes
 else
@@ -5771 +5779 @@
             { $as_echo "$as_me:${as_lineno-$LINENO}: checking for inet_ntoa in -lbind" >&5
 $as_echo_n "checking for inet_ntoa in -lbind... " >&6; }
-if test "${ac_cv_lib_bind_inet_ntoa+set}" = set; then :
+if ${ac_cv_lib_bind_inet_ntoa+:} false; then :
   $as_echo_n "(cached) " >&6
 else
@@ -5805 +5813 @@
 { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_bind_inet_ntoa" >&5
 $as_echo "$ac_cv_lib_bind_inet_ntoa" >&6; }
-if test "x$ac_cv_lib_bind_inet_ntoa" = x""yes; then :
+if test "x$ac_cv_lib_bind_inet_ntoa" = xyes; then :
   LIBS="$LIBS -lbind -lsocket"
 fi
@@ -5856 +5864 @@
             { $as_echo "$as_me:${as_lineno-$LINENO}: checking for shl_load in -ldld" >&5
 $as_echo_n "checking for shl_load in -ldld... " >&6; }
-if test "${ac_cv_lib_dld_shl_load+set}" = set; then :
+if ${ac_cv_lib_dld_shl_load+:} false; then :
   $as_echo_n "(cached) " >&6
 else
@@ -5890 +5898 @@
 { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_dld_shl_load" >&5
 $as_echo "$ac_cv_lib_dld_shl_load" >&6; }
-if test "x$ac_cv_lib_dld_shl_load" = x""yes; then :
+if test "x$ac_cv_lib_dld_shl_load" = xyes; then :
   tcl_ok=yes
 else
@@ -5945 +5953 @@
             { $as_echo "$as_me:${as_lineno-$LINENO}: checking for shl_load in -ldld" >&5
 $as_echo_n "checking for shl_load in -ldld... " >&6; }
-if test "${ac_cv_lib_dld_shl_load+set}" = set; then :
+if ${ac_cv_lib_dld_shl_load+:} false; then :
   $as_echo_n "(cached) " >&6
 else
@@ -5979 +5987 @@
 { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_dld_shl_load" >&5
 $as_echo "$ac_cv_lib_dld_shl_load" >&6; }
-if test "x$ac_cv_lib_dld_shl_load" = x""yes; then :
+if test "x$ac_cv_lib_dld_shl_load" = xyes; then :
   tcl_ok=yes
 else
@@ -6088 +6096 @@
             else
                 ac_fn_cxx_check_header_mongrel "$LINENO" "dld.h" "ac_cv_header_dld_h" "$ac_includes_default"
-if test "x$ac_cv_header_dld_h" = x""yes; then :
+if test "x$ac_cv_header_dld_h" = xyes; then :
 
                     SHLIB_LD="ld -shared"
@@ -6105 +6113 @@
                 { $as_echo "$as_me:${as_lineno-$LINENO}: checking if compiler accepts -m64 flag" >&5
 $as_echo_n "checking if compiler accepts -m64 flag... " >&6; }
-if test "${tcl_cv_cc_m64+set}" = set; then :
+if ${tcl_cv_cc_m64+:} false; then :
   $as_echo_n "(cached) " >&6
 else
@@ -6169 +6177 @@
             else
                 ac_fn_cxx_check_header_mongrel "$LINENO" "dld.h" "ac_cv_header_dld_h" "$ac_includes_default"
-if test "x$ac_cv_header_dld_h" = x""yes; then :
+if test "x$ac_cv_header_dld_h" = xyes; then :
 
                     SHLIB_LD="ld -shared"
@@ -6220 +6228 @@
             # Not available on all versions:  check for include file.
             ac_fn_cxx_check_header_mongrel "$LINENO" "dlfcn.h" "ac_cv_header_dlfcn_h" "$ac_includes_default"
-if test "x$ac_cv_header_dlfcn_h" = x""yes; then :
+if test "x$ac_cv_header_dlfcn_h" = xyes; then :
 
                 # NetBSD/SPARC needs -fPIC, -fpic will not do.
@@ -6233 +6241 @@
                 { $as_echo "$as_me:${as_lineno-$LINENO}: checking for ELF" >&5
 $as_echo_n "checking for ELF... " >&6; }
-if test "${tcl_cv_ld_elf+set}" = set; then :
+if ${tcl_cv_ld_elf+:} false; then :
   $as_echo_n "(cached) " >&6
 else
@@ -6315 +6323 @@
                 { $as_echo "$as_me:${as_lineno-$LINENO}: checking for ELF" >&5
 $as_echo_n "checking for ELF... " >&6; }
-if test "${tcl_cv_ld_elf+set}" = set; then :
+if ${tcl_cv_ld_elf+:} false; then :
   $as_echo_n "(cached) " >&6
 else
@@ -6393 +6401 @@
                         { $as_echo "$as_me:${as_lineno-$LINENO}: checking if compiler accepts -arch ppc64 flag" >&5
 $as_echo_n "checking if compiler accepts -arch ppc64 flag... " >&6; }
-if test "${tcl_cv_cc_arch_ppc64+set}" = set; then :
+if ${tcl_cv_cc_arch_ppc64+:} false; then :
   $as_echo_n "(cached) " >&6
 else
@@ -6428 +6436 @@
                         { $as_echo "$as_me:${as_lineno-$LINENO}: checking if compiler accepts -arch x86_64 flag" >&5
 $as_echo_n "checking if compiler accepts -arch x86_64 flag... " >&6; }
-if test "${tcl_cv_cc_arch_x86_64+set}" = set; then :
+if ${tcl_cv_cc_arch_x86_64+:} false; then :
   $as_echo_n "(cached) " >&6
 else
@@ -6473 +6481 @@
             { $as_echo "$as_me:${as_lineno-$LINENO}: checking if ld accepts -single_module flag" >&5
 $as_echo_n "checking if ld accepts -single_module flag... " >&6; }
-if test "${tcl_cv_ld_single_module+set}" = set; then :
+if ${tcl_cv_ld_single_module+:} false; then :
   $as_echo_n "(cached) " >&6
 else
@@ -6515 +6523 @@
             { $as_echo "$as_me:${as_lineno-$LINENO}: checking if ld accepts -search_paths_first flag" >&5
 $as_echo_n "checking if ld accepts -search_paths_first flag... " >&6; }
-if test "${tcl_cv_ld_search_paths_first+set}" = set; then :
+if ${tcl_cv_ld_search_paths_first+:} false; then :
   $as_echo_n "(cached) " >&6
 else
@@ -6565 +6573 @@
                 { $as_echo "$as_me:${as_lineno-$LINENO}: checking for CoreFoundation.framework" >&5
 $as_echo_n "checking for CoreFoundation.framework... " >&6; }
-if test "${tcl_cv_lib_corefoundation+set}" = set; then :
+if ${tcl_cv_lib_corefoundation+:} false; then :
   $as_echo_n "(cached) " >&6
 else
@@ -6611 +6619 @@
                     { $as_echo "$as_me:${as_lineno-$LINENO}: checking for 64-bit CoreFoundation" >&5
 $as_echo_n "checking for 64-bit CoreFoundation... " >&6; }
-if test "${tcl_cv_lib_corefoundation_64+set}" = set; then :
+if ${tcl_cv_lib_corefoundation_64+:} false; then :
   $as_echo_n "(cached) " >&6
 else
@@ -6936 +6944 @@
             { $as_echo "$as_me:${as_lineno-$LINENO}: checking for ld accepts -Bexport flag" >&5
 $as_echo_n "checking for ld accepts -Bexport flag... " >&6; }
-if test "${tcl_cv_ld_Bexport+set}" = set; then :
+if ${tcl_cv_ld_Bexport+:} false; then :
   $as_echo_n "(cached) " >&6
 else
@@ -7002 +7010 @@
         { $as_echo "$as_me:${as_lineno-$LINENO}: checking sys/exec.h" >&5
 $as_echo_n "checking sys/exec.h... " >&6; }
-if test "${tcl_cv_sysexec_h+set}" = set; then :
+if ${tcl_cv_sysexec_h+:} false; then :
   $as_echo_n "(cached) " >&6
 else
@@ -7043 +7051 @@
             { $as_echo "$as_me:${as_lineno-$LINENO}: checking a.out.h" >&5
 $as_echo_n "checking a.out.h... " >&6; }
-if test "${tcl_cv_aout_h+set}" = set; then :
+if ${tcl_cv_aout_h+:} false; then :
   $as_echo_n "(cached) " >&6
 else
@@ -7084 +7092 @@
                 { $as_echo "$as_me:${as_lineno-$LINENO}: checking sys/exec_aout.h" >&5
 $as_echo_n "checking sys/exec_aout.h... " >&6; }
-if test "${tcl_cv_sysexecaout_h+set}" = set; then :
+if ${tcl_cv_sysexecaout_h+:} false; then :
   $as_echo_n "(cached) " >&6
 else
@@ -7316 +7324 @@
 { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
 $as_echo_n "checking for $ac_word... " >&6; }
-if test "${ac_cv_path_TCLSH+set}" = set; then :
+if ${ac_cv_path_TCLSH+:} false; then :
   $as_echo_n "(cached) " >&6
 else
@@ -7358 +7366 @@
 { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
 $as_echo_n "checking for $ac_word... " >&6; }
-if test "${ac_cv_path_TCLSH+set}" = set; then :
+if ${ac_cv_path_TCLSH+:} false; then :
   $as_echo_n "(cached) " >&6
 else
@@ -7460 +7468 @@
 { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
 $as_echo_n "checking for $ac_word... " >&6; }
-if test "${ac_cv_path_MATLAB+set}" = set; then :
+if ${ac_cv_path_MATLAB+:} false; then :
   $as_echo_n "(cached) " >&6
 else
@@ -7501 +7509 @@
 { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
 $as_echo_n "checking for $ac_word... " >&6; }
-if test "${ac_cv_path_MATLAB+set}" = set; then :
+if ${ac_cv_path_MATLAB+:} false; then :
   $as_echo_n "(cached) " >&6
 else
@@ -7552 +7560 @@
 { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
 $as_echo_n "checking for $ac_word... " >&6; }
-if test "${ac_cv_path_MEX+set}" = set; then :
+if ${ac_cv_path_MEX+:} false; then :
   $as_echo_n "(cached) " >&6
 else
@@ -7592 +7600 @@
 { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
 $as_echo_n "checking for $ac_word... " >&6; }
-if test "${ac_cv_path_MEXEXT+set}" = set; then :
+if ${ac_cv_path_MEXEXT+:} false; then :
   $as_echo_n "(cached) " >&6
 else
@@ -7643 +7651 @@
 { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
 $as_echo_n "checking for $ac_word... " >&6; }
-if test "${ac_cv_path_MCC+set}" = set; then :
+if ${ac_cv_path_MCC+:} false; then :
   $as_echo_n "(cached) " >&6
 else
@@ -7705 +7713 @@
 { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
 $as_echo_n "checking for $ac_word... " >&6; }
-if test "${ac_cv_path_OCTAVE+set}" = set; then :
+if ${ac_cv_path_OCTAVE+:} false; then :
   $as_echo_n "(cached) " >&6
 else
@@ -7745 +7753 @@
 { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
 $as_echo_n "checking for $ac_word... " >&6; }
-if test "${ac_cv_path_MKOCTFILE+set}" = set; then :
+if ${ac_cv_path_MKOCTFILE+:} false; then :
   $as_echo_n "(cached) " >&6
 else
@@ -7832 +7840 @@
 { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
 $as_echo_n "checking for $ac_word... " >&6; }
-if test "${ac_cv_path_mkoctfile3+set}" = set; then :
+if ${ac_cv_path_mkoctfile3+:} false; then :
   $as_echo_n "(cached) " >&6
 else
@@ -7892 +7900 @@
 { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
 $as_echo_n "checking for $ac_word... " >&6; }
-if test "${ac_cv_path_mkoctfile2+set}" = set; then :
+if ${ac_cv_path_mkoctfile2+:} false; then :
   $as_echo_n "(cached) " >&6
 else
@@ -7965 +7973 @@
 { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
 $as_echo_n "checking for $ac_word... " >&6; }
-if test "${ac_cv_path_PERL+set}" = set; then :
+if ${ac_cv_path_PERL+:} false; then :
   $as_echo_n "(cached) " >&6
 else
@@ -8006 +8014 @@
 { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
 $as_echo_n "checking for $ac_word... " >&6; }
-if test "${ac_cv_path_XSUBPP+set}" = set; then :
+if ${ac_cv_path_XSUBPP+:} false; then :
   $as_echo_n "(cached) " >&6
 else
@@ -8048 +8056 @@
 { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
 $as_echo_n "checking for $ac_word... " >&6; }
-if test "${ac_cv_path_PERL+set}" = set; then :
+if ${ac_cv_path_PERL+:} false; then :
   $as_echo_n "(cached) " >&6
 else
@@ -8088 +8096 @@
 { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
 $as_echo_n "checking for $ac_word... " >&6; }
-if test "${ac_cv_path_XSUBPP+set}" = set; then :
+if ${ac_cv_path_XSUBPP+:} false; then :
   $as_echo_n "(cached) " >&6
 else
@@ -8170 +8178 @@
 { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
 $as_echo_n "checking for $ac_word... " >&6; }
-if test "${ac_cv_path_PYTHON+set}" = set; then :
+if ${ac_cv_path_PYTHON+:} false; then :
   $as_echo_n "(cached) " >&6
 else
@@ -8211 +8219 @@
 { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
 $as_echo_n "checking for $ac_word... " >&6; }
-if test "${ac_cv_path_PYTHON+set}" = set; then :
+if ${ac_cv_path_PYTHON+:} false; then :
   $as_echo_n "(cached) " >&6
 else
@@ -8295 +8303 @@
 do :
   ac_fn_cxx_check_header_mongrel "$LINENO" "Python.h" "ac_cv_header_Python_h" "$ac_includes_default"
-if test "x$ac_cv_header_Python_h" = x""yes; then :
+if test "x$ac_cv_header_Python_h" = xyes; then :
   cat >>confdefs.h <<_ACEOF
 #define HAVE_PYTHON_H 1
@@ -8333 +8341 @@
 { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
 $as_echo_n "checking for $ac_word... " >&6; }
-if test "${ac_cv_path_JAVA+set}" = set; then :
+if ${ac_cv_path_JAVA+:} false; then :
   $as_echo_n "(cached) " >&6
 else
@@ -8373 +8381 @@
 { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
 $as_echo_n "checking for $ac_word... " >&6; }
-if test "${ac_cv_path_JAVAC+set}" = set; then :
+if ${ac_cv_path_JAVAC+:} false; then :
   $as_echo_n "(cached) " >&6
 else
@@ -8413 +8421 @@
 { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
 $as_echo_n "checking for $ac_word... " >&6; }
-if test "${ac_cv_path_JAVAH+set}" = set; then :
+if ${ac_cv_path_JAVAH+:} false; then :
   $as_echo_n "(cached) " >&6
 else
@@ -8454 +8462 @@
 { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
 $as_echo_n "checking for $ac_word... " >&6; }
-if test "${ac_cv_path_JAVA+set}" = set; then :
+if ${ac_cv_path_JAVA+:} false; then :
   $as_echo_n "(cached) " >&6
 else
@@ -8495 +8503 @@
 { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
 $as_echo_n "checking for $ac_word... " >&6; }
-if test "${ac_cv_path_JAVAC+set}" = set; then :
+if ${ac_cv_path_JAVAC+:} false; then :
   $as_echo_n "(cached) " >&6
 else
@@ -8536 +8544 @@
 { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
 $as_echo_n "checking for $ac_word... " >&6; }
-if test "${ac_cv_path_JAVAH+set}" = set; then :
+if ${ac_cv_path_JAVAH+:} false; then :
   $as_echo_n "(cached) " >&6
 else
@@ -8625 +8633 @@
 { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
 $as_echo_n "checking for $ac_word... " >&6; }
-if test "${ac_cv_path_R+set}" = set; then :
+if ${ac_cv_path_R+:} false; then :
   $as_echo_n "(cached) " >&6
 else
@@ -8666 +8674 @@
 { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
 $as_echo_n "checking for $ac_word... " >&6; }
-if test "${ac_cv_path_R+set}" = set; then :
+if ${ac_cv_path_R+:} false; then :
   $as_echo_n "(cached) " >&6
 else
@@ -8726 +8734 @@
 { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
 $as_echo_n "checking for $ac_word... " >&6; }
-if test "${ac_cv_path_RUBY+set}" = set; then :
+if ${ac_cv_path_RUBY+:} false; then :
   $as_echo_n "(cached) " >&6
 else
@@ -8767 +8775 @@
 { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
 $as_echo_n "checking for $ac_word... " >&6; }
-if test "${ac_cv_path_RUBY+set}" = set; then :
+if ${ac_cv_path_RUBY+:} false; then :
   $as_echo_n "(cached) " >&6
 else
@@ -8812 +8820 @@
   { $as_echo "$as_me:${as_lineno-$LINENO}: checking for a sed that does not truncate output" >&5
 $as_echo_n "checking for a sed that does not truncate output... " >&6; }
-if test "${ac_cv_path_SED+set}" = set; then :
+if ${ac_cv_path_SED+:} false; then :
   $as_echo_n "(cached) " >&6
 else
@@ -8905 +8913 @@
 { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
 $as_echo_n "checking for $ac_word... " >&6; }
-if test "${ac_cv_prog_AWK+set}" = set; then :
+if ${ac_cv_prog_AWK+:} false; then :
   $as_echo_n "(cached) " >&6
 else
@@ -9179 +9187 @@
  { $as_echo "$as_me:${as_lineno-$LINENO}: checking whether byte ordering is bigendian" >&5
 $as_echo_n "checking whether byte ordering is bigendian... " >&6; }
-if test "${ac_cv_c_bigendian+set}" = set; then :
+if ${ac_cv_c_bigendian+:} false; then :
   $as_echo_n "(cached) " >&6
 else
@@ -9398 +9406 @@
    *)
      as_fn_error $? "unknown endianness
- presetting ac_cv_c_bigendian=no (or yes) will help" "$LINENO" 5  ;;
+ presetting ac_cv_c_bigendian=no (or yes) will help" "$LINENO" 5 ;;
  esac
 
@@ -9407 +9415 @@
 { $as_echo "$as_me:${as_lineno-$LINENO}: checking size of int" >&5
 $as_echo_n "checking size of int... " >&6; }
-if test "${ac_cv_sizeof_int+set}" = set; then :
+if ${ac_cv_sizeof_int+:} false; then :
   $as_echo_n "(cached) " >&6
 else
@@ -9417 +9425 @@
 $as_echo "$as_me: error: in \`$ac_pwd':" >&2;}
 as_fn_error 77 "cannot compute sizeof (int)
-See \`config.log' for more details" "$LINENO" 5 ; }
+See \`config.log' for more details" "$LINENO" 5; }
    else
      ac_cv_sizeof_int=0
@@ -9440 +9448 @@
 { $as_echo "$as_me:${as_lineno-$LINENO}: checking size of long" >&5
 $as_echo_n "checking size of long... " >&6; }
-if test "${ac_cv_sizeof_long+set}" = set; then :
+if ${ac_cv_sizeof_long+:} false; then :
   $as_echo_n "(cached) " >&6
 else
@@ -9450 +9458 @@
 $as_echo "$as_me: error: in \`$ac_pwd':" >&2;}
 as_fn_error 77 "cannot compute sizeof (long)
-See \`config.log' for more details" "$LINENO" 5 ; }
+See \`config.log' for more details" "$LINENO" 5; }
    else
      ac_cv_sizeof_long=0
@@ -9473 +9481 @@
 { $as_echo "$as_me:${as_lineno-$LINENO}: checking size of long long" >&5
 $as_echo_n "checking size of long long... " >&6; }
-if test "${ac_cv_sizeof_long_long+set}" = set; then :
+if ${ac_cv_sizeof_long_long+:} false; then :
   $as_echo_n "(cached) " >&6
 else
@@ -9483 +9491 @@
 $as_echo "$as_me: error: in \`$ac_pwd':" >&2;}
 as_fn_error 77 "cannot compute sizeof (long long)
-See \`config.log' for more details" "$LINENO" 5 ; }
+See \`config.log' for more details" "$LINENO" 5; }
    else
      ac_cv_sizeof_long_long=0
@@ -9506 +9514 @@
 { $as_echo "$as_me:${as_lineno-$LINENO}: checking size of void *" >&5
 $as_echo_n "checking size of void *... " >&6; }
-if test "${ac_cv_sizeof_void_p+set}" = set; then :
+if ${ac_cv_sizeof_void_p+:} false; then :
   $as_echo_n "(cached) " >&6
 else
@@ -9516 +9524 @@
 $as_echo "$as_me: error: in \`$ac_pwd':" >&2;}
 as_fn_error 77 "cannot compute sizeof (void *)
-See \`config.log' for more details" "$LINENO" 5 ; }
+See \`config.log' for more details" "$LINENO" 5; }
    else
      ac_cv_sizeof_void_p=0
@@ -9602 +9610 @@
 #--------------------------------------------------------------------
 
-for ac_header in ffmpeg/avcodec.h libavcodec/avcodec.h ffmpeg/avformat.h libavformat/avformat.h ffmpeg/avutil.h libavutil/avutil.h
+for ac_header in ffmpeg/avcodec.h libavcodec/avcodec.h ffmpeg/avformat.h libavformat/avformat.h ffmpeg/avutil.h libavutil/avutil.h ffmpeg/swscale.h libswscale/swscale.h
 do :
   as_ac_Header=`$as_echo "ac_cv_header_$ac_header" | $as_tr_sh`
@@ -9636 +9644 @@
   { $as_echo "$as_me:${as_lineno-$LINENO}: checking for main in -lavcodec" >&5
 $as_echo_n "checking for main in -lavcodec... " >&6; }
-if test "${ac_cv_lib_avcodec_main+set}" = set; then :
+if ${ac_cv_lib_avcodec_main+:} false; then :
   $as_echo_n "(cached) " >&6
 else
@@ -9664 +9672 @@
 { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_avcodec_main" >&5
 $as_echo "$ac_cv_lib_avcodec_main" >&6; }
-if test "x$ac_cv_lib_avcodec_main" = x""yes; then :
+if test "x$ac_cv_lib_avcodec_main" = xyes; then :
   cat >>confdefs.h <<_ACEOF
 #define HAVE_LIBAVCODEC 1
@@ -9677 +9685 @@
   { $as_echo "$as_me:${as_lineno-$LINENO}: checking for main in -lavutil" >&5
 $as_echo_n "checking for main in -lavutil... " >&6; }
-if test "${ac_cv_lib_avutil_main+set}" = set; then :
+if ${ac_cv_lib_avutil_main+:} false; then :
   $as_echo_n "(cached) " >&6
 else
@@ -9705 +9713 @@
 { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_avutil_main" >&5
 $as_echo "$ac_cv_lib_avutil_main" >&6; }
-if test "x$ac_cv_lib_avutil_main" = x""yes; then :
+if test "x$ac_cv_lib_avutil_main" = xyes; then :
   cat >>confdefs.h <<_ACEOF
 #define HAVE_LIBAVUTIL 1
@@ -9718 +9726 @@
   { $as_echo "$as_me:${as_lineno-$LINENO}: checking for main in -lavformat" >&5
 $as_echo_n "checking for main in -lavformat... " >&6; }
-if test "${ac_cv_lib_avformat_main+set}" = set; then :
+if ${ac_cv_lib_avformat_main+:} false; then :
   $as_echo_n "(cached) " >&6
 else
@@ -9746 +9754 @@
 { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_avformat_main" >&5
 $as_echo "$ac_cv_lib_avformat_main" >&6; }
-if test "x$ac_cv_lib_avformat_main" = x""yes; then :
+if test "x$ac_cv_lib_avformat_main" = xyes; then :
   cat >>confdefs.h <<_ACEOF
 #define HAVE_LIBAVFORMAT 1
@@ -9759 +9767 @@
   { $as_echo "$as_me:${as_lineno-$LINENO}: checking for main in -lswscale" >&5
 $as_echo_n "checking for main in -lswscale... " >&6; }
-if test "${ac_cv_lib_swscale_main+set}" = set; then :
+if ${ac_cv_lib_swscale_main+:} false; then :
   $as_echo_n "(cached) " >&6
 else
@@ -9787 +9795 @@
 { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_swscale_main" >&5
 $as_echo "$ac_cv_lib_swscale_main" >&6; }
-if test "x$ac_cv_lib_swscale_main" = x""yes; then :
+if test "x$ac_cv_lib_swscale_main" = xyes; then :
   cat >>confdefs.h <<_ACEOF
 #define HAVE_LIBSWSCALE 1
@@ -9795 +9803 @@
 
 fi
+
+  for ac_func in av_find_stream_info
+do :
+  ac_fn_cxx_check_func "$LINENO" "av_find_stream_info" "ac_cv_func_av_find_stream_info"
+if test "x$ac_cv_func_av_find_stream_info" = xyes; then :
+  cat >>confdefs.h <<_ACEOF
+#define HAVE_AV_FIND_STREAM_INFO 1
+_ACEOF
+
+fi
+done
+
+  for ac_func in av_open_input_file
+do :
+  ac_fn_cxx_check_func "$LINENO" "av_open_input_file" "ac_cv_func_av_open_input_file"
+if test "x$ac_cv_func_av_open_input_file" = xyes; then :
+  cat >>confdefs.h <<_ACEOF
+#define HAVE_AV_OPEN_INPUT_FILE 1
+_ACEOF
+
+fi
+done
+
+  for ac_func in avcodec_decode_video
+do :
+  ac_fn_cxx_check_func "$LINENO" "avcodec_decode_video" "ac_cv_func_avcodec_decode_video"
+if test "x$ac_cv_func_avcodec_decode_video" = xyes; then :
+  cat >>confdefs.h <<_ACEOF
+#define HAVE_AVCODEC_DECODE_VIDEO 1
+_ACEOF
+
+fi
+done
 
   for ac_func in avcodec_decode_video2
 do :
   ac_fn_cxx_check_func "$LINENO" "avcodec_decode_video2" "ac_cv_func_avcodec_decode_video2"
-if test "x$ac_cv_func_avcodec_decode_video2" = x""yes; then :
+if test "x$ac_cv_func_avcodec_decode_video2" = xyes; then :
   cat >>confdefs.h <<_ACEOF
 #define HAVE_AVCODEC_DECODE_VIDEO2 1
@@ -9807 +9848 @@
 done
 
-  for ac_func in avcodec_decode_video
+  for ac_func in avcodec_open
 do :
-  ac_fn_cxx_check_func "$LINENO" "avcodec_decode_video" "ac_cv_func_avcodec_decode_video"
-if test "x$ac_cv_func_avcodec_decode_video" = x""yes; then :
+  ac_fn_cxx_check_func "$LINENO" "avcodec_open" "ac_cv_func_avcodec_open"
+if test "x$ac_cv_func_avcodec_open" = xyes; then :
   cat >>confdefs.h <<_ACEOF
-#define HAVE_AVCODEC_DECODE_VIDEO 1
+#define HAVE_AVCODEC_OPEN 1
+_ACEOF
+
+fi
+done
+
+  for ac_func in avcodec_open2
+do :
+  ac_fn_cxx_check_func "$LINENO" "avcodec_open2" "ac_cv_func_avcodec_open2"
+if test "x$ac_cv_func_avcodec_open2" = xyes; then :
+  cat >>confdefs.h <<_ACEOF
+#define HAVE_AVCODEC_OPEN2 1
+_ACEOF
+
+fi
+done
+
+  for ac_func in avformat_find_stream_info
+do :
+  ac_fn_cxx_check_func "$LINENO" "avformat_find_stream_info" "ac_cv_func_avformat_find_stream_info"
+if test "x$ac_cv_func_avformat_find_stream_info" = xyes; then :
+  cat >>confdefs.h <<_ACEOF
+#define HAVE_AVFORMAT_FIND_STREAM_INFO 1
 _ACEOF
 
@@ -9821 +9884 @@
 do :
   ac_fn_cxx_check_func "$LINENO" "avformat_open_input" "ac_cv_func_avformat_open_input"
-if test "x$ac_cv_func_avformat_open_input" = x""yes; then :
+if test "x$ac_cv_func_avformat_open_input" = xyes; then :
   cat >>confdefs.h <<_ACEOF
 #define HAVE_AVFORMAT_OPEN_INPUT 1
-_ACEOF
-
-fi
-done
-
-  for ac_func in av_open_input_file
-do :
-  ac_fn_cxx_check_func "$LINENO" "av_open_input_file" "ac_cv_func_av_open_input_file"
-if test "x$ac_cv_func_av_open_input_file" = x""yes; then :
-  cat >>confdefs.h <<_ACEOF
-#define HAVE_AV_OPEN_INPUT_FILE 1
 _ACEOF
 
@@ -9843 +9895 @@
 do :
   ac_fn_cxx_check_func "$LINENO" "avio_close" "ac_cv_func_avio_close"
-if test "x$ac_cv_func_avio_close" = x""yes; then :
+if test "x$ac_cv_func_avio_close" = xyes; then :
   cat >>confdefs.h <<_ACEOF
 #define HAVE_AVIO_CLOSE 1
+_ACEOF
+
+fi
+done
+
+  for ac_func in img_convert
+do :
+  ac_fn_cxx_check_func "$LINENO" "img_convert" "ac_cv_func_img_convert"
+if test "x$ac_cv_func_img_convert" = xyes; then :
+  cat >>confdefs.h <<_ACEOF
+#define HAVE_IMG_CONVERT 1
+_ACEOF
+
+fi
+done
+
+  for ac_func in sws_getCachedContext
+do :
+  ac_fn_cxx_check_func "$LINENO" "sws_getCachedContext" "ac_cv_func_sws_getCachedContext"
+if test "x$ac_cv_func_sws_getCachedContext" = xyes; then :
+  cat >>confdefs.h <<_ACEOF
+#define HAVE_SWS_GETCACHEDCONTEXT 1
+_ACEOF
+
+fi
+done
+
+  for ac_func in sws_scale
+do :
+  ac_fn_cxx_check_func "$LINENO" "sws_scale" "ac_cv_func_sws_scale"
+if test "x$ac_cv_func_sws_scale" = xyes; then :
+  cat >>confdefs.h <<_ACEOF
+#define HAVE_SWS_SCALE 1
 _ACEOF
 
@@ -9854 +9939 @@
 do :
   ac_fn_cxx_check_func "$LINENO" "url_close" "ac_cv_func_url_close"
-if test "x$ac_cv_func_url_close" = x""yes; then :
+if test "x$ac_cv_func_url_close" = xyes; then :
   cat >>confdefs.h <<_ACEOF
 #define HAVE_URL_CLOSE 1
@@ -9862 +9947 @@
 done
 
-  ac_fn_cxx_check_func "$LINENO" "av_find_stream_info" "ac_cv_func_av_find_stream_info"
-if test "x$ac_cv_func_av_find_stream_info" = x""yes; then :
-
-else
-  as_fn_error $? "oops! no av_find_stream_info?!?" "$LINENO" 5
-fi
+  for ac_func in av_close_input_file
+do :
+  ac_fn_cxx_check_func "$LINENO" "av_close_input_file" "ac_cv_func_av_close_input_file"
+if test "x$ac_cv_func_av_close_input_file" = xyes; then :
+  cat >>confdefs.h <<_ACEOF
+#define HAVE_AV_CLOSE_INPUT_FILE 1
+_ACEOF
+
+fi
+done
+
+  for ac_func in avformat_close_input
+do :
+  ac_fn_cxx_check_func "$LINENO" "avformat_close_input" "ac_cv_func_avformat_close_input"
+if test "x$ac_cv_func_avformat_close_input" = xyes; then :
+  cat >>confdefs.h <<_ACEOF
+#define HAVE_AVFORMAT_CLOSE_INPUT 1
+_ACEOF
+
+fi
+done
+
 
   ac_fn_cxx_check_func "$LINENO" "avcodec_find_decoder" "ac_cv_func_avcodec_find_decoder"
-if test "x$ac_cv_func_avcodec_find_decoder" = x""yes; then :
+if test "x$ac_cv_func_avcodec_find_decoder" = xyes; then :
 
 else
@@ -9876 +9977 @@
 fi
 
-  ac_fn_cxx_check_func "$LINENO" "avcodec_open" "ac_cv_func_avcodec_open"
-if test "x$ac_cv_func_avcodec_open" = x""yes; then :
-
-else
-  as_fn_error $? "oops! avcodec_open ?!?" "$LINENO" 5
-fi
-
   ac_fn_cxx_check_func "$LINENO" "avcodec_alloc_frame" "ac_cv_func_avcodec_alloc_frame"
-if test "x$ac_cv_func_avcodec_alloc_frame" = x""yes; then :
+if test "x$ac_cv_func_avcodec_alloc_frame" = xyes; then :
 
 else
@@ -9891 +9985 @@
 
   ac_fn_cxx_check_func "$LINENO" "av_rescale_q" "ac_cv_func_av_rescale_q"
-if test "x$ac_cv_func_av_rescale_q" = x""yes; then :
+if test "x$ac_cv_func_av_rescale_q" = xyes; then :
 
 else
@@ -9898 +9992 @@
 
   ac_fn_cxx_check_func "$LINENO" "av_read_frame" "ac_cv_func_av_read_frame"
-if test "x$ac_cv_func_av_read_frame" = x""yes; then :
+if test "x$ac_cv_func_av_read_frame" = xyes; then :
 
 else
@@ -9905 +9999 @@
 
   ac_fn_cxx_check_func "$LINENO" "av_free" "ac_cv_func_av_free"
-if test "x$ac_cv_func_av_free" = x""yes; then :
+if test "x$ac_cv_func_av_free" = xyes; then :
 
 else
@@ -9912 +10006 @@
 
   ac_fn_cxx_check_func "$LINENO" "avcodec_default_release_buffer" "ac_cv_func_avcodec_default_release_buffer"
-if test "x$ac_cv_func_avcodec_default_release_buffer" = x""yes; then :
+if test "x$ac_cv_func_avcodec_default_release_buffer" = xyes; then :
 
 else
@@ -9919 +10013 @@
 
   ac_fn_cxx_check_func "$LINENO" "avpicture_get_size" "ac_cv_func_avpicture_get_size"
-if test "x$ac_cv_func_avpicture_get_size" = x""yes; then :
+if test "x$ac_cv_func_avpicture_get_size" = xyes; then :
 
 else
@@ -9926 +10020 @@
 
   ac_fn_cxx_check_func "$LINENO" "avpicture_fill" "ac_cv_func_avpicture_fill"
-if test "x$ac_cv_func_avpicture_fill" = x""yes; then :
+if test "x$ac_cv_func_avpicture_fill" = xyes; then :
 
 else
@@ -9932 +10026 @@
 fi
 
-  for ac_func in sws_getCachedContext
-do :
-  ac_fn_cxx_check_func "$LINENO" "sws_getCachedContext" "ac_cv_func_sws_getCachedContext"
-if test "x$ac_cv_func_sws_getCachedContext" = x""yes; then :
-  cat >>confdefs.h <<_ACEOF
-#define HAVE_SWS_GETCACHEDCONTEXT 1
-_ACEOF
-
-fi
-done
-
-  for ac_func in img_convert
-do :
-  ac_fn_cxx_check_func "$LINENO" "img_convert" "ac_cv_func_img_convert"
-if test "x$ac_cv_func_img_convert" = x""yes; then :
-  cat >>confdefs.h <<_ACEOF
-#define HAVE_IMG_CONVERT 1
-_ACEOF
-
-fi
-done
-
-  for ac_func in sws_scale
-do :
-  ac_fn_cxx_check_func "$LINENO" "sws_scale" "ac_cv_func_sws_scale"
-if test "x$ac_cv_func_sws_scale" = x""yes; then :
-  cat >>confdefs.h <<_ACEOF
-#define HAVE_SWS_SCALE 1
-_ACEOF
-
-fi
-done
 
   cat confdefs.h - <<_ACEOF >conftest.$ac_ext
@@ -10090 +10152 @@
 
 
-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/copy_rappture_examples gui/apps/encodedata gui/apps/rappture gui/apps/rappture-csh.env gui/apps/rappture.env gui/apps/rappture.use gui/apps/rerun gui/apps/simsim gui/apps/xmldiff gui/pkgIndex.tcl gui/scripts/Makefile gui/src/Makefile builder/Makefile builder/pkgIndex.tcl builder/scripts/Makefile tester/Makefile tester/pkgIndex.tcl tester/scripts/Makefile lang/Makefile lang/java/Makefile lang/java/rappture/Makefile lang/perl/Makefile lang/perl/Makefile.PL lang/python/Makefile lang/python/setup.py lang/matlab/Makefile lang/octave/Makefile lang/octave/octave2/Makefile lang/octave/octave3/Makefile lang/R/Makefile lang/ruby/Makefile lang/ruby/build.rb lang/tcl/Makefile lang/tcl/pkgIndex.tcl lang/tcl/src/Makefile lang/tcl/scripts/Makefile lang/tcl/tests/Makefile lib/Makefile examples/3D/Makefile examples/Makefile examples/app-fermi/2.0/Makefile examples/app-fermi/Makefile examples/app-fermi/cee/Makefile examples/app-fermi/fortran/Makefile examples/app-fermi/java/Makefile examples/app-fermi/matlab/Makefile examples/app-fermi/matlab/compiled/Makefile examples/app-fermi/matlab/uncompiled/Makefile examples/app-fermi/octave/octave2/Makefile examples/app-fermi/octave/octave3/Makefile examples/app-fermi/octave/Makefile examples/app-fermi/perl/Makefile examples/app-fermi/python/Makefile examples/app-fermi/ruby/Makefile examples/app-fermi/tcl/Makefile examples/app-fermi/wrapper/Makefile examples/app-fermi/wrapper/cee/Makefile examples/app-fermi/wrapper/perl/Makefile examples/app-fermi/wrapper/python/Makefile examples/app-fermi/wrapper/tcl/Makefile examples/app-fermi/R/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/histogram/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"
+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/copy_rappture_examples gui/apps/encodedata gui/apps/rappture gui/apps/rappture-csh.env gui/apps/rappture.env gui/apps/rappture.use gui/apps/rerun gui/apps/simsim gui/apps/xmldiff gui/pkgIndex.tcl gui/scripts/Makefile gui/src/Makefile builder/Makefile builder/pkgIndex.tcl builder/scripts/Makefile tester/Makefile tester/pkgIndex.tcl tester/scripts/Makefile lang/Makefile lang/java/Makefile lang/java/rappture/Makefile lang/perl/Makefile lang/perl/Makefile.PL lang/python/Makefile lang/python/setup.py lang/matlab/Makefile lang/octave/Makefile lang/octave/octave2/Makefile lang/octave/octave3/Makefile lang/R/Makefile lang/ruby/Makefile lang/ruby/build.rb lang/tcl/Makefile lang/tcl/pkgIndex.tcl lang/tcl/src/Makefile lang/tcl/scripts/Makefile lang/tcl/tests/Makefile lib/Makefile examples/3D/Makefile examples/Makefile examples/app-fermi/2.0/Makefile examples/app-fermi/Makefile examples/app-fermi/cee/Makefile examples/app-fermi/fortran/Makefile examples/app-fermi/java/Makefile examples/app-fermi/matlab/Makefile examples/app-fermi/matlab/compiled/Makefile examples/app-fermi/matlab/uncompiled/Makefile examples/app-fermi/octave/octave2/Makefile examples/app-fermi/octave/octave3/Makefile examples/app-fermi/octave/Makefile examples/app-fermi/perl/Makefile examples/app-fermi/python/Makefile examples/app-fermi/ruby/Makefile examples/app-fermi/tcl/Makefile examples/app-fermi/wrapper/Makefile examples/app-fermi/wrapper/cee/Makefile examples/app-fermi/wrapper/perl/Makefile examples/app-fermi/wrapper/python/Makefile examples/app-fermi/wrapper/tcl/Makefile examples/app-fermi/R/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/histogram/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 video/Makefile video/pkgIndex.tcl oldtest/Makefile oldtest/src/Makefile"
 
 cat >confcache <<\_ACEOF
@@ -10156 +10218 @@
 if diff "$cache_file" confcache >/dev/null 2>&1; then :; else
   if test -w "$cache_file"; then
-    test "x$cache_file" != "x/dev/null" &&
+    if test "x$cache_file" != "x/dev/null"; then
       { $as_echo "$as_me:${as_lineno-$LINENO}: updating cache $cache_file" >&5
 $as_echo "$as_me: updating cache $cache_file" >&6;}
-    cat confcache >$cache_file
+      if test ! -f "$cache_file" || test -h "$cache_file"; then
+        cat confcache >"$cache_file"
+      else
+        case $cache_file in #(
+        */* | ?:*)
+          mv -f confcache "$cache_file"$$ &&
+          mv -f "$cache_file"$$ "$cache_file" ;; #(
+        *)
+          mv -f confcache "$cache_file" ;;
+        esac
+      fi
+    fi
   else
     { $as_echo "$as_me:${as_lineno-$LINENO}: not updating unwritable cache $cache_file" >&5
@@ -10192 +10265 @@
 
 
-: ${CONFIG_STATUS=./config.status}
+: "${CONFIG_STATUS=./config.status}"
 ac_write_fail=0
 ac_clean_files_save=$ac_clean_files
@@ -10293 +10366 @@
 
 # Find who we are.  Look in the path if we contain no directory separator.
+as_myself=
 case $0 in #((
   *[\\/]* ) as_myself=$0 ;;
@@ -10600 +10674 @@
 ac_log="
 This file was extended by Rappture $as_me 1.1, which was
-generated by GNU Autoconf 2.67.  Invocation command line was
+generated by GNU Autoconf 2.68.  Invocation command line was
 
   CONFIG_FILES    = $CONFIG_FILES
@@ -10662 +10736 @@
 ac_cs_version="\\
 Rappture config.status 1.1
-configured by $0, generated by GNU Autoconf 2.67,
+configured by $0, generated by GNU Autoconf 2.68,
   with options \\"\$ac_cs_config\\"
 
@@ -10914 +10988 @@
     "examples/zoo/table/Makefile") CONFIG_FILES="$CONFIG_FILES examples/zoo/table/Makefile" ;;
     "examples/zoo/unirect2d/Makefile") CONFIG_FILES="$CONFIG_FILES examples/zoo/unirect2d/Makefile" ;;
+    "video/Makefile") CONFIG_FILES="$CONFIG_FILES video/Makefile" ;;
+    "video/pkgIndex.tcl") CONFIG_FILES="$CONFIG_FILES video/pkgIndex.tcl" ;;
     "oldtest/Makefile") CONFIG_FILES="$CONFIG_FILES oldtest/Makefile" ;;
     "oldtest/src/Makefile") CONFIG_FILES="$CONFIG_FILES oldtest/src/Makefile" ;;
 
-  *) as_fn_error $? "invalid argument: \`$ac_config_target'" "$LINENO" 5 ;;
+  *) as_fn_error $? "invalid argument: \`$ac_config_target'" "$LINENO" 5;;
   esac
 done
@@ -10939 +11015 @@
 $debug ||
 {
-  tmp=
+  tmp= ac_tmp=
   trap 'exit_status=$?
-  { test -z "$tmp" || test ! -d "$tmp" || rm -fr "$tmp"; } && exit $exit_status
+  : "${ac_tmp:=$tmp}"
+  { test ! -d "$ac_tmp" || rm -fr "$ac_tmp"; } && exit $exit_status
 ' 0
   trap 'as_fn_exit 1' 1 2 13 15
@@ -10949 +11026 @@
 {
   tmp=`(umask 077 && mktemp -d "./confXXXXXX") 2>/dev/null` &&
-  test -n "$tmp" && test -d "$tmp"
+  test -d "$tmp"
 }  ||
 {
@@ -10955 +11032 @@
   (umask 077 && mkdir "$tmp")
 } || as_fn_error $? "cannot create a temporary directory in ." "$LINENO" 5
+ac_tmp=$tmp
 
 # Set up the scripts for CONFIG_FILES section.
@@ -10976 +11054 @@
 fi
 
-echo 'BEGIN {' >"$tmp/subs1.awk" &&
+echo 'BEGIN {' >"$ac_tmp/subs1.awk" &&
 _ACEOF
 
@@ -11004 +11082 @@
 
 cat >>$CONFIG_STATUS <<_ACEOF || ac_write_fail=1
-cat >>"\$tmp/subs1.awk" <<\\_ACAWK &&
+cat >>"\$ac_tmp/subs1.awk" <<\\_ACAWK &&
 _ACEOF
 sed -n '
@@ -11052 +11130 @@
 cat >>$CONFIG_STATUS <<_ACEOF || ac_write_fail=1
 _ACAWK
-cat >>"\$tmp/subs1.awk" <<_ACAWK &&
+cat >>"\$ac_tmp/subs1.awk" <<_ACAWK &&
   for (key in S) S_is_set[key] = 1
   FS = ""
@@ -11084 +11162 @@
 else
   cat
-fi < "$tmp/subs1.awk" > "$tmp/subs.awk" \
+fi < "$ac_tmp/subs1.awk" > "$ac_tmp/subs.awk" \
   || as_fn_error $? "could not setup config files machinery" "$LINENO" 5
 _ACEOF
@@ -11118 +11196 @@
 # This happens for instance with `./config.status Makefile'.
 if test -n "$CONFIG_HEADERS"; then
-cat >"$tmp/defines.awk" <<\_ACAWK ||
+cat >"$ac_tmp/defines.awk" <<\_ACAWK ||
 BEGIN {
 _ACEOF
@@ -11130 +11208 @@
 ac_delim='%!_!# '
 for ac_last_try in false false :; do
-  ac_t=`sed -n "/$ac_delim/p" confdefs.h`
-  if test -z "$ac_t"; then
+  ac_tt=`sed -n "/$ac_delim/p" confdefs.h`
+  if test -z "$ac_tt"; then
     break
   elif $ac_last_try; then
@@ -11232 +11310 @@
   case $ac_mode$ac_tag in
   :[FHL]*:*);;
-  :L* | :C*:*) as_fn_error $? "invalid tag \`$ac_tag'" "$LINENO" 5 ;;
+  :L* | :C*:*) as_fn_error $? "invalid tag \`$ac_tag'" "$LINENO" 5;;
   :[FH]-) ac_tag=-:-;;
   :[FH]*) ac_tag=$ac_tag:$ac_tag.in;;
@@ -11251 +11329 @@
     do
       case $ac_f in
-      -) ac_f="$tmp/stdin";;
+      -) ac_f="$ac_tmp/stdin";;
       *) # Look for the file first in the build tree, then in the source tree
          # (if the path is not absolute).  The absolute path cannot be DOS-style,
@@ -11260 +11338 @@
            *) test -f "$srcdir/$ac_f" && ac_f="$srcdir/$ac_f";;
            esac ||
-           as_fn_error 1 "cannot find input file: \`$ac_f'" "$LINENO" 5 ;;
+           as_fn_error 1 "cannot find input file: \`$ac_f'" "$LINENO" 5;;
       esac
       case $ac_f in *\'*) ac_f=`$as_echo "$ac_f" | sed "s/'/'\\\\\\\\''/g"`;; esac
@@ -11286 +11364 @@
 
     case $ac_tag in
-    *:-:* | *:-) cat >"$tmp/stdin" \
-      || as_fn_error $? "could not create $ac_file" "$LINENO" 5  ;;
+    *:-:* | *:-) cat >"$ac_tmp/stdin" \
+      || as_fn_error $? "could not create $ac_file" "$LINENO" 5 ;;
     esac
     ;;
@@ -11423 +11501 @@
 $ac_datarootdir_hack
 "
-eval sed \"\$ac_sed_extra\" "$ac_file_inputs" | $AWK -f "$tmp/subs.awk" >$tmp/out \
-  || as_fn_error $? "could not create $ac_file" "$LINENO" 5
+eval sed \"\$ac_sed_extra\" "$ac_file_inputs" | $AWK -f "$ac_tmp/subs.awk" \
+  >$ac_tmp/out || as_fn_error $? "could not create $ac_file" "$LINENO" 5
 
 test -z "$ac_datarootdir_hack$ac_datarootdir_seen" &&
-  { ac_out=`sed -n '/\${datarootdir}/p' "$tmp/out"`; test -n "$ac_out"; } &&
-  { ac_out=`sed -n '/^[  ]*datarootdir[  ]*:*=/p' "$tmp/out"`; test -z "$ac_out"; } &&
+  { ac_out=`sed -n '/\${datarootdir}/p' "$ac_tmp/out"`; test -n "$ac_out"; } &&
+  { ac_out=`sed -n '/^[  ]*datarootdir[  ]*:*=/p' \
+      "$ac_tmp/out"`; test -z "$ac_out"; } &&
   { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: $ac_file contains a reference to the variable \`datarootdir'
 which seems to be undefined.  Please make sure it is defined" >&5
@@ -11434 +11513 @@
 which seems to be undefined.  Please make sure it is defined" >&2;}
 
-  rm -f "$tmp/stdin"
+  rm -f "$ac_tmp/stdin"
   case $ac_file in
-  -) cat "$tmp/out" && rm -f "$tmp/out";;
-  *) rm -f "$ac_file" && mv "$tmp/out" "$ac_file";;
+  -) cat "$ac_tmp/out" && rm -f "$ac_tmp/out";;
+  *) rm -f "$ac_file" && mv "$ac_tmp/out" "$ac_file";;
   esac \
   || as_fn_error $? "could not create $ac_file" "$LINENO" 5
@@ -11448 +11527 @@
     {
       $as_echo "/* $configure_input  */" \
-      && eval '$AWK -f "$tmp/defines.awk"' "$ac_file_inputs"
-    } >"$tmp/config.h" \
+      && eval '$AWK -f "$ac_tmp/defines.awk"' "$ac_file_inputs"
+    } >"$ac_tmp/config.h" \
       || as_fn_error $? "could not create $ac_file" "$LINENO" 5
-    if diff "$ac_file" "$tmp/config.h" >/dev/null 2>&1; then
+    if diff "$ac_file" "$ac_tmp/config.h" >/dev/null 2>&1; then
       { $as_echo "$as_me:${as_lineno-$LINENO}: $ac_file is unchanged" >&5
 $as_echo "$as_me: $ac_file is unchanged" >&6;}
     else
       rm -f "$ac_file"
-      mv "$tmp/config.h" "$ac_file" \
+      mv "$ac_tmp/config.h" "$ac_file" \
         || as_fn_error $? "could not create $ac_file" "$LINENO" 5
     fi
   else
     $as_echo "/* $configure_input  */" \
-      && eval '$AWK -f "$tmp/defines.awk"' "$ac_file_inputs" \
+      && eval '$AWK -f "$ac_tmp/defines.awk"' "$ac_file_inputs" \
       || as_fn_error $? "could not create -" "$LINENO" 5
   fi
@@ -11650 +11729 @@
 fi
 
+

trunk/configure.in

@@ -286 +286 @@
 #--------------------------------------------------------------------
 
-AC_CHECK_HEADERS([ffmpeg/avcodec.h libavcodec/avcodec.h ffmpeg/avformat.h libavformat/avformat.h ffmpeg/avutil.h libavutil/avutil.h],,,[
+AC_CHECK_HEADERS([ffmpeg/avcodec.h libavcodec/avcodec.h ffmpeg/avformat.h libavformat/avformat.h ffmpeg/avutil.h libavutil/avutil.h ffmpeg/swscale.h libswscale/swscale.h],,,[
 #define __STDC_CONSTANT_MACROS 1
 ])
@@ -307 +307 @@
   AC_CHECK_LIB(avformat, main,,AC_MSG_ERROR(librappture requires libavformat))
   AC_CHECK_LIB(swscale, main)
+  AC_CHECK_FUNCS(av_find_stream_info)
+  AC_CHECK_FUNCS(av_open_input_file)
+  AC_CHECK_FUNCS(avcodec_decode_video)
   AC_CHECK_FUNCS(avcodec_decode_video2)
-  AC_CHECK_FUNCS(avcodec_decode_video)
+  AC_CHECK_FUNCS(avcodec_open)
+  AC_CHECK_FUNCS(avcodec_open2)
+  AC_CHECK_FUNCS(avformat_find_stream_info)
   AC_CHECK_FUNCS(avformat_open_input)
-  AC_CHECK_FUNCS(av_open_input_file)
   AC_CHECK_FUNCS(avio_close)
+  AC_CHECK_FUNCS(img_convert)
+  AC_CHECK_FUNCS(sws_getCachedContext)
+  AC_CHECK_FUNCS(sws_scale)
   AC_CHECK_FUNCS(url_close)
-  AC_CHECK_FUNC(av_find_stream_info,, 
-  AC_MSG_ERROR(oops! no av_find_stream_info?!?))
+  AC_CHECK_FUNCS(av_close_input_file)
+  AC_CHECK_FUNCS(avformat_close_input)
+        
   AC_CHECK_FUNC(avcodec_find_decoder,,
     AC_MSG_ERROR(oops! no av_codec_find_decoder ?!?))
-  AC_CHECK_FUNC(avcodec_open,,AC_MSG_ERROR(oops! avcodec_open ?!?))
   AC_CHECK_FUNC(avcodec_alloc_frame,,
     AC_MSG_ERROR(oops! no avcode_alloc_frame ?!?))
@@ -328 +335 @@
     AC_MSG_ERROR(oops! no avpicture_get_size ?!?))
   AC_CHECK_FUNC(avpicture_fill,,AC_MSG_ERROR(oops! no avpicture_fill ?!?))
-  AC_CHECK_FUNCS(sws_getCachedContext)
-  AC_CHECK_FUNCS(img_convert)
-  AC_CHECK_FUNCS(sws_scale)
+
   AC_TRY_COMPILE([
 #define __STDC_CONSTANT_MACROS 1
@@ -564 +569 @@
     examples/zoo/table/Makefile
     examples/zoo/unirect2d/Makefile
+    video/Makefile
+    video/pkgIndex.tcl
     oldtest/Makefile
     oldtest/src/Makefile
 ])
 AC_OUTPUT
+        

trunk/gui/scripts/field3dresult.tcl

@@ -55 +55 @@
     }
     array set flags $args
+    set servers ""
     switch -- $flags(-mode) {
         "auto" - "nanovis" - "flowvis" {
@@ -64 +65 @@
         "vtk" {
             # Old vtk contour widget
-            set servers ""
-        }
+        }
         default {
             puts stderr "unknown render mode \"$flags(-mode)\""

trunk/lang/tcl/src/Makefile.in

@@ -77 +77 @@
 endif
 
-ifeq ($(HAVE_FFMPEG),yes)
-    OBJS += RpVideoTclInterface.o
-    LIBS += -L../../../src/objects -lRpObjects
-endif
-
-
 # Not using     RpLibraryTclInterface.o \
 

trunk/src/core/config.h.in

@@ -19 +19 @@
 #undef HAVE_AVCODEC_DECODE_VIDEO2
 
+/* Define to 1 if you have the `avcodec_open' function. */
+#undef HAVE_AVCODEC_OPEN
+
+/* Define to 1 if you have the `avcodec_open2' function. */
+#undef HAVE_AVCODEC_OPEN2
+
+/* Define to 1 if you have the `avformat_close_input' function. */
+#undef HAVE_AVFORMAT_CLOSE_INPUT
+
+/* Define to 1 if you have the `avformat_find_stream_info' function. */
+#undef HAVE_AVFORMAT_FIND_STREAM_INFO
+
 /* Define to 1 if you have the `avformat_open_input' function. */
 #undef HAVE_AVFORMAT_OPEN_INPUT
@@ -28 +40 @@
 #undef HAVE_AVMEDIA_TYPE_VIDEO
 
+/* Define to 1 if you have the `av_close_input_file' function. */
+#undef HAVE_AV_CLOSE_INPUT_FILE
+
+/* Define to 1 if you have the `av_find_stream_info' function. */
+#undef HAVE_AV_FIND_STREAM_INFO
+
 /* Define to 1 if you have the `av_open_input_file' function. */
 #undef HAVE_AV_OPEN_INPUT_FILE
@@ -106 +124 @@
 #undef HAVE_LIBM
 
+/* Define to 1 if you have the `ncurses' library (-lncurses). */
+#undef HAVE_LIBNCURSES
+
 /* Define to 1 if you have the `stdc++' library (-lstdc++). */
 #undef HAVE_LIBSTDC__
@@ -130 +151 @@
 #undef HAVE_MEMORY_H
 
+/* Define to 1 if you have the <ncurses.h> header file. */
+#undef HAVE_NCURSES_H
+
 /* Define to 1 if you have the <Python.h> header file. */
 #undef HAVE_PYTHON_H
@@ -156 +180 @@
 /* Define to 1 if you have the <string.h> header file. */
 #undef HAVE_STRING_H
+
+/* Define to 1 if you have the `sws_getCachedContext' function. */
+#undef HAVE_SWS_GETCACHEDCONTEXT
 
 /* Define to 1 if you have the `sws_scale' function. */

trunk/src/objects/Makefile.in

@@ -112 +112 @@
                 RpObject.o
 
-ifeq ($(FFMPEG),yes)
-  # since ffmpeg libraries are available,
-  # include them in compilation
-  LIBS += -lavcodec -lavformat -lswscale
-  HEADERS += RpVideo.h
-  OBJS += RpVideo.o
-endif
-
-
 name        = RpObjects
 lib         = lib$(name).a