To: vim_dev@googlegroups.com
Subject: Patch 7.4.223
Fcc: outbox
From: Bram Moolenaar <Bram@moolenaar.net>
Mime-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
------------

Patch 7.4.223
Problem:    Still using an older autoconf version.
Solution:   Switch to autoconf 2.69.
Files:	    src/Makefile, src/configure.in, src/auto/configure


*** ../vim-7.4.222/src/Makefile	2014-03-25 15:34:44.993932592 +0100
--- src/Makefile	2014-03-27 17:37:32.864693288 +0100
***************
*** 586,591 ****
--- 586,594 ----
  # as root: sysctl -w vm.max_proc_mmap=30000
  #EXTRA_LIBS = /usr/local/lib/libefence.a
  
+ # Autoconf binary.
+ AUTOCONF = autoconf
+ 
  # PURIFY - remove the # to use the "purify" program (hoi Nia++!)
  #PURIFY = purify
  
***************
*** 1713,1719 ****
  # - Uses ">config.log" instead of "./config.log".
  autoconf:
  	if test ! -f configure.save; then mv configure configure.save; fi
! 	autoconf
  	sed -e 's+>config.log+>auto/config.log+' -e 's+\./config.log+auto/config.log+' configure > auto/configure
  	chmod 755 auto/configure
  	mv -f configure.save configure
--- 1716,1722 ----
  # - Uses ">config.log" instead of "./config.log".
  autoconf:
  	if test ! -f configure.save; then mv configure configure.save; fi
! 	$(AUTOCONF)
  	sed -e 's+>config.log+>auto/config.log+' -e 's+\./config.log+auto/config.log+' configure > auto/configure
  	chmod 755 auto/configure
  	mv -f configure.save configure
*** ../vim-7.4.222/src/configure.in	2014-03-27 17:19:05.860676325 +0100
--- src/configure.in	2014-03-27 17:31:39.412687872 +0100
***************
*** 1397,1403 ****
    ldflags_save=$LDFLAGS
    dnl -ldl must go first to make this work on Archlinux (Roland Puntaier)
    LDFLAGS="-ldl $LDFLAGS"
!   AC_RUN_IFELSE([
      #include <dlfcn.h>
      /* If this program fails, then RTLD_GLOBAL is needed.
       * RTLD_GLOBAL will be used and then it is not possible to
--- 1397,1403 ----
    ldflags_save=$LDFLAGS
    dnl -ldl must go first to make this work on Archlinux (Roland Puntaier)
    LDFLAGS="-ldl $LDFLAGS"
!   AC_RUN_IFELSE([AC_LANG_SOURCE([
      #include <dlfcn.h>
      /* If this program fails, then RTLD_GLOBAL is needed.
       * RTLD_GLOBAL will be used and then it is not possible to
***************
*** 1430,1436 ****
        if (no_rtl_global_needed_for("${python_INSTSONAME}", "${vi_cv_path_python_pfx}"))
              not_needed = 1;
        return !not_needed;
!     }],
      [AC_MSG_RESULT(yes);AC_DEFINE(PY_NO_RTLD_GLOBAL)], [AC_MSG_RESULT(no)])
  
    CFLAGS=$cflags_save
--- 1430,1436 ----
        if (no_rtl_global_needed_for("${python_INSTSONAME}", "${vi_cv_path_python_pfx}"))
              not_needed = 1;
        return !not_needed;
!     }])],
      [AC_MSG_RESULT(yes);AC_DEFINE(PY_NO_RTLD_GLOBAL)], [AC_MSG_RESULT(no)])
  
    CFLAGS=$cflags_save
***************
*** 1442,1448 ****
    ldflags_save=$LDFLAGS
    dnl -ldl must go first to make this work on Archlinux (Roland Puntaier)
    LDFLAGS="-ldl $LDFLAGS"
!   AC_RUN_IFELSE([
      #include <dlfcn.h>
      #include <wchar.h>
      /* If this program fails, then RTLD_GLOBAL is needed.
--- 1442,1448 ----
    ldflags_save=$LDFLAGS
    dnl -ldl must go first to make this work on Archlinux (Roland Puntaier)
    LDFLAGS="-ldl $LDFLAGS"
!   AC_RUN_IFELSE([AC_LANG_SOURCE([
      #include <dlfcn.h>
      #include <wchar.h>
      /* If this program fails, then RTLD_GLOBAL is needed.
***************
*** 1476,1482 ****
        if (no_rtl_global_needed_for("${python3_INSTSONAME}", L"${vi_cv_path_python3_pfx}"))
              not_needed = 1;
        return !not_needed;
!     }],
      [AC_MSG_RESULT(yes);AC_DEFINE(PY3_NO_RTLD_GLOBAL)], [AC_MSG_RESULT(no)])
  
    CFLAGS=$cflags_save
--- 1476,1482 ----
        if (no_rtl_global_needed_for("${python3_INSTSONAME}", L"${vi_cv_path_python3_pfx}"))
              not_needed = 1;
        return !not_needed;
!     }])],
      [AC_MSG_RESULT(yes);AC_DEFINE(PY3_NO_RTLD_GLOBAL)], [AC_MSG_RESULT(no)])
  
    CFLAGS=$cflags_save
***************
*** 2737,2743 ****
  
  AC_CACHE_CHECK([whether toupper is broken], [vim_cv_toupper_broken],
    [
!     AC_RUN_IFELSE([[
  #include "confdefs.h"
  #include <ctype.h>
  #if STDC_HEADERS
--- 2737,2743 ----
  
  AC_CACHE_CHECK([whether toupper is broken], [vim_cv_toupper_broken],
    [
!     AC_RUN_IFELSE([AC_LANG_SOURCE([[
  #include "confdefs.h"
  #include <ctype.h>
  #if STDC_HEADERS
***************
*** 2745,2751 ****
  # include <stddef.h>
  #endif
  main() { exit(toupper('A') == 'A' && tolower('z') == 'z'); }
!   ]],[
      vim_cv_toupper_broken=yes
    ],[
      vim_cv_toupper_broken=no
--- 2745,2751 ----
  # include <stddef.h>
  #endif
  main() { exit(toupper('A') == 'A' && tolower('z') == 'z'); }
!   ]])],[
      vim_cv_toupper_broken=yes
    ],[
      vim_cv_toupper_broken=no
***************
*** 2993,2999 ****
  
  AC_CACHE_CHECK([whether we talk terminfo], [vim_cv_terminfo],
    [
!     AC_RUN_IFELSE([[
  #include "confdefs.h"
  #ifdef HAVE_TERMCAP_H
  # include <termcap.h>
--- 2993,2999 ----
  
  AC_CACHE_CHECK([whether we talk terminfo], [vim_cv_terminfo],
    [
!     AC_RUN_IFELSE([AC_LANG_SOURCE([[
  #include "confdefs.h"
  #ifdef HAVE_TERMCAP_H
  # include <termcap.h>
***************
*** 3007,3013 ****
  #endif
  main()
  {char *s; s=(char *)tgoto("%p1%d", 0, 1); exit(!strcmp(s==0 ? "" : s, "1")); }
!     ]],[
        vim_cv_terminfo=no
      ],[
        vim_cv_terminfo=yes
--- 3007,3013 ----
  #endif
  main()
  {char *s; s=(char *)tgoto("%p1%d", 0, 1); exit(!strcmp(s==0 ? "" : s, "1")); }
!     ]])],[
        vim_cv_terminfo=no
      ],[
        vim_cv_terminfo=yes
***************
*** 3023,3029 ****
  if test "x$olibs" != "x$LIBS"; then
    AC_CACHE_CHECK([what tgetent() returns for an unknown terminal], [vim_cv_tgent],
      [
!       AC_RUN_IFELSE([[
  #include "confdefs.h"
  #ifdef HAVE_TERMCAP_H
  # include <termcap.h>
--- 3023,3029 ----
  if test "x$olibs" != "x$LIBS"; then
    AC_CACHE_CHECK([what tgetent() returns for an unknown terminal], [vim_cv_tgent],
      [
!       AC_RUN_IFELSE([AC_LANG_SOURCE([[
  #include "confdefs.h"
  #ifdef HAVE_TERMCAP_H
  # include <termcap.h>
***************
*** 3034,3040 ****
  #endif
  main()
  {char s[10000]; int res = tgetent(s, "thisterminaldoesnotexist"); exit(res != 0); }
!       ]],[
  	vim_cv_tgent=zero
        ],[
  	vim_cv_tgent=non-zero
--- 3034,3040 ----
  #endif
  main()
  {char s[10000]; int res = tgetent(s, "thisterminaldoesnotexist"); exit(res != 0); }
!       ]])],[
  	vim_cv_tgent=zero
        ],[
  	vim_cv_tgent=non-zero
***************
*** 3158,3164 ****
  rm -f conftest_grp
  AC_CACHE_CHECK([default tty permissions/group], [vim_cv_tty_group],
    [
!     AC_RUN_IFELSE([[
  #include "confdefs.h"
  #include <sys/types.h>
  #if STDC_HEADERS
--- 3158,3164 ----
  rm -f conftest_grp
  AC_CACHE_CHECK([default tty permissions/group], [vim_cv_tty_group],
    [
!     AC_RUN_IFELSE([AC_LANG_SOURCE([[
  #include "confdefs.h"
  #include <sys/types.h>
  #if STDC_HEADERS
***************
*** 3194,3200 ****
    fclose(fp);
    exit(0);
  }
!     ]],[
        if test -f conftest_grp; then
  	vim_cv_tty_group=`cat conftest_grp`
  	if test "x$vim_cv_tty_mode" = "x" ; then
--- 3194,3200 ----
    fclose(fp);
    exit(0);
  }
!     ]])],[
        if test -f conftest_grp; then
  	vim_cv_tty_group=`cat conftest_grp`
  	if test "x$vim_cv_tty_mode" = "x" ; then
***************
*** 3252,3258 ****
  dnl system("sh -c pwd")
  AC_CACHE_CHECK([getcwd implementation is broken], [vim_cv_getcwd_broken],
    [
!     AC_RUN_IFELSE([[
  #include "confdefs.h"
  #ifdef HAVE_UNISTD_H
  #include <unistd.h>
--- 3252,3258 ----
  dnl system("sh -c pwd")
  AC_CACHE_CHECK([getcwd implementation is broken], [vim_cv_getcwd_broken],
    [
!     AC_RUN_IFELSE([AC_LANG_SOURCE([[
  #include "confdefs.h"
  #ifdef HAVE_UNISTD_H
  #include <unistd.h>
***************
*** 3265,3271 ****
    environ = dagger;
    return getcwd(buffer, 500) ? 0 : 1;
  }
!     ]],[
        vim_cv_getcwd_broken=no
      ],[
        vim_cv_getcwd_broken=yes
--- 3265,3271 ----
    environ = dagger;
    return getcwd(buffer, 500) ? 0 : 1;
  }
!     ]])],[
        vim_cv_getcwd_broken=no
      ],[
        vim_cv_getcwd_broken=yes
***************
*** 3308,3314 ****
  
  AC_CACHE_CHECK([whether stat() ignores a trailing slash], [vim_cv_stat_ignores_slash],
    [
!     AC_RUN_IFELSE([[
  #include "confdefs.h"
  #if STDC_HEADERS
  # include <stdlib.h>
--- 3308,3314 ----
  
  AC_CACHE_CHECK([whether stat() ignores a trailing slash], [vim_cv_stat_ignores_slash],
    [
!     AC_RUN_IFELSE([AC_LANG_SOURCE([[
  #include "confdefs.h"
  #if STDC_HEADERS
  # include <stdlib.h>
***************
*** 3317,3323 ****
  #include <sys/types.h>
  #include <sys/stat.h>
  main() {struct stat st;  exit(stat("configure/", &st) != 0); }
!     ]],[
        vim_cv_stat_ignores_slash=yes
      ],[
        vim_cv_stat_ignores_slash=no
--- 3317,3323 ----
  #include <sys/types.h>
  #include <sys/stat.h>
  main() {struct stat st;  exit(stat("configure/", &st) != 0); }
!     ]])],[
        vim_cv_stat_ignores_slash=yes
      ],[
        vim_cv_stat_ignores_slash=no
***************
*** 3631,3637 ****
  
  AC_CACHE_CHECK([whether memmove handles overlaps],[vim_cv_memmove_handles_overlap],
    [
!     AC_RUN_IFELSE([[#define mch_memmove(s,d,l) memmove(d,s,l) $bcopy_test_prog]],
        [
  	vim_cv_memmove_handles_overlap=yes
        ],[
--- 3631,3637 ----
  
  AC_CACHE_CHECK([whether memmove handles overlaps],[vim_cv_memmove_handles_overlap],
    [
!     AC_RUN_IFELSE([AC_LANG_SOURCE([[#define mch_memmove(s,d,l) memmove(d,s,l) $bcopy_test_prog]])],
        [
  	vim_cv_memmove_handles_overlap=yes
        ],[
***************
*** 3646,3652 ****
  else
    AC_CACHE_CHECK([whether bcopy handles overlaps],[vim_cv_bcopy_handles_overlap],
      [
!       AC_RUN_IFELSE([[#define mch_bcopy(s,d,l) bcopy(d,s,l) $bcopy_test_prog]],
        [
  	vim_cv_bcopy_handles_overlap=yes
        ],[
--- 3646,3652 ----
  else
    AC_CACHE_CHECK([whether bcopy handles overlaps],[vim_cv_bcopy_handles_overlap],
      [
!       AC_RUN_IFELSE([AC_LANG_SOURCE([[#define mch_bcopy(s,d,l) bcopy(d,s,l) $bcopy_test_prog]])],
        [
  	vim_cv_bcopy_handles_overlap=yes
        ],[
***************
*** 3661,3667 ****
    else
      AC_CACHE_CHECK([whether memcpy handles overlaps],[vim_cv_memcpy_handles_overlap],
        [
! 	AC_RUN_IFELSE([[#define mch_memcpy(s,d,l) memcpy(d,s,l) $bcopy_test_prog]],
  	  [
  	    vim_cv_memcpy_handles_overlap=yes
  	  ],[
--- 3661,3667 ----
    else
      AC_CACHE_CHECK([whether memcpy handles overlaps],[vim_cv_memcpy_handles_overlap],
        [
! 	AC_RUN_IFELSE([AC_LANG_SOURCE([[#define mch_memcpy(s,d,l) memcpy(d,s,l) $bcopy_test_prog]])],
  	  [
  	    vim_cv_memcpy_handles_overlap=yes
  	  ],[
*** ../vim-7.4.222/src/auto/configure	2014-03-27 17:19:05.868676325 +0100
--- src/auto/configure	2014-03-27 17:35:39.660691553 +0100
***************
*** 1,11 ****
  #! /bin/sh
  # Guess values for system-dependent variables and create Makefiles.
! # Generated by GNU Autoconf 2.65.
  #
  #
! # Copyright (C) 1992, 1993, 1994, 1995, 1996, 1998, 1999, 2000, 2001,
! # 2002, 2003, 2004, 2005, 2006, 2007, 2008, 2009 Free Software Foundation,
! # Inc.
  #
  #
  # This configure script is free software; the Free Software Foundation
--- 1,9 ----
  #! /bin/sh
  # Guess values for system-dependent variables and create Makefiles.
! # Generated by GNU Autoconf 2.69.
  #
  #
! # Copyright (C) 1992-1996, 1998-2012 Free Software Foundation, Inc.
  #
  #
  # This configure script is free software; the Free Software Foundation
***************
*** 89,94 ****
--- 87,93 ----
  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
***************
*** 133,138 ****
--- 132,162 ----
  # CDPATH.
  (unset CDPATH) >/dev/null 2>&1 && unset CDPATH
  
+ # Use a proper internal environment variable to ensure we don't fall
+   # into an infinite loop, continuously re-executing ourselves.
+   if test x"${_as_can_reexec}" != xno && test "x$CONFIG_SHELL" != x; then
+     _as_can_reexec=no; export _as_can_reexec;
+     # 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
+ 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+"$@"}
+ # Admittedly, this is quite paranoid, since all the known shells bail
+ # out after a failed `exec'.
+ $as_echo "$0: could not re-execute with $CONFIG_SHELL" >&2
+ as_fn_exit 255
+   fi
+   # We don't want this to propagate to other subprocesses.
+           { _as_can_reexec=; unset _as_can_reexec;}
  if test "x$CONFIG_SHELL" = x; then
    as_bourne_compatible="if test -n \"\${ZSH_VERSION+set}\" && (emulate sh) >/dev/null 2>&1; then :
    emulate sh
***************
*** 166,172 ****
  else
    exitcode=1; echo positional parameters were not saved.
  fi
! test x\$exitcode = x0 || exit 1"
    as_suggested="  as_lineno_1=";as_suggested=$as_suggested$LINENO;as_suggested=$as_suggested" as_lineno_1a=\$LINENO
    as_lineno_2=";as_suggested=$as_suggested$LINENO;as_suggested=$as_suggested" as_lineno_2a=\$LINENO
    eval 'test \"x\$as_lineno_1'\$as_run'\" != \"x\$as_lineno_2'\$as_run'\" &&
--- 190,197 ----
  else
    exitcode=1; echo positional parameters were not saved.
  fi
! test x\$exitcode = x0 || exit 1
! test -x / || exit 1"
    as_suggested="  as_lineno_1=";as_suggested=$as_suggested$LINENO;as_suggested=$as_suggested" as_lineno_1a=\$LINENO
    as_lineno_2=";as_suggested=$as_suggested$LINENO;as_suggested=$as_suggested" as_lineno_2a=\$LINENO
    eval 'test \"x\$as_lineno_1'\$as_run'\" != \"x\$as_lineno_2'\$as_run'\" &&
***************
*** 211,224 ****
  
  
        if test "x$CONFIG_SHELL" != x; then :
!   # 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 :
--- 236,260 ----
  
  
        if test "x$CONFIG_SHELL" != x; then :
!   export CONFIG_SHELL
!              # 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
! 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+"$@"}
! # Admittedly, this is quite paranoid, since all the known shells bail
! # out after a failed `exec'.
! $as_echo "$0: could not re-execute with $CONFIG_SHELL" >&2
! exit 255
  fi
  
      if test x$as_have_required = xno; then :
***************
*** 316,325 ****
        test -d "$as_dir" && break
      done
      test -z "$as_dirs" || eval "mkdir $as_dirs"
!   } || test -d "$as_dir" || as_fn_error "cannot create directory $as_dir"
  
  
  } # as_fn_mkdir_p
  # as_fn_append VAR VALUE
  # ----------------------
  # Append the text in VALUE to the end of the definition contained in VAR. Take
--- 352,369 ----
        test -d "$as_dir" && break
      done
      test -z "$as_dirs" || eval "mkdir $as_dirs"
!   } || test -d "$as_dir" || as_fn_error $? "cannot create directory $as_dir"
  
  
  } # as_fn_mkdir_p
+ 
+ # as_fn_executable_p FILE
+ # -----------------------
+ # Test if FILE is an executable regular file.
+ as_fn_executable_p ()
+ {
+   test -f "$1" && test -x "$1"
+ } # as_fn_executable_p
  # as_fn_append VAR VALUE
  # ----------------------
  # Append the text in VALUE to the end of the definition contained in VAR. Take
***************
*** 356,374 ****
  fi # as_fn_arith
  
  
! # as_fn_error ERROR [LINENO LOG_FD]
! # ---------------------------------
  # Output "`basename $0`: error: ERROR" to stderr. If LINENO and LOG_FD are
  # provided, also output the error to LOG_FD, referencing LINENO. Then exit the
! # script with status $?, using 1 if that was 0.
  as_fn_error ()
  {
!   as_status=$?; test $as_status -eq 0 && as_status=1
!   if test "$3"; then
!     as_lineno=${as_lineno-"$2"} as_lineno_stack=as_lineno_stack=$as_lineno_stack
!     $as_echo "$as_me:${as_lineno-$LINENO}: error: $1" >&$3
    fi
!   $as_echo "$as_me: error: $1" >&2
    as_fn_exit $as_status
  } # as_fn_error
  
--- 400,418 ----
  fi # as_fn_arith
  
  
! # as_fn_error STATUS ERROR [LINENO LOG_FD]
! # ----------------------------------------
  # Output "`basename $0`: error: ERROR" to stderr. If LINENO and LOG_FD are
  # provided, also output the error to LOG_FD, referencing LINENO. Then exit the
! # script with STATUS, using 1 if that was 0.
  as_fn_error ()
  {
!   as_status=$1; test $as_status -eq 0 && as_status=1
!   if test "$4"; then
!     as_lineno=${as_lineno-"$3"} as_lineno_stack=as_lineno_stack=$as_lineno_stack
!     $as_echo "$as_me:${as_lineno-$LINENO}: error: $2" >&$4
    fi
!   $as_echo "$as_me: error: $2" >&2
    as_fn_exit $as_status
  } # as_fn_error
  
***************
*** 441,446 ****
--- 485,494 ----
    chmod +x "$as_me.lineno" ||
      { $as_echo "$as_me: error: cannot create $as_me.lineno; rerun with a POSIX shell" >&2; as_fn_exit 1; }
  
+   # If we had to re-execute with $CONFIG_SHELL, we're ensured to have
+   # already done that, so ensure we don't try to do so again and fall
+   # in an infinite loop.  This has already happened in practice.
+   _as_can_reexec=no; export _as_can_reexec
    # Don't try to exec as it changes $[0], causing all sort of problems
    # (the dirname of $[0] is not the place where we might find the
    # original and so on.  Autoconf is especially sensitive to this).
***************
*** 475,490 ****
      # ... but there are two gotchas:
      # 1) On MSYS, both `ln -s file dir' and `ln file dir' fail.
      # 2) DJGPP < 2.04 has no symlinks; `ln -s' creates a wrapper executable.
!     # In both cases, we have to default to `cp -p'.
      ln -s conf$$.file conf$$.dir 2>/dev/null && test ! -f conf$$.exe ||
!       as_ln_s='cp -p'
    elif ln conf$$.file conf$$ 2>/dev/null; then
      as_ln_s=ln
    else
!     as_ln_s='cp -p'
    fi
  else
!   as_ln_s='cp -p'
  fi
  rm -f conf$$ conf$$.exe conf$$.dir/conf$$.file conf$$.file
  rmdir conf$$.dir 2>/dev/null
--- 523,538 ----
      # ... but there are two gotchas:
      # 1) On MSYS, both `ln -s file dir' and `ln file dir' fail.
      # 2) DJGPP < 2.04 has no symlinks; `ln -s' creates a wrapper executable.
!     # In both cases, we have to default to `cp -pR'.
      ln -s conf$$.file conf$$.dir 2>/dev/null && test ! -f conf$$.exe ||
!       as_ln_s='cp -pR'
    elif ln conf$$.file conf$$ 2>/dev/null; then
      as_ln_s=ln
    else
!     as_ln_s='cp -pR'
    fi
  else
!   as_ln_s='cp -pR'
  fi
  rm -f conf$$ conf$$.exe conf$$.dir/conf$$.file conf$$.file
  rmdir conf$$.dir 2>/dev/null
***************
*** 496,523 ****
    as_mkdir_p=false
  fi
  
! if test -x / >/dev/null 2>&1; then
!   as_test_x='test -x'
! else
!   if ls -dL / >/dev/null 2>&1; then
!     as_ls_L_option=L
!   else
!     as_ls_L_option=
!   fi
!   as_test_x='
!     eval sh -c '\''
!       if test -d "$1"; then
! 	test -d "$1/.";
!       else
! 	case $1 in #(
! 	-*)set "./$1";;
! 	esac;
! 	case `ls -ld'$as_ls_L_option' "$1" 2>/dev/null` in #((
! 	???[sx]*):;;*)false;;esac;fi
!     '\'' sh
!   '
! fi
! as_executable_p=$as_test_x
  
  # Sed expression to map a string onto a valid CPP name.
  as_tr_cpp="eval sed 'y%*$as_cr_letters%P$as_cr_LETTERS%;s%[^_$as_cr_alnum]%_%g'"
--- 544,551 ----
    as_mkdir_p=false
  fi
  
! as_test_x='test -x'
! as_executable_p=as_fn_executable_p
  
  # Sed expression to map a string onto a valid CPP name.
  as_tr_cpp="eval sed 'y%*$as_cr_letters%P$as_cr_LETTERS%;s%[^_$as_cr_alnum]%_%g'"
***************
*** 530,536 ****
  exec 6>&1
  
  # Name of the host.
! # hostname on some systems (SVR3.2, Linux) returns a bogus exit status,
  # so uname gets run too.
  ac_hostname=`(hostname || uname -n) 2>/dev/null | sed 1q`
  
--- 558,564 ----
  exec 6>&1
  
  # Name of the host.
! # hostname on some systems (SVR3.2, old GNU/Linux) returns a bogus exit status,
  # so uname gets run too.
  ac_hostname=`(hostname || uname -n) 2>/dev/null | sed 1q`
  
***************
*** 872,879 ****
    fi
  
    case $ac_option in
!   *=*)	ac_optarg=`expr "X$ac_option" : '[^=]*=\(.*\)'` ;;
!   *)	ac_optarg=yes ;;
    esac
  
    # Accept the important Cygnus configure options, so we can diagnose typos.
--- 900,908 ----
    fi
  
    case $ac_option in
!   *=?*) ac_optarg=`expr "X$ac_option" : '[^=]*=\(.*\)'` ;;
!   *=)   ac_optarg= ;;
!   *)    ac_optarg=yes ;;
    esac
  
    # Accept the important Cygnus configure options, so we can diagnose typos.
***************
*** 918,924 ****
      ac_useropt=`expr "x$ac_option" : 'x-*disable-\(.*\)'`
      # Reject names that are not valid shell variable names.
      expr "x$ac_useropt" : ".*[^-+._$as_cr_alnum]" >/dev/null &&
!       as_fn_error "invalid feature name: $ac_useropt"
      ac_useropt_orig=$ac_useropt
      ac_useropt=`$as_echo "$ac_useropt" | sed 's/[-+.]/_/g'`
      case $ac_user_opts in
--- 947,953 ----
      ac_useropt=`expr "x$ac_option" : 'x-*disable-\(.*\)'`
      # Reject names that are not valid shell variable names.
      expr "x$ac_useropt" : ".*[^-+._$as_cr_alnum]" >/dev/null &&
!       as_fn_error $? "invalid feature name: $ac_useropt"
      ac_useropt_orig=$ac_useropt
      ac_useropt=`$as_echo "$ac_useropt" | sed 's/[-+.]/_/g'`
      case $ac_user_opts in
***************
*** 944,950 ****
      ac_useropt=`expr "x$ac_option" : 'x-*enable-\([^=]*\)'`
      # Reject names that are not valid shell variable names.
      expr "x$ac_useropt" : ".*[^-+._$as_cr_alnum]" >/dev/null &&
!       as_fn_error "invalid feature name: $ac_useropt"
      ac_useropt_orig=$ac_useropt
      ac_useropt=`$as_echo "$ac_useropt" | sed 's/[-+.]/_/g'`
      case $ac_user_opts in
--- 973,979 ----
      ac_useropt=`expr "x$ac_option" : 'x-*enable-\([^=]*\)'`
      # Reject names that are not valid shell variable names.
      expr "x$ac_useropt" : ".*[^-+._$as_cr_alnum]" >/dev/null &&
!       as_fn_error $? "invalid feature name: $ac_useropt"
      ac_useropt_orig=$ac_useropt
      ac_useropt=`$as_echo "$ac_useropt" | sed 's/[-+.]/_/g'`
      case $ac_user_opts in
***************
*** 1148,1154 ****
      ac_useropt=`expr "x$ac_option" : 'x-*with-\([^=]*\)'`
      # Reject names that are not valid shell variable names.
      expr "x$ac_useropt" : ".*[^-+._$as_cr_alnum]" >/dev/null &&
!       as_fn_error "invalid package name: $ac_useropt"
      ac_useropt_orig=$ac_useropt
      ac_useropt=`$as_echo "$ac_useropt" | sed 's/[-+.]/_/g'`
      case $ac_user_opts in
--- 1177,1183 ----
      ac_useropt=`expr "x$ac_option" : 'x-*with-\([^=]*\)'`
      # Reject names that are not valid shell variable names.
      expr "x$ac_useropt" : ".*[^-+._$as_cr_alnum]" >/dev/null &&
!       as_fn_error $? "invalid package name: $ac_useropt"
      ac_useropt_orig=$ac_useropt
      ac_useropt=`$as_echo "$ac_useropt" | sed 's/[-+.]/_/g'`
      case $ac_user_opts in
***************
*** 1164,1170 ****
      ac_useropt=`expr "x$ac_option" : 'x-*without-\(.*\)'`
      # Reject names that are not valid shell variable names.
      expr "x$ac_useropt" : ".*[^-+._$as_cr_alnum]" >/dev/null &&
!       as_fn_error "invalid package name: $ac_useropt"
      ac_useropt_orig=$ac_useropt
      ac_useropt=`$as_echo "$ac_useropt" | sed 's/[-+.]/_/g'`
      case $ac_user_opts in
--- 1193,1199 ----
      ac_useropt=`expr "x$ac_option" : 'x-*without-\(.*\)'`
      # Reject names that are not valid shell variable names.
      expr "x$ac_useropt" : ".*[^-+._$as_cr_alnum]" >/dev/null &&
!       as_fn_error $? "invalid package name: $ac_useropt"
      ac_useropt_orig=$ac_useropt
      ac_useropt=`$as_echo "$ac_useropt" | sed 's/[-+.]/_/g'`
      case $ac_user_opts in
***************
*** 1194,1201 ****
    | --x-librar=* | --x-libra=* | --x-libr=* | --x-lib=* | --x-li=* | --x-l=*)
      x_libraries=$ac_optarg ;;
  
!   -*) as_fn_error "unrecognized option: \`$ac_option'
! Try \`$0 --help' for more information."
      ;;
  
    *=*)
--- 1223,1230 ----
    | --x-librar=* | --x-libra=* | --x-libr=* | --x-lib=* | --x-li=* | --x-l=*)
      x_libraries=$ac_optarg ;;
  
!   -*) as_fn_error $? "unrecognized option: \`$ac_option'
! Try \`$0 --help' for more information"
      ;;
  
    *=*)
***************
*** 1203,1209 ****
      # Reject names that are not valid shell variable names.
      case $ac_envvar in #(
        '' | [0-9]* | *[!_$as_cr_alnum]* )
!       as_fn_error "invalid variable name: \`$ac_envvar'" ;;
      esac
      eval $ac_envvar=\$ac_optarg
      export $ac_envvar ;;
--- 1232,1238 ----
      # Reject names that are not valid shell variable names.
      case $ac_envvar in #(
        '' | [0-9]* | *[!_$as_cr_alnum]* )
!       as_fn_error $? "invalid variable name: \`$ac_envvar'" ;;
      esac
      eval $ac_envvar=\$ac_optarg
      export $ac_envvar ;;
***************
*** 1213,1219 ****
      $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
--- 1242,1248 ----
      $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
***************
*** 1221,1233 ****
  
  if test -n "$ac_prev"; then
    ac_option=--`echo $ac_prev | sed 's/_/-/g'`
!   as_fn_error "missing argument to $ac_option"
  fi
  
  if test -n "$ac_unrecognized_opts"; then
    case $enable_option_checking in
      no) ;;
!     fatal) as_fn_error "unrecognized options: $ac_unrecognized_opts" ;;
      *)     $as_echo "$as_me: WARNING: unrecognized options: $ac_unrecognized_opts" >&2 ;;
    esac
  fi
--- 1250,1262 ----
  
  if test -n "$ac_prev"; then
    ac_option=--`echo $ac_prev | sed 's/_/-/g'`
!   as_fn_error $? "missing argument to $ac_option"
  fi
  
  if test -n "$ac_unrecognized_opts"; then
    case $enable_option_checking in
      no) ;;
!     fatal) as_fn_error $? "unrecognized options: $ac_unrecognized_opts" ;;
      *)     $as_echo "$as_me: WARNING: unrecognized options: $ac_unrecognized_opts" >&2 ;;
    esac
  fi
***************
*** 1250,1256 ****
      [\\/$]* | ?:[\\/]* )  continue;;
      NONE | '' ) case $ac_var in *prefix ) continue;; esac;;
    esac
!   as_fn_error "expected an absolute directory name for --$ac_var: $ac_val"
  done
  
  # There might be people who depend on the old broken behavior: `$host'
--- 1279,1285 ----
      [\\/$]* | ?:[\\/]* )  continue;;
      NONE | '' ) case $ac_var in *prefix ) continue;; esac;;
    esac
!   as_fn_error $? "expected an absolute directory name for --$ac_var: $ac_val"
  done
  
  # There might be people who depend on the old broken behavior: `$host'
***************
*** 1264,1271 ****
  if test "x$host_alias" != x; then
    if test "x$build_alias" = x; then
      cross_compiling=maybe
-     $as_echo "$as_me: WARNING: If you wanted to set the --build type, don't use --host.
-     If a cross compiler is detected then cross compile mode will be used." >&2
    elif test "x$build_alias" != "x$host_alias"; then
      cross_compiling=yes
    fi
--- 1293,1298 ----
***************
*** 1280,1288 ****
  ac_pwd=`pwd` && test -n "$ac_pwd" &&
  ac_ls_di=`ls -di .` &&
  ac_pwd_ls_di=`cd "$ac_pwd" && ls -di .` ||
!   as_fn_error "working directory cannot be determined"
  test "X$ac_ls_di" = "X$ac_pwd_ls_di" ||
!   as_fn_error "pwd does not report name of working directory"
  
  
  # Find the source files, if location was not specified.
--- 1307,1315 ----
  ac_pwd=`pwd` && test -n "$ac_pwd" &&
  ac_ls_di=`ls -di .` &&
  ac_pwd_ls_di=`cd "$ac_pwd" && ls -di .` ||
!   as_fn_error $? "working directory cannot be determined"
  test "X$ac_ls_di" = "X$ac_pwd_ls_di" ||
!   as_fn_error $? "pwd does not report name of working directory"
  
  
  # Find the source files, if location was not specified.
***************
*** 1321,1331 ****
  fi
  if test ! -r "$srcdir/$ac_unique_file"; then
    test "$ac_srcdir_defaulted" = yes && srcdir="$ac_confdir or .."
!   as_fn_error "cannot find sources ($ac_unique_file) in $srcdir"
  fi
  ac_msg="sources are in $srcdir, but \`cd $srcdir' does not work"
  ac_abs_confdir=`(
! 	cd "$srcdir" && test -r "./$ac_unique_file" || as_fn_error "$ac_msg"
  	pwd)`
  # When building in place, set srcdir=.
  if test "$ac_abs_confdir" = "$ac_pwd"; then
--- 1348,1358 ----
  fi
  if test ! -r "$srcdir/$ac_unique_file"; then
    test "$ac_srcdir_defaulted" = yes && srcdir="$ac_confdir or .."
!   as_fn_error $? "cannot find sources ($ac_unique_file) in $srcdir"
  fi
  ac_msg="sources are in $srcdir, but \`cd $srcdir' does not work"
  ac_abs_confdir=`(
! 	cd "$srcdir" && test -r "./$ac_unique_file" || as_fn_error $? "$ac_msg"
  	pwd)`
  # When building in place, set srcdir=.
  if test "$ac_abs_confdir" = "$ac_pwd"; then
***************
*** 1365,1371 ****
        --help=short        display options specific to this package
        --help=recursive    display the short help of all the included packages
    -V, --version           display version information and exit
!   -q, --quiet, --silent   do not print \`checking...' messages
        --cache-file=FILE   cache test results in FILE [disabled]
    -C, --config-cache      alias for \`--cache-file=config.cache'
    -n, --no-create         do not create output files
--- 1392,1398 ----
        --help=short        display options specific to this package
        --help=recursive    display the short help of all the included packages
    -V, --version           display version information and exit
!   -q, --quiet, --silent   do not print \`checking ...' messages
        --cache-file=FILE   cache test results in FILE [disabled]
    -C, --config-cache      alias for \`--cache-file=config.cache'
    -n, --no-create         do not create output files
***************
*** 1563,1571 ****
  if $ac_init_version; then
    cat <<\_ACEOF
  configure
! generated by GNU Autoconf 2.65
  
! Copyright (C) 2009 Free Software Foundation, Inc.
  This configure script is free software; the Free Software Foundation
  gives unlimited permission to copy, distribute and modify it.
  _ACEOF
--- 1590,1598 ----
  if $ac_init_version; then
    cat <<\_ACEOF
  configure
! generated by GNU Autoconf 2.69
  
! Copyright (C) 2012 Free Software Foundation, Inc.
  This configure script is free software; the Free Software Foundation
  gives unlimited permission to copy, distribute and modify it.
  _ACEOF
***************
*** 1609,1615 ****
  
  	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
--- 1636,1642 ----
  
  	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
***************
*** 1635,1641 ****
      mv -f conftest.er1 conftest.err
    fi
    $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
!   test $ac_status = 0; } >/dev/null && {
  	 test -z "$ac_c_preproc_warn_flag$ac_c_werror_flag" ||
  	 test ! -s conftest.err
         }; then :
--- 1662,1668 ----
      mv -f conftest.er1 conftest.err
    fi
    $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
!   test $ac_status = 0; } > conftest.i && {
  	 test -z "$ac_c_preproc_warn_flag$ac_c_werror_flag" ||
  	 test ! -s conftest.err
         }; then :
***************
*** 1646,1652 ****
  
      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
--- 1673,1679 ----
  
      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
***************
*** 1678,1684 ****
  	 test ! -s conftest.err
         } && test -s conftest$ac_exeext && {
  	 test "$cross_compiling" = yes ||
! 	 $as_test_x conftest$ac_exeext
         }; then :
    ac_retval=0
  else
--- 1705,1711 ----
  	 test ! -s conftest.err
         } && test -s conftest$ac_exeext && {
  	 test "$cross_compiling" = yes ||
! 	 test -x conftest$ac_exeext
         }; then :
    ac_retval=0
  else
***************
*** 1692,1698 ****
    # 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
--- 1719,1725 ----
    # 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
***************
*** 1734,1740 ****
         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
--- 1761,1767 ----
         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
***************
*** 1747,1756 ****
  ac_fn_c_check_header_mongrel ()
  {
    as_lineno=${as_lineno-"$1"} as_lineno_stack=as_lineno_stack=$as_lineno_stack
!   if { as_var=$3; eval "test \"\${$as_var+set}\" = set"; }; then :
    { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $2" >&5
  $as_echo_n "checking for $2... " >&6; }
! if { as_var=$3; eval "test \"\${$as_var+set}\" = set"; }; then :
    $as_echo_n "(cached) " >&6
  fi
  eval ac_res=\$$3
--- 1774,1783 ----
  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
***************
*** 1786,1792 ****
  else
    ac_header_preproc=no
  fi
! rm -f conftest.err conftest.$ac_ext
  { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_header_preproc" >&5
  $as_echo "$ac_header_preproc" >&6; }
  
--- 1813,1819 ----
  else
    ac_header_preproc=no
  fi
! rm -f conftest.err conftest.i conftest.$ac_ext
  { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_header_preproc" >&5
  $as_echo "$ac_header_preproc" >&6; }
  
***************
*** 1813,1819 ****
  esac
    { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $2" >&5
  $as_echo_n "checking for $2... " >&6; }
! if { as_var=$3; eval "test \"\${$as_var+set}\" = set"; }; then :
    $as_echo_n "(cached) " >&6
  else
    eval "$3=\$ac_header_compiler"
--- 1840,1846 ----
  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"
***************
*** 1822,1828 ****
  	       { $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
  
--- 1849,1855 ----
  	       { $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
  
***************
*** 1835,1841 ****
    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 { as_var=$3; eval "test \"\${$as_var+set}\" = set"; }; then :
    $as_echo_n "(cached) " >&6
  else
    cat confdefs.h - <<_ACEOF >conftest.$ac_ext
--- 1862,1868 ----
    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
***************
*** 1853,1859 ****
  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
  
--- 1880,1886 ----
  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
  
***************
*** 1865,1871 ****
    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 { as_var=$3; eval "test \"\${$as_var+set}\" = set"; }; then :
    $as_echo_n "(cached) " >&6
  else
    cat confdefs.h - <<_ACEOF >conftest.$ac_ext
--- 1892,1898 ----
    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
***************
*** 1920,1926 ****
  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
  
--- 1947,1953 ----
  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
  
***************
*** 1933,1939 ****
    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 { as_var=$3; eval "test \"\${$as_var+set}\" = set"; }; then :
    $as_echo_n "(cached) " >&6
  else
    eval "$3=no"
--- 1960,1966 ----
    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"
***************
*** 1974,1980 ****
  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
  
--- 2001,2007 ----
  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
  
***************
*** 1987,1993 ****
    as_lineno=${as_lineno-"$1"} as_lineno_stack=as_lineno_stack=$as_lineno_stack
    { $as_echo "$as_me:${as_lineno-$LINENO}: checking for uint$2_t" >&5
  $as_echo_n "checking for uint$2_t... " >&6; }
! if { as_var=$3; eval "test \"\${$as_var+set}\" = set"; }; then :
    $as_echo_n "(cached) " >&6
  else
    eval "$3=no"
--- 2014,2020 ----
    as_lineno=${as_lineno-"$1"} as_lineno_stack=as_lineno_stack=$as_lineno_stack
    { $as_echo "$as_me:${as_lineno-$LINENO}: checking for uint$2_t" >&5
  $as_echo_n "checking for uint$2_t... " >&6; }
! if eval \${$3+:} false; then :
    $as_echo_n "(cached) " >&6
  else
    eval "$3=no"
***************
*** 2002,2008 ****
  main ()
  {
  static int test_array [1 - 2 * !((($ac_type) -1 >> ($2 / 2 - 1)) >> ($2 / 2 - 1) == 3)];
! test_array [0] = 0
  
    ;
    return 0;
--- 2029,2036 ----
  main ()
  {
  static int test_array [1 - 2 * !((($ac_type) -1 >> ($2 / 2 - 1)) >> ($2 / 2 - 1) == 3)];
! test_array [0] = 0;
! return test_array [0];
  
    ;
    return 0;
***************
*** 2017,2024 ****
  esac
  fi
  rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
!        eval as_val=\$$3
!    if test "x$as_val" = x""no; then :
  
  else
    break
--- 2045,2051 ----
  esac
  fi
  rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
!        if eval test \"x\$"$3"\" = x"no"; then :
  
  else
    break
***************
*** 2028,2034 ****
  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_find_uintX_t
  
--- 2055,2061 ----
  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_find_uintX_t
  
***************
*** 2049,2055 ****
  main ()
  {
  static int test_array [1 - 2 * !(($2) >= 0)];
! test_array [0] = 0
  
    ;
    return 0;
--- 2076,2083 ----
  main ()
  {
  static int test_array [1 - 2 * !(($2) >= 0)];
! test_array [0] = 0;
! return test_array [0];
  
    ;
    return 0;
***************
*** 2065,2071 ****
  main ()
  {
  static int test_array [1 - 2 * !(($2) <= $ac_mid)];
! test_array [0] = 0
  
    ;
    return 0;
--- 2093,2100 ----
  main ()
  {
  static int test_array [1 - 2 * !(($2) <= $ac_mid)];
! test_array [0] = 0;
! return test_array [0];
  
    ;
    return 0;
***************
*** 2091,2097 ****
  main ()
  {
  static int test_array [1 - 2 * !(($2) < 0)];
! test_array [0] = 0
  
    ;
    return 0;
--- 2120,2127 ----
  main ()
  {
  static int test_array [1 - 2 * !(($2) < 0)];
! test_array [0] = 0;
! return test_array [0];
  
    ;
    return 0;
***************
*** 2107,2113 ****
  main ()
  {
  static int test_array [1 - 2 * !(($2) >= $ac_mid)];
! test_array [0] = 0
  
    ;
    return 0;
--- 2137,2144 ----
  main ()
  {
  static int test_array [1 - 2 * !(($2) >= $ac_mid)];
! test_array [0] = 0;
! return test_array [0];
  
    ;
    return 0;
***************
*** 2141,2147 ****
  main ()
  {
  static int test_array [1 - 2 * !(($2) <= $ac_mid)];
! test_array [0] = 0
  
    ;
    return 0;
--- 2172,2179 ----
  main ()
  {
  static int test_array [1 - 2 * !(($2) <= $ac_mid)];
! test_array [0] = 0;
! return test_array [0];
  
    ;
    return 0;
***************
*** 2205,2211 ****
  rm -f conftest.val
  
    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_compute_int
--- 2237,2243 ----
  rm -f conftest.val
  
    fi
!   eval $as_lineno_stack; ${as_lineno_stack:+:} unset as_lineno
    as_fn_set_status $ac_retval
  
  } # ac_fn_c_compute_int
***************
*** 2214,2220 ****
  running configure, to aid debugging if configure makes a mistake.
  
  It was created by $as_me, which was
! generated by GNU Autoconf 2.65.  Invocation command line was
  
    $ $0 $@
  
--- 2246,2252 ----
  running configure, to aid debugging if configure makes a mistake.
  
  It was created by $as_me, which was
! generated by GNU Autoconf 2.69.  Invocation command line was
  
    $ $0 $@
  
***************
*** 2324,2334 ****
    {
      echo
  
!     cat <<\_ASBOX
! ## ---------------- ##
  ## Cache variables. ##
! ## ---------------- ##
! _ASBOX
      echo
      # The following way of writing the cache mishandles newlines in values,
  (
--- 2356,2364 ----
    {
      echo
  
!     $as_echo "## ---------------- ##
  ## Cache variables. ##
! ## ---------------- ##"
      echo
      # The following way of writing the cache mishandles newlines in values,
  (
***************
*** 2362,2372 ****
  )
      echo
  
!     cat <<\_ASBOX
! ## ----------------- ##
  ## Output variables. ##
! ## ----------------- ##
! _ASBOX
      echo
      for ac_var in $ac_subst_vars
      do
--- 2392,2400 ----
  )
      echo
  
!     $as_echo "## ----------------- ##
  ## Output variables. ##
! ## ----------------- ##"
      echo
      for ac_var in $ac_subst_vars
      do
***************
*** 2379,2389 ****
      echo
  
      if test -n "$ac_subst_files"; then
!       cat <<\_ASBOX
! ## ------------------- ##
  ## File substitutions. ##
! ## ------------------- ##
! _ASBOX
        echo
        for ac_var in $ac_subst_files
        do
--- 2407,2415 ----
      echo
  
      if test -n "$ac_subst_files"; then
!       $as_echo "## ------------------- ##
  ## File substitutions. ##
! ## ------------------- ##"
        echo
        for ac_var in $ac_subst_files
        do
***************
*** 2397,2407 ****
      fi
  
      if test -s confdefs.h; then
!       cat <<\_ASBOX
! ## ----------- ##
  ## confdefs.h. ##
! ## ----------- ##
! _ASBOX
        echo
        cat confdefs.h
        echo
--- 2423,2431 ----
      fi
  
      if test -s confdefs.h; then
!       $as_echo "## ----------- ##
  ## confdefs.h. ##
! ## ----------- ##"
        echo
        cat confdefs.h
        echo
***************
*** 2456,2462 ****
  ac_site_file1=NONE
  ac_site_file2=NONE
  if test -n "$CONFIG_SITE"; then
!   ac_site_file1=$CONFIG_SITE
  elif test "x$prefix" != xNONE; then
    ac_site_file1=$prefix/share/config.site
    ac_site_file2=$prefix/etc/config.site
--- 2480,2491 ----
  ac_site_file1=NONE
  ac_site_file2=NONE
  if test -n "$CONFIG_SITE"; then
!   # We do not want a PATH search for config.site.
!   case $CONFIG_SITE in #((
!     -*)  ac_site_file1=./$CONFIG_SITE;;
!     */*) ac_site_file1=$CONFIG_SITE;;
!     *)   ac_site_file1=./$CONFIG_SITE;;
!   esac
  elif test "x$prefix" != xNONE; then
    ac_site_file1=$prefix/share/config.site
    ac_site_file2=$prefix/etc/config.site
