ncurses 6.1 - patch 20190518
[ncurses.git] / aclocal.m4
index 351e4b64383192b61cce846a9c836d357d2ef15a..6d2f989e62361593efc320ba1cf8b3ea255e2f45 100644 (file)
@@ -1,5 +1,5 @@
 dnl***************************************************************************
 dnl***************************************************************************
-dnl Copyright (c) 1998-2011,2012 Free Software Foundation, Inc.              *
+dnl Copyright (c) 1998-2018,2019 Free Software Foundation, Inc.              *
 dnl                                                                          *
 dnl Permission is hereby granted, free of charge, to any person obtaining a  *
 dnl copy of this software and associated documentation files (the            *
 dnl                                                                          *
 dnl Permission is hereby granted, free of charge, to any person obtaining a  *
 dnl copy of this software and associated documentation files (the            *
@@ -28,18 +28,18 @@ dnl***************************************************************************
 dnl
 dnl Author: Thomas E. Dickey 1995-on
 dnl
 dnl
 dnl Author: Thomas E. Dickey 1995-on
 dnl
-dnl $Id: aclocal.m4,v 1.643 2012/11/11 00:17:28 tom Exp $
+dnl $Id: aclocal.m4,v 1.862 2019/03/30 21:53:01 tom Exp $
 dnl Macros used in NCURSES auto-configuration script.
 dnl
 dnl These macros are maintained separately from NCURSES.  The copyright on
 dnl this file applies to the aggregation of macros and does not affect use of
 dnl these macros in other applications.
 dnl
 dnl Macros used in NCURSES auto-configuration script.
 dnl
 dnl These macros are maintained separately from NCURSES.  The copyright on
 dnl this file applies to the aggregation of macros and does not affect use of
 dnl these macros in other applications.
 dnl
-dnl See http://invisible-island.net/autoconf/ for additional information.
+dnl See https://invisible-island.net/autoconf/ for additional information.
 dnl
 dnl ---------------------------------------------------------------------------
 dnl ---------------------------------------------------------------------------
 dnl
 dnl ---------------------------------------------------------------------------
 dnl ---------------------------------------------------------------------------
-dnl AM_LANGINFO_CODESET version: 3 updated: 2002/10/27 23:21:42
+dnl AM_LANGINFO_CODESET version: 4 updated: 2015/04/18 08:56:57
 dnl -------------------
 dnl Inserted as requested by gettext 0.10.40
 dnl File from /usr/share/aclocal
 dnl -------------------
 dnl Inserted as requested by gettext 0.10.40
 dnl File from /usr/share/aclocal
@@ -50,19 +50,54 @@ dnl
 dnl From Bruno Haible.
 AC_DEFUN([AM_LANGINFO_CODESET],
 [
 dnl From Bruno Haible.
 AC_DEFUN([AM_LANGINFO_CODESET],
 [
-  AC_CACHE_CHECK([for nl_langinfo and CODESET], am_cv_langinfo_codeset,
-    [AC_TRY_LINK([#include <langinfo.h>],
-      [char* cs = nl_langinfo(CODESET);],
-      am_cv_langinfo_codeset=yes,
-      am_cv_langinfo_codeset=no)
-    ])
-  if test $am_cv_langinfo_codeset = yes; then
-    AC_DEFINE(HAVE_LANGINFO_CODESET, 1,
-      [Define if you have <langinfo.h> and nl_langinfo(CODESET).])
-  fi
-])dnl
-dnl ---------------------------------------------------------------------------
-dnl CF_ACVERSION_CHECK version: 3 updated: 2012/10/03 18:39:53
+AC_CACHE_CHECK([for nl_langinfo and CODESET], am_cv_langinfo_codeset,
+       [AC_TRY_LINK([#include <langinfo.h>],
+       [char* cs = nl_langinfo(CODESET);],
+       am_cv_langinfo_codeset=yes,
+       am_cv_langinfo_codeset=no)
+       ])
+       if test $am_cv_langinfo_codeset = yes; then
+               AC_DEFINE(HAVE_LANGINFO_CODESET, 1,
+               [Define if you have <langinfo.h> and nl_langinfo(CODESET).])
+       fi
+])dnl
+dnl ---------------------------------------------------------------------------
+dnl CF_ABI_DEFAULTS version: 2 updated: 2015/06/06 13:49:58
+dnl ---------------
+dnl Provide configure-script defaults for different ncurses ABIs.
+AC_DEFUN([CF_ABI_DEFAULTS],[
+AC_REQUIRE([CF_NCURSES_WITH_ABI_VERSION])
+case x$cf_cv_abi_version in
+(x[[6789]])
+       cf_dft_ext_colors=yes
+       cf_dft_ext_const=yes
+       cf_dft_ext_mouse=yes
+       cf_dft_ext_putwin=yes
+       cf_dft_ext_spfuncs=yes
+       cf_dft_filter_syms=yes
+       cf_dft_chtype=uint32_t
+       cf_dft_mmask_t=uint32_t
+       cf_dft_interop=yes
+       cf_dft_tparm_arg=intptr_t
+       cf_dft_with_lp64=yes
+       ;;
+(*)
+       cf_dft_ext_colors=no
+       cf_dft_ext_const=no
+       cf_dft_ext_mouse=no
+       cf_dft_ext_putwin=no
+       cf_dft_ext_spfuncs=no
+       cf_dft_filter_syms=no
+       cf_dft_chtype=auto
+       cf_dft_mmask_t=auto
+       cf_dft_interop=no
+       cf_dft_tparm_arg=long
+       cf_dft_with_lp64=no
+       ;;
+esac
+])dnl
+dnl ---------------------------------------------------------------------------
+dnl CF_ACVERSION_CHECK version: 5 updated: 2014/06/04 19:11:49
 dnl ------------------
 dnl Conditionally generate script according to whether we're using a given autoconf.
 dnl
 dnl ------------------
 dnl Conditionally generate script according to whether we're using a given autoconf.
 dnl
@@ -71,6 +106,7 @@ dnl $2 = code to use if AC_ACVERSION is at least as high as $1.
 dnl $3 = code to use if AC_ACVERSION is older than $1.
 define([CF_ACVERSION_CHECK],
 [
 dnl $3 = code to use if AC_ACVERSION is older than $1.
 define([CF_ACVERSION_CHECK],
 [
+ifdef([AC_ACVERSION], ,[ifdef([AC_AUTOCONF_VERSION],[m4_copy([AC_AUTOCONF_VERSION],[AC_ACVERSION])],[m4_copy([m4_PACKAGE_VERSION],[AC_ACVERSION])])])dnl
 ifdef([m4_version_compare],
 [m4_if(m4_version_compare(m4_defn([AC_ACVERSION]), [$1]), -1, [$3], [$2])],
 [CF_ACVERSION_COMPARE(
 ifdef([m4_version_compare],
 [m4_if(m4_version_compare(m4_defn([AC_ACVERSION]), [$1]), -1, [$3], [$2])],
 [CF_ACVERSION_COMPARE(
@@ -87,7 +123,7 @@ define([CF_ACVERSION_COMPARE],
 [ifelse([$8], , ,[$8])],
 [ifelse([$9], , ,[$9])])])dnl
 dnl ---------------------------------------------------------------------------
 [ifelse([$8], , ,[$8])],
 [ifelse([$9], , ,[$9])])])dnl
 dnl ---------------------------------------------------------------------------
-dnl CF_ADA_INCLUDE_DIRS version: 6 updated: 2010/02/26 19:52:07
+dnl CF_ADA_INCLUDE_DIRS version: 8 updated: 2013/10/14 04:24:07
 dnl -------------------
 dnl Construct the list of include-options for the C programs in the Ada95
 dnl binding.
 dnl -------------------
 dnl Construct the list of include-options for the C programs in the Ada95
 dnl binding.
@@ -101,7 +137,7 @@ if test "$GCC" != yes; then
        ACPPFLAGS="$ACPPFLAGS -I\${includedir}"
 elif test "$includedir" != "/usr/include"; then
        if test "$includedir" = '${prefix}/include' ; then
        ACPPFLAGS="$ACPPFLAGS -I\${includedir}"
 elif test "$includedir" != "/usr/include"; then
        if test "$includedir" = '${prefix}/include' ; then
-               if test $prefix != /usr ; then
+               if test x$prefix != x/usr ; then
                        ACPPFLAGS="$ACPPFLAGS -I\${includedir}"
                fi
        else
                        ACPPFLAGS="$ACPPFLAGS -I\${includedir}"
                fi
        else
@@ -119,7 +155,7 @@ AC_DEFUN([CF_ADD_ADAFLAGS],[
        AC_SUBST(ADAFLAGS)
 ])dnl
 dnl ---------------------------------------------------------------------------
        AC_SUBST(ADAFLAGS)
 ])dnl
 dnl ---------------------------------------------------------------------------
-dnl CF_ADD_CFLAGS version: 10 updated: 2010/05/26 05:38:42
+dnl CF_ADD_CFLAGS version: 13 updated: 2017/02/25 18:57:40
 dnl -------------
 dnl Copy non-preprocessor flags to $CFLAGS, preprocessor flags to $CPPFLAGS
 dnl The second parameter if given makes this macro verbose.
 dnl -------------
 dnl Copy non-preprocessor flags to $CFLAGS, preprocessor flags to $CPPFLAGS
 dnl The second parameter if given makes this macro verbose.
@@ -137,51 +173,51 @@ cf_new_extra_cppflags=
 for cf_add_cflags in $1
 do
 case $cf_fix_cppflags in
 for cf_add_cflags in $1
 do
 case $cf_fix_cppflags in
-no)
-       case $cf_add_cflags in #(vi
-       -undef|-nostdinc*|-I*|-D*|-U*|-E|-P|-C) #(vi
+(no)
+       case $cf_add_cflags in
+       (-undef|-nostdinc*|-I*|-D*|-U*|-E|-P|-C)
                case $cf_add_cflags in
                case $cf_add_cflags in
-               -D*)
+               (-D*)
                        cf_tst_cflags=`echo ${cf_add_cflags} |sed -e 's/^-D[[^=]]*='\''\"[[^"]]*//'`
 
                        cf_tst_cflags=`echo ${cf_add_cflags} |sed -e 's/^-D[[^=]]*='\''\"[[^"]]*//'`
 
-                       test "${cf_add_cflags}" != "${cf_tst_cflags}" \
+                       test "x${cf_add_cflags}" != "x${cf_tst_cflags}" \
                                && test -z "${cf_tst_cflags}" \
                                && cf_fix_cppflags=yes
 
                        if test $cf_fix_cppflags = yes ; then
                                && test -z "${cf_tst_cflags}" \
                                && cf_fix_cppflags=yes
 
                        if test $cf_fix_cppflags = yes ; then
-                               cf_new_extra_cppflags="$cf_new_extra_cppflags $cf_add_cflags"
+                               CF_APPEND_TEXT(cf_new_extra_cppflags,$cf_add_cflags)
                                continue
                        elif test "${cf_tst_cflags}" = "\"'" ; then
                                continue
                        elif test "${cf_tst_cflags}" = "\"'" ; then
-                               cf_new_extra_cppflags="$cf_new_extra_cppflags $cf_add_cflags"
+                               CF_APPEND_TEXT(cf_new_extra_cppflags,$cf_add_cflags)
                                continue
                        fi
                        ;;
                esac
                case "$CPPFLAGS" in
                                continue
                        fi
                        ;;
                esac
                case "$CPPFLAGS" in
-               *$cf_add_cflags) #(vi
+               (*$cf_add_cflags)
                        ;;
                        ;;
-               *) #(vi
-                       case $cf_add_cflags in #(vi
-                       -D*)
+               (*)
+                       case $cf_add_cflags in
+                       (-D*)
                                cf_tst_cppflags=`echo "x$cf_add_cflags" | sed -e 's/^...//' -e 's/=.*//'`
                                CF_REMOVE_DEFINE(CPPFLAGS,$CPPFLAGS,$cf_tst_cppflags)
                                ;;
                        esac
                                cf_tst_cppflags=`echo "x$cf_add_cflags" | sed -e 's/^...//' -e 's/=.*//'`
                                CF_REMOVE_DEFINE(CPPFLAGS,$CPPFLAGS,$cf_tst_cppflags)
                                ;;
                        esac
-                       cf_new_cppflags="$cf_new_cppflags $cf_add_cflags"
+                       CF_APPEND_TEXT(cf_new_cppflags,$cf_add_cflags)
                        ;;
                esac
                ;;
                        ;;
                esac
                ;;
-       *)
-               cf_new_cflags="$cf_new_cflags $cf_add_cflags"
+       (*)
+               CF_APPEND_TEXT(cf_new_cflags,$cf_add_cflags)
                ;;
        esac
        ;;
                ;;
        esac
        ;;
-yes)
-       cf_new_extra_cppflags="$cf_new_extra_cppflags $cf_add_cflags"
+(yes)
+       CF_APPEND_TEXT(cf_new_extra_cppflags,$cf_add_cflags)
 
        cf_tst_cflags=`echo ${cf_add_cflags} |sed -e 's/^[[^"]]*"'\''//'`
 
 
        cf_tst_cflags=`echo ${cf_add_cflags} |sed -e 's/^[[^"]]*"'\''//'`
 
-       test "${cf_add_cflags}" != "${cf_tst_cflags}" \
+       test "x${cf_add_cflags}" != "x${cf_tst_cflags}" \
                && test -z "${cf_tst_cflags}" \
                && cf_fix_cppflags=no
        ;;
                && test -z "${cf_tst_cflags}" \
                && cf_fix_cppflags=no
        ;;
@@ -190,24 +226,24 @@ done
 
 if test -n "$cf_new_cflags" ; then
        ifelse([$2],,,[CF_VERBOSE(add to \$CFLAGS $cf_new_cflags)])
 
 if test -n "$cf_new_cflags" ; then
        ifelse([$2],,,[CF_VERBOSE(add to \$CFLAGS $cf_new_cflags)])
-       CFLAGS="$CFLAGS $cf_new_cflags"
+       CF_APPEND_TEXT(CFLAGS,$cf_new_cflags)
 fi
 
 if test -n "$cf_new_cppflags" ; then
        ifelse([$2],,,[CF_VERBOSE(add to \$CPPFLAGS $cf_new_cppflags)])
 fi
 
 if test -n "$cf_new_cppflags" ; then
        ifelse([$2],,,[CF_VERBOSE(add to \$CPPFLAGS $cf_new_cppflags)])
-       CPPFLAGS="$CPPFLAGS $cf_new_cppflags"
+       CF_APPEND_TEXT(CPPFLAGS,$cf_new_cppflags)
 fi
 
 if test -n "$cf_new_extra_cppflags" ; then
        ifelse([$2],,,[CF_VERBOSE(add to \$EXTRA_CPPFLAGS $cf_new_extra_cppflags)])
 fi
 
 if test -n "$cf_new_extra_cppflags" ; then
        ifelse([$2],,,[CF_VERBOSE(add to \$EXTRA_CPPFLAGS $cf_new_extra_cppflags)])
-       EXTRA_CPPFLAGS="$cf_new_extra_cppflags $EXTRA_CPPFLAGS"
+       CF_APPEND_TEXT(EXTRA_CPPFLAGS,$cf_new_extra_cppflags)
 fi
 
 AC_SUBST(EXTRA_CPPFLAGS)
 
 ])dnl
 dnl ---------------------------------------------------------------------------
 fi
 
 AC_SUBST(EXTRA_CPPFLAGS)
 
 ])dnl
 dnl ---------------------------------------------------------------------------
-dnl CF_ADD_INCDIR version: 13 updated: 2010/05/26 16:44:57
+dnl CF_ADD_INCDIR version: 15 updated: 2018/06/20 20:23:13
 dnl -------------
 dnl Add an include-directory to $CPPFLAGS.  Don't add /usr/include, since it's
 dnl redundant.  We don't normally need to add -I/usr/local/include for gcc,
 dnl -------------
 dnl Add an include-directory to $CPPFLAGS.  Don't add /usr/include, since it's
 dnl redundant.  We don't normally need to add -I/usr/local/include for gcc,
@@ -238,7 +274,7 @@ if test -n "$1" ; then
                        if test "$GCC" = yes
                        then
                          cf_save_CPPFLAGS=$CPPFLAGS
                        if test "$GCC" = yes
                        then
                          cf_save_CPPFLAGS=$CPPFLAGS
-                         CPPFLAGS="$CPPFLAGS -I$cf_add_incdir"
+                         CF_APPEND_TEXT(CPPFLAGS,-I$cf_add_incdir)
                          AC_TRY_COMPILE([#include <stdio.h>],
                                  [printf("Hello")],
                                  [],
                          AC_TRY_COMPILE([#include <stdio.h>],
                                  [printf("Hello")],
                                  [],
@@ -258,6 +294,8 @@ if test -n "$1" ; then
                else
                  break
                fi
                else
                  break
                fi
+         else
+               break
          fi
        done
   done
          fi
        done
   done
@@ -272,7 +310,7 @@ dnl $1 = library to add, without the "-l"
 dnl $2 = variable to update (default $LIBS)
 AC_DEFUN([CF_ADD_LIB],[CF_ADD_LIBS(-l$1,ifelse($2,,LIBS,[$2]))])dnl
 dnl ---------------------------------------------------------------------------
 dnl $2 = variable to update (default $LIBS)
 AC_DEFUN([CF_ADD_LIB],[CF_ADD_LIBS(-l$1,ifelse($2,,LIBS,[$2]))])dnl
 dnl ---------------------------------------------------------------------------
-dnl CF_ADD_LIBDIR version: 9 updated: 2010/05/26 16:44:57
+dnl CF_ADD_LIBDIR version: 10 updated: 2015/04/18 08:56:57
 dnl -------------
 dnl    Adds to the library-path
 dnl
 dnl -------------
 dnl    Adds to the library-path
 dnl
@@ -284,39 +322,57 @@ dnl
 AC_DEFUN([CF_ADD_LIBDIR],
 [
 if test -n "$1" ; then
 AC_DEFUN([CF_ADD_LIBDIR],
 [
 if test -n "$1" ; then
-  for cf_add_libdir in $1
-  do
-    if test $cf_add_libdir = /usr/lib ; then
-      :
-    elif test -d $cf_add_libdir
-    then
-      cf_have_libdir=no
-      if test -n "$LDFLAGS$LIBS" ; then
-        # a loop is needed to ensure we can add subdirs of existing dirs
-        for cf_test_libdir in $LDFLAGS $LIBS ; do
-          if test ".$cf_test_libdir" = ".-L$cf_add_libdir" ; then
-            cf_have_libdir=yes; break
-          fi
-        done
-      fi
-      if test "$cf_have_libdir" = no ; then
-        CF_VERBOSE(adding $cf_add_libdir to library-path)
-        ifelse([$2],,LDFLAGS,[$2])="-L$cf_add_libdir $ifelse([$2],,LDFLAGS,[$2])"
-      fi
-    fi
-  done
+       for cf_add_libdir in $1
+       do
+               if test $cf_add_libdir = /usr/lib ; then
+                       :
+               elif test -d $cf_add_libdir
+               then
+                       cf_have_libdir=no
+                       if test -n "$LDFLAGS$LIBS" ; then
+                               # a loop is needed to ensure we can add subdirs of existing dirs
+                               for cf_test_libdir in $LDFLAGS $LIBS ; do
+                                       if test ".$cf_test_libdir" = ".-L$cf_add_libdir" ; then
+                                               cf_have_libdir=yes; break
+                                       fi
+                               done
+                       fi
+                       if test "$cf_have_libdir" = no ; then
+                               CF_VERBOSE(adding $cf_add_libdir to library-path)
+                               ifelse([$2],,LDFLAGS,[$2])="-L$cf_add_libdir $ifelse([$2],,LDFLAGS,[$2])"
+                       fi
+               fi
+       done
 fi
 ])dnl
 dnl ---------------------------------------------------------------------------
 fi
 ])dnl
 dnl ---------------------------------------------------------------------------
-dnl CF_ADD_LIBS version: 1 updated: 2010/06/02 05:03:05
+dnl CF_ADD_LIBS version: 2 updated: 2014/07/13 14:33:27
 dnl -----------
 dnl -----------
-dnl Add one or more libraries, used to enforce consistency.
+dnl Add one or more libraries, used to enforce consistency.  Libraries are
+dnl prepended to an existing list, since their dependencies are assumed to
+dnl already exist in the list.
 dnl
 dnl $1 = libraries to add, with the "-l", etc.
 dnl $2 = variable to update (default $LIBS)
 dnl
 dnl $1 = libraries to add, with the "-l", etc.
 dnl $2 = variable to update (default $LIBS)
-AC_DEFUN([CF_ADD_LIBS],[ifelse($2,,LIBS,[$2])="$1 [$]ifelse($2,,LIBS,[$2])"])dnl
+AC_DEFUN([CF_ADD_LIBS],[
+cf_add_libs="$1"
+# Filter out duplicates - this happens with badly-designed ".pc" files...
+for cf_add_1lib in [$]ifelse($2,,LIBS,[$2])
+do
+       for cf_add_2lib in $cf_add_libs
+       do
+               if test "x$cf_add_1lib" = "x$cf_add_2lib"
+               then
+                       cf_add_1lib=
+                       break
+               fi
+       done
+       test -n "$cf_add_1lib" && cf_add_libs="$cf_add_libs $cf_add_1lib"
+done
+ifelse($2,,LIBS,[$2])="$cf_add_libs"
+])dnl
 dnl ---------------------------------------------------------------------------
 dnl ---------------------------------------------------------------------------
-dnl CF_ADD_SUBDIR_PATH version: 3 updated: 2010/07/03 20:58:12
+dnl CF_ADD_SUBDIR_PATH version: 4 updated: 2013/10/08 17:47:05
 dnl ------------------
 dnl Append to a search-list for a nonstandard header/lib-file
 dnl    $1 = the variable to return as result
 dnl ------------------
 dnl Append to a search-list for a nonstandard header/lib-file
 dnl    $1 = the variable to return as result
@@ -326,9 +382,9 @@ dnl $4 = the directory under which we will test for subdirectories
 dnl $5 = a directory that we do not want $4 to match
 AC_DEFUN([CF_ADD_SUBDIR_PATH],
 [
 dnl $5 = a directory that we do not want $4 to match
 AC_DEFUN([CF_ADD_SUBDIR_PATH],
 [
-test "$4" != "$5" && \
+test "x$4" != "x$5" && \
 test -d "$4" && \
 test -d "$4" && \
-ifelse([$5],NONE,,[(test $5 = NONE || test "$4" != "$5") &&]) {
+ifelse([$5],NONE,,[(test -z "$5" || test x$5 = xNONE || test "x$4" != "x$5") &&]) {
        test -n "$verbose" && echo "    ... testing for $3-directories under $4"
        test -d $4/$3 &&          $1="[$]$1 $4/$3"
        test -d $4/$3/$2 &&       $1="[$]$1 $4/$3/$2"
        test -n "$verbose" && echo "    ... testing for $3-directories under $4"
        test -d $4/$3 &&          $1="[$]$1 $4/$3"
        test -d $4/$3/$2 &&       $1="[$]$1 $4/$3/$2"
@@ -338,13 +394,29 @@ ifelse([$5],NONE,,[(test $5 = NONE || test "$4" != "$5") &&]) {
 }
 ])dnl
 dnl ---------------------------------------------------------------------------
 }
 ])dnl
 dnl ---------------------------------------------------------------------------
+dnl CF_APPEND_TEXT version: 1 updated: 2017/02/25 18:58:55
+dnl --------------
+dnl use this macro for appending text without introducing an extra blank at
+dnl the beginning
+define([CF_APPEND_TEXT],
+[
+       test -n "[$]$1" && $1="[$]$1 "
+       $1="[$]{$1}$2"
+])dnl
+dnl ---------------------------------------------------------------------------
 dnl CF_ARG_DISABLE version: 3 updated: 1999/03/30 17:24:31
 dnl --------------
 dnl Allow user to disable a normally-on option.
 AC_DEFUN([CF_ARG_DISABLE],
 [CF_ARG_OPTION($1,[$2],[$3],[$4],yes)])dnl
 dnl ---------------------------------------------------------------------------
 dnl CF_ARG_DISABLE version: 3 updated: 1999/03/30 17:24:31
 dnl --------------
 dnl Allow user to disable a normally-on option.
 AC_DEFUN([CF_ARG_DISABLE],
 [CF_ARG_OPTION($1,[$2],[$3],[$4],yes)])dnl
 dnl ---------------------------------------------------------------------------
-dnl CF_ARG_OPTION version: 4 updated: 2010/05/26 05:38:42
+dnl CF_ARG_ENABLE version: 3 updated: 1999/03/30 17:24:31
+dnl -------------
+dnl Allow user to enable a normally-off option.
+AC_DEFUN([CF_ARG_ENABLE],
+[CF_ARG_OPTION($1,[$2],[$3],[$4],no)])dnl
+dnl ---------------------------------------------------------------------------
+dnl CF_ARG_OPTION version: 5 updated: 2015/05/10 19:52:14
 dnl -------------
 dnl Restricted form of AC_ARG_ENABLE that ensures user doesn't give bogus
 dnl values.
 dnl -------------
 dnl Restricted form of AC_ARG_ENABLE that ensures user doesn't give bogus
 dnl values.
@@ -357,25 +429,29 @@ dnl $4 = action if perform if option is default
 dnl $5 = default option value (either 'yes' or 'no')
 AC_DEFUN([CF_ARG_OPTION],
 [AC_ARG_ENABLE([$1],[$2],[test "$enableval" != ifelse([$5],no,yes,no) && enableval=ifelse([$5],no,no,yes)
 dnl $5 = default option value (either 'yes' or 'no')
 AC_DEFUN([CF_ARG_OPTION],
 [AC_ARG_ENABLE([$1],[$2],[test "$enableval" != ifelse([$5],no,yes,no) && enableval=ifelse([$5],no,no,yes)
-  if test "$enableval" != "$5" ; then
+       if test "$enableval" != "$5" ; then
 ifelse([$3],,[    :]dnl
 ,[    $3]) ifelse([$4],,,[
 ifelse([$3],,[    :]dnl
 ,[    $3]) ifelse([$4],,,[
-  else
-    $4])
-  fi],[enableval=$5 ifelse([$4],,,[
-  $4
+       else
+               $4])
+       fi],[enableval=$5 ifelse([$4],,,[
+       $4
 ])dnl
 ])dnl
-  ])])dnl
+])])dnl
 dnl ---------------------------------------------------------------------------
 dnl ---------------------------------------------------------------------------
-dnl CF_AR_FLAGS version: 5 updated: 2010/05/20 20:24:29
+dnl CF_AR_FLAGS version: 6 updated: 2015/10/10 15:25:05
 dnl -----------
 dnl Check for suitable "ar" (archiver) options for updating an archive.
 dnl -----------
 dnl Check for suitable "ar" (archiver) options for updating an archive.
+dnl
+dnl In particular, handle some obsolete cases where the "-" might be omitted,
+dnl as well as a workaround for breakage of make's archive rules by the GNU
+dnl binutils "ar" program.
 AC_DEFUN([CF_AR_FLAGS],[
 AC_REQUIRE([CF_PROG_AR])
 
 AC_CACHE_CHECK(for options to update archives, cf_cv_ar_flags,[
        cf_cv_ar_flags=unknown
 AC_DEFUN([CF_AR_FLAGS],[
 AC_REQUIRE([CF_PROG_AR])
 
 AC_CACHE_CHECK(for options to update archives, cf_cv_ar_flags,[
        cf_cv_ar_flags=unknown
-       for cf_ar_flags in -curv curv -crv crv -cqv cqv -rv rv
+       for cf_ar_flags in -curvU -curv curv -crv crv -cqv cqv -rv rv
        do
 
                # check if $ARFLAGS already contains this choice
        do
 
                # check if $ARFLAGS already contains this choice
@@ -420,7 +496,7 @@ fi
 AC_SUBST(ARFLAGS)
 ])
 dnl ---------------------------------------------------------------------------
 AC_SUBST(ARFLAGS)
 ])
 dnl ---------------------------------------------------------------------------
-dnl CF_AWK_BIG_PRINTF version: 4 updated: 2011/10/30 17:09:50
+dnl CF_AWK_BIG_PRINTF version: 5 updated: 2015/04/17 21:13:04
 dnl -----------------
 dnl Check if awk can handle big strings using printf.  Some older versions of
 dnl awk choke on large strings passed via "%s".
 dnl -----------------
 dnl Check if awk can handle big strings using printf.  Some older versions of
 dnl awk choke on large strings passed via "%s".
@@ -429,11 +505,11 @@ dnl $1 = desired string size
 dnl $2 = variable to set with result
 AC_DEFUN([CF_AWK_BIG_PRINTF],
 [
 dnl $2 = variable to set with result
 AC_DEFUN([CF_AWK_BIG_PRINTF],
 [
-       case x$AWK in #(vi
-       x)
+       case x$AWK in
+       (x)
                eval $2=no
                ;;
                eval $2=no
                ;;
-       *) #(vi
+       (*)
                if ( ${AWK} 'BEGIN { xx = "x"; while (length(xx) < $1) { xx = xx "x"; }; printf("%s\n", xx); }' 2>/dev/null \
                        | $AWK '{ printf "%d\n", length([$]0); }' 2>/dev/null | $AWK 'BEGIN { eqls=0; recs=0; } { recs++; if ([$]0 == 12000) eqls++; } END { if (recs != 1 || eqls != 1) exit 1; }' 2>/dev/null >/dev/null ) ; then
                        eval $2=yes
                if ( ${AWK} 'BEGIN { xx = "x"; while (length(xx) < $1) { xx = xx "x"; }; printf("%s\n", xx); }' 2>/dev/null \
                        | $AWK '{ printf "%d\n", length([$]0); }' 2>/dev/null | $AWK 'BEGIN { eqls=0; recs=0; } { recs++; if ([$]0 == 12000) eqls++; } END { if (recs != 1 || eqls != 1) exit 1; }' 2>/dev/null >/dev/null ) ; then
                        eval $2=yes
@@ -491,7 +567,7 @@ else        AC_MSG_RESULT(no)
 fi
 ])dnl
 dnl ---------------------------------------------------------------------------
 fi
 ])dnl
 dnl ---------------------------------------------------------------------------
-dnl CF_BOOL_SIZE version: 12 updated: 2006/12/16 12:33:30
+dnl CF_BOOL_SIZE version: 15 updated: 2017/01/21 11:06:25
 dnl ------------
 dnl Test for the size of 'bool' in the configured C++ compiler (e.g., a type).
 dnl Don't bother looking for bool.h, since it's been deprecated.
 dnl ------------
 dnl Test for the size of 'bool' in the configured C++ compiler (e.g., a type).
 dnl Don't bother looking for bool.h, since it's been deprecated.
@@ -525,7 +601,7 @@ AC_CACHE_VAL(cf_cv_type_of_bool,[
 
 #endif
 
 
 #endif
 
-main()
+int main(void)
 {
        FILE *fp = fopen("cf_test.out", "w");
        if (fp != 0) {
 {
        FILE *fp = fopen("cf_test.out", "w");
        if (fp != 0) {
@@ -551,15 +627,15 @@ main()
        rm -f cf_test.out
 AC_MSG_RESULT($cf_cv_type_of_bool)
 if test "$cf_cv_type_of_bool" = unknown ; then
        rm -f cf_test.out
 AC_MSG_RESULT($cf_cv_type_of_bool)
 if test "$cf_cv_type_of_bool" = unknown ; then
-       case .$NCURSES_BOOL in #(vi
-       .auto|.) NCURSES_BOOL=unsigned;;
+       case .$NCURSES_BOOL in
+       (.auto|.) NCURSES_BOOL=unsigned;;
        esac
        AC_MSG_WARN(Assuming $NCURSES_BOOL for type of bool)
        cf_cv_type_of_bool=$NCURSES_BOOL
 fi
 ])dnl
 dnl ---------------------------------------------------------------------------
        esac
        AC_MSG_WARN(Assuming $NCURSES_BOOL for type of bool)
        cf_cv_type_of_bool=$NCURSES_BOOL
 fi
 ])dnl
 dnl ---------------------------------------------------------------------------
-dnl CF_BUILD_CC version: 7 updated: 2012/10/06 15:31:55
+dnl CF_BUILD_CC version: 8 updated: 2018/01/04 20:31:04
 dnl -----------
 dnl If we're cross-compiling, allow the user to override the tools and their
 dnl options.  The configure script is oriented toward identifying the host
 dnl -----------
 dnl If we're cross-compiling, allow the user to override the tools and their
 dnl options.  The configure script is oriented toward identifying the host
@@ -584,7 +660,7 @@ if test "$cross_compiling" = yes ; then
        AC_ARG_WITH(build-cc,
                [  --with-build-cc=XXX     the build C compiler ($BUILD_CC)],
                [BUILD_CC="$withval"],
        AC_ARG_WITH(build-cc,
                [  --with-build-cc=XXX     the build C compiler ($BUILD_CC)],
                [BUILD_CC="$withval"],
-               [AC_CHECK_PROGS(BUILD_CC, gcc cc cl)])
+               [AC_CHECK_PROGS(BUILD_CC, [gcc clang c99 c89 cc cl],none)])
        AC_MSG_CHECKING(for native build C compiler)
        AC_MSG_RESULT($BUILD_CC)
 
        AC_MSG_CHECKING(for native build C compiler)
        AC_MSG_RESULT($BUILD_CC)
 
@@ -651,33 +727,71 @@ AC_SUBST(BUILD_EXEEXT)
 AC_SUBST(BUILD_OBJEXT)
 ])dnl
 dnl ---------------------------------------------------------------------------
 AC_SUBST(BUILD_OBJEXT)
 ])dnl
 dnl ---------------------------------------------------------------------------
-dnl CF_CC_ENV_FLAGS version: 1 updated: 2012/10/03 05:25:49
+dnl CF_CC_ENV_FLAGS version: 9 updated: 2018/07/29 18:03:26
 dnl ---------------
 dnl Check for user's environment-breakage by stuffing CFLAGS/CPPFLAGS content
 dnl ---------------
 dnl Check for user's environment-breakage by stuffing CFLAGS/CPPFLAGS content
-dnl into CC.  This will not help with broken scripts that wrap the compiler with
-dnl options, but eliminates a more common category of user confusion.
+dnl into CC.  This will not help with broken scripts that wrap the compiler
+dnl with options, but eliminates a more common category of user confusion.
+dnl
+dnl In particular, it addresses the problem of being able to run the C
+dnl preprocessor in a consistent manner.
+dnl
+dnl Caveat: this also disallows blanks in the pathname for the compiler, but
+dnl the nuisance of having inconsistent settings for compiler and preprocessor
+dnl outweighs that limitation.
 AC_DEFUN([CF_CC_ENV_FLAGS],
 [
 # This should have been defined by AC_PROG_CC
 : ${CC:=cc}
 
 AC_DEFUN([CF_CC_ENV_FLAGS],
 [
 # This should have been defined by AC_PROG_CC
 : ${CC:=cc}
 
+AC_MSG_CHECKING(\$CFLAGS variable)
+case "x$CFLAGS" in
+(*-[[IUD]]*)
+       AC_MSG_RESULT(broken)
+       AC_MSG_WARN(your environment uses the CFLAGS variable to hold CPPFLAGS options)
+       cf_flags="$CFLAGS"
+       CFLAGS=
+       for cf_arg in $cf_flags
+       do
+               CF_ADD_CFLAGS($cf_arg)
+       done
+       ;;
+(*)
+       AC_MSG_RESULT(ok)
+       ;;
+esac
+
 AC_MSG_CHECKING(\$CC variable)
 AC_MSG_CHECKING(\$CC variable)
-case "$CC" in #(vi
-*[[\ \ ]]-[[IUD]]*)
+case "$CC" in
+(*[[\ \        ]]-*)
        AC_MSG_RESULT(broken)
        AC_MSG_RESULT(broken)
-       AC_MSG_WARN(your environment misuses the CC variable to hold CFLAGS/CPPFLAGS options)
+       AC_MSG_WARN(your environment uses the CC variable to hold CFLAGS/CPPFLAGS options)
        # humor him...
        # humor him...
-       cf_flags=`echo "$CC" | sed -e 's/^[[^   ]]*[[   ]]//'`
-       CC=`echo "$CC" | sed -e 's/[[   ]].*//'`
-       CF_ADD_CFLAGS($cf_flags)
+       cf_prog=`echo "$CC" | sed -e 's/        / /g' -e 's/[[ ]]* / /g' -e 's/[[ ]]*[[ ]]-[[^ ]].*//'`
+       cf_flags=`echo "$CC" | ${AWK:-awk} -v prog="$cf_prog" '{ printf("%s", [substr]([$]0,1+length(prog))); }'`
+       CC="$cf_prog"
+       for cf_arg in $cf_flags
+       do
+               case "x$cf_arg" in
+               (x-[[IUDfgOW]]*)
+                       CF_ADD_CFLAGS($cf_arg)
+                       ;;
+               (*)
+                       CC="$CC $cf_arg"
+                       ;;
+               esac
+       done
+       CF_VERBOSE(resulting CC: '$CC')
+       CF_VERBOSE(resulting CFLAGS: '$CFLAGS')
+       CF_VERBOSE(resulting CPPFLAGS: '$CPPFLAGS')
        ;;
        ;;
-*)
+(*)
        AC_MSG_RESULT(ok)
        ;;
 esac
 ])dnl
 dnl ---------------------------------------------------------------------------
        AC_MSG_RESULT(ok)
        ;;
 esac
 ])dnl
 dnl ---------------------------------------------------------------------------
-dnl CF_CFG_DEFAULTS version: 8 updated: 2011/06/04 20:09:13
+dnl CF_CFG_DEFAULTS version: 11 updated: 2015/04/17 21:13:04
 dnl ---------------
 dnl Determine the default configuration into which we'll install ncurses.  This
 dnl can be overridden by the user's command-line options.  There's two items to
 dnl ---------------
 dnl Determine the default configuration into which we'll install ncurses.  This
 dnl can be overridden by the user's command-line options.  There's two items to
@@ -695,10 +809,10 @@ AC_MSG_CHECKING(for prefix)
 if test "x$prefix" = "xNONE" ; then
        case "$cf_cv_system_name" in
                # non-vendor systems don't have a conflict
 if test "x$prefix" = "xNONE" ; then
        case "$cf_cv_system_name" in
                # non-vendor systems don't have a conflict
-       openbsd*|freebsd*|mirbsd*|linux*|cygwin*|k*bsd*-gnu)
+       (openbsd*|freebsd*|mirbsd*|linux*|cygwin*|msys*|k*bsd*-gnu|mingw*)
                prefix=/usr
                ;;
                prefix=/usr
                ;;
-       *)      prefix=$ac_default_prefix
+       (*)     prefix=$ac_default_prefix
                ;;
        esac
 fi
                ;;
        esac
 fi
