Changeset 2075 for tags/20110125/configure

Timestamp:

Jan 31, 2011, 2:16:42 PM (13 years ago)

Author:

dkearney

Message:

adding --with-install flag to configure for use with hubzero vm builds

File:

• tags/20110125/configure (modified) (198 diffs)

tags/20110125/configure

@@ -1 +1 @@
 #! /bin/sh
 # Guess values for system-dependent variables and create Makefiles.
-# Generated by GNU Autoconf 2.68 for Rappture 1.1.
+# Generated by GNU Autoconf 2.67 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 ;;
@@ -218 +217 @@
         # 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
-        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+"$@"}
+        exec "$CONFIG_SHELL" "$as_myself" ${1+"$@"}
 fi
 
@@ -729 +721 @@
 INSTALL_PROGRAM
 LIB_SEARCH_DIRS
+INSTALL_PREFIX
 target_alias
 host_alias
@@ -770 +763 @@
 ac_user_opts='
 enable_option_checking
+with_install
 enable_64bit
 enable_64bit_vis
@@ -1207 +1201 @@
     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}
     ;;
 
@@ -1426 +1420 @@
   --with-PACKAGE[=ARG]    use PACKAGE [ARG=yes]
   --without-PACKAGE       do not use PACKAGE (same as --with-PACKAGE=no)
+  --with-install=DIR      location of installation [default=yes]
   --with-tclsh=DIR        location of tclsh [default=yes]
   --with-vtk=DIR          location of vtk library [default=yes]
@@ -1519 +1514 @@
   cat <<\_ACEOF
 Rappture configure 1.1
-generated by GNU Autoconf 2.68
+generated by GNU Autoconf 2.67
 
 Copyright (C) 2010 Free Software Foundation, Inc.
@@ -1565 +1560 @@
         ac_retval=1
 fi
-  eval $as_lineno_stack; ${as_lineno_stack:+:} unset as_lineno
+  eval $as_lineno_stack; test "x$as_lineno_stack" = x && { as_lineno=; unset as_lineno;}
   as_fn_set_status $ac_retval
 
@@ -1603 +1598 @@
         ac_retval=1
 fi
-  eval $as_lineno_stack; ${as_lineno_stack:+:} unset as_lineno
+  eval $as_lineno_stack; test "x$as_lineno_stack" = x && { as_lineno=; unset as_lineno;}
   as_fn_set_status $ac_retval
 
@@ -1641 +1636 @@
         ac_retval=1
 fi
-  eval $as_lineno_stack; ${as_lineno_stack:+:} unset as_lineno
+  eval $as_lineno_stack; test "x$as_lineno_stack" = x && { as_lineno=; unset as_lineno;}
   as_fn_set_status $ac_retval
 
@@ -1678 +1673 @@
     ac_retval=1
 fi
-  eval $as_lineno_stack; ${as_lineno_stack:+:} unset as_lineno
+  eval $as_lineno_stack; test "x$as_lineno_stack" = x && { as_lineno=; unset as_lineno;}
   as_fn_set_status $ac_retval
 
@@ -1720 +1715 @@
 fi
   rm -rf conftest.dSYM conftest_ipa8_conftest.oo
-  eval $as_lineno_stack; ${as_lineno_stack:+:} unset as_lineno
+  eval $as_lineno_stack; test "x$as_lineno_stack" = x && { as_lineno=; unset as_lineno;}
   as_fn_set_status $ac_retval
 
@@ -1766 +1761 @@
   # 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; ${as_lineno_stack:+:} unset as_lineno
+  eval $as_lineno_stack; test "x$as_lineno_stack" = x && { as_lineno=; unset as_lineno;}
   as_fn_set_status $ac_retval
 
@@ -1779 +1774 @@
   { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $2" >&5
 $as_echo_n "checking for $2... " >&6; }
-if eval \${$3+:} false; then :
+if eval "test \"\${$3+set}\"" = set; then :
   $as_echo_n "(cached) " >&6
 else
@@ -1834 +1829 @@
                { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_res" >&5
 $as_echo "$ac_res" >&6; }
-  eval $as_lineno_stack; ${as_lineno_stack:+:} unset as_lineno
+  eval $as_lineno_stack; test "x$as_lineno_stack" = x && { as_lineno=; unset as_lineno;}
 
 } # ac_fn_c_check_func
@@ -1879 +1874 @@
   # 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; ${as_lineno_stack:+:} unset as_lineno
+  eval $as_lineno_stack; test "x$as_lineno_stack" = x && { as_lineno=; unset as_lineno;}
   as_fn_set_status $ac_retval
 
@@ -1892 +1887 @@
   { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $2" >&5
 $as_echo_n "checking for $2... " >&6; }
-if eval \${$3+:} false; then :
+if eval "test \"\${$3+set}\"" = set; then :
   $as_echo_n "(cached) " >&6
 else
@@ -1947 +1942 @@
                { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_res" >&5
 $as_echo "$ac_res" >&6; }
-  eval $as_lineno_stack; ${as_lineno_stack:+:} unset as_lineno
+  eval $as_lineno_stack; test "x$as_lineno_stack" = x && { as_lineno=; unset as_lineno;}
 
 } # ac_fn_cxx_check_func
@@ -1983 +1978 @@
     ac_retval=1
 fi
-  eval $as_lineno_stack; ${as_lineno_stack:+:} unset as_lineno
+  eval $as_lineno_stack; test "x$as_lineno_stack" = x && { as_lineno=; unset as_lineno;}
   as_fn_set_status $ac_retval
 
@@ -1996 +1991 @@
 {
   as_lineno=${as_lineno-"$1"} as_lineno_stack=as_lineno_stack=$as_lineno_stack
-  if eval \${$3+:} false; then :
+  if eval "test \"\${$3+set}\"" = set; then :
   { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $2" >&5
 $as_echo_n "checking for $2... " >&6; }
-if eval \${$3+:} false; then :
+if eval "test \"\${$3+set}\"" = set; then :
   $as_echo_n "(cached) " >&6
 fi
@@ -2066 +2061 @@
   { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $2" >&5
 $as_echo_n "checking for $2... " >&6; }
-if eval \${$3+:} false; then :
+if eval "test \"\${$3+set}\"" = set; then :
   $as_echo_n "(cached) " >&6
 else
@@ -2075 +2070 @@
 $as_echo "$ac_res" >&6; }
 fi
-  eval $as_lineno_stack; ${as_lineno_stack:+:} unset as_lineno
+  eval $as_lineno_stack; test "x$as_lineno_stack" = x && { as_lineno=; unset as_lineno;}
 
 } # ac_fn_cxx_check_header_mongrel
@@ -2088 +2083 @@
   { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $2" >&5
 $as_echo_n "checking for $2... " >&6; }
-if eval \${$3+:} false; then :
+if eval "test \"\${$3+set}\"" = set; then :
   $as_echo_n "(cached) " >&6
 else
@@ -2106 +2101 @@
                { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_res" >&5
 $as_echo "$ac_res" >&6; }
-  eval $as_lineno_stack; ${as_lineno_stack:+:} unset as_lineno
+  eval $as_lineno_stack; test "x$as_lineno_stack" = x && { as_lineno=; unset as_lineno;}
 
 } # ac_fn_cxx_check_header_compile