***************
*** 2471,2477 ****
      { $as_echo "$as_me:${as_lineno-$LINENO}: loading site script $ac_site_file" >&5
  $as_echo "$as_me: loading site script $ac_site_file" >&6;}
      sed 's/^/| /' "$ac_site_file" >&5
!     . "$ac_site_file"
    fi
  done
  
--- 2500,2510 ----
      { $as_echo "$as_me:${as_lineno-$LINENO}: loading site script $ac_site_file" >&5
  $as_echo "$as_me: loading site script $ac_site_file" >&6;}
      sed 's/^/| /' "$ac_site_file" >&5
!     . "$ac_site_file" \
!       || { { $as_echo "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5
! $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; }
    fi
  done
  
***************
*** 2547,2553 ****
  $as_echo "$as_me: error: in \`$ac_pwd':" >&2;}
    { $as_echo "$as_me:${as_lineno-$LINENO}: error: changes in the environment can compromise the build" >&5
  $as_echo "$as_me: error: changes in the environment can compromise the build" >&2;}
!   as_fn_error "run \`make distclean' and/or \`rm $cache_file' and start over" "$LINENO" 5
  fi
  ## -------------------- ##
  ## Main body of script. ##
--- 2580,2586 ----
  $as_echo "$as_me: error: in \`$ac_pwd':" >&2;}
    { $as_echo "$as_me:${as_lineno-$LINENO}: error: changes in the environment can compromise the build" >&5
  $as_echo "$as_me: error: changes in the environment can compromise the build" >&2;}
!   as_fn_error $? "run \`make distclean' and/or \`rm $cache_file' and start over" "$LINENO" 5
  fi
  ## -------------------- ##
  ## Main body of script. ##
***************
*** 2569,2575 ****
  $as_echo_n "checking whether ${MAKE-make} sets \$(MAKE)... " >&6; }
  set x ${MAKE-make}
  ac_make=`$as_echo "$2" | sed 's/+/p/g; s/[^a-zA-Z0-9_]/_/g'`
! if { as_var=ac_cv_prog_make_${ac_make}_set; eval "test \"\${$as_var+set}\" = set"; }; then :
    $as_echo_n "(cached) " >&6
  else
    cat >conftest.make <<\_ACEOF
--- 2602,2608 ----
  $as_echo_n "checking whether ${MAKE-make} sets \$(MAKE)... " >&6; }
  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 :
    $as_echo_n "(cached) " >&6
  else
    cat >conftest.make <<\_ACEOF
***************
*** 2577,2583 ****
  all:
  	@echo '@@@%%%=$(MAKE)=@@@%%%'
  _ACEOF
! # GNU make sometimes prints "make[1]: Entering...", which would confuse us.
  case `${MAKE-make} -f conftest.make 2>/dev/null` in
    *@@@%%%=?*=@@@%%%*)
      eval ac_cv_prog_make_${ac_make}_set=yes;;
--- 2610,2616 ----
  all:
  	@echo '@@@%%%=$(MAKE)=@@@%%%'
  _ACEOF
! # GNU make sometimes prints "make[1]: Entering ...", which would confuse us.
  case `${MAKE-make} -f conftest.make 2>/dev/null` in
    *@@@%%%=?*=@@@%%%*)
      eval ac_cv_prog_make_${ac_make}_set=yes;;
***************
*** 2607,2613 ****
  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
--- 2640,2646 ----
  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
***************
*** 2619,2625 ****
    IFS=$as_save_IFS
    test -z "$as_dir" && as_dir=.
      for ac_exec_ext in '' $ac_executable_extensions; do
!   if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
      ac_cv_prog_CC="${ac_tool_prefix}gcc"
      $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
      break 2
--- 2652,2658 ----
    IFS=$as_save_IFS
    test -z "$as_dir" && as_dir=.
      for ac_exec_ext in '' $ac_executable_extensions; do
!   if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
      ac_cv_prog_CC="${ac_tool_prefix}gcc"
      $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
      break 2
***************
*** 2647,2653 ****
  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
--- 2680,2686 ----
  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
***************
*** 2659,2665 ****
    IFS=$as_save_IFS
    test -z "$as_dir" && as_dir=.
      for ac_exec_ext in '' $ac_executable_extensions; do
!   if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
      ac_cv_prog_ac_ct_CC="gcc"
      $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
      break 2
--- 2692,2698 ----
    IFS=$as_save_IFS
    test -z "$as_dir" && as_dir=.
      for ac_exec_ext in '' $ac_executable_extensions; do
!   if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
      ac_cv_prog_ac_ct_CC="gcc"
      $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
      break 2
***************
*** 2700,2706 ****
  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
--- 2733,2739 ----
  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
***************
*** 2712,2718 ****
    IFS=$as_save_IFS
    test -z "$as_dir" && as_dir=.
      for ac_exec_ext in '' $ac_executable_extensions; do
!   if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
      ac_cv_prog_CC="${ac_tool_prefix}cc"
      $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
      break 2
--- 2745,2751 ----
    IFS=$as_save_IFS
    test -z "$as_dir" && as_dir=.
      for ac_exec_ext in '' $ac_executable_extensions; do
!   if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
      ac_cv_prog_CC="${ac_tool_prefix}cc"
      $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
      break 2
***************
*** 2740,2746 ****
  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
--- 2773,2779 ----
  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
***************
*** 2753,2759 ****
    IFS=$as_save_IFS
    test -z "$as_dir" && as_dir=.
      for ac_exec_ext in '' $ac_executable_extensions; do
!   if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
      if test "$as_dir/$ac_word$ac_exec_ext" = "/usr/ucb/cc"; then
         ac_prog_rejected=yes
         continue
--- 2786,2792 ----
    IFS=$as_save_IFS
    test -z "$as_dir" && as_dir=.
      for ac_exec_ext in '' $ac_executable_extensions; do
!   if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
      if test "$as_dir/$ac_word$ac_exec_ext" = "/usr/ucb/cc"; then
         ac_prog_rejected=yes
         continue
***************
*** 2799,2805 ****
  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
--- 2832,2838 ----
  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
***************
*** 2811,2817 ****
    IFS=$as_save_IFS
    test -z "$as_dir" && as_dir=.
      for ac_exec_ext in '' $ac_executable_extensions; do
!   if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
      ac_cv_prog_CC="$ac_tool_prefix$ac_prog"
      $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
      break 2
--- 2844,2850 ----
    IFS=$as_save_IFS
    test -z "$as_dir" && as_dir=.
      for ac_exec_ext in '' $ac_executable_extensions; do
!   if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
      ac_cv_prog_CC="$ac_tool_prefix$ac_prog"
      $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
      break 2
***************
*** 2843,2849 ****
  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
--- 2876,2882 ----
  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
***************
*** 2855,2861 ****
    IFS=$as_save_IFS
    test -z "$as_dir" && as_dir=.
      for ac_exec_ext in '' $ac_executable_extensions; do
!   if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
      ac_cv_prog_ac_ct_CC="$ac_prog"
      $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
      break 2
--- 2888,2894 ----
    IFS=$as_save_IFS
    test -z "$as_dir" && as_dir=.
      for ac_exec_ext in '' $ac_executable_extensions; do
!   if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
      ac_cv_prog_ac_ct_CC="$ac_prog"
      $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
      break 2