@@ -731,7 +845,7 @@ AC_MSG_RESULT($includedir)
 fi
 ])dnl
 dnl ---------------------------------------------------------------------------
 fi
 ])dnl
 dnl ---------------------------------------------------------------------------
-dnl CF_CGETENT version: 5 updated: 2012/10/06 17:56:13
+dnl CF_CGETENT version: 6 updated: 2017/01/21 11:06:25
 dnl ----------
 dnl Check if the terminal-capability database functions are available.  If not,
 dnl ncurses has a much-reduced version.
 dnl ----------
 dnl Check if the terminal-capability database functions are available.  If not,
 dnl ncurses has a much-reduced version.
@@ -755,6 +869,7 @@ then
        AC_DEFINE(HAVE_BSD_CGETENT,1,[Define to 1 if we have BSD cgetent])
 AC_CACHE_CHECK(if cgetent uses const parameter,cf_cv_cgetent_const,[
 AC_TRY_LINK([
        AC_DEFINE(HAVE_BSD_CGETENT,1,[Define to 1 if we have BSD cgetent])
 AC_CACHE_CHECK(if cgetent uses const parameter,cf_cv_cgetent_const,[
 AC_TRY_LINK([
+#pragma GCC diagnostic error "-Wincompatible-pointer-types-discards-qualifiers"
 #include <stdlib.h>],[
        char temp[128];
        char *buf = temp;
 #include <stdlib.h>],[
        char temp[128];
        char *buf = temp;
@@ -810,7 +925,7 @@ if test ".$system_name" != ".$cf_cv_system_name" ; then
 fi
 ])dnl
 dnl ---------------------------------------------------------------------------
 fi
 ])dnl
 dnl ---------------------------------------------------------------------------
-dnl CF_CHECK_ERRNO version: 11 updated: 2010/05/26 05:38:42
+dnl CF_CHECK_ERRNO version: 12 updated: 2015/04/18 08:56:57
 dnl --------------
 dnl Check for data that is usually declared in <stdio.h> or <errno.h>, e.g.,
 dnl the 'errno' variable.  Define a DECL_xxx symbol if we must declare it
 dnl --------------
 dnl Check for data that is usually declared in <stdio.h> or <errno.h>, e.g.,
 dnl the 'errno' variable.  Define a DECL_xxx symbol if we must declare it
@@ -821,28 +936,28 @@ dnl $2 = the assumed type
 AC_DEFUN([CF_CHECK_ERRNO],
 [
 AC_CACHE_CHECK(if external $1 is declared, cf_cv_dcl_$1,[
 AC_DEFUN([CF_CHECK_ERRNO],
 [
 AC_CACHE_CHECK(if external $1 is declared, cf_cv_dcl_$1,[
-    AC_TRY_COMPILE([
+       AC_TRY_COMPILE([
 #ifdef HAVE_STDLIB_H
 #include <stdlib.h>
 #endif
 #include <stdio.h>
 #include <sys/types.h>
 #include <errno.h> ],
 #ifdef HAVE_STDLIB_H
 #include <stdlib.h>
 #endif
 #include <stdio.h>
 #include <sys/types.h>
 #include <errno.h> ],
-    ifelse([$2],,int,[$2]) x = (ifelse([$2],,int,[$2])) $1,
-    [cf_cv_dcl_$1=yes],
-    [cf_cv_dcl_$1=no])
+       ifelse([$2],,int,[$2]) x = (ifelse([$2],,int,[$2])) $1,
+       [cf_cv_dcl_$1=yes],
+       [cf_cv_dcl_$1=no])
 ])
 
 if test "$cf_cv_dcl_$1" = no ; then
 ])
 
 if test "$cf_cv_dcl_$1" = no ; then
-    CF_UPPER(cf_result,decl_$1)
-    AC_DEFINE_UNQUOTED($cf_result)
+       CF_UPPER(cf_result,decl_$1)
+       AC_DEFINE_UNQUOTED($cf_result)
 fi
 
 # It's possible (for near-UNIX clones) that the data doesn't exist
 CF_CHECK_EXTERN_DATA($1,ifelse([$2],,int,[$2]))
 ])dnl
 dnl ---------------------------------------------------------------------------
 fi
 
 # It's possible (for near-UNIX clones) that the data doesn't exist
 CF_CHECK_EXTERN_DATA($1,ifelse([$2],,int,[$2]))
 ])dnl
 dnl ---------------------------------------------------------------------------
-dnl CF_CHECK_EXTERN_DATA version: 3 updated: 2001/12/30 18:03:23
+dnl CF_CHECK_EXTERN_DATA version: 4 updated: 2015/04/18 08:56:57
 dnl --------------------
 dnl Check for existence of external data in the current set of libraries.  If
 dnl we can modify it, it's real enough.
 dnl --------------------
 dnl Check for existence of external data in the current set of libraries.  If
 dnl we can modify it, it's real enough.
@@ -851,23 +966,23 @@ dnl $2 = its type
 AC_DEFUN([CF_CHECK_EXTERN_DATA],
 [
 AC_CACHE_CHECK(if external $1 exists, cf_cv_have_$1,[
 AC_DEFUN([CF_CHECK_EXTERN_DATA],
 [
 AC_CACHE_CHECK(if external $1 exists, cf_cv_have_$1,[
-    AC_TRY_LINK([
+       AC_TRY_LINK([
 #undef $1
 extern $2 $1;
 ],
 #undef $1
 extern $2 $1;
 ],
-    [$1 = 2],
-    [cf_cv_have_$1=yes],
-    [cf_cv_have_$1=no])
+       [$1 = 2],
+       [cf_cv_have_$1=yes],
+       [cf_cv_have_$1=no])
 ])
 
 if test "$cf_cv_have_$1" = yes ; then
 ])
 
 if test "$cf_cv_have_$1" = yes ; then
-    CF_UPPER(cf_result,have_$1)
-    AC_DEFINE_UNQUOTED($cf_result)
+       CF_UPPER(cf_result,have_$1)
+       AC_DEFINE_UNQUOTED($cf_result)
 fi
 
 ])dnl
 dnl ---------------------------------------------------------------------------
 fi
 
 ])dnl
 dnl ---------------------------------------------------------------------------
-dnl CF_CHECK_GPM_WGETCH version: 2 updated: 2010/08/14 18:25:37
+dnl CF_CHECK_GPM_WGETCH version: 3 updated: 2017/01/21 11:06:25
 dnl -------------------
 dnl Check if GPM is already linked with curses.  If so - and if the linkage
 dnl is not "weak" - warn about this because it can create problems linking
 dnl -------------------
 dnl Check if GPM is already linked with curses.  If so - and if the linkage
 dnl is not "weak" - warn about this because it can create problems linking
@@ -881,7 +996,7 @@ if test "$cross_compiling" != yes ; then
 
 cat >conftest.$ac_ext <<CF_EOF
 #include <gpm.h>
 
 cat >conftest.$ac_ext <<CF_EOF
 #include <gpm.h>
-int main()
+int main(void)
 {
        Gpm_Wgetch();
        ${cf_cv_main_return:-return}(0);
 {
        Gpm_Wgetch();
        ${cf_cv_main_return:-return}(0);
@@ -911,15 +1026,45 @@ if test "$cf_cv_check_gpm_wgetch" != yes ; then
 fi
 ])])dnl
 dnl ---------------------------------------------------------------------------
 fi
 ])])dnl
 dnl ---------------------------------------------------------------------------
-dnl CF_CHECK_WCHAR_H version: 1 updated: 2011/10/29 15:01:05
+dnl CF_CHECK_LIBTOOL_VERSION version: 1 updated: 2013/04/06 18:03:09
+dnl ------------------------
+dnl Show the version of libtool
+dnl
+dnl Save the version in a cache variable - this is not entirely a good thing,
+dnl but the version string from libtool is very ugly, and for bug reports it
+dnl might be useful to have the original string.
+AC_DEFUN([CF_CHECK_LIBTOOL_VERSION],[
+if test -n "$LIBTOOL" && test "$LIBTOOL" != none
+then
+       AC_MSG_CHECKING(version of $LIBTOOL)
+       CF_LIBTOOL_VERSION
+       AC_MSG_RESULT($cf_cv_libtool_version)
+       if test -z "$cf_cv_libtool_version" ; then
+               AC_MSG_ERROR(This is not GNU libtool)
+       fi
+else
+       AC_MSG_ERROR(GNU libtool has not been found)
+fi
+])dnl
+dnl ---------------------------------------------------------------------------
+dnl CF_CHECK_WCHAR_H version: 2 updated: 2017/01/21 11:06:25
 dnl ----------------
 dnl Check if wchar.h can be used, i.e., without defining _XOPEN_SOURCE_EXTENDED
 AC_DEFUN([CF_CHECK_WCHAR_H],[
 dnl ----------------
 dnl Check if wchar.h can be used, i.e., without defining _XOPEN_SOURCE_EXTENDED
 AC_DEFUN([CF_CHECK_WCHAR_H],[
+AC_CHECK_HEADERS( \
+wchar.h \
+wctype.h \
+)
 AC_CACHE_CHECK(if wchar.h can be used as is,cf_cv_wchar_h_okay,[
 AC_TRY_COMPILE(
 [
 #include <stdlib.h>
 AC_CACHE_CHECK(if wchar.h can be used as is,cf_cv_wchar_h_okay,[
 AC_TRY_COMPILE(
 [
 #include <stdlib.h>
+#ifdef HAVE_WCHAR_H
 #include <wchar.h>
 #include <wchar.h>
+#endif
+#ifdef HAVE_WCTYPE_H
+#include <wctype.h>
+#endif
 ],[
        wint_t foo = 0;
        int bar = iswpunct(foo)],
 ],[
        wint_t foo = 0;
        int bar = iswpunct(foo)],
@@ -932,7 +1077,150 @@ then
 fi
 ])dnl
 dnl ---------------------------------------------------------------------------
 fi
 ])dnl
 dnl ---------------------------------------------------------------------------
-dnl CF_CLANG_COMPILER version: 1 updated: 2012/06/16 14:55:39
+dnl CF_CHECK_WCWIDTH_GRAPHICS version: 1 updated: 2015/12/19 17:47:56
+dnl -------------------------
+dnl Most "modern" terminal emulators are based to some degree on VT100, and
+dnl should support line-drawing.  Even with Unicode.  There is a problem.
+dnl
+dnl While most of the VT100 graphics characters were incorporated into Unicode,
+dnl all of those were combined into a page of useful graphics characters.
+dnl
+dnl So far, so good.
+dnl
+dnl However, while they are useful, there are other considerations.  CJK
+dnl is (because of poor device resolution) often rendered as double-width
+dnl characters.  So... for these generally-useful characters, what should
+dnl be the width (to make them consistent with adjacent characters)?
+dnl
+dnl The obvious choice would have been to make this locale-dependent, and use
+dnl wcwidth() to tell applications what the actual width is.  That was too
+dnl obvious.  Instead, we have a slew of "ambiguous-width" characters.
+dnl See for example
+dnl            http://www.unicode.org/reports/tr11/tr11-29.html
+dnl            http://www.cl.cam.ac.uk/~mgk25/ucs/scw-proposal.html
+dnl
+dnl The EastAsianWidth-6.2.0.txt file from the Unicode organization lists
+dnl more than 22,000 characters, with 1281 of those as ambiguous-width.  For
+dnl instance, it lists half (44/96) of the Latin-1 characters as
+dnl ambiguous-width.  Also, all of the box-characters at 0x2500 are ambiguous.
+dnl
+dnl What this means for the implementor is that on some systems wcwidth() can
+dnl give bad advice.  On Solaris, some of the ambiguous widths are returned as
+dnl 1 (the Latin-1 characters), while others are returned as 2 (line-drawing
+dnl characters).  These do not necessarily match the behavior of the terminal
+dnl emulator.  xterm, for instance, does an optional startup check to find if
+dnl this problem (or similar) exists with the system's locale tables, rejecting
+dnl them if they are too unreliable.
+AC_DEFUN([CF_CHECK_WCWIDTH_GRAPHICS],[
+AC_CACHE_CHECK(if wcwidth agrees graphics are single-width, cf_cv_wcwidth_graphics,[
+cat >conftest.in <<CF_EOF
+-      VT100 symbols
+0x250c upper left corner
+0x2514 lower left corner
+0x2510 upper right corner
+0x2518 lower right corner
+0x251c tee pointing left
+0x2524 tee pointing right
+0x2534 tee pointing up
+0x252c tee pointing down
+0x2500 horizontal line
+0x2502 vertical line
+0x253c large plus or crossover
+0x23ba scan line 1
+0x23bd scan line 9
+0x25c6 diamond
+0x2592 checker board (stipple)
+0x00b0 degree symbol
+0x00b1 plus/minus
+0x00b7 bullet
+-      Teletype 5410v1 symbols
+0x2190 arrow pointing left
+0x2192 arrow pointing right
+0x2193 arrow pointing down
+0x2191 arrow pointing up
+0x2592 board of squares
+0x2603 lantern symbol
+0x25ae solid square block
+-      these defaults were invented for ncurses
+0x23bb scan line 3
+0x23bc scan line 7
+0x2264 less-than-or-equal-to
+0x2265 greater-than-or-equal-to
+0x03c0 greek pi
+0x2260 not-equal
+0x00a3 pound-sterling symbol
+-      thick-line-drawing
+0x250f upper left corner
+0x2517 lower left corner
+0x2513 upper right corner
+0x251b lower right corner
+0x2523 tee pointing left
+0x252b tee pointing right
+0x253b tee pointing up
+0x2533 tee pointing down
+0x2501 horizontal line
+0x2503 vertical line
+0x254b large plus or crossover
+-      double-line-drawing
+0x2554 upper left corner
+0x255a lower left corner
+0x2557 upper right corner
+0x255d lower right corner
+0x2563 tee pointing left
+0x2560 tee pointing right
+0x2569 tee pointing up
+0x2566 tee pointing down
+0x2550 horizontal line
+0x2551 vertical line
+0x256c large plus or crossover
+CF_EOF
+AC_TRY_RUN([
+#include <locale.h>
+#include <stdio.h>
+#include <wchar.h>
+
+#define MY_LEN 80
+
+int
+main(void)
+{
+       FILE *fp;
+       int value;
+       char buffer[MY_LEN + 1];
+       char notes[MY_LEN + 1];
+       int totals = 0;
+       int passed = 0;
+
+       if (setlocale(LC_ALL, "en_US.UTF8") ||
+               setlocale(LC_ALL, "en_US.UTF-8") ||
+               setlocale(LC_ALL, "en_US.utf8") ||
+               setlocale(LC_ALL, "en_US.utf-8")) {
+               if ((fp = fopen("conftest.in", "r")) != 0) {
+                       while (fgets(buffer, MY_LEN, fp) != 0) {
+                               if (*buffer == '-') {
+                                       fprintf(stderr, "\t%s", buffer);
+                               } else if (sscanf(buffer, "%x %s", &value, notes) == 2) {
+                                       ++totals;
+                                       if (wcwidth(value) == 1)
+                                               ++passed;
+                                       fprintf(stderr, "%d\t%s", wcwidth(value), buffer);
+                               } else {
+                                       fprintf(stderr, "?\t%s", buffer);
+                               }
+                       }
+               }
+       }
+       fprintf(stderr, "%d/%d passed wcwidth/graphics check\n", passed, totals);
+       return (totals == passed) ? 0 : 1;
+}
+],
+[cf_cv_wcwidth_graphics=yes],
+[cf_cv_wcwidth_graphics=no],
+[cf_cv_wcwidth_graphics=unknown])
+])
+])dnl
+dnl ---------------------------------------------------------------------------
+dnl CF_CLANG_COMPILER version: 2 updated: 2013/11/19 19:23:35
 dnl -----------------
 dnl Check if the given compiler is really clang.  clang's C driver defines
 dnl __GNUC__ (fooling the configure script into setting $GCC to yes) but does
 dnl -----------------
 dnl Check if the given compiler is really clang.  clang's C driver defines
 dnl __GNUC__ (fooling the configure script into setting $GCC to yes) but does
@@ -943,7 +1231,7 @@ dnl ensure that it is not mistaken for gcc/g++.  It is normally invoked from
 dnl the wrappers for gcc and g++ warnings.
 dnl
 dnl $1 = GCC (default) or GXX
 dnl the wrappers for gcc and g++ warnings.
 dnl
 dnl $1 = GCC (default) or GXX
-dnl $2 = INTEL_COMPILER (default) or INTEL_CPLUSPLUS
+dnl $2 = CLANG_COMPILER (default)
 dnl $3 = CFLAGS (default) or CXXFLAGS
 AC_DEFUN([CF_CLANG_COMPILER],[
 ifelse([$2],,CLANG_COMPILER,[$2])=no
 dnl $3 = CFLAGS (default) or CXXFLAGS
 AC_DEFUN([CF_CLANG_COMPILER],[
 ifelse([$2],,CLANG_COMPILER,[$2])=no
@@ -965,7 +1253,7 @@ cf_save_CFLAGS="$cf_save_CFLAGS -Qunused-arguments"
 fi
 ])
 dnl ---------------------------------------------------------------------------
 fi
 ])
 dnl ---------------------------------------------------------------------------
-dnl CF_CPP_PARAM_INIT version: 6 updated: 2012/10/06 17:56:13
+dnl CF_CPP_PARAM_INIT version: 7 updated: 2017/01/21 11:06:25
 dnl -----------------
 dnl Check if the C++ compiler accepts duplicate parameter initialization.  This
 dnl is a late feature for the standard and is not in some recent compilers
 dnl -----------------
 dnl Check if the C++ compiler accepts duplicate parameter initialization.  This
 dnl is a late feature for the standard and is not in some recent compilers
@@ -989,7 +1277,7 @@ TEST::TEST(int x = 1)      // some compilers do not like second initializer
 {
        value = x;
 }
 {
        value = x;
 }
-int main() { }
+int main(void) { }
 ],
        [cf_cv_cpp_param_init=yes],
        [cf_cv_cpp_param_init=no],
 ],
        [cf_cv_cpp_param_init=yes],
        [cf_cv_cpp_param_init=no],
@@ -1000,7 +1288,7 @@ fi
 test "$cf_cv_cpp_param_init" = yes && AC_DEFINE(CPP_HAS_PARAM_INIT,1,[Define to 1 if C++ has parameter initialization])
 ])dnl
 dnl ---------------------------------------------------------------------------
 test "$cf_cv_cpp_param_init" = yes && AC_DEFINE(CPP_HAS_PARAM_INIT,1,[Define to 1 if C++ has parameter initialization])
 ])dnl
 dnl ---------------------------------------------------------------------------
-dnl CF_CPP_STATIC_CAST version: 2 updated: 2012/10/06 17:56:13
+dnl CF_CPP_STATIC_CAST version: 3 updated: 2013/04/13 18:03:21
 dnl ------------------
 dnl Check if the C++ compiler accepts static_cast in generics.  This appears to
 dnl not be supported in g++ before 3.0
 dnl ------------------
 dnl Check if the C++ compiler accepts static_cast in generics.  This appears to
 dnl not be supported in g++ before 3.0
@@ -1022,7 +1310,7 @@ public:
               int begin_x = 0)
   {
   }
               int begin_x = 0)
   {
   }
-
+  NCursesPanel();
   ~NCursesPanel();
 };
 
   ~NCursesPanel();
 };
 
@@ -1056,23 +1344,23 @@ fi
 test "$cf_cv_cpp_static_cast" = yes && AC_DEFINE(CPP_HAS_STATIC_CAST,1,[Define to 1 if C++ has static_cast])
 ])dnl
 dnl ---------------------------------------------------------------------------
 test "$cf_cv_cpp_static_cast" = yes && AC_DEFINE(CPP_HAS_STATIC_CAST,1,[Define to 1 if C++ has static_cast])
 ])dnl
 dnl ---------------------------------------------------------------------------
-dnl CF_CXX_AR_FLAGS version: 1 updated: 2011/10/29 08:35:34
+dnl CF_CXX_AR_FLAGS version: 2 updated: 2015/04/17 21:13:04
 dnl ---------------
 dnl Setup special archiver flags for given compilers.
 AC_DEFUN([CF_CXX_AR_FLAGS],[
        CXX_AR='$(AR)'
        CXX_ARFLAGS='$(ARFLAGS)'
 dnl ---------------
 dnl Setup special archiver flags for given compilers.
 AC_DEFUN([CF_CXX_AR_FLAGS],[
        CXX_AR='$(AR)'
        CXX_ARFLAGS='$(ARFLAGS)'
-       case $cf_cv_system_name in #(vi
-       irix*) #(vi
+       case $cf_cv_system_name in
+       (irix*)
            if test "$GXX" != yes ; then
                CXX_AR='$(CXX)'
                CXX_ARFLAGS='-ar -o'
            fi
            ;;
            if test "$GXX" != yes ; then
                CXX_AR='$(CXX)'
                CXX_ARFLAGS='-ar -o'
            fi
            ;;
-       sco3.2v5*) #(vi
+       (sco3.2v5*)
            CXXLDFLAGS="-u main"
            ;;
            CXXLDFLAGS="-u main"
            ;;
-       solaris2*)
+       (solaris2*)
            if test "$GXX" != yes ; then
                CXX_AR='$(CXX)'
                CXX_ARFLAGS='-xar -o'
            if test "$GXX" != yes ; then
                CXX_AR='$(CXX)'
                CXX_ARFLAGS='-xar -o'
@@ -1104,7 +1392,7 @@ cerr << "testing" << endl;
 fi
 ])dnl
 dnl ---------------------------------------------------------------------------
 fi
 ])dnl
 dnl ---------------------------------------------------------------------------
-dnl CF_C_INLINE version: 4 updated: 2012/06/16 14:55:39
+dnl CF_C_INLINE version: 5 updated: 2015/04/18 08:56:57
 dnl -----------
 dnl Check if the C compiler supports "inline".
 dnl $1 is the name of a shell variable to set if inline is supported
 dnl -----------
 dnl Check if the C compiler supports "inline".
 dnl $1 is the name of a shell variable to set if inline is supported
@@ -1113,28 +1401,28 @@ AC_DEFUN([CF_C_INLINE],[
 AC_C_INLINE
 $1=
 if test "$ac_cv_c_inline" != no ; then
 AC_C_INLINE
 $1=
 if test "$ac_cv_c_inline" != no ; then
-  $1=inline
-  if test "$INTEL_COMPILER" = yes
-  then
-    :
-  elif test "$CLANG_COMPILER" = yes
-  then
-    :
-  elif test "$GCC" = yes
-  then
-    AC_CACHE_CHECK(if $CC supports options to tune inlining,cf_cv_gcc_inline,[
-      cf_save_CFLAGS=$CFLAGS
-      CFLAGS="$CFLAGS --param max-inline-insns-single=$2"
-      AC_TRY_COMPILE([inline int foo(void) { return 1; }],
-      [${cf_cv_main_return:-return} foo()],
-      [cf_cv_gcc_inline=yes],
-      [cf_cv_gcc_inline=no])
-      CFLAGS=$cf_save_CFLAGS
-    ])
-    if test "$cf_cv_gcc_inline" = yes ; then
-        CF_ADD_CFLAGS([--param max-inline-insns-single=$2])
-    fi
-  fi
+       $1=inline
+       if test "$INTEL_COMPILER" = yes
+       then
+               :
+       elif test "$CLANG_COMPILER" = yes
+       then
+               :
+       elif test "$GCC" = yes
+       then
+               AC_CACHE_CHECK(if $CC supports options to tune inlining,cf_cv_gcc_inline,[
+               cf_save_CFLAGS=$CFLAGS
+               CFLAGS="$CFLAGS --param max-inline-insns-single=$2"
+               AC_TRY_COMPILE([inline int foo(void) { return 1; }],
+               [${cf_cv_main_return:-return} foo()],
+               [cf_cv_gcc_inline=yes],
+               [cf_cv_gcc_inline=no])
+               CFLAGS=$cf_save_CFLAGS
+               ])
+               if test "$cf_cv_gcc_inline" = yes ; then
+                       CF_ADD_CFLAGS([--param max-inline-insns-single=$2])
+               fi
+       fi
 fi
 AC_SUBST($1)
 ])dnl
 fi
 AC_SUBST($1)
 ])dnl
@@ -1165,7 +1453,7 @@ done
 AC_SUBST(DIRS_TO_MAKE)
 ])dnl
 dnl ---------------------------------------------------------------------------
 AC_SUBST(DIRS_TO_MAKE)
 ])dnl
 dnl ---------------------------------------------------------------------------
-dnl CF_DISABLE_ECHO version: 12 updated: 2012/10/06 16:30:28
+dnl CF_DISABLE_ECHO version: 13 updated: 2015/04/18 08:56:57
 dnl ---------------
 dnl You can always use "make -n" to see the actual options, but it's hard to
 dnl pick out/analyze warning messages when the compile-line is long.
 dnl ---------------
 dnl You can always use "make -n" to see the actual options, but it's hard to
 dnl pick out/analyze warning messages when the compile-line is long.
@@ -1182,17 +1470,17 @@ AC_MSG_CHECKING(if you want to see long compiling messages)
 CF_ARG_DISABLE(echo,
        [  --disable-echo          do not display "compiling" commands],
        [
 CF_ARG_DISABLE(echo,
        [  --disable-echo          do not display "compiling" commands],
        [
-    ECHO_LT='--silent'
-    ECHO_LD='@echo linking [$]@;'
-    RULE_CC='@echo compiling [$]<'
-    SHOW_CC='@echo compiling [$]@'
-    ECHO_CC='@'
+       ECHO_LT='--silent'
+       ECHO_LD='@echo linking [$]@;'
+       RULE_CC='@echo compiling [$]<'
+       SHOW_CC='@echo compiling [$]@'
+       ECHO_CC='@'
 ],[
 ],[
-    ECHO_LT=''
-    ECHO_LD=''
-    RULE_CC=''
-    SHOW_CC=''
-    ECHO_CC=''
+       ECHO_LT=''
+       ECHO_LD=''
+       RULE_CC=''
+       SHOW_CC=''
+       ECHO_CC=''
 ])
 AC_MSG_RESULT($enableval)
 AC_SUBST(ECHO_LT)
 ])
 AC_MSG_RESULT($enableval)
 AC_SUBST(ECHO_LT)
@@ -1202,6 +1490,17 @@ AC_SUBST(SHOW_CC)
 AC_SUBST(ECHO_CC)
 ])dnl
 dnl ---------------------------------------------------------------------------
 AC_SUBST(ECHO_CC)
 ])dnl
 dnl ---------------------------------------------------------------------------
+dnl CF_DISABLE_GNAT_PROJECTS version: 1 updated: 2014/06/01 11:34:00
+dnl ------------------------
+AC_DEFUN([CF_DISABLE_GNAT_PROJECTS],[
+AC_MSG_CHECKING(if we want to use GNAT projects)
+CF_ARG_DISABLE(gnat-projects,
+       [  --disable-gnat-projects test: disable GNAT projects even if usable],
+       [enable_gnat_projects=no],
+       [enable_gnat_projects=yes])
+AC_MSG_RESULT($enable_gnat_projects)
+])dnl
+dnl ---------------------------------------------------------------------------
 dnl CF_DISABLE_LEAKS version: 7 updated: 2012/10/02 20:55:03
 dnl ----------------
 dnl Combine no-leak checks with the libraries or tools that are used for the
 dnl CF_DISABLE_LEAKS version: 7 updated: 2012/10/02 20:55:03
 dnl ----------------
 dnl Combine no-leak checks with the libraries or tools that are used for the
@@ -1225,7 +1524,7 @@ if test "$with_no_leaks" = yes ; then
 fi
 ])dnl
 dnl ---------------------------------------------------------------------------
 fi
 ])dnl
 dnl ---------------------------------------------------------------------------
-dnl CF_DISABLE_LIBTOOL_VERSION version: 1 updated: 2010/05/15 15:45:59
+dnl CF_DISABLE_LIBTOOL_VERSION version: 3 updated: 2015/04/17 21:13:04
 dnl --------------------------
 dnl Check if we should use the libtool 1.5 feature "-version-number" instead of
 dnl the older "-version-info" feature.  The newer feature allows us to use
 dnl --------------------------
 dnl Check if we should use the libtool 1.5 feature "-version-number" instead of
 dnl the older "-version-info" feature.  The newer feature allows us to use
@@ -1244,8 +1543,25 @@ if test "$cf_libtool_version" = yes ; then
        LIBTOOL_VERSION="-version-number"
 else
        LIBTOOL_VERSION="-version-info"
        LIBTOOL_VERSION="-version-number"
 else
        LIBTOOL_VERSION="-version-info"
+       case "x$VERSION" in
+       (x)
+               AC_MSG_WARN(VERSION was not set)
+               ;;
+       (x*.*.*)
+               ABI_VERSION="$VERSION"
+               CF_VERBOSE(ABI_VERSION: $ABI_VERSION)
+               ;;
+       (x*:*:*)
+               ABI_VERSION=`echo "$VERSION" | sed -e 's/:/./g'`
+               CF_VERBOSE(ABI_VERSION: $ABI_VERSION)
+               ;;
+       (*)
+               AC_MSG_WARN(unexpected VERSION value: $VERSION)
+               ;;
+       esac
 fi
 
 fi
 
+AC_SUBST(ABI_VERSION)
 AC_SUBST(LIBTOOL_VERSION)
 ])dnl
 dnl ---------------------------------------------------------------------------
 AC_SUBST(LIBTOOL_VERSION)
 ])dnl
 dnl ---------------------------------------------------------------------------
@@ -1268,7 +1584,7 @@ if test "$cf_disable_rpath_hack" = no ; then
 fi
 ])
 dnl ---------------------------------------------------------------------------
 fi
 ])
 dnl ---------------------------------------------------------------------------
-dnl CF_ENABLE_PC_FILES version: 9 updated: 2012/08/04 13:59:54
+dnl CF_ENABLE_PC_FILES version: 13 updated: 2015/11/01 05:27:39
 dnl ------------------
 dnl This is the "--enable-pc-files" option, which is available if there is a
 dnl pkg-config configuration on the local machine.
 dnl ------------------
 dnl This is the "--enable-pc-files" option, which is available if there is a
 dnl pkg-config configuration on the local machine.
@@ -1276,20 +1592,34 @@ AC_DEFUN([CF_ENABLE_PC_FILES],[
 AC_REQUIRE([CF_PKG_CONFIG])
 AC_REQUIRE([CF_WITH_PKG_CONFIG_LIBDIR])
 
 AC_REQUIRE([CF_PKG_CONFIG])
 AC_REQUIRE([CF_WITH_PKG_CONFIG_LIBDIR])
 
-if test "$PKG_CONFIG" != none ; then
+if test "x$PKG_CONFIG" != xnone
+then
        AC_MSG_CHECKING(if we should install .pc files for $PKG_CONFIG)
        AC_MSG_CHECKING(if we should install .pc files for $PKG_CONFIG)
-       AC_ARG_ENABLE(pc-files,
-               [  --enable-pc-files       generate and install .pc files for pkg-config],
-               [enable_pc_files=$enableval],
-               [enable_pc_files=no])
-       AC_MSG_RESULT($enable_pc_files)
-       if test "$enable_pc_files" != no
-       then
+else
+       AC_MSG_CHECKING(if we should install .pc files)
+fi
+
+AC_ARG_ENABLE(pc-files,
+       [  --enable-pc-files       generate and install .pc files for pkg-config],
+       [enable_pc_files=$enableval],
+       [enable_pc_files=no])
+AC_MSG_RESULT($enable_pc_files)
+
+if test "x$enable_pc_files" != xno
+then
+       MAKE_PC_FILES=
+       case "x$PKG_CONFIG_LIBDIR" in
+       (xno|xyes)
+               AC_MSG_WARN(no PKG_CONFIG_LIBDIR was found)
+               ;;
+       (*)
                CF_PATH_SYNTAX(PKG_CONFIG_LIBDIR)
                CF_PATH_SYNTAX(PKG_CONFIG_LIBDIR)
-       fi
+               ;;
+       esac
 else
 else
-       enable_pc_files=no
+       MAKE_PC_FILES="#"
 fi
 fi
+AC_SUBST(MAKE_PC_FILES)
 ])dnl
 dnl ---------------------------------------------------------------------------
 dnl CF_ENABLE_RPATH version: 2 updated: 2010/03/27 18:39:42
 ])dnl
 dnl ---------------------------------------------------------------------------
 dnl CF_ENABLE_RPATH version: 2 updated: 2010/03/27 18:39:42
@@ -1306,7 +1636,7 @@ AC_ARG_ENABLE(rpath,
 AC_MSG_RESULT($cf_cv_enable_rpath)
 ])dnl
 dnl ---------------------------------------------------------------------------
 AC_MSG_RESULT($cf_cv_enable_rpath)
 ])dnl
 dnl ---------------------------------------------------------------------------
-dnl CF_ENABLE_STRING_HACKS version: 2 updated: 2012/10/06 17:56:13
+dnl CF_ENABLE_STRING_HACKS version: 5 updated: 2016/10/08 17:34:11
 dnl ----------------------
 dnl On a few platforms, the compiler and/or loader nags with untruthful
 dnl comments stating that "most" uses of strcat/strcpy/sprintf are incorrect,
 dnl ----------------------
 dnl On a few platforms, the compiler and/or loader nags with untruthful
 dnl comments stating that "most" uses of strcat/strcpy/sprintf are incorrect,
@@ -1325,7 +1655,7 @@ AC_DEFUN([CF_ENABLE_STRING_HACKS],
 [
 AC_MSG_CHECKING(if you want to work around bogus compiler/loader warnings)
 AC_ARG_ENABLE(string-hacks,
 [
 AC_MSG_CHECKING(if you want to work around bogus compiler/loader warnings)
 AC_ARG_ENABLE(string-hacks,
-       [  --enable-string-hacks  work around bogus compiler/loader warnings],
+       [  --enable-string-hacks   work around bogus compiler/loader warnings],
        [with_string_hacks=$enableval],
        [with_string_hacks=no])
 AC_MSG_RESULT($with_string_hacks)
        [with_string_hacks=$enableval],
        [with_string_hacks=no])
 AC_MSG_RESULT($with_string_hacks)
@@ -1333,7 +1663,16 @@ AC_MSG_RESULT($with_string_hacks)
 if test "x$with_string_hacks" = "xyes"; then
        AC_DEFINE(USE_STRING_HACKS,1,[Define to 1 to work around bogus compiler/loader warnings])
        AC_MSG_WARN(enabling string-hacks to work around bogus compiler/loader warnings)
 if test "x$with_string_hacks" = "xyes"; then
        AC_DEFINE(USE_STRING_HACKS,1,[Define to 1 to work around bogus compiler/loader warnings])
        AC_MSG_WARN(enabling string-hacks to work around bogus compiler/loader warnings)
-       AC_CHECK_FUNCS( strlcat strlcpy snprintf )
+       AC_CHECK_FUNC(strlcat,[
+               AC_DEFINE(HAVE_STRLCAT,1,[Define to 1 if we have strlcat function])
+               ],[
+               AC_CHECK_LIB(bsd,strlcat,[
+                       CF_ADD_LIB(bsd)
+                       AC_CHECK_HEADERS(bsd/string.h)
+                       AC_DEFINE(HAVE_STRLCAT,1,[Define to 1 if we have strlcat function])
+                       ])
+               ])
+       AC_CHECK_FUNCS( strlcpy snprintf )
 fi
 ])dnl
 dnl ---------------------------------------------------------------------------
 fi
 ])dnl
 dnl ---------------------------------------------------------------------------
@@ -1381,7 +1720,7 @@ AC_MSG_RESULT($cf_result)
 CXXFLAGS="$cf_save_CXXFLAGS"
 ])
 dnl ---------------------------------------------------------------------------
 CXXFLAGS="$cf_save_CXXFLAGS"
 ])
 dnl ---------------------------------------------------------------------------
-dnl CF_FIND_LINKAGE version: 19 updated: 2010/05/29 16:31:02
+dnl CF_FIND_LINKAGE version: 21 updated: 2018/06/20 20:23:13
 dnl ---------------
 dnl Find a library (specifically the linkage used in the code fragment),
 dnl searching for it if it is not already in the library path.
 dnl ---------------
 dnl Find a library (specifically the linkage used in the code fragment),
 dnl searching for it if it is not already in the library path.
