===================================================================
RCS file: /cvsrepo/anoncvs/cvs/src/usr.bin/less/Attic/configure,v
retrieving revision 1.4
retrieving revision 1.5
diff -c -r1.4 -r1.5
*** src/usr.bin/less/Attic/configure	2011/09/16 18:12:09	1.4
--- src/usr.bin/less/Attic/configure	2014/04/25 13:38:21	1.5
***************
*** 1,6 ****
  #! /bin/sh
  # Guess values for system-dependent variables and create Makefiles.
! # Generated by GNU Autoconf 2.67 for less 1.
  #
  #
  # Copyright (C) 1992, 1993, 1994, 1995, 1996, 1998, 1999, 2000, 2001,
--- 1,6 ----
  #! /bin/sh
  # Guess values for system-dependent variables and create Makefiles.
! # Generated by GNU Autoconf 2.68 for less 1.
  #
  #
  # Copyright (C) 1992, 1993, 1994, 1995, 1996, 1998, 1999, 2000, 2001,
***************
*** 89,94 ****
--- 89,95 ----
  IFS=" ""	$as_nl"
  
  # Find who we are.  Look in the path if we contain no directory separator.
+ as_myself=
  case $0 in #((
    *[\\/]* ) as_myself=$0 ;;
    *) as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
***************
*** 214,224 ****
    # We cannot yet assume a decent shell, so we have to provide a
  	# neutralization value for shells without unset; and this also
  	# works around shells that cannot unset nonexistent variables.
  	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+"$@"}
  fi
  
      if test x$as_have_required = xno; then :
--- 215,232 ----
    # We cannot yet assume a decent shell, so we have to provide a
  	# 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+"$@"}
  fi
  
      if test x$as_have_required = xno; then :
***************
*** 1067,1073 ****
      $as_echo "$as_me: WARNING: you should use --build, --host, --target" >&2
      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}
      ;;
  
    esac
--- 1075,1081 ----
      $as_echo "$as_me: WARNING: you should use --build, --host, --target" >&2
      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}"
      ;;
  
    esac
***************
*** 1281,1287 ****
    --without-PACKAGE       do not use PACKAGE (same as --with-PACKAGE=no)
    --with-secure  Compile in secure mode
    --with-no-float  Do not use floating point
!   --with-regex={auto,pcre,posix,regcmp,re_comp,regcomp,regcomp-local}  Select a regular expression library  auto
    --with-editor=PROGRAM   use PROGRAM as the default editor vi
  
  Some influential environment variables:
--- 1289,1295 ----
    --without-PACKAGE       do not use PACKAGE (same as --with-PACKAGE=no)
    --with-secure  Compile in secure mode
    --with-no-float  Do not use floating point
!   --with-regex={auto,gnu,pcre,posix,regcmp,re_comp,regcomp,regcomp-local,none}  Select a regular expression library  auto
    --with-editor=PROGRAM   use PROGRAM as the default editor vi
  
  Some influential environment variables:
***************
*** 1361,1367 ****
  if $ac_init_version; then
    cat <<\_ACEOF
  less configure 1
! generated by GNU Autoconf 2.67
  
  Copyright (C) 2010 Free Software Foundation, Inc.
  This configure script is free software; the Free Software Foundation
--- 1369,1375 ----
  if $ac_init_version; then
    cat <<\_ACEOF
  less configure 1
! generated by GNU Autoconf 2.68
  
  Copyright (C) 2010 Free Software Foundation, Inc.
  This configure script is free software; the Free Software Foundation
***************
*** 1407,1413 ****
  
  	ac_retval=1
  fi
!   eval $as_lineno_stack; test "x$as_lineno_stack" = x && { as_lineno=; unset as_lineno;}
    as_fn_set_status $ac_retval
  
  } # ac_fn_c_try_compile
--- 1415,1421 ----
  
  	ac_retval=1
  fi
!   eval $as_lineno_stack; ${as_lineno_stack:+:} unset as_lineno
    as_fn_set_status $ac_retval
  
  } # ac_fn_c_try_compile
***************
*** 1453,1459 ****
    # interfere with the next link command; also delete a directory that is
    # 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;}
    as_fn_set_status $ac_retval
  
  } # ac_fn_c_try_link
--- 1461,1467 ----
    # interfere with the next link command; also delete a directory that is
    # 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
    as_fn_set_status $ac_retval
  
  } # ac_fn_c_try_link
***************
*** 1490,1496 ****
  
      ac_retval=1
  fi
!   eval $as_lineno_stack; test "x$as_lineno_stack" = x && { as_lineno=; unset as_lineno;}
    as_fn_set_status $ac_retval
  
  } # ac_fn_c_try_cpp
--- 1498,1504 ----
  
      ac_retval=1
  fi
!   eval $as_lineno_stack; ${as_lineno_stack:+:} unset as_lineno
    as_fn_set_status $ac_retval
  
  } # ac_fn_c_try_cpp
***************
*** 1532,1538 ****
         ac_retval=$ac_status
  fi
    rm -rf conftest.dSYM conftest_ipa8_conftest.oo
!   eval $as_lineno_stack; test "x$as_lineno_stack" = x && { as_lineno=; unset as_lineno;}
    as_fn_set_status $ac_retval
  
  } # ac_fn_c_try_run
--- 1540,1546 ----
         ac_retval=$ac_status
  fi
    rm -rf conftest.dSYM conftest_ipa8_conftest.oo
!   eval $as_lineno_stack; ${as_lineno_stack:+:} unset as_lineno
    as_fn_set_status $ac_retval
  
  } # ac_fn_c_try_run