***************
*** 2897,2904 ****
  
  test -z "$CC" && { { $as_echo "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5
  $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; }
  
  # Provide some information about the compiler.
  $as_echo "$as_me:${as_lineno-$LINENO}: checking for C compiler version" >&5
--- 2930,2937 ----
  
  test -z "$CC" && { { $as_echo "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5
  $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; }
  
  # Provide some information about the compiler.
  $as_echo "$as_me:${as_lineno-$LINENO}: checking for C compiler version" >&5
***************
*** 3012,3020 ****
  
  { { $as_echo "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5
  $as_echo "$as_me: error: in \`$ac_pwd':" >&2;}
! { as_fn_set_status 77
! as_fn_error "C compiler cannot create executables
! See \`config.log' for more details." "$LINENO" 5; }; }
  else
    { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5
  $as_echo "yes" >&6; }
--- 3045,3052 ----
  
  { { $as_echo "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5
  $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; }
  else
    { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5
  $as_echo "yes" >&6; }
***************
*** 3056,3063 ****
  else
    { { $as_echo "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5
  $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; }
  fi
  rm -f conftest conftest$ac_cv_exeext
  { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_exeext" >&5
--- 3088,3095 ----
  else
    { { $as_echo "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5
  $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; }
  fi
  rm -f conftest conftest$ac_cv_exeext
  { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_exeext" >&5
***************
*** 3114,3122 ****
      else
  	{ { $as_echo "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5
  $as_echo "$as_me: error: in \`$ac_pwd':" >&2;}
! as_fn_error "cannot run C compiled programs.
  If you meant to cross compile, use \`--host'.
! See \`config.log' for more details." "$LINENO" 5; }
      fi
    fi
  fi
--- 3146,3154 ----
      else
  	{ { $as_echo "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5
  $as_echo "$as_me: error: in \`$ac_pwd':" >&2;}
! as_fn_error $? "cannot run C compiled programs.
  If you meant to cross compile, use \`--host'.
! See \`config.log' for more details" "$LINENO" 5; }
      fi
    fi
  fi
***************
*** 3127,3133 ****
  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
--- 3159,3165 ----
  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
***************
*** 3167,3174 ****
  
  { { $as_echo "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5
  $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; }
  fi
  rm -f conftest.$ac_cv_objext conftest.$ac_ext
  fi
--- 3199,3206 ----
  
  { { $as_echo "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5
  $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; }
  fi
  rm -f conftest.$ac_cv_objext conftest.$ac_ext
  fi
***************
*** 3178,3184 ****
  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
--- 3210,3216 ----
  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
***************
*** 3215,3221 ****
  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
--- 3247,3253 ----
  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
***************
*** 3293,3299 ****
  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
--- 3325,3331 ----
  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
***************
*** 3302,3309 ****
  /* end confdefs.h.  */
  #include <stdarg.h>
  #include <stdio.h>
! #include <sys/types.h>
! #include <sys/stat.h>
  /* Most of the following tests are stolen from RCS 5.7's src/conf.sh.  */
  struct buf { int x; };
  FILE * (*rcsopen) (struct buf *, struct stat *, int);
--- 3334,3340 ----
  /* end confdefs.h.  */
  #include <stdarg.h>
  #include <stdio.h>
! struct stat;
  /* Most of the following tests are stolen from RCS 5.7's src/conf.sh.  */
  struct buf { int x; };
  FILE * (*rcsopen) (struct buf *, struct stat *, int);
***************
*** 3399,3405 ****
    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
--- 3430,3436 ----
    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
***************
*** 3429,3435 ****
    # Broken: fails on valid input.
  continue
  fi
! rm -f conftest.err conftest.$ac_ext
  
    # OK, works on sane cases.  Now check whether nonexistent headers
    # can be detected and how.
--- 3460,3466 ----
    # Broken: fails on valid input.
  continue
  fi
! rm -f conftest.err conftest.i conftest.$ac_ext
  
    # OK, works on sane cases.  Now check whether nonexistent headers
    # can be detected and how.
***************
*** 3445,3455 ****
  ac_preproc_ok=:
  break
  fi
! rm -f conftest.err conftest.$ac_ext
  
  done
  # Because of `break', _AC_PREPROC_IFELSE's cleaning code was skipped.
! rm -f conftest.err conftest.$ac_ext
  if $ac_preproc_ok; then :
    break
  fi
--- 3476,3486 ----
  ac_preproc_ok=:
  break
  fi
! rm -f conftest.err conftest.i conftest.$ac_ext
  
  done
  # Because of `break', _AC_PREPROC_IFELSE's cleaning code was skipped.
! rm -f conftest.i conftest.err conftest.$ac_ext
  if $ac_preproc_ok; then :
    break
  fi
***************
*** 3488,3494 ****
    # Broken: fails on valid input.
  continue
  fi
! rm -f conftest.err conftest.$ac_ext
  
    # OK, works on sane cases.  Now check whether nonexistent headers
    # can be detected and how.
--- 3519,3525 ----
    # Broken: fails on valid input.
  continue
  fi
! rm -f conftest.err conftest.i conftest.$ac_ext
  
    # OK, works on sane cases.  Now check whether nonexistent headers
    # can be detected and how.
***************
*** 3504,3521 ****
  ac_preproc_ok=:
  break
  fi
! rm -f conftest.err conftest.$ac_ext
  
  done
  # Because of `break', _AC_PREPROC_IFELSE's cleaning code was skipped.
! rm -f conftest.err conftest.$ac_ext
  if $ac_preproc_ok; then :
  
  else
    { { $as_echo "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5
  $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; }
  fi
  
  ac_ext=c
--- 3535,3552 ----
  ac_preproc_ok=:
  break
  fi
! rm -f conftest.err conftest.i conftest.$ac_ext
  
  done
  # Because of `break', _AC_PREPROC_IFELSE's cleaning code was skipped.
! rm -f conftest.i conftest.err conftest.$ac_ext
  if $ac_preproc_ok; then :
  
  else
    { { $as_echo "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5
  $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; }
  fi
  
  ac_ext=c
***************
*** 3527,3533 ****
  
  { $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
--- 3558,3564 ----
  
  { $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
***************
*** 3541,3547 ****
      for ac_prog in grep ggrep; do
      for ac_exec_ext in '' $ac_executable_extensions; do
        ac_path_GREP="$as_dir/$ac_prog$ac_exec_ext"
!       { test -f "$ac_path_GREP" && $as_test_x "$ac_path_GREP"; } || continue
  # Check for GNU ac_path_GREP and select it if it is found.
    # Check for GNU $ac_path_GREP
  case `"$ac_path_GREP" --version 2>&1` in
--- 3572,3578 ----
      for ac_prog in grep ggrep; do
      for ac_exec_ext in '' $ac_executable_extensions; do
        ac_path_GREP="$as_dir/$ac_prog$ac_exec_ext"
!       as_fn_executable_p "$ac_path_GREP" || continue
  # Check for GNU ac_path_GREP and select it if it is found.
    # Check for GNU $ac_path_GREP
  case `"$ac_path_GREP" --version 2>&1` in
***************
*** 3576,3582 ****
    done
  IFS=$as_save_IFS
    if test -z "$ac_cv_path_GREP"; then
!     as_fn_error "no acceptable grep could be found in $PATH$PATH_SEPARATOR/usr/xpg4/bin" "$LINENO" 5
    fi
  else
    ac_cv_path_GREP=$GREP
--- 3607,3613 ----
    done
  IFS=$as_save_IFS
    if test -z "$ac_cv_path_GREP"; then
!     as_fn_error $? "no acceptable grep could be found in $PATH$PATH_SEPARATOR/usr/xpg4/bin" "$LINENO" 5
    fi
  else
    ac_cv_path_GREP=$GREP
***************
*** 3590,3596 ****
  
  { $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
--- 3621,3627 ----
  
  { $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
***************
*** 3607,3613 ****
      for ac_prog in egrep; do
      for ac_exec_ext in '' $ac_executable_extensions; do
        ac_path_EGREP="$as_dir/$ac_prog$ac_exec_ext"
!       { test -f "$ac_path_EGREP" && $as_test_x "$ac_path_EGREP"; } || continue
  # Check for GNU ac_path_EGREP and select it if it is found.
    # Check for GNU $ac_path_EGREP
  case `"$ac_path_EGREP" --version 2>&1` in
--- 3638,3644 ----
      for ac_prog in egrep; do
      for ac_exec_ext in '' $ac_executable_extensions; do
        ac_path_EGREP="$as_dir/$ac_prog$ac_exec_ext"
!       as_fn_executable_p "$ac_path_EGREP" || continue
  # Check for GNU ac_path_EGREP and select it if it is found.
    # Check for GNU $ac_path_EGREP
  case `"$ac_path_EGREP" --version 2>&1` in
***************
*** 3642,3648 ****
    done
  IFS=$as_save_IFS
    if test -z "$ac_cv_path_EGREP"; then
!     as_fn_error "no acceptable egrep could be found in $PATH$PATH_SEPARATOR/usr/xpg4/bin" "$LINENO" 5
    fi
  else
    ac_cv_path_EGREP=$EGREP
--- 3673,3679 ----
    done
  IFS=$as_save_IFS
    if test -z "$ac_cv_path_EGREP"; then
!     as_fn_error $? "no acceptable egrep could be found in $PATH$PATH_SEPARATOR/usr/xpg4/bin" "$LINENO" 5
    fi
  else
    ac_cv_path_EGREP=$EGREP
***************
*** 3666,3672 ****
  rm -f conftest*
   { $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
--- 3697,3703 ----
  rm -f conftest*
   { $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
***************
*** 3700,3710 ****
  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
--- 3731,3741 ----
  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
***************
*** 3725,3731 ****
  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_AWK+set}" = set; then :
    $as_echo_n "(cached) " >&6
  else
    if test -n "$AWK"; then
--- 3756,3762 ----
  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_AWK+:} false; then :
    $as_echo_n "(cached) " >&6
  else
    if test -n "$AWK"; then
***************
*** 3737,3743 ****
    IFS=$as_save_IFS
    test -z "$as_dir" && as_dir=.
      for ac_exec_ext in '' $ac_executable_extensions; do
!   if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
      ac_cv_prog_AWK="$ac_prog"
      $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
      break 2
--- 3768,3774 ----
    IFS=$as_save_IFS
    test -z "$as_dir" && as_dir=.
      for ac_exec_ext in '' $ac_executable_extensions; do
!   if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
      ac_cv_prog_AWK="$ac_prog"
      $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
      break 2
***************
*** 3765,3771 ****
  set dummy strip; 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_STRIP+set}" = set; then :
    $as_echo_n "(cached) " >&6
  else
    if test -n "$STRIP"; then
--- 3796,3802 ----
  set dummy strip; 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_STRIP+:} false; then :
    $as_echo_n "(cached) " >&6
  else
    if test -n "$STRIP"; then
***************
*** 3777,3783 ****
    IFS=$as_save_IFS
    test -z "$as_dir" && as_dir=.
      for ac_exec_ext in '' $ac_executable_extensions; do
!   if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
      ac_cv_prog_STRIP="strip"
      $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
      break 2
--- 3808,3814 ----
    IFS=$as_save_IFS
    test -z "$as_dir" && as_dir=.
      for ac_exec_ext in '' $ac_executable_extensions; do
!   if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
      ac_cv_prog_STRIP="strip"
      $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
      break 2
***************
*** 3804,3810 ****
  
  { $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
--- 3835,3841 ----
  
  { $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
***************
*** 3916,3922 ****
  
  { $as_echo "$as_me:${as_lineno-$LINENO}: checking for sys/wait.h that is POSIX.1 compatible" >&5
  $as_echo_n "checking for sys/wait.h that is POSIX.1 compatible... " >&6; }
! if test "${ac_cv_header_sys_wait_h+set}" = set; then :
    $as_echo_n "(cached) " >&6
  else
    cat confdefs.h - <<_ACEOF >conftest.$ac_ext
--- 3947,3953 ----
  
  { $as_echo "$as_me:${as_lineno-$LINENO}: checking for sys/wait.h that is POSIX.1 compatible" >&5
  $as_echo_n "checking for sys/wait.h that is POSIX.1 compatible... " >&6; }
! if ${ac_cv_header_sys_wait_h+:} false; then :
    $as_echo_n "(cached) " >&6
  else
    cat confdefs.h - <<_ACEOF >conftest.$ac_ext
***************
*** 4107,4113 ****
  set dummy xcode-select; 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_path_XCODE_SELECT+set}" = set; then :
    $as_echo_n "(cached) " >&6
  else
    case $XCODE_SELECT in
--- 4138,4144 ----
  set dummy xcode-select; 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_path_XCODE_SELECT+:} false; then :
    $as_echo_n "(cached) " >&6
  else
    case $XCODE_SELECT in
***************
*** 4121,4127 ****
    IFS=$as_save_IFS
    test -z "$as_dir" && as_dir=.
      for ac_exec_ext in '' $ac_executable_extensions; do
!   if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
      ac_cv_path_XCODE_SELECT="$as_dir/$ac_word$ac_exec_ext"
      $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
      break 2
--- 4152,4158 ----
    IFS=$as_save_IFS
    test -z "$as_dir" && as_dir=.
      for ac_exec_ext in '' $ac_executable_extensions; do
!   if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
      ac_cv_path_XCODE_SELECT="$as_dir/$ac_word$ac_exec_ext"
      $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
      break 2
***************
*** 4230,4237 ****
    as_ac_Header=`$as_echo "ac_cv_header_$ac_header" | $as_tr_sh`
  ac_fn_c_check_header_compile "$LINENO" "$ac_header" "$as_ac_Header" "$ac_includes_default
  "
! eval as_val=\$$as_ac_Header
!    if test "x$as_val" = x""yes; then :
    cat >>confdefs.h <<_ACEOF
  #define `$as_echo "HAVE_$ac_header" | $as_tr_cpp` 1
  _ACEOF
--- 4261,4267 ----
    as_ac_Header=`$as_echo "ac_cv_header_$ac_header" | $as_tr_sh`
  ac_fn_c_check_header_compile "$LINENO" "$ac_header" "$as_ac_Header" "$ac_includes_default
  "
! if eval test \"x\$"$as_ac_Header"\" = x"yes"; then :
    cat >>confdefs.h <<_ACEOF
  #define `$as_echo "HAVE_$ac_header" | $as_tr_cpp` 1
  _ACEOF
***************
*** 4242,4248 ****
  
  
  ac_fn_c_check_header_mongrel "$LINENO" "Carbon/Carbon.h" "ac_cv_header_Carbon_Carbon_h" "$ac_includes_default"
! if test "x$ac_cv_header_Carbon_Carbon_h" = x""yes; then :
    CARBON=yes
  fi
  
--- 4272,4278 ----
  
  
  ac_fn_c_check_header_mongrel "$LINENO" "Carbon/Carbon.h" "ac_cv_header_Carbon_Carbon_h" "$ac_includes_default"
! if test "x$ac_cv_header_Carbon_Carbon_h" = xyes; then :
    CARBON=yes
  fi
  
***************
*** 4266,4272 ****
  for ac_header in AvailabilityMacros.h
  do :
    ac_fn_c_check_header_mongrel "$LINENO" "AvailabilityMacros.h" "ac_cv_header_AvailabilityMacros_h" "$ac_includes_default"
! if test "x$ac_cv_header_AvailabilityMacros_h" = x""yes; then :
    cat >>confdefs.h <<_ACEOF
  #define HAVE_AVAILABILITYMACROS_H 1
  _ACEOF
--- 4296,4302 ----
  for ac_header in AvailabilityMacros.h
  do :
    ac_fn_c_check_header_mongrel "$LINENO" "AvailabilityMacros.h" "ac_cv_header_AvailabilityMacros_h" "$ac_includes_default"
! if test "x$ac_cv_header_AvailabilityMacros_h" = xyes; then :
    cat >>confdefs.h <<_ACEOF
  #define HAVE_AVAILABILITYMACROS_H 1
  _ACEOF
***************
*** 4296,4302 ****
        have_local_include=yes
        have_local_lib=yes
        ;;
!     *) as_fn_error "must pass path argument to --with-local-dir" "$LINENO" 5 ;;
      esac
  	{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $local_dir" >&5
  $as_echo "$local_dir" >&6; }
--- 4326,4332 ----
        have_local_include=yes
        have_local_lib=yes
        ;;
!     *) as_fn_error $? "must pass path argument to --with-local-dir" "$LINENO" 5 ;;
      esac
  	{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $local_dir" >&5
  $as_echo "$local_dir" >&6; }
***************
*** 4505,4511 ****
  $as_echo "no" >&6; }
    { $as_echo "$as_me:${as_lineno-$LINENO}: checking for is_selinux_enabled in -lselinux" >&5
  $as_echo_n "checking for is_selinux_enabled in -lselinux... " >&6; }
! if test "${ac_cv_lib_selinux_is_selinux_enabled+set}" = set; then :
    $as_echo_n "(cached) " >&6
  else
    ac_check_lib_save_LIBS=$LIBS
--- 4535,4541 ----
  $as_echo "no" >&6; }
    { $as_echo "$as_me:${as_lineno-$LINENO}: checking for is_selinux_enabled in -lselinux" >&5
  $as_echo_n "checking for is_selinux_enabled in -lselinux... " >&6; }
! if ${ac_cv_lib_selinux_is_selinux_enabled+:} false; then :
    $as_echo_n "(cached) " >&6
  else
    ac_check_lib_save_LIBS=$LIBS
***************
*** 4539,4545 ****
  fi
  { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_selinux_is_selinux_enabled" >&5
  $as_echo "$ac_cv_lib_selinux_is_selinux_enabled" >&6; }
! if test "x$ac_cv_lib_selinux_is_selinux_enabled" = x""yes; then :
    LIBS="$LIBS -lselinux"
  	   $as_echo "#define HAVE_SELINUX 1" >>confdefs.h
  
--- 4569,4575 ----
  fi
  { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_selinux_is_selinux_enabled" >&5
  $as_echo "$ac_cv_lib_selinux_is_selinux_enabled" >&6; }
! if test "x$ac_cv_lib_selinux_is_selinux_enabled" = xyes; then :
    LIBS="$LIBS -lselinux"
  	   $as_echo "#define HAVE_SELINUX 1" >>confdefs.h
  
***************
*** 4701,4707 ****
  set dummy luajit; 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_path_vi_cv_path_luajit+set}" = set; then :
    $as_echo_n "(cached) " >&6
  else
    case $vi_cv_path_luajit in
--- 4731,4737 ----
  set dummy luajit; 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_path_vi_cv_path_luajit+:} false; then :
    $as_echo_n "(cached) " >&6
  else
    case $vi_cv_path_luajit in
***************
*** 4715,4721 ****
    IFS=$as_save_IFS
    test -z "$as_dir" && as_dir=.
      for ac_exec_ext in '' $ac_executable_extensions; do
!   if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
      ac_cv_path_vi_cv_path_luajit="$as_dir/$ac_word$ac_exec_ext"
      $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
      break 2
--- 4745,4751 ----
    IFS=$as_save_IFS
    test -z "$as_dir" && as_dir=.
      for ac_exec_ext in '' $ac_executable_extensions; do
!   if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
      ac_cv_path_vi_cv_path_luajit="$as_dir/$ac_word$ac_exec_ext"
      $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
      break 2
***************
*** 4740,4746 ****
        if test "X$vi_cv_path_luajit" != "X"; then
  		{ $as_echo "$as_me:${as_lineno-$LINENO}: checking LuaJIT version" >&5
  $as_echo_n "checking LuaJIT version... " >&6; }
! if test "${vi_cv_version_luajit+set}" = set; then :
    $as_echo_n "(cached) " >&6
  else
     vi_cv_version_luajit=`${vi_cv_path_luajit} -v 2>&1 | sed 's/LuaJIT \([0-9.]*\)\.[0-9]\(-[a-z0-9]*\)* .*/\1/'`
--- 4770,4776 ----
        if test "X$vi_cv_path_luajit" != "X"; then
  		{ $as_echo "$as_me:${as_lineno-$LINENO}: checking LuaJIT version" >&5
  $as_echo_n "checking LuaJIT version... " >&6; }
! if ${vi_cv_version_luajit+:} false; then :
    $as_echo_n "(cached) " >&6
  else
     vi_cv_version_luajit=`${vi_cv_path_luajit} -v 2>&1 | sed 's/LuaJIT \([0-9.]*\)\.[0-9]\(-[a-z0-9]*\)* .*/\1/'`
***************
*** 4749,4755 ****
  $as_echo "$vi_cv_version_luajit" >&6; }
  	{ $as_echo "$as_me:${as_lineno-$LINENO}: checking Lua version of LuaJIT" >&5
  $as_echo_n "checking Lua version of LuaJIT... " >&6; }
! if test "${vi_cv_version_lua_luajit+set}" = set; then :
    $as_echo_n "(cached) " >&6
  else
     vi_cv_version_lua_luajit=`${vi_cv_path_luajit} -e "print(_VERSION)" | sed 's/.* //'`
--- 4779,4785 ----
  $as_echo "$vi_cv_version_luajit" >&6; }
  	{ $as_echo "$as_me:${as_lineno-$LINENO}: checking Lua version of LuaJIT" >&5
  $as_echo_n "checking Lua version of LuaJIT... " >&6; }
! if ${vi_cv_version_lua_luajit+:} false; then :
    $as_echo_n "(cached) " >&6
  else
     vi_cv_version_lua_luajit=`${vi_cv_path_luajit} -e "print(_VERSION)" | sed 's/.* //'`
***************
*** 4764,4770 ****
  set dummy lua; 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_path_vi_cv_path_plain_lua+set}" = set; then :
    $as_echo_n "(cached) " >&6
  else
    case $vi_cv_path_plain_lua in
--- 4794,4800 ----
  set dummy lua; 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_path_vi_cv_path_plain_lua+:} false; then :
    $as_echo_n "(cached) " >&6
  else
    case $vi_cv_path_plain_lua in
***************
*** 4778,4784 ****
    IFS=$as_save_IFS
    test -z "$as_dir" && as_dir=.
      for ac_exec_ext in '' $ac_executable_extensions; do
!   if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
      ac_cv_path_vi_cv_path_plain_lua="$as_dir/$ac_word$ac_exec_ext"
      $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
      break 2
--- 4808,4814 ----
    IFS=$as_save_IFS
    test -z "$as_dir" && as_dir=.
      for ac_exec_ext in '' $ac_executable_extensions; do
!   if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
      ac_cv_path_vi_cv_path_plain_lua="$as_dir/$ac_word$ac_exec_ext"
      $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
      break 2
***************
*** 4803,4809 ****
        if test "X$vi_cv_path_plain_lua" != "X"; then
  		{ $as_echo "$as_me:${as_lineno-$LINENO}: checking Lua version" >&5
  $as_echo_n "checking Lua version... " >&6; }
! if test "${vi_cv_version_plain_lua+set}" = set; then :
    $as_echo_n "(cached) " >&6
  else
     vi_cv_version_plain_lua=`${vi_cv_path_plain_lua} -e "print(_VERSION)" | sed 's/.* //'`
--- 4833,4839 ----
        if test "X$vi_cv_path_plain_lua" != "X"; then
  		{ $as_echo "$as_me:${as_lineno-$LINENO}: checking Lua version" >&5
  $as_echo_n "checking Lua version... " >&6; }
! if ${vi_cv_version_plain_lua+:} false; then :
    $as_echo_n "(cached) " >&6
  else
     vi_cv_version_plain_lua=`${vi_cv_path_plain_lua} -e "print(_VERSION)" | sed 's/.* //'`
***************
*** 4963,4969 ****
      fi
    fi
    if test "$fail_if_missing" = "yes" -a "$lua_ok" != "yes"; then
!     as_fn_error "could not configure lua" "$LINENO" 5
    fi
  
  
--- 4993,4999 ----
      fi
    fi
    if test "$fail_if_missing" = "yes" -a "$lua_ok" != "yes"; then
!     as_fn_error $? "could not configure lua" "$LINENO" 5
    fi
  
  
***************
*** 5017,5023 ****
  set dummy mzscheme; 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_path_vi_cv_path_mzscheme+set}" = set; then :
    $as_echo_n "(cached) " >&6
  else
    case $vi_cv_path_mzscheme in
--- 5047,5053 ----
  set dummy mzscheme; 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_path_vi_cv_path_mzscheme+:} false; then :
    $as_echo_n "(cached) " >&6
  else
    case $vi_cv_path_mzscheme in
***************
*** 5031,5037 ****
    IFS=$as_save_IFS
    test -z "$as_dir" && as_dir=.
      for ac_exec_ext in '' $ac_executable_extensions; do
!   if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
      ac_cv_path_vi_cv_path_mzscheme="$as_dir/$ac_word$ac_exec_ext"
      $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
      break 2
--- 5061,5067 ----
    IFS=$as_save_IFS
    test -z "$as_dir" && as_dir=.
      for ac_exec_ext in '' $ac_executable_extensions; do
!   if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
      ac_cv_path_vi_cv_path_mzscheme="$as_dir/$ac_word$ac_exec_ext"
      $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
      break 2
***************
*** 5064,5070 ****
  	if test "X$vi_cv_path_mzscheme" != "X"; then
  	    	    { $as_echo "$as_me:${as_lineno-$LINENO}: checking MzScheme install prefix" >&5
  $as_echo_n "checking MzScheme install prefix... " >&6; }
! if test "${vi_cv_path_mzscheme_pfx+set}" = set; then :
    $as_echo_n "(cached) " >&6
  else
    	    	    echo "(display (simplify-path		\
--- 5094,5100 ----
  	if test "X$vi_cv_path_mzscheme" != "X"; then
  	    	    { $as_echo "$as_me:${as_lineno-$LINENO}: checking MzScheme install prefix" >&5
  $as_echo_n "checking MzScheme install prefix... " >&6; }
! if ${vi_cv_path_mzscheme_pfx+:} false; then :
    $as_echo_n "(cached) " >&6
  else
    	    	    echo "(display (simplify-path		\
***************
*** 5226,5232 ****
  
          { $as_echo "$as_me:${as_lineno-$LINENO}: checking for ffi_type_void in -lffi" >&5
  $as_echo_n "checking for ffi_type_void in -lffi... " >&6; }
! if test "${ac_cv_lib_ffi_ffi_type_void+set}" = set; then :
    $as_echo_n "(cached) " >&6
  else
    ac_check_lib_save_LIBS=$LIBS
--- 5256,5262 ----
  
          { $as_echo "$as_me:${as_lineno-$LINENO}: checking for ffi_type_void in -lffi" >&5
  $as_echo_n "checking for ffi_type_void in -lffi... " >&6; }
! if ${ac_cv_lib_ffi_ffi_type_void+:} false; then :
    $as_echo_n "(cached) " >&6
  else
    ac_check_lib_save_LIBS=$LIBS
***************
*** 5260,5266 ****
  fi
  { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_ffi_ffi_type_void" >&5
  $as_echo "$ac_cv_lib_ffi_ffi_type_void" >&6; }
! if test "x$ac_cv_lib_ffi_ffi_type_void" = x""yes; then :
    MZSCHEME_LIBS="$MZSCHEME_LIBS -lffi"
  fi
  
--- 5290,5296 ----
  fi
  { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_ffi_ffi_type_void" >&5
  $as_echo "$ac_cv_lib_ffi_ffi_type_void" >&6; }
! if test "x$ac_cv_lib_ffi_ffi_type_void" = xyes; then :
    MZSCHEME_LIBS="$MZSCHEME_LIBS -lffi"
  fi
  
***************
*** 5336,5342 ****
  set dummy perl; 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_path_vi_cv_path_perl+set}" = set; then :
    $as_echo_n "(cached) " >&6
  else
    case $vi_cv_path_perl in
--- 5366,5372 ----
  set dummy perl; 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_path_vi_cv_path_perl+:} false; then :
    $as_echo_n "(cached) " >&6
  else
    case $vi_cv_path_perl in
***************
*** 5350,5356 ****
    IFS=$as_save_IFS
    test -z "$as_dir" && as_dir=.
      for ac_exec_ext in '' $ac_executable_extensions; do