@@ -1429,73 +1768,74 @@ AC_TRY_LINK([$1],[$2],[
        cf_cv_find_linkage_$3=no
        LIBS="$cf_save_LIBS"
 
        cf_cv_find_linkage_$3=no
        LIBS="$cf_save_LIBS"
 
-    CF_VERBOSE(find linkage for $3 library)
-    CF_MSG_LOG([Searching for headers in [FIND_LINKAGE]($3,$6)])
-
-    cf_save_CPPFLAGS="$CPPFLAGS"
-    cf_test_CPPFLAGS="$CPPFLAGS"
-
-    CF_HEADER_PATH(cf_search,ifelse([$6],,[$3],[$6]))
-    for cf_cv_header_path_$3 in $cf_search
-    do
-      if test -d $cf_cv_header_path_$3 ; then
-        CF_VERBOSE(... testing $cf_cv_header_path_$3)
-        CPPFLAGS="$cf_save_CPPFLAGS -I$cf_cv_header_path_$3"
-        AC_TRY_COMPILE([$1],[$2],[
-            CF_VERBOSE(... found $3 headers in $cf_cv_header_path_$3)
-            cf_cv_find_linkage_$3=maybe
-            cf_test_CPPFLAGS="$CPPFLAGS"
-            break],[
-            CPPFLAGS="$cf_save_CPPFLAGS"
-            ])
-      fi
-    done
-
-    if test "$cf_cv_find_linkage_$3" = maybe ; then
-
-      CF_MSG_LOG([Searching for $3 library in [FIND_LINKAGE]($3,$6)])
-
-      cf_save_LIBS="$LIBS"
-      cf_save_LDFLAGS="$LDFLAGS"
-
-      ifelse([$6],,,[
-        CPPFLAGS="$cf_test_CPPFLAGS"
-        LIBS="-l$3 $7 $cf_save_LIBS"
-        AC_TRY_LINK([$1],[$2],[
-            CF_VERBOSE(... found $3 library in system)
-            cf_cv_find_linkage_$3=yes])
-            CPPFLAGS="$cf_save_CPPFLAGS"
-            LIBS="$cf_save_LIBS"
-            ])
-
-      if test "$cf_cv_find_linkage_$3" != yes ; then
-        CF_LIBRARY_PATH(cf_search,$3)
-        for cf_cv_library_path_$3 in $cf_search
-        do
-          if test -d $cf_cv_library_path_$3 ; then
-            CF_VERBOSE(... testing $cf_cv_library_path_$3)
-            CPPFLAGS="$cf_test_CPPFLAGS"
-            LIBS="-l$3 $7 $cf_save_LIBS"
-            LDFLAGS="$cf_save_LDFLAGS -L$cf_cv_library_path_$3"
-            AC_TRY_LINK([$1],[$2],[
-                CF_VERBOSE(... found $3 library in $cf_cv_library_path_$3)
-                cf_cv_find_linkage_$3=yes
-                cf_cv_library_file_$3="-l$3"
-                break],[
-                CPPFLAGS="$cf_save_CPPFLAGS"
-                LIBS="$cf_save_LIBS"
-                LDFLAGS="$cf_save_LDFLAGS"
-                ])
-          fi
-        done
-        CPPFLAGS="$cf_save_CPPFLAGS"
-        LDFLAGS="$cf_save_LDFLAGS"
-      fi
-
-    else
-      cf_cv_find_linkage_$3=no
-    fi
-    ],$7)
+       CF_VERBOSE(find linkage for $3 library)
+       CF_MSG_LOG([Searching for headers in [FIND_LINKAGE]($3,$6)])
+
+       cf_save_CPPFLAGS="$CPPFLAGS"
+       cf_test_CPPFLAGS="$CPPFLAGS"
+
+       CF_HEADER_PATH(cf_search,ifelse([$6],,[$3],[$6]))
+       for cf_cv_header_path_$3 in $cf_search
+       do
+               if test -d $cf_cv_header_path_$3 ; then
+                       CF_VERBOSE(... testing $cf_cv_header_path_$3)
+                       CPPFLAGS="$cf_save_CPPFLAGS"
+                       CF_APPEND_TEXT(CPPFLAGS,-I$cf_cv_header_path_$3)
+                       AC_TRY_COMPILE([$1],[$2],[
+                               CF_VERBOSE(... found $3 headers in $cf_cv_header_path_$3)
+                               cf_cv_find_linkage_$3=maybe
+                               cf_test_CPPFLAGS="$CPPFLAGS"
+                               break],[
+                               CPPFLAGS="$cf_save_CPPFLAGS"
+                               ])
+               fi
+       done
+
+       if test "$cf_cv_find_linkage_$3" = maybe ; then
+
+               CF_MSG_LOG([Searching for $3 library in [FIND_LINKAGE]($3,$6)])
+
+               cf_save_LIBS="$LIBS"
+               cf_save_LDFLAGS="$LDFLAGS"
+
+               ifelse([$6],,,[
+               CPPFLAGS="$cf_test_CPPFLAGS"
+               LIBS="-l$3 $7 $cf_save_LIBS"
+               AC_TRY_LINK([$1],[$2],[
+                       CF_VERBOSE(... found $3 library in system)
+                       cf_cv_find_linkage_$3=yes])
+                       CPPFLAGS="$cf_save_CPPFLAGS"
+                       LIBS="$cf_save_LIBS"
+                       ])
+
+               if test "$cf_cv_find_linkage_$3" != yes ; then
+                       CF_LIBRARY_PATH(cf_search,$3)
+                       for cf_cv_library_path_$3 in $cf_search
+                       do
+                               if test -d $cf_cv_library_path_$3 ; then
+                                       CF_VERBOSE(... testing $cf_cv_library_path_$3)
+                                       CPPFLAGS="$cf_test_CPPFLAGS"
+                                       LIBS="-l$3 $7 $cf_save_LIBS"
+                                       LDFLAGS="$cf_save_LDFLAGS -L$cf_cv_library_path_$3"
+                                       AC_TRY_LINK([$1],[$2],[
+                                       CF_VERBOSE(... found $3 library in $cf_cv_library_path_$3)
+                                       cf_cv_find_linkage_$3=yes
+                                       cf_cv_library_file_$3="-l$3"
+                                       break],[
+                                       CPPFLAGS="$cf_save_CPPFLAGS"
+                                       LIBS="$cf_save_LIBS"
+                                       LDFLAGS="$cf_save_LDFLAGS"
+                                       ])
+                               fi
+                       done
+                       CPPFLAGS="$cf_save_CPPFLAGS"
+                       LDFLAGS="$cf_save_LDFLAGS"
+               fi
+
+       else
+               cf_cv_find_linkage_$3=no
+       fi
+       ],$7)
 ])
 
 LIBS="$cf_save_LIBS"
 ])
 
 LIBS="$cf_save_LIBS"
@@ -1511,18 +1851,52 @@ ifelse([$5],,AC_MSG_WARN(Cannot find $3 library),[$5])
 fi
 ])dnl
 dnl ---------------------------------------------------------------------------
 fi
 ])dnl
 dnl ---------------------------------------------------------------------------
-dnl CF_FIXUP_ADAFLAGS version: 1 updated: 2012/03/31 18:48:10
+dnl CF_FIND_SUB_INCDIR version: 2 updated: 2015/04/17 21:13:04
+dnl ------------------
+dnl Find an include-directory with the given leaf-name.  This is useful for
+dnl example with FreeBSD ports, which use this convention to distinguish
+dnl different versions of the same port.
+AC_DEFUN([CF_FIND_SUB_INCDIR],[
+       CF_SUBDIR_PATH(cf_search,$1,include)
+       for cf_item in $cf_search
+       do
+               case $cf_item in
+               (*/$1)
+                       CF_ADD_INCDIR($cf_item)
+                       ;;
+               esac
+       done
+])dnl
+dnl ---------------------------------------------------------------------------
+dnl CF_FIND_SUB_LIBDIR version: 2 updated: 2015/04/17 21:13:04
+dnl ------------------
+dnl Find a library-directory with the given leaf-name.  This is useful for
+dnl example with FreeBSD ports, which use this convention to distinguish
+dnl different versions of the same port.
+AC_DEFUN([CF_FIND_SUB_LIBDIR],[
+       CF_SUBDIR_PATH(cf_search,$1,lib)
+       for cf_item in $cf_search
+       do
+               case $cf_item in
+               (*/$1)
+                       CF_ADD_LIBDIR($cf_item)
+                       ;;
+               esac
+       done
+])dnl
+dnl ---------------------------------------------------------------------------
+dnl CF_FIXUP_ADAFLAGS version: 2 updated: 2015/04/17 21:13:04
 dnl -----------------
 dnl make ADAFLAGS consistent with CFLAGS
 AC_DEFUN([CF_FIXUP_ADAFLAGS],[
        AC_MSG_CHECKING(optimization options for ADAFLAGS)
        case "$CFLAGS" in
 dnl -----------------
 dnl make ADAFLAGS consistent with CFLAGS
 AC_DEFUN([CF_FIXUP_ADAFLAGS],[
        AC_MSG_CHECKING(optimization options for ADAFLAGS)
        case "$CFLAGS" in
-       *-g*)
+       (*-g*)
                CF_ADD_ADAFLAGS(-g)
                ;;
        esac
        case "$CFLAGS" in
                CF_ADD_ADAFLAGS(-g)
                ;;
        esac
        case "$CFLAGS" in
-       *-O*)
+       (*-O*)
                cf_O_flag=`echo "$CFLAGS" |sed -e 's/^.*-O/-O/' -e 's/[[        ]].*//'`
                CF_ADD_ADAFLAGS($cf_O_flag)
                ;;
                cf_O_flag=`echo "$CFLAGS" |sed -e 's/^.*-O/-O/' -e 's/[[        ]].*//'`
                CF_ADD_ADAFLAGS($cf_O_flag)
                ;;
@@ -1530,7 +1904,59 @@ AC_DEFUN([CF_FIXUP_ADAFLAGS],[
        AC_MSG_RESULT($ADAFLAGS)
 ])dnl
 dnl ---------------------------------------------------------------------------
        AC_MSG_RESULT($ADAFLAGS)
 ])dnl
 dnl ---------------------------------------------------------------------------
-dnl CF_FUNC_DLSYM version: 3 updated: 2012/10/06 11:17:15
+dnl CF_FOPEN_BIN_R version: 1 updated: 2019/03/30 17:52:21
+dnl --------------
+dnl Check if fopen works when the "b" (binary) flag is added to the mode
+dnl parameter.  POSIX ignores the "b", which c89 specified.  Some very old
+dnl systems do not accept it.
+AC_DEFUN([CF_FOPEN_BIN_R],[
+AC_CACHE_CHECK(if fopen accepts explicit binary mode,cf_cv_fopen_bin_r,[
+       AC_TRY_RUN([
+#include <stdio.h>
+int main(void) {
+       FILE *fp = fopen("conftest.tmp", "wb");
+       int rc = 0;
+       if (fp != 0) {
+               int p, q;
+               for (p = 0; p < 256; ++p) {
+                       fputc(p, fp);
+               }
+               fclose(fp);
+               fp = fopen("conftest.tmp", "rb");
+               if (fp != 0) {
+                       for (p = 0; p < 256; ++p) {
+                               q = fgetc(fp);
+                               if (q != p) {
+                                       rc = 1;
+                                       break;
+                               }
+                       }
+               } else {
+                       rc = 1;
+               }
+       } else {
+               rc = 1;
+       }
+       ${cf_cv_main_return:-return} (rc);
+}
+],
+               [cf_cv_fopen_bin_r=yes],
+               [cf_cv_fopen_bin_r=no],
+               [cf_cv_fopen_bin_r=unknown])
+])
+test "x$cf_cv_fopen_bin_r" != xno && AC_DEFINE(USE_FOPEN_BIN_R)
+])dnl
+dnl ---------------------------------------------------------------------------
+dnl CF_FORGET_TOOL version: 1 updated: 2013/04/06 18:03:09
+dnl --------------
+dnl Forget that we saw the given tool.
+AC_DEFUN([CF_FORGET_TOOL],[
+unset ac_cv_prog_ac_ct_$1
+unset ac_ct_$1
+unset $1
+])dnl
+dnl ---------------------------------------------------------------------------
+dnl CF_FUNC_DLSYM version: 4 updated: 2015/09/12 14:46:44
 dnl -------------
 dnl Test for dlsym() and related functions, as well as libdl.
 dnl
 dnl -------------
 dnl Test for dlsym() and related functions, as well as libdl.
 dnl
@@ -1547,7 +1973,7 @@ AC_CHECK_LIB(dl,dlsym,[
        cf_have_libdl=yes])])
 
 if test "$cf_have_dlsym" = yes ; then
        cf_have_libdl=yes])])
 
 if test "$cf_have_dlsym" = yes ; then
-       test "$cf_have_libdl" = yes && CF_ADD_LIB(dl)
+       test "$cf_have_libdl" = yes && { CF_ADD_LIB(dl) }
 
        AC_MSG_CHECKING(whether able to link to dl*() functions)
        AC_TRY_LINK([#include <dlfcn.h>],[
 
        AC_MSG_CHECKING(whether able to link to dl*() functions)
        AC_TRY_LINK([#include <dlfcn.h>],[
@@ -1565,7 +1991,38 @@ else
 fi
 ])
 dnl ---------------------------------------------------------------------------
 fi
 ])
 dnl ---------------------------------------------------------------------------
-dnl CF_FUNC_NANOSLEEP version: 4 updated: 2012/10/06 17:56:13
+dnl CF_FUNC_MEMMOVE version: 9 updated: 2017/01/21 11:06:25
+dnl ---------------
+dnl Check for memmove, or a bcopy that can handle overlapping copy.  If neither
+dnl is found, add our own version of memmove to the list of objects.
+AC_DEFUN([CF_FUNC_MEMMOVE],
+[
+AC_CHECK_FUNC(memmove,,[
+AC_CHECK_FUNC(bcopy,[
+       AC_CACHE_CHECK(if bcopy does overlapping moves,cf_cv_good_bcopy,[
+               AC_TRY_RUN([
+int main(void) {
+       static char data[] = "abcdefghijklmnopqrstuwwxyz";
+       char temp[40];
+       bcopy(data, temp, sizeof(data));
+       bcopy(temp+10, temp, 15);
+       bcopy(temp+5, temp+15, 10);
+       ${cf_cv_main_return:-return} (strcmp(temp, "klmnopqrstuwwxypqrstuwwxyz"));
+}
+               ],
+               [cf_cv_good_bcopy=yes],
+               [cf_cv_good_bcopy=no],
+               [cf_cv_good_bcopy=unknown])
+               ])
+       ],[cf_cv_good_bcopy=no])
+       if test "$cf_cv_good_bcopy" = yes ; then
+               AC_DEFINE(USE_OK_BCOPY,1,[Define to 1 to use bcopy when memmove is unavailable])
+       else
+               AC_DEFINE(USE_MY_MEMMOVE,1,[Define to 1 to use replacement function when memmove is unavailable])
+       fi
+])])dnl
+dnl ---------------------------------------------------------------------------
+dnl CF_FUNC_NANOSLEEP version: 5 updated: 2017/01/21 11:06:25
 dnl -----------------
 dnl Check for existence of workable nanosleep() function.  Some systems, e.g.,
 dnl AIX 4.x, provide a non-working version.
 dnl -----------------
 dnl Check for existence of workable nanosleep() function.  Some systems, e.g.,
 dnl AIX 4.x, provide a non-working version.
@@ -1580,7 +2037,7 @@ AC_TRY_RUN([
 #include <sys/time.h>
 #endif
 
 #include <sys/time.h>
 #endif
 
-int main() {
+int main(void) {
        struct timespec ts1, ts2;
        int code;
        ts1.tv_sec  = 0;
        struct timespec ts1, ts2;
        int code;
        ts1.tv_sec  = 0;
@@ -1599,7 +2056,7 @@ int main() {
 test "$cf_cv_func_nanosleep" = "yes" && AC_DEFINE(HAVE_NANOSLEEP,1,[Define to 1 if we have nanosleep()])
 ])
 dnl ---------------------------------------------------------------------------
 test "$cf_cv_func_nanosleep" = "yes" && AC_DEFINE(HAVE_NANOSLEEP,1,[Define to 1 if we have nanosleep()])
 ])
 dnl ---------------------------------------------------------------------------
-dnl CF_FUNC_OPENPTY version: 3 updated: 2010/05/29 16:31:02
+dnl CF_FUNC_OPENPTY version: 5 updated: 2015/09/12 14:46:50
 dnl ---------------
 dnl Check for openpty() function, along with <pty.h> header.  It may need the
 dnl "util" library as well.
 dnl ---------------
 dnl Check for openpty() function, along with <pty.h> header.  It may need the
 dnl "util" library as well.
@@ -1607,31 +2064,32 @@ AC_DEFUN([CF_FUNC_OPENPTY],
 [
 AC_CHECK_LIB(util,openpty,cf_cv_lib_util=yes,cf_cv_lib_util=no)
 AC_CACHE_CHECK(for openpty header,cf_cv_func_openpty,[
 [
 AC_CHECK_LIB(util,openpty,cf_cv_lib_util=yes,cf_cv_lib_util=no)
 AC_CACHE_CHECK(for openpty header,cf_cv_func_openpty,[
-    cf_save_LIBS="$LIBS"
-    test $cf_cv_lib_util = yes && CF_ADD_LIB(util)
-    for cf_header in pty.h libutil.h util.h
-    do
-    AC_TRY_LINK([
+       cf_save_LIBS="$LIBS"
+       test $cf_cv_lib_util = yes && { CF_ADD_LIB(util) }
+       for cf_header in pty.h libutil.h util.h
+       do
+       AC_TRY_LINK([
 #include <$cf_header>
 ],[
 #include <$cf_header>
 ],[
-    int x = openpty((int *)0, (int *)0, (char *)0,
-                   (struct termios *)0, (struct winsize *)0);
+       int x = openpty((int *)0, (int *)0, (char *)0,
+                                  (struct termios *)0, (struct winsize *)0);
 ],[
 ],[
-        cf_cv_func_openpty=$cf_header
-        break
+               cf_cv_func_openpty=$cf_header
+               break
 ],[
 ],[
-        cf_cv_func_openpty=no
+               cf_cv_func_openpty=no
 ])
 ])
-    done
-    LIBS="$cf_save_LIBS"
+       done
+       LIBS="$cf_save_LIBS"
 ])
 ])dnl
 dnl ---------------------------------------------------------------------------
 ])
 ])dnl
 dnl ---------------------------------------------------------------------------
-dnl CF_FUNC_POLL version: 8 updated: 2012/10/04 05:24:07
+dnl CF_FUNC_POLL version: 9 updated: 2015/10/10 13:27:32
 dnl ------------
 dnl See if the poll function really works.  Some platforms have poll(), but
 dnl it does not work for terminals or files.
 AC_DEFUN([CF_FUNC_POLL],[
 dnl ------------
 dnl See if the poll function really works.  Some platforms have poll(), but
 dnl it does not work for terminals or files.
 AC_DEFUN([CF_FUNC_POLL],[
+tty 2>&1 >/dev/null || { AC_CHECK_FUNCS(posix_openpt) }
 AC_CACHE_CHECK(if poll really works,cf_cv_working_poll,[
 AC_TRY_RUN([
 #include <stdlib.h>
 AC_CACHE_CHECK(if poll really works,cf_cv_working_poll,[
 AC_TRY_RUN([
 #include <stdlib.h>
@@ -1643,7 +2101,7 @@ AC_TRY_RUN([
 #else
 #include <sys/poll.h>
 #endif
 #else
 #include <sys/poll.h>
 #endif
-int main() {
+int main(void) {
        struct pollfd myfds;
        int ret;
 
        struct pollfd myfds;
        int ret;
 
@@ -1663,6 +2121,11 @@ int main() {
                if (!isatty(fd)) {
                        fd = open("/dev/tty", 2);       /* O_RDWR */
                }
                if (!isatty(fd)) {
                        fd = open("/dev/tty", 2);       /* O_RDWR */
                }
+#ifdef HAVE_POSIX_OPENPT
+               if (fd < 0) {
+                       fd = posix_openpt(O_RDWR);
+               }
+#endif
 
                if (fd >= 0) {
                        /* also check with standard input */
 
                if (fd >= 0) {
                        /* also check with standard input */
@@ -1711,7 +2174,7 @@ tcgetattr(1, &foo);],
 test "$cf_cv_have_tcgetattr" = yes && AC_DEFINE(HAVE_TCGETATTR,1,[Define to 1 if we have tcgetattr])
 ])dnl
 dnl ---------------------------------------------------------------------------
 test "$cf_cv_have_tcgetattr" = yes && AC_DEFINE(HAVE_TCGETATTR,1,[Define to 1 if we have tcgetattr])
 ])dnl
 dnl ---------------------------------------------------------------------------
-dnl CF_FUNC_VSSCANF version: 4 updated: 2012/10/06 17:56:13
+dnl CF_FUNC_VSSCANF version: 6 updated: 2015/04/18 08:56:57
 dnl ---------------
 dnl Check for vsscanf() function, which is in c9x but generally not in earlier
 dnl versions of C.  It is in the GNU C library, and can often be simulated by
 dnl ---------------
 dnl Check for vsscanf() function, which is in c9x but generally not in earlier
 dnl versions of C.  It is in the GNU C library, and can often be simulated by
@@ -1727,36 +2190,36 @@ AC_TRY_LINK([
 AC_TRY_LINK([
 #include <stdarg.h>
 #include <stdio.h>],[
 AC_TRY_LINK([
 #include <stdarg.h>
 #include <stdio.h>],[
-    FILE strbuf;
-    char *str = "from";
-
-    strbuf._flag = _IOREAD;
-    strbuf._ptr = strbuf._base = (unsigned char *) str;
-    strbuf._cnt = strlen(str);
-    strbuf._file = _NFILE;
-    return (vfscanf(&strbuf, "%d", ap))],[cf_cv_func_vsscanf=vfscanf],[
+       FILE strbuf;
+       char *str = "from";
+
+       strbuf._flag = _IOREAD;
+       strbuf._ptr = strbuf._base = (unsigned char *) str;
+       strbuf._cnt = strlen(str);
+       strbuf._file = _NFILE;
+       return (vfscanf(&strbuf, "%d", ap))],[cf_cv_func_vsscanf=vfscanf],[
 AC_TRY_LINK([
 #include <stdarg.h>
 #include <stdio.h>],[
 AC_TRY_LINK([
 #include <stdarg.h>
 #include <stdio.h>],[
-    FILE strbuf;
-    char *str = "from";
-
-    strbuf._flag = _IOREAD;
-    strbuf._ptr = strbuf._base = (unsigned char *) str;
-    strbuf._cnt = strlen(str);
-    strbuf._file = _NFILE;
-    return (_doscan(&strbuf, "%d", ap))],[cf_cv_func_vsscanf=_doscan],[
+       FILE strbuf;
+       char *str = "from";
+
+       strbuf._flag = _IOREAD;
+       strbuf._ptr = strbuf._base = (unsigned char *) str;
+       strbuf._cnt = strlen(str);
+       strbuf._file = _NFILE;
+       return (_doscan(&strbuf, "%d", ap))],[cf_cv_func_vsscanf=_doscan],[
 cf_cv_func_vsscanf=no])])])])
 
 cf_cv_func_vsscanf=no])])])])
 
-case $cf_cv_func_vsscanf in #(vi
-vsscanf) AC_DEFINE(HAVE_VSSCANF,1,[Define to 1 if we have vsscanf]);; #(vi
-vfscanf) AC_DEFINE(HAVE_VFSCANF,1,[Define to 1 if we have vfscanf]);; #(vi
-_doscan) AC_DEFINE(HAVE__DOSCAN,1,[Define to 1 if we have _doscan]);;
+case $cf_cv_func_vsscanf in
+(vsscanf) AC_DEFINE(HAVE_VSSCANF,1,[Define to 1 if we have vsscanf]);;
+(vfscanf) AC_DEFINE(HAVE_VFSCANF,1,[Define to 1 if we have vfscanf]);;
+(_doscan) AC_DEFINE(HAVE__DOSCAN,1,[Define to 1 if we have _doscan]);;
 esac
 
 ])dnl
 dnl ---------------------------------------------------------------------------
 esac
 
 ])dnl
 dnl ---------------------------------------------------------------------------
-dnl CF_GCC_ATTRIBUTES version: 16 updated: 2012/10/02 20:55:03
+dnl CF_GCC_ATTRIBUTES version: 17 updated: 2015/04/12 15:39:00
 dnl -----------------
 dnl Test for availability of useful gcc __attribute__ directives to quiet
 dnl compiler warnings.  Though useful, not all are supported -- and contrary
 dnl -----------------
 dnl Test for availability of useful gcc __attribute__ directives to quiet
 dnl compiler warnings.  Though useful, not all are supported -- and contrary
@@ -1810,20 +2273,20 @@ EOF
                cf_directive="__attribute__(($cf_attribute))"
                echo "checking for $CC $cf_directive" 1>&AC_FD_CC
 
                cf_directive="__attribute__(($cf_attribute))"
                echo "checking for $CC $cf_directive" 1>&AC_FD_CC
 
-               case $cf_attribute in #(vi
-               printf) #(vi
+               case $cf_attribute in
+               (printf)
                        cf_printf_attribute=yes
                        cat >conftest.h <<EOF
 #define GCC_$cf_ATTRIBUTE 1
 EOF
                        ;;
                        cf_printf_attribute=yes
                        cat >conftest.h <<EOF
 #define GCC_$cf_ATTRIBUTE 1
 EOF
                        ;;
-               scanf) #(vi
+               (scanf)
                        cf_scanf_attribute=yes
                        cat >conftest.h <<EOF
 #define GCC_$cf_ATTRIBUTE 1
 EOF
                        ;;
                        cf_scanf_attribute=yes
                        cat >conftest.h <<EOF
 #define GCC_$cf_ATTRIBUTE 1
 EOF
                        ;;
-               *) #(vi
+               (*)
                        cat >conftest.h <<EOF
 #define GCC_$cf_ATTRIBUTE $cf_directive
 EOF
                        cat >conftest.h <<EOF
 #define GCC_$cf_ATTRIBUTE $cf_directive
 EOF
@@ -1833,11 +2296,11 @@ EOF
                if AC_TRY_EVAL(ac_compile); then
                        test -n "$verbose" && AC_MSG_RESULT(... $cf_attribute)
                        cat conftest.h >>confdefs.h
                if AC_TRY_EVAL(ac_compile); then
                        test -n "$verbose" && AC_MSG_RESULT(... $cf_attribute)
                        cat conftest.h >>confdefs.h
-                       case $cf_attribute in #(vi
-                       noreturn) #(vi
+                       case $cf_attribute in
+                       (noreturn)
                                AC_DEFINE_UNQUOTED(GCC_NORETURN,$cf_directive,[Define to noreturn-attribute for gcc])
                                ;;
                                AC_DEFINE_UNQUOTED(GCC_NORETURN,$cf_directive,[Define to noreturn-attribute for gcc])
                                ;;
-                       printf) #(vi
+                       (printf)
                                cf_value='/* nothing */'
                                if test "$cf_printf_attribute" != no ; then
                                        cf_value='__attribute__((format(printf,fmt,var)))'
                                cf_value='/* nothing */'
                                if test "$cf_printf_attribute" != no ; then
                                        cf_value='__attribute__((format(printf,fmt,var)))'
@@ -1845,7 +2308,7 @@ EOF
                                fi
                                AC_DEFINE_UNQUOTED(GCC_PRINTFLIKE(fmt,var),$cf_value,[Define to printf-attribute for gcc])
                                ;;
                                fi
                                AC_DEFINE_UNQUOTED(GCC_PRINTFLIKE(fmt,var),$cf_value,[Define to printf-attribute for gcc])
                                ;;
-                       scanf) #(vi
+                       (scanf)
                                cf_value='/* nothing */'
                                if test "$cf_scanf_attribute" != no ; then
                                        cf_value='__attribute__((format(scanf,fmt,var)))'
                                cf_value='/* nothing */'
                                if test "$cf_scanf_attribute" != no ; then
                                        cf_value='__attribute__((format(scanf,fmt,var)))'
@@ -1853,7 +2316,7 @@ EOF
                                fi
                                AC_DEFINE_UNQUOTED(GCC_SCANFLIKE(fmt,var),$cf_value,[Define to sscanf-attribute for gcc])
                                ;;
                                fi
                                AC_DEFINE_UNQUOTED(GCC_SCANFLIKE(fmt,var),$cf_value,[Define to sscanf-attribute for gcc])
                                ;;
-                       unused) #(vi
+                       (unused)
                                AC_DEFINE_UNQUOTED(GCC_UNUSED,$cf_directive,[Define to unused-attribute for gcc])
                                ;;
                        esac
                                AC_DEFINE_UNQUOTED(GCC_UNUSED,$cf_directive,[Define to unused-attribute for gcc])
                                ;;
                        esac
@@ -1880,7 +2343,7 @@ if test "$GCC" = yes ; then
 fi
 ])dnl
 dnl ---------------------------------------------------------------------------
 fi
 ])dnl
 dnl ---------------------------------------------------------------------------
-dnl CF_GCC_WARNINGS version: 29 updated: 2012/06/16 14:55:39
+dnl CF_GCC_WARNINGS version: 33 updated: 2018/06/20 20:23:13
 dnl ---------------
 dnl Check if the compiler supports useful warning options.  There's a few that
 dnl we don't use, simply because they're too noisy:
 dnl ---------------
 dnl Check if the compiler supports useful warning options.  There's a few that
 dnl we don't use, simply because they're too noisy:
@@ -1952,10 +2415,14 @@ then
        EXTRA_CFLAGS=
        cf_warn_CONST=""
        test "$with_ext_const" = yes && cf_warn_CONST="Wwrite-strings"
        EXTRA_CFLAGS=
        cf_warn_CONST=""
        test "$with_ext_const" = yes && cf_warn_CONST="Wwrite-strings"
+       cf_gcc_warnings="Wignored-qualifiers Wlogical-op Wvarargs"
+       test "x$CLANG_COMPILER" = xyes && cf_gcc_warnings=
        for cf_opt in W Wall \
                Wbad-function-cast \
                Wcast-align \
                Wcast-qual \
        for cf_opt in W Wall \
                Wbad-function-cast \
                Wcast-align \
                Wcast-qual \
+               Wdeclaration-after-statement \
+               Wextra \
                Winline \
                Wmissing-declarations \
                Wmissing-prototypes \
                Winline \
                Wmissing-declarations \
                Wmissing-prototypes \
@@ -1963,25 +2430,25 @@ then
                Wpointer-arith \
                Wshadow \
                Wstrict-prototypes \
                Wpointer-arith \
                Wshadow \
                Wstrict-prototypes \
-               Wundef $cf_warn_CONST $1
+               Wundef $cf_gcc_warnings $cf_warn_CONST $1
        do
                CFLAGS="$cf_save_CFLAGS $EXTRA_CFLAGS -$cf_opt"
                if AC_TRY_EVAL(ac_compile); then
                        test -n "$verbose" && AC_MSG_RESULT(... -$cf_opt)
        do
                CFLAGS="$cf_save_CFLAGS $EXTRA_CFLAGS -$cf_opt"
                if AC_TRY_EVAL(ac_compile); then
                        test -n "$verbose" && AC_MSG_RESULT(... -$cf_opt)
-                       case $cf_opt in #(vi
-                       Wcast-qual) #(vi
-                               CPPFLAGS="$CPPFLAGS -DXTSTRINGDEFINES"
+                       case $cf_opt in
+                       (Wcast-qual)
+                               CF_APPEND_TEXT(CPPFLAGS,-DXTSTRINGDEFINES)
                                ;;
                                ;;
-                       Winline) #(vi
+                       (Winline)
                                case $GCC_VERSION in
                                case $GCC_VERSION in
-                               [[34]].*)
+                               ([[34]].*)
                                        CF_VERBOSE(feature is broken in gcc $GCC_VERSION)
                                        continue;;
                                esac
                                ;;
                                        CF_VERBOSE(feature is broken in gcc $GCC_VERSION)
                                        continue;;
                                esac
                                ;;
-                       Wpointer-arith) #(vi
+                       (Wpointer-arith)
                                case $GCC_VERSION in
                                case $GCC_VERSION in
-                               [[12]].*)
+                               ([[12]].*)
                                        CF_VERBOSE(feature is broken in gcc $GCC_VERSION)
                                        continue;;
                                esac
                                        CF_VERBOSE(feature is broken in gcc $GCC_VERSION)
                                        continue;;
                                esac
@@ -1997,7 +2464,7 @@ rm -rf conftest*
 AC_SUBST(EXTRA_CFLAGS)
 ])dnl
 dnl ---------------------------------------------------------------------------
 AC_SUBST(EXTRA_CFLAGS)
 ])dnl
 dnl ---------------------------------------------------------------------------
-dnl CF_GETOPT_HEADER version: 5 updated: 2012/10/06 16:39:58
+dnl CF_GETOPT_HEADER version: 6 updated: 2014/07/22 14:45:54
 dnl ----------------
 dnl Check for getopt's variables which are commonly defined in stdlib.h,
 dnl unistd.h or (nonstandard) in getopt.h
 dnl ----------------
 dnl Check for getopt's variables which are commonly defined in stdlib.h,
 dnl unistd.h or (nonstandard) in getopt.h
@@ -2016,22 +2483,36 @@ AC_TRY_COMPILE([
 done
 ])
 if test $cf_cv_getopt_header != none ; then
 done
 ])
 if test $cf_cv_getopt_header != none ; then
-       AC_DEFINE(HAVE_GETOPT_HEADER,1,[Define to 1 if we need to include getopt.h])
+       AC_DEFINE(HAVE_GETOPT_HEADER,1,[Define to 1 if getopt variables are declared in header])
+fi
+if test $cf_cv_getopt_header = getopt.h ; then
+       AC_DEFINE(NEED_GETOPT_H,1,[Define to 1 if we must include getopt.h])
 fi
 ])dnl
 dnl ---------------------------------------------------------------------------
 fi
 ])dnl
 dnl ---------------------------------------------------------------------------
-dnl CF_GNAT_GENERICS version: 2 updated: 2011/03/23 20:24:41
+dnl CF_GNATPREP_OPT_T version: 1 updated: 2014/08/02 18:37:25
+dnl -----------------
+AC_DEFUN([CF_GNATPREP_OPT_T],[
+AC_CACHE_CHECK(if GNATPREP supports -T option,cf_cv_gnatprep_opt_t,[
+cf_cv_gnatprep_opt_t=no
+gnatprep -T 2>/dev/null >/dev/null && cf_cv_gnatprep_opt_t=yes
+])
+test "$cf_cv_gnatprep_opt_t" = yes && GNATPREP_OPTS="-T $GNATPREP_OPTS"
+AC_SUBST(GNATPREP_OPTS)
+])dnl
+dnl ---------------------------------------------------------------------------
+dnl CF_GNAT_GENERICS version: 3 updated: 2015/04/17 21:13:04
 dnl ----------------
 AC_DEFUN([CF_GNAT_GENERICS],
 [
 AC_REQUIRE([CF_GNAT_VERSION])
 
 AC_MSG_CHECKING(if GNAT supports generics)
 dnl ----------------
 AC_DEFUN([CF_GNAT_GENERICS],
 [
 AC_REQUIRE([CF_GNAT_VERSION])
 
 AC_MSG_CHECKING(if GNAT supports generics)
-case $cf_gnat_version in #(vi
-3.[[1-9]]*|[[4-9]].*) #(vi
+case $cf_gnat_version in
+(3.[[1-9]]*|[[4-9]].*)
        cf_gnat_generics=yes
        ;;
        cf_gnat_generics=yes
        ;;
-*)
+(*)
        cf_gnat_generics=no
        ;;
 esac
        cf_gnat_generics=no
        ;;
 esac
@@ -2050,59 +2531,34 @@ AC_SUBST(cf_compile_generics)
 AC_SUBST(cf_generic_objects)
 ])dnl
 dnl ---------------------------------------------------------------------------
 AC_SUBST(cf_generic_objects)
 ])dnl
 dnl ---------------------------------------------------------------------------
-dnl CF_GNAT_PRAGMA_UNREF version: 1 updated: 2010/06/19 15:22:18
-dnl --------------------
-dnl Check if the gnat pragma "Unreferenced" works.
-AC_DEFUN([CF_GNAT_PRAGMA_UNREF],[
-AC_CACHE_CHECK(if GNAT pragma Unreferenced works,cf_cv_pragma_unreferenced,[
-CF_GNAT_TRY_LINK([procedure conftest;],
-[with Text_IO;
-with GNAT.OS_Lib;
-procedure conftest is
-   test : Integer;
-   pragma Unreferenced (test);
-begin
-   test := 1;
-   Text_IO.Put ("Hello World");
-   Text_IO.New_Line;
-   GNAT.OS_Lib.OS_Exit (0);
-end conftest;],
-       [cf_cv_pragma_unreferenced=yes],
-       [cf_cv_pragma_unreferenced=no])])
-
-# if the pragma is supported, use it (needed in the Trace code).
-if test $cf_cv_pragma_unreferenced = yes ; then
-       PRAGMA_UNREF=TRUE
-else
-       PRAGMA_UNREF=FALSE
-fi
-AC_SUBST(PRAGMA_UNREF)
-])dnl
-dnl ---------------------------------------------------------------------------
-dnl CF_GNAT_PROJECTS version: 2 updated: 2011/03/23 20:24:41
+dnl CF_GNAT_PROJECTS version: 9 updated: 2018/01/14 15:46:09
 dnl ----------------
 dnl GNAT projects are configured with ".gpr" project files.
 dnl GNAT libraries are a further development, using the project feature.
 AC_DEFUN([CF_GNAT_PROJECTS],
 [
 AC_REQUIRE([CF_GNAT_VERSION])
 dnl ----------------
 dnl GNAT projects are configured with ".gpr" project files.
 dnl GNAT libraries are a further development, using the project feature.
 AC_DEFUN([CF_GNAT_PROJECTS],
 [
 AC_REQUIRE([CF_GNAT_VERSION])
+AC_REQUIRE([CF_DISABLE_GNAT_PROJECTS])
 
 cf_gnat_libraries=no
 cf_gnat_projects=no
 
 
 cf_gnat_libraries=no
 cf_gnat_projects=no
 
+if test "$enable_gnat_projects" != no ; then
 AC_MSG_CHECKING(if GNAT supports project files)
 AC_MSG_CHECKING(if GNAT supports project files)
-case $cf_gnat_version in #(vi
-3.[[0-9]]*) #(vi
+case $cf_gnat_version in
+(3.[[0-9]]*)
        ;;
        ;;
-*)
-       case $cf_cv_system_name in #(vi
-       cygwin*) #(vi
+(*)
+       case $cf_cv_system_name in
+       (cygwin*|msys*)
                ;;
                ;;
-       *)
-               mkdir conftest.src conftest.bin conftest.lib
-               cd conftest.src
+       (*)
                rm -rf conftest* *~conftest*
                rm -rf conftest* *~conftest*
-               cat >>library.gpr <<CF_EOF
+               if mkdir conftest.src conftest.bin conftest.lib
+               then
+                       cd conftest.src
+                       rm -rf conftest* *~conftest*
+                       cat >>library.gpr <<CF_EOF
 project Library is
   Kind := External ("LIB_KIND");
   for Library_Name use "ConfTest";
 project Library is
   Kind := External ("LIB_KIND");
   for Library_Name use "ConfTest";
@@ -2113,22 +2569,14 @@ project Library is
   for Library_Dir use External("BUILD_DIR");
   Source_Dir := External ("SOURCE_DIR");
   for Source_Dirs use (Source_Dir);
   for Library_Dir use External("BUILD_DIR");
   Source_Dir := External ("SOURCE_DIR");
   for Source_Dirs use (Source_Dir);
-  package Compiler is
-     for Default_Switches ("Ada") use
-       ("-g",
-        "-O2",
-        "-gnatafno",
-        "-gnatVa",   -- All validity checks
-        "-gnatwa");  -- Activate all optional errors
-  end Compiler;
 end Library;
 CF_EOF
 end Library;
 CF_EOF
-               cat >>confpackage.ads <<CF_EOF
+                       cat >>confpackage.ads <<CF_EOF
 package ConfPackage is
    procedure conftest;
 end ConfPackage;
 CF_EOF
 package ConfPackage is
    procedure conftest;
 end ConfPackage;
 CF_EOF
-               cat >>confpackage.adb <<CF_EOF
+                       cat >>confpackage.adb <<CF_EOF
 with Text_IO;
 package body ConfPackage is
    procedure conftest is
 with Text_IO;
 package body ConfPackage is
    procedure conftest is
@@ -2138,16 +2586,17 @@ package body ConfPackage is
    end conftest;
 end ConfPackage;
 CF_EOF
    end conftest;
 end ConfPackage;
 CF_EOF