@@ -2147 +2142 @@
 fi
   rm -rf conftest.dSYM conftest_ipa8_conftest.oo
-  eval $as_lineno_stack; ${as_lineno_stack:+:} unset as_lineno
+  eval $as_lineno_stack; test "x$as_lineno_stack" = x && { as_lineno=; unset as_lineno;}
   as_fn_set_status $ac_retval
 
@@ -2325 +2320 @@
 
   fi
-  eval $as_lineno_stack; ${as_lineno_stack:+:} unset as_lineno
+  eval $as_lineno_stack; test "x$as_lineno_stack" = x && { as_lineno=; unset as_lineno;}
   as_fn_set_status $ac_retval
 
@@ -2334 +2329 @@
 
 It was created by Rappture $as_me 1.1, which was
-generated by GNU Autoconf 2.68.  Invocation command line was
+generated by GNU Autoconf 2.67.  Invocation command line was
 
   $ $0 $@
@@ -2592 +2587 @@
 $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
@@ -2726 +2721 @@
 fi
 
+# Check whether --with-install was given.
+if test "${with_install+set}" = set; then :
+  withval=$with_install;
+else
+  with_install=yes
+fi
+
+if test "$with_install" != "yes"; then
+    INSTALL_PREFIX=$with_install
+else
+    INSTALL_PREFIX=$prefix
+fi
+
+
+
 if test "${libdir}" != "${prefix}/lib"; then
     LIB_SEARCH_DIRS="-L${prefix}/lib -L${libdir}"
@@ -2751 +2761 @@
 $as_echo_n "checking for a BSD-compatible install... " >&6; }
 if test -z "$INSTALL"; then
-if ${ac_cv_path_install+:} false; then :
+if test "${ac_cv_path_install+set}" = set; then :
   $as_echo_n "(cached) " >&6
 else
@@ -2833 +2843 @@
 { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
 $as_echo_n "checking for $ac_word... " >&6; }
-if ${ac_cv_prog_RANLIB+:} false; then :
+if test "${ac_cv_prog_RANLIB+set}" = set; then :
   $as_echo_n "(cached) " >&6
 else
@@ -2873 +2883 @@
 { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
 $as_echo_n "checking for $ac_word... " >&6; }
-if ${ac_cv_prog_ac_ct_RANLIB+:} false; then :
+if test "${ac_cv_prog_ac_ct_RANLIB+set}" = set; then :
   $as_echo_n "(cached) " >&6
 else
@@ -2934 +2944 @@
 $as_echo_n "checking for a thread-safe mkdir -p... " >&6; }
 if test -z "$MKDIR_P"; then
-  if ${ac_cv_path_mkdir+:} false; then :
+  if test "${ac_cv_path_mkdir+set}" = set; then :
   $as_echo_n "(cached) " >&6
 else
@@ -2977 +2987 @@
 set x ${MAKE-make}
 ac_make=`$as_echo "$2" | sed 's/+/p/g; s/[^a-zA-Z0-9_]/_/g'`
-if eval \${ac_cv_prog_make_${ac_make}_set+:} false; then :
+if eval "test \"\${ac_cv_prog_make_${ac_make}_set+set}\"" = set; then :
   $as_echo_n "(cached) " >&6
 else
@@ -3016 +3026 @@
 { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
 $as_echo_n "checking for $ac_word... " >&6; }
-if ${ac_cv_prog_CC+:} false; then :
+if test "${ac_cv_prog_CC+set}" = set; then :
   $as_echo_n "(cached) " >&6
 else
@@ -3056 +3066 @@
 { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
 $as_echo_n "checking for $ac_word... " >&6; }
-if ${ac_cv_prog_ac_ct_CC+:} false; then :
+if test "${ac_cv_prog_ac_ct_CC+set}" = set; then :
   $as_echo_n "(cached) " >&6
 else
@@ -3109 +3119 @@
 { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
 $as_echo_n "checking for $ac_word... " >&6; }
-if ${ac_cv_prog_CC+:} false; then :
+if test "${ac_cv_prog_CC+set}" = set; then :
   $as_echo_n "(cached) " >&6
 else
@@ -3149 +3159 @@
 { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
 $as_echo_n "checking for $ac_word... " >&6; }
-if ${ac_cv_prog_CC+:} false; then :
+if test "${ac_cv_prog_CC+set}" = set; then :
   $as_echo_n "(cached) " >&6
 else
@@ -3208 +3218 @@
 { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
 $as_echo_n "checking for $ac_word... " >&6; }
-if ${ac_cv_prog_CC+:} false; then :
+if test "${ac_cv_prog_CC+set}" = set; then :
   $as_echo_n "(cached) " >&6
 else
@@ -3252 +3262 @@
 { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
 $as_echo_n "checking for $ac_word... " >&6; }
-if ${ac_cv_prog_ac_ct_CC+:} false; then :
+if test "${ac_cv_prog_ac_ct_CC+set}" = set; then :
   $as_echo_n "(cached) " >&6
 else
@@ -3307 +3317 @@
 $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.
@@ -3422 +3432 @@
 $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
@@ -3465 +3475 @@
 $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
@@ -3524 +3534 @@
 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