!   if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
      ac_cv_path_vi_cv_path_perl="$as_dir/$ac_word$ac_exec_ext"
      $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
      break 2
--- 5380,5386 ----
    IFS=$as_save_IFS
    test -z "$as_dir" && as_dir=.
      for ac_exec_ext in '' $ac_executable_extensions; do
!   if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
      ac_cv_path_vi_cv_path_perl="$as_dir/$ac_word$ac_exec_ext"
      $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
      break 2
***************
*** 5498,5504 ****
    fi
  
    if test "$fail_if_missing" = "yes" -a "$perl_ok" != "yes"; then
!     as_fn_error "could not configure perl" "$LINENO" 5
    fi
  fi
  
--- 5528,5534 ----
    fi
  
    if test "$fail_if_missing" = "yes" -a "$perl_ok" != "yes"; then
!     as_fn_error $? "could not configure perl" "$LINENO" 5
    fi
  fi
  
***************
*** 5526,5532 ****
  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_path_vi_cv_path_python+set}" = set; then :
    $as_echo_n "(cached) " >&6
  else
    case $vi_cv_path_python in
--- 5556,5562 ----
  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_path_vi_cv_path_python+:} false; then :
    $as_echo_n "(cached) " >&6
  else
    case $vi_cv_path_python in
***************
*** 5540,5546 ****
    IFS=$as_save_IFS
    test -z "$as_dir" && as_dir=.
      for ac_exec_ext in '' $ac_executable_extensions; do
!   if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
      ac_cv_path_vi_cv_path_python="$as_dir/$ac_word$ac_exec_ext"
      $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
      break 2
--- 5570,5576 ----
    IFS=$as_save_IFS
    test -z "$as_dir" && as_dir=.
      for ac_exec_ext in '' $ac_executable_extensions; do
!   if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
      ac_cv_path_vi_cv_path_python="$as_dir/$ac_word$ac_exec_ext"
      $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
      break 2
***************
*** 5569,5575 ****
  
          { $as_echo "$as_me:${as_lineno-$LINENO}: checking Python version" >&5
  $as_echo_n "checking Python version... " >&6; }
! if test "${vi_cv_var_python_version+set}" = set; then :
    $as_echo_n "(cached) " >&6
  else
    vi_cv_var_python_version=`
--- 5599,5605 ----
  
          { $as_echo "$as_me:${as_lineno-$LINENO}: checking Python version" >&5
  $as_echo_n "checking Python version... " >&6; }
! if ${vi_cv_var_python_version+:} false; then :
    $as_echo_n "(cached) " >&6
  else
    vi_cv_var_python_version=`
***************
*** 5589,5595 ****
  
              { $as_echo "$as_me:${as_lineno-$LINENO}: checking Python's install prefix" >&5
  $as_echo_n "checking Python's install prefix... " >&6; }
! if test "${vi_cv_path_python_pfx+set}" = set; then :
    $as_echo_n "(cached) " >&6
  else
     vi_cv_path_python_pfx=`
--- 5619,5625 ----
  
              { $as_echo "$as_me:${as_lineno-$LINENO}: checking Python's install prefix" >&5
  $as_echo_n "checking Python's install prefix... " >&6; }
! if ${vi_cv_path_python_pfx+:} false; then :
    $as_echo_n "(cached) " >&6
  else
     vi_cv_path_python_pfx=`
***************
*** 5601,5607 ****
  
              { $as_echo "$as_me:${as_lineno-$LINENO}: checking Python's execution prefix" >&5
  $as_echo_n "checking Python's execution prefix... " >&6; }
! if test "${vi_cv_path_python_epfx+set}" = set; then :
    $as_echo_n "(cached) " >&6
  else
     vi_cv_path_python_epfx=`
--- 5631,5637 ----
  
              { $as_echo "$as_me:${as_lineno-$LINENO}: checking Python's execution prefix" >&5
  $as_echo_n "checking Python's execution prefix... " >&6; }
! if ${vi_cv_path_python_epfx+:} false; then :
    $as_echo_n "(cached) " >&6
  else
     vi_cv_path_python_epfx=`
***************
*** 5612,5618 ****
  $as_echo "$vi_cv_path_python_epfx" >&6; }
  
  
!       if test "${vi_cv_path_pythonpath+set}" = set; then :
    $as_echo_n "(cached) " >&6
  else
     vi_cv_path_pythonpath=`
--- 5642,5648 ----
  $as_echo "$vi_cv_path_python_epfx" >&6; }
  
  
!       if ${vi_cv_path_pythonpath+:} false; then :
    $as_echo_n "(cached) " >&6
  else
     vi_cv_path_pythonpath=`
***************
*** 5632,5638 ****
  
        { $as_echo "$as_me:${as_lineno-$LINENO}: checking Python's configuration directory" >&5
  $as_echo_n "checking Python's configuration directory... " >&6; }
! if test "${vi_cv_path_python_conf+set}" = set; then :
    $as_echo_n "(cached) " >&6
  else
  
--- 5662,5668 ----
  
        { $as_echo "$as_me:${as_lineno-$LINENO}: checking Python's configuration directory" >&5
  $as_echo_n "checking Python's configuration directory... " >&6; }
! if ${vi_cv_path_python_conf+:} false; then :
    $as_echo_n "(cached) " >&6
  else
  
***************
*** 5662,5668 ****
  $as_echo "can't find it!" >&6; }
        else
  
! 			if test "${vi_cv_path_python_plibs+set}" = set; then :
    $as_echo_n "(cached) " >&6
  else
  
--- 5692,5698 ----
  $as_echo "can't find it!" >&6; }
        else
  
! 			if ${vi_cv_path_python_plibs+:} false; then :
    $as_echo_n "(cached) " >&6
  else
  
***************
*** 5803,5809 ****
    fi
  
    if test "$fail_if_missing" = "yes" -a "$python_ok" != "yes"; then
!     as_fn_error "could not configure python" "$LINENO" 5
    fi
  fi
  
--- 5833,5839 ----
    fi
  
    if test "$fail_if_missing" = "yes" -a "$python_ok" != "yes"; then
!     as_fn_error $? "could not configure python" "$LINENO" 5
    fi
  fi
  
***************
*** 5833,5839 ****
  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_path_vi_cv_path_python3+set}" = set; then :
    $as_echo_n "(cached) " >&6
  else
    case $vi_cv_path_python3 in
--- 5863,5869 ----
  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_path_vi_cv_path_python3+:} false; then :
    $as_echo_n "(cached) " >&6
  else
    case $vi_cv_path_python3 in
***************
*** 5847,5853 ****
    IFS=$as_save_IFS
    test -z "$as_dir" && as_dir=.
      for ac_exec_ext in '' $ac_executable_extensions; do
!   if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
      ac_cv_path_vi_cv_path_python3="$as_dir/$ac_word$ac_exec_ext"
      $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
      break 2
--- 5877,5883 ----
    IFS=$as_save_IFS
    test -z "$as_dir" && as_dir=.
      for ac_exec_ext in '' $ac_executable_extensions; do
!   if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
      ac_cv_path_vi_cv_path_python3="$as_dir/$ac_word$ac_exec_ext"
      $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
      break 2
***************
*** 5876,5882 ****
  
          { $as_echo "$as_me:${as_lineno-$LINENO}: checking Python version" >&5
  $as_echo_n "checking Python version... " >&6; }
! if test "${vi_cv_var_python3_version+set}" = set; then :
    $as_echo_n "(cached) " >&6
  else
    vi_cv_var_python3_version=`
--- 5906,5912 ----
  
          { $as_echo "$as_me:${as_lineno-$LINENO}: checking Python version" >&5
  $as_echo_n "checking Python version... " >&6; }
! if ${vi_cv_var_python3_version+:} false; then :
    $as_echo_n "(cached) " >&6
  else
    vi_cv_var_python3_version=`
***************
*** 5896,5902 ****
  
              { $as_echo "$as_me:${as_lineno-$LINENO}: checking Python's abiflags" >&5
  $as_echo_n "checking Python's abiflags... " >&6; }
! if test "${vi_cv_var_python3_abiflags+set}" = set; then :
    $as_echo_n "(cached) " >&6
  else
  
--- 5926,5932 ----
  
              { $as_echo "$as_me:${as_lineno-$LINENO}: checking Python's abiflags" >&5
  $as_echo_n "checking Python's abiflags... " >&6; }
! if ${vi_cv_var_python3_abiflags+:} false; then :
    $as_echo_n "(cached) " >&6
  else
  
***************
*** 5913,5919 ****
  
              { $as_echo "$as_me:${as_lineno-$LINENO}: checking Python's install prefix" >&5
  $as_echo_n "checking Python's install prefix... " >&6; }
! if test "${vi_cv_path_python3_pfx+set}" = set; then :
    $as_echo_n "(cached) " >&6
  else
     vi_cv_path_python3_pfx=`
--- 5943,5949 ----
  
              { $as_echo "$as_me:${as_lineno-$LINENO}: checking Python's install prefix" >&5
  $as_echo_n "checking Python's install prefix... " >&6; }
! if ${vi_cv_path_python3_pfx+:} false; then :
    $as_echo_n "(cached) " >&6
  else
     vi_cv_path_python3_pfx=`
***************
*** 5925,5931 ****
  
              { $as_echo "$as_me:${as_lineno-$LINENO}: checking Python's execution prefix" >&5
  $as_echo_n "checking Python's execution prefix... " >&6; }
! if test "${vi_cv_path_python3_epfx+set}" = set; then :
    $as_echo_n "(cached) " >&6
  else
     vi_cv_path_python3_epfx=`
--- 5955,5961 ----
  
              { $as_echo "$as_me:${as_lineno-$LINENO}: checking Python's execution prefix" >&5
  $as_echo_n "checking Python's execution prefix... " >&6; }
! if ${vi_cv_path_python3_epfx+:} false; then :
    $as_echo_n "(cached) " >&6
  else
     vi_cv_path_python3_epfx=`
***************
*** 5936,5942 ****
  $as_echo "$vi_cv_path_python3_epfx" >&6; }
  
  
!       if test "${vi_cv_path_python3path+set}" = set; then :
    $as_echo_n "(cached) " >&6
  else
     vi_cv_path_python3path=`
--- 5966,5972 ----
  $as_echo "$vi_cv_path_python3_epfx" >&6; }
  
  
!       if ${vi_cv_path_python3path+:} false; then :
    $as_echo_n "(cached) " >&6
  else
     vi_cv_path_python3path=`
***************
*** 5956,5962 ****
  
        { $as_echo "$as_me:${as_lineno-$LINENO}: checking Python's configuration directory" >&5
  $as_echo_n "checking Python's configuration directory... " >&6; }
! if test "${vi_cv_path_python3_conf+set}" = set; then :
    $as_echo_n "(cached) " >&6
  else
  
--- 5986,5992 ----
  
        { $as_echo "$as_me:${as_lineno-$LINENO}: checking Python's configuration directory" >&5
  $as_echo_n "checking Python's configuration directory... " >&6; }
! if ${vi_cv_path_python3_conf+:} false; then :
    $as_echo_n "(cached) " >&6
  else
  
***************
*** 5987,5993 ****
  $as_echo "can't find it!" >&6; }
        else
  
!                         if test "${vi_cv_path_python3_plibs+set}" = set; then :
    $as_echo_n "(cached) " >&6
  else
  
--- 6017,6023 ----
  $as_echo "can't find it!" >&6; }
        else
  
!                         if ${vi_cv_path_python3_plibs+:} false; then :
    $as_echo_n "(cached) " >&6
  else
  
***************
*** 6114,6120 ****
      fi
    fi
    if test "$fail_if_missing" = "yes" -a "$python3_ok" != "yes"; then
!     as_fn_error "could not configure python3" "$LINENO" 5
    fi
  fi
  
--- 6144,6150 ----
      fi
    fi
    if test "$fail_if_missing" = "yes" -a "$python3_ok" != "yes"; then
!     as_fn_error $? "could not configure python3" "$LINENO" 5
    fi
  fi
  