-               if ( $cf_ada_make $ADAFLAGS \
-                               -Plibrary.gpr \
-                               -XBUILD_DIR=`cd ../conftest.bin;pwd` \
-                               -XLIBRARY_DIR=`cd ../conftest.lib;pwd` \
-                               -XSOURCE_DIR=`pwd` \
-                               -XSONAME=libConfTest.so.1 \
-                               -XLIB_KIND=static 1>&AC_FD_CC 2>&1 ) ; then
-                       cf_gnat_projects=yes
+                       if ( $cf_ada_make $ADAFLAGS \
+                                       -Plibrary.gpr \
+                                       -XBUILD_DIR=`cd ../conftest.bin;pwd` \
+                                       -XLIBRARY_DIR=`cd ../conftest.lib;pwd` \
+                                       -XSOURCE_DIR=`pwd` \
+                                       -XSONAME=libConfTest.so.1 \
+                                       -XLIB_KIND=static 1>&AC_FD_CC 2>&1 ) ; then
+                               cf_gnat_projects=yes
+                       fi
+                       cd ..
                fi
                fi
-               cd ..
                if test -f conftest.lib/confpackage.ali
                then
                        cf_gnat_libraries=yes
                if test -f conftest.lib/confpackage.ali
                then
                        cf_gnat_libraries=yes
@@ -2158,6 +2607,7 @@ CF_EOF
        ;;
 esac
 AC_MSG_RESULT($cf_gnat_projects)
        ;;
 esac
 AC_MSG_RESULT($cf_gnat_projects)
+fi # enable_gnat_projects
 
 if test $cf_gnat_projects = yes
 then
 
 if test $cf_gnat_projects = yes
 then
@@ -2291,7 +2741,7 @@ fi
 rm -rf conftest* *~conftest*
 ])dnl
 dnl ---------------------------------------------------------------------------
 rm -rf conftest* *~conftest*
 ])dnl
 dnl ---------------------------------------------------------------------------
-dnl CF_GNAT_VERSION version: 18 updated: 2012/01/21 19:28:10
+dnl CF_GNAT_VERSION version: 20 updated: 2015/04/18 08:56:57
 dnl ---------------
 dnl Verify version of GNAT.
 AC_DEFUN([CF_GNAT_VERSION],
 dnl ---------------
 dnl Verify version of GNAT.
 AC_DEFUN([CF_GNAT_VERSION],
@@ -2299,21 +2749,21 @@ AC_DEFUN([CF_GNAT_VERSION],
 AC_MSG_CHECKING(for gnat version)
 cf_gnat_version=`${cf_ada_make:-gnatmake} -v 2>&1 | \
        grep '[[0-9]].[[0-9]][[0-9]]*' |\
 AC_MSG_CHECKING(for gnat version)
 cf_gnat_version=`${cf_ada_make:-gnatmake} -v 2>&1 | \
        grep '[[0-9]].[[0-9]][[0-9]]*' |\
-    sed -e '2,$d' -e 's/[[^0-9 \.]]//g' -e 's/^[[ ]]*//' -e 's/ .*//'`
+       sed -e '2,$d' -e 's/[[^0-9 \.]]//g' -e 's/^[[ ]]*//' -e 's/ .*//'`
 AC_MSG_RESULT($cf_gnat_version)
 
 AC_MSG_RESULT($cf_gnat_version)
 
-case $cf_gnat_version in #(vi
-3.1[[1-9]]*|3.[[2-9]]*|[[4-9]].*|20[[0-9]][[0-9]]) #(vi
+case $cf_gnat_version in
+(3.1[[1-9]]*|3.[[2-9]]*|[[4-9]].*|20[[0-9]][[0-9]])
        cf_cv_prog_gnat_correct=yes
        ;;
        cf_cv_prog_gnat_correct=yes
        ;;
-*)
+(*)
        AC_MSG_WARN(Unsupported GNAT version $cf_gnat_version. We require 3.11 or better. Disabling Ada95 binding.)
        cf_cv_prog_gnat_correct=no
        ;;
 esac
 ])
 dnl ---------------------------------------------------------------------------
        AC_MSG_WARN(Unsupported GNAT version $cf_gnat_version. We require 3.11 or better. Disabling Ada95 binding.)
        cf_cv_prog_gnat_correct=no
        ;;
 esac
 ])
 dnl ---------------------------------------------------------------------------
-dnl CF_GNU_SOURCE version: 6 updated: 2005/07/09 13:23:07
+dnl CF_GNU_SOURCE version: 10 updated: 2018/12/10 20:09:41
 dnl -------------
 dnl Check if we must define _GNU_SOURCE to get a reasonable value for
 dnl _XOPEN_SOURCE, upon which many POSIX definitions depend.  This is a defect
 dnl -------------
 dnl Check if we must define _GNU_SOURCE to get a reasonable value for
 dnl _XOPEN_SOURCE, upon which many POSIX definitions depend.  This is a defect
@@ -2321,29 +2771,110 @@ dnl (or misfeature) of glibc2, which breaks portability of many applications,
 dnl since it is interwoven with GNU extensions.
 dnl
 dnl Well, yes we could work around it...
 dnl since it is interwoven with GNU extensions.
 dnl
 dnl Well, yes we could work around it...
+dnl
+dnl Parameters:
+dnl    $1 is the nominal value for _XOPEN_SOURCE
 AC_DEFUN([CF_GNU_SOURCE],
 [
 AC_DEFUN([CF_GNU_SOURCE],
 [
-AC_CACHE_CHECK(if we must define _GNU_SOURCE,cf_cv_gnu_source,[
+cf_gnu_xopen_source=ifelse($1,,500,$1)
+
+AC_CACHE_CHECK(if this is the GNU C library,cf_cv_gnu_library,[
 AC_TRY_COMPILE([#include <sys/types.h>],[
 AC_TRY_COMPILE([#include <sys/types.h>],[
-#ifndef _XOPEN_SOURCE
-make an error
-#endif],
-       [cf_cv_gnu_source=no],
-       [cf_save="$CPPFLAGS"
-        CPPFLAGS="$CPPFLAGS -D_GNU_SOURCE"
-        AC_TRY_COMPILE([#include <sys/types.h>],[
-#ifdef _XOPEN_SOURCE
-make an error
-#endif],
-       [cf_cv_gnu_source=no],
-       [cf_cv_gnu_source=yes])
-       CPPFLAGS="$cf_save"
-       ])
+       #if __GLIBC__ > 0 && __GLIBC_MINOR__ >= 0
+               return 0;
+       #elif __NEWLIB__ > 0 && __NEWLIB_MINOR__ >= 0
+               return 0;
+       #else
+       #       error not GNU C library
+       #endif],
+       [cf_cv_gnu_library=yes],
+       [cf_cv_gnu_library=no])
 ])
 ])
-test "$cf_cv_gnu_source" = yes && CPPFLAGS="$CPPFLAGS -D_GNU_SOURCE"
+
+if test x$cf_cv_gnu_library = xyes; then
+
+       # With glibc 2.19 (13 years after this check was begun), _DEFAULT_SOURCE
+       # was changed to help a little.  newlib incorporated the change about 4
+       # years later.
+       AC_CACHE_CHECK(if _DEFAULT_SOURCE can be used as a basis,cf_cv_gnu_library_219,[
+               cf_save="$CPPFLAGS"
+               CF_APPEND_TEXT(CPPFLAGS,-D_DEFAULT_SOURCE)
+               AC_TRY_COMPILE([#include <sys/types.h>],[
+                       #if (__GLIBC__ == 2 && __GLIBC_MINOR__ >= 19) || (__GLIBC__ > 2)
+                               return 0;
+                       #elif (__NEWLIB__ == 2 && __NEWLIB_MINOR__ >= 4) || (__GLIBC__ > 3)
+                               return 0;
+                       #else
+                       #       error GNU C library __GLIBC__.__GLIBC_MINOR__ is too old
+                       #endif],
+                       [cf_cv_gnu_library_219=yes],
+                       [cf_cv_gnu_library_219=no])
+               CPPFLAGS="$cf_save"
+       ])
+
+       if test "x$cf_cv_gnu_library_219" = xyes; then
+               cf_save="$CPPFLAGS"
+               AC_CACHE_CHECK(if _XOPEN_SOURCE=$cf_gnu_xopen_source works with _DEFAULT_SOURCE,cf_cv_gnu_dftsrc_219,[
+                       CF_ADD_CFLAGS(-D_DEFAULT_SOURCE -D_XOPEN_SOURCE=$cf_gnu_xopen_source)
+                       AC_TRY_COMPILE([
+                               #include <limits.h>
+                               #include <sys/types.h>
+                               ],[
+                               #if (_XOPEN_SOURCE >= $cf_gnu_xopen_source) && (MB_LEN_MAX > 1)
+                                       return 0;
+                               #else
+                               #       error GNU C library is too old
+                               #endif],
+                               [cf_cv_gnu_dftsrc_219=yes],
+                               [cf_cv_gnu_dftsrc_219=no])
+                       ])
+               test "x$cf_cv_gnu_dftsrc_219" = "xyes" || CPPFLAGS="$cf_save"
+       else
+               cf_cv_gnu_dftsrc_219=maybe
+       fi
+
+       if test "x$cf_cv_gnu_dftsrc_219" != xyes; then
+
+               AC_CACHE_CHECK(if we must define _GNU_SOURCE,cf_cv_gnu_source,[
+               AC_TRY_COMPILE([#include <sys/types.h>],[
+                       #ifndef _XOPEN_SOURCE
+                       #error  expected _XOPEN_SOURCE to be defined
+                       #endif],
+                       [cf_cv_gnu_source=no],
+                       [cf_save="$CPPFLAGS"
+                        CF_ADD_CFLAGS(-D_GNU_SOURCE)
+                        AC_TRY_COMPILE([#include <sys/types.h>],[
+                               #ifdef _XOPEN_SOURCE
+                               #error  expected _XOPEN_SOURCE to be undefined
+                               #endif],
+                               [cf_cv_gnu_source=no],
+                               [cf_cv_gnu_source=yes])
+                       CPPFLAGS="$cf_save"
+                       ])
+               ])
+
+               if test "$cf_cv_gnu_source" = yes
+               then
+               AC_CACHE_CHECK(if we should also define _DEFAULT_SOURCE,cf_cv_default_source,[
+                       CF_APPEND_TEXT(CPPFLAGS,-D_GNU_SOURCE)
+                       AC_TRY_COMPILE([#include <sys/types.h>],[
+                               #ifdef _DEFAULT_SOURCE
+                               #error  expected _DEFAULT_SOURCE to be undefined
+                               #endif],
+                               [cf_cv_default_source=no],
+                               [cf_cv_default_source=yes])
+                       ])
+                       if test "$cf_cv_default_source" = yes
+                       then
+                               CF_APPEND_TEXT(CPPFLAGS,-D_DEFAULT_SOURCE)
+                       fi
+               fi
+       fi
+
+fi
 ])dnl
 dnl ---------------------------------------------------------------------------
 ])dnl
 dnl ---------------------------------------------------------------------------
-dnl CF_GPP_LIBRARY version: 11 updated: 2012/10/06 17:56:13
+dnl CF_GPP_LIBRARY version: 12 updated: 2015/04/17 21:13:04
 dnl --------------
 dnl If we're trying to use g++, test if libg++ is installed (a rather common
 dnl problem :-).  If we have the compiler but no library, we'll be able to
 dnl --------------
 dnl If we're trying to use g++, test if libg++ is installed (a rather common
 dnl problem :-).  If we have the compiler but no library, we'll be able to
@@ -2351,11 +2882,11 @@ dnl configure, but won't be able to build the c++ demo program.
 AC_DEFUN([CF_GPP_LIBRARY],
 [
 cf_cxx_library=unknown
 AC_DEFUN([CF_GPP_LIBRARY],
 [
 cf_cxx_library=unknown
-case $cf_cv_system_name in #(vi
-os2*) #(vi
+case $cf_cv_system_name in
+(os2*)
        cf_gpp_libname=gpp
        ;;
        cf_gpp_libname=gpp
        ;;
-*)
+(*)
        cf_gpp_libname=g++
        ;;
 esac
        cf_gpp_libname=g++
        ;;
 esac
@@ -2387,7 +2918,7 @@ if test "$GXX" = yes; then
 fi
 ])dnl
 dnl ---------------------------------------------------------------------------
 fi
 ])dnl
 dnl ---------------------------------------------------------------------------
-dnl CF_GXX_VERSION version: 7 updated: 2012/06/16 14:55:39
+dnl CF_GXX_VERSION version: 8 updated: 2017/02/11 14:48:57
 dnl --------------
 dnl Check for version of g++
 AC_DEFUN([CF_GXX_VERSION],[
 dnl --------------
 dnl Check for version of g++
 AC_DEFUN([CF_GXX_VERSION],[
@@ -2396,12 +2927,16 @@ GXX_VERSION=none
 if test "$GXX" = yes; then
        AC_MSG_CHECKING(version of ${CXX:-g++})
        GXX_VERSION="`${CXX:-g++} --version| sed -e '2,$d' -e 's/^.*(GCC) //' -e 's/^[[^0-9.]]*//' -e 's/[[^0-9.]].*//'`"
 if test "$GXX" = yes; then
        AC_MSG_CHECKING(version of ${CXX:-g++})
        GXX_VERSION="`${CXX:-g++} --version| sed -e '2,$d' -e 's/^.*(GCC) //' -e 's/^[[^0-9.]]*//' -e 's/[[^0-9.]].*//'`"
-       test -z "$GXX_VERSION" && GXX_VERSION=unknown
+       if test -z "$GXX_VERSION"
+       then
+               GXX_VERSION=unknown
+               GXX=no
+       fi
        AC_MSG_RESULT($GXX_VERSION)
 fi
 ])dnl
 dnl ---------------------------------------------------------------------------
        AC_MSG_RESULT($GXX_VERSION)
 fi
 ])dnl
 dnl ---------------------------------------------------------------------------
-dnl CF_GXX_WARNINGS version: 7 updated: 2012/06/16 14:55:39
+dnl CF_GXX_WARNINGS version: 9 updated: 2015/04/17 21:13:04
 dnl ---------------
 dnl Check if the compiler supports useful warning options.
 dnl
 dnl ---------------
 dnl Check if the compiler supports useful warning options.
 dnl
@@ -2481,25 +3016,26 @@ then
        cf_gxx_extra_warnings=""
        test "$with_ext_const" = yes && cf_gxx_extra_warnings="Wwrite-strings"
        case "$GCC_VERSION" in
        cf_gxx_extra_warnings=""
        test "$with_ext_const" = yes && cf_gxx_extra_warnings="Wwrite-strings"
        case "$GCC_VERSION" in
-       [[1-2]].*)
+       ([[1-2]].*)
                ;;
                ;;
-       *)
+       (*)
                cf_gxx_extra_warnings="$cf_gxx_extra_warnings Weffc++"
                ;;
        esac
        for cf_opt in \
                Wabi \
                fabi-version=0 \
                cf_gxx_extra_warnings="$cf_gxx_extra_warnings Weffc++"
                ;;
        esac
        for cf_opt in \
                Wabi \
                fabi-version=0 \
+               Wextra \
+               Wignored-qualifiers \
+               Wlogical-op \
                Woverloaded-virtual \
                Wsign-promo \
                Wsynth \
                Wold-style-cast \
                Wcast-align \
                Wcast-qual \
                Woverloaded-virtual \
                Wsign-promo \
                Wsynth \
                Wold-style-cast \
                Wcast-align \
                Wcast-qual \
-               Wmissing-prototypes \
                Wpointer-arith \
                Wshadow \
                Wpointer-arith \
                Wshadow \
-               Wstrict-prototypes \
                Wundef $cf_gxx_extra_warnings $1
        do
                CXXFLAGS="$cf_save_CXXFLAGS $EXTRA_CXXFLAGS -Werror -$cf_opt"
                Wundef $cf_gxx_extra_warnings $1
        do
                CXXFLAGS="$cf_save_CXXFLAGS $EXTRA_CXXFLAGS -Werror -$cf_opt"
@@ -2518,7 +3054,7 @@ AC_LANG_RESTORE
 AC_SUBST(EXTRA_CXXFLAGS)
 ])dnl
 dnl ---------------------------------------------------------------------------
 AC_SUBST(EXTRA_CXXFLAGS)
 ])dnl
 dnl ---------------------------------------------------------------------------
-dnl CF_HASHED_DB version: 4 updated: 2010/05/29 16:31:02
+dnl CF_HASHED_DB version: 7 updated: 2015/04/18 08:56:57
 dnl ------------
 dnl Look for an instance of the Berkeley hashed database.
 dnl
 dnl ------------
 dnl Look for an instance of the Berkeley hashed database.
 dnl
@@ -2526,14 +3062,24 @@ dnl $1 = optional parameter, to specify install-prefix for the database.
 AC_DEFUN([CF_HASHED_DB],
 [
 ifelse([$1],,,[
 AC_DEFUN([CF_HASHED_DB],
 [
 ifelse([$1],,,[
-case $1 in #(vi
-yes|*able*) #(vi
-    ;;
-*)
-    if test -d "$1" ; then
-        CF_ADD_INCDIR($1/include)
-        CF_ADD_LIBDIR($1/lib)
-    fi
+case $1 in
+(yes|*able*)
+       ;;
+(*)
+       if test -d "$1" ; then
+               CF_ADD_INCDIR($1/include)
+               CF_ADD_LIBDIR($1/lib)
+       else
+               case "$1" in
+               (./*|../*|/*)
+                       AC_MSG_WARN(no such directory $1)
+                       ;;
+               (*)
+                       CF_FIND_SUB_INCDIR($1)
+                       CF_FIND_SUB_LIBDIR($1)
+                       ;;
+               esac
+       fi
 esac
 ])
 AC_CHECK_HEADER(db.h,[
 esac
 ])
 AC_CHECK_HEADER(db.h,[
@@ -2625,7 +3171,7 @@ done
 ])
 ])dnl
 dnl ---------------------------------------------------------------------------
 ])
 ])dnl
 dnl ---------------------------------------------------------------------------
-dnl CF_HASHED_DB_VERSION version: 3 updated: 2007/12/01 15:01:37
+dnl CF_HASHED_DB_VERSION version: 4 updated: 2014/04/12 16:47:01
 dnl --------------------
 dnl Given that we have the header file for hashed database, find the version
 dnl information.
 dnl --------------------
 dnl Given that we have the header file for hashed database, find the version
 dnl information.
@@ -2634,7 +3180,7 @@ AC_DEFUN([CF_HASHED_DB_VERSION],
 AC_CACHE_CHECK(for version of db, cf_cv_hashed_db_version,[
 cf_cv_hashed_db_version=unknown
 
 AC_CACHE_CHECK(for version of db, cf_cv_hashed_db_version,[
 cf_cv_hashed_db_version=unknown
 
-for cf_db_version in 1 2 3 4 5
+for cf_db_version in 1 2 3 4 5 6
 do
        CF_MSG_LOG(checking for db version $cf_db_version)
        AC_TRY_COMPILE([
 do
        CF_MSG_LOG(checking for db version $cf_db_version)
        AC_TRY_COMPILE([
@@ -2663,7 +3209,7 @@ done
 ])
 ])dnl
 dnl ---------------------------------------------------------------------------
 ])
 ])dnl
 dnl ---------------------------------------------------------------------------
-dnl CF_HEADER_PATH version: 12 updated: 2010/05/05 05:22:40
+dnl CF_HEADER_PATH version: 13 updated: 2015/04/15 19:08:48
 dnl --------------
 dnl Construct a search-list of directories for a nonstandard header-file
 dnl
 dnl --------------
 dnl Construct a search-list of directories for a nonstandard header-file
 dnl
@@ -2679,8 +3225,8 @@ cf_header_path_list=""
 if test -n "${CFLAGS}${CPPFLAGS}" ; then
        for cf_header_path in $CPPFLAGS $CFLAGS
        do
 if test -n "${CFLAGS}${CPPFLAGS}" ; then
        for cf_header_path in $CPPFLAGS $CFLAGS
        do
-               case $cf_header_path in #(vi
-               -I*)
+               case $cf_header_path in
+               (-I*)
                        cf_header_path=`echo ".$cf_header_path" |sed -e 's/^...//' -e 's,/include$,,'`
                        CF_ADD_SUBDIR_PATH($1,$2,include,$cf_header_path,NONE)
                        cf_header_path_list="$cf_header_path_list [$]$1"
                        cf_header_path=`echo ".$cf_header_path" |sed -e 's/^...//' -e 's,/include$,,'`
                        CF_ADD_SUBDIR_PATH($1,$2,include,$cf_header_path,NONE)
                        cf_header_path_list="$cf_header_path_list [$]$1"
@@ -2716,33 +3262,118 @@ AC_DEFUN([CF_HELP_MESSAGE],
 [AC_DIVERT_HELP([$1])dnl
 ])dnl
 dnl ---------------------------------------------------------------------------
 [AC_DIVERT_HELP([$1])dnl
 ])dnl
 dnl ---------------------------------------------------------------------------
-dnl CF_INCLUDE_DIRS version: 7 updated: 2012/11/10 19:15:05
+dnl CF_INCLUDE_DIRS version: 10 updated: 2014/09/19 20:58:42
 dnl ---------------
 dnl Construct the list of include-options according to whether we're building
 dnl ---------------
 dnl Construct the list of include-options according to whether we're building
-dnl in the source directory or using '--srcdir=DIR' option.  If we're building
-dnl with gcc, don't append the includedir if it happens to be /usr/include,
-dnl since that usually breaks gcc's shadow-includes.
+dnl in the source directory or using '--srcdir=DIR' option.
 AC_DEFUN([CF_INCLUDE_DIRS],
 [
 AC_DEFUN([CF_INCLUDE_DIRS],
 [
-if test "$GCC" != yes; then
-       CPPFLAGS="-I\${includedir} $CPPFLAGS"
-elif test "$includedir" != "/usr/include"; then
-       if test "$includedir" = '${prefix}/include' ; then
-               if test $prefix != /usr ; then
-                       CPPFLAGS="-I\${includedir} $CPPFLAGS"
-               fi
-       else
-               CPPFLAGS="-I\${includedir} $CPPFLAGS"
-       fi
-fi
 if test "$srcdir" != "."; then
        CPPFLAGS="-I\${srcdir}/../include $CPPFLAGS"
 fi
 if test "$srcdir" != "."; then
        CPPFLAGS="-I\${srcdir}/../include $CPPFLAGS"
 fi
-CPPFLAGS="-I. -I../include $CPPFLAGS"
+CPPFLAGS="-I../include $CPPFLAGS"
+if test "$srcdir" != "."; then
+       CPPFLAGS="-I\${srcdir} $CPPFLAGS"
+fi
+CPPFLAGS="-I. $CPPFLAGS"
 AC_SUBST(CPPFLAGS)
 ])dnl
 dnl ---------------------------------------------------------------------------
 AC_SUBST(CPPFLAGS)
 ])dnl
 dnl ---------------------------------------------------------------------------
-dnl CF_INTEL_COMPILER version: 4 updated: 2010/05/26 05:38:42
+dnl CF_INSTALL_OPTS version: 2 updated: 2018/08/18 12:19:21
+dnl ---------------
+dnl prompt for/fill-in useful install-program options
+AC_DEFUN([CF_INSTALL_OPTS],
+[
+CF_INSTALL_OPT_S
+CF_INSTALL_OPT_P
+CF_INSTALL_OPT_O
+])dnl
+dnl ---------------------------------------------------------------------------
+dnl CF_INSTALL_OPT_O version: 2 updated: 2015/05/15 19:45:35
+dnl ----------------
+dnl Almost all "install" programs default to the current user's ownership.
+dnl Almost - MINIX is an exception.
+AC_DEFUN([CF_INSTALL_OPT_O],
+[
+AC_MSG_CHECKING(if install needs to be told about ownership)
+case `$ac_config_guess` in
+(*minix)
+       with_install_o=yes
+       ;;
+(*)
+       with_install_o=no
+       ;;
+esac
+
+AC_MSG_RESULT($with_install_o)
+if test "x$with_install_o" = xyes
+then
+       INSTALL_OPT_O=`id root|sed -e 's/uid=[[0-9]]*(/ -o /' -e 's/gid=[[0-9]]*(/ -g /' -e 's/ [[^=[:space:]]][[^=[:space:]]]*=.*/ /' -e 's/)//g'`
+else
+       INSTALL_OPT_O=
+fi
+
+AC_SUBST(INSTALL_OPT_O)
+])dnl
+dnl ---------------------------------------------------------------------------
+dnl CF_INSTALL_OPT_P version: 1 updated: 2018/08/18 12:19:21
+dnl ----------------
+dnl Some install-programs accept a "-p" option to preserve file modification
+dnl timestamps.  That can be useful as an install option, as well as a way to
+dnl avoid the need for ranlib after copying a static archive.
+AC_DEFUN([CF_INSTALL_OPT_P],
+[
+: ${INSTALL:=install}
+AC_CACHE_CHECK(if install accepts -p option, cf_cv_install_p,[
+       rm -rf conftest*
+       date >conftest.in
+       mkdir conftest.out
+       sleep 3
+       if $INSTALL -p conftest.in conftest.out 2>/dev/null
+       then
+               if test -f conftest.out/conftest.in
+               then
+                       test conftest.in -nt conftest.out/conftest.in 2>conftest.err && \
+                       test conftest.out/conftest.in -nt conftest.in 2>conftest.err
+                       if test -s conftest.err
+                       then
+                               cf_cv_install_p=no
+                       else
+                               cf_cv_install_p=yes
+                       fi
+               else
+                       cf_cv_install_p=no
+               fi
+       else
+               cf_cv_install_p=no
+       fi
+       rm -rf conftest*
+])
+])dnl
+dnl ---------------------------------------------------------------------------
+dnl CF_INSTALL_OPT_S version: 2 updated: 2018/08/18 12:19:21
+dnl ----------------
+dnl By default, we should strip executables which are installed, but leave the
+dnl ability to suppress that for unit-testing.
+AC_DEFUN([CF_INSTALL_OPT_S],
+[
+AC_MSG_CHECKING(if you want to install stripped executables)
+CF_ARG_DISABLE(stripping,
+       [  --disable-stripping     do not strip (debug info) installed executables],
+       [with_stripping=no],
+       [with_stripping=yes])
+AC_MSG_RESULT($with_stripping)
+
+if test "$with_stripping" = yes
+then
+       INSTALL_OPT_S="-s"
+else
+       INSTALL_OPT_S=
+fi
+AC_SUBST(INSTALL_OPT_S)
+])dnl
+dnl ---------------------------------------------------------------------------
+dnl CF_INTEL_COMPILER version: 7 updated: 2015/04/12 15:39:00
 dnl -----------------
 dnl Check if the given compiler is really the Intel compiler for Linux.  It
 dnl tries to imitate gcc, but does not return an error when it finds a mismatch
 dnl -----------------
 dnl Check if the given compiler is really the Intel compiler for Linux.  It
 dnl tries to imitate gcc, but does not return an error when it finds a mismatch
@@ -2756,11 +3387,12 @@ dnl $1 = GCC (default) or GXX
 dnl $2 = INTEL_COMPILER (default) or INTEL_CPLUSPLUS
 dnl $3 = CFLAGS (default) or CXXFLAGS
 AC_DEFUN([CF_INTEL_COMPILER],[
 dnl $2 = INTEL_COMPILER (default) or INTEL_CPLUSPLUS
 dnl $3 = CFLAGS (default) or CXXFLAGS
 AC_DEFUN([CF_INTEL_COMPILER],[
+AC_REQUIRE([AC_CANONICAL_HOST])
 ifelse([$2],,INTEL_COMPILER,[$2])=no
 
 if test "$ifelse([$1],,[$1],GCC)" = yes ; then
        case $host_os in
 ifelse([$2],,INTEL_COMPILER,[$2])=no
 
 if test "$ifelse([$1],,[$1],GCC)" = yes ; then
        case $host_os in
-       linux*|gnu*)
+       (linux*|gnu*)
                AC_MSG_CHECKING(if this is really Intel ifelse([$1],GXX,C++,C) compiler)
                cf_save_CFLAGS="$ifelse([$3],,CFLAGS,[$3])"
                ifelse([$3],,CFLAGS,[$3])="$ifelse([$3],,CFLAGS,[$3]) -no-gcc"
                AC_MSG_CHECKING(if this is really Intel ifelse([$1],GXX,C++,C) compiler)
                cf_save_CFLAGS="$ifelse([$3],,CFLAGS,[$3])"
                ifelse([$3],,CFLAGS,[$3])="$ifelse([$3],,CFLAGS,[$3]) -no-gcc"
@@ -2770,7 +3402,7 @@ if test "$ifelse([$1],,[$1],GCC)" = yes ; then
 make an error
 #endif
 ],[ifelse([$2],,INTEL_COMPILER,[$2])=yes
 make an error
 #endif
 ],[ifelse([$2],,INTEL_COMPILER,[$2])=yes
-cf_save_CFLAGS="$cf_save_CFLAGS -we147 -no-gcc"
+cf_save_CFLAGS="$cf_save_CFLAGS -we147"
 ],[])
                ifelse([$3],,CFLAGS,[$3])="$cf_save_CFLAGS"
                AC_MSG_RESULT($ifelse([$2],,INTEL_COMPILER,[$2]))
 ],[])
                ifelse([$3],,CFLAGS,[$3])="$cf_save_CFLAGS"
                AC_MSG_RESULT($ifelse([$2],,INTEL_COMPILER,[$2]))
@@ -2794,13 +3426,13 @@ AC_MSG_RESULT($cf_cv_have_isascii)
 test "$cf_cv_have_isascii" = yes && AC_DEFINE(HAVE_ISASCII,1,[Define to 1 if we have isascii()])
 ])dnl
 dnl ---------------------------------------------------------------------------
 test "$cf_cv_have_isascii" = yes && AC_DEFINE(HAVE_ISASCII,1,[Define to 1 if we have isascii()])
 ])dnl
 dnl ---------------------------------------------------------------------------
-dnl CF_LARGEFILE version: 8 updated: 2012/10/06 08:57:51
+dnl CF_LARGEFILE version: 11 updated: 2018/06/20 20:23:13
 dnl ------------
 dnl Add checks for large file support.
 AC_DEFUN([CF_LARGEFILE],[
 ifdef([AC_FUNC_FSEEKO],[
 dnl ------------
 dnl Add checks for large file support.
 AC_DEFUN([CF_LARGEFILE],[
 ifdef([AC_FUNC_FSEEKO],[
-    AC_SYS_LARGEFILE
-    if test "$enable_largefile" != no ; then
+       AC_SYS_LARGEFILE
+       if test "$enable_largefile" != no ; then
        AC_FUNC_FSEEKO
 
        # Normally we would collect these definitions in the config.h,
        AC_FUNC_FSEEKO
 
        # Normally we would collect these definitions in the config.h,
@@ -2810,12 +3442,22 @@ ifdef([AC_FUNC_FSEEKO],[
        # header files by themselves before looking at the body files it is
        # told to compile.  For ncurses, those header files do not include
        # the config.h
        # header files by themselves before looking at the body files it is
        # told to compile.  For ncurses, those header files do not include
        # the config.h
-       test "$ac_cv_sys_large_files"      != no && CPPFLAGS="$CPPFLAGS -D_LARGE_FILES "
-       test "$ac_cv_sys_largefile_source" != no && CPPFLAGS="$CPPFLAGS -D_LARGEFILE_SOURCE "
-       test "$ac_cv_sys_file_offset_bits" != no && CPPFLAGS="$CPPFLAGS -D_FILE_OFFSET_BITS=$ac_cv_sys_file_offset_bits "
+       if test "$ac_cv_sys_large_files" != no
+       then
+               CF_APPEND_TEXT(CPPFLAGS,-D_LARGE_FILES)
+       fi
+       if test "$ac_cv_sys_largefile_source" != no
+       then
+               CF_APPEND_TEXT(CPPFLAGS,-D_LARGEFILE_SOURCE)
+       fi
+       if test "$ac_cv_sys_file_offset_bits" != no
+       then
+               CF_APPEND_TEXT(CPPFLAGS,-D_FILE_OFFSET_BITS=$ac_cv_sys_file_offset_bits)
+       fi
 
        AC_CACHE_CHECK(whether to use struct dirent64, cf_cv_struct_dirent64,[
                AC_TRY_COMPILE([
 
        AC_CACHE_CHECK(whether to use struct dirent64, cf_cv_struct_dirent64,[
                AC_TRY_COMPILE([
+#pragma GCC diagnostic error "-Wincompatible-pointer-types"
 #include <sys/types.h>
 #include <dirent.h>
                ],[
 #include <sys/types.h>
 #include <dirent.h>
                ],[
@@ -2829,11 +3471,11 @@ ifdef([AC_FUNC_FSEEKO],[
                [cf_cv_struct_dirent64=no])
        ])
        test "$cf_cv_struct_dirent64" = yes && AC_DEFINE(HAVE_STRUCT_DIRENT64,1,[Define to 1 if we have struct dirent64])
                [cf_cv_struct_dirent64=no])
        ])
        test "$cf_cv_struct_dirent64" = yes && AC_DEFINE(HAVE_STRUCT_DIRENT64,1,[Define to 1 if we have struct dirent64])
-    fi
+       fi
 ])
 ])
 dnl ---------------------------------------------------------------------------
 ])
 ])
 dnl ---------------------------------------------------------------------------
-dnl CF_LDFLAGS_STATIC version: 10 updated: 2011/09/24 12:51:48
+dnl CF_LDFLAGS_STATIC version: 12 updated: 2015/04/18 08:56:57
 dnl -----------------
 dnl Check for compiler/linker flags used to temporarily force usage of static
 dnl libraries.  This depends on the compiler and platform.  Use this to help
 dnl -----------------
 dnl Check for compiler/linker flags used to temporarily force usage of static
 dnl libraries.  This depends on the compiler and platform.  Use this to help
@@ -2842,37 +3484,37 @@ dnl the list of linker options and libraries.
 AC_DEFUN([CF_LDFLAGS_STATIC],[
 
 if test "$GCC" = yes ; then
 AC_DEFUN([CF_LDFLAGS_STATIC],[
 
 if test "$GCC" = yes ; then
-       case $cf_cv_system_name in #(
-       OS/2*|os2*|aix[[4]]*|solaris2.1[[0-9]]|darwin*)         #( vi
+       case $cf_cv_system_name in
+       (OS/2*|os2*|aix[[4]]*|solaris2.1[[0-9]]|darwin*)
                LDFLAGS_STATIC=
                LDFLAGS_SHARED=
                ;;
                LDFLAGS_STATIC=
                LDFLAGS_SHARED=
                ;;
-    *)         #( normally, except when broken
-        LDFLAGS_STATIC=-static
-        LDFLAGS_SHARED=-dynamic
-        ;;
-    esac
+       (*)     # normally, except when broken
+               LDFLAGS_STATIC=-static
+               LDFLAGS_SHARED=-dynamic
+               ;;
+       esac
 else
 else
-       case $cf_cv_system_name in #(
-       aix[[4-7]]*)    #( from ld manpage
+       case $cf_cv_system_name in
+       (aix[[4-7]]*)   # from ld manpage
                LDFLAGS_STATIC=-bstatic
                LDFLAGS_SHARED=-bdynamic
                ;;
                LDFLAGS_STATIC=-bstatic
                LDFLAGS_SHARED=-bdynamic
                ;;
-       hpux*)          #( from ld manpage for hpux10.20, hpux11.11
+       (hpux*)         # from ld manpage for hpux10.20, hpux11.11
                # We could also use just "archive" and "shared".
                LDFLAGS_STATIC=-Wl,-a,archive_shared
                LDFLAGS_SHARED=-Wl,-a,shared_archive
                ;;
                # We could also use just "archive" and "shared".
                LDFLAGS_STATIC=-Wl,-a,archive_shared
                LDFLAGS_SHARED=-Wl,-a,shared_archive
                ;;
-       irix*)          #( from ld manpage IRIX64
+       (irix*)         # from ld manpage IRIX64
                LDFLAGS_STATIC=-Bstatic
                LDFLAGS_SHARED=-Bdynamic
                ;;
                LDFLAGS_STATIC=-Bstatic
                LDFLAGS_SHARED=-Bdynamic
                ;;
-       osf[[45]]*)     #( from ld manpage osf4.0d, osf5.1
+       (osf[[45]]*)    # from ld manpage osf4.0d, osf5.1
                # alternative "-oldstyle_liblookup" (not in cc manpage)
                LDFLAGS_STATIC=-noso
                LDFLAGS_SHARED=-so_archive
                ;;
                # alternative "-oldstyle_liblookup" (not in cc manpage)
                LDFLAGS_STATIC=-noso
                LDFLAGS_SHARED=-so_archive
                ;;
-       solaris2*)
+       (solaris2*)
                LDFLAGS_STATIC=-Bstatic
                LDFLAGS_SHARED=-Bdynamic
                ;;
                LDFLAGS_STATIC=-Bstatic
                LDFLAGS_SHARED=-Bdynamic
                ;;
@@ -2906,11 +3548,11 @@ int cf_ldflags_static(FILE *fp);
        return cf_ldflags_static(stdin);
 ],[
        # some linkers simply ignore the -dynamic
        return cf_ldflags_static(stdin);
 ],[
        # some linkers simply ignore the -dynamic
-       case x`file conftest$ac_exeext 2>/dev/null` in #(vi
-       *static*) # (vi
+       case x`file conftest$ac_exeext 2>/dev/null` in
+       (*static*)
                cf_ldflags_static=no
                ;;
                cf_ldflags_static=no
                ;;
-       *)
+       (*)
                cf_ldflags_static=yes
                ;;
        esac
                cf_ldflags_static=yes
                ;;
        esac
@@ -2935,7 +3577,7 @@ AC_SUBST(LDFLAGS_STATIC)
 AC_SUBST(LDFLAGS_SHARED)
 ])
 dnl ---------------------------------------------------------------------------
 AC_SUBST(LDFLAGS_SHARED)
 ])
 dnl ---------------------------------------------------------------------------
-dnl CF_LD_RPATH_OPT version: 5 updated: 2011/07/17 14:48:41
+dnl CF_LD_RPATH_OPT version: 8 updated: 2018/08/18 16:36:35
 dnl ---------------
 dnl For the given system and compiler, find the compiler flags to pass to the
 dnl loader to use the "rpath" feature.
 dnl ---------------
 dnl For the given system and compiler, find the compiler flags to pass to the
 dnl loader to use the "rpath" feature.
@@ -2944,52 +3586,55 @@ AC_DEFUN([CF_LD_RPATH_OPT],
 AC_REQUIRE([CF_CHECK_CACHE])
 
 LD_RPATH_OPT=
 AC_REQUIRE([CF_CHECK_CACHE])
 
 LD_RPATH_OPT=
-AC_MSG_CHECKING(for an rpath option)
-case $cf_cv_system_name in #(vi
-irix*) #(vi
-       if test "$GCC" = yes; then
+if test "x$cf_cv_enable_rpath" != xno
+then
+       AC_MSG_CHECKING(for an rpath option)
+       case $cf_cv_system_name in
+       (irix*)
+               if test "$GCC" = yes; then
+                       LD_RPATH_OPT="-Wl,-rpath,"
+               else
+                       LD_RPATH_OPT="-rpath "
+               fi
+               ;;
+       (linux*|gnu*|k*bsd*-gnu|freebsd*)
                LD_RPATH_OPT="-Wl,-rpath,"
                LD_RPATH_OPT="-Wl,-rpath,"