***************
*** 1545,1554 ****
  ac_fn_c_check_header_mongrel ()
  {
    as_lineno=${as_lineno-"$1"} as_lineno_stack=as_lineno_stack=$as_lineno_stack
!   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 "test \"\${$3+set}\"" = set; then :
    $as_echo_n "(cached) " >&6
  fi
  eval ac_res=\$$3
--- 1553,1562 ----
  ac_fn_c_check_header_mongrel ()
  {
    as_lineno=${as_lineno-"$1"} as_lineno_stack=as_lineno_stack=$as_lineno_stack
!   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 \${$3+:} false; then :
    $as_echo_n "(cached) " >&6
  fi
  eval ac_res=\$$3
***************
*** 1611,1617 ****
  esac
    { $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 :
    $as_echo_n "(cached) " >&6
  else
    eval "$3=\$ac_header_compiler"
--- 1619,1625 ----
  esac
    { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $2" >&5
  $as_echo_n "checking for $2... " >&6; }
! if eval \${$3+:} false; then :
    $as_echo_n "(cached) " >&6
  else
    eval "$3=\$ac_header_compiler"
***************
*** 1620,1626 ****
  	       { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_res" >&5
  $as_echo "$ac_res" >&6; }
  fi
!   eval $as_lineno_stack; test "x$as_lineno_stack" = x && { as_lineno=; unset as_lineno;}
  
  } # ac_fn_c_check_header_mongrel
  
--- 1628,1634 ----
  	       { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_res" >&5
  $as_echo "$ac_res" >&6; }
  fi
!   eval $as_lineno_stack; ${as_lineno_stack:+:} unset as_lineno
  
  } # ac_fn_c_check_header_mongrel
  
***************
*** 1633,1639 ****
    as_lineno=${as_lineno-"$1"} as_lineno_stack=as_lineno_stack=$as_lineno_stack
    { $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 :
    $as_echo_n "(cached) " >&6
  else
    cat confdefs.h - <<_ACEOF >conftest.$ac_ext
--- 1641,1647 ----
    as_lineno=${as_lineno-"$1"} as_lineno_stack=as_lineno_stack=$as_lineno_stack
    { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $2" >&5
  $as_echo_n "checking for $2... " >&6; }
! if eval \${$3+:} false; then :
    $as_echo_n "(cached) " >&6
  else
    cat confdefs.h - <<_ACEOF >conftest.$ac_ext
***************
*** 1651,1657 ****
  eval ac_res=\$$3
  	       { $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;}
  
  } # ac_fn_c_check_header_compile
  
--- 1659,1665 ----
  eval ac_res=\$$3
  	       { $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
  
  } # ac_fn_c_check_header_compile
  
***************
*** 1664,1670 ****
    as_lineno=${as_lineno-"$1"} as_lineno_stack=as_lineno_stack=$as_lineno_stack
    { $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 :
    $as_echo_n "(cached) " >&6
  else
    eval "$3=no"
--- 1672,1678 ----
    as_lineno=${as_lineno-"$1"} as_lineno_stack=as_lineno_stack=$as_lineno_stack
    { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $2" >&5
  $as_echo_n "checking for $2... " >&6; }
! if eval \${$3+:} false; then :
    $as_echo_n "(cached) " >&6
  else
    eval "$3=no"
***************
*** 1705,1711 ****
  eval ac_res=\$$3
  	       { $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;}
  
  } # ac_fn_c_check_type
  
--- 1713,1719 ----
  eval ac_res=\$$3
  	       { $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
  
  } # ac_fn_c_check_type
  
***************
*** 1717,1723 ****
    as_lineno=${as_lineno-"$1"} as_lineno_stack=as_lineno_stack=$as_lineno_stack
    { $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 :
    $as_echo_n "(cached) " >&6
  else
    cat confdefs.h - <<_ACEOF >conftest.$ac_ext
--- 1725,1731 ----
    as_lineno=${as_lineno-"$1"} as_lineno_stack=as_lineno_stack=$as_lineno_stack
    { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $2" >&5
  $as_echo_n "checking for $2... " >&6; }
! if eval \${$3+:} false; then :
    $as_echo_n "(cached) " >&6
  else
    cat confdefs.h - <<_ACEOF >conftest.$ac_ext
***************
*** 1772,1778 ****
  eval ac_res=\$$3
  	       { $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;}
  
  } # ac_fn_c_check_func
  cat >config.log <<_ACEOF
--- 1780,1786 ----
  eval ac_res=\$$3
  	       { $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
  
  } # ac_fn_c_check_func
  cat >config.log <<_ACEOF
***************
*** 1780,1786 ****
  running configure, to aid debugging if configure makes a mistake.
  
  It was created by less $as_me 1, which was
! generated by GNU Autoconf 2.67.  Invocation command line was
  
    $ $0 $@
  
--- 1788,1794 ----
  running configure, to aid debugging if configure makes a mistake.
  
  It was created by less $as_me 1, which was
! generated by GNU Autoconf 2.68.  Invocation command line was
  
    $ $0 $@
  
***************
*** 2142,2148 ****
  set dummy ${ac_tool_prefix}gcc; ac_word=$2
  { $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 :
    $as_echo_n "(cached) " >&6
  else
    if test -n "$CC"; then
--- 2150,2156 ----
  set dummy ${ac_tool_prefix}gcc; ac_word=$2
  { $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 :
    $as_echo_n "(cached) " >&6
  else
    if test -n "$CC"; then
***************
*** 2182,2188 ****
  set dummy gcc; ac_word=$2
  { $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 :
    $as_echo_n "(cached) " >&6
  else
    if test -n "$ac_ct_CC"; then
--- 2190,2196 ----
  set dummy gcc; ac_word=$2
  { $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 :
    $as_echo_n "(cached) " >&6
  else
    if test -n "$ac_ct_CC"; then
***************
*** 2235,2241 ****
  set dummy ${ac_tool_prefix}cc; ac_word=$2
  { $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 :
    $as_echo_n "(cached) " >&6
  else
    if test -n "$CC"; then
--- 2243,2249 ----
  set dummy ${ac_tool_prefix}cc; ac_word=$2
  { $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 :
    $as_echo_n "(cached) " >&6
  else
    if test -n "$CC"; then
***************
*** 2275,2281 ****
  set dummy cc; ac_word=$2
  { $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 :
    $as_echo_n "(cached) " >&6
  else
    if test -n "$CC"; then
--- 2283,2289 ----
  set dummy cc; ac_word=$2
  { $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 :
    $as_echo_n "(cached) " >&6
  else
    if test -n "$CC"; then
***************
*** 2334,2340 ****
  set dummy $ac_tool_prefix$ac_prog; ac_word=$2
  { $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 :
    $as_echo_n "(cached) " >&6
  else
    if test -n "$CC"; then
--- 2342,2348 ----
  set dummy $ac_tool_prefix$ac_prog; ac_word=$2
  { $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 :
    $as_echo_n "(cached) " >&6
  else
    if test -n "$CC"; then
***************
*** 2378,2384 ****
  set dummy $ac_prog; ac_word=$2
  { $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 :
    $as_echo_n "(cached) " >&6
  else
    if test -n "$ac_ct_CC"; then
--- 2386,2392 ----
  set dummy $ac_prog; ac_word=$2
  { $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 :
    $as_echo_n "(cached) " >&6
  else
    if test -n "$ac_ct_CC"; then
***************
*** 2661,2667 ****
  ac_clean_files=$ac_clean_files_save
  { $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 :
    $as_echo_n "(cached) " >&6
  else
    cat confdefs.h - <<_ACEOF >conftest.$ac_ext
--- 2669,2675 ----
  ac_clean_files=$ac_clean_files_save
  { $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 :
    $as_echo_n "(cached) " >&6
  else
    cat confdefs.h - <<_ACEOF >conftest.$ac_ext
***************
*** 2712,2718 ****
  ac_objext=$OBJEXT
  { $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 :
    $as_echo_n "(cached) " >&6
  else
    cat confdefs.h - <<_ACEOF >conftest.$ac_ext
--- 2720,2726 ----
  ac_objext=$OBJEXT
  { $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 :
    $as_echo_n "(cached) " >&6
  else
    cat confdefs.h - <<_ACEOF >conftest.$ac_ext
***************
*** 2749,2755 ****
  ac_save_CFLAGS=$CFLAGS
  { $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 :
    $as_echo_n "(cached) " >&6
  else
    ac_save_c_werror_flag=$ac_c_werror_flag
--- 2757,2763 ----
  ac_save_CFLAGS=$CFLAGS
  { $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 :
    $as_echo_n "(cached) " >&6
  else
    ac_save_c_werror_flag=$ac_c_werror_flag
***************
*** 2827,2833 ****
  fi
  { $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 :
    $as_echo_n "(cached) " >&6
  else
    ac_cv_prog_cc_c89=no
--- 2835,2841 ----
  fi
  { $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 :
    $as_echo_n "(cached) " >&6
  else
    ac_cv_prog_cc_c89=no
***************
*** 2925,2931 ****
  
  { $as_echo "$as_me:${as_lineno-$LINENO}: checking for library containing strerror" >&5
  $as_echo_n "checking for library containing strerror... " >&6; }
! if test "${ac_cv_search_strerror+set}" = set; then :
    $as_echo_n "(cached) " >&6
  else
    ac_func_search_save_LIBS=$LIBS
--- 2933,2939 ----
  
  { $as_echo "$as_me:${as_lineno-$LINENO}: checking for library containing strerror" >&5
  $as_echo_n "checking for library containing strerror... " >&6; }
! if ${ac_cv_search_strerror+:} false; then :
    $as_echo_n "(cached) " >&6
  else
    ac_func_search_save_LIBS=$LIBS
***************
*** 2959,2969 ****
  fi
  rm -f core conftest.err conftest.$ac_objext \
      conftest$ac_exeext
!   if test "${ac_cv_search_strerror+set}" = set; then :
    break
  fi
  done
! if test "${ac_cv_search_strerror+set}" = set; then :
  
  else
    ac_cv_search_strerror=no
--- 2967,2977 ----
  fi
  rm -f core conftest.err conftest.$ac_objext \
      conftest$ac_exeext
!   if ${ac_cv_search_strerror+:} false; then :
    break
  fi
  done
! if ${ac_cv_search_strerror+:} false; then :
  
  else
    ac_cv_search_strerror=no
***************
*** 2991,2997 ****
    CPP=
  fi
  if test -z "$CPP"; then
!   if test "${ac_cv_prog_CPP+set}" = set; then :
    $as_echo_n "(cached) " >&6
  else
        # Double quotes because CPP needs to be expanded
--- 2999,3005 ----
    CPP=
  fi
  if test -z "$CPP"; then
!   if ${ac_cv_prog_CPP+:} false; then :
    $as_echo_n "(cached) " >&6
  else
        # Double quotes because CPP needs to be expanded
***************
*** 3119,3125 ****
  
  { $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 :
    $as_echo_n "(cached) " >&6
  else
    if test -z "$GREP"; then
--- 3127,3133 ----
  
  { $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 :
    $as_echo_n "(cached) " >&6
  else
    if test -z "$GREP"; then
***************
*** 3182,3188 ****
  
  { $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 :
    $as_echo_n "(cached) " >&6
  else
    if echo a | $GREP -E '(a|b)' >/dev/null 2>&1
--- 3190,3196 ----
  
  { $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 :
    $as_echo_n "(cached) " >&6
  else
    if echo a | $GREP -E '(a|b)' >/dev/null 2>&1
***************
*** 3250,3256 ****
  if test $ac_cv_c_compiler_gnu = yes; then
      { $as_echo "$as_me:${as_lineno-$LINENO}: checking whether $CC needs -traditional" >&5
  $as_echo_n "checking whether $CC needs -traditional... " >&6; }
! if test "${ac_cv_prog_gcc_traditional+set}" = set; then :
    $as_echo_n "(cached) " >&6
  else
      ac_pattern="Autoconf.*'x'"
--- 3258,3264 ----
  if test $ac_cv_c_compiler_gnu = yes; then
      { $as_echo "$as_me:${as_lineno-$LINENO}: checking whether $CC needs -traditional" >&5
  $as_echo_n "checking whether $CC needs -traditional... " >&6; }
! if ${ac_cv_prog_gcc_traditional+:} false; then :
    $as_echo_n "(cached) " >&6
  else
      ac_pattern="Autoconf.*'x'"
***************
*** 3335,3341 ****
  { $as_echo "$as_me:${as_lineno-$LINENO}: checking for a BSD-compatible install" >&5
  $as_echo_n "checking for a BSD-compatible install... " >&6; }
  if test -z "$INSTALL"; then
! if test "${ac_cv_path_install+set}" = set; then :
    $as_echo_n "(cached) " >&6
  else
    as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
--- 3343,3349 ----
  { $as_echo "$as_me:${as_lineno-$LINENO}: checking for a BSD-compatible install" >&5
  $as_echo_n "checking for a BSD-compatible install... " >&6; }
  if test -z "$INSTALL"; then
! if ${ac_cv_path_install+:} false; then :
    $as_echo_n "(cached) " >&6
  else
    as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
***************
*** 3422,3428 ****
  
    { $as_echo "$as_me:${as_lineno-$LINENO}: checking for special C compiler options needed for large files" >&5
  $as_echo_n "checking for special C compiler options needed for large files... " >&6; }
! if test "${ac_cv_sys_largefile_CC+set}" = set; then :
    $as_echo_n "(cached) " >&6
  else
    ac_cv_sys_largefile_CC=no
--- 3430,3436 ----
  
    { $as_echo "$as_me:${as_lineno-$LINENO}: checking for special C compiler options needed for large files" >&5
  $as_echo_n "checking for special C compiler options needed for large files... " >&6; }
! if ${ac_cv_sys_largefile_CC+:} false; then :
    $as_echo_n "(cached) " >&6
  else
    ac_cv_sys_largefile_CC=no
***************
*** 3473,3479 ****
  
    { $as_echo "$as_me:${as_lineno-$LINENO}: checking for _FILE_OFFSET_BITS value needed for large files" >&5
  $as_echo_n "checking for _FILE_OFFSET_BITS value needed for large files... " >&6; }
! if test "${ac_cv_sys_file_offset_bits+set}" = set; then :
    $as_echo_n "(cached) " >&6
  else
    while :; do
--- 3481,3487 ----
  
    { $as_echo "$as_me:${as_lineno-$LINENO}: checking for _FILE_OFFSET_BITS value needed for large files" >&5
  $as_echo_n "checking for _FILE_OFFSET_BITS value needed for large files... " >&6; }
! if ${ac_cv_sys_file_offset_bits+:} false; then :
    $as_echo_n "(cached) " >&6
  else
    while :; do
***************
*** 3542,3548 ****
    if test $ac_cv_sys_file_offset_bits = unknown; then
      { $as_echo "$as_me:${as_lineno-$LINENO}: checking for _LARGE_FILES value needed for large files" >&5
  $as_echo_n "checking for _LARGE_FILES value needed for large files... " >&6; }
! if test "${ac_cv_sys_large_files+set}" = set; then :
    $as_echo_n "(cached) " >&6
  else
    while :; do
--- 3550,3556 ----
    if test $ac_cv_sys_file_offset_bits = unknown; then
      { $as_echo "$as_me:${as_lineno-$LINENO}: checking for _LARGE_FILES value needed for large files" >&5
  $as_echo_n "checking for _LARGE_FILES value needed for large files... " >&6; }
! if ${ac_cv_sys_large_files+:} false; then :
    $as_echo_n "(cached) " >&6
  else
    while :; do
***************
*** 3615,3621 ****
  # Checks for general libraries.
  { $as_echo "$as_me:${as_lineno-$LINENO}: checking for tgoto in -ltinfo" >&5
  $as_echo_n "checking for tgoto in -ltinfo... " >&6; }
! if test "${ac_cv_lib_tinfo_tgoto+set}" = set; then :
    $as_echo_n "(cached) " >&6
  else
    ac_check_lib_save_LIBS=$LIBS
--- 3623,3629 ----
  # Checks for general libraries.
  { $as_echo "$as_me:${as_lineno-$LINENO}: checking for tgoto in -ltinfo" >&5
  $as_echo_n "checking for tgoto in -ltinfo... " >&6; }
! if ${ac_cv_lib_tinfo_tgoto+:} false; then :
    $as_echo_n "(cached) " >&6
  else
    ac_check_lib_save_LIBS=$LIBS
***************
*** 3649,3655 ****
  fi
  { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_tinfo_tgoto" >&5
  $as_echo "$ac_cv_lib_tinfo_tgoto" >&6; }
! if test "x$ac_cv_lib_tinfo_tgoto" = x""yes; then :
    have_tinfo=yes
  else
    have_tinfo=no
--- 3657,3663 ----
  fi
  { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_tinfo_tgoto" >&5
  $as_echo "$ac_cv_lib_tinfo_tgoto" >&6; }
! if test "x$ac_cv_lib_tinfo_tgoto" = xyes; then :
    have_tinfo=yes
  else
    have_tinfo=no
***************
*** 3657,3663 ****
  
  { $as_echo "$as_me:${as_lineno-$LINENO}: checking for initscr in -lxcurses" >&5
  $as_echo_n "checking for initscr in -lxcurses... " >&6; }
! if test "${ac_cv_lib_xcurses_initscr+set}" = set; then :
    $as_echo_n "(cached) " >&6
  else
    ac_check_lib_save_LIBS=$LIBS
--- 3665,3671 ----
  
  { $as_echo "$as_me:${as_lineno-$LINENO}: checking for initscr in -lxcurses" >&5
  $as_echo_n "checking for initscr in -lxcurses... " >&6; }
! if ${ac_cv_lib_xcurses_initscr+:} false; then :
    $as_echo_n "(cached) " >&6
  else
    ac_check_lib_save_LIBS=$LIBS
***************
*** 3691,3697 ****
  fi
  { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_xcurses_initscr" >&5
  $as_echo "$ac_cv_lib_xcurses_initscr" >&6; }
! if test "x$ac_cv_lib_xcurses_initscr" = x""yes; then :
    have_xcurses=yes
  else
    have_xcurses=no
--- 3699,3705 ----
  fi
  { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_xcurses_initscr" >&5
  $as_echo "$ac_cv_lib_xcurses_initscr" >&6; }
! if test "x$ac_cv_lib_xcurses_initscr" = xyes; then :
    have_xcurses=yes
  else
    have_xcurses=no
***************
*** 3699,3705 ****
  
  { $as_echo "$as_me:${as_lineno-$LINENO}: checking for initscr in -lncursesw" >&5
  $as_echo_n "checking for initscr in -lncursesw... " >&6; }
! if test "${ac_cv_lib_ncursesw_initscr+set}" = set; then :
    $as_echo_n "(cached) " >&6
  else
    ac_check_lib_save_LIBS=$LIBS
--- 3707,3713 ----
  
  { $as_echo "$as_me:${as_lineno-$LINENO}: checking for initscr in -lncursesw" >&5
  $as_echo_n "checking for initscr in -lncursesw... " >&6; }
! if ${ac_cv_lib_ncursesw_initscr+:} false; then :
    $as_echo_n "(cached) " >&6
  else
    ac_check_lib_save_LIBS=$LIBS
***************
*** 3733,3739 ****
  fi
  { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_ncursesw_initscr" >&5
  $as_echo "$ac_cv_lib_ncursesw_initscr" >&6; }
! if test "x$ac_cv_lib_ncursesw_initscr" = x""yes; then :
    have_ncursesw=yes
  else
    have_ncursesw=no
--- 3741,3747 ----
  fi
  { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_ncursesw_initscr" >&5
  $as_echo "$ac_cv_lib_ncursesw_initscr" >&6; }
! if test "x$ac_cv_lib_ncursesw_initscr" = xyes; then :
    have_ncursesw=yes
  else
    have_ncursesw=no
***************
*** 3741,3747 ****
  
  { $as_echo "$as_me:${as_lineno-$LINENO}: checking for initscr in -lncurses" >&5
  $as_echo_n "checking for initscr in -lncurses... " >&6; }
! if test "${ac_cv_lib_ncurses_initscr+set}" = set; then :
    $as_echo_n "(cached) " >&6
  else
    ac_check_lib_save_LIBS=$LIBS
--- 3749,3755 ----
  
  { $as_echo "$as_me:${as_lineno-$LINENO}: checking for initscr in -lncurses" >&5
  $as_echo_n "checking for initscr in -lncurses... " >&6; }
! if ${ac_cv_lib_ncurses_initscr+:} false; then :
    $as_echo_n "(cached) " >&6
  else
    ac_check_lib_save_LIBS=$LIBS
***************
*** 3775,3781 ****
  fi
  { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_ncurses_initscr" >&5
  $as_echo "$ac_cv_lib_ncurses_initscr" >&6; }
! if test "x$ac_cv_lib_ncurses_initscr" = x""yes; then :
    have_ncurses=yes
  else
    have_ncurses=no
--- 3783,3789 ----
  fi
  { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_ncurses_initscr" >&5
  $as_echo "$ac_cv_lib_ncurses_initscr" >&6; }
! if test "x$ac_cv_lib_ncurses_initscr" = xyes; then :
    have_ncurses=yes
  else
    have_ncurses=no
***************
*** 3783,3789 ****
  
  { $as_echo "$as_me:${as_lineno-$LINENO}: checking for initscr in -lcurses" >&5
  $as_echo_n "checking for initscr in -lcurses... " >&6; }
! if test "${ac_cv_lib_curses_initscr+set}" = set; then :
    $as_echo_n "(cached) " >&6
  else
    ac_check_lib_save_LIBS=$LIBS
--- 3791,3797 ----
  
  { $as_echo "$as_me:${as_lineno-$LINENO}: checking for initscr in -lcurses" >&5
  $as_echo_n "checking for initscr in -lcurses... " >&6; }
! if ${ac_cv_lib_curses_initscr+:} false; then :
    $as_echo_n "(cached) " >&6
  else
    ac_check_lib_save_LIBS=$LIBS
***************
*** 3817,3823 ****
  fi
  { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_curses_initscr" >&5
  $as_echo "$ac_cv_lib_curses_initscr" >&6; }
! if test "x$ac_cv_lib_curses_initscr" = x""yes; then :
    have_curses=yes
  else
    have_curses=no
--- 3825,3831 ----
  fi
  { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_curses_initscr" >&5
  $as_echo "$ac_cv_lib_curses_initscr" >&6; }
! if test "x$ac_cv_lib_curses_initscr" = xyes; then :
    have_curses=yes
  else
    have_curses=no
***************
*** 3825,3831 ****
  
  { $as_echo "$as_me:${as_lineno-$LINENO}: checking for tgetent in -ltermcap" >&5
  $as_echo_n "checking for tgetent in -ltermcap... " >&6; }
! if test "${ac_cv_lib_termcap_tgetent+set}" = set; then :
    $as_echo_n "(cached) " >&6
  else
    ac_check_lib_save_LIBS=$LIBS
--- 3833,3839 ----
  
  { $as_echo "$as_me:${as_lineno-$LINENO}: checking for tgetent in -ltermcap" >&5
  $as_echo_n "checking for tgetent in -ltermcap... " >&6; }
! if ${ac_cv_lib_termcap_tgetent+:} false; then :
    $as_echo_n "(cached) " >&6
  else
    ac_check_lib_save_LIBS=$LIBS
***************
*** 3859,3865 ****
  fi
  { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_termcap_tgetent" >&5
  $as_echo "$ac_cv_lib_termcap_tgetent" >&6; }
! if test "x$ac_cv_lib_termcap_tgetent" = x""yes; then :
    have_termcap=yes
  else
    have_termcap=no
--- 3867,3873 ----
  fi
  { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_termcap_tgetent" >&5
  $as_echo "$ac_cv_lib_termcap_tgetent" >&6; }
! if test "x$ac_cv_lib_termcap_tgetent" = xyes; then :
    have_termcap=yes
  else
    have_termcap=no
***************
*** 3867,3873 ****
  
  { $as_echo "$as_me:${as_lineno-$LINENO}: checking for tgetent in -ltermlib" >&5
  $as_echo_n "checking for tgetent in -ltermlib... " >&6; }
! if test "${ac_cv_lib_termlib_tgetent+set}" = set; then :
    $as_echo_n "(cached) " >&6
  else
    ac_check_lib_save_LIBS=$LIBS
--- 3875,3881 ----
  
  { $as_echo "$as_me:${as_lineno-$LINENO}: checking for tgetent in -ltermlib" >&5
  $as_echo_n "checking for tgetent in -ltermlib... " >&6; }
! if ${ac_cv_lib_termlib_tgetent+:} false; then :
    $as_echo_n "(cached) " >&6
  else
    ac_check_lib_save_LIBS=$LIBS
***************
*** 3901,3921 ****
  fi
  { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_termlib_tgetent" >&5
  $as_echo "$ac_cv_lib_termlib_tgetent" >&6; }
! if test "x$ac_cv_lib_termlib_tgetent" = x""yes; then :
    have_termlib=yes
  else
    have_termlib=no
  fi
  
! # Regular expressions (regcmp) are in -lgen on Solaris 2,
! # and in -lintl on SCO Unix.
! { $as_echo "$as_me:${as_lineno-$LINENO}: checking for regcmp in -lgen" >&5
! $as_echo_n "checking for regcmp in -lgen... " >&6; }
! if test "${ac_cv_lib_gen_regcmp+set}" = set; then :
    $as_echo_n "(cached) " >&6
  else
!   ac_check_lib_save_LIBS=$LIBS
! LIBS="-lgen  $LIBS"
  cat confdefs.h - <<_ACEOF >conftest.$ac_ext
  /* end confdefs.h.  */
  
--- 3909,3928 ----
  fi
  { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_termlib_tgetent" >&5
  $as_echo "$ac_cv_lib_termlib_tgetent" >&6; }
! if test "x$ac_cv_lib_termlib_tgetent" = xyes; then :
    have_termlib=yes
  else
    have_termlib=no
  fi
  
! # Regular expressions (regcmp) are in -lgen on Solaris 2, (but in libc
! # at least on Solaris 10 (2.10)) and in -lintl on SCO Unix.
! { $as_echo "$as_me:${as_lineno-$LINENO}: checking for library containing regcmp" >&5
! $as_echo_n "checking for library containing regcmp... " >&6; }
! if ${ac_cv_search_regcmp+:} false; then :
    $as_echo_n "(cached) " >&6
  else
!   ac_func_search_save_LIBS=$LIBS
  cat confdefs.h - <<_ACEOF >conftest.$ac_ext
  /* end confdefs.h.  */
  
***************
*** 3934,4050 ****
    return 0;
  }
  _ACEOF
! if ac_fn_c_try_link "$LINENO"; then :
!   ac_cv_lib_gen_regcmp=yes
! else
!   ac_cv_lib_gen_regcmp=no
  fi
  rm -f core conftest.err conftest.$ac_objext \
!     conftest$ac_exeext conftest.$ac_ext
! LIBS=$ac_check_lib_save_LIBS
  fi
! { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_gen_regcmp" >&5
! $as_echo "$ac_cv_lib_gen_regcmp" >&6; }
! if test "x$ac_cv_lib_gen_regcmp" = x""yes; then :
!   cat >>confdefs.h <<_ACEOF
! #define HAVE_LIBGEN 1
! _ACEOF
  
-   LIBS="-lgen $LIBS"
- 
- fi
- 
- { $as_echo "$as_me:${as_lineno-$LINENO}: checking for regcmp in -lintl" >&5
- $as_echo_n "checking for regcmp in -lintl... " >&6; }
- if test "${ac_cv_lib_intl_regcmp+set}" = set; then :
-   $as_echo_n "(cached) " >&6
  else
!   ac_check_lib_save_LIBS=$LIBS
! LIBS="-lintl  $LIBS"
! cat confdefs.h - <<_ACEOF >conftest.$ac_ext
! /* end confdefs.h.  */
! 
! /* Override any GCC internal prototype to avoid an error.
!    Use char because int might match the return type of a GCC
!    builtin and then its argument prototype would still apply.  */
! #ifdef __cplusplus
! extern "C"
! #endif
! char regcmp ();
! int
! main ()
! {
! return regcmp ();
!   ;
!   return 0;
! }
! _ACEOF
! if ac_fn_c_try_link "$LINENO"; then :
!   ac_cv_lib_intl_regcmp=yes
! else
!   ac_cv_lib_intl_regcmp=no
  fi
! rm -f core conftest.err conftest.$ac_objext \
!     conftest$ac_exeext conftest.$ac_ext
! LIBS=$ac_check_lib_save_LIBS
  fi
! { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_intl_regcmp" >&5
! $as_echo "$ac_cv_lib_intl_regcmp" >&6; }
! if test "x$ac_cv_lib_intl_regcmp" = x""yes; then :
!   cat >>confdefs.h <<_ACEOF
! #define HAVE_LIBINTL 1
! _ACEOF
  
-   LIBS="-lintl $LIBS"
- 
  fi
  
- { $as_echo "$as_me:${as_lineno-$LINENO}: checking for regcmp in -lPW" >&5
- $as_echo_n "checking for regcmp in -lPW... " >&6; }
- if test "${ac_cv_lib_PW_regcmp+set}" = set; then :
-   $as_echo_n "(cached) " >&6
- else
-   ac_check_lib_save_LIBS=$LIBS
- LIBS="-lPW  $LIBS"
- cat confdefs.h - <<_ACEOF >conftest.$ac_ext
- /* end confdefs.h.  */
  
- /* Override any GCC internal prototype to avoid an error.
-    Use char because int might match the return type of a GCC
-    builtin and then its argument prototype would still apply.  */
- #ifdef __cplusplus
- extern "C"
- #endif
- char regcmp ();
- int
- main ()
- {
- return regcmp ();
-   ;
-   return 0;
- }
- _ACEOF
- if ac_fn_c_try_link "$LINENO"; then :
-   ac_cv_lib_PW_regcmp=yes
- else
-   ac_cv_lib_PW_regcmp=no
- fi
- rm -f core conftest.err conftest.$ac_objext \
-     conftest$ac_exeext conftest.$ac_ext
- LIBS=$ac_check_lib_save_LIBS
- fi
- { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_PW_regcmp" >&5
- $as_echo "$ac_cv_lib_PW_regcmp" >&6; }
- if test "x$ac_cv_lib_PW_regcmp" = x""yes; then :
-   cat >>confdefs.h <<_ACEOF
- #define HAVE_LIBPW 1
- _ACEOF
- 
-   LIBS="-lPW $LIBS"
- 
- fi
- 
- 
  # Checks for terminal libraries
  { $as_echo "$as_me:${as_lineno-$LINENO}: checking for working terminal libraries" >&5
  $as_echo_n "checking for working terminal libraries... " >&6; }
--- 3941,3979 ----
    return 0;
  }
  _ACEOF
! for ac_lib in '' gen intl PW; do
!   if test -z "$ac_lib"; then
!     ac_res="none required"
!   else
!     ac_res=-l$ac_lib
!     LIBS="-l$ac_lib  $ac_func_search_save_LIBS"
!   fi
!   if ac_fn_c_try_link "$LINENO"; then :
!   ac_cv_search_regcmp=$ac_res
  fi
  rm -f core conftest.err conftest.$ac_objext \
!     conftest$ac_exeext
!   if ${ac_cv_search_regcmp+:} false; then :
!   break
  fi
! done
! if ${ac_cv_search_regcmp+:} false; then :
  
  else
!   ac_cv_search_regcmp=no
  fi
! rm conftest.$ac_ext
! LIBS=$ac_func_search_save_LIBS
  fi
! { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_search_regcmp" >&5
! $as_echo "$ac_cv_search_regcmp" >&6; }
! ac_res=$ac_cv_search_regcmp
! if test "$ac_res" != no; then :
!   test "$ac_res" = "none required" || LIBS="$ac_res $LIBS"
  
  fi
  
  
  # Checks for terminal libraries
  { $as_echo "$as_me:${as_lineno-$LINENO}: checking for working terminal libraries" >&5
  $as_echo_n "checking for working terminal libraries... " >&6; }
***************
*** 4310,4316 ****
  # Checks for header files.
  { $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 :
    $as_echo_n "(cached) " >&6
  else
    cat confdefs.h - <<_ACEOF >conftest.$ac_ext
--- 4239,4245 ----
  # Checks for header files.
  { $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 :
    $as_echo_n "(cached) " >&6
  else
    cat confdefs.h - <<_ACEOF >conftest.$ac_ext
***************
*** 4454,4460 ****
  # Checks for typedefs, structures, and compiler characteristics.
  { $as_echo "$as_me:${as_lineno-$LINENO}: checking whether stat file-mode macros are broken" >&5
  $as_echo_n "checking whether stat file-mode macros are broken... " >&6; }
! if test "${ac_cv_header_stat_broken+set}" = set; then :
    $as_echo_n "(cached) " >&6
  else
    cat confdefs.h - <<_ACEOF >conftest.$ac_ext
--- 4383,4389 ----
  # Checks for typedefs, structures, and compiler characteristics.
  { $as_echo "$as_me:${as_lineno-$LINENO}: checking whether stat file-mode macros are broken" >&5
  $as_echo_n "checking whether stat file-mode macros are broken... " >&6; }
! if ${ac_cv_header_stat_broken+:} false; then :
    $as_echo_n "(cached) " >&6
  else
    cat confdefs.h - <<_ACEOF >conftest.$ac_ext
***************
*** 4496,4502 ****
  
  { $as_echo "$as_me:${as_lineno-$LINENO}: checking for an ANSI C-conforming const" >&5
  $as_echo_n "checking for an ANSI C-conforming const... " >&6; }
! if test "${ac_cv_c_const+set}" = set; then :
    $as_echo_n "(cached) " >&6
  else
    cat confdefs.h - <<_ACEOF >conftest.$ac_ext
--- 4425,4431 ----
  
  { $as_echo "$as_me:${as_lineno-$LINENO}: checking for an ANSI C-conforming const" >&5
  $as_echo_n "checking for an ANSI C-conforming const... " >&6; }
! if ${ac_cv_c_const+:} false; then :
    $as_echo_n "(cached) " >&6
  else
    cat confdefs.h - <<_ACEOF >conftest.$ac_ext
***************
*** 4575,4581 ****
  fi
  
  ac_fn_c_check_type "$LINENO" "off_t" "ac_cv_type_off_t" "$ac_includes_default"
! if test "x$ac_cv_type_off_t" = x""yes; then :
  
  else
  
--- 4504,4510 ----
  fi
  
  ac_fn_c_check_type "$LINENO" "off_t" "ac_cv_type_off_t" "$ac_includes_default"
! if test "x$ac_cv_type_off_t" = xyes; then :
  
  else
  
***************
*** 4586,4592 ****
  fi
  
  ac_fn_c_check_type "$LINENO" "size_t" "ac_cv_type_size_t" "$ac_includes_default"
! if test "x$ac_cv_type_size_t" = x""yes; then :
  
  else
  
--- 4515,4521 ----
  fi
  
  ac_fn_c_check_type "$LINENO" "size_t" "ac_cv_type_size_t" "$ac_includes_default"
! if test "x$ac_cv_type_size_t" = xyes; then :
  
  else
  
***************
*** 4598,4604 ****
  
  { $as_echo "$as_me:${as_lineno-$LINENO}: checking whether time.h and sys/time.h may both be included" >&5
  $as_echo_n "checking whether time.h and sys/time.h may both be included... " >&6; }
! if test "${ac_cv_header_time+set}" = set; then :
    $as_echo_n "(cached) " >&6
  else
    cat confdefs.h - <<_ACEOF >conftest.$ac_ext
--- 4527,4533 ----
  
  { $as_echo "$as_me:${as_lineno-$LINENO}: checking whether time.h and sys/time.h may both be included" >&5
  $as_echo_n "checking whether time.h and sys/time.h may both be included... " >&6; }
! if ${ac_cv_header_time+:} false; then :
    $as_echo_n "(cached) " >&6
  else
    cat confdefs.h - <<_ACEOF >conftest.$ac_ext
***************
*** 4661,4669 ****
  
  
  
  # Checks for identifiers.
  ac_fn_c_check_type "$LINENO" "off_t" "ac_cv_type_off_t" "$ac_includes_default"
! if test "x$ac_cv_type_off_t" = x""yes; then :
  
  else
  
--- 4590,4599 ----
  
  
  
+ 
  # Checks for identifiers.
  ac_fn_c_check_type "$LINENO" "off_t" "ac_cv_type_off_t" "$ac_includes_default"
! if test "x$ac_cv_type_off_t" = xyes; then :
  
  else
  
***************
*** 4766,4772 ****
  # Checks for library functions.
  { $as_echo "$as_me:${as_lineno-$LINENO}: checking return type of signal handlers" >&5
  $as_echo_n "checking return type of signal handlers... " >&6; }
! if test "${ac_cv_type_signal+set}" = set; then :
    $as_echo_n "(cached) " >&6
  else
    cat confdefs.h - <<_ACEOF >conftest.$ac_ext
--- 4696,4702 ----
  # Checks for library functions.
  { $as_echo "$as_me:${as_lineno-$LINENO}: checking return type of signal handlers" >&5
  $as_echo_n "checking return type of signal handlers... " >&6; }
! if ${ac_cv_type_signal+:} false; then :
    $as_echo_n "(cached) " >&6
  else
    cat confdefs.h - <<_ACEOF >conftest.$ac_ext
***************
*** 4894,4900 ****
  
  # Some systems have termios.h but not the corresponding functions.
  ac_fn_c_check_func "$LINENO" "tcgetattr" "ac_cv_func_tcgetattr"
! if test "x$ac_cv_func_tcgetattr" = x""yes; then :
    $as_echo "#define HAVE_TERMIOS_FUNCS 1" >>confdefs.h
  
  fi
--- 4824,4830 ----
  
  # Some systems have termios.h but not the corresponding functions.
  ac_fn_c_check_func "$LINENO" "tcgetattr" "ac_cv_func_tcgetattr"
! if test "x$ac_cv_func_tcgetattr" = xyes; then :
    $as_echo "#define HAVE_TERMIOS_FUNCS 1" >>confdefs.h
  
  fi
***************
*** 4986,4992 ****
  
  ac_fn_c_check_type "$LINENO" "sigset_t" "ac_cv_type_sigset_t" "#include <signal.h>
  "
! if test "x$ac_cv_type_sigset_t" = x""yes; then :
  
  cat >>confdefs.h <<_ACEOF
  #define HAVE_SIGSET_T 1
--- 4916,4922 ----
  
  ac_fn_c_check_type "$LINENO" "sigset_t" "ac_cv_type_sigset_t" "#include <signal.h>
  "
! if test "x$ac_cv_type_sigset_t" = xyes; then :
  
  cat >>confdefs.h <<_ACEOF
  #define HAVE_SIGSET_T 1
***************
*** 5258,5265 ****
  # Checks for regular expression functions.
  have_regex=no
  have_posix_regex=unknown
! { $as_echo "$as_me:${as_lineno-$LINENO}: checking for regcomp" >&5
! $as_echo_n "checking for regcomp... " >&6; }
  
  # Select a regular expression library.
  WANT_REGEX=auto
--- 5188,5194 ----
  # Checks for regular expression functions.
  have_regex=no
  have_posix_regex=unknown
! supported_regex=""
  
  # Select a regular expression library.
  WANT_REGEX=auto
***************
*** 5274,5279 ****
--- 5203,5210 ----
  if test $WANT_REGEX = auto -o $WANT_REGEX = posix; then
  # Some versions of Solaris have a regcomp() function, but it doesn't work!
  # So we run a test program.  If we're cross-compiling, do it the old way.
+ { $as_echo "$as_me:${as_lineno-$LINENO}: checking for POSIX regcomp" >&5
+ $as_echo_n "checking for POSIX regcomp... " >&6; }
  if test "$cross_compiling" = yes; then :
    have_posix_regex=unknown
  else
***************
*** 5302,5311 ****
  fi
  
  if test $have_posix_regex = yes; then
!   { $as_echo "$as_me:${as_lineno-$LINENO}: result: using POSIX regcomp" >&5
! $as_echo "using POSIX regcomp" >&6; }
    $as_echo "#define HAVE_POSIX_REGCOMP 1" >>confdefs.h
! 
    have_regex=yes
  elif test $have_posix_regex = unknown; then
    cat confdefs.h - <<_ACEOF >conftest.$ac_ext
--- 5233,5242 ----
  fi
  
  if test $have_posix_regex = yes; then
!   { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5
! $as_echo "yes" >&6; }
    $as_echo "#define HAVE_POSIX_REGCOMP 1" >>confdefs.h
!  supported_regex="$supported_regex posix"
    have_regex=yes
  elif test $have_posix_regex = unknown; then
    cat confdefs.h - <<_ACEOF >conftest.$ac_ext
***************
*** 5322,5331 ****
  }
  _ACEOF
  if ac_fn_c_try_link "$LINENO"; then :
!   { $as_echo "$as_me:${as_lineno-$LINENO}: result: using POSIX regcomp" >&5
! $as_echo "using POSIX regcomp" >&6; }
    $as_echo "#define HAVE_POSIX_REGCOMP 1" >>confdefs.h
!  have_regex=yes
  fi
  rm -f core conftest.err conftest.$ac_objext \
      conftest$ac_exeext conftest.$ac_ext
--- 5253,5262 ----
  }
  _ACEOF
  if ac_fn_c_try_link "$LINENO"; then :
!   { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5
! $as_echo "yes" >&6; }
    $as_echo "#define HAVE_POSIX_REGCOMP 1" >>confdefs.h
!  have_regex=yes; supported_regex="$supported_regex posix"
  fi
  rm -f core conftest.err conftest.$ac_objext \
      conftest$ac_exeext conftest.$ac_ext
***************
*** 5340,5346 ****
  if test $WANT_REGEX = auto -o $WANT_REGEX = pcre; then
  { $as_echo "$as_me:${as_lineno-$LINENO}: checking for pcre_compile in -lpcre" >&5
  $as_echo_n "checking for pcre_compile in -lpcre... " >&6; }
! if test "${ac_cv_lib_pcre_pcre_compile+set}" = set; then :
    $as_echo_n "(cached) " >&6
  else
    ac_check_lib_save_LIBS=$LIBS
--- 5271,5277 ----
  if test $WANT_REGEX = auto -o $WANT_REGEX = pcre; then
  { $as_echo "$as_me:${as_lineno-$LINENO}: checking for pcre_compile in -lpcre" >&5
  $as_echo_n "checking for pcre_compile in -lpcre... " >&6; }
! if ${ac_cv_lib_pcre_pcre_compile+:} false; then :
    $as_echo_n "(cached) " >&6
  else
    ac_check_lib_save_LIBS=$LIBS
***************
*** 5374,5395 ****
  fi
  { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_pcre_pcre_compile" >&5
  $as_echo "$ac_cv_lib_pcre_pcre_compile" >&6; }
! if test "x$ac_cv_lib_pcre_pcre_compile" = x""yes; then :
!   { $as_echo "$as_me:${as_lineno-$LINENO}: result: using pcre" >&5
! $as_echo "using pcre" >&6; }; $as_echo "#define HAVE_PCRE 1" >>confdefs.h
!  LIBS="$LIBS -lpcre" have_regex=yes
  fi
  
  fi
  fi
  
  if test $have_regex = no; then
  if test $WANT_REGEX = auto -o $WANT_REGEX = regcmp; then
  ac_fn_c_check_func "$LINENO" "regcmp" "ac_cv_func_regcmp"
! if test "x$ac_cv_func_regcmp" = x""yes; then :
!   { $as_echo "$as_me:${as_lineno-$LINENO}: result: using regcmp" >&5
! $as_echo "using regcmp" >&6; }; $as_echo "#define HAVE_REGCMP 1" >>confdefs.h
!  have_regex=yes
  fi
  
  fi
--- 5305,5370 ----
  fi
  { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_pcre_pcre_compile" >&5
  $as_echo "$ac_cv_lib_pcre_pcre_compile" >&6; }
! if test "x$ac_cv_lib_pcre_pcre_compile" = xyes; then :
!   $as_echo "#define HAVE_PCRE 1" >>confdefs.h
!  LIBS="$LIBS -lpcre" have_regex=yes; supported_regex="$supported_regex pcre"
  fi
  
  fi
  fi
  
  if test $have_regex = no; then
+ if test $WANT_REGEX = auto -o $WANT_REGEX = gnu; then
+ { $as_echo "$as_me:${as_lineno-$LINENO}: checking for re_compile_pattern in -lc" >&5
+ $as_echo_n "checking for re_compile_pattern in -lc... " >&6; }
+ if ${ac_cv_lib_c_re_compile_pattern+:} false; then :
+   $as_echo_n "(cached) " >&6
+ else
+   ac_check_lib_save_LIBS=$LIBS
+ LIBS="-lc  $LIBS"
+ cat confdefs.h - <<_ACEOF >conftest.$ac_ext
+ /* end confdefs.h.  */
+ 
+ /* Override any GCC internal prototype to avoid an error.
+    Use char because int might match the return type of a GCC
+    builtin and then its argument prototype would still apply.  */
+ #ifdef __cplusplus
+ extern "C"
+ #endif
+ char re_compile_pattern ();
+ int
+ main ()
+ {
+ return re_compile_pattern ();
+   ;
+   return 0;
+ }
+ _ACEOF
+ if ac_fn_c_try_link "$LINENO"; then :
+   ac_cv_lib_c_re_compile_pattern=yes
+ else
+   ac_cv_lib_c_re_compile_pattern=no
+ fi
+ rm -f core conftest.err conftest.$ac_objext \
+     conftest$ac_exeext conftest.$ac_ext
+ LIBS=$ac_check_lib_save_LIBS
+ fi
+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_c_re_compile_pattern" >&5
+ $as_echo "$ac_cv_lib_c_re_compile_pattern" >&6; }
+ if test "x$ac_cv_lib_c_re_compile_pattern" = xyes; then :
+   $as_echo "#define HAVE_GNU_REGEX 1" >>confdefs.h
+  have_regex=yes; supported_regex="$supported_regex gnu"
+ fi
+ 
+ fi
+ fi
+ 
+ if test $have_regex = no; then
  if test $WANT_REGEX = auto -o $WANT_REGEX = regcmp; then
  ac_fn_c_check_func "$LINENO" "regcmp" "ac_cv_func_regcmp"
! if test "x$ac_cv_func_regcmp" = xyes; then :
!   $as_echo "#define HAVE_REGCMP 1" >>confdefs.h
!  have_regex=yes; supported_regex="$supported_regex regcmp"
  fi
  
  fi
***************
*** 5397,5402 ****
--- 5372,5379 ----
  
  if test $have_regex = no; then
  if test $WANT_REGEX = auto -o $WANT_REGEX = regcomp; then
+ { $as_echo "$as_me:${as_lineno-$LINENO}: checking for V8 regcomp" >&5
+ $as_echo_n "checking for V8 regcomp... " >&6; }
  cat confdefs.h - <<_ACEOF >conftest.$ac_ext
  /* end confdefs.h.  */
  
***************
*** 5410,5418 ****
  }
  _ACEOF
  if ac_fn_c_try_link "$LINENO"; then :
!   { $as_echo "$as_me:${as_lineno-$LINENO}: result: using V8 regcomp" >&5
! $as_echo "using V8 regcomp" >&6; }; $as_echo "#define HAVE_V8_REGCOMP 1" >>confdefs.h
!  have_regex=yes
  fi
  rm -f core conftest.err conftest.$ac_objext \
      conftest$ac_exeext conftest.$ac_ext
--- 5387,5398 ----
  }
  _ACEOF
  if ac_fn_c_try_link "$LINENO"; then :
!   { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5
! $as_echo "yes" >&6; }; $as_echo "#define HAVE_V8_REGCOMP 1" >>confdefs.h
!  have_regex=yes; supported_regex="$supported_regex regcomp"
! else
!   { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
! $as_echo "no" >&6; }
  fi
  rm -f core conftest.err conftest.$ac_objext \
      conftest$ac_exeext conftest.$ac_ext
***************
*** 5423,5452 ****
  if test $WANT_REGEX = auto -o $WANT_REGEX = regcomp-local; then
  { $as_echo "$as_me:${as_lineno-$LINENO}: result: using V8 regcomp -- local source" >&5
  $as_echo "using V8 regcomp -- local source" >&6; }; $as_echo "#define HAVE_V8_REGCOMP 1" >>confdefs.h
!  $as_echo "#define HAVE_REGEXEC2 1" >>confdefs.h
   REGEX_O='regexp.$(O)'  have_regex=yes
  fi
  fi
  
  if test $have_regex = no; then
  if test $WANT_REGEX = auto -o $WANT_REGEX = re_comp; then
! { $as_echo "$as_me:${as_lineno-$LINENO}: result: using re_comp" >&5
! $as_echo "using re_comp" >&6; }; ac_fn_c_check_func "$LINENO" "re_comp" "ac_cv_func_re_comp"
! if test "x$ac_cv_func_re_comp" = x""yes; then :
    $as_echo "#define HAVE_RE_COMP 1" >>confdefs.h
!  have_regex=yes
  fi
  
  fi
  fi
  
  if test $have_regex = no; then
! { $as_echo "$as_me:${as_lineno-$LINENO}: result: cannot find regular expression library" >&5
! $as_echo "cannot find regular expression library" >&6; }; $as_echo "#define NO_REGEX 1" >>confdefs.h
! 
  fi
  
  
  # Check whether --with-editor was given.
  if test "${with_editor+set}" = set; then :
    withval=$with_editor; cat >>confdefs.h <<_ACEOF
--- 5403,5444 ----
  if test $WANT_REGEX = auto -o $WANT_REGEX = regcomp-local; then
  { $as_echo "$as_me:${as_lineno-$LINENO}: result: using V8 regcomp -- local source" >&5
  $as_echo "using V8 regcomp -- local source" >&6; }; $as_echo "#define HAVE_V8_REGCOMP 1" >>confdefs.h
! 
! supported_regex="$supported_regex regcomp-local"
! $as_echo "#define HAVE_REGEXEC2 1" >>confdefs.h
   REGEX_O='regexp.$(O)'  have_regex=yes
  fi
  fi
  
  if test $have_regex = no; then
  if test $WANT_REGEX = auto -o $WANT_REGEX = re_comp; then
! { $as_echo "$as_me:${as_lineno-$LINENO}: checking for re_comp" >&5
! $as_echo_n "checking for re_comp... " >&6; }
! ac_fn_c_check_func "$LINENO" "re_comp" "ac_cv_func_re_comp"
! if test "x$ac_cv_func_re_comp" = xyes; then :
    $as_echo "#define HAVE_RE_COMP 1" >>confdefs.h
!  have_regex=yes; supported_regex="$supported_regex re_comp"
  fi
  
  fi
  fi
  
  if test $have_regex = no; then
! if test $WANT_REGEX = auto -o $WANT_REGEX = none; then
! { $as_echo "$as_me:${as_lineno-$LINENO}: result: using no regex" >&5
! $as_echo "using no regex" >&6; }
! else
! { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: cannot find regular expression library" >&5
! $as_echo "$as_me: WARNING: cannot find regular expression library" >&2;}
  fi
+ $as_echo "#define NO_REGEX 1" >>confdefs.h
+  supported_regex="$supported_regex none"
+ fi
  
+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: regular expression library: $supported_regex" >&5
+ $as_echo "regular expression library: $supported_regex" >&6; }
  
+ 
  # Check whether --with-editor was given.
  if test "${with_editor+set}" = set; then :
    withval=$with_editor; cat >>confdefs.h <<_ACEOF
***************
*** 5527,5536 ****
       :end' >>confcache
  if diff "$cache_file" confcache >/dev/null 2>&1; then :; else
    if test -w "$cache_file"; 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;}
!     cat confcache >$cache_file
    else
      { $as_echo "$as_me:${as_lineno-$LINENO}: not updating unwritable cache $cache_file" >&5
  $as_echo "$as_me: not updating unwritable cache $cache_file" >&6;}
--- 5519,5539 ----
       :end' >>confcache
  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
        { $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
    else
      { $as_echo "$as_me:${as_lineno-$LINENO}: not updating unwritable cache $cache_file" >&5
  $as_echo "$as_me: not updating unwritable cache $cache_file" >&6;}
***************
*** 5562,5568 ****
  
  
  
! : ${CONFIG_STATUS=./config.status}
  ac_write_fail=0
  ac_clean_files_save=$ac_clean_files
  ac_clean_files="$ac_clean_files $CONFIG_STATUS"
--- 5565,5571 ----
  
  
  
! : "${CONFIG_STATUS=./config.status}"
  ac_write_fail=0
  ac_clean_files_save=$ac_clean_files
  ac_clean_files="$ac_clean_files $CONFIG_STATUS"
***************
*** 5663,5668 ****
--- 5666,5672 ----
  IFS=" ""	$as_nl"
  
  # Find who we are.  Look in the path if we contain no directory separator.
+ as_myself=
  case $0 in #((
    *[\\/]* ) as_myself=$0 ;;
    *) as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
***************
*** 5970,5976 ****
  # values after options handling.
  ac_log="
  This file was extended by less $as_me 1, which was
! generated by GNU Autoconf 2.67.  Invocation command line was
  
    CONFIG_FILES    = $CONFIG_FILES
    CONFIG_HEADERS  = $CONFIG_HEADERS
--- 5974,5980 ----
  # values after options handling.
  ac_log="
  This file was extended by less $as_me 1, which was
! generated by GNU Autoconf 2.68.  Invocation command line was
  
    CONFIG_FILES    = $CONFIG_FILES
    CONFIG_HEADERS  = $CONFIG_HEADERS
***************
*** 6032,6038 ****
  ac_cs_config="`$as_echo "$ac_configure_args" | sed 's/^ //; s/[\\""\`\$]/\\\\&/g'`"
  ac_cs_version="\\
  less config.status 1
! configured by $0, generated by GNU Autoconf 2.67,
    with options \\"\$ac_cs_config\\"
  
  Copyright (C) 2010 Free Software Foundation, Inc.
--- 6036,6042 ----
  ac_cs_config="`$as_echo "$ac_configure_args" | sed 's/^ //; s/[\\""\`\$]/\\\\&/g'`"
  ac_cs_version="\\
  less config.status 1
! configured by $0, generated by GNU Autoconf 2.68,
    with options \\"\$ac_cs_config\\"
  
  Copyright (C) 2010 Free Software Foundation, Inc.
***************
*** 6178,6186 ****
  # after its creation but before its name has been assigned to `$tmp'.
  $debug ||
  {
!   tmp=
    trap 'exit_status=$?
!   { test -z "$tmp" || test ! -d "$tmp" || rm -fr "$tmp"; } && exit $exit_status
  ' 0
    trap 'as_fn_exit 1' 1 2 13 15
  }
--- 6182,6191 ----
  # after its creation but before its name has been assigned to `$tmp'.
  $debug ||
  {
!   tmp= ac_tmp=
    trap '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
  }
***************
*** 6188,6199 ****
  
  {
    tmp=`(umask 077 && mktemp -d "./confXXXXXX") 2>/dev/null` &&
!   test -n "$tmp" && test -d "$tmp"
  }  ||
  {
    tmp=./conf$$-$RANDOM
    (umask 077 && mkdir "$tmp")
  } || as_fn_error $? "cannot create a temporary directory in ." "$LINENO" 5
  
  # Set up the scripts for CONFIG_FILES section.
  # No need to generate them if there are no CONFIG_FILES.
--- 6193,6205 ----
  
  {
    tmp=`(umask 077 && mktemp -d "./confXXXXXX") 2>/dev/null` &&
!   test -d "$tmp"
  }  ||
  {
    tmp=./conf$$-$RANDOM
    (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.
  # No need to generate them if there are no CONFIG_FILES.
***************
*** 6215,6221 ****
    ac_cs_awk_cr=$ac_cr
  fi
  
! echo 'BEGIN {' >"$tmp/subs1.awk" &&
  _ACEOF
  
  
--- 6221,6227 ----
    ac_cs_awk_cr=$ac_cr
  fi
  
! echo 'BEGIN {' >"$ac_tmp/subs1.awk" &&
  _ACEOF
  
  
***************
*** 6243,6249 ****
  rm -f conf$$subs.sh
  
  cat >>$CONFIG_STATUS <<_ACEOF || ac_write_fail=1
! cat >>"\$tmp/subs1.awk" <<\\_ACAWK &&
  _ACEOF
  sed -n '
  h
--- 6249,6255 ----
  rm -f conf$$subs.sh
  
  cat >>$CONFIG_STATUS <<_ACEOF || ac_write_fail=1
! cat >>"\$ac_tmp/subs1.awk" <<\\_ACAWK &&
  _ACEOF
  sed -n '
  h
***************
*** 6291,6297 ****
  rm -f conf$$subs.awk
  cat >>$CONFIG_STATUS <<_ACEOF || ac_write_fail=1
  _ACAWK
! cat >>"\$tmp/subs1.awk" <<_ACAWK &&
    for (key in S) S_is_set[key] = 1
    FS = ""
  
--- 6297,6303 ----
  rm -f conf$$subs.awk
  cat >>$CONFIG_STATUS <<_ACEOF || ac_write_fail=1
  _ACAWK
! cat >>"\$ac_tmp/subs1.awk" <<_ACAWK &&
    for (key in S) S_is_set[key] = 1
    FS = ""
  
***************
*** 6323,6329 ****
    sed "s/$ac_cr\$//; s/$ac_cr/$ac_cs_awk_cr/g"
  else
    cat
! fi < "$tmp/subs1.awk" > "$tmp/subs.awk" \
    || as_fn_error $? "could not setup config files machinery" "$LINENO" 5
  _ACEOF
  
--- 6329,6335 ----
    sed "s/$ac_cr\$//; s/$ac_cr/$ac_cs_awk_cr/g"
  else
    cat
! fi < "$ac_tmp/subs1.awk" > "$ac_tmp/subs.awk" \
    || as_fn_error $? "could not setup config files machinery" "$LINENO" 5
  _ACEOF
  
***************
*** 6357,6363 ****
  # No need to generate them if there are no CONFIG_HEADERS.
  # This happens for instance with `./config.status Makefile'.
  if test -n "$CONFIG_HEADERS"; then
! cat >"$tmp/defines.awk" <<\_ACAWK ||
  BEGIN {
  _ACEOF
  
--- 6363,6369 ----
  # No need to generate them if there are no CONFIG_HEADERS.
  # This happens for instance with `./config.status Makefile'.
  if test -n "$CONFIG_HEADERS"; then
! cat >"$ac_tmp/defines.awk" <<\_ACAWK ||
  BEGIN {
  _ACEOF
  
***************
*** 6369,6376 ****
  # handling of long lines.
  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
      break
    elif $ac_last_try; then
      as_fn_error $? "could not make $CONFIG_HEADERS" "$LINENO" 5
--- 6375,6382 ----
  # handling of long lines.
  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
      break
    elif $ac_last_try; then
      as_fn_error $? "could not make $CONFIG_HEADERS" "$LINENO" 5
***************
*** 6490,6496 ****
      for ac_f
      do
        case $ac_f in
!       -) 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,
  	 # because $ac_f cannot contain `:'.
--- 6496,6502 ----
      for ac_f
      do
        case $ac_f in
!       -) 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,
  	 # because $ac_f cannot contain `:'.
***************
*** 6525,6531 ****
      esac
  
      case $ac_tag in
!     *:-:* | *:-) cat >"$tmp/stdin" \
        || as_fn_error $? "could not create $ac_file" "$LINENO" 5  ;;
      esac
      ;;
--- 6531,6537 ----
      esac
  
      case $ac_tag in
!     *:-:* | *:-) cat >"$ac_tmp/stdin" \
        || as_fn_error $? "could not create $ac_file" "$LINENO" 5  ;;
      esac
      ;;
***************
*** 6656,6676 ****
  s&@INSTALL@&$ac_INSTALL&;t t
  $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
  
  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"; } &&
    { $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
  $as_echo "$as_me: WARNING: $ac_file contains a reference to the variable \`datarootdir'
  which seems to be undefined.  Please make sure it is defined" >&2;}
  
!   rm -f "$tmp/stdin"
    case $ac_file in
!   -) 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
   ;;
--- 6662,6683 ----
  s&@INSTALL@&$ac_INSTALL&;t t
  $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
  
  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"; } &&
    { $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
  $as_echo "$as_me: WARNING: $ac_file contains a reference to the variable \`datarootdir'
  which seems to be undefined.  Please make sure it is defined" >&2;}
  
!   rm -f "$ac_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";;
    esac \
    || as_fn_error $? "could not create $ac_file" "$LINENO" 5
   ;;
***************
*** 6681,6700 ****
    if test x"$ac_file" != x-; then
      {
        $as_echo "/* $configure_input  */" \
!       && 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" "$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" \
  	|| 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" \
        || as_fn_error $? "could not create -" "$LINENO" 5
    fi
   ;;
--- 6688,6707 ----
    if test x"$ac_file" != x-; then
      {
        $as_echo "/* $configure_input  */" \
!       && 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" "$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 "$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 "$ac_tmp/defines.awk"' "$ac_file_inputs" \
        || as_fn_error $? "could not create -" "$LINENO" 5
    fi
   ;;