***************
*** 6138,6145 ****
    if test "$cross_compiling" = yes; then :
    { { $as_echo "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5
  $as_echo "$as_me: error: in \`$ac_pwd':" >&2;}
! as_fn_error "cannot run test program while cross compiling
! See \`config.log' for more details." "$LINENO" 5; }
  else
    cat confdefs.h - <<_ACEOF >conftest.$ac_ext
  /* end confdefs.h.  */
--- 6168,6175 ----
    if test "$cross_compiling" = yes; then :
    { { $as_echo "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5
  $as_echo "$as_me: error: in \`$ac_pwd':" >&2;}
! as_fn_error $? "cannot run test program while cross compiling
! See \`config.log' for more details" "$LINENO" 5; }
  else
    cat confdefs.h - <<_ACEOF >conftest.$ac_ext
  /* end confdefs.h.  */
***************
*** 6203,6210 ****
    if test "$cross_compiling" = yes; then :
    { { $as_echo "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5
  $as_echo "$as_me: error: in \`$ac_pwd':" >&2;}
! as_fn_error "cannot run test program while cross compiling
! See \`config.log' for more details." "$LINENO" 5; }
  else
    cat confdefs.h - <<_ACEOF >conftest.$ac_ext
  /* end confdefs.h.  */
--- 6233,6240 ----
    if test "$cross_compiling" = yes; then :
    { { $as_echo "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5
  $as_echo "$as_me: error: in \`$ac_pwd':" >&2;}
! as_fn_error $? "cannot run test program while cross compiling
! See \`config.log' for more details" "$LINENO" 5; }
  else
    cat confdefs.h - <<_ACEOF >conftest.$ac_ext
  /* end confdefs.h.  */
***************
*** 6378,6384 ****
  set dummy $tclsh_name; 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_path_vi_cv_path_tcl+set}" = set; then :
    $as_echo_n "(cached) " >&6
  else
    case $vi_cv_path_tcl in
--- 6408,6414 ----
  set dummy $tclsh_name; 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_path_vi_cv_path_tcl+:} false; then :
    $as_echo_n "(cached) " >&6
  else
    case $vi_cv_path_tcl in
***************
*** 6392,6398 ****
    IFS=$as_save_IFS
    test -z "$as_dir" && as_dir=.
      for ac_exec_ext in '' $ac_executable_extensions; do
!   if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
      ac_cv_path_vi_cv_path_tcl="$as_dir/$ac_word$ac_exec_ext"
      $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
      break 2
--- 6422,6428 ----
    IFS=$as_save_IFS
    test -z "$as_dir" && as_dir=.
      for ac_exec_ext in '' $ac_executable_extensions; do
!   if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
      ac_cv_path_vi_cv_path_tcl="$as_dir/$ac_word$ac_exec_ext"
      $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
      break 2
***************
*** 6422,6428 ****
  set dummy $tclsh_name; 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_path_vi_cv_path_tcl+set}" = set; then :
    $as_echo_n "(cached) " >&6
  else
    case $vi_cv_path_tcl in
--- 6452,6458 ----
  set dummy $tclsh_name; 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_path_vi_cv_path_tcl+:} false; then :
    $as_echo_n "(cached) " >&6
  else
    case $vi_cv_path_tcl in
***************
*** 6436,6442 ****
    IFS=$as_save_IFS
    test -z "$as_dir" && as_dir=.
      for ac_exec_ext in '' $ac_executable_extensions; do
!   if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
      ac_cv_path_vi_cv_path_tcl="$as_dir/$ac_word$ac_exec_ext"
      $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
      break 2
--- 6466,6472 ----
    IFS=$as_save_IFS
    test -z "$as_dir" && as_dir=.
      for ac_exec_ext in '' $ac_executable_extensions; do
!   if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
      ac_cv_path_vi_cv_path_tcl="$as_dir/$ac_word$ac_exec_ext"
      $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
      break 2
***************
*** 6465,6471 ****
  set dummy $tclsh_name; 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_path_vi_cv_path_tcl+set}" = set; then :
    $as_echo_n "(cached) " >&6
  else
    case $vi_cv_path_tcl in
--- 6495,6501 ----
  set dummy $tclsh_name; 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_path_vi_cv_path_tcl+:} false; then :
    $as_echo_n "(cached) " >&6
  else
    case $vi_cv_path_tcl in
***************
*** 6479,6485 ****
    IFS=$as_save_IFS
    test -z "$as_dir" && as_dir=.
      for ac_exec_ext in '' $ac_executable_extensions; do
!   if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
      ac_cv_path_vi_cv_path_tcl="$as_dir/$ac_word$ac_exec_ext"
      $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
      break 2
--- 6509,6515 ----
    IFS=$as_save_IFS
    test -z "$as_dir" && as_dir=.
      for ac_exec_ext in '' $ac_executable_extensions; do
!   if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
      ac_cv_path_vi_cv_path_tcl="$as_dir/$ac_word$ac_exec_ext"
      $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
      break 2
***************
*** 6508,6514 ****
  set dummy $tclsh_name; 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_path_vi_cv_path_tcl+set}" = set; then :
    $as_echo_n "(cached) " >&6
  else
    case $vi_cv_path_tcl in
--- 6538,6544 ----
  set dummy $tclsh_name; 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_path_vi_cv_path_tcl+:} false; then :
    $as_echo_n "(cached) " >&6
  else
    case $vi_cv_path_tcl in
***************
*** 6522,6528 ****
    IFS=$as_save_IFS
    test -z "$as_dir" && as_dir=.
      for ac_exec_ext in '' $ac_executable_extensions; do
!   if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
      ac_cv_path_vi_cv_path_tcl="$as_dir/$ac_word$ac_exec_ext"
      $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
      break 2
--- 6552,6558 ----
    IFS=$as_save_IFS
    test -z "$as_dir" && as_dir=.
      for ac_exec_ext in '' $ac_executable_extensions; do
!   if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
      ac_cv_path_vi_cv_path_tcl="$as_dir/$ac_word$ac_exec_ext"
      $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
      break 2
***************
*** 6551,6557 ****
  set dummy $tclsh_name; 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_path_vi_cv_path_tcl+set}" = set; then :
    $as_echo_n "(cached) " >&6
  else
    case $vi_cv_path_tcl in
--- 6581,6587 ----
  set dummy $tclsh_name; 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_path_vi_cv_path_tcl+:} false; then :
    $as_echo_n "(cached) " >&6
  else
    case $vi_cv_path_tcl in
***************
*** 6565,6571 ****
    IFS=$as_save_IFS
    test -z "$as_dir" && as_dir=.
      for ac_exec_ext in '' $ac_executable_extensions; do
!   if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
      ac_cv_path_vi_cv_path_tcl="$as_dir/$ac_word$ac_exec_ext"
      $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
      break 2
--- 6595,6601 ----
    IFS=$as_save_IFS
    test -z "$as_dir" && as_dir=.
      for ac_exec_ext in '' $ac_executable_extensions; do
!   if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
      ac_cv_path_vi_cv_path_tcl="$as_dir/$ac_word$ac_exec_ext"
      $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
      break 2
***************
*** 6682,6688 ****
      fi
    fi
    if test "$fail_if_missing" = "yes" -a -z "$TCL_SRC"; then
!     as_fn_error "could not configure Tcl" "$LINENO" 5
    fi
  fi
  
--- 6712,6718 ----
      fi
    fi
    if test "$fail_if_missing" = "yes" -a -z "$TCL_SRC"; then
!     as_fn_error $? "could not configure Tcl" "$LINENO" 5
    fi
  fi
  
***************
*** 6720,6726 ****
  set dummy $RUBY_CMD; 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_path_vi_cv_path_ruby+set}" = set; then :
    $as_echo_n "(cached) " >&6
  else
    case $vi_cv_path_ruby in
--- 6750,6756 ----
  set dummy $RUBY_CMD; 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_path_vi_cv_path_ruby+:} false; then :
    $as_echo_n "(cached) " >&6
  else
    case $vi_cv_path_ruby in
***************
*** 6734,6740 ****
    IFS=$as_save_IFS
    test -z "$as_dir" && as_dir=.
      for ac_exec_ext in '' $ac_executable_extensions; do
!   if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
      ac_cv_path_vi_cv_path_ruby="$as_dir/$ac_word$ac_exec_ext"
      $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
      break 2
--- 6764,6770 ----
    IFS=$as_save_IFS
    test -z "$as_dir" && as_dir=.
      for ac_exec_ext in '' $ac_executable_extensions; do
!   if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
      ac_cv_path_vi_cv_path_ruby="$as_dir/$ac_word$ac_exec_ext"
      $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
      break 2
***************
*** 6836,6842 ****
    fi
  
    if test "$fail_if_missing" = "yes" -a -z "$RUBY_OBJ"; then
!     as_fn_error "could not configure Ruby" "$LINENO" 5
    fi
  fi
  
--- 6866,6872 ----
    fi
  
    if test "$fail_if_missing" = "yes" -a -z "$RUBY_OBJ"; then
!     as_fn_error $? "could not configure Ruby" "$LINENO" 5
    fi
  fi
  
***************
*** 6898,6904 ****
  $as_echo "no" >&6; }
      { $as_echo "$as_me:${as_lineno-$LINENO}: checking for socket in -lsocket" >&5
  $as_echo_n "checking for socket in -lsocket... " >&6; }
! if test "${ac_cv_lib_socket_socket+set}" = set; then :
    $as_echo_n "(cached) " >&6
  else
    ac_check_lib_save_LIBS=$LIBS
--- 6928,6934 ----
  $as_echo "no" >&6; }
      { $as_echo "$as_me:${as_lineno-$LINENO}: checking for socket in -lsocket" >&5
  $as_echo_n "checking for socket in -lsocket... " >&6; }
! if ${ac_cv_lib_socket_socket+:} false; then :
    $as_echo_n "(cached) " >&6
  else
    ac_check_lib_save_LIBS=$LIBS
***************
*** 6932,6938 ****
  fi
  { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_socket_socket" >&5
  $as_echo "$ac_cv_lib_socket_socket" >&6; }
! if test "x$ac_cv_lib_socket_socket" = x""yes; then :
    cat >>confdefs.h <<_ACEOF
  #define HAVE_LIBSOCKET 1
  _ACEOF
--- 6962,6968 ----
  fi
  { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_socket_socket" >&5
  $as_echo "$ac_cv_lib_socket_socket" >&6; }
! if test "x$ac_cv_lib_socket_socket" = xyes; then :
    cat >>confdefs.h <<_ACEOF
  #define HAVE_LIBSOCKET 1
  _ACEOF
***************
*** 6943,6949 ****
  
    { $as_echo "$as_me:${as_lineno-$LINENO}: checking for gethostbyname in -lnsl" >&5
  $as_echo_n "checking for gethostbyname in -lnsl... " >&6; }
! if test "${ac_cv_lib_nsl_gethostbyname+set}" = set; then :
    $as_echo_n "(cached) " >&6
  else
    ac_check_lib_save_LIBS=$LIBS
--- 6973,6979 ----
  
    { $as_echo "$as_me:${as_lineno-$LINENO}: checking for gethostbyname in -lnsl" >&5
  $as_echo_n "checking for gethostbyname in -lnsl... " >&6; }
! if ${ac_cv_lib_nsl_gethostbyname+:} false; then :
    $as_echo_n "(cached) " >&6
  else
    ac_check_lib_save_LIBS=$LIBS
***************
*** 6977,6983 ****
  fi
  { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_nsl_gethostbyname" >&5
  $as_echo "$ac_cv_lib_nsl_gethostbyname" >&6; }
! if test "x$ac_cv_lib_nsl_gethostbyname" = x""yes; then :
    cat >>confdefs.h <<_ACEOF
  #define HAVE_LIBNSL 1
  _ACEOF
--- 7007,7013 ----
  fi
  { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_nsl_gethostbyname" >&5
  $as_echo "$ac_cv_lib_nsl_gethostbyname" >&6; }
! if test "x$ac_cv_lib_nsl_gethostbyname" = xyes; then :
    cat >>confdefs.h <<_ACEOF
  #define HAVE_LIBNSL 1
  _ACEOF
***************
*** 7127,7133 ****
  set dummy xmkmf; 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_path_xmkmfpath+set}" = set; then :
    $as_echo_n "(cached) " >&6
  else
    case $xmkmfpath in
--- 7157,7163 ----
  set dummy xmkmf; 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_path_xmkmfpath+:} false; then :
    $as_echo_n "(cached) " >&6
  else
    case $xmkmfpath in
***************
*** 7141,7147 ****
    IFS=$as_save_IFS
    test -z "$as_dir" && as_dir=.
      for ac_exec_ext in '' $ac_executable_extensions; do
!   if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
      ac_cv_path_xmkmfpath="$as_dir/$ac_word$ac_exec_ext"
      $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
      break 2
--- 7171,7177 ----
    IFS=$as_save_IFS
    test -z "$as_dir" && as_dir=.
      for ac_exec_ext in '' $ac_executable_extensions; do
!   if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
      ac_cv_path_xmkmfpath="$as_dir/$ac_word$ac_exec_ext"
      $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
      break 2
***************
*** 7179,7186 ****
    have_x=disabled
  else
    case $x_includes,$x_libraries in #(
!     *\'*) as_fn_error "cannot use X directory names containing '" "$LINENO" 5;; #(
!     *,NONE | NONE,*) if test "${ac_cv_have_x+set}" = set; then :
    $as_echo_n "(cached) " >&6
  else
    # One or both of the vars are not set, and there is no cached value.
--- 7209,7216 ----
    have_x=disabled
  else
    case $x_includes,$x_libraries in #(
!     *\'*) as_fn_error $? "cannot use X directory names containing '" "$LINENO" 5;; #(
!     *,NONE | NONE,*) if ${ac_cv_have_x+:} false; then :
    $as_echo_n "(cached) " >&6
  else
    # One or both of the vars are not set, and there is no cached value.
***************
*** 7197,7203 ****
  	@echo libdir='${LIBDIR}'
  _ACEOF
    if (export CC; ${XMKMF-xmkmf}) >/dev/null 2>/dev/null && test -f Makefile; then
!     # GNU make sometimes prints "make[1]: Entering...", which would confuse us.
      for ac_var in incroot usrlibdir libdir; do
        eval "ac_im_$ac_var=\`\${MAKE-make} $ac_var 2>/dev/null | sed -n 's/^$ac_var=//p'\`"
      done
--- 7227,7233 ----
  	@echo libdir='${LIBDIR}'
  _ACEOF
    if (export CC; ${XMKMF-xmkmf}) >/dev/null 2>/dev/null && test -f Makefile; then
!     # GNU make sometimes prints "make[1]: Entering ...", which would confuse us.
      for ac_var in incroot usrlibdir libdir; do
        eval "ac_im_$ac_var=\`\${MAKE-make} $ac_var 2>/dev/null | sed -n 's/^$ac_var=//p'\`"
      done
***************
*** 7283,7289 ****
    fi
  done
  fi
! rm -f conftest.err conftest.$ac_ext
  fi # $ac_x_includes = no
  
  if test "$ac_x_libraries" = no; then
--- 7313,7319 ----
    fi
  done
  fi
! rm -f conftest.err conftest.i conftest.$ac_ext
  fi # $ac_x_includes = no
  
  if test "$ac_x_libraries" = no; then
***************
*** 7457,7463 ****
  else
    { $as_echo "$as_me:${as_lineno-$LINENO}: checking for dnet_ntoa in -ldnet" >&5
  $as_echo_n "checking for dnet_ntoa in -ldnet... " >&6; }
! if test "${ac_cv_lib_dnet_dnet_ntoa+set}" = set; then :
    $as_echo_n "(cached) " >&6
  else
    ac_check_lib_save_LIBS=$LIBS
--- 7487,7493 ----
  else
    { $as_echo "$as_me:${as_lineno-$LINENO}: checking for dnet_ntoa in -ldnet" >&5
  $as_echo_n "checking for dnet_ntoa in -ldnet... " >&6; }
! if ${ac_cv_lib_dnet_dnet_ntoa+:} false; then :
    $as_echo_n "(cached) " >&6
  else
    ac_check_lib_save_LIBS=$LIBS
***************
*** 7491,7504 ****
  fi
  { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_dnet_dnet_ntoa" >&5
  $as_echo "$ac_cv_lib_dnet_dnet_ntoa" >&6; }
! if test "x$ac_cv_lib_dnet_dnet_ntoa" = x""yes; then :
    X_EXTRA_LIBS="$X_EXTRA_LIBS -ldnet"
  fi
  
      if test $ac_cv_lib_dnet_dnet_ntoa = no; then
        { $as_echo "$as_me:${as_lineno-$LINENO}: checking for dnet_ntoa in -ldnet_stub" >&5
  $as_echo_n "checking for dnet_ntoa in -ldnet_stub... " >&6; }
! if test "${ac_cv_lib_dnet_stub_dnet_ntoa+set}" = set; then :
    $as_echo_n "(cached) " >&6
  else
    ac_check_lib_save_LIBS=$LIBS
--- 7521,7534 ----
  fi
  { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_dnet_dnet_ntoa" >&5
  $as_echo "$ac_cv_lib_dnet_dnet_ntoa" >&6; }
! if test "x$ac_cv_lib_dnet_dnet_ntoa" = xyes; then :
    X_EXTRA_LIBS="$X_EXTRA_LIBS -ldnet"
  fi
  
      if test $ac_cv_lib_dnet_dnet_ntoa = no; then
        { $as_echo "$as_me:${as_lineno-$LINENO}: checking for dnet_ntoa in -ldnet_stub" >&5
  $as_echo_n "checking for dnet_ntoa in -ldnet_stub... " >&6; }
! if ${ac_cv_lib_dnet_stub_dnet_ntoa+:} false; then :
    $as_echo_n "(cached) " >&6
  else
    ac_check_lib_save_LIBS=$LIBS
***************
*** 7532,7538 ****
  fi
  { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_dnet_stub_dnet_ntoa" >&5
  $as_echo "$ac_cv_lib_dnet_stub_dnet_ntoa" >&6; }
! if test "x$ac_cv_lib_dnet_stub_dnet_ntoa" = x""yes; then :
    X_EXTRA_LIBS="$X_EXTRA_LIBS -ldnet_stub"
  fi
  
--- 7562,7568 ----
  fi
  { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_dnet_stub_dnet_ntoa" >&5
  $as_echo "$ac_cv_lib_dnet_stub_dnet_ntoa" >&6; }
! if test "x$ac_cv_lib_dnet_stub_dnet_ntoa" = xyes; then :
    X_EXTRA_LIBS="$X_EXTRA_LIBS -ldnet_stub"
  fi
  
***************
*** 7551,7564 ****
      # The functions gethostbyname, getservbyname, and inet_addr are
      # in -lbsd on LynxOS 3.0.1/i386, according to Lars Hecking.
      ac_fn_c_check_func "$LINENO" "gethostbyname" "ac_cv_func_gethostbyname"
! if test "x$ac_cv_func_gethostbyname" = x""yes; then :
  
  fi
  
      if test $ac_cv_func_gethostbyname = no; then
        { $as_echo "$as_me:${as_lineno-$LINENO}: checking for gethostbyname in -lnsl" >&5
  $as_echo_n "checking for gethostbyname in -lnsl... " >&6; }
! if test "${ac_cv_lib_nsl_gethostbyname+set}" = set; then :
    $as_echo_n "(cached) " >&6
  else
    ac_check_lib_save_LIBS=$LIBS
--- 7581,7594 ----
      # The functions gethostbyname, getservbyname, and inet_addr are
      # in -lbsd on LynxOS 3.0.1/i386, according to Lars Hecking.
      ac_fn_c_check_func "$LINENO" "gethostbyname" "ac_cv_func_gethostbyname"
! if test "x$ac_cv_func_gethostbyname" = xyes; then :
  
  fi
  
      if test $ac_cv_func_gethostbyname = no; then
        { $as_echo "$as_me:${as_lineno-$LINENO}: checking for gethostbyname in -lnsl" >&5
  $as_echo_n "checking for gethostbyname in -lnsl... " >&6; }
! if ${ac_cv_lib_nsl_gethostbyname+:} false; then :
    $as_echo_n "(cached) " >&6
  else
    ac_check_lib_save_LIBS=$LIBS
***************
*** 7592,7605 ****
  fi
  { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_nsl_gethostbyname" >&5
  $as_echo "$ac_cv_lib_nsl_gethostbyname" >&6; }
! if test "x$ac_cv_lib_nsl_gethostbyname" = x""yes; then :
    X_EXTRA_LIBS="$X_EXTRA_LIBS -lnsl"
  fi
  
        if test $ac_cv_lib_nsl_gethostbyname = no; then
  	{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for gethostbyname in -lbsd" >&5
  $as_echo_n "checking for gethostbyname in -lbsd... " >&6; }
! if test "${ac_cv_lib_bsd_gethostbyname+set}" = set; then :
    $as_echo_n "(cached) " >&6
  else
    ac_check_lib_save_LIBS=$LIBS
--- 7622,7635 ----
  fi
  { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_nsl_gethostbyname" >&5
  $as_echo "$ac_cv_lib_nsl_gethostbyname" >&6; }
! if test "x$ac_cv_lib_nsl_gethostbyname" = xyes; then :
    X_EXTRA_LIBS="$X_EXTRA_LIBS -lnsl"
  fi
  
        if test $ac_cv_lib_nsl_gethostbyname = no; then
  	{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for gethostbyname in -lbsd" >&5
  $as_echo_n "checking for gethostbyname in -lbsd... " >&6; }
! if ${ac_cv_lib_bsd_gethostbyname+:} false; then :
    $as_echo_n "(cached) " >&6
  else
    ac_check_lib_save_LIBS=$LIBS
***************
*** 7633,7639 ****
  fi
  { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_bsd_gethostbyname" >&5
  $as_echo "$ac_cv_lib_bsd_gethostbyname" >&6; }
! if test "x$ac_cv_lib_bsd_gethostbyname" = x""yes; then :
    X_EXTRA_LIBS="$X_EXTRA_LIBS -lbsd"
  fi
  
--- 7663,7669 ----
  fi
  { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_bsd_gethostbyname" >&5
  $as_echo "$ac_cv_lib_bsd_gethostbyname" >&6; }
! if test "x$ac_cv_lib_bsd_gethostbyname" = xyes; then :
    X_EXTRA_LIBS="$X_EXTRA_LIBS -lbsd"
  fi
  
***************
*** 7648,7661 ****
      # must be given before -lnsl if both are needed.  We assume that
      # if connect needs -lnsl, so does gethostbyname.
      ac_fn_c_check_func "$LINENO" "connect" "ac_cv_func_connect"
! if test "x$ac_cv_func_connect" = x""yes; then :
  
  fi
  
      if test $ac_cv_func_connect = no; then
        { $as_echo "$as_me:${as_lineno-$LINENO}: checking for connect in -lsocket" >&5
  $as_echo_n "checking for connect in -lsocket... " >&6; }
! if test "${ac_cv_lib_socket_connect+set}" = set; then :
    $as_echo_n "(cached) " >&6
  else
    ac_check_lib_save_LIBS=$LIBS
--- 7678,7691 ----
      # must be given before -lnsl if both are needed.  We assume that
      # if connect needs -lnsl, so does gethostbyname.
      ac_fn_c_check_func "$LINENO" "connect" "ac_cv_func_connect"
! if test "x$ac_cv_func_connect" = xyes; then :
  
  fi
  
      if test $ac_cv_func_connect = no; then
        { $as_echo "$as_me:${as_lineno-$LINENO}: checking for connect in -lsocket" >&5
  $as_echo_n "checking for connect in -lsocket... " >&6; }
! if ${ac_cv_lib_socket_connect+:} false; then :
    $as_echo_n "(cached) " >&6
  else
    ac_check_lib_save_LIBS=$LIBS
***************
*** 7689,7695 ****
  fi
  { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_socket_connect" >&5
  $as_echo "$ac_cv_lib_socket_connect" >&6; }
! if test "x$ac_cv_lib_socket_connect" = x""yes; then :
    X_EXTRA_LIBS="-lsocket $X_EXTRA_LIBS"
  fi
  
--- 7719,7725 ----
  fi
  { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_socket_connect" >&5
  $as_echo "$ac_cv_lib_socket_connect" >&6; }
! if test "x$ac_cv_lib_socket_connect" = xyes; then :
    X_EXTRA_LIBS="-lsocket $X_EXTRA_LIBS"
  fi
  
***************
*** 7697,7710 ****
  
      # Guillermo Gomez says -lposix is necessary on A/UX.
      ac_fn_c_check_func "$LINENO" "remove" "ac_cv_func_remove"
! if test "x$ac_cv_func_remove" = x""yes; then :
  
  fi
  
      if test $ac_cv_func_remove = no; then
        { $as_echo "$as_me:${as_lineno-$LINENO}: checking for remove in -lposix" >&5
  $as_echo_n "checking for remove in -lposix... " >&6; }
! if test "${ac_cv_lib_posix_remove+set}" = set; then :
    $as_echo_n "(cached) " >&6
  else
    ac_check_lib_save_LIBS=$LIBS
--- 7727,7740 ----
  
      # Guillermo Gomez says -lposix is necessary on A/UX.
      ac_fn_c_check_func "$LINENO" "remove" "ac_cv_func_remove"
! if test "x$ac_cv_func_remove" = xyes; then :
  
  fi
  
      if test $ac_cv_func_remove = no; then
        { $as_echo "$as_me:${as_lineno-$LINENO}: checking for remove in -lposix" >&5
  $as_echo_n "checking for remove in -lposix... " >&6; }
! if ${ac_cv_lib_posix_remove+:} false; then :
    $as_echo_n "(cached) " >&6
  else
    ac_check_lib_save_LIBS=$LIBS
***************
*** 7738,7744 ****
  fi
  { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_posix_remove" >&5
  $as_echo "$ac_cv_lib_posix_remove" >&6; }
! if test "x$ac_cv_lib_posix_remove" = x""yes; then :
    X_EXTRA_LIBS="$X_EXTRA_LIBS -lposix"
  fi
  
--- 7768,7774 ----
  fi
  { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_posix_remove" >&5
  $as_echo "$ac_cv_lib_posix_remove" >&6; }
! if test "x$ac_cv_lib_posix_remove" = xyes; then :
    X_EXTRA_LIBS="$X_EXTRA_LIBS -lposix"
  fi
  
***************
*** 7746,7759 ****
  
      # BSDI BSD/OS 2.1 needs -lipc for XOpenDisplay.
      ac_fn_c_check_func "$LINENO" "shmat" "ac_cv_func_shmat"
! if test "x$ac_cv_func_shmat" = x""yes; then :
  
  fi
  
      if test $ac_cv_func_shmat = no; then
        { $as_echo "$as_me:${as_lineno-$LINENO}: checking for shmat in -lipc" >&5
  $as_echo_n "checking for shmat in -lipc... " >&6; }
! if test "${ac_cv_lib_ipc_shmat+set}" = set; then :
    $as_echo_n "(cached) " >&6
  else
    ac_check_lib_save_LIBS=$LIBS
--- 7776,7789 ----
  
      # BSDI BSD/OS 2.1 needs -lipc for XOpenDisplay.
      ac_fn_c_check_func "$LINENO" "shmat" "ac_cv_func_shmat"
! if test "x$ac_cv_func_shmat" = xyes; then :
  
  fi
  
      if test $ac_cv_func_shmat = no; then
        { $as_echo "$as_me:${as_lineno-$LINENO}: checking for shmat in -lipc" >&5
  $as_echo_n "checking for shmat in -lipc... " >&6; }
! if ${ac_cv_lib_ipc_shmat+:} false; then :
    $as_echo_n "(cached) " >&6
  else
    ac_check_lib_save_LIBS=$LIBS
***************
*** 7787,7793 ****
  fi
  { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_ipc_shmat" >&5
  $as_echo "$ac_cv_lib_ipc_shmat" >&6; }
! if test "x$ac_cv_lib_ipc_shmat" = x""yes; then :
    X_EXTRA_LIBS="$X_EXTRA_LIBS -lipc"
  fi
  
--- 7817,7823 ----
  fi
  { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_ipc_shmat" >&5
  $as_echo "$ac_cv_lib_ipc_shmat" >&6; }
! if test "x$ac_cv_lib_ipc_shmat" = xyes; then :
    X_EXTRA_LIBS="$X_EXTRA_LIBS -lipc"
  fi
  
***************
*** 7805,7811 ****
    # John Interrante, Karl Berry
    { $as_echo "$as_me:${as_lineno-$LINENO}: checking for IceConnectionNumber in -lICE" >&5
  $as_echo_n "checking for IceConnectionNumber in -lICE... " >&6; }
! if test "${ac_cv_lib_ICE_IceConnectionNumber+set}" = set; then :
    $as_echo_n "(cached) " >&6
  else
    ac_check_lib_save_LIBS=$LIBS
--- 7835,7841 ----
    # John Interrante, Karl Berry
    { $as_echo "$as_me:${as_lineno-$LINENO}: checking for IceConnectionNumber in -lICE" >&5
  $as_echo_n "checking for IceConnectionNumber in -lICE... " >&6; }
! if ${ac_cv_lib_ICE_IceConnectionNumber+:} false; then :
    $as_echo_n "(cached) " >&6
  else
    ac_check_lib_save_LIBS=$LIBS
***************
*** 7839,7845 ****
  fi
  { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_ICE_IceConnectionNumber" >&5
  $as_echo "$ac_cv_lib_ICE_IceConnectionNumber" >&6; }
! if test "x$ac_cv_lib_ICE_IceConnectionNumber" = x""yes; then :
    X_PRE_LIBS="$X_PRE_LIBS -lSM -lICE"
  fi
  
--- 7869,7875 ----
  fi
  { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_ICE_IceConnectionNumber" >&5
  $as_echo "$ac_cv_lib_ICE_IceConnectionNumber" >&6; }
! if test "x$ac_cv_lib_ICE_IceConnectionNumber" = xyes; then :
    X_PRE_LIBS="$X_PRE_LIBS -lSM -lICE"
  fi
  
***************
*** 7917,7923 ****
  
              { $as_echo "$as_me:${as_lineno-$LINENO}: checking for _XdmcpAuthDoIt in -lXdmcp" >&5
  $as_echo_n "checking for _XdmcpAuthDoIt in -lXdmcp... " >&6; }
! if test "${ac_cv_lib_Xdmcp__XdmcpAuthDoIt+set}" = set; then :
    $as_echo_n "(cached) " >&6
  else
    ac_check_lib_save_LIBS=$LIBS
--- 7947,7953 ----
  
              { $as_echo "$as_me:${as_lineno-$LINENO}: checking for _XdmcpAuthDoIt in -lXdmcp" >&5
  $as_echo_n "checking for _XdmcpAuthDoIt in -lXdmcp... " >&6; }
! if ${ac_cv_lib_Xdmcp__XdmcpAuthDoIt+:} false; then :
    $as_echo_n "(cached) " >&6
  else
    ac_check_lib_save_LIBS=$LIBS
***************
*** 7951,7964 ****
  fi
  { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_Xdmcp__XdmcpAuthDoIt" >&5
  $as_echo "$ac_cv_lib_Xdmcp__XdmcpAuthDoIt" >&6; }
! if test "x$ac_cv_lib_Xdmcp__XdmcpAuthDoIt" = x""yes; then :
    X_EXTRA_LIBS="$X_EXTRA_LIBS -lXdmcp"
  fi
  
  
                      { $as_echo "$as_me:${as_lineno-$LINENO}: checking for IceOpenConnection in -lICE" >&5
  $as_echo_n "checking for IceOpenConnection in -lICE... " >&6; }
! if test "${ac_cv_lib_ICE_IceOpenConnection+set}" = set; then :
    $as_echo_n "(cached) " >&6
  else
    ac_check_lib_save_LIBS=$LIBS
--- 7981,7994 ----
  fi
  { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_Xdmcp__XdmcpAuthDoIt" >&5
  $as_echo "$ac_cv_lib_Xdmcp__XdmcpAuthDoIt" >&6; }
! if test "x$ac_cv_lib_Xdmcp__XdmcpAuthDoIt" = xyes; then :
    X_EXTRA_LIBS="$X_EXTRA_LIBS -lXdmcp"
  fi
  
  
                      { $as_echo "$as_me:${as_lineno-$LINENO}: checking for IceOpenConnection in -lICE" >&5
  $as_echo_n "checking for IceOpenConnection in -lICE... " >&6; }
! if ${ac_cv_lib_ICE_IceOpenConnection+:} false; then :
    $as_echo_n "(cached) " >&6
  else
    ac_check_lib_save_LIBS=$LIBS
***************
*** 7992,7998 ****
  fi
  { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_ICE_IceOpenConnection" >&5
  $as_echo "$ac_cv_lib_ICE_IceOpenConnection" >&6; }
! if test "x$ac_cv_lib_ICE_IceOpenConnection" = x""yes; then :
    X_EXTRA_LIBS="$X_EXTRA_LIBS -lSM -lICE"
  fi
  
--- 8022,8028 ----
  fi
  { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_ICE_IceOpenConnection" >&5
  $as_echo "$ac_cv_lib_ICE_IceOpenConnection" >&6; }
! if test "x$ac_cv_lib_ICE_IceOpenConnection" = xyes; then :
    X_EXTRA_LIBS="$X_EXTRA_LIBS -lSM -lICE"
  fi
  
***************
*** 8000,8006 ****
          LDFLAGS="$X_LIBS $ac_save_LDFLAGS"
      { $as_echo "$as_me:${as_lineno-$LINENO}: checking for XpmCreatePixmapFromData in -lXpm" >&5
  $as_echo_n "checking for XpmCreatePixmapFromData in -lXpm... " >&6; }
! if test "${ac_cv_lib_Xpm_XpmCreatePixmapFromData+set}" = set; then :
    $as_echo_n "(cached) " >&6
  else
    ac_check_lib_save_LIBS=$LIBS
--- 8030,8036 ----
          LDFLAGS="$X_LIBS $ac_save_LDFLAGS"
      { $as_echo "$as_me:${as_lineno-$LINENO}: checking for XpmCreatePixmapFromData in -lXpm" >&5
  $as_echo_n "checking for XpmCreatePixmapFromData in -lXpm... " >&6; }
! if ${ac_cv_lib_Xpm_XpmCreatePixmapFromData+:} false; then :
    $as_echo_n "(cached) " >&6
  else
    ac_check_lib_save_LIBS=$LIBS
***************
*** 8034,8040 ****
  fi
  { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_Xpm_XpmCreatePixmapFromData" >&5
  $as_echo "$ac_cv_lib_Xpm_XpmCreatePixmapFromData" >&6; }
! if test "x$ac_cv_lib_Xpm_XpmCreatePixmapFromData" = x""yes; then :
    X_PRE_LIBS="$X_PRE_LIBS -lXpm"
  fi
  
--- 8064,8070 ----
  fi
  { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_Xpm_XpmCreatePixmapFromData" >&5
  $as_echo "$ac_cv_lib_Xpm_XpmCreatePixmapFromData" >&6; }
! if test "x$ac_cv_lib_Xpm_XpmCreatePixmapFromData" = xyes; then :
    X_PRE_LIBS="$X_PRE_LIBS -lXpm"
  fi
  
***************
*** 8092,8102 ****
  
      { $as_echo "$as_me:${as_lineno-$LINENO}: checking size of wchar_t is 2 bytes" >&5
  $as_echo_n "checking size of wchar_t is 2 bytes... " >&6; }
!     if test "${ac_cv_small_wchar_t+set}" = set; then :
    $as_echo_n "(cached) " >&6
  else
    if test "$cross_compiling" = yes; then :
!   as_fn_error "failed to compile test program" "$LINENO" 5
  else
    cat confdefs.h - <<_ACEOF >conftest.$ac_ext
  /* end confdefs.h.  */
--- 8122,8132 ----
  
      { $as_echo "$as_me:${as_lineno-$LINENO}: checking size of wchar_t is 2 bytes" >&5
  $as_echo_n "checking size of wchar_t is 2 bytes... " >&6; }
!     if ${ac_cv_small_wchar_t+:} false; then :
    $as_echo_n "(cached) " >&6
  else
    if test "$cross_compiling" = yes; then :
!   as_fn_error $? "failed to compile test program" "$LINENO" 5
  else
    cat confdefs.h - <<_ACEOF >conftest.$ac_ext
  /* end confdefs.h.  */
***************
*** 8395,8401 ****
  set dummy pkg-config; 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_path_PKG_CONFIG+set}" = set; then :
    $as_echo_n "(cached) " >&6
  else
    case $PKG_CONFIG in
--- 8425,8431 ----
  set dummy pkg-config; 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_path_PKG_CONFIG+:} false; then :
    $as_echo_n "(cached) " >&6
  else
    case $PKG_CONFIG in
***************
*** 8409,8415 ****
    IFS=$as_save_IFS
    test -z "$as_dir" && as_dir=.
      for ac_exec_ext in '' $ac_executable_extensions; do
!   if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
      ac_cv_path_PKG_CONFIG="$as_dir/$ac_word$ac_exec_ext"
      $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
      break 2
--- 8439,8445 ----
    IFS=$as_save_IFS
    test -z "$as_dir" && as_dir=.
      for ac_exec_ext in '' $ac_executable_extensions; do
!   if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
      ac_cv_path_PKG_CONFIG="$as_dir/$ac_word$ac_exec_ext"
      $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
      break 2
***************
*** 8634,8640 ****
        { $as_echo "$as_me:${as_lineno-$LINENO}: result: not found" >&5
  $as_echo "not found" >&6; }
        if test "x" = xfail; then
! 	as_fn_error "Could not find libgnomeui-2.0 via pkg-config" "$LINENO" 5
        fi
      fi
    }
--- 8664,8670 ----
        { $as_echo "$as_me:${as_lineno-$LINENO}: result: not found" >&5
  $as_echo "not found" >&6; }
        if test "x" = xfail; then
! 	as_fn_error $? "Could not find libgnomeui-2.0 via pkg-config" "$LINENO" 5
        fi
      fi
    }
***************
*** 8827,8833 ****
    LDFLAGS="$X_LIBS $LDFLAGS"
    { $as_echo "$as_me:${as_lineno-$LINENO}: checking for XShapeQueryExtension in -lXext" >&5
  $as_echo_n "checking for XShapeQueryExtension in -lXext... " >&6; }
! if test "${ac_cv_lib_Xext_XShapeQueryExtension+set}" = set; then :
    $as_echo_n "(cached) " >&6
  else
    ac_check_lib_save_LIBS=$LIBS
--- 8857,8863 ----
    LDFLAGS="$X_LIBS $LDFLAGS"
    { $as_echo "$as_me:${as_lineno-$LINENO}: checking for XShapeQueryExtension in -lXext" >&5
  $as_echo_n "checking for XShapeQueryExtension in -lXext... " >&6; }
! if ${ac_cv_lib_Xext_XShapeQueryExtension+:} false; then :
    $as_echo_n "(cached) " >&6
  else
    ac_check_lib_save_LIBS=$LIBS
***************
*** 8861,8873 ****
  fi
  { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_Xext_XShapeQueryExtension" >&5
  $as_echo "$ac_cv_lib_Xext_XShapeQueryExtension" >&6; }
! if test "x$ac_cv_lib_Xext_XShapeQueryExtension" = x""yes; then :
    GUI_X_LIBS="-lXext"
  fi
  
      { $as_echo "$as_me:${as_lineno-$LINENO}: checking for wslen in -lw" >&5
  $as_echo_n "checking for wslen in -lw... " >&6; }
! if test "${ac_cv_lib_w_wslen+set}" = set; then :
    $as_echo_n "(cached) " >&6
  else
    ac_check_lib_save_LIBS=$LIBS
--- 8891,8903 ----
  fi
  { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_Xext_XShapeQueryExtension" >&5
  $as_echo "$ac_cv_lib_Xext_XShapeQueryExtension" >&6; }
! if test "x$ac_cv_lib_Xext_XShapeQueryExtension" = xyes; then :
    GUI_X_LIBS="-lXext"
  fi
  
      { $as_echo "$as_me:${as_lineno-$LINENO}: checking for wslen in -lw" >&5
  $as_echo_n "checking for wslen in -lw... " >&6; }
! if ${ac_cv_lib_w_wslen+:} false; then :
    $as_echo_n "(cached) " >&6
  else
    ac_check_lib_save_LIBS=$LIBS
***************
*** 8901,8913 ****
  fi
  { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_w_wslen" >&5
  $as_echo "$ac_cv_lib_w_wslen" >&6; }
! if test "x$ac_cv_lib_w_wslen" = x""yes; then :
    X_EXTRA_LIBS="$X_EXTRA_LIBS -lw"
  fi
  
    { $as_echo "$as_me:${as_lineno-$LINENO}: checking for dlsym in -ldl" >&5
  $as_echo_n "checking for dlsym in -ldl... " >&6; }
! if test "${ac_cv_lib_dl_dlsym+set}" = set; then :
    $as_echo_n "(cached) " >&6
  else
    ac_check_lib_save_LIBS=$LIBS
--- 8931,8943 ----
  fi
  { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_w_wslen" >&5
  $as_echo "$ac_cv_lib_w_wslen" >&6; }
! if test "x$ac_cv_lib_w_wslen" = xyes; then :
    X_EXTRA_LIBS="$X_EXTRA_LIBS -lw"
  fi
  
    { $as_echo "$as_me:${as_lineno-$LINENO}: checking for dlsym in -ldl" >&5
  $as_echo_n "checking for dlsym in -ldl... " >&6; }
! if ${ac_cv_lib_dl_dlsym+:} false; then :
    $as_echo_n "(cached) " >&6
  else
    ac_check_lib_save_LIBS=$LIBS
***************
*** 8941,8953 ****
  fi
  { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_dl_dlsym" >&5
  $as_echo "$ac_cv_lib_dl_dlsym" >&6; }
! if test "x$ac_cv_lib_dl_dlsym" = x""yes; then :
    X_EXTRA_LIBS="$X_EXTRA_LIBS -ldl"
  fi
  
    { $as_echo "$as_me:${as_lineno-$LINENO}: checking for XmuCreateStippledPixmap in -lXmu" >&5
  $as_echo_n "checking for XmuCreateStippledPixmap in -lXmu... " >&6; }
! if test "${ac_cv_lib_Xmu_XmuCreateStippledPixmap+set}" = set; then :
    $as_echo_n "(cached) " >&6
  else
    ac_check_lib_save_LIBS=$LIBS
--- 8971,8983 ----
  fi
  { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_dl_dlsym" >&5
  $as_echo "$ac_cv_lib_dl_dlsym" >&6; }
! if test "x$ac_cv_lib_dl_dlsym" = xyes; then :
    X_EXTRA_LIBS="$X_EXTRA_LIBS -ldl"
  fi
  
    { $as_echo "$as_me:${as_lineno-$LINENO}: checking for XmuCreateStippledPixmap in -lXmu" >&5
  $as_echo_n "checking for XmuCreateStippledPixmap in -lXmu... " >&6; }
! if ${ac_cv_lib_Xmu_XmuCreateStippledPixmap+:} false; then :
    $as_echo_n "(cached) " >&6
  else
    ac_check_lib_save_LIBS=$LIBS
***************
*** 8981,8994 ****
  fi
  { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_Xmu_XmuCreateStippledPixmap" >&5
  $as_echo "$ac_cv_lib_Xmu_XmuCreateStippledPixmap" >&6; }
! if test "x$ac_cv_lib_Xmu_XmuCreateStippledPixmap" = x""yes; then :
    GUI_X_LIBS="-lXmu $GUI_X_LIBS"
  fi
  
    if test -z "$SKIP_MOTIF"; then
      { $as_echo "$as_me:${as_lineno-$LINENO}: checking for XpEndJob in -lXp" >&5
  $as_echo_n "checking for XpEndJob in -lXp... " >&6; }
! if test "${ac_cv_lib_Xp_XpEndJob+set}" = set; then :
    $as_echo_n "(cached) " >&6
  else
    ac_check_lib_save_LIBS=$LIBS
--- 9011,9024 ----
  fi
  { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_Xmu_XmuCreateStippledPixmap" >&5
  $as_echo "$ac_cv_lib_Xmu_XmuCreateStippledPixmap" >&6; }
! if test "x$ac_cv_lib_Xmu_XmuCreateStippledPixmap" = xyes; then :
    GUI_X_LIBS="-lXmu $GUI_X_LIBS"
  fi
  
    if test -z "$SKIP_MOTIF"; then
      { $as_echo "$as_me:${as_lineno-$LINENO}: checking for XpEndJob in -lXp" >&5
  $as_echo_n "checking for XpEndJob in -lXp... " >&6; }
! if ${ac_cv_lib_Xp_XpEndJob+:} false; then :
    $as_echo_n "(cached) " >&6
  else
    ac_check_lib_save_LIBS=$LIBS
***************
*** 9022,9028 ****
  fi
  { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_Xp_XpEndJob" >&5
  $as_echo "$ac_cv_lib_Xp_XpEndJob" >&6; }
! if test "x$ac_cv_lib_Xp_XpEndJob" = x""yes; then :
    GUI_X_LIBS="-lXp $GUI_X_LIBS"
  fi
  
--- 9052,9058 ----
  fi
  { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_Xp_XpEndJob" >&5
  $as_echo "$ac_cv_lib_Xp_XpEndJob" >&6; }
! if test "x$ac_cv_lib_Xp_XpEndJob" = xyes; then :
    GUI_X_LIBS="-lXp $GUI_X_LIBS"
  fi
  
***************
*** 9061,9067 ****
    for ac_header in X11/SM/SMlib.h
  do :
    ac_fn_c_check_header_mongrel "$LINENO" "X11/SM/SMlib.h" "ac_cv_header_X11_SM_SMlib_h" "$ac_includes_default"
! if test "x$ac_cv_header_X11_SM_SMlib_h" = x""yes; then :
    cat >>confdefs.h <<_ACEOF
  #define HAVE_X11_SM_SMLIB_H 1
  _ACEOF
--- 9091,9097 ----
    for ac_header in X11/SM/SMlib.h
  do :
    ac_fn_c_check_header_mongrel "$LINENO" "X11/SM/SMlib.h" "ac_cv_header_X11_SM_SMlib_h" "$ac_includes_default"
! if test "x$ac_cv_header_X11_SM_SMlib_h" = xyes; then :
    cat >>confdefs.h <<_ACEOF
  #define HAVE_X11_SM_SMLIB_H 1
  _ACEOF
***************
*** 9081,9088 ****
  do :
    as_ac_Header=`$as_echo "ac_cv_header_$ac_header" | $as_tr_sh`
  ac_fn_c_check_header_mongrel "$LINENO" "$ac_header" "$as_ac_Header" "$ac_includes_default"
! eval as_val=\$$as_ac_Header
!    if test "x$as_val" = x""yes; then :
    cat >>confdefs.h <<_ACEOF
  #define `$as_echo "HAVE_$ac_header" | $as_tr_cpp` 1
  _ACEOF
--- 9111,9117 ----
  do :
    as_ac_Header=`$as_echo "ac_cv_header_$ac_header" | $as_tr_sh`
  ac_fn_c_check_header_mongrel "$LINENO" "$ac_header" "$as_ac_Header" "$ac_includes_default"
! if eval test \"x\$"$as_ac_Header"\" = x"yes"; then :
    cat >>confdefs.h <<_ACEOF
  #define `$as_echo "HAVE_$ac_header" | $as_tr_cpp` 1
  _ACEOF
***************
*** 9164,9171 ****
  do :
    as_ac_Header=`$as_echo "ac_cv_header_$ac_header" | $as_tr_sh`
  ac_fn_c_check_header_mongrel "$LINENO" "$ac_header" "$as_ac_Header" "$ac_includes_default"
! eval as_val=\$$as_ac_Header
!    if test "x$as_val" = x""yes; then :
    cat >>confdefs.h <<_ACEOF
  #define `$as_echo "HAVE_$ac_header" | $as_tr_cpp` 1
  _ACEOF
--- 9193,9199 ----
  do :
    as_ac_Header=`$as_echo "ac_cv_header_$ac_header" | $as_tr_sh`
  ac_fn_c_check_header_mongrel "$LINENO" "$ac_header" "$as_ac_Header" "$ac_includes_default"
! if eval test \"x\$"$as_ac_Header"\" = x"yes"; then :
    cat >>confdefs.h <<_ACEOF
  #define `$as_echo "HAVE_$ac_header" | $as_tr_cpp` 1
  _ACEOF
***************
*** 9233,9239 ****
  
  
  if test "$enable_workshop" = "yes" -a -n "$SKIP_MOTIF"; then
!   as_fn_error "cannot use workshop without Motif" "$LINENO" 5
  fi
  
  if test "$enable_xim" = "yes"; then
--- 9261,9267 ----
  
  
  if test "$enable_workshop" = "yes" -a -n "$SKIP_MOTIF"; then
!   as_fn_error $? "cannot use workshop without Motif" "$LINENO" 5
  fi
  
  if test "$enable_xim" = "yes"; then
***************
*** 9287,9299 ****
  
  { $as_echo "$as_me:${as_lineno-$LINENO}: checking whether toupper is broken" >&5
  $as_echo_n "checking whether toupper is broken... " >&6; }
! if test "${vim_cv_toupper_broken+set}" = set; then :
    $as_echo_n "(cached) " >&6
  else
  
      if test "$cross_compiling" = yes; then :
  
!     as_fn_error "cross-compiling: please set 'vim_cv_toupper_broken'" "$LINENO" 5
  
  else
    cat confdefs.h - <<_ACEOF >conftest.$ac_ext
--- 9315,9327 ----
  
  { $as_echo "$as_me:${as_lineno-$LINENO}: checking whether toupper is broken" >&5
  $as_echo_n "checking whether toupper is broken... " >&6; }
! if ${vim_cv_toupper_broken+:} false; then :
    $as_echo_n "(cached) " >&6
  else
  
      if test "$cross_compiling" = yes; then :
  
!     as_fn_error $? "cross-compiling: please set 'vim_cv_toupper_broken'" "$LINENO" 5
  
  else
    cat confdefs.h - <<_ACEOF >conftest.$ac_ext
***************
*** 9377,9383 ****
  rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
  
  ac_fn_c_check_header_mongrel "$LINENO" "elf.h" "ac_cv_header_elf_h" "$ac_includes_default"
! if test "x$ac_cv_header_elf_h" = x""yes; then :
    HAS_ELF=1
  fi
  
--- 9405,9411 ----
  rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
  
  ac_fn_c_check_header_mongrel "$LINENO" "elf.h" "ac_cv_header_elf_h" "$ac_includes_default"
! if test "x$ac_cv_header_elf_h" = xyes; then :
    HAS_ELF=1
  fi
  
***************
*** 9385,9391 ****
  if test "$HAS_ELF" = 1; then
    { $as_echo "$as_me:${as_lineno-$LINENO}: checking for main in -lelf" >&5
  $as_echo_n "checking for main in -lelf... " >&6; }
! if test "${ac_cv_lib_elf_main+set}" = set; then :
    $as_echo_n "(cached) " >&6
  else
    ac_check_lib_save_LIBS=$LIBS
--- 9413,9419 ----
  if test "$HAS_ELF" = 1; then
    { $as_echo "$as_me:${as_lineno-$LINENO}: checking for main in -lelf" >&5
  $as_echo_n "checking for main in -lelf... " >&6; }
! if ${ac_cv_lib_elf_main+:} false; then :
    $as_echo_n "(cached) " >&6
  else
    ac_check_lib_save_LIBS=$LIBS
***************
*** 9413,9419 ****
  fi
  { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_elf_main" >&5
  $as_echo "$ac_cv_lib_elf_main" >&6; }
! if test "x$ac_cv_lib_elf_main" = x""yes; then :
    cat >>confdefs.h <<_ACEOF
  #define HAVE_LIBELF 1
  _ACEOF
--- 9441,9447 ----
  fi
  { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_elf_main" >&5
  $as_echo "$ac_cv_lib_elf_main" >&6; }
! if test "x$ac_cv_lib_elf_main" = xyes; then :
    cat >>confdefs.h <<_ACEOF
  #define HAVE_LIBELF 1
  _ACEOF
***************
*** 9429,9435 ****
    as_ac_Header=`$as_echo "ac_cv_header_dirent_$ac_hdr" | $as_tr_sh`
  { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_hdr that defines DIR" >&5
  $as_echo_n "checking for $ac_hdr that defines DIR... " >&6; }
! if { as_var=$as_ac_Header; eval "test \"\${$as_var+set}\" = set"; }; then :
    $as_echo_n "(cached) " >&6
  else
    cat confdefs.h - <<_ACEOF >conftest.$ac_ext
--- 9457,9463 ----
    as_ac_Header=`$as_echo "ac_cv_header_dirent_$ac_hdr" | $as_tr_sh`
  { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_hdr that defines DIR" >&5
  $as_echo_n "checking for $ac_hdr that defines DIR... " >&6; }
! if eval \${$as_ac_Header+:} false; then :
    $as_echo_n "(cached) " >&6
  else
    cat confdefs.h - <<_ACEOF >conftest.$ac_ext
***************
*** 9456,9463 ****
  eval ac_res=\$$as_ac_Header
  	       { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_res" >&5
  $as_echo "$ac_res" >&6; }
! eval as_val=\$$as_ac_Header
!    if test "x$as_val" = x""yes; then :
    cat >>confdefs.h <<_ACEOF
  #define `$as_echo "HAVE_$ac_hdr" | $as_tr_cpp` 1
  _ACEOF
--- 9484,9490 ----
  eval ac_res=\$$as_ac_Header
  	       { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_res" >&5
  $as_echo "$ac_res" >&6; }
! if eval test \"x\$"$as_ac_Header"\" = x"yes"; then :
    cat >>confdefs.h <<_ACEOF
  #define `$as_echo "HAVE_$ac_hdr" | $as_tr_cpp` 1
  _ACEOF
***************
*** 9470,9476 ****
  if test $ac_header_dirent = dirent.h; then
    { $as_echo "$as_me:${as_lineno-$LINENO}: checking for library containing opendir" >&5
  $as_echo_n "checking for library containing opendir... " >&6; }
! if test "${ac_cv_search_opendir+set}" = set; then :
    $as_echo_n "(cached) " >&6
  else
    ac_func_search_save_LIBS=$LIBS
--- 9497,9503 ----
  if test $ac_header_dirent = dirent.h; then
    { $as_echo "$as_me:${as_lineno-$LINENO}: checking for library containing opendir" >&5
  $as_echo_n "checking for library containing opendir... " >&6; }
! if ${ac_cv_search_opendir+:} false; then :
    $as_echo_n "(cached) " >&6
  else
    ac_func_search_save_LIBS=$LIBS
***************
*** 9504,9514 ****
  fi
  rm -f core conftest.err conftest.$ac_objext \
      conftest$ac_exeext
!   if test "${ac_cv_search_opendir+set}" = set; then :
    break
  fi
  done
! if test "${ac_cv_search_opendir+set}" = set; then :
  
  else
    ac_cv_search_opendir=no
--- 9531,9541 ----
  fi
  rm -f core conftest.err conftest.$ac_objext \
      conftest$ac_exeext
!   if ${ac_cv_search_opendir+:} false; then :
    break
  fi
  done
! if ${ac_cv_search_opendir+:} false; then :
  
  else
    ac_cv_search_opendir=no
***************
*** 9527,9533 ****
  else
    { $as_echo "$as_me:${as_lineno-$LINENO}: checking for library containing opendir" >&5
  $as_echo_n "checking for library containing opendir... " >&6; }
! if test "${ac_cv_search_opendir+set}" = set; then :
    $as_echo_n "(cached) " >&6
  else
    ac_func_search_save_LIBS=$LIBS
--- 9554,9560 ----
  else
    { $as_echo "$as_me:${as_lineno-$LINENO}: checking for library containing opendir" >&5
  $as_echo_n "checking for library containing opendir... " >&6; }
! if ${ac_cv_search_opendir+:} false; then :
    $as_echo_n "(cached) " >&6
  else
    ac_func_search_save_LIBS=$LIBS
***************
*** 9561,9571 ****
  fi
  rm -f core conftest.err conftest.$ac_objext \
      conftest$ac_exeext
!   if test "${ac_cv_search_opendir+set}" = set; then :
    break
  fi
  done
! if test "${ac_cv_search_opendir+set}" = set; then :
  
  else
    ac_cv_search_opendir=no
--- 9588,9598 ----
  fi
  rm -f core conftest.err conftest.$ac_objext \
      conftest$ac_exeext
!   if ${ac_cv_search_opendir+:} false; then :
    break
  fi
  done
! if ${ac_cv_search_opendir+:} false; then :
  
  else
    ac_cv_search_opendir=no
***************
*** 9625,9632 ****
  do :
    as_ac_Header=`$as_echo "ac_cv_header_$ac_header" | $as_tr_sh`
  ac_fn_c_check_header_mongrel "$LINENO" "$ac_header" "$as_ac_Header" "$ac_includes_default"
! eval as_val=\$$as_ac_Header
!    if test "x$as_val" = x""yes; then :
    cat >>confdefs.h <<_ACEOF
  #define `$as_echo "HAVE_$ac_header" | $as_tr_cpp` 1
  _ACEOF
--- 9652,9658 ----
  do :
    as_ac_Header=`$as_echo "ac_cv_header_$ac_header" | $as_tr_sh`
  ac_fn_c_check_header_mongrel "$LINENO" "$ac_header" "$as_ac_Header" "$ac_includes_default"
! if eval test \"x\$"$as_ac_Header"\" = x"yes"; then :
    cat >>confdefs.h <<_ACEOF
  #define `$as_echo "HAVE_$ac_header" | $as_tr_cpp` 1
  _ACEOF
***************
*** 9642,9648 ****
  #  include <sys/stream.h>
  #endif
  "
! if test "x$ac_cv_header_sys_ptem_h" = x""yes; then :
    cat >>confdefs.h <<_ACEOF
  #define HAVE_SYS_PTEM_H 1
  _ACEOF
--- 9668,9674 ----
  #  include <sys/stream.h>
  #endif
  "
! if test "x$ac_cv_header_sys_ptem_h" = xyes; then :
    cat >>confdefs.h <<_ACEOF
  #define HAVE_SYS_PTEM_H 1
  _ACEOF
***************
*** 9658,9664 ****
  #  include <sys/param.h>
  #endif
  "
! if test "x$ac_cv_header_sys_sysctl_h" = x""yes; then :
    cat >>confdefs.h <<_ACEOF
  #define HAVE_SYS_SYSCTL_H 1
  _ACEOF
--- 9684,9690 ----
  #  include <sys/param.h>
  #endif
  "
! if test "x$ac_cv_header_sys_sysctl_h" = xyes; then :
    cat >>confdefs.h <<_ACEOF
  #define HAVE_SYS_SYSCTL_H 1
  _ACEOF
***************
*** 9698,9704 ****
  for ac_header in strings.h
  do :
    ac_fn_c_check_header_mongrel "$LINENO" "strings.h" "ac_cv_header_strings_h" "$ac_includes_default"
! if test "x$ac_cv_header_strings_h" = x""yes; then :
    cat >>confdefs.h <<_ACEOF
  #define HAVE_STRINGS_H 1
  _ACEOF
--- 9724,9730 ----
  for ac_header in strings.h
  do :
    ac_fn_c_check_header_mongrel "$LINENO" "strings.h" "ac_cv_header_strings_h" "$ac_includes_default"
! if test "x$ac_cv_header_strings_h" = xyes; then :
    cat >>confdefs.h <<_ACEOF
  #define HAVE_STRINGS_H 1
  _ACEOF
***************
*** 9757,9763 ****
  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'"
--- 9783,9789 ----
  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'"
***************
*** 9798,9804 ****
  
  { $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
--- 9824,9830 ----
  
  { $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
***************
*** 9807,9817 ****
  int
  main ()
  {
! /* FIXME: Include the comments suggested by Paul. */
  #ifndef __cplusplus
!   /* Ultrix mips cc rejects this.  */
    typedef int charset[2];
!   const charset cs;
    /* SunOS 4.1.1 cc rejects this.  */
    char const *const *pcpcc;
    char **ppc;
--- 9833,9843 ----
  int
  main ()
  {
! 
  #ifndef __cplusplus
!   /* Ultrix mips cc rejects this sort of thing.  */
    typedef int charset[2];
!   const charset cs = { 0, 0 };
    /* SunOS 4.1.1 cc rejects this.  */
    char const *const *pcpcc;
    char **ppc;
***************
*** 9828,9835 ****
    ++pcpcc;
    ppc = (char**) pcpcc;
    pcpcc = (char const *const *) ppc;
!   { /* SCO 3.2v4 cc rejects this.  */
!     char *t;
      char const *s = 0 ? (char *) 0 : (char const *) 0;
  
      *t++ = 0;
--- 9854,9862 ----
    ++pcpcc;
    ppc = (char**) pcpcc;
    pcpcc = (char const *const *) ppc;
!   { /* SCO 3.2v4 cc rejects this sort of thing.  */
!     char tx;
!     char *t = &tx;
      char const *s = 0 ? (char *) 0 : (char const *) 0;
  
      *t++ = 0;
***************
*** 9845,9854 ****
      iptr p = 0;
      ++p;
    }
!   { /* AIX XL C 1.02.0.0 rejects this saying
         "k.c", line 2.27: 1506-025 (S) Operand must be a modifiable lvalue. */
!     struct s { int j; const int *ap[3]; };
!     struct s *b; b->j = 5;
    }
    { /* ULTRIX-32 V3.1 (Rev 9) vcc rejects this */
      const int foo = 10;
--- 9872,9881 ----
      iptr p = 0;
      ++p;
    }
!   { /* AIX XL C 1.02.0.0 rejects this sort of thing, saying
         "k.c", line 2.27: 1506-025 (S) Operand must be a modifiable lvalue. */
!     struct s { int j; const int *ap[3]; } bx;
!     struct s *b = &bx; b->j = 5;
    }
    { /* ULTRIX-32 V3.1 (Rev 9) vcc rejects this */
      const int foo = 10;
***************
*** 9878,9884 ****
  
  { $as_echo "$as_me:${as_lineno-$LINENO}: checking for working volatile" >&5
  $as_echo_n "checking for working volatile... " >&6; }
! if test "${ac_cv_c_volatile+set}" = set; then :
    $as_echo_n "(cached) " >&6
  else
    cat confdefs.h - <<_ACEOF >conftest.$ac_ext
--- 9905,9911 ----
  
  { $as_echo "$as_me:${as_lineno-$LINENO}: checking for working volatile" >&5
  $as_echo_n "checking for working volatile... " >&6; }
! if ${ac_cv_c_volatile+:} false; then :
    $as_echo_n "(cached) " >&6
  else
    cat confdefs.h - <<_ACEOF >conftest.$ac_ext
***************
*** 9911,9917 ****
  fi
  
  ac_fn_c_check_type "$LINENO" "mode_t" "ac_cv_type_mode_t" "$ac_includes_default"
! if test "x$ac_cv_type_mode_t" = x""yes; then :
  
  else
  
--- 9938,9944 ----
  fi
  
  ac_fn_c_check_type "$LINENO" "mode_t" "ac_cv_type_mode_t" "$ac_includes_default"
! if test "x$ac_cv_type_mode_t" = xyes; then :
  
  else
  
***************
*** 9922,9928 ****
  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
  
--- 9949,9955 ----
  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
  
***************
*** 9933,9939 ****
  fi
  
  ac_fn_c_check_type "$LINENO" "pid_t" "ac_cv_type_pid_t" "$ac_includes_default"
! if test "x$ac_cv_type_pid_t" = x""yes; then :
  
  else
  
--- 9960,9966 ----
  fi
  
  ac_fn_c_check_type "$LINENO" "pid_t" "ac_cv_type_pid_t" "$ac_includes_default"
! if test "x$ac_cv_type_pid_t" = xyes; then :
  
  else
  
***************
*** 9944,9950 ****
  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
  
--- 9971,9977 ----
  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
  
***************
*** 9956,9962 ****
  
  { $as_echo "$as_me:${as_lineno-$LINENO}: checking for uid_t in sys/types.h" >&5
  $as_echo_n "checking for uid_t in sys/types.h... " >&6; }
! if test "${ac_cv_type_uid_t+set}" = set; then :
    $as_echo_n "(cached) " >&6
  else
    cat confdefs.h - <<_ACEOF >conftest.$ac_ext
--- 9983,9989 ----
  
  { $as_echo "$as_me:${as_lineno-$LINENO}: checking for uid_t in sys/types.h" >&5
  $as_echo_n "checking for uid_t in sys/types.h... " >&6; }
! if ${ac_cv_type_uid_t+:} false; then :
    $as_echo_n "(cached) " >&6
  else
    cat confdefs.h - <<_ACEOF >conftest.$ac_ext
***************
*** 10001,10007 ****
  
  { $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
--- 10028,10034 ----
  
  { $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
***************
*** 10035,10041 ****
  fi
  
  ac_fn_c_check_type "$LINENO" "ino_t" "ac_cv_type_ino_t" "$ac_includes_default"
! if test "x$ac_cv_type_ino_t" = x""yes; then :
  
  else
  
--- 10062,10068 ----
  fi
  
  ac_fn_c_check_type "$LINENO" "ino_t" "ac_cv_type_ino_t" "$ac_includes_default"
! if test "x$ac_cv_type_ino_t" = xyes; then :
  
  else
  
***************
*** 10046,10052 ****
  fi
  
  ac_fn_c_check_type "$LINENO" "dev_t" "ac_cv_type_dev_t" "$ac_includes_default"
! if test "x$ac_cv_type_dev_t" = x""yes; then :
  
  else
  
--- 10073,10079 ----
  fi
  
  ac_fn_c_check_type "$LINENO" "dev_t" "ac_cv_type_dev_t" "$ac_includes_default"
! if test "x$ac_cv_type_dev_t" = xyes; then :
  
  else
  
***************
*** 10058,10064 ****
  
   { $as_echo "$as_me:${as_lineno-$LINENO}: checking whether byte ordering is bigendian" >&5
  $as_echo_n "checking whether byte ordering is bigendian... " >&6; }
! if test "${ac_cv_c_bigendian+set}" = set; then :
    $as_echo_n "(cached) " >&6
  else
    ac_cv_c_bigendian=unknown
--- 10085,10091 ----
  
   { $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 :
    $as_echo_n "(cached) " >&6
  else
    ac_cv_c_bigendian=unknown
***************
*** 10276,10282 ****
  
       ;; #(
     *)
!      as_fn_error "unknown endianness
   presetting ac_cv_c_bigendian=no (or yes) will help" "$LINENO" 5 ;;
   esac
  
--- 10303,10309 ----
  
       ;; #(
     *)
!      as_fn_error $? "unknown endianness
   presetting ac_cv_c_bigendian=no (or yes) will help" "$LINENO" 5 ;;
   esac
  
***************
*** 10412,10418 ****
    { $as_echo "$as_me:${as_lineno-$LINENO}: result: OK" >&5
  $as_echo "OK" >&6; }
  else
!   as_fn_error "FAILED" "$LINENO" 5
  fi
  rm -f core conftest.err conftest.$ac_objext \
      conftest$ac_exeext conftest.$ac_ext
--- 10439,10445 ----
    { $as_echo "$as_me:${as_lineno-$LINENO}: result: OK" >&5
  $as_echo "OK" >&6; }
  else
!   as_fn_error $? "FAILED" "$LINENO" 5
  fi
  rm -f core conftest.err conftest.$ac_objext \
      conftest$ac_exeext conftest.$ac_ext
***************
*** 10428,10434 ****
      as_ac_Lib=`$as_echo "ac_cv_lib_${libname}''_tgetent" | $as_tr_sh`
  { $as_echo "$as_me:${as_lineno-$LINENO}: checking for tgetent in -l${libname}" >&5
  $as_echo_n "checking for tgetent in -l${libname}... " >&6; }
! if { as_var=$as_ac_Lib; eval "test \"\${$as_var+set}\" = set"; }; then :
    $as_echo_n "(cached) " >&6
  else
    ac_check_lib_save_LIBS=$LIBS
--- 10455,10461 ----
      as_ac_Lib=`$as_echo "ac_cv_lib_${libname}''_tgetent" | $as_tr_sh`
  { $as_echo "$as_me:${as_lineno-$LINENO}: checking for tgetent in -l${libname}" >&5
  $as_echo_n "checking for tgetent in -l${libname}... " >&6; }
! if eval \${$as_ac_Lib+:} false; then :
    $as_echo_n "(cached) " >&6
  else
    ac_check_lib_save_LIBS=$LIBS
***************
*** 10463,10470 ****
  eval ac_res=\$$as_ac_Lib
  	       { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_res" >&5
  $as_echo "$ac_res" >&6; }
! eval as_val=\$$as_ac_Lib
!    if test "x$as_val" = x""yes; then :
    cat >>confdefs.h <<_ACEOF
  #define `$as_echo "HAVE_LIB${libname}" | $as_tr_cpp` 1
  _ACEOF
--- 10490,10496 ----
  eval ac_res=\$$as_ac_Lib
  	       { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_res" >&5
  $as_echo "$ac_res" >&6; }
! if eval test \"x\$"$as_ac_Lib"\" = x"yes"; then :
    cat >>confdefs.h <<_ACEOF
  #define `$as_echo "HAVE_LIB${libname}" | $as_tr_cpp` 1
  _ACEOF
***************
*** 10530,10536 ****
    { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5
  $as_echo "yes" >&6; }
  else
!   as_fn_error "NOT FOUND!
        You need to install a terminal library; for example ncurses.
        Or specify the name of the library with --with-tlib." "$LINENO" 5
  fi
--- 10556,10562 ----
    { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5
  $as_echo "yes" >&6; }
  else
!   as_fn_error $? "NOT FOUND!
        You need to install a terminal library; for example ncurses.
        Or specify the name of the library with --with-tlib." "$LINENO" 5
  fi
***************
*** 10540,10552 ****
  
  { $as_echo "$as_me:${as_lineno-$LINENO}: checking whether we talk terminfo" >&5
  $as_echo_n "checking whether we talk terminfo... " >&6; }
! if test "${vim_cv_terminfo+set}" = set; then :
    $as_echo_n "(cached) " >&6
  else
  
      if test "$cross_compiling" = yes; then :
  
!       as_fn_error "cross-compiling: please set 'vim_cv_terminfo'" "$LINENO" 5
  
  else
    cat confdefs.h - <<_ACEOF >conftest.$ac_ext
--- 10566,10578 ----
  
  { $as_echo "$as_me:${as_lineno-$LINENO}: checking whether we talk terminfo" >&5
  $as_echo_n "checking whether we talk terminfo... " >&6; }
! if ${vim_cv_terminfo+:} false; then :
    $as_echo_n "(cached) " >&6
  else
  
      if test "$cross_compiling" = yes; then :
  
!       as_fn_error $? "cross-compiling: please set 'vim_cv_terminfo'" "$LINENO" 5
  
  else
    cat confdefs.h - <<_ACEOF >conftest.$ac_ext
***************
*** 10593,10605 ****
  if test "x$olibs" != "x$LIBS"; then
    { $as_echo "$as_me:${as_lineno-$LINENO}: checking what tgetent() returns for an unknown terminal" >&5
  $as_echo_n "checking what tgetent() returns for an unknown terminal... " >&6; }
! if test "${vim_cv_tgent+set}" = set; then :
    $as_echo_n "(cached) " >&6
  else
  
        if test "$cross_compiling" = yes; then :
  
! 	as_fn_error "failed to compile test program." "$LINENO" 5
  
  else
    cat confdefs.h - <<_ACEOF >conftest.$ac_ext
--- 10619,10631 ----
  if test "x$olibs" != "x$LIBS"; then
    { $as_echo "$as_me:${as_lineno-$LINENO}: checking what tgetent() returns for an unknown terminal" >&5
  $as_echo_n "checking what tgetent() returns for an unknown terminal... " >&6; }
! if ${vim_cv_tgent+:} false; then :
    $as_echo_n "(cached) " >&6
  else
  
        if test "$cross_compiling" = yes; then :
  
! 	as_fn_error $? "failed to compile test program." "$LINENO" 5
  
  else
    cat confdefs.h - <<_ACEOF >conftest.$ac_ext
***************
*** 10894,10906 ****
  rm -f conftest_grp
  { $as_echo "$as_me:${as_lineno-$LINENO}: checking default tty permissions/group" >&5
  $as_echo_n "checking default tty permissions/group... " >&6; }
! if test "${vim_cv_tty_group+set}" = set; then :
    $as_echo_n "(cached) " >&6
  else
  
      if test "$cross_compiling" = yes; then :
  
!       as_fn_error "cross-compiling: please set 'vim_cv_tty_group' and 'vim_cv_tty_mode'" "$LINENO" 5
  
  else
    cat confdefs.h - <<_ACEOF >conftest.$ac_ext
--- 10920,10932 ----
  rm -f conftest_grp
  { $as_echo "$as_me:${as_lineno-$LINENO}: checking default tty permissions/group" >&5
  $as_echo_n "checking default tty permissions/group... " >&6; }
! if ${vim_cv_tty_group+:} false; then :
    $as_echo_n "(cached) " >&6
  else
  
      if test "$cross_compiling" = yes; then :
  
!       as_fn_error $? "cross-compiling: please set 'vim_cv_tty_group' and 'vim_cv_tty_mode'" "$LINENO" 5
  
  else
    cat confdefs.h - <<_ACEOF >conftest.$ac_ext
***************
*** 10981,10987 ****
  _ACEOF
  
    if test "x$vim_cv_tty_mode" = "x" ; then
!     as_fn_error "It seems you're cross compiling and have 'vim_cv_tty_group' set, please also set the environment variable 'vim_cv_tty_mode' to the correct mode (probably 0620)" "$LINENO" 5
    else
      $as_echo "#define PTYMODE 0620" >>confdefs.h
  
--- 11007,11013 ----
  _ACEOF
  
    if test "x$vim_cv_tty_mode" = "x" ; then
!     as_fn_error $? "It seems you're cross compiling and have 'vim_cv_tty_group' set, please also set the environment variable 'vim_cv_tty_mode' to the correct mode (probably 0620)" "$LINENO" 5
    else
      $as_echo "#define PTYMODE 0620" >>confdefs.h
  
***************
*** 10991,10997 ****
  
  { $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
--- 11017,11023 ----
  
  { $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
***************
*** 11064,11076 ****
  
  { $as_echo "$as_me:${as_lineno-$LINENO}: checking getcwd implementation is broken" >&5
  $as_echo_n "checking getcwd implementation is broken... " >&6; }
! if test "${vim_cv_getcwd_broken+set}" = set; then :
    $as_echo_n "(cached) " >&6
  else
  
      if test "$cross_compiling" = yes; then :
  
!       as_fn_error "cross-compiling: please set 'vim_cv_getcwd_broken'" "$LINENO" 5
  
  else
    cat confdefs.h - <<_ACEOF >conftest.$ac_ext
--- 11090,11102 ----
  
  { $as_echo "$as_me:${as_lineno-$LINENO}: checking getcwd implementation is broken" >&5
  $as_echo_n "checking getcwd implementation is broken... " >&6; }
! if ${vim_cv_getcwd_broken+:} false; then :
    $as_echo_n "(cached) " >&6
  else
  
      if test "$cross_compiling" = yes; then :
  
!       as_fn_error $? "cross-compiling: please set 'vim_cv_getcwd_broken'" "$LINENO" 5
  
  else
    cat confdefs.h - <<_ACEOF >conftest.$ac_ext
***************
*** 11123,11130 ****
  do :
    as_ac_var=`$as_echo "ac_cv_func_$ac_func" | $as_tr_sh`
  ac_fn_c_check_func "$LINENO" "$ac_func" "$as_ac_var"
! eval as_val=\$$as_ac_var
!    if test "x$as_val" = x""yes; then :
    cat >>confdefs.h <<_ACEOF
  #define `$as_echo "HAVE_$ac_func" | $as_tr_cpp` 1
  _ACEOF
--- 11149,11155 ----
  do :
    as_ac_var=`$as_echo "ac_cv_func_$ac_func" | $as_tr_sh`
  ac_fn_c_check_func "$LINENO" "$ac_func" "$as_ac_var"
! if eval test \"x\$"$as_ac_var"\" = x"yes"; then :
    cat >>confdefs.h <<_ACEOF
  #define `$as_echo "HAVE_$ac_func" | $as_tr_cpp` 1
  _ACEOF
***************
*** 11134,11140 ****
  
  { $as_echo "$as_me:${as_lineno-$LINENO}: checking for _LARGEFILE_SOURCE value needed for large files" >&5
  $as_echo_n "checking for _LARGEFILE_SOURCE value needed for large files... " >&6; }
! if test "${ac_cv_sys_largefile_source+set}" = set; then :
    $as_echo_n "(cached) " >&6
  else
    while :; do
--- 11159,11165 ----
  
  { $as_echo "$as_me:${as_lineno-$LINENO}: checking for _LARGEFILE_SOURCE value needed for large files" >&5
  $as_echo_n "checking for _LARGEFILE_SOURCE value needed for large files... " >&6; }
! if ${ac_cv_sys_largefile_source+:} false; then :
    $as_echo_n "(cached) " >&6
  else
    while :; do
***************
*** 11210,11216 ****
  
    { $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
--- 11235,11241 ----
  
    { $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
***************
*** 11261,11267 ****
  
    { $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
--- 11286,11292 ----
  
    { $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
***************
*** 11330,11336 ****
    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
--- 11355,11361 ----
    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
***************
*** 11397,11402 ****
--- 11422,11429 ----
  esac
  rm -rf conftest*
    fi
+ 
+ 
  fi
  
  
***************
*** 11430,11442 ****
  
  { $as_echo "$as_me:${as_lineno-$LINENO}: checking whether stat() ignores a trailing slash" >&5
  $as_echo_n "checking whether stat() ignores a trailing slash... " >&6; }
! if test "${vim_cv_stat_ignores_slash+set}" = set; then :
    $as_echo_n "(cached) " >&6
  else
  
      if test "$cross_compiling" = yes; then :
  
!       as_fn_error "cross-compiling: please set 'vim_cv_stat_ignores_slash'" "$LINENO" 5
  
  else
    cat confdefs.h - <<_ACEOF >conftest.$ac_ext
--- 11457,11469 ----
  
  { $as_echo "$as_me:${as_lineno-$LINENO}: checking whether stat() ignores a trailing slash" >&5
  $as_echo_n "checking whether stat() ignores a trailing slash... " >&6; }
! if ${vim_cv_stat_ignores_slash+:} false; then :
    $as_echo_n "(cached) " >&6
  else
  
      if test "$cross_compiling" = yes; then :
  
!       as_fn_error $? "cross-compiling: please set 'vim_cv_stat_ignores_slash'" "$LINENO" 5
  
  else
    cat confdefs.h - <<_ACEOF >conftest.$ac_ext
***************
*** 11560,11566 ****
  
  { $as_echo "$as_me:${as_lineno-$LINENO}: checking for strtod in -lm" >&5
  $as_echo_n "checking for strtod in -lm... " >&6; }
! if test "${ac_cv_lib_m_strtod+set}" = set; then :
    $as_echo_n "(cached) " >&6
  else
    ac_check_lib_save_LIBS=$LIBS
--- 11587,11593 ----
  
  { $as_echo "$as_me:${as_lineno-$LINENO}: checking for strtod in -lm" >&5
  $as_echo_n "checking for strtod in -lm... " >&6; }
! if ${ac_cv_lib_m_strtod+:} false; then :
    $as_echo_n "(cached) " >&6
  else
    ac_check_lib_save_LIBS=$LIBS
***************
*** 11594,11600 ****
  fi
  { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_m_strtod" >&5
  $as_echo "$ac_cv_lib_m_strtod" >&6; }
! if test "x$ac_cv_lib_m_strtod" = x""yes; then :
    cat >>confdefs.h <<_ACEOF
  #define HAVE_LIBM 1
  _ACEOF
--- 11621,11627 ----
  fi
  { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_m_strtod" >&5
  $as_echo "$ac_cv_lib_m_strtod" >&6; }
! if test "x$ac_cv_lib_m_strtod" = xyes; then :
    cat >>confdefs.h <<_ACEOF
  #define HAVE_LIBM 1
  _ACEOF
***************
*** 11660,11666 ****
  $as_echo "no" >&6; }
  { $as_echo "$as_me:${as_lineno-$LINENO}: checking for acl_get_file in -lposix1e" >&5
  $as_echo_n "checking for acl_get_file in -lposix1e... " >&6; }
! if test "${ac_cv_lib_posix1e_acl_get_file+set}" = set; then :
    $as_echo_n "(cached) " >&6
  else
    ac_check_lib_save_LIBS=$LIBS
--- 11687,11693 ----
  $as_echo "no" >&6; }
  { $as_echo "$as_me:${as_lineno-$LINENO}: checking for acl_get_file in -lposix1e" >&5
  $as_echo_n "checking for acl_get_file in -lposix1e... " >&6; }
! if ${ac_cv_lib_posix1e_acl_get_file+:} false; then :
    $as_echo_n "(cached) " >&6
  else
    ac_check_lib_save_LIBS=$LIBS
***************
*** 11694,11705 ****
  fi
  { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_posix1e_acl_get_file" >&5
  $as_echo "$ac_cv_lib_posix1e_acl_get_file" >&6; }
! if test "x$ac_cv_lib_posix1e_acl_get_file" = x""yes; then :
    LIBS="$LIBS -lposix1e"
  else
    { $as_echo "$as_me:${as_lineno-$LINENO}: checking for acl_get_file in -lacl" >&5
  $as_echo_n "checking for acl_get_file in -lacl... " >&6; }
! if test "${ac_cv_lib_acl_acl_get_file+set}" = set; then :
    $as_echo_n "(cached) " >&6
  else
    ac_check_lib_save_LIBS=$LIBS
--- 11721,11732 ----
  fi
  { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_posix1e_acl_get_file" >&5
  $as_echo "$ac_cv_lib_posix1e_acl_get_file" >&6; }
! if test "x$ac_cv_lib_posix1e_acl_get_file" = xyes; then :
    LIBS="$LIBS -lposix1e"
  else
    { $as_echo "$as_me:${as_lineno-$LINENO}: checking for acl_get_file in -lacl" >&5
  $as_echo_n "checking for acl_get_file in -lacl... " >&6; }
! if ${ac_cv_lib_acl_acl_get_file+:} false; then :
    $as_echo_n "(cached) " >&6
  else
    ac_check_lib_save_LIBS=$LIBS
***************
*** 11733,11743 ****
  fi
  { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_acl_acl_get_file" >&5
  $as_echo "$ac_cv_lib_acl_acl_get_file" >&6; }
! if test "x$ac_cv_lib_acl_acl_get_file" = x""yes; then :
    LIBS="$LIBS -lacl"
  		  { $as_echo "$as_me:${as_lineno-$LINENO}: checking for fgetxattr in -lattr" >&5
  $as_echo_n "checking for fgetxattr in -lattr... " >&6; }
! if test "${ac_cv_lib_attr_fgetxattr+set}" = set; then :
    $as_echo_n "(cached) " >&6
  else
    ac_check_lib_save_LIBS=$LIBS
--- 11760,11770 ----
  fi
  { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_acl_acl_get_file" >&5
  $as_echo "$ac_cv_lib_acl_acl_get_file" >&6; }
! if test "x$ac_cv_lib_acl_acl_get_file" = xyes; then :
    LIBS="$LIBS -lacl"
  		  { $as_echo "$as_me:${as_lineno-$LINENO}: checking for fgetxattr in -lattr" >&5
  $as_echo_n "checking for fgetxattr in -lattr... " >&6; }
! if ${ac_cv_lib_attr_fgetxattr+:} false; then :
    $as_echo_n "(cached) " >&6
  else
    ac_check_lib_save_LIBS=$LIBS
***************
*** 11771,11777 ****
  fi
  { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_attr_fgetxattr" >&5
  $as_echo "$ac_cv_lib_attr_fgetxattr" >&6; }
! if test "x$ac_cv_lib_attr_fgetxattr" = x""yes; then :
    LIBS="$LIBS -lattr"
  fi
  
--- 11798,11804 ----
  fi
  { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_attr_fgetxattr" >&5
  $as_echo "$ac_cv_lib_attr_fgetxattr" >&6; }
! if test "x$ac_cv_lib_attr_fgetxattr" = xyes; then :
    LIBS="$LIBS -lattr"
  fi
  
***************
*** 11813,11819 ****
  
  { $as_echo "$as_me:${as_lineno-$LINENO}: checking for acl_get in -lsec" >&5
  $as_echo_n "checking for acl_get in -lsec... " >&6; }
! if test "${ac_cv_lib_sec_acl_get+set}" = set; then :
    $as_echo_n "(cached) " >&6
  else
    ac_check_lib_save_LIBS=$LIBS
--- 11840,11846 ----
  
  { $as_echo "$as_me:${as_lineno-$LINENO}: checking for acl_get in -lsec" >&5
  $as_echo_n "checking for acl_get in -lsec... " >&6; }
! if ${ac_cv_lib_sec_acl_get+:} false; then :
    $as_echo_n "(cached) " >&6
  else
    ac_check_lib_save_LIBS=$LIBS
***************
*** 11847,11853 ****
  fi
  { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_sec_acl_get" >&5
  $as_echo "$ac_cv_lib_sec_acl_get" >&6; }
! if test "x$ac_cv_lib_sec_acl_get" = x""yes; then :
    LIBS="$LIBS -lsec"; $as_echo "#define HAVE_SOLARIS_ZFS_ACL 1" >>confdefs.h
  
  else
--- 11874,11880 ----
  fi
  { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_sec_acl_get" >&5
  $as_echo "$ac_cv_lib_sec_acl_get" >&6; }
! if test "x$ac_cv_lib_sec_acl_get" = xyes; then :
    LIBS="$LIBS -lsec"; $as_echo "#define HAVE_SOLARIS_ZFS_ACL 1" >>confdefs.h
  
  else
***************
*** 11943,11949 ****
  $as_echo "no" >&6; }
      { $as_echo "$as_me:${as_lineno-$LINENO}: checking for gpm" >&5
  $as_echo_n "checking for gpm... " >&6; }
! if test "${vi_cv_have_gpm+set}" = set; then :
    $as_echo_n "(cached) " >&6
  else
    olibs="$LIBS" ; LIBS="-lgpm"
--- 11970,11976 ----
  $as_echo "no" >&6; }
      { $as_echo "$as_me:${as_lineno-$LINENO}: checking for gpm" >&5
  $as_echo_n "checking for gpm... " >&6; }
! if ${vi_cv_have_gpm+:} false; then :
    $as_echo_n "(cached) " >&6
  else
    olibs="$LIBS" ; LIBS="-lgpm"
***************
*** 11996,12002 ****
  $as_echo "no" >&6; }
          { $as_echo "$as_me:${as_lineno-$LINENO}: checking for sysmouse" >&5
  $as_echo_n "checking for sysmouse... " >&6; }
! if test "${vi_cv_have_sysmouse+set}" = set; then :
    $as_echo_n "(cached) " >&6
  else
    cat confdefs.h - <<_ACEOF >conftest.$ac_ext
--- 12023,12029 ----
  $as_echo "no" >&6; }
          { $as_echo "$as_me:${as_lineno-$LINENO}: checking for sysmouse" >&5
  $as_echo_n "checking for sysmouse... " >&6; }
! if ${vi_cv_have_sysmouse+:} false; then :
    $as_echo_n "(cached) " >&6
  else
    cat confdefs.h - <<_ACEOF >conftest.$ac_ext
***************
*** 12202,12208 ****
  # This bug is HP SR number 8606223364.
  { $as_echo "$as_me:${as_lineno-$LINENO}: checking size of int" >&5
  $as_echo_n "checking size of int... " >&6; }
! if test "${ac_cv_sizeof_int+set}" = set; then :
    $as_echo_n "(cached) " >&6
  else
    if ac_fn_c_compute_int "$LINENO" "(long int) (sizeof (int))" "ac_cv_sizeof_int"        "$ac_includes_default"; then :
--- 12229,12235 ----
  # This bug is HP SR number 8606223364.
  { $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 :
    $as_echo_n "(cached) " >&6
  else
    if ac_fn_c_compute_int "$LINENO" "(long int) (sizeof (int))" "ac_cv_sizeof_int"        "$ac_includes_default"; then :
***************
*** 12211,12219 ****
    if test "$ac_cv_type_int" = yes; then
       { { $as_echo "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5
  $as_echo "$as_me: error: in \`$ac_pwd':" >&2;}
! { as_fn_set_status 77
! as_fn_error "cannot compute sizeof (int)
! See \`config.log' for more details." "$LINENO" 5; }; }
     else
       ac_cv_sizeof_int=0
     fi
--- 12238,12245 ----
    if test "$ac_cv_type_int" = yes; then
       { { $as_echo "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5
  $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; }
     else
       ac_cv_sizeof_int=0
     fi
***************
*** 12236,12242 ****
  # This bug is HP SR number 8606223364.
  { $as_echo "$as_me:${as_lineno-$LINENO}: checking size of long" >&5
  $as_echo_n "checking size of long... " >&6; }
! if test "${ac_cv_sizeof_long+set}" = set; then :
    $as_echo_n "(cached) " >&6
  else
    if ac_fn_c_compute_int "$LINENO" "(long int) (sizeof (long))" "ac_cv_sizeof_long"        "$ac_includes_default"; then :
--- 12262,12268 ----
  # This bug is HP SR number 8606223364.
  { $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 :
    $as_echo_n "(cached) " >&6
  else
    if ac_fn_c_compute_int "$LINENO" "(long int) (sizeof (long))" "ac_cv_sizeof_long"        "$ac_includes_default"; then :
***************
*** 12245,12253 ****
    if test "$ac_cv_type_long" = yes; then
       { { $as_echo "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5
  $as_echo "$as_me: error: in \`$ac_pwd':" >&2;}
! { as_fn_set_status 77
! as_fn_error "cannot compute sizeof (long)
! See \`config.log' for more details." "$LINENO" 5; }; }
     else
       ac_cv_sizeof_long=0
     fi
--- 12271,12278 ----
    if test "$ac_cv_type_long" = yes; then
       { { $as_echo "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5
  $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; }
     else
       ac_cv_sizeof_long=0
     fi
***************
*** 12270,12276 ****
  # This bug is HP SR number 8606223364.
  { $as_echo "$as_me:${as_lineno-$LINENO}: checking size of time_t" >&5
  $as_echo_n "checking size of time_t... " >&6; }
! if test "${ac_cv_sizeof_time_t+set}" = set; then :
    $as_echo_n "(cached) " >&6
  else
    if ac_fn_c_compute_int "$LINENO" "(long int) (sizeof (time_t))" "ac_cv_sizeof_time_t"        "$ac_includes_default"; then :
--- 12295,12301 ----
  # This bug is HP SR number 8606223364.
  { $as_echo "$as_me:${as_lineno-$LINENO}: checking size of time_t" >&5
  $as_echo_n "checking size of time_t... " >&6; }
! if ${ac_cv_sizeof_time_t+:} false; then :
    $as_echo_n "(cached) " >&6
  else
    if ac_fn_c_compute_int "$LINENO" "(long int) (sizeof (time_t))" "ac_cv_sizeof_time_t"        "$ac_includes_default"; then :
***************
*** 12279,12287 ****
    if test "$ac_cv_type_time_t" = yes; then
       { { $as_echo "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5
  $as_echo "$as_me: error: in \`$ac_pwd':" >&2;}
! { as_fn_set_status 77
! as_fn_error "cannot compute sizeof (time_t)
! See \`config.log' for more details." "$LINENO" 5; }; }
     else
       ac_cv_sizeof_time_t=0
     fi
--- 12304,12311 ----
    if test "$ac_cv_type_time_t" = yes; then
       { { $as_echo "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5
  $as_echo "$as_me: error: in \`$ac_pwd':" >&2;}
! as_fn_error 77 "cannot compute sizeof (time_t)
! See \`config.log' for more details" "$LINENO" 5; }
     else
       ac_cv_sizeof_time_t=0
     fi
***************
*** 12304,12310 ****
  # This bug is HP SR number 8606223364.
  { $as_echo "$as_me:${as_lineno-$LINENO}: checking size of off_t" >&5
  $as_echo_n "checking size of off_t... " >&6; }
! if test "${ac_cv_sizeof_off_t+set}" = set; then :
    $as_echo_n "(cached) " >&6
  else
    if ac_fn_c_compute_int "$LINENO" "(long int) (sizeof (off_t))" "ac_cv_sizeof_off_t"        "$ac_includes_default"; then :
--- 12328,12334 ----
  # This bug is HP SR number 8606223364.
  { $as_echo "$as_me:${as_lineno-$LINENO}: checking size of off_t" >&5
  $as_echo_n "checking size of off_t... " >&6; }
! if ${ac_cv_sizeof_off_t+:} false; then :
    $as_echo_n "(cached) " >&6
  else
    if ac_fn_c_compute_int "$LINENO" "(long int) (sizeof (off_t))" "ac_cv_sizeof_off_t"        "$ac_includes_default"; then :
***************
*** 12313,12321 ****
    if test "$ac_cv_type_off_t" = yes; then
       { { $as_echo "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5
  $as_echo "$as_me: error: in \`$ac_pwd':" >&2;}
! { as_fn_set_status 77
! as_fn_error "cannot compute sizeof (off_t)
! See \`config.log' for more details." "$LINENO" 5; }; }
     else
       ac_cv_sizeof_off_t=0
     fi
--- 12337,12344 ----
    if test "$ac_cv_type_off_t" = yes; then
       { { $as_echo "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5
  $as_echo "$as_me: error: in \`$ac_pwd':" >&2;}
! as_fn_error 77 "cannot compute sizeof (off_t)
! See \`config.log' for more details" "$LINENO" 5; }
     else
       ac_cv_sizeof_off_t=0
     fi
***************
*** 12368,12374 ****
    { $as_echo "$as_me:${as_lineno-$LINENO}: result: ok" >&5
  $as_echo "ok" >&6; }
  else
!   as_fn_error "WRONG!  uint32_t not defined correctly." "$LINENO" 5
  fi
  rm -f core *.core core.conftest.* gmon.out bb.out conftest$ac_exeext \
    conftest.$ac_objext conftest.beam conftest.$ac_ext
--- 12391,12397 ----
    { $as_echo "$as_me:${as_lineno-$LINENO}: result: ok" >&5
  $as_echo "ok" >&6; }
  else
!   as_fn_error $? "WRONG!  uint32_t not defined correctly." "$LINENO" 5
  fi
  rm -f core *.core core.conftest.* gmon.out bb.out conftest$ac_exeext \
    conftest.$ac_objext conftest.beam conftest.$ac_ext
***************
*** 12400,12412 ****
  
  { $as_echo "$as_me:${as_lineno-$LINENO}: checking whether memmove handles overlaps" >&5
  $as_echo_n "checking whether memmove handles overlaps... " >&6; }
! if test "${vim_cv_memmove_handles_overlap+set}" = set; then :
    $as_echo_n "(cached) " >&6
  else
  
      if test "$cross_compiling" = yes; then :
  
! 	as_fn_error "cross-compiling: please set 'vim_cv_memmove_handles_overlap'" "$LINENO" 5
  
  else
    cat confdefs.h - <<_ACEOF >conftest.$ac_ext
--- 12423,12435 ----
  
  { $as_echo "$as_me:${as_lineno-$LINENO}: checking whether memmove handles overlaps" >&5
  $as_echo_n "checking whether memmove handles overlaps... " >&6; }
! if ${vim_cv_memmove_handles_overlap+:} false; then :
    $as_echo_n "(cached) " >&6
  else
  
      if test "$cross_compiling" = yes; then :
  
! 	as_fn_error $? "cross-compiling: please set 'vim_cv_memmove_handles_overlap'" "$LINENO" 5
  
  else
    cat confdefs.h - <<_ACEOF >conftest.$ac_ext
***************
*** 12437,12449 ****
  else
    { $as_echo "$as_me:${as_lineno-$LINENO}: checking whether bcopy handles overlaps" >&5
  $as_echo_n "checking whether bcopy handles overlaps... " >&6; }
! if test "${vim_cv_bcopy_handles_overlap+set}" = set; then :
    $as_echo_n "(cached) " >&6
  else
  
        if test "$cross_compiling" = yes; then :
  
! 	as_fn_error "cross-compiling: please set 'vim_cv_bcopy_handles_overlap'" "$LINENO" 5
  
  else
    cat confdefs.h - <<_ACEOF >conftest.$ac_ext
--- 12460,12472 ----
  else
    { $as_echo "$as_me:${as_lineno-$LINENO}: checking whether bcopy handles overlaps" >&5
  $as_echo_n "checking whether bcopy handles overlaps... " >&6; }
! if ${vim_cv_bcopy_handles_overlap+:} false; then :
    $as_echo_n "(cached) " >&6
  else
  
        if test "$cross_compiling" = yes; then :
  
! 	as_fn_error $? "cross-compiling: please set 'vim_cv_bcopy_handles_overlap'" "$LINENO" 5
  
  else
    cat confdefs.h - <<_ACEOF >conftest.$ac_ext
***************
*** 12474,12486 ****
    else
      { $as_echo "$as_me:${as_lineno-$LINENO}: checking whether memcpy handles overlaps" >&5
  $as_echo_n "checking whether memcpy handles overlaps... " >&6; }
! if test "${vim_cv_memcpy_handles_overlap+set}" = set; then :
    $as_echo_n "(cached) " >&6
  else
  
  	if test "$cross_compiling" = yes; then :
  
! 	    as_fn_error "cross-compiling: please set 'vim_cv_memcpy_handles_overlap'" "$LINENO" 5
  
  else
    cat confdefs.h - <<_ACEOF >conftest.$ac_ext
--- 12497,12509 ----
    else
      { $as_echo "$as_me:${as_lineno-$LINENO}: checking whether memcpy handles overlaps" >&5
  $as_echo_n "checking whether memcpy handles overlaps... " >&6; }
! if ${vim_cv_memcpy_handles_overlap+:} false; then :
    $as_echo_n "(cached) " >&6
  else
  
  	if test "$cross_compiling" = yes; then :
  
! 	    as_fn_error $? "cross-compiling: please set 'vim_cv_memcpy_handles_overlap'" "$LINENO" 5
  
  else
    cat confdefs.h - <<_ACEOF >conftest.$ac_ext
***************
*** 12575,12581 ****
  
  { $as_echo "$as_me:${as_lineno-$LINENO}: checking for _xpg4_setrunelocale in -lxpg4" >&5
  $as_echo_n "checking for _xpg4_setrunelocale in -lxpg4... " >&6; }
! if test "${ac_cv_lib_xpg4__xpg4_setrunelocale+set}" = set; then :
    $as_echo_n "(cached) " >&6
  else
    ac_check_lib_save_LIBS=$LIBS
--- 12598,12604 ----
  
  { $as_echo "$as_me:${as_lineno-$LINENO}: checking for _xpg4_setrunelocale in -lxpg4" >&5
  $as_echo_n "checking for _xpg4_setrunelocale in -lxpg4... " >&6; }
! if ${ac_cv_lib_xpg4__xpg4_setrunelocale+:} false; then :
    $as_echo_n "(cached) " >&6
  else
    ac_check_lib_save_LIBS=$LIBS
***************
*** 12609,12615 ****
  fi
  { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_xpg4__xpg4_setrunelocale" >&5
  $as_echo "$ac_cv_lib_xpg4__xpg4_setrunelocale" >&6; }
! if test "x$ac_cv_lib_xpg4__xpg4_setrunelocale" = x""yes; then :
    LIBS="$LIBS -lxpg4"
  fi
  
--- 12632,12638 ----
  fi
  { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_xpg4__xpg4_setrunelocale" >&5
  $as_echo "$ac_cv_lib_xpg4__xpg4_setrunelocale" >&6; }
! if test "x$ac_cv_lib_xpg4__xpg4_setrunelocale" = xyes; then :
    LIBS="$LIBS -lxpg4"
  fi
  
***************
*** 12671,12677 ****
  set dummy msgfmt; 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_MSGFMT+set}" = set; then :
    $as_echo_n "(cached) " >&6
  else
    if test -n "$MSGFMT"; then
--- 12694,12700 ----
  set dummy msgfmt; 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_MSGFMT+:} false; then :
    $as_echo_n "(cached) " >&6
  else
    if test -n "$MSGFMT"; then
***************
*** 12683,12689 ****
    IFS=$as_save_IFS
    test -z "$as_dir" && as_dir=.
      for ac_exec_ext in '' $ac_executable_extensions; do
!   if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
      ac_cv_prog_MSGFMT="msgfmt"
      $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
      break 2
--- 12706,12712 ----
    IFS=$as_save_IFS
    test -z "$as_dir" && as_dir=.
      for ac_exec_ext in '' $ac_executable_extensions; do
!   if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
      ac_cv_prog_MSGFMT="msgfmt"
      $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
      break 2
***************
*** 12764,12770 ****
              for ac_func in bind_textdomain_codeset
  do :
    ac_fn_c_check_func "$LINENO" "bind_textdomain_codeset" "ac_cv_func_bind_textdomain_codeset"
! if test "x$ac_cv_func_bind_textdomain_codeset" = x""yes; then :
    cat >>confdefs.h <<_ACEOF
  #define HAVE_BIND_TEXTDOMAIN_CODESET 1
  _ACEOF
--- 12787,12793 ----
              for ac_func in bind_textdomain_codeset
  do :
    ac_fn_c_check_func "$LINENO" "bind_textdomain_codeset" "ac_cv_func_bind_textdomain_codeset"
! if test "x$ac_cv_func_bind_textdomain_codeset" = xyes; then :
    cat >>confdefs.h <<_ACEOF
  #define HAVE_BIND_TEXTDOMAIN_CODESET 1
  _ACEOF
***************
*** 12807,12817 ****
  fi
  
  ac_fn_c_check_header_mongrel "$LINENO" "dlfcn.h" "ac_cv_header_dlfcn_h" "$ac_includes_default"
! if test "x$ac_cv_header_dlfcn_h" = x""yes; then :
    DLL=dlfcn.h
  else
    ac_fn_c_check_header_mongrel "$LINENO" "dl.h" "ac_cv_header_dl_h" "$ac_includes_default"
! if test "x$ac_cv_header_dl_h" = x""yes; then :
    DLL=dl.h
  fi
  
--- 12830,12840 ----
  fi
  
  ac_fn_c_check_header_mongrel "$LINENO" "dlfcn.h" "ac_cv_header_dlfcn_h" "$ac_includes_default"
! if test "x$ac_cv_header_dlfcn_h" = xyes; then :
    DLL=dlfcn.h
  else
    ac_fn_c_check_header_mongrel "$LINENO" "dl.h" "ac_cv_header_dl_h" "$ac_includes_default"
! if test "x$ac_cv_header_dl_h" = xyes; then :
    DLL=dl.h
  fi
  
***************
*** 13008,13014 ****
  for ac_header in setjmp.h
  do :
    ac_fn_c_check_header_mongrel "$LINENO" "setjmp.h" "ac_cv_header_setjmp_h" "$ac_includes_default"
! if test "x$ac_cv_header_setjmp_h" = x""yes; then :
    cat >>confdefs.h <<_ACEOF
  #define HAVE_SETJMP_H 1
  _ACEOF
--- 13031,13037 ----
  for ac_header in setjmp.h
  do :
    ac_fn_c_check_header_mongrel "$LINENO" "setjmp.h" "ac_cv_header_setjmp_h" "$ac_includes_default"
! if test "x$ac_cv_header_setjmp_h" = xyes; then :
    cat >>confdefs.h <<_ACEOF
  #define HAVE_SETJMP_H 1
  _ACEOF
***************
*** 13159,13168 ****
       :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;}
--- 13182,13202 ----
       :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;}
***************
*** 13178,13183 ****
--- 13212,13218 ----
  
  ac_libobjs=
  ac_ltlibobjs=
+ U=
  for ac_i in : $LIBOBJS; do test "x$ac_i" = x: && continue
    # 1. Remove the extension, and $U if already installed.
    ac_script='s/\$U\././;s/\.o$//;s/\.obj$//'
***************
*** 13194,13200 ****
  
  
  
! : ${CONFIG_STATUS=./config.status}
  ac_write_fail=0
  ac_clean_files_save=$ac_clean_files
  ac_clean_files="$ac_clean_files $CONFIG_STATUS"
--- 13229,13235 ----
  
  
  
! : "${CONFIG_STATUS=./config.status}"
  ac_write_fail=0
  ac_clean_files_save=$ac_clean_files
  ac_clean_files="$ac_clean_files $CONFIG_STATUS"
***************
*** 13295,13300 ****
--- 13330,13336 ----
  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
***************
*** 13340,13358 ****
  (unset CDPATH) >/dev/null 2>&1 && unset CDPATH
  
  
! # as_fn_error ERROR [LINENO LOG_FD]
! # ---------------------------------
  # Output "`basename $0`: error: ERROR" to stderr. If LINENO and LOG_FD are
  # provided, also output the error to LOG_FD, referencing LINENO. Then exit the
! # script with status $?, using 1 if that was 0.
  as_fn_error ()
  {
!   as_status=$?; test $as_status -eq 0 && as_status=1
!   if test "$3"; then
!     as_lineno=${as_lineno-"$2"} as_lineno_stack=as_lineno_stack=$as_lineno_stack
!     $as_echo "$as_me:${as_lineno-$LINENO}: error: $1" >&$3
    fi
!   $as_echo "$as_me: error: $1" >&2
    as_fn_exit $as_status
  } # as_fn_error
  
--- 13376,13394 ----
  (unset CDPATH) >/dev/null 2>&1 && unset CDPATH
  
  
! # as_fn_error STATUS ERROR [LINENO LOG_FD]
! # ----------------------------------------
  # Output "`basename $0`: error: ERROR" to stderr. If LINENO and LOG_FD are
  # provided, also output the error to LOG_FD, referencing LINENO. Then exit the
! # script with STATUS, using 1 if that was 0.
  as_fn_error ()
  {
!   as_status=$1; test $as_status -eq 0 && as_status=1
!   if test "$4"; then
!     as_lineno=${as_lineno-"$3"} as_lineno_stack=as_lineno_stack=$as_lineno_stack
!     $as_echo "$as_me:${as_lineno-$LINENO}: error: $2" >&$4
    fi
!   $as_echo "$as_me: error: $2" >&2
    as_fn_exit $as_status
  } # as_fn_error
  
***************
*** 13490,13505 ****
      # ... but there are two gotchas:
      # 1) On MSYS, both `ln -s file dir' and `ln file dir' fail.
      # 2) DJGPP < 2.04 has no symlinks; `ln -s' creates a wrapper executable.
!     # In both cases, we have to default to `cp -p'.
      ln -s conf$$.file conf$$.dir 2>/dev/null && test ! -f conf$$.exe ||
!       as_ln_s='cp -p'
    elif ln conf$$.file conf$$ 2>/dev/null; then
      as_ln_s=ln
    else
!     as_ln_s='cp -p'
    fi
  else
!   as_ln_s='cp -p'
  fi
  rm -f conf$$ conf$$.exe conf$$.dir/conf$$.file conf$$.file
  rmdir conf$$.dir 2>/dev/null
--- 13526,13541 ----
      # ... but there are two gotchas:
      # 1) On MSYS, both `ln -s file dir' and `ln file dir' fail.
      # 2) DJGPP < 2.04 has no symlinks; `ln -s' creates a wrapper executable.
!     # In both cases, we have to default to `cp -pR'.
      ln -s conf$$.file conf$$.dir 2>/dev/null && test ! -f conf$$.exe ||
!       as_ln_s='cp -pR'
    elif ln conf$$.file conf$$ 2>/dev/null; then
      as_ln_s=ln
    else
!     as_ln_s='cp -pR'
    fi
  else
!   as_ln_s='cp -pR'
  fi
  rm -f conf$$ conf$$.exe conf$$.dir/conf$$.file conf$$.file
  rmdir conf$$.dir 2>/dev/null
***************
*** 13548,13554 ****
        test -d "$as_dir" && break
      done
      test -z "$as_dirs" || eval "mkdir $as_dirs"
!   } || test -d "$as_dir" || as_fn_error "cannot create directory $as_dir"
  
  
  } # as_fn_mkdir_p