-       else
+               ;;
+       (openbsd[[2-9]].*|mirbsd*)
+               LD_RPATH_OPT="-Wl,-rpath,"
+               ;;
+       (dragonfly*)
                LD_RPATH_OPT="-rpath "
                LD_RPATH_OPT="-rpath "
-       fi
-       ;;
-linux*|gnu*|k*bsd*-gnu) #(vi
-       LD_RPATH_OPT="-Wl,-rpath,"
-       ;;
-openbsd[[2-9]].*|mirbsd*) #(vi
-       LD_RPATH_OPT="-Wl,-rpath,"
-       ;;
-dragonfly*|freebsd*) #(vi
-       LD_RPATH_OPT="-rpath "
-       ;;
-netbsd*) #(vi
-       LD_RPATH_OPT="-Wl,-rpath,"
-       ;;
-osf*|mls+*) #(vi
-       LD_RPATH_OPT="-rpath "
-       ;;
-solaris2*) #(vi
-       LD_RPATH_OPT="-R"
-       ;;
-*)
-       ;;
-esac
-AC_MSG_RESULT($LD_RPATH_OPT)
-
-case "x$LD_RPATH_OPT" in #(vi
-x-R*)
-       AC_MSG_CHECKING(if we need a space after rpath option)
-       cf_save_LIBS="$LIBS"
-       CF_ADD_LIBS(${LD_RPATH_OPT}$libdir)
-       AC_TRY_LINK(, , cf_rpath_space=no, cf_rpath_space=yes)
-       LIBS="$cf_save_LIBS"
-       AC_MSG_RESULT($cf_rpath_space)
-       test "$cf_rpath_space" = yes && LD_RPATH_OPT="$LD_RPATH_OPT "
-       ;;
-esac
+               ;;
+       (netbsd*)
+               LD_RPATH_OPT="-Wl,-rpath,"
+               ;;
+       (osf*|mls+*)
+               LD_RPATH_OPT="-rpath "
+               ;;
+       (solaris2*)
+               LD_RPATH_OPT="-R"
+               ;;
+       (*)
+               ;;
+       esac
+       AC_MSG_RESULT($LD_RPATH_OPT)
+
+       case "x$LD_RPATH_OPT" in
+       (x-R*)
+               AC_MSG_CHECKING(if we need a space after rpath option)
+               cf_save_LIBS="$LIBS"
+               CF_ADD_LIBS(${LD_RPATH_OPT}$libdir)
+               AC_TRY_LINK(, , cf_rpath_space=no, cf_rpath_space=yes)
+               LIBS="$cf_save_LIBS"
+               AC_MSG_RESULT($cf_rpath_space)
+               test "$cf_rpath_space" = yes && LD_RPATH_OPT="$LD_RPATH_OPT "
+               ;;
+       esac
+fi
 ])dnl
 dnl ---------------------------------------------------------------------------
 ])dnl
 dnl ---------------------------------------------------------------------------
-dnl CF_LIBRARY_PATH version: 9 updated: 2010/03/28 12:52:50
+dnl CF_LIBRARY_PATH version: 10 updated: 2015/04/15 19:08:48
 dnl ---------------
 dnl Construct a search-list of directories for a nonstandard library-file
 dnl
 dnl ---------------
 dnl Construct a search-list of directories for a nonstandard library-file
 dnl
@@ -3003,8 +3648,8 @@ cf_library_path_list=""
 if test -n "${LDFLAGS}${LIBS}" ; then
        for cf_library_path in $LDFLAGS $LIBS
        do
 if test -n "${LDFLAGS}${LIBS}" ; then
        for cf_library_path in $LDFLAGS $LIBS
        do
-               case $cf_library_path in #(vi
-               -L*)
+               case $cf_library_path in
+               (-L*)
                        cf_library_path=`echo ".$cf_library_path" |sed -e 's/^...//' -e 's,/lib$,,'`
                        CF_ADD_SUBDIR_PATH($1,$2,lib,$cf_library_path,NONE)
                        cf_library_path_list="$cf_library_path_list [$]$1"
                        cf_library_path=`echo ".$cf_library_path" |sed -e 's/^...//' -e 's,/lib$,,'`
                        CF_ADD_SUBDIR_PATH($1,$2,lib,$cf_library_path,NONE)
                        cf_library_path_list="$cf_library_path_list [$]$1"
@@ -3018,24 +3663,40 @@ CF_SUBDIR_PATH($1,$2,lib)
 $1="$cf_library_path_list [$]$1"
 ])dnl
 dnl ---------------------------------------------------------------------------
 $1="$cf_library_path_list [$]$1"
 ])dnl
 dnl ---------------------------------------------------------------------------
-dnl CF_LIB_PREFIX version: 9 updated: 2012/01/21 19:28:10
+dnl CF_LIBTOOL_VERSION version: 1 updated: 2013/04/06 18:03:09
+dnl ------------------
+AC_DEFUN([CF_LIBTOOL_VERSION],[
+if test -n "$LIBTOOL" && test "$LIBTOOL" != none
+then
+       cf_cv_libtool_version=`$LIBTOOL --version 2>&1 | sed -e '/^$/d' |sed -e '2,$d' -e 's/([[^)]]*)//g' -e 's/^[[^1-9]]*//' -e 's/[[^0-9.]].*//'`
+else
+       cf_cv_libtool_version=
+fi
+test -z "$cf_cv_libtool_version" && unset cf_cv_libtool_version
+])dnl
+dnl ---------------------------------------------------------------------------
+dnl CF_LIB_PREFIX version: 12 updated: 2015/10/17 19:03:33
 dnl -------------
 dnl Compute the library-prefix for the given host system
 dnl $1 = variable to set
 define([CF_LIB_PREFIX],
 [
 dnl -------------
 dnl Compute the library-prefix for the given host system
 dnl $1 = variable to set
 define([CF_LIB_PREFIX],
 [
-       case $cf_cv_system_name in #(vi
-       OS/2*|os2*) #(vi
-        LIB_PREFIX=''
-        ;;
-       *)      LIB_PREFIX='lib'
-        ;;
+       case $cf_cv_system_name in
+       (OS/2*|os2*)
+               if test "$DFT_LWR_MODEL" = libtool; then
+                       LIB_PREFIX='lib'
+               else
+                       LIB_PREFIX=''
+               fi
+               ;;
+       (*)     LIB_PREFIX='lib'
+               ;;
        esac
 ifelse($1,,,[$1=$LIB_PREFIX])
        AC_SUBST(LIB_PREFIX)
 ])dnl
 dnl ---------------------------------------------------------------------------
        esac
 ifelse($1,,,[$1=$LIB_PREFIX])
        AC_SUBST(LIB_PREFIX)
 ])dnl
 dnl ---------------------------------------------------------------------------
-dnl CF_LIB_RULES version: 67 updated: 2012/10/06 13:36:35
+dnl CF_LIB_RULES version: 88 updated: 2018/08/18 12:19:21
 dnl ------------
 dnl Append definitions and rules for the given models to the subdirectory
 dnl Makefiles, and the recursion rule for the top-level Makefile.  If the
 dnl ------------
 dnl Append definitions and rules for the given models to the subdirectory
 dnl Makefiles, and the recursion rule for the top-level Makefile.  If the
@@ -3055,8 +3716,8 @@ AC_DEFUN([CF_LIB_RULES],
 cf_prefix=$LIB_PREFIX
 AC_REQUIRE([CF_SUBST_NCURSES_VERSION])
 
 cf_prefix=$LIB_PREFIX
 AC_REQUIRE([CF_SUBST_NCURSES_VERSION])
 
-case $cf_cv_shlib_version in #(vi
-cygdll|mingw)
+case $cf_cv_shlib_version in
+(cygdll|msysdll|mingw)
        TINFO_NAME=$TINFO_ARG_SUFFIX
        TINFO_SUFFIX=.dll
        ;;
        TINFO_NAME=$TINFO_ARG_SUFFIX
        TINFO_SUFFIX=.dll
        ;;
@@ -3064,17 +3725,17 @@ esac
 
 if test -n "$TINFO_SUFFIX" ; then
        case $TINFO_SUFFIX in
 
 if test -n "$TINFO_SUFFIX" ; then
        case $TINFO_SUFFIX in
-       tw*)
-               TINFO_NAME="${TINFO_NAME}tw"
-               TINFO_SUFFIX=`echo $TINFO_SUFFIX | sed 's/^tw//'`
+       (tw*)
+               TINFO_NAME="${TINFO_NAME}tw${EXTRA_SUFFIX}"
+               TINFO_SUFFIX=`echo $TINFO_SUFFIX | sed 's/^tw'$EXTRA_SUFFIX'//'`
                ;;
                ;;
-       t*)
-               TINFO_NAME="${TINFO_NAME}t"
-               TINFO_SUFFIX=`echo $TINFO_SUFFIX | sed 's/^t//'`
+       (t*)
+               TINFO_NAME="${TINFO_NAME}t${EXTRA_SUFFIX}"
+               TINFO_SUFFIX=`echo $TINFO_SUFFIX | sed 's/^t'$EXTRA_SUFFIX'//'`
                ;;
                ;;
-       w*)
-               TINFO_NAME="${TINFO_NAME}w"
-               TINFO_SUFFIX=`echo $TINFO_SUFFIX | sed 's/^w//'`
+       (w*)
+               TINFO_NAME="${TINFO_NAME}w${EXTRA_SUFFIX}"
+               TINFO_SUFFIX=`echo $TINFO_SUFFIX | sed 's/^w'$EXTRA_SUFFIX'//'`
                ;;
        esac
 fi
                ;;
        esac
 fi
 
                SHARED_LIB=
                Libs_To_Make=
 
                SHARED_LIB=
                Libs_To_Make=
+               cf_awk_program=
+               if test -n "${cf_cv_abi_version}" && test "x${cf_cv_abi_version}" != "x5"
+               then
+                       cf_awk_program="$cf_awk_program\
+/deprecated in ABI${cf_cv_abi_version}/ { next; }\
+{ sub(\"NCURSES([[WT]]+)?\", \"&${cf_cv_abi_version}\"); }\
+"
+               fi
+
+               if test "x$WILDCARD_SYMS" = xno
+               then
+                       cf_awk_program="$cf_awk_program\
+/[[    ]]_\\*;/ { skip=1; next; }\
+"
+               fi
+
+               if test "x$cf_awk_program" != "x"
+               then
+                       cat >>$cf_dir/Makefile <<CF_EOF
+
+# Generated by CF_LIB_RULES
+resulting.map: $UNALTERED_SYMS
+       $AWK 'BEGIN { skip = 1; last=""; } \
+$cf_awk_program \
+{ if ( last != "" && ( skip == 0 || \[$]\[$]0 !~ /}/ ) ) { print last; }\
+ skip = 0; last = \[$]\[$]0; } \
+END { print last; }' < $UNALTERED_SYMS >\[$]@
+
+distclean::
+       rm -f resulting.map
+CF_EOF
+               fi
+
                for cf_item in $cf_LIST_MODELS
                do
                        CF_LIB_SUFFIX($cf_item,cf_suffix,cf_depsuf)
                for cf_item in $cf_LIST_MODELS
                do
                        CF_LIB_SUFFIX($cf_item,cf_suffix,cf_depsuf)
+                       cf_libname=$cf_dir
+                       test "$cf_dir" = c++ && cf_libname=ncurses++
                        if test $cf_item = shared ; then
                        if test $cf_item = shared ; then
-                       if test "$cf_cv_do_symlinks" = yes ; then
-                               case "$cf_cv_shlib_version" in #(vi
-                               rel) #(vi
-                                       case "$cf_cv_system_name" in #(vi
-                                       darwin*)
-                                       case .${LIB_SUFFIX} in
-                                       .tw*)
-                                               cf_suffix=`echo $cf_suffix | sed 's/^tw//'`
-                                               cf_suffix=tw'.${REL_VERSION}'"$cf_suffix"
-                                               ;;
-                                       .t*)
-                                               cf_suffix=`echo $cf_suffix | sed 's/^t//'`
-                                               cf_suffix=t'.${REL_VERSION}'"$cf_suffix"
-                                               ;;
-                                       .w*)
-                                               cf_suffix=`echo $cf_suffix | sed 's/^w//'`
-                                               cf_suffix=w'.${REL_VERSION}'"$cf_suffix"
+                               if test -n "${LIB_SUFFIX}"
+                               then
+                                       cf_shared_suffix=`echo "$cf_suffix" | sed 's/^'"${USE_LIB_SUFFIX}"'//'`
+                               else
+                                       cf_shared_suffix="$cf_suffix"
+                               fi
+                               if test "$cf_cv_do_symlinks" = yes ; then
+                                       cf_version_name=
+
+                                       case "$cf_cv_shlib_version" in
+                                       (rel)
+                                               cf_version_name=REL_VERSION
                                                ;;
                                                ;;
-                                       *)
-                                               cf_suffix='.${REL_VERSION}'"$cf_suffix"
+                                       (abi)
+                                               cf_version_name=ABI_VERSION
                                                ;;
                                        esac
                                                ;;
                                        esac
-                                       ;; #(vi
-                                       *) cf_suffix="$cf_suffix"'.${REL_VERSION}' ;;
-                                       esac
+
+                                       if test -n "$cf_version_name"
+                                       then
+                                               case "$cf_cv_system_name" in
+                                               (darwin*)
+                                                       # "w", etc?
+                                                       cf_suffix="${USE_LIB_SUFFIX}"'.${'$cf_version_name'}'"$cf_shared_suffix"
+                                                       ;;
+                                               (*)
+                                                       cf_suffix="$cf_suffix"'.${'$cf_version_name'}'
+                                                       ;;
+                                               esac
+                                       fi
+                                       if test -n "${USE_LIB_SUFFIX}"
+                                       then
+                                               cf_shared_suffix=`echo "$cf_suffix" | sed 's/^'"${USE_LIB_SUFFIX}"'//'`
+                                       else
+                                               cf_shared_suffix="$cf_suffix"
+                                       fi
+                               fi
+                               # cygwin needs import library, and has unique naming convention
+                               # use autodetected ${cf_prefix} for import lib and static lib, but
+                               # use 'cyg' prefix for shared lib.
+                               case $cf_cv_shlib_version in
+                               (cygdll)
+                                       cf_cygsuf=`echo "$cf_suffix" | sed -e 's/\.dll/\${ABI_VERSION}.dll/'`
+                                       cf_add_lib="../lib/cyg${cf_libname}${cf_cygsuf}"
                                        ;;
                                        ;;
-                               abi)
-                                       case "$cf_cv_system_name" in #(vi
-                                       darwin*)
-                                       case .${LIB_SUFFIX} in
-                                       .tw*)
-                                               cf_suffix=`echo $cf_suffix | sed 's/^tw//'`
-                                               cf_suffix=tw'.${ABI_VERSION}'"$cf_suffix"
-                                               ;;
-                                       .t*)
-                                               cf_suffix=`echo $cf_suffix | sed 's/^t//'`
-                                               cf_suffix=t'.${ABI_VERSION}'"$cf_suffix"
-                                               ;;
-                                       .w*)
-                                               cf_suffix=`echo $cf_suffix | sed 's/^w//'`
-                                               cf_suffix=w'.${ABI_VERSION}'"$cf_suffix"
-                                               ;;
-                                       *)
-                                               cf_suffix='.${ABI_VERSION}'"$cf_suffix"
-                                               ;;
-                                       esac
-                                       ;; #(vi
-                                       *) cf_suffix="$cf_suffix"'.${ABI_VERSION}' ;;
-                                       esac
+                               (msysdll)
+                                       cf_cygsuf=`echo "$cf_suffix" | sed -e 's/\.dll/\${ABI_VERSION}.dll/'`
+                                       cf_add_lib="../lib/msys-${cf_libname}${cf_cygsuf}"
+                                       ;;
+                               (mingw)
+                                       cf_cygsuf=`echo "$cf_suffix" | sed -e 's/\.dll/\${ABI_VERSION}.dll/'`
+                                       cf_add_lib="../lib/lib${cf_libname}${cf_cygsuf}"
+                                       ;;
+                               (*)
+                                       cf_add_lib=
                                        ;;
                                esac
                                        ;;
                                esac
+                               if test -n "$cf_add_lib"
+                               then
+                                       Libs_To_Make="$Libs_To_Make $cf_add_lib"
+                                       continue
+                               fi
                        fi
                        fi
-                       # cygwin needs import library, and has unique naming convention
-                       # use autodetected ${cf_prefix} for import lib and static lib, but
-                       # use 'cyg' prefix for shared lib.
-                       case $cf_cv_shlib_version in #(vi
-                       cygdll) #(vi
-                               cf_cygsuf=`echo "$cf_suffix" | sed -e 's/\.dll/\${ABI_VERSION}.dll/'`
-                               Libs_To_Make="$Libs_To_Make ../lib/cyg${cf_dir}${cf_cygsuf}"
-                               continue
-                               ;;
-                       mingw)
-                               cf_cygsuf=`echo "$cf_suffix" | sed -e 's/\.dll/\${ABI_VERSION}.dll/'`
-                               Libs_To_Make="$Libs_To_Make ../lib/lib${cf_dir}${cf_cygsuf}"
-                               continue
-                               ;;
-                       esac
-                       fi
-                       Libs_To_Make="$Libs_To_Make ../lib/${cf_prefix}${cf_dir}${cf_suffix}"
+                       cf_add_lib="../lib/${cf_prefix}${cf_libname}${cf_suffix}"
+                       Libs_To_Make="$Libs_To_Make $cf_add_lib"
                done
 
                if test $cf_dir = ncurses ; then
                done
 
                if test $cf_dir = ncurses ; then
@@ -3172,20 +3864,20 @@ do
                                cf_l_parts=`echo "$cf_r_parts" |sed -e 's/ .*$//'`
                                cf_r_parts=`echo "$cf_r_parts" |sed -e 's/^[[^ ]]* //'`
                                if test "$cf_l_parts" != "$cf_r_parts" ; then
                                cf_l_parts=`echo "$cf_r_parts" |sed -e 's/ .*$//'`
                                cf_r_parts=`echo "$cf_r_parts" |sed -e 's/^[[^ ]]* //'`
                                if test "$cf_l_parts" != "$cf_r_parts" ; then
-                                       cf_item=
-                                       case $cf_l_parts in #(vi
-                                       *termlib*) #(vi
-                                               cf_item=`echo $cf_liblist |sed -e s%${LIB_NAME}${LIB_SUFFIX}%${TINFO_LIB_SUFFIX}%g`
+                                       cf_add_lib=
+                                       case $cf_l_parts in
+                                       (*termlib*)
+                                               cf_add_lib=`echo $cf_liblist |sed -e s%${LIB_NAME}${USE_LIB_SUFFIX}%${TINFO_LIB_SUFFIX}%g`
                                                ;;
                                                ;;
-                                       *ticlib*)
-                                               cf_item=`echo $cf_liblist |sed -e s%${LIB_NAME}${LIB_SUFFIX}%${TICS_LIB_SUFFIX}%g`
+                                       (*ticlib*)
+                                               cf_add_lib=`echo $cf_liblist |sed -e s%${LIB_NAME}${USE_LIB_SUFFIX}%${TICS_LIB_SUFFIX}%g`
                                                ;;
                                                ;;
-                                       *)
+                                       (*)
                                                break
                                                ;;
                                        esac
                                                break
                                                ;;
                                        esac
-                                       if test -n "$cf_item"; then
-                                               Libs_To_Make="$cf_item $Libs_To_Make"
+                                       if test -n "$cf_add_lib"; then
+                                               Libs_To_Make="$cf_add_lib $Libs_To_Make"
                                        fi
                                else
                                        break
                                        fi
                                else
                                        break
@@ -3195,6 +3887,33 @@ do
                        cf_subsets=`echo "$LIB_SUBSETS" | sed -e 's/^termlib.* //'`
                fi
 
                        cf_subsets=`echo "$LIB_SUBSETS" | sed -e 's/^termlib.* //'`
                fi
 
+               if test $cf_dir = c++; then
+                       if test "x$with_shared_cxx" != xyes && test -n "$cf_shared_suffix"; then
+                               cf_list=
+                               for cf_item in $Libs_To_Make
+                               do
+                                       case $cf_item in
+                                       (*.a)
+                                               ;;
+                                       (*)
+                                               cf_item=`echo "$cf_item" | sed -e "s,"$cf_shared_suffix",.a,"`
+                                               ;;
+                                       esac
+                                       for cf_test in $cf_list
+                                       do
+                                               if test "$cf_test" = "$cf_item"
+                                               then
+                                                       cf_LIST_MODELS=`echo "$cf_LIST_MODELS" | sed -e 's/normal//'`
+                                                       cf_item=
+                                                       break
+                                               fi
+                                       done
+                                       test -n "$cf_item" && cf_list="$cf_list $cf_item"
+                               done
+                               Libs_To_Make="$cf_list"
+                       fi
+               fi
+
                sed -e "s%@Libs_To_Make@%$Libs_To_Make%" \
                    -e "s%@SHARED_LIB@%$SHARED_LIB%" \
                        $cf_dir/Makefile >$cf_dir/Makefile.out
                sed -e "s%@Libs_To_Make@%$Libs_To_Make%" \
                    -e "s%@SHARED_LIB@%$SHARED_LIB%" \
                        $cf_dir/Makefile >$cf_dir/Makefile.out
@@ -3209,8 +3928,23 @@ do
                        cf_subdirs=
                        for cf_item in $cf_LIST_MODELS
                        do
                        cf_subdirs=
                        for cf_item in $cf_LIST_MODELS
                        do
+
                        echo "Appending rules for ${cf_item} model (${cf_dir}: ${cf_subset})"
                        CF_UPPER(cf_ITEM,$cf_item)
                        echo "Appending rules for ${cf_item} model (${cf_dir}: ${cf_subset})"
                        CF_UPPER(cf_ITEM,$cf_item)
+
+                       CXX_MODEL=$cf_ITEM
+                       if test "$CXX_MODEL" = SHARED; then
+                               case $cf_cv_shlib_version in
+                               (cygdll|msysdll|mingw)
+                                       test "x$with_shared_cxx" = xno && CF_VERBOSE(overriding CXX_MODEL to SHARED)
+                                       with_shared_cxx=yes
+                                       ;;
+                               (*)
+                                       test "x$with_shared_cxx" = xno && CXX_MODEL=NORMAL
+                                       ;;
+                               esac
+                       fi
+
                        CF_LIB_SUFFIX($cf_item,cf_suffix,cf_depsuf)
                        CF_OBJ_SUBDIR($cf_item,cf_subdir)
 
                        CF_LIB_SUFFIX($cf_item,cf_suffix,cf_depsuf)
                        CF_OBJ_SUBDIR($cf_item,cf_subdir)
 
@@ -3218,22 +3952,24 @@ do
                        cf_libname=$cf_dir
                        if test $cf_dir = ncurses ; then
                                case $cf_subset in
                        cf_libname=$cf_dir
                        if test $cf_dir = ncurses ; then
                                case $cf_subset in
-                               *base*)
-                                       cf_libname=${cf_libname}$LIB_SUFFIX
+                               (*base*)
+                                       cf_libname=${cf_libname}$USE_LIB_SUFFIX
                                        ;;
                                        ;;
-                               *termlib*)
+                               (*termlib*)
                                        cf_libname=$TINFO_LIB_SUFFIX
                                        ;;
                                        cf_libname=$TINFO_LIB_SUFFIX
                                        ;;
-                               ticlib*)
+                               (ticlib*)
                                        cf_libname=$TICS_LIB_SUFFIX
                                        ;;
                                esac
                                        cf_libname=$TICS_LIB_SUFFIX
                                        ;;
                                esac
+                       elif test $cf_dir = c++ ; then
+                               cf_libname=ncurses++$USE_LIB_SUFFIX
                        else
                        else
-                               cf_libname=${cf_libname}$LIB_SUFFIX
+                               cf_libname=${cf_libname}$USE_LIB_SUFFIX
                        fi
                        fi
-                       if test -n "${DFT_ARG_SUFFIX}" ; then
-                               # undo $LIB_SUFFIX add-on in CF_LIB_SUFFIX
-                               cf_suffix=`echo $cf_suffix |sed -e "s%^${LIB_SUFFIX}%%"`
+                       if test -n "${USE_ARG_SUFFIX}" ; then
+                               # undo $USE_LIB_SUFFIX add-on in CF_LIB_SUFFIX
+                               cf_suffix=`echo $cf_suffix |sed -e "s%^${USE_LIB_SUFFIX}%%"`
                        fi
 
                        # These dependencies really are for development, not
                        fi
 
                        # These dependencies really are for development, not
@@ -3254,22 +3990,27 @@ do
                        cf_dir_suffix=
                        old_cf_suffix="$cf_suffix"
                        if test "$cf_cv_shlib_version_infix" = yes ; then
                        cf_dir_suffix=
                        old_cf_suffix="$cf_suffix"
                        if test "$cf_cv_shlib_version_infix" = yes ; then
-                       if test -n "$LIB_SUFFIX" ; then
-                               case $LIB_SUFFIX in
-                               tw*)
-                                       cf_libname=`echo $cf_libname | sed 's/tw$//'`
-                                       cf_suffix=`echo $cf_suffix | sed 's/^tw//'`
-                                       cf_dir_suffix=tw
+                       if test -n "$USE_LIB_SUFFIX" ; then
+                               case $USE_LIB_SUFFIX in
+                               (tw*)
+                                       cf_libname=`echo $cf_libname | sed 's/tw'$EXTRA_SUFFIX'$//'`
+                                       cf_suffix=`echo $cf_suffix | sed 's/^tw'$EXTRA_SUFFIX'//'`
+                                       cf_dir_suffix=tw$EXTRA_SUFFIX
+                                       ;;
+                               (t*)
+                                       cf_libname=`echo $cf_libname | sed 's/t'$EXTRA_SUFFIX'$//'`
+                                       cf_suffix=`echo $cf_suffix | sed 's/^t'$EXTRA_SUFFIX'//'`
+                                       cf_dir_suffix=t$EXTRA_SUFFIX
                                        ;;
                                        ;;
-                               t*)
-                                       cf_libname=`echo $cf_libname | sed 's/t$//'`
-                                       cf_suffix=`echo $cf_suffix | sed 's/^t//'`
-                                       cf_dir_suffix=t
+                               (w*)
+                                       cf_libname=`echo $cf_libname | sed 's/w'$EXTRA_SUFFIX'$//'`
+                                       cf_suffix=`echo $cf_suffix | sed 's/^w'$EXTRA_SUFFIX'//'`
+                                       cf_dir_suffix=w$EXTRA_SUFFIX
                                        ;;
                                        ;;
-                               w*)
-                                       cf_libname=`echo $cf_libname | sed 's/w$//'`
-                                       cf_suffix=`echo $cf_suffix | sed 's/^w//'`
-                                       cf_dir_suffix=w
+                               (*)
+                                       cf_libname=`echo $cf_libname | sed 's/'$EXTRA_SUFFIX'$//'`
+                                       cf_suffix=`echo $cf_suffix | sed 's/^'$EXTRA_SUFFIX'//'`
+                                       cf_dir_suffix=$EXTRA_SUFFIX
                                        ;;
                                esac
                        fi
                                        ;;
                                esac
                        fi
@@ -3279,6 +4020,7 @@ do
                                name=${cf_libname}${cf_dir_suffix} \
                                traces=$LIB_TRACING \
                                MODEL=$cf_ITEM \
                                name=${cf_libname}${cf_dir_suffix} \
                                traces=$LIB_TRACING \
                                MODEL=$cf_ITEM \
+                               CXX_MODEL=$CXX_MODEL \
                                model=$cf_subdir \
                                prefix=$cf_prefix \
                                suffix=$cf_suffix \
                                model=$cf_subdir \
                                prefix=$cf_prefix \
                                suffix=$cf_suffix \
@@ -3290,6 +4032,7 @@ do
                                ShlibVer=$cf_cv_shlib_version \
                                ShlibVerInfix=$cf_cv_shlib_version_infix \
                                ReLink=${cf_cv_do_relink:-no} \
                                ShlibVer=$cf_cv_shlib_version \
                                ShlibVerInfix=$cf_cv_shlib_version_infix \
                                ReLink=${cf_cv_do_relink:-no} \
+                               ReRanlib=${cf_cv_do_reranlib:-yes} \
                                DoLinks=$cf_cv_do_symlinks \
                                rmSoLocs=$cf_cv_rm_so_locs \
                                ldconfig="$LDCONFIG" \
                                DoLinks=$cf_cv_do_symlinks \
                                rmSoLocs=$cf_cv_rm_so_locs \
                                ldconfig="$LDCONFIG" \
@@ -3333,7 +4076,7 @@ do
 
        if test -f $cf_dir/Makefile ; then
                case "$cf_dir" in
 
        if test -f $cf_dir/Makefile ; then
                case "$cf_dir" in
-               Ada95) #(vi
+               (Ada95)
                        echo 'libs \' >> Makefile
                        echo 'install.libs \' >> Makefile
                        echo 'uninstall.libs ::' >> Makefile
                        echo 'libs \' >> Makefile
                        echo 'install.libs \' >> Makefile
                        echo 'uninstall.libs ::' >> Makefile
@@ -3375,12 +4118,20 @@ CF_EOF
 fi
 done
 
 fi
 done
 
+if test "x$cf_with_db_install" = xyes; then
 cat >> Makefile <<CF_EOF
 
 install.libs uninstall.libs \\
 install.data uninstall.data ::
 $MAKE_TERMINFO cd misc && \${MAKE} \${TOP_MFLAGS} \[$]@
 CF_EOF
 cat >> Makefile <<CF_EOF
 
 install.libs uninstall.libs \\
 install.data uninstall.data ::
 $MAKE_TERMINFO cd misc && \${MAKE} \${TOP_MFLAGS} \[$]@
 CF_EOF
+else
+cat >> Makefile <<CF_EOF
+
+install.libs uninstall.libs ::
+       cd misc && \${MAKE} \${TOP_MFLAGS} \[$]@
+CF_EOF
+fi
 
 if test "x$cf_with_manpages" = xyes; then
 cat >> Makefile <<CF_EOF
 
 if test "x$cf_with_manpages" = xyes; then
 cat >> Makefile <<CF_EOF
@@ -3402,8 +4153,7 @@ CF_EOF
 
 # Special case: tack's manpage lives in its own directory.
 if test "x$cf_with_manpages" = xyes; then
 
 # Special case: tack's manpage lives in its own directory.
 if test "x$cf_with_manpages" = xyes; then
-if test -d tack ; then
-if test -f $srcdir/$tack.h; then
+if test "x$cf_with_tack" = "xyes"; then
 cat >> Makefile <<CF_EOF
 
 install.man \\
 cat >> Makefile <<CF_EOF
 
 install.man \\
@@ -3412,7 +4162,6 @@ uninstall.man ::
 CF_EOF
 fi
 fi
 CF_EOF
 fi
 fi
-fi
 
 dnl If we're installing into a subdirectory of /usr/include, etc., we should
 dnl prepend the subdirectory's name to the "#include" paths.  It won't hurt
 
 dnl If we're installing into a subdirectory of /usr/include, etc., we should
 dnl prepend the subdirectory's name to the "#include" paths.  It won't hurt
@@ -3425,7 +4174,7 @@ rm -f headers.sed headers.sh
 dnl ( generating this script makes the makefiles a little tidier :-)
 echo creating headers.sh
 cat >headers.sh <<CF_EOF
 dnl ( generating this script makes the makefiles a little tidier :-)
 echo creating headers.sh
 cat >headers.sh <<CF_EOF
-#! /bin/sh
+#! $SHELL
 # This shell script is generated by the 'configure' script.  It is invoked in a
 # subdirectory of the build tree.  It generates a sed-script in the parent
 # directory that is used to adjust includes for header files that reside in a
 # This shell script is generated by the 'configure' script.  It is invoked in a
 # subdirectory of the build tree.  It generates a sed-script in the parent
 # directory that is used to adjust includes for header files that reside in a
@@ -3446,7 +4195,7 @@ CF_EOF
 if test $WITH_CURSES_H = yes; then
        cat >>headers.sh <<CF_EOF
 case \$DST in
 if test $WITH_CURSES_H = yes; then
        cat >>headers.sh <<CF_EOF
 case \$DST in