@@ -3535 +3545 @@
 { $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 ${ac_cv_objext+:} false; then :
+if test "${ac_cv_objext+set}" = set; then :
   $as_echo_n "(cached) " >&6
 else
@@ -3576 +3586 @@
 $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
@@ -3586 +3596 @@
 { $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 ${ac_cv_c_compiler_gnu+:} false; then :
+if test "${ac_cv_c_compiler_gnu+set}" = set; then :
   $as_echo_n "(cached) " >&6
 else
@@ -3623 +3633 @@
 { $as_echo "$as_me:${as_lineno-$LINENO}: checking whether $CC accepts -g" >&5
 $as_echo_n "checking whether $CC accepts -g... " >&6; }
-if ${ac_cv_prog_cc_g+:} false; then :
+if test "${ac_cv_prog_cc_g+set}" = set; then :
   $as_echo_n "(cached) " >&6
 else
@@ -3701 +3711 @@
 { $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 ${ac_cv_prog_cc_c89+:} false; then :
+if test "${ac_cv_prog_cc_c89+set}" = set; then :
   $as_echo_n "(cached) " >&6
 else
@@ -3812 +3822 @@
 { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
 $as_echo_n "checking for $ac_word... " >&6; }
-if ${ac_cv_prog_CXX+:} false; then :
+if test "${ac_cv_prog_CXX+set}" = set; then :
   $as_echo_n "(cached) " >&6
 else
@@ -3856 +3866 @@
 { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
 $as_echo_n "checking for $ac_word... " >&6; }
-if ${ac_cv_prog_ac_ct_CXX+:} false; then :
+if test "${ac_cv_prog_ac_ct_CXX+set}" = set; then :
   $as_echo_n "(cached) " >&6
 else
@@ -3934 +3944 @@
 { $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 ${ac_cv_cxx_compiler_gnu+:} false; then :
+if test "${ac_cv_cxx_compiler_gnu+set}" = set; then :
   $as_echo_n "(cached) " >&6
 else
@@ -3971 +3981 @@
 { $as_echo "$as_me:${as_lineno-$LINENO}: checking whether $CXX accepts -g" >&5
 $as_echo_n "checking whether $CXX accepts -g... " >&6; }
-if ${ac_cv_prog_cxx_g+:} false; then :
+if test "${ac_cv_prog_cxx_g+set}" = set; then :
   $as_echo_n "(cached) " >&6
 else
@@ -4065 +4075 @@
 { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
 $as_echo_n "checking for $ac_word... " >&6; }
-if ${ac_cv_prog_F77+:} false; then :
+if test "${ac_cv_prog_F77+set}" = set; then :
   $as_echo_n "(cached) " >&6
 else
@@ -4109 +4119 @@
 { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
 $as_echo_n "checking for $ac_word... " >&6; }
-if ${ac_cv_prog_ac_ct_F77+:} false; then :
+if test "${ac_cv_prog_ac_ct_F77+set}" = set; then :
   $as_echo_n "(cached) " >&6
 else
@@ -4191 +4201 @@
 { $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 ${ac_cv_f77_compiler_gnu+:} false; then :
+if test "${ac_cv_f77_compiler_gnu+set}" = set; then :
   $as_echo_n "(cached) " >&6
 else
@@ -4219 +4229 @@
 { $as_echo "$as_me:${as_lineno-$LINENO}: checking whether $F77 accepts -g" >&5
 $as_echo_n "checking whether $F77 accepts -g... " >&6; }
-if ${ac_cv_prog_f77_g+:} false; then :
+if test "${ac_cv_prog_f77_g+set}" = set; then :
   $as_echo_n "(cached) " >&6
 else
@@ -4286 +4296 @@
 fi
 if test -z "$CPP"; then
-  if ${ac_cv_prog_CPP+:} false; then :
+  if test "${ac_cv_prog_CPP+set}" = set; then :
   $as_echo_n "(cached) " >&6
 else
@@ -4402 +4412 @@
 $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
 
@@ -4414 +4424 @@
 { $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 ${ac_cv_path_GREP+:} false; then :
+if test "${ac_cv_path_GREP+set}" = set; then :
   $as_echo_n "(cached) " >&6
 else
@@ -4477 +4487 @@
 { $as_echo "$as_me:${as_lineno-$LINENO}: checking for egrep" >&5
 $as_echo_n "checking for egrep... " >&6; }
-if ${ac_cv_path_EGREP+:} false; then :
+if test "${ac_cv_path_EGREP+set}" = set; then :
   $as_echo_n "(cached) " >&6
 else
@@ -4544 +4554 @@
 { $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 ${ac_cv_header_stdc+:} false; then :
+if test "${ac_cv_header_stdc+set}" = set; then :
   $as_echo_n "(cached) " >&6
 else
@@ -4655 +4665 @@
 
 ac_fn_c_check_func "$LINENO" "atol" "ac_cv_func_atol"
-if test "x$ac_cv_func_atol" = xyes; then :
+if test "x$ac_cv_func_atol" = x""yes; then :
 
 else
@@ -4673 +4683 @@
 do :
   ac_fn_cxx_check_func "$LINENO" "sysinfo" "ac_cv_func_sysinfo"
-if test "x$ac_cv_func_sysinfo" = xyes; then :
+if test "x$ac_cv_func_sysinfo" = x""yes; then :
   cat >>confdefs.h <<_ACEOF
 #define HAVE_SYSINFO 1
@@ -4689 +4699 @@
 $as_echo_n "checking how to run the C++ preprocessor... " >&6; }
 if test -z "$CXXCPP"; then
-  if ${ac_cv_prog_CXXCPP+:} false; then :
+  if test "${ac_cv_prog_CXXCPP+set}" = set; then :
   $as_echo_n "(cached) " >&6
 else
@@ -4805 +4815 @@
 $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
 
@@ -4835 +4845 @@
 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" = xyes; then :
+if test "x$ac_cv_header_sys_sysinfo_h" = x""yes; then :
   cat >>confdefs.h <<_ACEOF
 #define HAVE_SYS_SYSINFO_H 1
@@ -4847 +4857 @@
 { $as_echo "$as_me:${as_lineno-$LINENO}: checking for main in -lm" >&5
 $as_echo_n "checking for main in -lm... " >&6; }
-if ${ac_cv_lib_m_main+:} false; then :
+if test "${ac_cv_lib_m_main+set}" = set; then :
   $as_echo_n "(cached) " >&6
 else
@@ -4875 +4885 @@
 { $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" = xyes; then :
+if test "x$ac_cv_lib_m_main" = x""yes; then :
   cat >>confdefs.h <<_ACEOF
 #define HAVE_LIBM 1
@@ -4888 +4898 @@
 { $as_echo "$as_me:${as_lineno-$LINENO}: checking for main in -lstdc++" >&5
 $as_echo_n "checking for main in -lstdc++... " >&6; }
-if ${ac_cv_lib_stdcpp_main+:} false; then :
+if test "${ac_cv_lib_stdcpp_main+set}" = set; then :
   $as_echo_n "(cached) " >&6
 else
@@ -4916 +4926 @@
 { $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" = xyes; then :
+if test "x$ac_cv_lib_stdcpp_main" = x""yes; then :
   cat >>confdefs.h <<_ACEOF
 #define HAVE_LIBSTDC__ 1
@@ -4930 +4940 @@
 do :
   ac_fn_cxx_check_header_mongrel "$LINENO" "algorithm" "ac_cv_header_algorithm" "$ac_includes_default"
-if test "x$ac_cv_header_algorithm" = xyes; then :
+if test "x$ac_cv_header_algorithm" = x""yes; then :
   cat >>confdefs.h <<_ACEOF
 #define HAVE_ALGORITHM 1
@@ -4945 +4955 @@
 do :
   ac_fn_cxx_check_header_mongrel "$LINENO" "cctype" "ac_cv_header_cctype" "$ac_includes_default"
-if test "x$ac_cv_header_cctype" = xyes; then :
+if test "x$ac_cv_header_cctype" = x""yes; then :
   cat >>confdefs.h <<_ACEOF
 #define HAVE_CCTYPE 1
@@ -4960 +4970 @@
 do :
   ac_fn_cxx_check_header_mongrel "$LINENO" "cfloat" "ac_cv_header_cfloat" "$ac_includes_default"
-if test "x$ac_cv_header_cfloat" = xyes; then :
+if test "x$ac_cv_header_cfloat" = x""yes; then :
   cat >>confdefs.h <<_ACEOF
 #define HAVE_CFLOAT 1
@@ -4975 +4985 @@
 do :
   ac_fn_cxx_check_header_mongrel "$LINENO" "cmath" "ac_cv_header_cmath" "$ac_includes_default"
-if test "x$ac_cv_header_cmath" = xyes; then :
+if test "x$ac_cv_header_cmath" = x""yes; then :
   cat >>confdefs.h <<_ACEOF
 #define HAVE_CMATH 1
@@ -4990 +5000 @@
 do :
   ac_fn_cxx_check_header_mongrel "$LINENO" "cstdio" "ac_cv_header_cstdio" "$ac_includes_default"
-if test "x$ac_cv_header_cstdio" = xyes; then :
+if test "x$ac_cv_header_cstdio" = x""yes; then :
   cat >>confdefs.h <<_ACEOF
 #define HAVE_CSTDIO 1
@@ -5005 +5015 @@
 do :
   ac_fn_cxx_check_header_mongrel "$LINENO" "cstdlib" "ac_cv_header_cstdlib" "$ac_includes_default"
-if test "x$ac_cv_header_cstdlib" = xyes; then :
+if test "x$ac_cv_header_cstdlib" = x""yes; then :
   cat >>confdefs.h <<_ACEOF
 #define HAVE_CSTDLIB 1
@@ -5020 +5030 @@
 do :
   ac_fn_cxx_check_header_mongrel "$LINENO" "cstring" "ac_cv_header_cstring" "$ac_includes_default"
-if test "x$ac_cv_header_cstring" = xyes; then :
+if test "x$ac_cv_header_cstring" = x""yes; then :
   cat >>confdefs.h <<_ACEOF
 #define HAVE_CSTRING 1
@@ -5035 +5045 @@
 do :
   ac_fn_cxx_check_header_mongrel "$LINENO" "fstream" "ac_cv_header_fstream" "$ac_includes_default"
-if test "x$ac_cv_header_fstream" = xyes; then :
+if test "x$ac_cv_header_fstream" = x""yes; then :
   cat >>confdefs.h <<_ACEOF
 #define HAVE_FSTREAM 1
@@ -5050 +5060 @@
 do :
   ac_fn_cxx_check_header_mongrel "$LINENO" "list" "ac_cv_header_list" "$ac_includes_default"
-if test "x$ac_cv_header_list" = xyes; then :
+if test "x$ac_cv_header_list" = x""yes; then :
   cat >>confdefs.h <<_ACEOF
 #define HAVE_LIST 1
@@ -5065 +5075 @@
 do :
   ac_fn_cxx_check_header_mongrel "$LINENO" "iostream" "ac_cv_header_iostream" "$ac_includes_default"
-if test "x$ac_cv_header_iostream" = xyes; then :
+if test "x$ac_cv_header_iostream" = x""yes; then :
   cat >>confdefs.h <<_ACEOF
 #define HAVE_IOSTREAM 1
@@ -5080 +5090 @@
 do :
   ac_fn_cxx_check_header_mongrel "$LINENO" "iterator" "ac_cv_header_iterator" "$ac_includes_default"
-if test "x$ac_cv_header_iterator" = xyes; then :
+if test "x$ac_cv_header_iterator" = x""yes; then :
   cat >>confdefs.h <<_ACEOF
 #define HAVE_ITERATOR 1
@@ -5095 +5105 @@
 do :
   ac_fn_cxx_check_header_mongrel "$LINENO" "sstream" "ac_cv_header_sstream" "$ac_includes_default"
-if test "x$ac_cv_header_sstream" = xyes; then :
+if test "x$ac_cv_header_sstream" = x""yes; then :
   cat >>confdefs.h <<_ACEOF
 #define HAVE_SSTREAM 1
@@ -5110 +5120 @@
 do :
   ac_fn_cxx_check_header_mongrel "$LINENO" "stack" "ac_cv_header_stack" "$ac_includes_default"
-if test "x$ac_cv_header_stack" = xyes; then :
+if test "x$ac_cv_header_stack" = x""yes; then :
   cat >>confdefs.h <<_ACEOF
 #define HAVE_STACK 1
@@ -5125 +5135 @@
 do :
   ac_fn_cxx_check_header_mongrel "$LINENO" "string" "ac_cv_header_string" "$ac_includes_default"
-if test "x$ac_cv_header_string" = xyes; then :
+if test "x$ac_cv_header_string" = x""yes; then :
   cat >>confdefs.h <<_ACEOF
 #define HAVE_STRING 1
@@ -5140 +5150 @@
 do :
   ac_fn_cxx_check_header_mongrel "$LINENO" "vector" "ac_cv_header_vector" "$ac_includes_default"
-if test "x$ac_cv_header_vector" = xyes; then :
+if test "x$ac_cv_header_vector" = x""yes; then :
   cat >>confdefs.h <<_ACEOF
 #define HAVE_VECTOR 1
@@ -5156 +5166 @@
 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" = xyes; then :
+if test "x$ac_cv_header_assert_h" = x""yes; then :
   cat >>confdefs.h <<_ACEOF
 #define HAVE_ASSERT_H 1
@@ -5171 +5181 @@
 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" = xyes; then :
+if test "x$ac_cv_header_ctype_h" = x""yes; then :
   cat >>confdefs.h <<_ACEOF
 #define HAVE_CTYPE_H 1
@@ -5186 +5196 @@
 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" = xyes; then :
+if test "x$ac_cv_header_errno_h" = x""yes; then :
   cat >>confdefs.h <<_ACEOF
 #define HAVE_ERRNO_H 1
@@ -5201 +5211 @@
 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" = xyes; then :
+if test "x$ac_cv_header_limits_h" = x""yes; then :
   cat >>confdefs.h <<_ACEOF
 #define HAVE_LIMITS_H 1
@@ -5216 +5226 @@
 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" = xyes; then :
+if test "x$ac_cv_header_string_h" = x""yes; then :
   cat >>confdefs.h <<_ACEOF
 #define HAVE_STRING_H 1
@@ -5231 +5241 @@
 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" = xyes; then :
+if test "x$ac_cv_header_stdlib_h" = x""yes; then :
   cat >>confdefs.h <<_ACEOF
 #define HAVE_STDLIB_H 1
@@ -5246 +5256 @@
 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" = xyes; then :
+if test "x$ac_cv_header_stddef_h" = x""yes; then :
   cat >>confdefs.h <<_ACEOF
 #define HAVE_STDDEF_H 1
@@ -5261 +5271 @@
 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" = xyes; then :
+if test "x$ac_cv_header_float_h" = x""yes; then :
   cat >>confdefs.h <<_ACEOF
 #define HAVE_FLOAT_H 1
@@ -5276 +5286 @@
 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" = xyes; then :
+if test "x$ac_cv_header_math_h" = x""yes; then :
   cat >>confdefs.h <<_ACEOF
 #define HAVE_MATH_H 1
@@ -5291 +5301 @@
 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" = xyes; then :
+if test "x$ac_cv_header_malloc_h" = x""yes; then :
   cat >>confdefs.h <<_ACEOF
 #define HAVE_MALLOC_H 1
@@ -5306 +5316 @@
 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" = xyes; then :
+if test "x$ac_cv_header_memory_h" = x""yes; then :
   cat >>confdefs.h <<_ACEOF
 #define HAVE_MEMORY_H 1
@@ -5321 +5331 @@
 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" = xyes; then :
+if test "x$ac_cv_header_unistd_h" = x""yes; then :
   cat >>confdefs.h <<_ACEOF
 #define HAVE_UNISTD_H 1
@@ -5337 +5347 @@
 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" = xyes; then :
+if test "x$ac_cv_header_inttypes_h" = x""yes; then :
   cat >>confdefs.h <<_ACEOF
 #define HAVE_INTTYPES_H 1
@@ -5398 +5408 @@
     { $as_echo "$as_me:${as_lineno-$LINENO}: checking system version" >&5
 $as_echo_n "checking system version... " >&6; }
-if ${tcl_cv_sys_version+:} false; then :
+if test "${tcl_cv_sys_version+set}" = set; then :
   $as_echo_n "(cached) " >&6
 else
@@ -5434 +5444 @@
     { $as_echo "$as_me:${as_lineno-$LINENO}: checking for dlopen in -ldl" >&5
 $as_echo_n "checking for dlopen in -ldl... " >&6; }
-if ${ac_cv_lib_dl_dlopen+:} false; then :
+if test "${ac_cv_lib_dl_dlopen+set}" = set; then :
   $as_echo_n "(cached) " >&6
 else
@@ -5468 +5478 @@
 { $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" = xyes; then :
+if test "x$ac_cv_lib_dl_dlopen" = x""yes; then :
   have_dl=yes
 else
@@ -5502 +5512 @@
 { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
 $as_echo_n "checking for $ac_word... " >&6; }
-if ${ac_cv_prog_AR+:} false; then :
+if test "${ac_cv_prog_AR+set}" = set; then :
   $as_echo_n "(cached) " >&6
 else
@@ -5627 +5637 @@
             { $as_echo "$as_me:${as_lineno-$LINENO}: checking for gettimeofday in -lbsd" >&5
 $as_echo_n "checking for gettimeofday in -lbsd... " >&6; }
-if ${ac_cv_lib_bsd_gettimeofday+:} false; then :
+if test "${ac_cv_lib_bsd_gettimeofday+set}" = set; then :
   $as_echo_n "(cached) " >&6
 else
@@ -5661 +5671 @@
 { $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" = xyes; then :
+if test "x$ac_cv_lib_bsd_gettimeofday" = x""yes; then :
   libbsd=yes
 else
@@ -5688 +5698 @@
             { $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 ${ac_cv_lib_bind_inet_ntoa+:} false; then :
+if test "${ac_cv_lib_bind_inet_ntoa+set}" = set; then :
   $as_echo_n "(cached) " >&6
 else
@@ -5722 +5732 @@
 { $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" = xyes; then :
+if test "x$ac_cv_lib_bind_inet_ntoa" = x""yes; then :
   LIBS="$LIBS -lbind -lsocket"
 fi
@@ -5773 +5783 @@
             { $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 ${ac_cv_lib_dld_shl_load+:} false; then :
+if test "${ac_cv_lib_dld_shl_load+set}" = set; then :
   $as_echo_n "(cached) " >&6
 else
@@ -5807 +5817 @@
 { $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" = xyes; then :
+if test "x$ac_cv_lib_dld_shl_load" = x""yes; then :
   tcl_ok=yes
 else
@@ -5862 +5872 @@
             { $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 ${ac_cv_lib_dld_shl_load+:} false; then :
+if test "${ac_cv_lib_dld_shl_load+set}" = set; then :
   $as_echo_n "(cached) " >&6
 else
@@ -5896 +5906 @@
 { $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" = xyes; then :
+if test "x$ac_cv_lib_dld_shl_load" = x""yes; then :
   tcl_ok=yes
 else
@@ -6005 +6015 @@
             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" = xyes; then :
+if test "x$ac_cv_header_dld_h" = x""yes; then :
 
                     SHLIB_LD="ld -shared"
@@ -6022 +6032 @@
                 { $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 ${tcl_cv_cc_m64+:} false; then :
+if test "${tcl_cv_cc_m64+set}" = set; then :
   $as_echo_n "(cached) " >&6
 else
@@ -6086 +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" = xyes; then :
+if test "x$ac_cv_header_dld_h" = x""yes; then :
 
                     SHLIB_LD="ld -shared"
@@ -6137 +6147 @@
             # 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" = xyes; then :
+if test "x$ac_cv_header_dlfcn_h" = x""yes; then :
 
                 # NetBSD/SPARC needs -fPIC, -fpic will not do.
@@ -6150 +6160 @@
                 { $as_echo "$as_me:${as_lineno-$LINENO}: checking for ELF" >&5
 $as_echo_n "checking for ELF... " >&6; }
-if ${tcl_cv_ld_elf+:} false; then :
+if test "${tcl_cv_ld_elf+set}" = set; then :
   $as_echo_n "(cached) " >&6
 else
@@ -6232 +6242 @@
                 { $as_echo "$as_me:${as_lineno-$LINENO}: checking for ELF" >&5
 $as_echo_n "checking for ELF... " >&6; }
-if ${tcl_cv_ld_elf+:} false; then :
+if test "${tcl_cv_ld_elf+set}" = set; then :
   $as_echo_n "(cached) " >&6
 else
@@ -6310 +6320 @@
                         { $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 ${tcl_cv_cc_arch_ppc64+:} false; then :
+if test "${tcl_cv_cc_arch_ppc64+set}" = set; then :
   $as_echo_n "(cached) " >&6
 else
@@ -6345 +6355 @@
                         { $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 ${tcl_cv_cc_arch_x86_64+:} false; then :
+if test "${tcl_cv_cc_arch_x86_64+set}" = set; then :
   $as_echo_n "(cached) " >&6
 else
@@ -6390 +6400 @@
             { $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 ${tcl_cv_ld_single_module+:} false; then :
+if test "${tcl_cv_ld_single_module+set}" = set; then :
   $as_echo_n "(cached) " >&6
 else
@@ -6432 +6442 @@
             { $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 ${tcl_cv_ld_search_paths_first+:} false; then :
+if test "${tcl_cv_ld_search_paths_first+set}" = set; then :
   $as_echo_n "(cached) " >&6
 else
@@ -6482 +6492 @@
                 { $as_echo "$as_me:${as_lineno-$LINENO}: checking for CoreFoundation.framework" >&5
 $as_echo_n "checking for CoreFoundation.framework... " >&6; }
-if ${tcl_cv_lib_corefoundation+:} false; then :
+if test "${tcl_cv_lib_corefoundation+set}" = set; then :
   $as_echo_n "(cached) " >&6
 else
@@ -6528 +6538 @@
                     { $as_echo "$as_me:${as_lineno-$LINENO}: checking for 64-bit CoreFoundation" >&5
 $as_echo_n "checking for 64-bit CoreFoundation... " >&6; }
-if ${tcl_cv_lib_corefoundation_64+:} false; then :
+if test "${tcl_cv_lib_corefoundation_64+set}" = set; then :
   $as_echo_n "(cached) " >&6
 else
@@ -6853 +6863 @@
             { $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 ${tcl_cv_ld_Bexport+:} false; then :
+if test "${tcl_cv_ld_Bexport+set}" = set; then :
   $as_echo_n "(cached) " >&6
 else
@@ -6919 +6929 @@
         { $as_echo "$as_me:${as_lineno-$LINENO}: checking sys/exec.h" >&5
 $as_echo_n "checking sys/exec.h... " >&6; }
-if ${tcl_cv_sysexec_h+:} false; then :
+if test "${tcl_cv_sysexec_h+set}" = set; then :
   $as_echo_n "(cached) " >&6
 else
@@ -6960 +6970 @@
             { $as_echo "$as_me:${as_lineno-$LINENO}: checking a.out.h" >&5
 $as_echo_n "checking a.out.h... " >&6; }
-if ${tcl_cv_aout_h+:} false; then :
+if test "${tcl_cv_aout_h+set}" = set; then :
   $as_echo_n "(cached) " >&6
 else
@@ -7001 +7011 @@
                 { $as_echo "$as_me:${as_lineno-$LINENO}: checking sys/exec_aout.h" >&5
 $as_echo_n "checking sys/exec_aout.h... " >&6; }
-if ${tcl_cv_sysexecaout_h+:} false; then :
+if test "${tcl_cv_sysexecaout_h+set}" = set; then :
   $as_echo_n "(cached) " >&6
 else
@@ -7229 +7239 @@
 { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
 $as_echo_n "checking for $ac_word... " >&6; }
-if ${ac_cv_path_TCLSH+:} false; then :
+if test "${ac_cv_path_TCLSH+set}" = set; then :
   $as_echo_n "(cached) " >&6
 else
@@ -7271 +7281 @@
 { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
 $as_echo_n "checking for $ac_word... " >&6; }
-if ${ac_cv_path_TCLSH+:} false; then :
+if test "${ac_cv_path_TCLSH+set}" = set; then :
   $as_echo_n "(cached) " >&6
 else
@@ -7379 +7389 @@
 { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
 $as_echo_n "checking for $ac_word... " >&6; }
-if ${ac_cv_path_MATLAB+:} false; then :
+if test "${ac_cv_path_MATLAB+set}" = set; then :
   $as_echo_n "(cached) " >&6
 else
@@ -7420 +7430 @@
 { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
 $as_echo_n "checking for $ac_word... " >&6; }
-if ${ac_cv_path_MATLAB+:} false; then :
+if test "${ac_cv_path_MATLAB+set}" = set; then :
   $as_echo_n "(cached) " >&6
 else
@@ -7471 +7481 @@
 { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
 $as_echo_n "checking for $ac_word... " >&6; }
-if ${ac_cv_path_MEX+:} false; then :
+if test "${ac_cv_path_MEX+set}" = set; then :
   $as_echo_n "(cached) " >&6
 else
@@ -7511 +7521 @@
 { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
 $as_echo_n "checking for $ac_word... " >&6; }
-if ${ac_cv_path_MEXEXT+:} false; then :
+if test "${ac_cv_path_MEXEXT+set}" = set; then :
   $as_echo_n "(cached) " >&6
 else
@@ -7562 +7572 @@
 { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
 $as_echo_n "checking for $ac_word... " >&6; }
-if ${ac_cv_path_MCC+:} false; then :
+if test "${ac_cv_path_MCC+set}" = set; then :
   $as_echo_n "(cached) " >&6
 else
@@ -7632 +7642 @@
 { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
 $as_echo_n "checking for $ac_word... " >&6; }
-if ${ac_cv_path_OCTAVE+:} false; then :
+if test "${ac_cv_path_OCTAVE+set}" = set; then :
   $as_echo_n "(cached) " >&6
 else
@@ -7672 +7682 @@
 { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
 $as_echo_n "checking for $ac_word... " >&6; }
-if ${ac_cv_path_MKOCTFILE+:} false; then :
+if test "${ac_cv_path_MKOCTFILE+set}" = set; then :
   $as_echo_n "(cached) " >&6
 else
@@ -7742 +7752 @@
 { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
 $as_echo_n "checking for $ac_word... " >&6; }
-if ${ac_cv_path_octave2+:} false; then :
+if test "${ac_cv_path_octave2+set}" = set; then :
   $as_echo_n "(cached) " >&6
 else
@@ -7782 +7792 @@
 { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
 $as_echo_n "checking for $ac_word... " >&6; }
-if ${ac_cv_path_mkoctfile2+:} false; then :
+if test "${ac_cv_path_mkoctfile2+set}" = set; then :
   $as_echo_n "(cached) " >&6
 else
@@ -7849 +7859 @@
 { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
 $as_echo_n "checking for $ac_word... " >&6; }
-if ${ac_cv_path_octave3+:} false; then :
+if test "${ac_cv_path_octave3+set}" = set; then :
   $as_echo_n "(cached) " >&6
 else
@@ -7889 +7899 @@
 { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
 $as_echo_n "checking for $ac_word... " >&6; }
-if ${ac_cv_path_mkoctfile3+:} false; then :
+if test "${ac_cv_path_mkoctfile3+set}" = set; then :
   $as_echo_n "(cached) " >&6
 else
@@ -7975 +7985 @@
 { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
 $as_echo_n "checking for $ac_word... " >&6; }
-if ${ac_cv_path_PERL+:} false; then :
+if test "${ac_cv_path_PERL+set}" = set; then :
   $as_echo_n "(cached) " >&6
 else
@@ -8017 +8027 @@
 { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
 $as_echo_n "checking for $ac_word... " >&6; }
-if ${ac_cv_path_PERL+:} false; then :
+if test "${ac_cv_path_PERL+set}" = set; then :
   $as_echo_n "(cached) " >&6
 else
@@ -8111 +8121 @@
 { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
 $as_echo_n "checking for $ac_word... " >&6; }
-if ${ac_cv_path_PYTHON+:} false; then :
+if test "${ac_cv_path_PYTHON+set}" = set; then :
   $as_echo_n "(cached) " >&6
 else
@@ -8152 +8162 @@
 { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
 $as_echo_n "checking for $ac_word... " >&6; }
-if ${ac_cv_path_PYTHON+:} false; then :
+if test "${ac_cv_path_PYTHON+set}" = set; then :
   $as_echo_n "(cached) " >&6
 else
@@ -8236 +8246 @@
 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" = xyes; then :
+if test "x$ac_cv_header_Python_h" = x""yes; then :
   cat >>confdefs.h <<_ACEOF
 #define HAVE_PYTHON_H 1
@@ -8284 +8294 @@
 { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
 $as_echo_n "checking for $ac_word... " >&6; }
-if ${ac_cv_path_RUBY+:} false; then :
+if test "${ac_cv_path_RUBY+set}" = set; then :
   $as_echo_n "(cached) " >&6
 else
@@ -8325 +8335 @@
 { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
 $as_echo_n "checking for $ac_word... " >&6; }
-if ${ac_cv_path_RUBY+:} false; then :
+if test "${ac_cv_path_RUBY+set}" = set; then :
   $as_echo_n "(cached) " >&6
 else
@@ -8371 +8381 @@
   { $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 ${ac_cv_path_SED+:} false; then :
+if test "${ac_cv_path_SED+set}" = set; then :
   $as_echo_n "(cached) " >&6
 else
@@ -8464 +8474 @@
 { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
 $as_echo_n "checking for $ac_word... " >&6; }
-if ${ac_cv_prog_AWK+:} false; then :
+if test "${ac_cv_prog_AWK+set}" = set; then :
   $as_echo_n "(cached) " >&6
 else
@@ -8703 +8713 @@
 { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
 $as_echo_n "checking for $ac_word... " >&6; }
-if ${ac_cv_path_JAVA+:} false; then :
+if test "${ac_cv_path_JAVA+set}" = set; then :
   $as_echo_n "(cached) " >&6
 else
@@ -8743 +8753 @@
 { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
 $as_echo_n "checking for $ac_word... " >&6; }
-if ${ac_cv_path_JAVAC+:} false; then :
+if test "${ac_cv_path_JAVAC+set}" = set; then :
   $as_echo_n "(cached) " >&6
 else
@@ -8783 +8793 @@
 { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
 $as_echo_n "checking for $ac_word... " >&6; }
-if ${ac_cv_path_JAVAH+:} false; then :
+if test "${ac_cv_path_JAVAH+set}" = set; then :
   $as_echo_n "(cached) " >&6
 else
@@ -8824 +8834 @@
 { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
 $as_echo_n "checking for $ac_word... " >&6; }
-if ${ac_cv_path_JAVA+:} false; then :
+if test "${ac_cv_path_JAVA+set}" = set; then :
   $as_echo_n "(cached) " >&6
 else
@@ -8865 +8875 @@
 { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
 $as_echo_n "checking for $ac_word... " >&6; }
-if ${ac_cv_path_JAVAC+:} false; then :
+if test "${ac_cv_path_JAVAC+set}" = set; then :
   $as_echo_n "(cached) " >&6
 else
@@ -8906 +8916 @@
 { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
 $as_echo_n "checking for $ac_word... " >&6; }
-if ${ac_cv_path_JAVAH+:} false; then :
+if test "${ac_cv_path_JAVAH+set}" = set; then :
   $as_echo_n "(cached) " >&6
 else
@@ -9043 +9053 @@
  { $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 ${ac_cv_c_bigendian+:} false; then :
+if test "${ac_cv_c_bigendian+set}" = set; then :
   $as_echo_n "(cached) " >&6
 else
@@ -9262 +9272 @@
    *)
      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
 
@@ -9271 +9281 @@
 { $as_echo "$as_me:${as_lineno-$LINENO}: checking size of int" >&5
 $as_echo_n "checking size of int... " >&6; }
-if ${ac_cv_sizeof_int+:} false; then :
+if test "${ac_cv_sizeof_int+set}" = set; then :
   $as_echo_n "(cached) " >&6
 else
@@ -9281 +9291 @@
 $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
@@ -9304 +9314 @@
 { $as_echo "$as_me:${as_lineno-$LINENO}: checking size of long" >&5
 $as_echo_n "checking size of long... " >&6; }
-if ${ac_cv_sizeof_long+:} false; then :
+if test "${ac_cv_sizeof_long+set}" = set; then :
   $as_echo_n "(cached) " >&6
 else
@@ -9314 +9324 @@
 $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
@@ -9337 +9347 @@
 { $as_echo "$as_me:${as_lineno-$LINENO}: checking size of long long" >&5
 $as_echo_n "checking size of long long... " >&6; }
-if ${ac_cv_sizeof_long_long+:} false; then :
+if test "${ac_cv_sizeof_long_long+set}" = set; then :
   $as_echo_n "(cached) " >&6
 else
@@ -9347 +9357 @@
 $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
@@ -9370 +9380 @@
 { $as_echo "$as_me:${as_lineno-$LINENO}: checking size of void *" >&5
 $as_echo_n "checking size of void *... " >&6; }
-if ${ac_cv_sizeof_void_p+:} false; then :
+if test "${ac_cv_sizeof_void_p+set}" = set; then :
   $as_echo_n "(cached) " >&6
 else
@@ -9380 +9390 @@
 $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
@@ -9478 +9488 @@
 
 "
-if test "x$ac_cv_header_ffmpeg_avcodec_h" = xyes; then :
+if test "x$ac_cv_header_ffmpeg_avcodec_h" = x""yes; then :
   cat >>confdefs.h <<_ACEOF
 #define HAVE_FFMPEG_AVCODEC_H 1
@@ -9496 +9506 @@
 
 "
-if test "x$ac_cv_header_libavcodec_avcodec_h" = xyes; then :
+if test "x$ac_cv_header_libavcodec_avcodec_h" = x""yes; then :
   cat >>confdefs.h <<_ACEOF
 #define HAVE_LIBAVCODEC_AVCODEC_H 1
@@ -9514 +9524 @@
 
 "
-if test "x$ac_cv_header_ffmpeg_avformat_h" = xyes; then :
+if test "x$ac_cv_header_ffmpeg_avformat_h" = x""yes; then :
   cat >>confdefs.h <<_ACEOF
 #define HAVE_FFMPEG_AVFORMAT_H 1
@@ -9532 +9542 @@
 
 "
-if test "x$ac_cv_header_libavformat_avformat_h" = xyes; then :
+if test "x$ac_cv_header_libavformat_avformat_h" = x""yes; then :
   cat >>confdefs.h <<_ACEOF
 #define HAVE_LIBAVFORMAT_AVFORMAT_H 1
@@ -9550 +9560 @@
 
 "
-if test "x$ac_cv_header_ffmpeg_avutil_h" = xyes; then :
+if test "x$ac_cv_header_ffmpeg_avutil_h" = x""yes; then :
   cat >>confdefs.h <<_ACEOF
 #define HAVE_FFMPEG_AVUTIL_H 1
@@ -9568 +9578 @@
 
 "
-if test "x$ac_cv_header_libavutil_avutil_h" = xyes; then :
+if test "x$ac_cv_header_libavutil_avutil_h" = x""yes; then :
   cat >>confdefs.h <<_ACEOF
 #define HAVE_LIBAVUTIL_AVUTIL_H 1
@@ -9586 +9596 @@
 
 "
-if test "x$ac_cv_header_ffmpeg_swscale_h" = xyes; then :
+if test "x$ac_cv_header_ffmpeg_swscale_h" = x""yes; then :
   cat >>confdefs.h <<_ACEOF
 #define HAVE_FFMPEG_SWSCALE_H 1
@@ -9604 +9614 @@
 
 "
-if test "x$ac_cv_header_libswscale_swscale_h" = xyes; then :
+if test "x$ac_cv_header_libswscale_swscale_h" = x""yes; then :
   cat >>confdefs.h <<_ACEOF
 #define HAVE_LIBSWSCALE_SWSCALE_H 1
@@ -9634 +9644 @@
 do :
   ac_fn_cxx_check_func "$LINENO" "img_convert" "ac_cv_func_img_convert"
-if test "x$ac_cv_func_img_convert" = xyes; then :
+if test "x$ac_cv_func_img_convert" = x""yes; then :
   cat >>confdefs.h <<_ACEOF
 #define HAVE_IMG_CONVERT 1
@@ -9645 +9655 @@
 do :
   ac_fn_cxx_check_func "$LINENO" "sws_scale" "ac_cv_func_sws_scale"
-if test "x$ac_cv_func_sws_scale" = xyes; then :
+if test "x$ac_cv_func_sws_scale" = x""yes; then :
   cat >>confdefs.h <<_ACEOF
 #define HAVE_SWS_SCALE 1
@@ -9727 +9737 @@
 if diff "$cache_file" confcache >/dev/null 2>&1; then :; else
   if test -w "$cache_file"; then
-    if test "x$cache_file" != "x/dev/null"; then
+    test "x$cache_file" != "x/dev/null" &&
       { $as_echo "$as_me:${as_lineno-$LINENO}: updating cache $cache_file" >&5
 $as_echo "$as_me: updating cache $cache_file" >&6;}
-      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
+    cat confcache >$cache_file
   else
     { $as_echo "$as_me:${as_lineno-$LINENO}: not updating unwritable cache $cache_file" >&5
@@ -9774 +9773 @@
 
 
-: "${CONFIG_STATUS=./config.status}"
+: ${CONFIG_STATUS=./config.status}
 ac_write_fail=0
 ac_clean_files_save=$ac_clean_files
@@ -9875 +9874 @@
 
 # Find who we are.  Look in the path if we contain no directory separator.
-as_myself=
 case $0 in #((
   *[\\/]* ) as_myself=$0 ;;
@@ -10183 +10181 @@
 ac_log="
 This file was extended by Rappture $as_me 1.1, which was
-generated by GNU Autoconf 2.68.  Invocation command line was
+generated by GNU Autoconf 2.67.  Invocation command line was
 
   CONFIG_FILES    = $CONFIG_FILES
@@ -10245 +10243 @@
 ac_cs_version="\\
 Rappture config.status 1.1
-configured by $0, generated by GNU Autoconf 2.68,
+configured by $0, generated by GNU Autoconf 2.67,
   with options \\"\$ac_cs_config\\"
 
@@ -10491 +10489 @@
     "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
@@ -10513 +10511 @@
 $debug ||
 {
-  tmp= ac_tmp=
+  tmp=
   trap 'exit_status=$?
-  : "${ac_tmp:=$tmp}"
-  { test ! -d "$ac_tmp" || rm -fr "$ac_tmp"; } && exit $exit_status
+  { test -z "$tmp" || test ! -d "$tmp" || rm -fr "$tmp"; } && exit $exit_status
 ' 0
   trap 'as_fn_exit 1' 1 2 13 15
@@ -10524 +10521 @@
 {
   tmp=`(umask 077 && mktemp -d "./confXXXXXX") 2>/dev/null` &&
-  test -d "$tmp"
+  test -n "$tmp" && test -d "$tmp"
 }  ||
 {
@@ -10530 +10527 @@
   (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.
@@ -10552 +10548 @@
 fi
 
-echo 'BEGIN {' >"$ac_tmp/subs1.awk" &&
+echo 'BEGIN {' >"$tmp/subs1.awk" &&
 _ACEOF
 
@@ -10580 +10576 @@
 
 cat >>$CONFIG_STATUS <<_ACEOF || ac_write_fail=1
-cat >>"\$ac_tmp/subs1.awk" <<\\_ACAWK &&
+cat >>"\$tmp/subs1.awk" <<\\_ACAWK &&
 _ACEOF
 sed -n '
@@ -10628 +10624 @@
 cat >>$CONFIG_STATUS <<_ACEOF || ac_write_fail=1
 _ACAWK
-cat >>"\$ac_tmp/subs1.awk" <<_ACAWK &&
+cat >>"\$tmp/subs1.awk" <<_ACAWK &&
   for (key in S) S_is_set[key] = 1
   FS = ""
@@ -10660 +10656 @@
 else
   cat
-fi < "$ac_tmp/subs1.awk" > "$ac_tmp/subs.awk" \
+fi < "$tmp/subs1.awk" > "$tmp/subs.awk" \
   || as_fn_error $? "could not setup config files machinery" "$LINENO" 5
 _ACEOF
@@ -10694 +10690 @@
 # This happens for instance with `./config.status Makefile'.
 if test -n "$CONFIG_HEADERS"; then
-cat >"$ac_tmp/defines.awk" <<\_ACAWK ||
+cat >"$tmp/defines.awk" <<\_ACAWK ||
 BEGIN {
 _ACEOF
@@ -10706 +10702 @@
 ac_delim='%!_!# '
 for ac_last_try in false false :; do
-  ac_tt=`sed -n "/$ac_delim/p" confdefs.h`
-  if test -z "$ac_tt"; then
+  ac_t=`sed -n "/$ac_delim/p" confdefs.h`
+  if test -z "$ac_t"; then
     break
   elif $ac_last_try; then
@@ -10808 +10804 @@
   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;;
@@ -10827 +10823 @@
     do
       case $ac_f in
-      -) ac_f="$ac_tmp/stdin";;
+      -) ac_f="$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,
@@ -10836 +10832 @@
            *) 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
@@ -10862 +10858 @@
 
     case $ac_tag in
-    *:-:* | *:-) cat >"$ac_tmp/stdin" \
-      || as_fn_error $? "could not create $ac_file" "$LINENO" 5 ;;
+    *:-:* | *:-) cat >"$tmp/stdin" \
+      || as_fn_error $? "could not create $ac_file" "$LINENO" 5  ;;
     esac
     ;;
@@ -10999 +10995 @@
 $ac_datarootdir_hack
 "
-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
+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
 
 test -z "$ac_datarootdir_hack$ac_datarootdir_seen" &&
-  { 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"; } &&
+  { ac_out=`sed -n '/\${datarootdir}/p' "$tmp/out"`; test -n "$ac_out"; } &&
+  { ac_out=`sed -n '/^[  ]*datarootdir[  ]*:*=/p' "$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
@@ -11011 +11006 @@
 which seems to be undefined.  Please make sure it is defined" >&2;}
 
-  rm -f "$ac_tmp/stdin"
+  rm -f "$tmp/stdin"
   case $ac_file in
-  -) cat "$ac_tmp/out" && rm -f "$ac_tmp/out";;
-  *) rm -f "$ac_file" && mv "$ac_tmp/out" "$ac_file";;
+  -) cat "$tmp/out" && rm -f "$tmp/out";;
+  *) rm -f "$ac_file" && mv "$tmp/out" "$ac_file";;
   esac \
   || as_fn_error $? "could not create $ac_file" "$LINENO" 5
@@ -11025 +11020 @@
     {
       $as_echo "/* $configure_input  */" \
-      && eval '$AWK -f "$ac_tmp/defines.awk"' "$ac_file_inputs"
-    } >"$ac_tmp/config.h" \
+      && eval '$AWK -f "$tmp/defines.awk"' "$ac_file_inputs"
+    } >"$tmp/config.h" \
       || as_fn_error $? "could not create $ac_file" "$LINENO" 5
-    if diff "$ac_file" "$ac_tmp/config.h" >/dev/null 2>&1; then
+    if diff "$ac_file" "$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 "$ac_tmp/config.h" "$ac_file" \
+      mv "$tmp/config.h" "$ac_file" \
         || as_fn_error $? "could not create $ac_file" "$LINENO" 5
     fi
   else
     $as_echo "/* $configure_input  */" \
-      && eval '$AWK -f "$ac_tmp/defines.awk"' "$ac_file_inputs" \
+      && eval '$AWK -f "$tmp/defines.awk"' "$ac_file_inputs" \
       || as_fn_error $? "could not create -" "$LINENO" 5
   fi