--- 13584,13590 ----
        test -d "$as_dir" && break
      done
      test -z "$as_dirs" || eval "mkdir $as_dirs"
!   } || test -d "$as_dir" || as_fn_error $? "cannot create directory $as_dir"
  
  
  } # as_fn_mkdir_p
***************
*** 13559,13586 ****
    as_mkdir_p=false
  fi
  
! if test -x / >/dev/null 2>&1; then
!   as_test_x='test -x'
! else
!   if ls -dL / >/dev/null 2>&1; then
!     as_ls_L_option=L
!   else
!     as_ls_L_option=
!   fi
!   as_test_x='
!     eval sh -c '\''
!       if test -d "$1"; then
! 	test -d "$1/.";
!       else
! 	case $1 in #(
! 	-*)set "./$1";;
! 	esac;
! 	case `ls -ld'$as_ls_L_option' "$1" 2>/dev/null` in #((
! 	???[sx]*):;;*)false;;esac;fi
!     '\'' sh
!   '
! fi
! as_executable_p=$as_test_x
  
  # Sed expression to map a string onto a valid CPP name.
  as_tr_cpp="eval sed 'y%*$as_cr_letters%P$as_cr_LETTERS%;s%[^_$as_cr_alnum]%_%g'"
--- 13595,13610 ----
    as_mkdir_p=false
  fi
  