-/*/include/*)
+(/*/include/*)
        END=\`basename \$DST\`
        for i in \`cat \$REF/../*/headers |fgrep -v "#"\`
        do
        END=\`basename \$DST\`
        for i in \`cat \$REF/../*/headers |fgrep -v "#"\`
        do
@@ -3454,7 +4203,7 @@ case \$DST in
                echo "s/<\$NAME>/<\$END\/\$NAME>/" >> \$TMPSED
        done
        ;;
                echo "s/<\$NAME>/<\$END\/\$NAME>/" >> \$TMPSED
        done
        ;;
-*)
+(*)
        echo "" >> \$TMPSED
        ;;
 esac
        echo "" >> \$TMPSED
        ;;
 esac
@@ -3463,7 +4212,7 @@ CF_EOF
 else
        cat >>headers.sh <<CF_EOF
 case \$DST in
 else
        cat >>headers.sh <<CF_EOF
 case \$DST in
-/*/include/*)
+(/*/include/*)
        END=\`basename \$DST\`
        for i in \`cat \$REF/../*/headers |fgrep -v "#"\`
        do
        END=\`basename \$DST\`
        for i in \`cat \$REF/../*/headers |fgrep -v "#"\`
        do
@@ -3476,7 +4225,7 @@ case \$DST in
                echo "s/<\$NAME>/<\$END\/\$NAME>/" >> \$TMPSED
        done
        ;;
                echo "s/<\$NAME>/<\$END\/\$NAME>/" >> \$TMPSED
        done
        ;;
-*)
+(*)
        echo "s/<curses.h>/<ncurses.h>/" >> \$TMPSED
        ;;
 esac
        echo "s/<curses.h>/<ncurses.h>/" >> \$TMPSED
        ;;
 esac
@@ -3529,7 +4278,7 @@ done
 AC_SUBST(Libs_To_Make)
 ])dnl
 dnl ---------------------------------------------------------------------------
 AC_SUBST(Libs_To_Make)
 ])dnl
 dnl ---------------------------------------------------------------------------
-dnl CF_LIB_SONAME version: 5 updated: 2010/08/14 18:25:37
+dnl CF_LIB_SONAME version: 6 updated: 2017/01/21 11:06:25
 dnl -------------
 dnl Find the and soname for the given shared library.  Set the cache variable
 dnl cf_cv_$3_soname to this, unless it is not found.  Then set the cache
 dnl -------------
 dnl Find the and soname for the given shared library.  Set the cache variable
 dnl cf_cv_$3_soname to this, unless it is not found.  Then set the cache
@@ -3546,7 +4295,7 @@ cf_cv_$3_soname=unknown
 if test "$cross_compiling" != yes ; then
 cat >conftest.$ac_ext <<CF_EOF
 $1
 if test "$cross_compiling" != yes ; then
 cat >conftest.$ac_ext <<CF_EOF
 $1
-int main()
+int main(void)
 {
 $2
        ${cf_cv_main_return:-return}(0);
 {
 $2
        ${cf_cv_main_return:-return}(0);
@@ -3566,7 +4315,7 @@ fi
 ])
 ])
 dnl ---------------------------------------------------------------------------
 ])
 ])
 dnl ---------------------------------------------------------------------------
-dnl CF_LIB_SUFFIX version: 18 updated: 2012/02/25 15:20:07
+dnl CF_LIB_SUFFIX version: 25 updated: 2015/04/17 21:13:04
 dnl -------------
 dnl Compute the library file-suffix from the given model name
 dnl $1 = model name
 dnl -------------
 dnl Compute the library file-suffix from the given model name
 dnl $1 = model name
@@ -3575,60 +4324,64 @@ dnl $3 = dependency variable to set (actual filename)
 dnl The variable $LIB_SUFFIX, if set, prepends the variable to set.
 AC_DEFUN([CF_LIB_SUFFIX],
 [
 dnl The variable $LIB_SUFFIX, if set, prepends the variable to set.
 AC_DEFUN([CF_LIB_SUFFIX],
 [
-       AC_REQUIRE([CF_SUBST_NCURSES_VERSION])
-       case $1 in #(vi
-       libtool) #(vi
+       case X$1 in
+       (Xlibtool)
                $2='.la'
                $3=[$]$2
                ;;
                $2='.la'
                $3=[$]$2
                ;;
-       normal) #(vi
-               $2='.a'
-               $3=[$]$2
-               ;;
-       debug) #(vi
+       (Xdebug)
                $2='_g.a'
                $3=[$]$2
                ;;
                $2='_g.a'
                $3=[$]$2
                ;;
-       profile) #(vi
+       (Xprofile)
                $2='_p.a'
                $3=[$]$2
                ;;
                $2='_p.a'
                $3=[$]$2
                ;;
-       shared) #(vi
+       (Xshared)
                case $cf_cv_system_name in
                case $cf_cv_system_name in
-               aix[[5-7]]*) #(vi
-                       $2='.a'
+               (aix[[5-7]]*)
+                       $2='.so'
                        $3=[$]$2
                        ;;
                        $3=[$]$2
                        ;;
-               cygwin*|mingw*) #(vi
+               (cygwin*|msys*|mingw*)
                        $2='.dll'
                        $3='.dll.a'
                        ;;
                        $2='.dll'
                        $3='.dll.a'
                        ;;
-               darwin*) #(vi
+               (darwin*)
                        $2='.dylib'
                        $3=[$]$2
                        ;;
                        $2='.dylib'
                        $3=[$]$2
                        ;;
-               hpux*) #(vi
+               (hpux*)
                        case $target in
                        case $target in
-                       ia64*) #(vi
+                       (ia64*)
                                $2='.so'
                                $3=[$]$2
                                ;;
                                $2='.so'
                                $3=[$]$2
                                ;;
-                       *) #(vi
+                       (*)
                                $2='.sl'
                                $3=[$]$2
                                ;;
                        esac
                        ;;
                                $2='.sl'
                                $3=[$]$2
                                ;;
                        esac
                        ;;
-               *)      $2='.so'
+               (*)
+                       $2='.so'
                        $3=[$]$2
                        ;;
                esac
                        $3=[$]$2
                        ;;
                esac
+               ;;
+       (*)
+               $2='.a'
+               $3=[$]$2
+               ;;
        esac
        esac
-       test -n "$LIB_SUFFIX" && $2="${LIB_SUFFIX}[$]{$2}"
-       test -n "$LIB_SUFFIX" && $3="${LIB_SUFFIX}[$]{$3}"
+       if test -n "${LIB_SUFFIX}${EXTRA_SUFFIX}"
+       then
+               $2="${LIB_SUFFIX}${EXTRA_SUFFIX}[$]{$2}"
+               $3="${LIB_SUFFIX}${EXTRA_SUFFIX}[$]{$3}"
+       fi
 ])dnl
 dnl ---------------------------------------------------------------------------
 ])dnl
 dnl ---------------------------------------------------------------------------
-dnl CF_LIB_TYPE version: 4 updated: 2000/10/20 22:57:49
+dnl CF_LIB_TYPE version: 5 updated: 2015/04/17 21:13:04
 dnl -----------
 dnl Compute the string to append to -library from the given model name
 dnl $1 = model name
 dnl -----------
 dnl Compute the string to append to -library from the given model name
 dnl $1 = model name
@@ -3637,16 +4390,16 @@ dnl The variable $LIB_SUFFIX, if set, prepends the variable to set.
 AC_DEFUN([CF_LIB_TYPE],
 [
        case $1 in
 AC_DEFUN([CF_LIB_TYPE],
 [
        case $1 in
-       libtool) $2=''   ;;
-       normal)  $2=''   ;;
-       debug)   $2='_g' ;;
-       profile) $2='_p' ;;
-       shared)  $2=''   ;;
+       (libtool) $2=''   ;;
+       (normal)  $2=''   ;;
+       (debug)   $2='_g' ;;
+       (profile) $2='_p' ;;
+       (shared)  $2=''   ;;
        esac
        test -n "$LIB_SUFFIX" && $2="${LIB_SUFFIX}[$]{$2}"
 ])dnl
 dnl ---------------------------------------------------------------------------
        esac
        test -n "$LIB_SUFFIX" && $2="${LIB_SUFFIX}[$]{$2}"
 ])dnl
 dnl ---------------------------------------------------------------------------
-dnl CF_LINK_DATAONLY version: 10 updated: 2012/10/06 17:41:51
+dnl CF_LINK_DATAONLY version: 12 updated: 2017/07/23 17:46:07
 dnl ----------------
 dnl Some systems have a non-ANSI linker that doesn't pull in modules that have
 dnl only data (i.e., no functions), for example NeXT.  On those systems we'll
 dnl ----------------
 dnl Some systems have a non-ANSI linker that doesn't pull in modules that have
 dnl only data (i.e., no functions), for example NeXT.  On those systems we'll
@@ -3668,7 +4421,7 @@ EOF
        rm -f conftest.$ac_ext data.o
        cat >conftest.$ac_ext <<EOF
 #line __oline__ "configure"
        rm -f conftest.$ac_ext data.o
        cat >conftest.$ac_ext <<EOF
 #line __oline__ "configure"
-int    testfunc()
+int    testfunc(void)
 {
 #if defined(NeXT)
        ${cf_cv_main_return:-return}(1);        /* I'm told this linker is broken */
 {
 #if defined(NeXT)
        ${cf_cv_main_return:-return}(1);        /* I'm told this linker is broken */
@@ -3689,7 +4442,7 @@ EOF
        cf_saveLIBS="$LIBS"
        LIBS="conftest.a $LIBS"
        AC_TRY_RUN([
        cf_saveLIBS="$LIBS"
        LIBS="conftest.a $LIBS"
        AC_TRY_RUN([
-       int main()
+       int main(void)
        {
                extern int testfunc();
                ${cf_cv_main_return:-return} (!testfunc());
        {
                extern int testfunc();
                ${cf_cv_main_return:-return} (!testfunc());
@@ -3709,13 +4462,16 @@ fi
 
 ])dnl
 dnl ---------------------------------------------------------------------------
 
 ])dnl
 dnl ---------------------------------------------------------------------------
-dnl CF_LINK_FUNCS version: 8 updated: 2012/10/06 17:56:13
+dnl CF_LINK_FUNCS version: 9 updated: 2017/01/21 11:11:02
 dnl -------------
 dnl Most Unix systems have both link and symlink, a few don't have symlink.
 dnl A few non-Unix systems implement symlink, but not link.
 dnl A few non-systems implement neither (or have nonfunctional versions).
 AC_DEFUN([CF_LINK_FUNCS],
 [
 dnl -------------
 dnl Most Unix systems have both link and symlink, a few don't have symlink.
 dnl A few non-Unix systems implement symlink, but not link.
 dnl A few non-systems implement neither (or have nonfunctional versions).
 AC_DEFUN([CF_LINK_FUNCS],
 [
+AC_CHECK_HEADERS( \
+unistd.h \
+)
 AC_CHECK_FUNCS( \
        remove \
        unlink )
 AC_CHECK_FUNCS( \
        remove \
        unlink )
@@ -3734,7 +4490,7 @@ else
 #ifdef HAVE_UNISTD_H
 #include <unistd.h>
 #endif
 #ifdef HAVE_UNISTD_H
 #include <unistd.h>
 #endif
-int main()
+int main(void)
 {
        int fail = 0;
        char *src = "config.log";
 {
        int fail = 0;
        char *src = "config.log";
@@ -3766,7 +4522,7 @@ int main()
 fi
 ])dnl
 dnl ---------------------------------------------------------------------------
 fi
 ])dnl
 dnl ---------------------------------------------------------------------------
-dnl CF_MAKEFLAGS version: 14 updated: 2011/03/31 19:29:46
+dnl CF_MAKEFLAGS version: 18 updated: 2018/02/21 21:26:03
 dnl ------------
 dnl Some 'make' programs support ${MAKEFLAGS}, some ${MFLAGS}, to pass 'make'
 dnl options to lower-levels.  It's very useful for "make -n" -- if we have it.
 dnl ------------
 dnl Some 'make' programs support ${MAKEFLAGS}, some ${MFLAGS}, to pass 'make'
 dnl options to lower-levels.  It's very useful for "make -n" -- if we have it.
@@ -3779,24 +4535,26 @@ AC_CACHE_CHECK(for makeflags variable, cf_cv_makeflags,[
        for cf_option in '-${MAKEFLAGS}' '${MFLAGS}'
        do
                cat >cf_makeflags.tmp <<CF_EOF
        for cf_option in '-${MAKEFLAGS}' '${MFLAGS}'
        do
                cat >cf_makeflags.tmp <<CF_EOF
-SHELL = /bin/sh
+SHELL = $SHELL
 all :
        @ echo '.$cf_option'
 CF_EOF
                cf_result=`${MAKE:-make} -k -f cf_makeflags.tmp 2>/dev/null | fgrep -v "ing directory" | sed -e 's,[[   ]]*$,,'`
                case "$cf_result" in
 all :
        @ echo '.$cf_option'
 CF_EOF
                cf_result=`${MAKE:-make} -k -f cf_makeflags.tmp 2>/dev/null | fgrep -v "ing directory" | sed -e 's,[[   ]]*$,,'`
                case "$cf_result" in
-               .*k)
+               (.*k|.*kw)
                        cf_result=`${MAKE:-make} -k -f cf_makeflags.tmp CC=cc 2>/dev/null`
                        case "$cf_result" in
                        cf_result=`${MAKE:-make} -k -f cf_makeflags.tmp CC=cc 2>/dev/null`
                        case "$cf_result" in
-                       .*CC=*) cf_cv_makeflags=
+                       (.*CC=*)        cf_cv_makeflags=
                                ;;
                                ;;
-                       *)      cf_cv_makeflags=$cf_option
+                       (*)     cf_cv_makeflags=$cf_option
                                ;;
                        esac
                        break
                        ;;
                                ;;
                        esac
                        break
                        ;;
-               .-)     ;;
-               *)      echo "given option \"$cf_option\", no match \"$cf_result\""
+               (.-)
+                       ;;
+               (*)
+                       CF_MSG_LOG(given option \"$cf_option\", no match \"$cf_result\")
                        ;;
                esac
        done
                        ;;
                esac
        done
@@ -3843,7 +4601,7 @@ AC_SUBST(MAKE_UPPER_TAGS)
 AC_SUBST(MAKE_LOWER_TAGS)
 ])dnl
 dnl ---------------------------------------------------------------------------
 AC_SUBST(MAKE_LOWER_TAGS)
 ])dnl
 dnl ---------------------------------------------------------------------------
-dnl CF_MANPAGE_FORMAT version: 9 updated: 2010/10/23 16:10:30
+dnl CF_MANPAGE_FORMAT version: 11 updated: 2015/04/18 08:56:57
 dnl -----------------
 dnl Option to allow user to override automatic configuration of manpage format.
 dnl There are several special cases:
 dnl -----------------
 dnl Option to allow user to override automatic configuration of manpage format.
 dnl There are several special cases:
@@ -3874,85 +4632,85 @@ MANPAGE_FORMAT=`echo "$MANPAGE_FORMAT" | sed -e 's/,/ /g'`
 cf_unknown=
 
 case $MANPAGE_FORMAT in
 cf_unknown=
 
 case $MANPAGE_FORMAT in
-unknown)
-  if test -z "$MANPATH" ; then
-    MANPATH="/usr/man:/usr/share/man"
-  fi
-
-  # look for the 'date' man-page (it's most likely to be installed!)
-  MANPAGE_FORMAT=
-  cf_preform=no
-  cf_catonly=yes
-  cf_example=date
-
-  IFS="${IFS:-         }"; ac_save_ifs="$IFS"; IFS="${IFS}${PATH_SEPARATOR}"
-  for cf_dir in $MANPATH; do
-    test -z "$cf_dir" && cf_dir=/usr/man
-    for cf_name in $cf_dir/man*/$cf_example.[[01]]* $cf_dir/cat*/$cf_example.[[01]]* $cf_dir/man*/$cf_example $cf_dir/cat*/$cf_example
-    do
-      cf_test=`echo $cf_name | sed -e 's/*//'`
-      if test "x$cf_test" = "x$cf_name" ; then
-
-       case "$cf_name" in
-       *.gz) MANPAGE_FORMAT="$MANPAGE_FORMAT gzip";;
-       *.Z)  MANPAGE_FORMAT="$MANPAGE_FORMAT compress";;
-       *.0)    MANPAGE_FORMAT="$MANPAGE_FORMAT BSDI";;
-       *)    MANPAGE_FORMAT="$MANPAGE_FORMAT normal";;
-       esac
+(unknown)
+       if test -z "$MANPATH" ; then
+               MANPATH="/usr/man:/usr/share/man"
+       fi
 
 
-       case "$cf_name" in
-       $cf_dir/man*)
-         cf_catonly=no
-         ;;
-       $cf_dir/cat*)
-         cf_preform=yes
-         ;;
-       esac
-       break
-      fi
-
-      # if we found a match in either man* or cat*, stop looking
-      if test -n "$MANPAGE_FORMAT" ; then
-       cf_found=no
-       test "$cf_preform" = yes && MANPAGE_FORMAT="$MANPAGE_FORMAT formatted"
-       test "$cf_catonly" = yes && MANPAGE_FORMAT="$MANPAGE_FORMAT catonly"
-       case "$cf_name" in
-       $cf_dir/cat*)
-         cf_found=yes
-         ;;
+       # look for the 'date' man-page (it's most likely to be installed!)
+       MANPAGE_FORMAT=
+       cf_preform=no
+       cf_catonly=yes
+       cf_example=date
+
+       IFS="${IFS:-    }"; ac_save_ifs="$IFS"; IFS="${IFS}${PATH_SEPARATOR}"
+       for cf_dir in $MANPATH; do
+               test -z "$cf_dir" && cf_dir=/usr/man
+               for cf_name in $cf_dir/man*/$cf_example.[[01]]* $cf_dir/cat*/$cf_example.[[01]]* $cf_dir/man*/$cf_example $cf_dir/cat*/$cf_example
+               do
+                       cf_test=`echo $cf_name | sed -e 's/*//'`
+                       if test "x$cf_test" = "x$cf_name" ; then
+
+                               case "$cf_name" in
+                               (*.gz) MANPAGE_FORMAT="$MANPAGE_FORMAT gzip";;
+                               (*.Z)  MANPAGE_FORMAT="$MANPAGE_FORMAT compress";;
+                               (*.0)  MANPAGE_FORMAT="$MANPAGE_FORMAT BSDI";;
+                               (*)    MANPAGE_FORMAT="$MANPAGE_FORMAT normal";;
+                               esac
+
+                               case "$cf_name" in
+                               ($cf_dir/man*)
+                                       cf_catonly=no
+                                       ;;
+                               ($cf_dir/cat*)
+                                       cf_preform=yes
+                                       ;;
+                               esac
+                               break
+                       fi
+
+                       # if we found a match in either man* or cat*, stop looking
+                       if test -n "$MANPAGE_FORMAT" ; then
+                               cf_found=no
+                               test "$cf_preform" = yes && MANPAGE_FORMAT="$MANPAGE_FORMAT formatted"
+                               test "$cf_catonly" = yes && MANPAGE_FORMAT="$MANPAGE_FORMAT catonly"
+                               case "$cf_name" in
+                               ($cf_dir/cat*)
+                                       cf_found=yes
+                                       ;;
+                               esac
+                               test $cf_found=yes && break
+                       fi
+               done
+               # only check the first directory in $MANPATH where we find manpages
+               if test -n "$MANPAGE_FORMAT" ; then
+                       break
+               fi
+       done
+       # if we did not find the example, just assume it is normal
+       test -z "$MANPAGE_FORMAT" && MANPAGE_FORMAT=normal
+       IFS="$ac_save_ifs"
+       ;;
+(*)
+       for cf_option in $MANPAGE_FORMAT; do
+       case $cf_option in
+       (gzip|compress|BSDI|normal|formatted|catonly)
+               ;;
+       (*)
+               cf_unknown="$cf_unknown $cf_option"
+               ;;
        esac
        esac
-       test $cf_found=yes && break
-      fi
-    done
-    # only check the first directory in $MANPATH where we find manpages
-    if test -n "$MANPAGE_FORMAT" ; then
-       break
-    fi
-  done
-  # if we did not find the example, just assume it is normal
-  test -z "$MANPAGE_FORMAT" && MANPAGE_FORMAT=normal
-  IFS="$ac_save_ifs"
-  ;;
-*)
-  for cf_option in $MANPAGE_FORMAT; do
-     case $cf_option in #(vi
-     gzip|compress|BSDI|normal|formatted|catonly)
-       ;;
-     *)
-       cf_unknown="$cf_unknown $cf_option"
-       ;;
-     esac
-  done
-  ;;
+       done
+       ;;
 esac
 
 AC_MSG_RESULT($MANPAGE_FORMAT)
 if test -n "$cf_unknown" ; then
 esac
 
 AC_MSG_RESULT($MANPAGE_FORMAT)
 if test -n "$cf_unknown" ; then
-  AC_MSG_WARN(Unexpected manpage-format $cf_unknown)
+       AC_MSG_WARN(Unexpected manpage-format $cf_unknown)
 fi
 ])dnl
 dnl ---------------------------------------------------------------------------
 fi
 ])dnl
 dnl ---------------------------------------------------------------------------
-dnl CF_MANPAGE_RENAMES version: 7 updated: 2005/06/18 18:51:57
+dnl CF_MANPAGE_RENAMES version: 10 updated: 2015/08/05 20:44:28
 dnl ------------------
 dnl The Debian people have their own naming convention for manpages.  This
 dnl option lets us override the name of the file containing renaming, or
 dnl ------------------
 dnl The Debian people have their own naming convention for manpages.  This
 dnl option lets us override the name of the file containing renaming, or
@@ -3966,40 +4724,40 @@ AC_ARG_WITH(manpage-renames,
        [MANPAGE_RENAMES=$withval],
        [MANPAGE_RENAMES=yes])
 
        [MANPAGE_RENAMES=$withval],
        [MANPAGE_RENAMES=yes])
 
-case ".$MANPAGE_RENAMES" in #(vi
-.no) #(vi
-  ;;
-.|.yes)
-  # Debian 'man' program?
-  if test -f /etc/debian_version ; then
-    MANPAGE_RENAMES=`cd $srcdir && pwd`/man/man_db.renames
-  else
-    MANPAGE_RENAMES=no
-  fi
-  ;;
+case ".$MANPAGE_RENAMES" in
+(.no)
+       ;;
+(.|.yes)
+       # Debian 'man' program?
+       if test -f /etc/debian_version ; then
+               MANPAGE_RENAMES=`cd $srcdir && pwd`/man/man_db.renames
+       else
+               MANPAGE_RENAMES=no
+       fi
+       ;;
 esac
 
 if test "$MANPAGE_RENAMES" != no ; then
 esac
 
 if test "$MANPAGE_RENAMES" != no ; then
-  if test -f $srcdir/man/$MANPAGE_RENAMES ; then
-    MANPAGE_RENAMES=`cd $srcdir/man && pwd`/$MANPAGE_RENAMES
-  elif test ! -f $MANPAGE_RENAMES ; then
-    AC_MSG_ERROR(not a filename: $MANPAGE_RENAMES)
-  fi
+       if test -f $srcdir/man/$MANPAGE_RENAMES ; then
+               MANPAGE_RENAMES=`cd $srcdir/man && pwd`/$MANPAGE_RENAMES
+       elif test ! -f $MANPAGE_RENAMES ; then
+               AC_MSG_ERROR(not a filename: $MANPAGE_RENAMES)
+       fi
 
 
-  test ! -d man && mkdir man
+       test ! -d man && mkdir man
 
 
-  # Construct a sed-script to perform renaming within man-pages
-  if test -n "$MANPAGE_RENAMES" ; then
-    test ! -d man && mkdir man
-    sh $srcdir/man/make_sed.sh $MANPAGE_RENAMES >./edit_man.sed
-  fi
+       # Construct a sed-script to perform renaming within man-pages
+       if test -n "$MANPAGE_RENAMES" ; then
+               test ! -d man && mkdir man
+               $SHELL $srcdir/man/make_sed.sh $MANPAGE_RENAMES >./edit_man.sed
+       fi
 fi
 
 AC_MSG_RESULT($MANPAGE_RENAMES)
 AC_SUBST(MANPAGE_RENAMES)
 ])dnl
 dnl ---------------------------------------------------------------------------
 fi
 
 AC_MSG_RESULT($MANPAGE_RENAMES)
 AC_SUBST(MANPAGE_RENAMES)
 ])dnl
 dnl ---------------------------------------------------------------------------
-dnl CF_MANPAGE_SYMLINKS version: 5 updated: 2010/07/24 17:12:40
+dnl CF_MANPAGE_SYMLINKS version: 6 updated: 2015/04/17 21:13:04
 dnl -------------------
 dnl Some people expect each tool to make all aliases for manpages in the
 dnl man-directory.  This accommodates the older, less-capable implementations
 dnl -------------------
 dnl Some people expect each tool to make all aliases for manpages in the
 dnl man-directory.  This accommodates the older, less-capable implementations
@@ -4015,11 +4773,11 @@ AC_ARG_WITH(manpage-aliases,
 
 AC_MSG_RESULT($MANPAGE_ALIASES)
 
 
 AC_MSG_RESULT($MANPAGE_ALIASES)
 
-case "x$LN_S" in #(vi
-xln*) #(vi
+case "x$LN_S" in
+(xln*)
        cf_use_symlinks=yes
        ;;
        cf_use_symlinks=yes
        ;;
-*)
+(*)
        cf_use_symlinks=no
        ;;
 esac
        cf_use_symlinks=no
        ;;
 esac
@@ -4061,7 +4819,7 @@ AC_ARG_WITH(manpage-tbl,
 AC_MSG_RESULT($MANPAGE_TBL)
 ])dnl
 dnl ---------------------------------------------------------------------------
 AC_MSG_RESULT($MANPAGE_TBL)
 ])dnl
 dnl ---------------------------------------------------------------------------
-dnl CF_MAN_PAGES version: 41 updated: 2012/08/11 19:35:44
+dnl CF_MAN_PAGES version: 47 updated: 2017/08/12 07:58:51
 dnl ------------
 dnl Try to determine if the man-pages on the system are compressed, and if
 dnl so, what format is used.  Use this information to construct a script that
 dnl ------------
 dnl Try to determine if the man-pages on the system are compressed, and if
 dnl so, what format is used.  Use this information to construct a script that
@@ -4074,47 +4832,47 @@ CF_MANPAGE_RENAMES
 CF_MANPAGE_SYMLINKS
 CF_MANPAGE_TBL
 
 CF_MANPAGE_SYMLINKS
 CF_MANPAGE_TBL
 
-  if test "$prefix" = "NONE" ; then
-     cf_prefix="$ac_default_prefix"
-  else
-     cf_prefix="$prefix"
-  fi
-
-  case "$MANPAGE_FORMAT" in # (vi
-  *catonly*) # (vi
-    cf_format=yes
-    cf_inboth=no
-    ;;
-  *formatted*) # (vi
-    cf_format=yes
-    cf_inboth=yes
-    ;;
-  *)
-    cf_format=no
-    cf_inboth=no
-    ;;
-  esac
+if test "$prefix" = "NONE" ; then
+       cf_prefix="$ac_default_prefix"
+else
+       cf_prefix="$prefix"
+fi
+
+case "$MANPAGE_FORMAT" in
+(*catonly*)
+       cf_format=yes
+       cf_inboth=no
+       ;;
+(*formatted*)
+       cf_format=yes
+       cf_inboth=yes
+       ;;
+(*)
+       cf_format=no
+       cf_inboth=no
+       ;;
+esac
 
 test ! -d man && mkdir man
 
 cf_so_strip=
 cf_compress=
 
 test ! -d man && mkdir man
 
 cf_so_strip=
 cf_compress=
-case "$MANPAGE_FORMAT" in #(vi
-*compress*) #(vi
+case "$MANPAGE_FORMAT" in
+(*compress*)
        cf_so_strip="Z"
        cf_compress=compress
        cf_so_strip="Z"
        cf_compress=compress
-  ;;
-*gzip*)
+       ;;
+(*gzip*)
        cf_so_strip="gz"
        cf_compress=gzip
        cf_so_strip="gz"
        cf_compress=gzip
-  ;;
+       ;;
 esac
 
 cf_edit_man=./edit_man.sh
 cf_man_alias=`pwd`/man_alias.sed
 
 cat >$cf_edit_man <<CF_EOF
 esac
 
 cf_edit_man=./edit_man.sh
 cf_man_alias=`pwd`/man_alias.sed
 
 cat >$cf_edit_man <<CF_EOF
-#! /bin/sh
+#! $SHELL
 # this script is generated by the configure-script CF_MAN_PAGES macro.
 
 prefix="$cf_prefix"
 # this script is generated by the configure-script CF_MAN_PAGES macro.
 
 prefix="$cf_prefix"
@@ -4134,7 +4892,7 @@ INSTALL_DATA="$INSTALL_DATA"
 transform="$program_transform_name"
 
 TMP=\${TMPDIR:=/tmp}/man\$\$
 transform="$program_transform_name"
 
 TMP=\${TMPDIR:=/tmp}/man\$\$
-trap "rm -f \$TMP" 0 1 2 5 15
+trap "rm -f \$TMP" 0 1 2 3 15
 
 form=\[$]1
 shift || exit 1
 
 form=\[$]1
 shift || exit 1
@@ -4152,7 +4910,7 @@ shift || exit 1
 if test "\$form" = normal ; then
        if test "$cf_format" = yes ; then
        if test "$cf_inboth" = no ; then
 if test "\$form" = normal ; then
        if test "$cf_format" = yes ; then
        if test "$cf_inboth" = no ; then
-               sh \[$]0 format \$verb \$mandir \$srcdir \[$]*
+               $SHELL \[$]0 format \$verb \$mandir \$srcdir \[$]*
                exit $?
        fi
        fi
                exit $?
        fi
        fi
@@ -4165,9 +4923,9 @@ fi
 
 # process the list of source-files
 for i in \[$]* ; do
 
 # process the list of source-files
 for i in \[$]* ; do
-case \$i in #(vi
-*.orig|*.rej) ;; #(vi
-*.[[0-9]]*)
+case \$i in
+(*.orig|*.rej) ;;
+(*.[[0-9]]*)
        section=\`expr "\$i" : '.*\\.\\([[0-9]]\\)[[xm]]*'\`;
        if test \$verb = installing ; then
        if test ! -d \$cf_subdir\${section} ; then
        section=\`expr "\$i" : '.*\\.\\([[0-9]]\\)[[xm]]*'\`;
        if test \$verb = installing ; then
        if test ! -d \$cf_subdir\${section} ; then
@@ -4179,11 +4937,12 @@ case \$i in #(vi
        if test ! -f $cf_man_alias ; then
 cat >>$cf_man_alias <<-CF_EOF2
                s,@DATADIR@,\$datadir,g
        if test ! -f $cf_man_alias ; then
 cat >>$cf_man_alias <<-CF_EOF2
                s,@DATADIR@,\$datadir,g
-               s,@TERMINFO@,\$TERMINFO,g
-               s,@NCURSES_MAJOR@,\$NCURSES_MAJOR,g
-               s,@NCURSES_MINOR@,\$NCURSES_MINOR,g
-               s,@NCURSES_PATCH@,\$NCURSES_PATCH,g
-               s,@NCURSES_OSPEED@,\$NCURSES_OSPEED,g
+               s,@TERMINFO@,\${TERMINFO:="no default value"},g
+               s,@TERMINFO_DIRS@,\${TERMINFO_DIRS:="no default value"},g
+               s,@NCURSES_MAJOR@,\${NCURSES_MAJOR:="no default value"},g
+               s,@NCURSES_MINOR@,\${NCURSES_MINOR:="no default value"},g
+               s,@NCURSES_PATCH@,\${NCURSES_PATCH:="no default value"},g
+               s,@NCURSES_OSPEED@,\${NCURSES_OSPEED:="no default value"},g
 CF_EOF
        ifelse($1,,,[
        for cf_name in $1
 CF_EOF
        ifelse($1,,,[
        for cf_name in $1
@@ -4293,8 +5052,8 @@ cat >>$cf_edit_man <<CF_EOF
 CF_EOF
 fi
 
 CF_EOF
 fi
 
-case "$MANPAGE_FORMAT" in #(vi
-*BSDI*)
+case "$MANPAGE_FORMAT" in
+(*BSDI*)
 cat >>$cf_edit_man <<CF_EOF
        if test \$form = format ; then
                # BSDI installs only .0 suffixes in the cat directories
 cat >>$cf_edit_man <<CF_EOF
        if test \$form = format ; then
                # BSDI installs only .0 suffixes in the cat directories
@@ -4330,13 +5089,13 @@ cat >>$cf_edit_man <<CF_EOF
                                                fi
                                                echo .. \$verb alias \$cf_alias\${suffix}
 CF_EOF
                                                fi
                                                echo .. \$verb alias \$cf_alias\${suffix}
 CF_EOF
-case "x$LN_S" in #(vi
-*-f) #(vi
+case "x$LN_S" in
+(*-f)
 cat >>$cf_edit_man <<CF_EOF
                                                $LN_S \$cf_target \$cf_alias\${suffix}
 CF_EOF
        ;;
 cat >>$cf_edit_man <<CF_EOF
                                                $LN_S \$cf_target \$cf_alias\${suffix}
 CF_EOF
        ;;
-*)
+(*)
 cat >>$cf_edit_man <<CF_EOF
                                                rm -f \$cf_alias\${suffix}
                                                $LN_S \$cf_target \$cf_alias\${suffix}
 cat >>$cf_edit_man <<CF_EOF
                                                rm -f \$cf_alias\${suffix}
                                                $LN_S \$cf_target \$cf_alias\${suffix}
@@ -4392,7 +5151,7 @@ done
 
 if test $cf_inboth = yes ; then
 if test \$form != format ; then
 
 if test $cf_inboth = yes ; then
 if test \$form != format ; then
-       sh \[$]0 format \$verb \$mandir \$srcdir \[$]*
+       $SHELL \[$]0 format \$verb \$mandir \$srcdir \[$]*
 fi
 fi
 
 fi
 fi
 
@@ -4402,7 +5161,7 @@ chmod 755 $cf_edit_man
 
 ])dnl
 dnl ---------------------------------------------------------------------------
 
 ])dnl
 dnl ---------------------------------------------------------------------------
-dnl CF_MATH_LIB version: 8 updated: 2010/05/29 16:31:02
+dnl CF_MATH_LIB version: 9 updated: 2017/01/21 11:06:25
 dnl -----------
 dnl Checks for libraries.  At least one UNIX system, Apple Macintosh
 dnl Rhapsody 5.5, does not have -lm.  We cannot use the simpler
 dnl -----------
 dnl Checks for libraries.  At least one UNIX system, Apple Macintosh
 dnl Rhapsody 5.5, does not have -lm.  We cannot use the simpler
@@ -4413,6 +5172,7 @@ AC_CACHE_CHECK(if -lm needed for math functions,
        cf_cv_need_libm,[
        AC_TRY_LINK([
        #include <stdio.h>
        cf_cv_need_libm,[
        AC_TRY_LINK([
        #include <stdio.h>
+       #include <stdlib.h>
        #include <math.h>
        ],
        [double x = rand(); printf("result = %g\n", ]ifelse([$2],,sin(x),$2)[)],
        #include <math.h>
        ],
        [double x = rand(); printf("result = %g\n", ]ifelse([$2],,sin(x),$2)[)],
@@ -4426,7 +5186,7 @@ ifelse($1,,[
 fi
 ])
 dnl ---------------------------------------------------------------------------
 fi
 ])
 dnl ---------------------------------------------------------------------------
-dnl CF_MIXEDCASE_FILENAMES version: 4 updated: 2012/10/02 20:55:03
+dnl CF_MIXEDCASE_FILENAMES version: 7 updated: 2015/04/12 15:39:00
 dnl ----------------------
 dnl Check if the file-system supports mixed-case filenames.  If we're able to
 dnl create a lowercase name and see it as uppercase, it doesn't support that.
 dnl ----------------------
 dnl Check if the file-system supports mixed-case filenames.  If we're able to
 dnl create a lowercase name and see it as uppercase, it doesn't support that.
@@ -4434,11 +5194,11 @@ AC_DEFUN([CF_MIXEDCASE_FILENAMES],
 [
 AC_CACHE_CHECK(if filesystem supports mixed-case filenames,cf_cv_mixedcase,[
 if test "$cross_compiling" = yes ; then
 [
 AC_CACHE_CHECK(if filesystem supports mixed-case filenames,cf_cv_mixedcase,[
 if test "$cross_compiling" = yes ; then
-       case $target_alias in #(vi
-       *-os2-emx*|*-msdosdjgpp*|*-cygwin*|*-mingw32*|*-uwin*) #(vi
+       case $target_alias in
+       (*-os2-emx*|*-msdosdjgpp*|*-cygwin*|*-msys*|*-mingw*|*-uwin*)
                cf_cv_mixedcase=no
                ;;
                cf_cv_mixedcase=no
                ;;
-       *)
+       (*)
                cf_cv_mixedcase=yes
                ;;
        esac
                cf_cv_mixedcase=yes
                ;;
        esac
@@ -4456,20 +5216,26 @@ fi
 test "$cf_cv_mixedcase" = yes && AC_DEFINE(MIXEDCASE_FILENAMES,1,[Define to 1 if filesystem supports mixed-case filenames.])
 ])dnl
 dnl ---------------------------------------------------------------------------
 test "$cf_cv_mixedcase" = yes && AC_DEFINE(MIXEDCASE_FILENAMES,1,[Define to 1 if filesystem supports mixed-case filenames.])
 ])dnl
 dnl ---------------------------------------------------------------------------
-dnl CF_MKSTEMP version: 9 updated: 2012/10/03 04:34:49
+dnl CF_MKSTEMP version: 10 updated: 2017/01/21 11:12:16
 dnl ----------
 dnl Check for a working mkstemp.  This creates two files, checks that they are
 dnl successfully created and distinct (AmigaOS apparently fails on the last).
 AC_DEFUN([CF_MKSTEMP],[
 dnl ----------
 dnl Check for a working mkstemp.  This creates two files, checks that they are
 dnl successfully created and distinct (AmigaOS apparently fails on the last).
 AC_DEFUN([CF_MKSTEMP],[
+AC_CHECK_HEADERS( \
+unistd.h \
+)
 AC_CACHE_CHECK(for working mkstemp, cf_cv_func_mkstemp,[
 rm -rf conftest*
 AC_TRY_RUN([
 #include <sys/types.h>
 AC_CACHE_CHECK(for working mkstemp, cf_cv_func_mkstemp,[
 rm -rf conftest*
 AC_TRY_RUN([
 #include <sys/types.h>
+#ifdef HAVE_UNISTD_H
+#include <unistd.h>
+#endif
 #include <stdlib.h>
 #include <stdio.h>
 #include <string.h>
 #include <sys/stat.h>
 #include <stdlib.h>
 #include <stdio.h>
 #include <string.h>
 #include <sys/stat.h>
-int main()
+int main(void)
 {
        char *tmpl = "conftestXXXXXX";
        char name[2][80];
 {
        char *tmpl = "conftestXXXXXX";
        char name[2][80];
@@ -4516,31 +5282,51 @@ AC_DEFUN([CF_MSG_LOG],[
 echo "${as_me:-configure}:__oline__: testing $* ..." 1>&AC_FD_CC
 ])dnl
 dnl ---------------------------------------------------------------------------
 echo "${as_me:-configure}:__oline__: testing $* ..." 1>&AC_FD_CC
 ])dnl
 dnl ---------------------------------------------------------------------------
-dnl CF_NCURSES_ABI_6 version: 1 updated: 2005/09/17 18:42:49
+dnl CF_NCURSES_ABI_6 version: 3 updated: 2015/06/06 16:10:11
 dnl ----------------
 dnl Set ncurses' ABI to 6 unless overridden by explicit configure option, and
 dnl warn about this.
 AC_DEFUN([CF_NCURSES_ABI_6],[
 if test "${with_abi_version+set}" != set; then
        case $cf_cv_rel_version in
 dnl ----------------
 dnl Set ncurses' ABI to 6 unless overridden by explicit configure option, and
 dnl warn about this.
 AC_DEFUN([CF_NCURSES_ABI_6],[
 if test "${with_abi_version+set}" != set; then
        case $cf_cv_rel_version in
-       5.*)
+       (5.*)
                cf_cv_rel_version=6.0
                cf_cv_abi_version=6
                cf_cv_rel_version=6.0
                cf_cv_abi_version=6
-               AC_MSG_WARN(Overriding ABI version to $cf_cv_abi_version)
+               AC_MSG_WARN(overriding ABI version to $cf_cv_abi_version)
                ;;
        esac
 fi
 ])dnl
 dnl ---------------------------------------------------------------------------
                ;;
        esac
 fi
 ])dnl
 dnl ---------------------------------------------------------------------------
-dnl CF_NO_LEAKS_OPTION version: 5 updated: 2012/10/02 20:55:03
-dnl ------------------
-dnl see CF_WITH_NO_LEAKS
-AC_DEFUN([CF_NO_LEAKS_OPTION],[
-AC_MSG_CHECKING(if you want to use $1 for testing)
-AC_ARG_WITH($1,
-       [$2],
-       [AC_DEFINE_UNQUOTED($3,1,"Define to 1 if you want to use $1 for testing.")ifelse([$4],,[
-        $4
+dnl CF_NCURSES_WITH_ABI_VERSION version: 2 updated: 2015/12/19 17:51:52
+dnl ---------------------------
+dnl Allow ncurses's ABI to be overridden.  Generally this happens when a
+dnl packager has incremented the ABI past that used in the original package,
+dnl and wishes to keep doing this.
+dnl
+dnl $1 is the package name, if any, to derive a corresponding {package}_ABI
+dnl symbol.
+AC_DEFUN([CF_NCURSES_WITH_ABI_VERSION],[
+CF_WITH_ABI_VERSION($1)
+if test "x$cf_cv_abi_version" != "x$with_abi_version"
+then
+       case $cf_cv_rel_version in
+       (5.*)
+               cf_cv_rel_version=$with_abi_version.0
+               ;;
+       esac
+fi
+])dnl
+dnl ---------------------------------------------------------------------------
+dnl CF_NO_LEAKS_OPTION version: 6 updated: 2015/04/12 15:39:00
+dnl ------------------
+dnl see CF_WITH_NO_LEAKS
+AC_DEFUN([CF_NO_LEAKS_OPTION],[
+AC_MSG_CHECKING(if you want to use $1 for testing)
+AC_ARG_WITH($1,
+       [$2],
+       [AC_DEFINE_UNQUOTED($3,1,"Define to 1 if you want to use $1 for testing.")ifelse([$4],,[
+        $4
 ])
        : ${with_cflags:=-g}
        : ${with_no_leaks:=yes}
 ])
        : ${with_cflags:=-g}
        : ${with_no_leaks:=yes}
@@ -4548,12 +5334,12 @@ AC_ARG_WITH($1,
        [with_$1=])
 AC_MSG_RESULT(${with_$1:-no})
 
        [with_$1=])
 AC_MSG_RESULT(${with_$1:-no})
 
-case .$with_cflags in #(vi
-.*-g*)
-       case .$CFLAGS in #(vi
-       .*-g*) #(vi
+case .$with_cflags in
+(.*-g*)
+       case .$CFLAGS in
+       (.*-g*)
                ;;
                ;;
-       *)
+       (*)
                CF_ADD_CFLAGS([-g])
                ;;
        esac
                CF_ADD_CFLAGS([-g])
                ;;
        esac
@@ -4561,17 +5347,17 @@ case .$with_cflags in #(vi
 esac
 ])dnl
 dnl ---------------------------------------------------------------------------
 esac
 ])dnl
 dnl ---------------------------------------------------------------------------
-dnl CF_NUMBER_SYNTAX version: 1 updated: 2003/09/20 18:12:49
+dnl CF_NUMBER_SYNTAX version: 2 updated: 2015/04/17 21:13:04
 dnl ----------------
 dnl Check if the given variable is a number.  If not, report an error.
 dnl $1 is the variable
 dnl $2 is the message
 AC_DEFUN([CF_NUMBER_SYNTAX],[
 if test -n "$1" ; then
 dnl ----------------
 dnl Check if the given variable is a number.  If not, report an error.
 dnl $1 is the variable
 dnl $2 is the message
 AC_DEFUN([CF_NUMBER_SYNTAX],[
 if test -n "$1" ; then
-  case $1 in #(vi
-  [[0-9]]*) #(vi
+  case $1 in
+  ([[0-9]]*)
        ;;
        ;;
-  *)
+  (*)
        AC_MSG_ERROR($2 is not a number: $1)
        ;;
   esac
        AC_MSG_ERROR($2 is not a number: $1)
        ;;
   esac
@@ -4580,27 +5366,27 @@ else
 fi
 ])dnl
 dnl ---------------------------------------------------------------------------
 fi
 ])dnl
 dnl ---------------------------------------------------------------------------
-dnl CF_OBJ_SUBDIR version: 4 updated: 2002/02/23 20:38:31
+dnl CF_OBJ_SUBDIR version: 7 updated: 2015/04/17 21:13:04
 dnl -------------
 dnl Compute the object-directory name from the given model name
 AC_DEFUN([CF_OBJ_SUBDIR],
 [
        case $1 in
 dnl -------------
 dnl Compute the object-directory name from the given model name
 AC_DEFUN([CF_OBJ_SUBDIR],
 [
        case $1 in
-       libtool) $2='obj_lo'  ;;
-       normal)  $2='objects' ;;
-       debug)   $2='obj_g' ;;
-       profile) $2='obj_p' ;;
-       shared)
-               case $cf_cv_system_name in #(vi
-               cygwin) #(vi
+       (libtool) $2='obj_lo'  ;;
+       (normal)  $2='objects' ;;
+       (debug)   $2='obj_g' ;;
+       (profile) $2='obj_p' ;;
+       (shared)
+               case $cf_cv_system_name in
+               (cygwin|msys)
                        $2='objects' ;;
                        $2='objects' ;;
-               *)
+               (*)
                        $2='obj_s' ;;
                esac
        esac
 ])dnl
 dnl ---------------------------------------------------------------------------
                        $2='obj_s' ;;
                esac
        esac
 ])dnl
 dnl ---------------------------------------------------------------------------
-dnl CF_PATHSEP version: 6 updated: 2012/09/29 18:38:12
+dnl CF_PATHSEP version: 7 updated: 2015/04/12 15:39:00
 dnl ----------
 dnl Provide a value for the $PATH and similar separator (or amend the value
 dnl as provided in autoconf 2.5x).
 dnl ----------
 dnl Provide a value for the $PATH and similar separator (or amend the value
 dnl as provided in autoconf 2.5x).
@@ -4608,15 +5394,15 @@ AC_DEFUN([CF_PATHSEP],
 [
        AC_MSG_CHECKING(for PATH separator)
        case $cf_cv_system_name in
 [
        AC_MSG_CHECKING(for PATH separator)
        case $cf_cv_system_name in
-       os2*)   PATH_SEPARATOR=';'  ;;
-       *)      ${PATH_SEPARATOR:=':'}  ;;
+       (os2*)  PATH_SEPARATOR=';'  ;;
+       (*)     ${PATH_SEPARATOR:=':'}  ;;
        esac
 ifelse([$1],,,[$1=$PATH_SEPARATOR])
        AC_SUBST(PATH_SEPARATOR)
        AC_MSG_RESULT($PATH_SEPARATOR)
 ])dnl
 dnl ---------------------------------------------------------------------------
        esac
 ifelse([$1],,,[$1=$PATH_SEPARATOR])
        AC_SUBST(PATH_SEPARATOR)
        AC_MSG_RESULT($PATH_SEPARATOR)
 ])dnl
 dnl ---------------------------------------------------------------------------
-dnl CF_PATH_SYNTAX version: 14 updated: 2012/06/19 20:58:54
+dnl CF_PATH_SYNTAX version: 16 updated: 2015/04/18 08:56:57
 dnl --------------
 dnl Check the argument to see that it looks like a pathname.  Rewrite it if it
 dnl begins with one of the prefix/exec_prefix variables, and then again if the
 dnl --------------
 dnl Check the argument to see that it looks like a pathname.  Rewrite it if it
 dnl begins with one of the prefix/exec_prefix variables, and then again if the
@@ -4624,36 +5410,36 @@ dnl result begins with 'NONE'.  This is necessary to work around autoconf's
 dnl delayed evaluation of those symbols.
 AC_DEFUN([CF_PATH_SYNTAX],[
 if test "x$prefix" != xNONE; then
 dnl delayed evaluation of those symbols.
 AC_DEFUN([CF_PATH_SYNTAX],[
 if test "x$prefix" != xNONE; then
-  cf_path_syntax="$prefix"
+       cf_path_syntax="$prefix"
 else
 else
-  cf_path_syntax="$ac_default_prefix"
+       cf_path_syntax="$ac_default_prefix"
 fi
 
 fi
 
-case ".[$]$1" in #(vi
-.\[$]\(*\)*|.\'*\'*) #(vi
-  ;;
-..|./*|.\\*) #(vi
-  ;;
-.[[a-zA-Z]]:[[\\/]]*) #(vi OS/2 EMX
-  ;;
-.\[$]{*prefix}*|.\[$]{*dir}*) #(vi
-  eval $1="[$]$1"
-  case ".[$]$1" in #(vi
-  .NONE/*)
-    $1=`echo [$]$1 | sed -e s%NONE%$cf_path_syntax%`
-    ;;
-  esac
-  ;; #(vi
-.no|.NONE/*)
-  $1=`echo [$]$1 | sed -e s%NONE%$cf_path_syntax%`
-  ;;
-*)
-  ifelse([$2],,[AC_MSG_ERROR([expected a pathname, not \"[$]$1\"])],$2)
-  ;;
+case ".[$]$1" in
+(.\[$]\(*\)*|.\'*\'*)
+       ;;
+(..|./*|.\\*)
+       ;;
+(.[[a-zA-Z]]:[[\\/]]*) # OS/2 EMX
+       ;;
+(.\[$]{*prefix}*|.\[$]{*dir}*)
+       eval $1="[$]$1"
+       case ".[$]$1" in
+       (.NONE/*)
+               $1=`echo [$]$1 | sed -e s%NONE%$cf_path_syntax%`
+               ;;
+       esac
+       ;;
+(.no|.NONE/*)
+       $1=`echo [$]$1 | sed -e s%NONE%$cf_path_syntax%`
+       ;;
+(*)
+       ifelse([$2],,[AC_MSG_ERROR([expected a pathname, not \"[$]$1\"])],$2)
+       ;;
 esac
 ])dnl
 dnl ---------------------------------------------------------------------------
 esac
 ])dnl
 dnl ---------------------------------------------------------------------------
-dnl CF_PKG_CONFIG version: 7 updated: 2011/04/29 04:53:22
+dnl CF_PKG_CONFIG version: 10 updated: 2015/04/26 18:06:58
 dnl -------------
 dnl Check for the package-config program, unless disabled by command-line.
 AC_DEFUN([CF_PKG_CONFIG],
 dnl -------------
 dnl Check for the package-config program, unless disabled by command-line.
 AC_DEFUN([CF_PKG_CONFIG],
@@ -4665,16 +5451,16 @@ AC_ARG_WITH(pkg-config,
        [cf_pkg_config=yes])
 AC_MSG_RESULT($cf_pkg_config)
 
        [cf_pkg_config=yes])
 AC_MSG_RESULT($cf_pkg_config)
 
-case $cf_pkg_config in #(vi
-no) #(vi
+case $cf_pkg_config in
+(no)
        PKG_CONFIG=none
        ;;
        PKG_CONFIG=none
        ;;
-yes) #(vi
+(yes)
        CF_ACVERSION_CHECK(2.52,
                [AC_PATH_TOOL(PKG_CONFIG, pkg-config, none)],
                [AC_PATH_PROG(PKG_CONFIG, pkg-config, none)])
        ;;
        CF_ACVERSION_CHECK(2.52,
                [AC_PATH_TOOL(PKG_CONFIG, pkg-config, none)],
                [AC_PATH_PROG(PKG_CONFIG, pkg-config, none)])
        ;;
-*)
+(*)
        PKG_CONFIG=$withval
        ;;
 esac
        PKG_CONFIG=$withval
        ;;
 esac
@@ -4682,12 +5468,14 @@ esac
 test -z "$PKG_CONFIG" && PKG_CONFIG=none
 if test "$PKG_CONFIG" != none ; then
        CF_PATH_SYNTAX(PKG_CONFIG)
 test -z "$PKG_CONFIG" && PKG_CONFIG=none
 if test "$PKG_CONFIG" != none ; then
        CF_PATH_SYNTAX(PKG_CONFIG)
+elif test "x$cf_pkg_config" != xno ; then
+       AC_MSG_WARN(pkg-config is not installed)
 fi
 
 AC_SUBST(PKG_CONFIG)
 ])dnl
 dnl ---------------------------------------------------------------------------
 fi
 
 AC_SUBST(PKG_CONFIG)
 ])dnl
 dnl ---------------------------------------------------------------------------
-dnl CF_POSIX_C_SOURCE version: 8 updated: 2010/05/26 05:38:42
+dnl CF_POSIX_C_SOURCE version: 11 updated: 2018/12/31 20:46:17
 dnl -----------------
 dnl Define _POSIX_C_SOURCE to the given level, and _POSIX_SOURCE if needed.
 dnl
 dnl -----------------
 dnl Define _POSIX_C_SOURCE to the given level, and _POSIX_SOURCE if needed.
 dnl
@@ -4702,7 +5490,10 @@ dnl
 dnl Parameters:
 dnl    $1 is the nominal value for _POSIX_C_SOURCE
 AC_DEFUN([CF_POSIX_C_SOURCE],
 dnl Parameters:
 dnl    $1 is the nominal value for _POSIX_C_SOURCE
 AC_DEFUN([CF_POSIX_C_SOURCE],
-[
+[AC_REQUIRE([CF_POSIX_VISIBLE])dnl
+
+if test "$cf_cv_posix_visible" = no; then
+
 cf_POSIX_C_SOURCE=ifelse([$1],,199506L,[$1])
 
 cf_save_CFLAGS="$CFLAGS"
 cf_POSIX_C_SOURCE=ifelse([$1],,199506L,[$1])
 
 cf_save_CFLAGS="$CFLAGS"
@@ -4719,15 +5510,15 @@ make an error
 #endif],
        [cf_cv_posix_c_source=no],
        [cf_want_posix_source=no
 #endif],
        [cf_cv_posix_c_source=no],
        [cf_want_posix_source=no
-        case .$cf_POSIX_C_SOURCE in #(vi
-        .[[12]]??*) #(vi
+        case .$cf_POSIX_C_SOURCE in
+        (.[[12]]??*)
                cf_cv_posix_c_source="-D_POSIX_C_SOURCE=$cf_POSIX_C_SOURCE"
                ;;
                cf_cv_posix_c_source="-D_POSIX_C_SOURCE=$cf_POSIX_C_SOURCE"
                ;;
-        .2) #(vi
+        (.2)
                cf_cv_posix_c_source="-D_POSIX_C_SOURCE=$cf_POSIX_C_SOURCE"
                cf_want_posix_source=yes
                ;;
                cf_cv_posix_c_source="-D_POSIX_C_SOURCE=$cf_POSIX_C_SOURCE"
                cf_want_posix_source=yes
                ;;
-        .*)
+        (.*)
                cf_want_posix_source=yes
                ;;
         esac
                cf_want_posix_source=yes
                ;;
         esac
@@ -4740,7 +5531,8 @@ make an error
         fi
         CF_MSG_LOG(ifdef from value $cf_POSIX_C_SOURCE)
         CFLAGS="$cf_trim_CFLAGS"
         fi
         CF_MSG_LOG(ifdef from value $cf_POSIX_C_SOURCE)
         CFLAGS="$cf_trim_CFLAGS"
-        CPPFLAGS="$cf_trim_CPPFLAGS $cf_cv_posix_c_source"
+        CPPFLAGS="$cf_trim_CPPFLAGS"
+        CF_APPEND_TEXT(CPPFLAGS,$cf_cv_posix_c_source)
         CF_MSG_LOG(if the second compile does not leave our definition intact error)
         AC_TRY_COMPILE([#include <sys/types.h>],[
 #ifndef _POSIX_C_SOURCE
         CF_MSG_LOG(if the second compile does not leave our definition intact error)
         AC_TRY_COMPILE([#include <sys/types.h>],[
 #ifndef _POSIX_C_SOURCE
@@ -4758,6 +5550,35 @@ if test "$cf_cv_posix_c_source" != no ; then
        CF_ADD_CFLAGS($cf_cv_posix_c_source)
 fi
 
        CF_ADD_CFLAGS($cf_cv_posix_c_source)
 fi
 
+fi # cf_cv_posix_visible
+
+])dnl
+dnl ---------------------------------------------------------------------------
+dnl CF_POSIX_VISIBLE version: 1 updated: 2018/12/31 20:46:17
+dnl ----------------
+dnl POSIX documents test-macros which an application may set before any system
+dnl headers are included to make features available.
+dnl
+dnl Some BSD platforms (originally FreeBSD, but copied by a few others)
+dnl diverged from POSIX in 2002 by setting symbols which make all of the most
+dnl recent features visible in the system header files unless the application
+dnl overrides the corresponding test-macros.  Doing that introduces portability
+dnl problems.
+dnl
+dnl This macro makes a special check for the symbols used for this, to avoid a
+dnl conflicting definition.
+AC_DEFUN([CF_POSIX_VISIBLE],
+[
+AC_CACHE_CHECK(if the POSIX test-macros are already defined,cf_cv_posix_visible,[
+AC_TRY_COMPILE([#include <stdio.h>],[
+#if defined(__POSIX_VISIBLE) && ((__POSIX_VISIBLE - 0L) > 0) \
+       && defined(__XSI_VISIBLE) && ((__XSI_VISIBLE - 0L) > 0) \
+       && defined(__BSD_VISIBLE) && ((__BSD_VISIBLE - 0L) > 0) \
+       && defined(__ISO_C_VISIBLE) && ((__ISO_C_VISIBLE - 0L) > 0)
+#error conflicting symbols found
+#endif
+],[cf_cv_posix_visible=no],[cf_cv_posix_visible=yes])
+])
 ])dnl
 dnl ---------------------------------------------------------------------------
 dnl CF_PREDEFINE version: 2 updated: 2010/05/26 16:44:57
 ])dnl
 dnl ---------------------------------------------------------------------------
 dnl CF_PREDEFINE version: 2 updated: 2010/05/26 16:44:57
@@ -4833,7 +5654,7 @@ AC_PROG_AWK
 test -z "$AWK" && AC_MSG_ERROR(No awk program found)
 ])dnl
 dnl ---------------------------------------------------------------------------
 test -z "$AWK" && AC_MSG_ERROR(No awk program found)
 ])dnl
 dnl ---------------------------------------------------------------------------
-dnl CF_PROG_CC version: 3 updated: 2012/10/06 15:31:55
+dnl CF_PROG_CC version: 4 updated: 2014/07/12 18:57:58
 dnl ----------
 dnl standard check for CC, plus followup sanity checks
 dnl $1 = optional parameter to pass to AC_PROG_CC to specify compiler name
 dnl ----------
 dnl standard check for CC, plus followup sanity checks
 dnl $1 = optional parameter to pass to AC_PROG_CC to specify compiler name
@@ -4843,10 +5664,10 @@ CF_GCC_VERSION
 CF_ACVERSION_CHECK(2.52,
        [AC_PROG_CC_STDC],
        [CF_ANSI_CC_REQD])
 CF_ACVERSION_CHECK(2.52,
        [AC_PROG_CC_STDC],
        [CF_ANSI_CC_REQD])
-CF_CC_ENV_FLAGS 
+CF_CC_ENV_FLAGS
 ])dnl
 dnl ---------------------------------------------------------------------------
 ])dnl
 dnl ---------------------------------------------------------------------------
-dnl CF_PROG_CC_C_O version: 3 updated: 2010/08/14 18:25:37
+dnl CF_PROG_CC_C_O version: 5 updated: 2017/01/21 11:06:25
 dnl --------------
 dnl Analogous to AC_PROG_CC_C_O, but more useful: tests only $CC, ensures that
 dnl the output file can be renamed, and allows for a shell variable that can
 dnl --------------
 dnl Analogous to AC_PROG_CC_C_O, but more useful: tests only $CC, ensures that
 dnl the output file can be renamed, and allows for a shell variable that can
@@ -4854,21 +5675,23 @@ dnl be used later.  The parameter is either CC or CXX.  The result is the
 dnl cache variable:
 dnl    $cf_cv_prog_CC_c_o
 dnl    $cf_cv_prog_CXX_c_o
 dnl cache variable:
 dnl    $cf_cv_prog_CC_c_o
 dnl    $cf_cv_prog_CXX_c_o
+dnl
+dnl $1 = compiler
+dnl $2 = compiler options, if any
 AC_DEFUN([CF_PROG_CC_C_O],
 [AC_REQUIRE([AC_PROG_CC])dnl
 AC_MSG_CHECKING([whether [$]$1 understands -c and -o together])
 AC_CACHE_VAL(cf_cv_prog_$1_c_o,
 [
 cat > conftest.$ac_ext <<CF_EOF
 AC_DEFUN([CF_PROG_CC_C_O],
 [AC_REQUIRE([AC_PROG_CC])dnl
 AC_MSG_CHECKING([whether [$]$1 understands -c and -o together])
 AC_CACHE_VAL(cf_cv_prog_$1_c_o,
 [
 cat > conftest.$ac_ext <<CF_EOF
-#include <stdio.h>
-int main()
+int main(void)
 {
        ${cf_cv_main_return:-return}(0);
 }
 CF_EOF
 # We do the test twice because some compilers refuse to overwrite an
 # existing .o file with -o, though they will create one.
 {
        ${cf_cv_main_return:-return}(0);
 }
 CF_EOF
 # We do the test twice because some compilers refuse to overwrite an
 # existing .o file with -o, though they will create one.
-ac_try='[$]$1 -c conftest.$ac_ext -o conftest2.$ac_objext >&AC_FD_CC'
+ac_try='[$]$1 $2 -c conftest.$ac_ext -o conftest2.$ac_objext >&AC_FD_CC'
 if AC_TRY_EVAL(ac_try) &&
   test -f conftest2.$ac_objext && AC_TRY_EVAL(ac_try);
 then
 if AC_TRY_EVAL(ac_try) &&
   test -f conftest2.$ac_objext && AC_TRY_EVAL(ac_try);
 then
@@ -4885,40 +5708,85 @@ else
 fi
 ])dnl
 dnl ---------------------------------------------------------------------------
 fi
 ])dnl
 dnl ---------------------------------------------------------------------------
-dnl CF_PROG_EGREP version: 1 updated: 2006/09/16 11:40:59
+dnl CF_PROG_EGREP version: 2 updated: 2015/04/18 08:56:57
 dnl -------------
 dnl AC_PROG_EGREP was introduced in autoconf 2.53.
 dnl This macro adds a check to ensure the script found something.
 AC_DEFUN([CF_PROG_EGREP],
 [AC_CACHE_CHECK([for egrep], [ac_cv_prog_egrep],
 dnl -------------
 dnl AC_PROG_EGREP was introduced in autoconf 2.53.
 dnl This macro adds a check to ensure the script found something.
 AC_DEFUN([CF_PROG_EGREP],
 [AC_CACHE_CHECK([for egrep], [ac_cv_prog_egrep],
-   [if echo a | (grep -E '(a|b)') >/dev/null 2>&1
-    then ac_cv_prog_egrep='grep -E'
-    else ac_cv_prog_egrep='egrep'
-    fi])
- EGREP=$ac_cv_prog_egrep
- AC_SUBST([EGREP])
-test -z "$EGREP" && AC_MSG_ERROR(No egrep program found)
+       [if echo a | (grep -E '(a|b)') >/dev/null 2>&1
+               then ac_cv_prog_egrep='grep -E'
+               else ac_cv_prog_egrep='egrep'
+       fi])
      EGREP=$ac_cv_prog_egrep
      AC_SUBST([EGREP])
+       test -z "$EGREP" && AC_MSG_ERROR(No egrep program found)
 ])dnl
 dnl ---------------------------------------------------------------------------
 ])dnl
 dnl ---------------------------------------------------------------------------
-dnl CF_PROG_GNAT version: 2 updated: 2011/10/22 14:01:47
+dnl CF_PROG_GNAT version: 8 updated: 2018/11/10 19:47:04
 dnl ------------
 dnl Check for gnatmake, ensure that it is complete.
 AC_DEFUN([CF_PROG_GNAT],[
 cf_ada_make=gnatmake
 dnl ------------
 dnl Check for gnatmake, ensure that it is complete.
 AC_DEFUN([CF_PROG_GNAT],[
 cf_ada_make=gnatmake
-AC_CHECK_PROG(gnat_exists, $cf_ada_make, yes, no)
-if test "$ac_cv_prog_gnat_exists" = no; then
-   cf_ada_make=
-   cf_cv_prog_gnat_correct=no
+cf_ada_config="#"
+AC_CHECK_PROG(gnatmake_exists, $cf_ada_make, yes, no)
+if test "$ac_cv_prog_gnatmake_exists" = no; then
+       cf_ada_make=
+       cf_cv_prog_gnat_correct=no
 else
 else
-   CF_GNAT_VERSION
-   AC_CHECK_PROG(M4_exists, m4, yes, no)
-   if test "$ac_cv_prog_M4_exists" = no; then
-      cf_cv_prog_gnat_correct=no
-      echo Ada95 binding required program m4 not found. Ada95 binding disabled.
-   fi
-   if test "$cf_cv_prog_gnat_correct" = yes; then
-      AC_MSG_CHECKING(if GNAT works)
-      CF_GNAT_TRY_RUN([procedure conftest;],
+       AC_CHECK_PROG(gprconfig_exists, gprconfig, yes, no)
+       if test "$ac_cv_prog_gprconfig_exists" = yes
+       then
+               rm -rf conftest* *~conftest*
+               if mkdir conftest.src
+               then
+                       cf_ada_config=""
+                       cd conftest.src
+                       for cf_gprconfig in Ada C
+                       do
+                               AC_MSG_CHECKING(for gprconfig name for $cf_gprconfig)
+                               if test $cf_gprconfig = C
+                               then
+                                       for cf_gprconfig_param in \
+                                               $cf_gprconfig,,,,GNATGCC \
+                                               $cf_gprconfig,,,,GCC \
+                                               $cf_gprconfig
+                                       do
+                                               cf_gprconfig_value=`echo s| gprconfig --config=$cf_gprconfig_param 2>&AC_FD_CC | ${AWK:-awk} '/^\*/{print [$]3;}' | head -n 1`
+                                               test -n "$cf_gprconfig_value" && break
+                                       done
+                               else
+                                       cf_gprconfig_param=$cf_gprconfig
+                                       cf_gprconfig_value=`echo s| gprconfig --config=$cf_gprconfig_param 2>&AC_FD_CC | ${AWK:-awk} '/^\*/{print [$]3;}' | head -n 1`
+                               fi
+                               if test -n "$cf_gprconfig_value"
+                               then
+                                       eval cf_ada_config_[$]cf_gprconfig=[$]cf_gprconfig_value
+                                       AC_MSG_RESULT($cf_gprconfig_value)
+                               else
+                                       AC_MSG_RESULT(missing)
+                                       cf_ada_config="#"
+                                       break
+                               fi
+                       done
+                       cd ..
+                       rm -rf conftest* *~conftest*
+               fi
+       else
+               # gprconfig is newer than gnatmake; we can continue...
+               cf_ada_config="##"
+       fi
+       if test "x$cf_ada_config" != "x#"
+       then
+               CF_GNAT_VERSION
+               AC_CHECK_PROG(M4_exists, m4, yes, no)
+               if test "$ac_cv_prog_M4_exists" = no; then
+                       cf_cv_prog_gnat_correct=no
+                       echo Ada95 binding required program m4 not found. Ada95 binding disabled.
+               fi
+               if test "$cf_cv_prog_gnat_correct" = yes; then
+                       AC_MSG_CHECKING(if GNAT works)
+                       CF_GNAT_TRY_RUN([procedure conftest;],
 [with Text_IO;
 with GNAT.OS_Lib;
 procedure conftest is
 [with Text_IO;
 with GNAT.OS_Lib;
 procedure conftest is
@@ -4927,14 +5795,20 @@ begin
    Text_IO.New_Line;
    GNAT.OS_Lib.OS_Exit (0);
 end conftest;],[cf_cv_prog_gnat_correct=yes],[cf_cv_prog_gnat_correct=no])
    Text_IO.New_Line;
    GNAT.OS_Lib.OS_Exit (0);
 end conftest;],[cf_cv_prog_gnat_correct=yes],[cf_cv_prog_gnat_correct=no])
-      AC_MSG_RESULT($cf_cv_prog_gnat_correct)
-   fi
+                       AC_MSG_RESULT($cf_cv_prog_gnat_correct)
+               fi
+       else
+               cf_cv_prog_gnat_correct=no
+       fi
 fi
 
 AC_SUBST(cf_ada_make)
 fi
 
 AC_SUBST(cf_ada_make)
+AC_SUBST(cf_ada_config)
+AC_SUBST(cf_ada_config_Ada)
+AC_SUBST(cf_ada_config_C)
 ])dnl
 dnl ---------------------------------------------------------------------------
 ])dnl
 dnl ---------------------------------------------------------------------------
-dnl CF_PROG_INSTALL version: 5 updated: 2002/12/21 22:46:07
+dnl CF_PROG_INSTALL version: 7 updated: 2015/04/18 08:56:57
 dnl ---------------
 dnl Force $INSTALL to be an absolute-path.  Otherwise, edit_man.sh and the
 dnl misc/tabset install won't work properly.  Usually this happens only when
 dnl ---------------
 dnl Force $INSTALL to be an absolute-path.  Otherwise, edit_man.sh and the
 dnl misc/tabset install won't work properly.  Usually this happens only when
@@ -4942,41 +5816,41 @@ dnl using the fallback mkinstalldirs script
 AC_DEFUN([CF_PROG_INSTALL],
 [AC_PROG_INSTALL
 case $INSTALL in
 AC_DEFUN([CF_PROG_INSTALL],
 [AC_PROG_INSTALL
 case $INSTALL in
-/*)
-  ;;
-*)
-  CF_DIRNAME(cf_dir,$INSTALL)
-  test -z "$cf_dir" && cf_dir=.
-  INSTALL=`cd $cf_dir && pwd`/`echo $INSTALL | sed -e 's%^.*/%%'`
-  ;;
+(/*)
+       ;;
+(*)
+       CF_DIRNAME(cf_dir,$INSTALL)
+       test -z "$cf_dir" && cf_dir=.
+       INSTALL=`cd $cf_dir && pwd`/`echo $INSTALL | sed -e 's%^.*/%%'`
+       ;;
 esac
 ])dnl
 dnl ---------------------------------------------------------------------------
 esac
 ])dnl
 dnl ---------------------------------------------------------------------------
-dnl CF_PROG_LDCONFIG version: 3 updated: 2011/06/04 20:09:13
+dnl CF_PROG_LDCONFIG version: 5 updated: 2015/04/18 08:56:57
 dnl ----------------
 dnl Check for ldconfig, needed to fixup shared libraries that would be built
 dnl and then used in the install.
 AC_DEFUN([CF_PROG_LDCONFIG],[
 if test "$cross_compiling" = yes ; then
 dnl ----------------
 dnl Check for ldconfig, needed to fixup shared libraries that would be built
 dnl and then used in the install.
 AC_DEFUN([CF_PROG_LDCONFIG],[
 if test "$cross_compiling" = yes ; then
-  LDCONFIG=:
+       LDCONFIG=:
 else
 else
-case "$cf_cv_system_name" in #(vi
-dragonfly*|mirbsd*|freebsd*) #(vi
-  test -z "$LDCONFIG" && LDCONFIG="/sbin/ldconfig -R"
-  ;;
-*) LDPATH=$PATH:/sbin:/usr/sbin
-  AC_PATH_PROG(LDCONFIG,ldconfig,,$LDPATH)
-  ;;
-esac
+       case "$cf_cv_system_name" in
+       (dragonfly*|mirbsd*|freebsd*)
+               test -z "$LDCONFIG" && LDCONFIG="/sbin/ldconfig -R"
+               ;;
+       (*) LDPATH=$PATH:/sbin:/usr/sbin
+               AC_PATH_PROG(LDCONFIG,ldconfig,,$LDPATH)
+               ;;
+       esac
 fi
 AC_SUBST(LDCONFIG)
 ])dnl
 dnl ---------------------------------------------------------------------------
 fi
 AC_SUBST(LDCONFIG)
 ])dnl
 dnl ---------------------------------------------------------------------------
-dnl CF_PROG_LINT version: 2 updated: 2009/08/12 04:43:14
+dnl CF_PROG_LINT version: 3 updated: 2016/05/22 15:25:54
 dnl ------------
 AC_DEFUN([CF_PROG_LINT],
 [
 dnl ------------
 AC_DEFUN([CF_PROG_LINT],
 [
-AC_CHECK_PROGS(LINT, tdlint lint alint splint lclint)
+AC_CHECK_PROGS(LINT, lint cppcheck splint)
 AC_SUBST(LINT_OPTS)
 ])dnl
 dnl ---------------------------------------------------------------------------
 AC_SUBST(LINT_OPTS)
 ])dnl
 dnl ---------------------------------------------------------------------------
@@ -5002,7 +5876,7 @@ AC_MSG_RESULT($cf_prog_ln_sf)
 test "$cf_prog_ln_sf" = yes && LN_S="$LN_S -f"
 ])dnl
 dnl ---------------------------------------------------------------------------
 test "$cf_prog_ln_sf" = yes && LN_S="$LN_S -f"
 ])dnl
 dnl ---------------------------------------------------------------------------
-dnl CF_REGEX version: 10 updated: 2012/10/04 20:12:20
+dnl CF_REGEX version: 12 updated: 2015/04/18 08:56:57
 dnl --------
 dnl Attempt to determine if we've got one of the flavors of regular-expression
 dnl code that we can support.
 dnl --------
 dnl Attempt to determine if we've got one of the flavors of regular-expression
 dnl code that we can support.
@@ -5012,8 +5886,8 @@ AC_DEFUN([CF_REGEX],
 cf_regex_func=no
 
 cf_regex_libs="regex re"
 cf_regex_func=no
 
 cf_regex_libs="regex re"
-case $host_os in #(vi
-mingw*)
+case $host_os in
+(mingw*)
        cf_regex_libs="gnurx $cf_regex_libs"
        ;;
 esac
        cf_regex_libs="gnurx $cf_regex_libs"
        ;;
 esac
@@ -5042,8 +5916,8 @@ fi
 AC_CACHE_CHECK(for regular-expression headers,cf_cv_regex_hdrs,[
 
 cf_cv_regex_hdrs=no
 AC_CACHE_CHECK(for regular-expression headers,cf_cv_regex_hdrs,[
 
 cf_cv_regex_hdrs=no
-case $cf_regex_func in #(vi
-compile) #(vi
+case $cf_regex_func in
+(compile)
        for cf_regex_hdr in regexp.h regexpr.h
        do
                AC_TRY_LINK([#include <$cf_regex_hdr>],[
        for cf_regex_hdr in regexp.h regexpr.h
        do
                AC_TRY_LINK([#include <$cf_regex_hdr>],[
@@ -5055,7 +5929,7 @@ compile) #(vi
                ])
        done
        ;;
                ])
        done
        ;;
-*)
+(*)
        for cf_regex_hdr in regex.h
        do
                AC_TRY_LINK([#include <sys/types.h>
        for cf_regex_hdr in regex.h
        do
                AC_TRY_LINK([#include <sys/types.h>
@@ -5074,11 +5948,11 @@ esac
 
 ])
 
 
 ])
 
-case $cf_cv_regex_hdrs in #(vi
-    no)               AC_MSG_WARN(no regular expression header found) ;; #(vi
-    regex.h)   AC_DEFINE(HAVE_REGEX_H_FUNCS,1,[Define to 1 to include regex.h for regular expressions]) ;; #(vi
-    regexp.h)  AC_DEFINE(HAVE_REGEXP_H_FUNCS,1,[Define to 1 to include regexp.h for regular expressions]) ;; #(vi
-    regexpr.h) AC_DEFINE(HAVE_REGEXPR_H_FUNCS,1,[Define to 1 to include regexpr.h for regular expressions]) ;;
+case $cf_cv_regex_hdrs in
+       (no)            AC_MSG_WARN(no regular expression header found) ;;
+       (regex.h)       AC_DEFINE(HAVE_REGEX_H_FUNCS,1,[Define to 1 to include regex.h for regular expressions]) ;;
+       (regexp.h)      AC_DEFINE(HAVE_REGEXP_H_FUNCS,1,[Define to 1 to include regexp.h for regular expressions]) ;;
+       (regexpr.h) AC_DEFINE(HAVE_REGEXPR_H_FUNCS,1,[Define to 1 to include regexpr.h for regular expressions]) ;;
 esac
 ])dnl
 dnl ---------------------------------------------------------------------------
 esac
 ])dnl
 dnl ---------------------------------------------------------------------------
@@ -5112,7 +5986,7 @@ define([CF_REMOVE_LIB],
 $1=`echo "$2" | sed -e 's/-l$3[[       ]]//g' -e 's/-l$3[$]//'`
 ])dnl
 dnl ---------------------------------------------------------------------------
 $1=`echo "$2" | sed -e 's/-l$3[[       ]]//g' -e 's/-l$3[$]//'`
 ])dnl
 dnl ---------------------------------------------------------------------------
-dnl CF_RPATH_HACK version: 9 updated: 2011/02/13 13:31:33
+dnl CF_RPATH_HACK version: 11 updated: 2013/09/01 13:02:00
 dnl -------------
 AC_DEFUN([CF_RPATH_HACK],
 [
 dnl -------------
 AC_DEFUN([CF_RPATH_HACK],
 [
@@ -5129,8 +6003,8 @@ if test -n "$LD_RPATH_OPT" ; then
 
 AC_TRY_LINK([#include <stdio.h>],
                [printf("Hello");],
 
 AC_TRY_LINK([#include <stdio.h>],
                [printf("Hello");],
-               [cf_rpath_oops=`$cf_ldd_prog conftest$ac_exeext | fgrep ' not found' | sed -e 's% =>.*$%%' |sort -u`
-                cf_rpath_list=`$cf_ldd_prog conftest$ac_exeext | fgrep / | sed -e 's%^.*[[     ]]/%/%' -e 's%/[[^/]][[^/]]*$%%' |sort -u`])
+               [cf_rpath_oops=`$cf_ldd_prog conftest$ac_exeext | fgrep ' not found' | sed -e 's% =>.*$%%' |sort | uniq`
+                cf_rpath_list=`$cf_ldd_prog conftest$ac_exeext | fgrep / | sed -e 's%^.*[[     ]]/%/%' -e 's%/[[^/]][[^/]]*$%%' |sort | uniq`])
 
                # If we passed the link-test, but get a "not found" on a given library,
                # this could be due to inept reconfiguration of gcc to make it only
 
                # If we passed the link-test, but get a "not found" on a given library,
                # this could be due to inept reconfiguration of gcc to make it only
@@ -5163,11 +6037,13 @@ AC_TRY_LINK([#include <stdio.h>],
        CF_RPATH_HACK_2(LIBS)
 
        CF_VERBOSE(...checked EXTRA_LDFLAGS $EXTRA_LDFLAGS)
        CF_RPATH_HACK_2(LIBS)
 
        CF_VERBOSE(...checked EXTRA_LDFLAGS $EXTRA_LDFLAGS)
+else
+       AC_MSG_RESULT(no)
 fi
 AC_SUBST(EXTRA_LDFLAGS)
 ])dnl
 dnl ---------------------------------------------------------------------------
 fi
 AC_SUBST(EXTRA_LDFLAGS)
 ])dnl
 dnl ---------------------------------------------------------------------------
-dnl CF_RPATH_HACK_2 version: 6 updated: 2010/04/17 16:31:24
+dnl CF_RPATH_HACK_2 version: 7 updated: 2015/04/12 15:39:00
 dnl ---------------
 dnl Do one set of substitutions for CF_RPATH_HACK, adding an rpath option to
 dnl EXTRA_LDFLAGS for each -L option found.
 dnl ---------------
 dnl Do one set of substitutions for CF_RPATH_HACK, adding an rpath option to
 dnl EXTRA_LDFLAGS for each -L option found.
@@ -5183,8 +6059,8 @@ CF_VERBOSE(...checking $1 [$]$1)
 cf_rpath_dst=
 for cf_rpath_src in [$]$1
 do
 cf_rpath_dst=
 for cf_rpath_src in [$]$1
 do
-       case $cf_rpath_src in #(vi
-       -L*) #(vi
+       case $cf_rpath_src in
+       (-L*)
 
                # check if this refers to a directory which we will ignore
                cf_rpath_skip=no
 
                # check if this refers to a directory which we will ignore
                cf_rpath_skip=no
@@ -5227,18 +6103,19 @@ CF_VERBOSE(...checked $1 [$]$1)
 AC_SUBST(EXTRA_LDFLAGS)
 ])dnl
 dnl ---------------------------------------------------------------------------
 AC_SUBST(EXTRA_LDFLAGS)
 ])dnl
 dnl ---------------------------------------------------------------------------
-dnl CF_SHARED_OPTS version: 70 updated: 2012/02/25 15:20:07
+dnl CF_SHARED_OPTS version: 93 updated: 2018/08/18 16:36:35
 dnl --------------
 dnl --------------
 dnl Attempt to determine the appropriate CC/LD options for creating a shared
 dnl library.
 dnl
 dnl --------------
 dnl --------------
 dnl Attempt to determine the appropriate CC/LD options for creating a shared
 dnl library.
 dnl
-dnl Note: ${LOCAL_LDFLAGS} is used to link executables that will run within the
-dnl build-tree, i.e., by making use of the libraries that are compiled in ../lib
-dnl We avoid compiling-in a ../lib path for the shared library since that can
-dnl lead to unexpected results at runtime.
-dnl ${LOCAL_LDFLAGS2} has the same intention but assumes that the shared libraries
-dnl are compiled in ../../lib
+dnl Notes:
+dnl a) ${LOCAL_LDFLAGS} is used to link executables that will run within
+dnl the build-tree, i.e., by making use of the libraries that are compiled in
+dnl $rel_builddir/lib We avoid compiling-in a $rel_builddir/lib path for the
+dnl shared library since that can lead to unexpected results at runtime.
+dnl b) ${LOCAL_LDFLAGS2} has the same intention but assumes that the shared
+dnl libraries are compiled in ../../lib
 dnl
 dnl The variable 'cf_cv_do_symlinks' is used to control whether we configure
 dnl to install symbolic links to the rel/abi versions of shared libraries.
 dnl
 dnl The variable 'cf_cv_do_symlinks' is used to control whether we configure
 dnl to install symbolic links to the rel/abi versions of shared libraries.
@@ -5253,12 +6130,20 @@ dnl
 dnl Some loaders leave 'so_locations' lying around.  It's nice to clean up.
 AC_DEFUN([CF_SHARED_OPTS],
 [
 dnl Some loaders leave 'so_locations' lying around.  It's nice to clean up.
 AC_DEFUN([CF_SHARED_OPTS],
 [
-       AC_REQUIRE([CF_SUBST_NCURSES_VERSION])
        AC_REQUIRE([CF_LD_RPATH_OPT])
        AC_REQUIRE([CF_LD_RPATH_OPT])
+
+       RM_SHARED_OPTS=
        LOCAL_LDFLAGS=
        LOCAL_LDFLAGS2=
        LD_SHARED_OPTS=
        INSTALL_LIB="-m 644"
        LOCAL_LDFLAGS=
        LOCAL_LDFLAGS2=
        LD_SHARED_OPTS=
        INSTALL_LIB="-m 644"
+       : ${rel_builddir:=.}
+
+       shlibdir=$libdir
+       AC_SUBST(shlibdir)
+
+       MAKE_DLLS="#"
+       AC_SUBST(MAKE_DLLS)
 
        cf_cv_do_symlinks=no
        cf_ld_rpath_opt=
 
        cf_cv_do_symlinks=no
        cf_ld_rpath_opt=
@@ -5268,25 +6153,40 @@ AC_DEFUN([CF_SHARED_OPTS],
        AC_ARG_WITH(shlib-version,
        [  --with-shlib-version=X  Specify rel or abi version for shared libs],
        [test -z "$withval" && withval=auto
        AC_ARG_WITH(shlib-version,
        [  --with-shlib-version=X  Specify rel or abi version for shared libs],
        [test -z "$withval" && withval=auto
-       case $withval in #(vi
-       yes) #(vi
+       case $withval in
+       (yes)
                cf_cv_shlib_version=auto
                ;;
                cf_cv_shlib_version=auto
                ;;
-       rel|abi|auto|no) #(vi
+       (rel|abi|auto)
                cf_cv_shlib_version=$withval
                ;;
                cf_cv_shlib_version=$withval
                ;;
-       *)
-               AC_MSG_ERROR([option value must be one of: rel, abi, auto or no])
+       (*)
+               AC_MSG_RESULT($withval)
+               AC_MSG_ERROR([option value must be one of: rel, abi, or auto])
                ;;
        esac
        ],[cf_cv_shlib_version=auto])
        AC_MSG_RESULT($cf_cv_shlib_version)
 
        cf_cv_rm_so_locs=no
                ;;
        esac
        ],[cf_cv_shlib_version=auto])
        AC_MSG_RESULT($cf_cv_shlib_version)
 
        cf_cv_rm_so_locs=no
+       cf_try_cflags=
 
        # Some less-capable ports of gcc support only -fpic
        CC_SHARED_OPTS=
 
        # Some less-capable ports of gcc support only -fpic
        CC_SHARED_OPTS=
+
+       cf_try_fPIC=no
        if test "$GCC" = yes
        if test "$GCC" = yes
+       then
+               cf_try_fPIC=yes
+       else
+               case $cf_cv_system_name in
+               (*linux*)       # e.g., PGI compiler
+                       cf_try_fPIC=yes
+                       ;;
+               esac
+       fi
+
+       if test "$cf_try_fPIC" = yes
        then
                AC_MSG_CHECKING(which $CC option to use)
                cf_save_CFLAGS="$CFLAGS"
        then
                AC_MSG_CHECKING(which $CC option to use)
                cf_save_CFLAGS="$CFLAGS"
@@ -5301,27 +6201,30 @@ AC_DEFUN([CF_SHARED_OPTS],
 
        cf_cv_shlib_version_infix=no
 
 
        cf_cv_shlib_version_infix=no
 
-       case $cf_cv_system_name in #(vi
-       aix4.[3-9]*|aix[[5-7]]*) #(vi
+       case $cf_cv_system_name in
+       (aix4.[3-9]*|aix[[5-7]]*)
                if test "$GCC" = yes; then
                if test "$GCC" = yes; then
-                       CC_SHARED_OPTS=
-                       MK_SHARED_LIB='${CC} -shared -Wl,-brtl -Wl,-blibpath:${RPATH_LIST}:/usr/lib -o [$]@'
+                       CC_SHARED_OPTS='-Wl,-brtl'
+                       MK_SHARED_LIB='${CC} ${LDFLAGS} ${CFLAGS} -shared -Wl,-brtl -Wl,-blibpath:${RPATH_LIST}:/usr/lib -o [$]@'
                else
                else
-                       # CC_SHARED_OPTS='-qpic=large -G'
-                       # perhaps "-bM:SRE -bnoentry -bexpall"
-                       MK_SHARED_LIB='${CC} -G -Wl,-brtl -Wl,-blibpath:${RPATH_LIST}:/usr/lib -o [$]@'
+                       CC_SHARED_OPTS='-brtl'
+                       # as well as '-qpic=large -G' or perhaps "-bM:SRE -bnoentry -bexpall"
+                       MK_SHARED_LIB='${CC} ${LDFLAGS} ${CFLAGS} -G -Wl,-brtl -Wl,-blibpath:${RPATH_LIST}:/usr/lib -o [$]@'
                fi
                ;;
                fi
                ;;
-       beos*) #(vi
-               MK_SHARED_LIB='${CC} ${CFLAGS} -o $[@] -Xlinker -soname=`basename $[@]` -nostart -e 0'
+       (beos*)
+               MK_SHARED_LIB='${CC} ${LDFLAGS} ${CFLAGS} -o $[@] -Xlinker -soname=`basename $[@]` -nostart -e 0'
                ;;
                ;;
-       cygwin*) #(vi
+       (cygwin*)
                CC_SHARED_OPTS=
                CC_SHARED_OPTS=
-               MK_SHARED_LIB='sh ../mk_shared_lib.sh [$]@ [$]{CC} [$]{CFLAGS}'
+               MK_SHARED_LIB=$SHELL' '$rel_builddir'/mk_shared_lib.sh [$]@ [$]{CC} [$]{CFLAGS}'
+               RM_SHARED_OPTS="$RM_SHARED_OPTS $rel_builddir/mk_shared_lib.sh *.dll.a"
                cf_cv_shlib_version=cygdll
                cf_cv_shlib_version_infix=cygdll
                cf_cv_shlib_version=cygdll
                cf_cv_shlib_version_infix=cygdll
+               shlibdir=$bindir
+               MAKE_DLLS=
                cat >mk_shared_lib.sh <<-CF_EOF
                cat >mk_shared_lib.sh <<-CF_EOF
-               #!/bin/sh
+               #!$SHELL
                SHARED_LIB=\[$]1
                IMPORT_LIB=\`echo "\[$]1" | sed -e 's/cyg/lib/' -e 's/[[0-9]]*\.dll[$]/.dll.a/'\`
                shift
                SHARED_LIB=\[$]1
                IMPORT_LIB=\`echo "\[$]1" | sed -e 's/cyg/lib/' -e 's/[[0-9]]*\.dll[$]/.dll.a/'\`
                shift
@@ -5330,14 +6233,36 @@ AC_DEFUN([CF_SHARED_OPTS],
                ** SHARED_LIB \[$]SHARED_LIB
                ** IMPORT_LIB \[$]IMPORT_LIB
 EOF
                ** SHARED_LIB \[$]SHARED_LIB
                ** IMPORT_LIB \[$]IMPORT_LIB
 EOF
-               exec \[$]* -shared -Wl,--out-implib=../lib/\[$]{IMPORT_LIB} -Wl,--export-all-symbols -o ../lib/\[$]{SHARED_LIB}
+               exec \[$]* ${LDFLAGS} -shared -Wl,--out-implib=\[$]{IMPORT_LIB} -Wl,--export-all-symbols -o \[$]{SHARED_LIB}
 CF_EOF
                chmod +x mk_shared_lib.sh
                ;;
 CF_EOF
                chmod +x mk_shared_lib.sh
                ;;
-       darwin*) #(vi
-               EXTRA_CFLAGS="-no-cpp-precomp"
+       (msys*)
+               CC_SHARED_OPTS=
+               MK_SHARED_LIB=$SHELL' '$rel_builddir'/mk_shared_lib.sh [$]@ [$]{CC} [$]{CFLAGS}'
+               RM_SHARED_OPTS="$RM_SHARED_OPTS $rel_builddir/mk_shared_lib.sh *.dll.a"
+               cf_cv_shlib_version=msysdll
+               cf_cv_shlib_version_infix=msysdll
+               shlibdir=$bindir
+               MAKE_DLLS=
+               cat >mk_shared_lib.sh <<-CF_EOF
+               #!$SHELL
+               SHARED_LIB=\[$]1
+               IMPORT_LIB=\`echo "\[$]1" | sed -e 's/msys-/lib/' -e 's/[[0-9]]*\.dll[$]/.dll.a/'\`
+               shift
+               cat <<-EOF
+               Linking shared library
+               ** SHARED_LIB \[$]SHARED_LIB
+               ** IMPORT_LIB \[$]IMPORT_LIB
+EOF
+               exec \[$]* ${LDFLAGS} -shared -Wl,--out-implib=\[$]{IMPORT_LIB} -Wl,--export-all-symbols -o \[$]{SHARED_LIB}
+CF_EOF
+               chmod +x mk_shared_lib.sh
+               ;;
+       (darwin*)
+               cf_try_cflags="no-cpp-precomp"
                CC_SHARED_OPTS="-dynamic"
                CC_SHARED_OPTS="-dynamic"
-               MK_SHARED_LIB='${CC} ${CFLAGS} -dynamiclib -install_name ${libdir}/`basename $[@]` -compatibility_version ${ABI_VERSION} -current_version ${ABI_VERSION} -o $[@]'
+               MK_SHARED_LIB='${CC} ${LDFLAGS} ${CFLAGS} -dynamiclib -install_name ${libdir}/`basename $[@]` -compatibility_version ${ABI_VERSION} -current_version ${ABI_VERSION} -o $[@]'
                test "$cf_cv_shlib_version" = auto && cf_cv_shlib_version=abi
                cf_cv_shlib_version_infix=yes
                AC_CACHE_CHECK([if ld -search_paths_first works], cf_cv_ldflags_search_paths_first, [
                test "$cf_cv_shlib_version" = auto && cf_cv_shlib_version=abi
                cf_cv_shlib_version_infix=yes
                AC_CACHE_CHECK([if ld -search_paths_first works], cf_cv_ldflags_search_paths_first, [
@@ -5349,7 +6274,15 @@ CF_EOF
                        LDFLAGS="$LDFLAGS -Wl,-search_paths_first"
                fi
                ;;
                        LDFLAGS="$LDFLAGS -Wl,-search_paths_first"
                fi
                ;;
-       hpux*) #(vi
+       (hpux[[7-8]]*)
+               # HP-UX 8.07 ld lacks "+b" option used for libdir search-list
+               if test "$GCC" != yes; then
+                       CC_SHARED_OPTS='+Z'
+               fi
+               MK_SHARED_LIB='${LD} ${LDFLAGS} -b -o $[@]'
+               INSTALL_LIB="-m 555"
+               ;;
+       (hpux*)
                # (tested with gcc 2.7.2 -- I don't have c89)
                if test "$GCC" = yes; then
                        LD_SHARED_OPTS='-Xlinker +b -Xlinker ${libdir}'
                # (tested with gcc 2.7.2 -- I don't have c89)
                if test "$GCC" = yes; then
                        LD_SHARED_OPTS='-Xlinker +b -Xlinker ${libdir}'
@@ -5357,36 +6290,36 @@ CF_EOF
                        CC_SHARED_OPTS='+Z'
                        LD_SHARED_OPTS='-Wl,+b,${libdir}'
                fi
                        CC_SHARED_OPTS='+Z'
                        LD_SHARED_OPTS='-Wl,+b,${libdir}'
                fi
-               MK_SHARED_LIB='${LD} +b ${libdir} -b -o $[@]'
+               MK_SHARED_LIB='${LD} ${LDFLAGS} +b ${libdir} -b -o $[@]'
                # HP-UX shared libraries must be executable, and should be
                # readonly to exploit a quirk in the memory manager.
                INSTALL_LIB="-m 555"
                ;;
                # HP-UX shared libraries must be executable, and should be
                # readonly to exploit a quirk in the memory manager.
                INSTALL_LIB="-m 555"
                ;;
-       interix*)
+       (interix*)
                test "$cf_cv_shlib_version" = auto && cf_cv_shlib_version=rel
                if test "$cf_cv_shlib_version" = rel; then
                test "$cf_cv_shlib_version" = auto && cf_cv_shlib_version=rel
                if test "$cf_cv_shlib_version" = rel; then
-                       cf_shared_soname='`basename $@ .${REL_VERSION}`.${ABI_VERSION}'
+                       cf_shared_soname='`basename $[@] .${REL_VERSION}`.${ABI_VERSION}'
                else
                else
-                       cf_shared_soname='`basename $@`'
+                       cf_shared_soname='`basename $[@]`'
                fi
                CC_SHARED_OPTS=
                fi
                CC_SHARED_OPTS=
-               MK_SHARED_LIB='${CC} -shared -Wl,-rpath,${RPATH_LIST} -Wl,-h,'$cf_shared_soname' -o $@'
+               MK_SHARED_LIB='${CC} ${LDFLAGS} ${CFLAGS} -shared -Wl,-rpath,${RPATH_LIST} -Wl,-h,'$cf_shared_soname' -o $[@]'
                ;;
                ;;
-       irix*) #(vi
+       (irix*)
                if test "$cf_cv_enable_rpath" = yes ; then
                        EXTRA_LDFLAGS="${cf_ld_rpath_opt}\${RPATH_LIST} $EXTRA_LDFLAGS"
                fi
                # tested with IRIX 5.2 and 'cc'.
                if test "$GCC" != yes; then
                        CC_SHARED_OPTS='-KPIC'
                if test "$cf_cv_enable_rpath" = yes ; then
                        EXTRA_LDFLAGS="${cf_ld_rpath_opt}\${RPATH_LIST} $EXTRA_LDFLAGS"
                fi
                # tested with IRIX 5.2 and 'cc'.
                if test "$GCC" != yes; then
                        CC_SHARED_OPTS='-KPIC'
-                       MK_SHARED_LIB='${CC} -shared -rdata_shared -soname `basename $[@]` -o $[@]'
+                       MK_SHARED_LIB='${CC} ${LDFLAGS} ${CFLAGS} -shared -rdata_shared -soname `basename $[@]` -o $[@]'
                else
                else
-                       MK_SHARED_LIB='${CC} -shared -Wl,-soname,`basename $[@]` -o $[@]'
+                       MK_SHARED_LIB='${CC} ${LDFLAGS} ${CFLAGS} -shared -Wl,-soname,`basename $[@]` -o $[@]'
                fi
                cf_cv_rm_so_locs=yes
                ;;
                fi
                cf_cv_rm_so_locs=yes
                ;;
-       linux*|gnu*|k*bsd*-gnu) #(vi
-               if test "$DFT_LWR_MODEL" = "shared" ; then
+       (linux*|gnu*|k*bsd*-gnu)
+               if test "$DFT_LWR_MODEL" = "shared" && test -n "$LD_RPATH_OPT" ; then
                        LOCAL_LDFLAGS="${LD_RPATH_OPT}\$(LOCAL_LIBDIR)"
                        LOCAL_LDFLAGS2="$LOCAL_LDFLAGS"
                fi
                        LOCAL_LDFLAGS="${LD_RPATH_OPT}\$(LOCAL_LIBDIR)"
                        LOCAL_LDFLAGS2="$LOCAL_LDFLAGS"
                fi
@@ -5394,17 +6327,23 @@ CF_EOF
                        EXTRA_LDFLAGS="${cf_ld_rpath_opt}\${RPATH_LIST} $EXTRA_LDFLAGS"
                fi
                CF_SHARED_SONAME
                        EXTRA_LDFLAGS="${cf_ld_rpath_opt}\${RPATH_LIST} $EXTRA_LDFLAGS"
                fi
                CF_SHARED_SONAME
-               MK_SHARED_LIB='${CC} ${CFLAGS} -shared -Wl,-soname,'$cf_cv_shared_soname',-stats,-lc -o $[@]'
+               MK_SHARED_LIB='${CC} ${LDFLAGS} ${CFLAGS} -shared -Wl,-soname,'$cf_cv_shared_soname',-stats,-lc -o $[@]'
                ;;
                ;;
-       mingw*) #(vi
+       (mingw*)
                cf_cv_shlib_version=mingw
                cf_cv_shlib_version_infix=mingw
                cf_cv_shlib_version=mingw
                cf_cv_shlib_version_infix=mingw
+               shlibdir=$bindir
+               MAKE_DLLS=
+               if test "$DFT_LWR_MODEL" = "shared" ; then
+                       LOCAL_LDFLAGS="-Wl,--enable-auto-import"
+                       LOCAL_LDFLAGS2="$LOCAL_LDFLAGS"
+                       EXTRA_LDFLAGS="-Wl,--enable-auto-import $EXTRA_LDFLAGS"
+               fi
                CC_SHARED_OPTS=
                CC_SHARED_OPTS=
-               MK_SHARED_LIB='sh ../mk_shared_lib.sh [$]@ [$]{CC} [$]{CFLAGS}'
-               #MK_SHARED_LIB='${CC} ${CFLAGS} -mdll -Wl,-soname,'$cf_cv_shared_soname',-stats -o $[@]'
-               #MK_SHARED_LIB='${DLLTOOL} --export-all-symbols --output-exp --output-lib $[@]'
+               MK_SHARED_LIB=$SHELL' '$rel_builddir'/mk_shared_lib.sh [$]@ [$]{CC} [$]{CFLAGS}'
+               RM_SHARED_OPTS="$RM_SHARED_OPTS $rel_builddir/mk_shared_lib.sh *.dll.a"
                cat >mk_shared_lib.sh <<-CF_EOF
                cat >mk_shared_lib.sh <<-CF_EOF
-               #!/bin/sh
+               #!$SHELL
                SHARED_LIB=\[$]1
                IMPORT_LIB=\`echo "\[$]1" | sed -e 's/[[0-9]]*\.dll[$]/.dll.a/'\`
                shift
                SHARED_LIB=\[$]1
                IMPORT_LIB=\`echo "\[$]1" | sed -e 's/[[0-9]]*\.dll[$]/.dll.a/'\`
                shift
@@ -5413,12 +6352,12 @@ CF_EOF
                ** SHARED_LIB \[$]SHARED_LIB
                ** IMPORT_LIB \[$]IMPORT_LIB
 EOF
                ** SHARED_LIB \[$]SHARED_LIB
                ** IMPORT_LIB \[$]IMPORT_LIB
 EOF
-               exec \[$]* -shared -Wl,--out-implib=../lib/\[$]{IMPORT_LIB} -Wl,--export-all-symbols -o ../lib/\[$]{SHARED_LIB}
+               exec \[$]* ${LDFLAGS} -shared -Wl,--enable-auto-import,--out-implib=\[$]{IMPORT_LIB} -Wl,--export-all-symbols -o \[$]{SHARED_LIB}
 CF_EOF
                chmod +x mk_shared_lib.sh
                ;;
 CF_EOF
                chmod +x mk_shared_lib.sh
                ;;
-       openbsd[[2-9]].*|mirbsd*) #(vi
-               if test "$DFT_LWR_MODEL" = "shared" ; then
+       (openbsd[[2-9]].*|mirbsd*)
+               if test "$DFT_LWR_MODEL" = "shared" && test -n "$LD_RPATH_OPT" ; then
                        LOCAL_LDFLAGS="${LD_RPATH_OPT}\$(LOCAL_LIBDIR)"
                        LOCAL_LDFLAGS2="$LOCAL_LDFLAGS"
                fi
                        LOCAL_LDFLAGS="${LD_RPATH_OPT}\$(LOCAL_LIBDIR)"
                        LOCAL_LDFLAGS2="$LOCAL_LDFLAGS"
                fi
@@ -5427,14 +6366,14 @@ CF_EOF
                fi
                CC_SHARED_OPTS="$CC_SHARED_OPTS -DPIC"
                CF_SHARED_SONAME
                fi
                CC_SHARED_OPTS="$CC_SHARED_OPTS -DPIC"
                CF_SHARED_SONAME
-               MK_SHARED_LIB='${CC} ${CFLAGS} -shared -Wl,-Bshareable,-soname,'$cf_cv_shared_soname',-stats,-lc -o $[@]'
+               MK_SHARED_LIB='${CC} ${LDFLAGS} ${CFLAGS} -shared -Wl,-Bshareable,-soname,'$cf_cv_shared_soname',-stats,-lc -o $[@]'
                ;;
                ;;
-       nto-qnx*|openbsd*|freebsd[[12]].*) #(vi
+       (nto-qnx*|openbsd*|freebsd[[12]].*)
                CC_SHARED_OPTS="$CC_SHARED_OPTS -DPIC"
                CC_SHARED_OPTS="$CC_SHARED_OPTS -DPIC"
-               MK_SHARED_LIB='${LD} -Bshareable -o $[@]'
+               MK_SHARED_LIB='${LD} ${LDFLAGS} -Bshareable -o $[@]'
                test "$cf_cv_shlib_version" = auto && cf_cv_shlib_version=rel
                ;;
                test "$cf_cv_shlib_version" = auto && cf_cv_shlib_version=rel
                ;;
-       dragonfly*|freebsd*) #(vi
+       (dragonfly*|freebsd*)
                CC_SHARED_OPTS="$CC_SHARED_OPTS -DPIC"
                if test "$DFT_LWR_MODEL" = "shared" && test "$cf_cv_enable_rpath" = yes ; then
                        LOCAL_LDFLAGS="${cf_ld_rpath_opt}\$(LOCAL_LIBDIR)"
                CC_SHARED_OPTS="$CC_SHARED_OPTS -DPIC"
                if test "$DFT_LWR_MODEL" = "shared" && test "$cf_cv_enable_rpath" = yes ; then
                        LOCAL_LDFLAGS="${cf_ld_rpath_opt}\$(LOCAL_LIBDIR)"
@@ -5442,9 +6381,9 @@ CF_EOF
                        EXTRA_LDFLAGS="${cf_ld_rpath_opt}\${RPATH_LIST} $EXTRA_LDFLAGS"
                fi
                CF_SHARED_SONAME
                        EXTRA_LDFLAGS="${cf_ld_rpath_opt}\${RPATH_LIST} $EXTRA_LDFLAGS"
                fi
                CF_SHARED_SONAME
-               MK_SHARED_LIB='${LD} -shared -Bshareable -soname=`basename $[@]` -o $[@]'
+               MK_SHARED_LIB='${CC} ${LDFLAGS} ${CFLAGS} -shared -Wl,-soname,'$cf_cv_shared_soname',-stats,-lc -o $[@]'
                ;;
                ;;
-       netbsd*) #(vi
+       (netbsd*)
                CC_SHARED_OPTS="$CC_SHARED_OPTS -DPIC"
                if test "$DFT_LWR_MODEL" = "shared" && test "$cf_cv_enable_rpath" = yes ; then
                        LOCAL_LDFLAGS="${cf_ld_rpath_opt}\$(LOCAL_LIBDIR)"
                CC_SHARED_OPTS="$CC_SHARED_OPTS -DPIC"
                if test "$DFT_LWR_MODEL" = "shared" && test "$cf_cv_enable_rpath" = yes ; then
                        LOCAL_LDFLAGS="${cf_ld_rpath_opt}\$(LOCAL_LIBDIR)"
@@ -5458,34 +6397,34 @@ CF_EOF
                        fi
                        fi
                        CF_SHARED_SONAME
                        fi
                        fi
                        CF_SHARED_SONAME
-                       MK_SHARED_LIB='${CC} ${CFLAGS} -shared -Wl,-soname,'$cf_cv_shared_soname' -o $[@]'
+                       MK_SHARED_LIB='${CC} ${LDFLAGS} ${CFLAGS} -shared -Wl,-soname,'$cf_cv_shared_soname' -o $[@]'
                else
                else
-                       MK_SHARED_LIB='${LD} -shared -Bshareable -o $[@]'
+                       MK_SHARED_LIB='${CC} ${LDFLAGS} ${CFLAGS} -Wl,-shared -Wl,-Bshareable -o $[@]'
                fi
                ;;
                fi
                ;;
-       osf*|mls+*) #(vi
+       (osf*|mls+*)
                # tested with OSF/1 V3.2 and 'cc'
                # tested with OSF/1 V3.2 and gcc 2.6.3 (but the c++ demo didn't
                # link with shared libs).
                # tested with OSF/1 V3.2 and 'cc'
                # tested with OSF/1 V3.2 and gcc 2.6.3 (but the c++ demo didn't
                # link with shared libs).
-               MK_SHARED_LIB='${LD} -set_version ${REL_VERSION}:${ABI_VERSION} -expect_unresolved "*" -shared -soname `basename $[@]`'
-               case $host_os in #(vi
-               osf4*)
+               MK_SHARED_LIB='${LD} ${LDFLAGS} -set_version ${REL_VERSION}:${ABI_VERSION} -expect_unresolved "*" -shared -soname `basename $[@]`'
+               case $host_os in
+               (osf4*)
                        MK_SHARED_LIB="${MK_SHARED_LIB} -msym"
                        ;;
                esac
                MK_SHARED_LIB="${MK_SHARED_LIB}"' -o $[@]'
                        MK_SHARED_LIB="${MK_SHARED_LIB} -msym"
                        ;;
                esac
                MK_SHARED_LIB="${MK_SHARED_LIB}"' -o $[@]'
-               if test "$DFT_LWR_MODEL" = "shared" ; then
+               if test "$DFT_LWR_MODEL" = "shared" && test -n "$LD_RPATH_OPT" ; then
                        LOCAL_LDFLAGS="${LD_RPATH_OPT}\$(LOCAL_LIBDIR)"
                        LOCAL_LDFLAGS2="$LOCAL_LDFLAGS"
                fi
                cf_cv_rm_so_locs=yes
                ;;
                        LOCAL_LDFLAGS="${LD_RPATH_OPT}\$(LOCAL_LIBDIR)"
                        LOCAL_LDFLAGS2="$LOCAL_LDFLAGS"
                fi
                cf_cv_rm_so_locs=yes
                ;;
-       sco3.2v5*)  # (also uw2* and UW7: hops 13-Apr-98
+       (sco3.2v5*)  # also uw2* and UW7: hops 13-Apr-98
                # tested with osr5.0.5
                if test "$GCC" != yes; then
                        CC_SHARED_OPTS='-belf -KPIC'
                fi
                # tested with osr5.0.5
                if test "$GCC" != yes; then
                        CC_SHARED_OPTS='-belf -KPIC'
                fi
-               MK_SHARED_LIB='${LD} -dy -G -h `basename $[@] .${REL_VERSION}`.${ABI_VERSION} -o [$]@'
+               MK_SHARED_LIB='${LD} ${LDFLAGS} -dy -G -h `basename $[@] .${REL_VERSION}`.${ABI_VERSION} -o [$]@'
                if test "$cf_cv_enable_rpath" = yes ; then
                        # only way is to set LD_RUN_PATH but no switch for it
                        RUN_PATH=$libdir
                if test "$cf_cv_enable_rpath" = yes ; then
                        # only way is to set LD_RUN_PATH but no switch for it
                        RUN_PATH=$libdir
@@ -5494,15 +6433,15 @@ CF_EOF
                LINK_PROGS='LD_RUN_PATH=${libdir}'
                LINK_TESTS='Pwd=`pwd`;LD_RUN_PATH=`dirname $${Pwd}`/lib'
                ;;
                LINK_PROGS='LD_RUN_PATH=${libdir}'
                LINK_TESTS='Pwd=`pwd`;LD_RUN_PATH=`dirname $${Pwd}`/lib'
                ;;
-       sunos4*) #(vi
+       (sunos4*)
                # tested with SunOS 4.1.1 and gcc 2.7.0
                if test "$GCC" != yes; then
                        CC_SHARED_OPTS='-KPIC'
                fi
                # tested with SunOS 4.1.1 and gcc 2.7.0
                if test "$GCC" != yes; then
                        CC_SHARED_OPTS='-KPIC'
                fi
-               MK_SHARED_LIB='${LD} -assert pure-text -o $[@]'
+               MK_SHARED_LIB='${LD} ${LDFLAGS} -assert pure-text -o $[@]'
                test "$cf_cv_shlib_version" = auto && cf_cv_shlib_version=rel
                ;;
                test "$cf_cv_shlib_version" = auto && cf_cv_shlib_version=rel
                ;;
-       solaris2*) #(vi
+       (solaris2*)
                # tested with SunOS 5.5.1 (solaris 2.5.1) and gcc 2.7.2
                # tested with SunOS 5.10 (solaris 10) and gcc 3.4.3
                if test "$DFT_LWR_MODEL" = "shared" ; then
                # tested with SunOS 5.5.1 (solaris 2.5.1) and gcc 2.7.2
                # tested with SunOS 5.10 (solaris 10) and gcc 3.4.3
                if test "$DFT_LWR_MODEL" = "shared" ; then
@@ -5522,42 +6461,71 @@ CF_EOF
                        done
                        CFLAGS="$cf_save_CFLAGS"
                        CC_SHARED_OPTS=$cf_shared_opts
                        done
                        CFLAGS="$cf_save_CFLAGS"
                        CC_SHARED_OPTS=$cf_shared_opts
-                       MK_SHARED_LIB='${CC} -dy -G -h '$cf_cv_shared_soname' -o $[@]'
+                       MK_SHARED_LIB='${CC} ${LDFLAGS} ${CFLAGS} -dy -G -h '$cf_cv_shared_soname' -o $[@]'
                else
                else
-                       MK_SHARED_LIB='${CC} -shared -dy -G -h '$cf_cv_shared_soname' -o $[@]'
+                       MK_SHARED_LIB='${CC} ${LDFLAGS} ${CFLAGS} -shared -dy -G -h '$cf_cv_shared_soname' -o $[@]'
                fi
                ;;
                fi
                ;;
-       sysv5uw7*|unix_sv*) #(vi
+       (sysv5uw7*|unix_sv*)
                # tested with UnixWare 7.1.0 (gcc 2.95.2 and cc)
                if test "$GCC" != yes; then
                        CC_SHARED_OPTS='-KPIC'
                fi
                # tested with UnixWare 7.1.0 (gcc 2.95.2 and cc)
                if test "$GCC" != yes; then
                        CC_SHARED_OPTS='-KPIC'
                fi
-               MK_SHARED_LIB='${LD} -d y -G -o [$]@'
+               MK_SHARED_LIB='${LD} ${LDFLAGS} -d y -G -o [$]@'
                ;;
                ;;
-       *)
+       (*)
                CC_SHARED_OPTS='unknown'
                MK_SHARED_LIB='echo unknown'
                ;;
        esac
 
        # This works if the last tokens in $MK_SHARED_LIB are the -o target.
                CC_SHARED_OPTS='unknown'
                MK_SHARED_LIB='echo unknown'
                ;;
        esac
 
        # This works if the last tokens in $MK_SHARED_LIB are the -o target.
-       case "$cf_cv_shlib_version" in #(vi
-       rel|abi)
-               case "$MK_SHARED_LIB" in #(vi
-               *'-o $[@]') #(vi
+       case "$cf_cv_shlib_version" in
+       (rel|abi)
+               case "$MK_SHARED_LIB" in
+               (*'-o $[@]')
                        test "$cf_cv_do_symlinks" = no && cf_cv_do_symlinks=yes
                        ;;
                        test "$cf_cv_do_symlinks" = no && cf_cv_do_symlinks=yes
                        ;;
-               *)
+               (*)
                        AC_MSG_WARN(ignored --with-shlib-version)
                        ;;
                esac
                ;;
        esac
 
                        AC_MSG_WARN(ignored --with-shlib-version)
                        ;;
                esac
                ;;
        esac
 
+       if test -n "$cf_try_cflags"
+       then
+cat > conftest.$ac_ext <<EOF
+#line __oline__ "${as_me:-configure}"
+#include <stdio.h>
+int main(int argc, char *argv[[]])
+{
+       printf("hello\n");
+       return (argv[[argc-1]] == 0) ;
+}
+EOF
+               cf_save_CFLAGS="$CFLAGS"
+               for cf_opt in $cf_try_cflags
+               do
+                       CFLAGS="$cf_save_CFLAGS -$cf_opt"
+                       AC_MSG_CHECKING(if CFLAGS option -$cf_opt works)
+                       if AC_TRY_EVAL(ac_compile); then
+                               AC_MSG_RESULT(yes)
+                               cf_save_CFLAGS="$CFLAGS"
+                       else
+                               AC_MSG_RESULT(no)
+                       fi
+               done
+               CFLAGS="$cf_save_CFLAGS"
+       fi
+
+
        # RPATH_LIST is a colon-separated list of directories
        test -n "$cf_ld_rpath_opt" && MK_SHARED_LIB="$MK_SHARED_LIB $cf_ld_rpath_opt\${RPATH_LIST}"
        test -z "$RPATH_LIST" && RPATH_LIST="\${libdir}"
 
        # RPATH_LIST is a colon-separated list of directories
        test -n "$cf_ld_rpath_opt" && MK_SHARED_LIB="$MK_SHARED_LIB $cf_ld_rpath_opt\${RPATH_LIST}"
        test -z "$RPATH_LIST" && RPATH_LIST="\${libdir}"
 
+       test $cf_cv_rm_so_locs = yes && RM_SHARED_OPTS="$RM_SHARED_OPTS so_locations"
+
        CF_VERBOSE(CC_SHARED_OPTS: $CC_SHARED_OPTS)
        CF_VERBOSE(MK_SHARED_LIB:  $MK_SHARED_LIB)
 
        CF_VERBOSE(CC_SHARED_OPTS: $CC_SHARED_OPTS)
        CF_VERBOSE(MK_SHARED_LIB:  $MK_SHARED_LIB)
 
@@ -5565,11 +6533,15 @@ CF_EOF
        AC_SUBST(LD_RPATH_OPT)
        AC_SUBST(LD_SHARED_OPTS)
        AC_SUBST(MK_SHARED_LIB)
        AC_SUBST(LD_RPATH_OPT)
        AC_SUBST(LD_SHARED_OPTS)
        AC_SUBST(MK_SHARED_LIB)
+       AC_SUBST(RM_SHARED_OPTS)
+
        AC_SUBST(LINK_PROGS)
        AC_SUBST(LINK_TESTS)
        AC_SUBST(LINK_PROGS)
        AC_SUBST(LINK_TESTS)
+
        AC_SUBST(EXTRA_LDFLAGS)
        AC_SUBST(LOCAL_LDFLAGS)
        AC_SUBST(LOCAL_LDFLAGS2)
        AC_SUBST(EXTRA_LDFLAGS)
        AC_SUBST(LOCAL_LDFLAGS)
        AC_SUBST(LOCAL_LDFLAGS2)
+
        AC_SUBST(INSTALL_LIB)
        AC_SUBST(RPATH_LIST)
 ])dnl
        AC_SUBST(INSTALL_LIB)
        AC_SUBST(RPATH_LIST)
 ])dnl
@@ -5686,23 +6658,27 @@ AC_MSG_RESULT($cf_cv_sig_atomic_t)
 test "$cf_cv_sig_atomic_t" != no && AC_DEFINE_UNQUOTED(SIG_ATOMIC_T, $cf_cv_sig_atomic_t,[Define to signal global datatype])
 ])dnl
 dnl ---------------------------------------------------------------------------
 test "$cf_cv_sig_atomic_t" != no && AC_DEFINE_UNQUOTED(SIG_ATOMIC_T, $cf_cv_sig_atomic_t,[Define to signal global datatype])
 ])dnl
 dnl ---------------------------------------------------------------------------
-dnl CF_SIZECHANGE version: 9 updated: 2012/10/06 11:17:15
+dnl CF_SIZECHANGE version: 14 updated: 2018/06/20 20:23:13
 dnl -------------
 dnl Check for definitions & structures needed for window size-changing
 dnl -------------
 dnl Check for definitions & structures needed for window size-changing
-dnl FIXME: check that this works with "snake" (HP-UX 10.x)
+dnl
+dnl https://stackoverflow.com/questions/18878141/difference-between-structures-ttysize-and-winsize/50769952#50769952
 AC_DEFUN([CF_SIZECHANGE],
 [
 AC_REQUIRE([CF_STRUCT_TERMIOS])
 AC_CACHE_CHECK(declaration of size-change, cf_cv_sizechange,[
 AC_DEFUN([CF_SIZECHANGE],
 [
 AC_REQUIRE([CF_STRUCT_TERMIOS])
 AC_CACHE_CHECK(declaration of size-change, cf_cv_sizechange,[
-    cf_cv_sizechange=unknown
-    cf_save_CPPFLAGS="$CPPFLAGS"
+       cf_cv_sizechange=unknown
+       cf_save_CPPFLAGS="$CPPFLAGS"
 
 for cf_opts in "" "NEED_PTEM_H"
 do
 
 
 for cf_opts in "" "NEED_PTEM_H"
 do
 
-    CPPFLAGS="$cf_save_CPPFLAGS"
-    test -n "$cf_opts" && CPPFLAGS="$CPPFLAGS -D$cf_opts"
-    AC_TRY_COMPILE([#include <sys/types.h>
+       CPPFLAGS="$cf_save_CPPFLAGS"
+       if test -n "$cf_opts"
+       then
+               CF_APPEND_TEXT(CPPFLAGS,-D$cf_opts)
+       fi
+       AC_TRY_COMPILE([#include <sys/types.h>
 #ifdef HAVE_TERMIOS_H
 #include <termios.h>
 #else
 #ifdef HAVE_TERMIOS_H
 #include <termios.h>
 #else
@@ -5710,24 +6686,26 @@ do
 #include <termio.h>
 #endif
 #endif
 #include <termio.h>
 #endif
 #endif
+
 #ifdef NEED_PTEM_H
 /* This is a workaround for SCO:  they neglected to define struct winsize in
  * termios.h -- it's only in termio.h and ptem.h
  */
 #ifdef NEED_PTEM_H
 /* This is a workaround for SCO:  they neglected to define struct winsize in
  * termios.h -- it's only in termio.h and ptem.h
  */
-#include        <sys/stream.h>
-#include        <sys/ptem.h>
+#include <sys/stream.h>
+#include <sys/ptem.h>
 #endif
 #endif
-#if !defined(sun) || !defined(HAVE_TERMIOS_H)
+
+#ifdef HAVE_SYS_IOCTL_H
 #include <sys/ioctl.h>
 #endif
 ],[
 #ifdef TIOCGSIZE
 #include <sys/ioctl.h>
 #endif
 ],[
 #ifdef TIOCGSIZE
-       struct ttysize win;     /* FIXME: what system is this? */
+       struct ttysize win;     /* SunOS 3.0... */
        int y = win.ts_lines;
        int x = win.ts_cols;
 #else
 #ifdef TIOCGWINSZ
        int y = win.ts_lines;
        int x = win.ts_cols;
 #else
 #ifdef TIOCGWINSZ
-       struct winsize win;
+       struct winsize win;