! 
! # as_fn_executable_p FILE
! # -----------------------
! # Test if FILE is an executable regular file.
! as_fn_executable_p ()
! {
!   test -f "$1" && test -x "$1"
! } # as_fn_executable_p
! as_test_x='test -x'
! as_executable_p=as_fn_executable_p
  
  # Sed expression to map a string onto a valid CPP name.
  as_tr_cpp="eval sed 'y%*$as_cr_letters%P$as_cr_LETTERS%;s%[^_$as_cr_alnum]%_%g'"
***************
*** 13602,13608 ****
  # values after options handling.
  ac_log="
  This file was extended by $as_me, which was
! generated by GNU Autoconf 2.65.  Invocation command line was
  
    CONFIG_FILES    = $CONFIG_FILES
    CONFIG_HEADERS  = $CONFIG_HEADERS
--- 13626,13632 ----
  # values after options handling.
  ac_log="
  This file was extended by $as_me, which was
! generated by GNU Autoconf 2.69.  Invocation command line was
  
    CONFIG_FILES    = $CONFIG_FILES
    CONFIG_HEADERS  = $CONFIG_HEADERS
***************
*** 13664,13673 ****
  ac_cs_config="`$as_echo "$ac_configure_args" | sed 's/^ //; s/[\\""\`\$]/\\\\&/g'`"
  ac_cs_version="\\
  config.status
! configured by $0, generated by GNU Autoconf 2.65,
    with options \\"\$ac_cs_config\\"
  
! Copyright (C) 2009 Free Software Foundation, Inc.
  This config.status script is free software; the Free Software Foundation
  gives unlimited permission to copy, distribute and modify it."
  
--- 13688,13697 ----
  ac_cs_config="`$as_echo "$ac_configure_args" | sed 's/^ //; s/[\\""\`\$]/\\\\&/g'`"
  ac_cs_version="\\
  config.status
! configured by $0, generated by GNU Autoconf 2.69,
    with options \\"\$ac_cs_config\\"
  
! Copyright (C) 2012 Free Software Foundation, Inc.
  This config.status script is free software; the Free Software Foundation
  gives unlimited permission to copy, distribute and modify it."
  
***************
*** 13683,13693 ****
  while test $# != 0
  do
    case $1 in
!   --*=*)
      ac_option=`expr "X$1" : 'X\([^=]*\)='`
      ac_optarg=`expr "X$1" : 'X[^=]*=\(.*\)'`
      ac_shift=:
      ;;
    *)
      ac_option=$1
      ac_optarg=$2
--- 13707,13722 ----
  while test $# != 0
  do
    case $1 in
!   --*=?*)
      ac_option=`expr "X$1" : 'X\([^=]*\)='`
      ac_optarg=`expr "X$1" : 'X[^=]*=\(.*\)'`
      ac_shift=:
      ;;
+   --*=)
+     ac_option=`expr "X$1" : 'X\([^=]*\)='`
+     ac_optarg=
+     ac_shift=:
+     ;;
    *)
      ac_option=$1
      ac_optarg=$2
***************
*** 13709,13714 ****
--- 13738,13744 ----
      $ac_shift
      case $ac_optarg in
      *\'*) ac_optarg=`$as_echo "$ac_optarg" | sed "s/'/'\\\\\\\\''/g"` ;;
+     '') as_fn_error $? "missing file argument" ;;
      esac
      as_fn_append CONFIG_FILES " '$ac_optarg'"
      ac_need_defaults=false;;
***************
*** 13721,13727 ****
      ac_need_defaults=false;;
    --he | --h)
      # Conflict between --help and --header
!     as_fn_error "ambiguous option: \`$1'
  Try \`$0 --help' for more information.";;
    --help | --hel | -h )
      $as_echo "$ac_cs_usage"; exit ;;
--- 13751,13757 ----
      ac_need_defaults=false;;
    --he | --h)
      # Conflict between --help and --header
!     as_fn_error $? "ambiguous option: \`$1'
  Try \`$0 --help' for more information.";;
    --help | --hel | -h )
      $as_echo "$ac_cs_usage"; exit ;;
***************
*** 13730,13736 ****
      ac_cs_silent=: ;;
  
    # This is an error.
!   -*) as_fn_error "unrecognized option: \`$1'
  Try \`$0 --help' for more information." ;;
  
    *) as_fn_append ac_config_targets " $1"
--- 13760,13766 ----
      ac_cs_silent=: ;;
  
    # This is an error.
!   -*) as_fn_error $? "unrecognized option: \`$1'
  Try \`$0 --help' for more information." ;;
  
    *) as_fn_append ac_config_targets " $1"
***************
*** 13750,13756 ****
  _ACEOF
  cat >>$CONFIG_STATUS <<_ACEOF || ac_write_fail=1
  if \$ac_cs_recheck; then
!   set X '$SHELL' '$0' $ac_configure_args \$ac_configure_extra_args --no-create --no-recursion
    shift
    \$as_echo "running CONFIG_SHELL=$SHELL \$*" >&6
    CONFIG_SHELL='$SHELL'
--- 13780,13786 ----
  _ACEOF
  cat >>$CONFIG_STATUS <<_ACEOF || ac_write_fail=1
  if \$ac_cs_recheck; then
!   set X $SHELL '$0' $ac_configure_args \$ac_configure_extra_args --no-create --no-recursion
    shift
    \$as_echo "running CONFIG_SHELL=$SHELL \$*" >&6
    CONFIG_SHELL='$SHELL'
***************
*** 13782,13788 ****
      "auto/config.h") CONFIG_HEADERS="$CONFIG_HEADERS auto/config.h:config.h.in" ;;
      "auto/config.mk") CONFIG_FILES="$CONFIG_FILES auto/config.mk:config.mk.in" ;;
  
!   *) as_fn_error "invalid argument: \`$ac_config_target'" "$LINENO" 5;;
    esac
  done
  
--- 13812,13818 ----
      "auto/config.h") CONFIG_HEADERS="$CONFIG_HEADERS auto/config.h:config.h.in" ;;
      "auto/config.mk") CONFIG_FILES="$CONFIG_FILES auto/config.mk:config.mk.in" ;;
  
!   *) as_fn_error $? "invalid argument: \`$ac_config_target'" "$LINENO" 5;;
    esac
  done
  
***************
*** 13804,13812 ****
  # 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
  }
--- 13834,13843 ----
  # 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
  }
***************
*** 13814,13825 ****
  
  {
    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.
--- 13845,13857 ----
  
  {
    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.
***************
*** 13836,13847 ****
  fi
  ac_cs_awk_cr=`$AWK 'BEGIN { print "a\rb" }' </dev/null 2>/dev/null`
  if test "$ac_cs_awk_cr" = "a${ac_cr}b"; then
!   ac_cs_awk_cr='\r'
  else
    ac_cs_awk_cr=$ac_cr
  fi
  
! echo 'BEGIN {' >"$tmp/subs1.awk" &&
  _ACEOF
  
  
--- 13868,13879 ----
  fi
  ac_cs_awk_cr=`$AWK 'BEGIN { print "a\rb" }' </dev/null 2>/dev/null`
  if test "$ac_cs_awk_cr" = "a${ac_cr}b"; then
!   ac_cs_awk_cr='\\r'
  else
    ac_cs_awk_cr=$ac_cr
  fi
  
! echo 'BEGIN {' >"$ac_tmp/subs1.awk" &&
  _ACEOF
  
  
***************
*** 13850,13867 ****
    echo "$ac_subst_vars" | sed 's/.*/&!$&$ac_delim/' &&
    echo "_ACEOF"
  } >conf$$subs.sh ||
!   as_fn_error "could not make $CONFIG_STATUS" "$LINENO" 5
! ac_delim_num=`echo "$ac_subst_vars" | grep -c '$'`
  ac_delim='%!_!# '
  for ac_last_try in false false false false false :; do
    . ./conf$$subs.sh ||
!     as_fn_error "could not make $CONFIG_STATUS" "$LINENO" 5
  
    ac_delim_n=`sed -n "s/.*$ac_delim\$/X/p" conf$$subs.awk | grep -c X`
    if test $ac_delim_n = $ac_delim_num; then
      break
    elif $ac_last_try; then
!     as_fn_error "could not make $CONFIG_STATUS" "$LINENO" 5
    else
      ac_delim="$ac_delim!$ac_delim _$ac_delim!! "
    fi
--- 13882,13899 ----
    echo "$ac_subst_vars" | sed 's/.*/&!$&$ac_delim/' &&
    echo "_ACEOF"
  } >conf$$subs.sh ||
!   as_fn_error $? "could not make $CONFIG_STATUS" "$LINENO" 5
! ac_delim_num=`echo "$ac_subst_vars" | grep -c '^'`
  ac_delim='%!_!# '
  for ac_last_try in false false false false false :; do
    . ./conf$$subs.sh ||
!     as_fn_error $? "could not make $CONFIG_STATUS" "$LINENO" 5
  
    ac_delim_n=`sed -n "s/.*$ac_delim\$/X/p" conf$$subs.awk | grep -c X`
    if test $ac_delim_n = $ac_delim_num; then
      break
    elif $ac_last_try; then
!     as_fn_error $? "could not make $CONFIG_STATUS" "$LINENO" 5
    else
      ac_delim="$ac_delim!$ac_delim _$ac_delim!! "
    fi
***************
*** 13869,13875 ****
  rm -f conf$$subs.sh
  
  cat >>$CONFIG_STATUS <<_ACEOF || ac_write_fail=1
! cat >>"\$tmp/subs1.awk" <<\\_ACAWK &&
  _ACEOF
  sed -n '
  h
--- 13901,13907 ----
  rm -f conf$$subs.sh
  
  cat >>$CONFIG_STATUS <<_ACEOF || ac_write_fail=1
! cat >>"\$ac_tmp/subs1.awk" <<\\_ACAWK &&
  _ACEOF
  sed -n '
  h
***************
*** 13917,13923 ****
  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 = ""
  
--- 13949,13955 ----
  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 = ""
  
***************
*** 13949,13969 ****
    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
  
! # VPATH may cause trouble with some makes, so we remove $(srcdir),
! # ${srcdir} and @srcdir@ from VPATH if srcdir is ".", strip leading and
  # trailing colons and then remove the whole line if VPATH becomes empty
  # (actually we leave an empty line to preserve line numbers).
  if test "x$srcdir" = x.; then
!   ac_vpsub='/^[	 ]*VPATH[	 ]*=/{
! s/:*\$(srcdir):*/:/
! s/:*\${srcdir}:*/:/
! s/:*@srcdir@:*/:/
! s/^\([^=]*=[	 ]*\):*/\1/
  s/:*$//
  s/^[^=]*=[	 ]*$//
  }'
  fi
--- 13981,14009 ----
    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
  
! # VPATH may cause trouble with some makes, so we remove sole $(srcdir),
! # ${srcdir} and @srcdir@ entries from VPATH if srcdir is ".", strip leading and
  # trailing colons and then remove the whole line if VPATH becomes empty
  # (actually we leave an empty line to preserve line numbers).
  if test "x$srcdir" = x.; then
!   ac_vpsub='/^[	 ]*VPATH[	 ]*=[	 ]*/{
! h
! s///
! s/^/:/
! s/[	 ]*$/:/
! s/:\$(srcdir):/:/g
! s/:\${srcdir}:/:/g
! s/:@srcdir@:/:/g
! s/^:*//
  s/:*$//
+ x
+ s/\(=[	 ]*\).*/\1/
+ G
+ s/\n//
  s/^[^=]*=[	 ]*$//
  }'
  fi
***************
*** 13975,13981 ****
  # 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
  
--- 14015,14021 ----
  # 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
  
***************
*** 13987,13997 ****
  # 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
    else
      ac_delim="$ac_delim!$ac_delim _$ac_delim!! "
    fi
--- 14027,14037 ----
  # 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
    else
      ac_delim="$ac_delim!$ac_delim _$ac_delim!! "
    fi
***************
*** 14076,14082 ****
  _ACAWK
  _ACEOF
  cat >>$CONFIG_STATUS <<\_ACEOF || ac_write_fail=1
!   as_fn_error "could not setup config headers machinery" "$LINENO" 5
  fi # test -n "$CONFIG_HEADERS"
  
  
--- 14116,14122 ----
  _ACAWK
  _ACEOF
  cat >>$CONFIG_STATUS <<\_ACEOF || ac_write_fail=1
!   as_fn_error $? "could not setup config headers machinery" "$LINENO" 5
  fi # test -n "$CONFIG_HEADERS"
  
  
***************
*** 14089,14095 ****
    esac
    case $ac_mode$ac_tag in
    :[FHL]*:*);;
!   :L* | :C*:*) as_fn_error "invalid tag \`$ac_tag'" "$LINENO" 5;;
    :[FH]-) ac_tag=-:-;;
    :[FH]*) ac_tag=$ac_tag:$ac_tag.in;;
    esac
--- 14129,14135 ----
    esac
    case $ac_mode$ac_tag in
    :[FHL]*:*);;
!   :L* | :C*:*) as_fn_error $? "invalid tag \`$ac_tag'" "$LINENO" 5;;
    :[FH]-) ac_tag=-:-;;
    :[FH]*) ac_tag=$ac_tag:$ac_tag.in;;
    esac
***************
*** 14108,14114 ****
      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 `:'.
--- 14148,14154 ----
      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 `:'.
***************
*** 14117,14123 ****
  	   [\\/$]*) false;;
  	   *) test -f "$srcdir/$ac_f" && ac_f="$srcdir/$ac_f";;
  	   esac ||
! 	   as_fn_error "cannot find input file: \`$ac_f'" "$LINENO" 5;;
        esac
        case $ac_f in *\'*) ac_f=`$as_echo "$ac_f" | sed "s/'/'\\\\\\\\''/g"`;; esac
        as_fn_append ac_file_inputs " '$ac_f'"
--- 14157,14163 ----
  	   [\\/$]*) false;;
  	   *) test -f "$srcdir/$ac_f" && ac_f="$srcdir/$ac_f";;
  	   esac ||
! 	   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
        as_fn_append ac_file_inputs " '$ac_f'"
***************
*** 14143,14150 ****
      esac
  
      case $ac_tag in
!     *:-:* | *:-) cat >"$tmp/stdin" \
!       || as_fn_error "could not create $ac_file" "$LINENO" 5 ;;
      esac
      ;;
    esac
--- 14183,14190 ----
      esac
  
      case $ac_tag in
!     *:-:* | *:-) cat >"$ac_tmp/stdin" \
!       || as_fn_error $? "could not create $ac_file" "$LINENO" 5 ;;
      esac
      ;;
    esac
***************
*** 14269,14291 ****
  s&@abs_top_builddir@&$ac_abs_top_builddir&;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
   ;;
    :H)
    #
--- 14309,14332 ----
  s&@abs_top_builddir@&$ac_abs_top_builddir&;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
   ;;
    :H)
    #
***************
*** 14294,14314 ****
    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
   ;;
  
--- 14335,14355 ----
    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
   ;;
  
***************
*** 14323,14329 ****
  ac_clean_files=$ac_clean_files_save
  
  test $ac_write_fail = 0 ||
!   as_fn_error "write failure creating $CONFIG_STATUS" "$LINENO" 5
  
  
  # configure is writing to config.log, and then calls config.status.
--- 14364,14370 ----
  ac_clean_files=$ac_clean_files_save
  
  test $ac_write_fail = 0 ||
!   as_fn_error $? "write failure creating $CONFIG_STATUS" "$LINENO" 5
  
  
  # configure is writing to config.log, and then calls config.status.
***************
*** 14344,14350 ****
    exec 5>>auto/config.log
    # Use ||, not &&, to avoid exiting from the if with $? = 1, which
    # would make configure fail if this is the last instruction.
!   $ac_cs_success || as_fn_exit $?
  fi
  if test -n "$ac_unrecognized_opts" && test "$enable_option_checking" != no; then
    { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: unrecognized options: $ac_unrecognized_opts" >&5
--- 14385,14391 ----
    exec 5>>auto/config.log
    # Use ||, not &&, to avoid exiting from the if with $? = 1, which
    # would make configure fail if this is the last instruction.
!   $ac_cs_success || as_fn_exit 1
  fi
  if test -n "$ac_unrecognized_opts" && test "$enable_option_checking" != no; then
    { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: unrecognized options: $ac_unrecognized_opts" >&5
*** ../vim-7.4.222/src/version.c	2014-03-27 17:19:05.868676325 +0100
--- src/version.c	2014-03-27 17:37:52.608693590 +0100
***************
*** 736,737 ****
--- 736,739 ----
  {   /* Add new patch number below this line */
+ /**/
+     223,
  /**/

-- 
For humans, honesty is a matter of degree.  Engineers are always honest in
matters of technology and human relationships.  That's why it's a good idea
to keep engineers away from customers, romantic interests, and other people
who can't handle the truth.
				(Scott Adams - The Dilbert principle)

 /// Bram Moolenaar -- Bram@Moolenaar.net -- http://www.Moolenaar.net   \\\
///        sponsor Vim, vote for features -- http://www.Vim.org/sponsor/ \\\
\\\  an exciting new programming language -- http://www.Zimbu.org        ///
 \\\            help me help AIDS victims -- http://ICCF-Holland.org    ///
