Changeset 5a377a7 for patches


Ignore:
Timestamp:
Jan 5, 2009, 3:41:52 AM (16 years ago)
Author:
Jim Gifford <clfs@…>
Branches:
clfs-1.2, clfs-2.1, clfs-3.0.0-systemd, clfs-3.0.0-sysvinit, master, systemd, sysvinit
Children:
902b794
Parents:
c75433a
Message:

Ncurses Branch Patch Updated to -3

File:
1 moved

Legend:

Unmodified
Added
Removed

  • patches/ncurses-5.7-branch_update-3.patch

    rc75433a r5a377a7  
    1 Submitted By: Jim Gifford (jim at linuxfromscratch dot org)
    2 Date: 12-29-2008
     1Submitted By: Jim Gifford (jim at cross-lfs dot org)
     2Date: 01-05-2009
    33Initial Package Version: 5.7
    44Origin: Upstream
    55Upstream Status: Applied
    66Description: This is a branch update for NCurses-5.7, and should be
    7              rechecked periodically. This patch covers up to 5.7-20081227.
     7             rechecked periodically. This patch covers up to 5.7-20090104.
    88
    99diff -Naur ncurses-5.7.orig/Ada95/samples/Makefile.in ncurses-5.7/Ada95/samples/Makefile.in
    1010--- ncurses-5.7.orig/Ada95/samples/Makefile.in  2006-12-17 08:45:02.000000000 -0800
    11 +++ ncurses-5.7/Ada95/samples/Makefile.in       2008-12-29 20:11:45.000000000 -0800
     11+++ ncurses-5.7/Ada95/samples/Makefile.in       2009-01-05 03:38:57.000000000 -0800
    1212@@ -1,5 +1,5 @@
    1313 ##############################################################################
    … …  
    3535 distclean :: clean
    3636        rm -f Makefile
     37diff -Naur ncurses-5.7.orig/Ada95/src/Makefile.in ncurses-5.7/Ada95/src/Makefile.in
     38--- ncurses-5.7.orig/Ada95/src/Makefile.in      2007-09-15 11:22:24.000000000 -0700
     39+++ ncurses-5.7/Ada95/src/Makefile.in   2009-01-05 03:39:10.000000000 -0800
     40@@ -1,5 +1,5 @@
     41 ##############################################################################
     42-# Copyright (c) 1998-2003,2004 Free Software Foundation, Inc.                #
     43+# Copyright (c) 1998-2007,2009 Free Software Foundation, Inc.                #
     44 #                                                                            #
     45 # Permission is hereby granted, free of charge, to any person obtaining a    #
     46 # copy of this software and associated documentation files (the "Software"), #
     47@@ -28,7 +28,7 @@
     48 #
     49 #  Author:  Juergen Pfeifer, 1996
     50 #
     51-#  $Id: Makefile.in,v 1.31 2007/09/15 18:22:24 tom Exp $
     52+#  $Id: Makefile.in,v 1.32 2009/01/03 19:12:01 tom Exp $
     53 #
     54 .SUFFIXES:
     55 
     56@@ -46,7 +46,7 @@
     57 INSTALL_DATA   = @INSTALL_DATA@
     58 
     59 AR             = @AR@
     60-AR_OPTS                = @AR_OPTS@
     61+ARFLAGS                = @ARFLAGS@
     62 AWK            = @AWK@
     63 LN_S           = @LN_S@
     64 
     65@@ -168,7 +168,7 @@
     66        @echo done
     67 
     68 libAdaCurses.a :: dotouch $(LIBOBJS) @cf_generic_objects@
     69-       $(AR) $(AR_OPTS) $@ $(LIBOBJS) @cf_generic_objects@
     70+       $(AR) $(ARFLAGS) $@ $(LIBOBJS) @cf_generic_objects@
     71 
     72 dotouch :
     73        @sh -c 'for f in $(LIBALIS) $(GENALIS); do test -f $$f || touch $$f; done'
    3774diff -Naur ncurses-5.7.orig/Ada95/src/terminal_interface-curses-mouse.adb ncurses-5.7/Ada95/src/terminal_interface-curses-mouse.adb
    3875--- ncurses-5.7.orig/Ada95/src/terminal_interface-curses-mouse.adb      2008-07-26 11:51:11.000000000 -0700
    39 +++ ncurses-5.7/Ada95/src/terminal_interface-curses-mouse.adb   2008-12-29 20:11:45.000000000 -0800
     76+++ ncurses-5.7/Ada95/src/terminal_interface-curses-mouse.adb   2009-01-05 03:38:57.000000000 -0800
    4077@@ -35,8 +35,8 @@
    4178 ------------------------------------------------------------------------------
    … …  
    6097diff -Naur ncurses-5.7.orig/INSTALL ncurses-5.7/INSTALL
    6198--- ncurses-5.7.orig/INSTALL    2008-11-02 13:13:51.000000000 -0800
    62 +++ ncurses-5.7/INSTALL 2008-12-29 20:11:42.000000000 -0800
     99+++ ncurses-5.7/INSTALL 2009-01-05 03:39:10.000000000 -0800
     100@@ -1,5 +1,5 @@
     101 -------------------------------------------------------------------------------
     102--- Copyright (c) 1998-2006,2008 Free Software Foundation, Inc.               --
     103+-- Copyright (c) 1998-2008,2009 Free Software Foundation, Inc.               --
     104 --                                                                           --
     105 -- Permission is hereby granted, free of charge, to any person obtaining a   --
     106 -- copy of this software and associated documentation files (the             --
    63107@@ -25,7 +25,7 @@
    64108 -- sale, use or other dealings in this Software without prior written        --
    … …  
    66110 -------------------------------------------------------------------------------
    67111--- $Id: INSTALL,v 1.135 2008/11/02 21:13:51 tom Exp $
    68 +-- $Id: INSTALL,v 1.136 2008/11/08 16:05:02 tom Exp $
     112+-- $Id: INSTALL,v 1.137 2009/01/03 23:59:23 tom Exp $
    69113 ---------------------------------------------------------------------
    70114              How to install Ncurses/Terminfo on your system
    71115 ---------------------------------------------------------------------
    72 @@ -975,6 +975,9 @@
     116@@ -525,6 +525,11 @@
     117        terminfo entries.  This is the default, unless you have disabled the
     118        extended functions.
     119 
     120+    --enable-pc-files
     121+       If pkg-config is found (see --with-pkg-config), generate ".pc" files
     122+       for each of the libraries, and install them in pkg-config's library
     123+       directory.
     124+
     125     --enable-reentrant
     126        Compile experimental configuration which improves reentrant use of the
     127        library by reducing global and static variables.  This option is also
     128@@ -850,6 +855,9 @@
     129        those using termcap, do not use the higher speeds.  Your application
     130        (or system, in general) may or may not.
     131 
     132+    --with-pkg-config=[DIR]
     133+       Check for pkg-config, optionally specifying its path.
     134+
     135     --with-profile
     136        Generate profile-libraries These are named by adding "_p" to the root,
     137        e.g., libncurses_p.a
     138@@ -975,6 +983,9 @@
    73139     --without-dlsym
    74140        Do not use dlsym() to load GPM dynamically.
    … …  
    82148diff -Naur ncurses-5.7.orig/MANIFEST ncurses-5.7/MANIFEST
    83149--- ncurses-5.7.orig/MANIFEST   2008-10-25 16:47:24.000000000 -0700
    84 +++ ncurses-5.7/MANIFEST        2008-12-29 20:11:58.000000000 -0800
     150+++ ncurses-5.7/MANIFEST        2009-01-05 03:39:10.000000000 -0800
    85151@@ -640,6 +640,7 @@
    86152 ./man/ncurses.3x
    … …  
    91157 ./man/term.7
    92158 ./man/terminfo.head
    93 @@ -947,6 +948,7 @@
     159@@ -694,6 +695,7 @@
     160 ./misc/emx.src
     161 ./misc/form.def
     162 ./misc/form.ref
     163+./misc/gen-pkgconfig.in
     164 ./misc/gen_edit.sh
     165 ./misc/jpf-indent
     166 ./misc/makedef.cmd
     167@@ -947,6 +949,7 @@
    94168 ./progs/infocmp.c
    95169 ./progs/modules
    … …  
    99173 ./progs/toe.c
    100174 ./progs/tput.c
    101 @@ -963,6 +965,7 @@
     175@@ -963,6 +966,7 @@
    102176 ./test/cardfile.c
    103177 ./test/cardfile.dat
    … …  
    107181 ./test/configure
    108182 ./test/configure.in
    109 @@ -990,6 +993,7 @@
     183@@ -990,6 +994,7 @@
    110184 ./test/inch_wide.c
    111185 ./test/inchs.c
    … …  
    117191diff -Naur ncurses-5.7.orig/NEWS ncurses-5.7/NEWS
    118192--- ncurses-5.7.orig/NEWS       2008-11-01 17:56:22.000000000 -0700
    119 +++ ncurses-5.7/NEWS    2008-12-29 20:12:06.000000000 -0800
     193+++ ncurses-5.7/NEWS    2009-01-05 03:39:12.000000000 -0800
     194@@ -1,5 +1,5 @@
     195 -------------------------------------------------------------------------------
     196--- Copyright (c) 1998-2007,2008 Free Software Foundation, Inc.               --
     197+-- Copyright (c) 1998-2008,2009 Free Software Foundation, Inc.               --
     198 --                                                                           --
     199 -- Permission is hereby granted, free of charge, to any person obtaining a   --
     200 -- copy of this software and associated documentation files (the             --
    120201@@ -25,7 +25,7 @@
    121202 -- sale, use or other dealings in this Software without prior written        --
    … …  
    123204 -------------------------------------------------------------------------------
    124205--- $Id: NEWS,v 1.1320 2008/11/02 00:56:22 tom Exp $
    125 +-- $Id: NEWS,v 1.1344 2008/12/28 01:14:55 tom Exp $
     206+-- $Id: NEWS,v 1.1351 2009/01/04 22:43:22 tom Exp $
    126207 -------------------------------------------------------------------------------
    127208 
    128209 This is a log of changes that ncurses has gone through since Zeyd started
    129 @@ -45,6 +45,75 @@
     210@@ -45,6 +45,97 @@
    130211 Changes through 1.9.9e did not credit all contributions;
    131212 it is not possible to add this information.
    132213 
     214+20090104
     215+       + modify gen-pkgconfig.in to eliminate a dependency on rpath when
     216+         deciding whether to add $LIBS to --libs output; that should be shown
     217+         for the ncurses and tinfo libraries without taking rpath into
     218+         account.
     219+       + fix an overlooked change from $AR_OPTS to $ARFLAGS in mk-1st.awk,
     220+         used in static libraries (report by Marty Jack).
     221+
     222+20090103
     223+       + add a configure-time check to pick a suitable value for
     224+         CC_SHARED_OPTS for Solaris (report by Dagobert Michelsen).
     225+       + add configure --with-pkg-config and --enable-pc-files options, along
     226+         with misc/gen-pkgconfig.in which can be used to generate ".pc" files
     227+         for pkg-config (request by Jan Engelhardt).
     228+       + use $includedir symbol in misc/ncurses-config.in, add --includedir
     229+         option.
     230+       + change makefiles to use $ARFLAGS rather than $AR_OPTS, provide a
     231+         configure check to detect whether a "-" is needed before "ar"
     232+         options.
     233+       + update config.guess, config.sub from
     234+               http://savannah.gnu.org/projects/config
     235+
    133236+20081227
    134237+       + modify mk-1st.awk to work with extra categories for tinfo library.
    … …  
    205308diff -Naur ncurses-5.7.orig/TO-DO ncurses-5.7/TO-DO
    206309--- ncurses-5.7.orig/TO-DO      2008-10-11 12:22:27.000000000 -0700
    207 +++ ncurses-5.7/TO-DO   2008-12-29 20:11:47.000000000 -0800
     310+++ ncurses-5.7/TO-DO   2009-01-05 03:38:59.000000000 -0800
    208311@@ -25,7 +25,7 @@
    209312 -- sale, use or other dealings in this Software without prior written        --
    … …  
    283386diff -Naur ncurses-5.7.orig/aclocal.m4 ncurses-5.7/aclocal.m4
    284387--- ncurses-5.7.orig/aclocal.m4 2008-10-25 15:15:32.000000000 -0700
    285 +++ ncurses-5.7/aclocal.m4      2008-12-29 20:12:06.000000000 -0800
     388+++ ncurses-5.7/aclocal.m4      2009-01-05 03:39:10.000000000 -0800
     389@@ -1,5 +1,5 @@
     390 dnl***************************************************************************
     391-dnl Copyright (c) 1998-2007,2008 Free Software Foundation, Inc.              *
     392+dnl Copyright (c) 1998-2008,2009 Free Software Foundation, Inc.              *
     393 dnl                                                                          *
     394 dnl Permission is hereby granted, free of charge, to any person obtaining a  *
     395 dnl copy of this software and associated documentation files (the            *
    286396@@ -28,7 +28,7 @@
    287397 dnl
    … …  
    289399 dnl
    290400-dnl $Id: aclocal.m4,v 1.470 2008/10/25 22:15:32 tom Exp $
    291 +dnl $Id: aclocal.m4,v 1.477 2008/12/27 17:35:01 tom Exp $
     401+dnl $Id: aclocal.m4,v 1.481 2009/01/04 00:11:12 tom Exp $
    292402 dnl Macros used in NCURSES auto-configuration script.
    293403 dnl
    … …  
    324434                  break
    325435                fi
    326 @@ -353,7 +353,7 @@
     436@@ -353,7 +353,41 @@
    327437 fi
    328438 ])dnl
    329439 dnl ---------------------------------------------------------------------------
    330440-dnl CF_AWK_BIG_PRINTF version: 2 updated: 2008/10/04 17:16:18
     441+dnl CF_AR_FLAGS version: 2 updated: 2009/01/01 20:45:18
     442+dnl -----------
     443+dnl Check for suitable "ar" (archiver) options for updating an archive.
     444+AC_DEFUN([CF_AR_FLAGS],[
     445+AC_REQUIRE([CF_PROG_AR])
     446+
     447+AC_CACHE_CHECK(for options to update archives, cf_cv_ar_flags,[
     448+       cf_cv_ar_flags=unknown
     449+       for cf_ar_flags in -curv curv -crv crv -cqv cqv -rv rv
     450+       do
     451+               rm -f conftest.$ac_cv_objext
     452+               rm -f conftest.a
     453+
     454+               cat >conftest.$ac_ext <<EOF
     455+#line __oline__ "configure"
     456+int    testdata[[3]] = { 123, 456, 789 };
     457+EOF
     458+               if AC_TRY_EVAL(ac_compile) ; then
     459+                       $AR $cf_ar_flags conftest.a conftest.$ac_cv_objext 2>&AC_FD_CC 1>/dev/null
     460+                       if test -f conftest.a ; then
     461+                               cf_cv_ar_flags=$cf_ar_flags
     462+                               break
     463+                       fi
     464+               else
     465+                       CF_VERBOSE(cannot compile test-program)
     466+                       break
     467+               fi
     468+       done
     469+       rm -f conftest.a conftest.$ac_ext conftest.$ac_cv_objext
     470+])
     471+
     472+AC_SUBST(ARFLAGS,$cf_cv_ar_flags)
     473+])
     474+dnl ---------------------------------------------------------------------------
    331475+dnl CF_AWK_BIG_PRINTF version: 3 updated: 2008/12/27 12:30:03
    332476 dnl -----------------
    333477 dnl Check if awk can handle big strings using printf.  Some older versions of
    334478 dnl awk choke on large strings passed via "%s".
    335 @@ -362,19 +362,19 @@
     479@@ -362,19 +396,19 @@
    336480 dnl $2 = variable to set with result
    337481 AC_DEFUN([CF_AWK_BIG_PRINTF],
    … …  
    366510 dnl ---------------------------------------------------------------------------
    367511 dnl CF_BOOL_DECL version: 8 updated: 2004/01/30 15:51:18
    368 @@ -1019,7 +1019,7 @@
     512@@ -1019,7 +1053,7 @@
    369513 CXXFLAGS="$cf_save_CXXFLAGS"
    370514 ])
    … …  
    375519 dnl Find a library (specifically the linkage used in the code fragment),
    376520 dnl searching for it if it is not already in the library path.
    377 @@ -1052,6 +1052,7 @@
     521@@ -1052,6 +1086,7 @@
    378522     cf_cv_find_linkage_$3=yes,[
    379523     cf_cv_find_linkage_$3=no
    … …  
    383527 
    384528     cf_save_CPPFLAGS="$CPPFLAGS"
    385 @@ -1998,11 +1999,31 @@
     529@@ -1998,11 +2033,31 @@
    386530 ])
    387531 ])dnl
    … …  
    418562 test "$includedir" != "/usr/include" && \
    419563 test -d "$includedir" && {
    420 @@ -2017,6 +2038,7 @@
     564@@ -2017,6 +2072,7 @@
    421565        test -d $oldincludedir/$2 && $1="[$]$1 $oldincludedir/$2"
    422566 }
    … …  
    426570 dnl ---------------------------------------------------------------------------
    427571 dnl CF_HELP_MESSAGE version: 3 updated: 1998/01/14 10:56:23
    428 @@ -2143,7 +2165,7 @@
     572@@ -2143,7 +2199,7 @@
    429573 ])
    430574 ])
    … …  
    435579 dnl Check for compiler/linker flags used to temporarily force usage of static
    436580 dnl libraries.  This depends on the compiler and platform.  Use this to help
    437 @@ -2153,7 +2175,7 @@
     581@@ -2153,7 +2209,7 @@
    438582 
    439583 if test "$GCC" = yes ; then
    … …  
    444588                LDFLAGS_SHARED=
    445589                ;;
    446 @@ -2164,7 +2186,7 @@
     590@@ -2164,7 +2220,7 @@
    447591     esac
    448592 else
    … …  
    453597                LDFLAGS_SHARED=-bdynamic
    454598                ;;
    455 @@ -2179,7 +2201,7 @@
     599@@ -2179,7 +2235,7 @@
    456600                ;;
    457601        osf[[45]]*)     #( from ld manpage osf4.0d, osf5.1
    … …  
    462606                ;;
    463607        solaris2*)
    464 @@ -2193,11 +2215,33 @@
     608@@ -2193,11 +2249,33 @@
    465609 AC_SUBST(LDFLAGS_SHARED)
    466610 ])
    … …  
    499643 dnl CF_LIB_PREFIX version: 8 updated: 2008/09/13 11:34:16
    500644 dnl -------------
    501 @@ -2216,7 +2260,7 @@
     645@@ -2216,7 +2294,7 @@
    502646        AC_SUBST(LIB_PREFIX)
    503647 ])dnl
    … …  
    508652 dnl Append definitions and rules for the given models to the subdirectory
    509653 dnl Makefiles, and the recursion rule for the top-level Makefile.  If the
    510 @@ -2504,18 +2548,28 @@
     654@@ -2504,18 +2582,28 @@
    511655 install.libs uninstall.libs \\
    512656 install.data uninstall.data ::
    … …  
    537681 if test -f $srcdir/$tack.h; then
    538682 cat >> Makefile <<CF_EOF
    539 @@ -2526,6 +2580,7 @@
     683@@ -2526,6 +2614,7 @@
    540684 CF_EOF
    541685 fi
    … …  
    545689 dnl If we're installing into a subdirectory of /usr/include, etc., we should
    546690 dnl prepend the subdirectory's name to the "#include" paths.  It won't hurt
    547 @@ -2679,7 +2734,7 @@
     691@@ -2679,7 +2768,7 @@
    548692 ])
    549693 ])
    … …  
    554698 dnl Compute the library file-suffix from the given model name
    555699 dnl $1 = model name
    556 @@ -2689,40 +2744,44 @@
     700@@ -2689,40 +2778,44 @@
    557701 AC_DEFUN([CF_LIB_SUFFIX],
    558702 [
    … …  
    610754                                $3=[$]$2
    611755                                ;;
    612 @@ -4003,7 +4062,7 @@
     756@@ -2755,7 +2848,7 @@
     757        test -n "$LIB_SUFFIX" && $2="${LIB_SUFFIX}[$]{$2}"
     758 ])dnl
     759 dnl ---------------------------------------------------------------------------
     760-dnl CF_LINK_DATAONLY version: 8 updated: 2006/12/16 12:33:30
     761+dnl CF_LINK_DATAONLY version: 9 updated: 2009/01/01 20:21:38
     762 dnl ----------------
     763 dnl Some systems have a non-ANSI linker that doesn't pull in modules that have
     764 dnl only data (i.e., no functions), for example NeXT.  On those systems we'll
     765@@ -2772,7 +2865,7 @@
     766 EOF
     767        if AC_TRY_EVAL(ac_compile) ; then
     768                mv conftest.o data.o && \
     769-               ( $AR $AR_OPTS conftest.a data.o ) 2>&AC_FD_CC 1>/dev/null
     770+               ( $AR $ARFLAGS conftest.a data.o ) 2>&AC_FD_CC 1>/dev/null
     771        fi
     772        rm -f conftest.$ac_ext data.o
     773        cat >conftest.$ac_ext <<EOF
     774@@ -2791,7 +2884,7 @@
     775 EOF
     776        if AC_TRY_EVAL(ac_compile); then
     777                mv conftest.o func.o && \
     778-               ( $AR $AR_OPTS conftest.a func.o ) 2>&AC_FD_CC 1>/dev/null
     779+               ( $AR $ARFLAGS conftest.a func.o ) 2>&AC_FD_CC 1>/dev/null
     780        fi
     781        rm -f conftest.$ac_ext func.o
     782        ( eval $RANLIB conftest.a ) 2>&AC_FD_CC >/dev/null
     783@@ -3737,6 +3830,38 @@
     784 esac
     785 ])dnl
     786 dnl ---------------------------------------------------------------------------
     787+dnl CF_PKG_CONFIG version: 2 updated: 2008/12/24 07:57:28
     788+dnl -------------
     789+dnl Check for the package-config program, unless disabled by command-line.
     790+AC_DEFUN([CF_PKG_CONFIG],
     791+[
     792+AC_MSG_CHECKING(if you want to use pkg-config)
     793+AC_ARG_WITH(pkg-config,
     794+       [  --with-pkg-config{=path} enable/disable use of pkg-config],
     795+       [cf_pkg_config=$withval],
     796+       [cf_pkg_config=yes])
     797+AC_MSG_RESULT($cf_pkg_config)
     798+
     799+case $cf_pkg_config in
     800+no)
     801+       PKG_CONFIG=none
     802+       ;;
     803+yes)
     804+       AC_PATH_PROG(PKG_CONFIG, pkg-config, none)
     805+       ;;
     806+*)
     807+       PKG_CONFIG=$withval
     808+       ;;
     809+esac
     810+
     811+test -z "$PKG_CONFIG" && PKG_CONFIG=none
     812+if test "$PKG_CONFIG" != none ; then
     813+       CF_PATH_SYNTAX(PKG_CONFIG)
     814+fi
     815+
     816+AC_SUBST(PKG_CONFIG)
     817+])dnl
     818+dnl ---------------------------------------------------------------------------
     819 dnl CF_POSIX_C_SOURCE version: 6 updated: 2005/07/14 20:25:10
     820 dnl -----------------
     821 dnl Define _POSIX_C_SOURCE to the given level, and _POSIX_SOURCE if needed.
     822@@ -3872,6 +3997,13 @@
     823 
     824 ])dnl
     825 dnl ---------------------------------------------------------------------------
     826+dnl CF_PROG_AR version: 1 updated: 2009/01/01 20:15:22
     827+dnl ----------
     828+dnl Check for archiver "ar".
     829+AC_DEFUN([CF_PROG_AR],[
     830+AC_CHECK_TOOL(AR, ar, ar)
     831+])
     832+dnl ---------------------------------------------------------------------------
     833 dnl CF_PROG_AWK version: 1 updated: 2006/09/16 11:40:59
     834 dnl -----------
     835 dnl Check for awk, ensure that the check found something.
     836@@ -4003,7 +4135,7 @@
    613837 esac
    614838 ])dnl
    … …  
    619843 dnl Check for ldconfig, needed to fixup shared libraries that would be built
    620844 dnl and then used in the install.
    621 @@ -4012,7 +4071,7 @@
     845@@ -4012,7 +4144,7 @@
    622846   LDCONFIG=:
    623847 else
    … …  
    628852   ;;
    629853 *) LDPATH=$PATH:/sbin:/usr/sbin
    630 @@ -4147,7 +4206,7 @@
     854@@ -4147,7 +4279,7 @@
    631855 fi
    632856 ])dnl
    633857 dnl ---------------------------------------------------------------------------
    634858-dnl CF_SHARED_OPTS version: 53 updated: 2008/10/25 18:14:20
    635 +dnl CF_SHARED_OPTS version: 54 updated: 2008/12/27 12:30:03
     859+dnl CF_SHARED_OPTS version: 56 updated: 2009/01/03 19:10:38
    636860 dnl --------------
    637861 dnl --------------
    638862 dnl Attempt to determine the appropriate CC/LD options for creating a shared
    639 @@ -4219,6 +4278,12 @@
     863@@ -4176,6 +4308,7 @@
     864        AC_REQUIRE([CF_SUBST_NCURSES_VERSION])
     865        LOCAL_LDFLAGS=
     866        LOCAL_LDFLAGS2=
     867+       LD_RPATH_OPT=
     868        LD_SHARED_OPTS=
     869        INSTALL_LIB="-m 644"
     870 
     871@@ -4219,6 +4352,12 @@
    640872        cf_cv_shlib_version_infix=no
    641873 
    … …  
    650882                MK_SHARED_LIB='${CC} ${CFLAGS} -o $[@] -Xlinker -soname=`basename $[@]` -nostart -e 0'
    651883                ;;
    652 @@ -4239,7 +4304,7 @@
     884@@ -4239,7 +4378,7 @@
    653885 EOF
    654886                exec \[$]* -shared -Wl,--out-implib=../lib/\[$]{IMPORT_LIB} -Wl,--export-all-symbols -o ../lib/\[$]{SHARED_LIB}
    … …  
    659891        darwin*)
    660892                EXTRA_CFLAGS="-no-cpp-precomp"
    661 @@ -4642,7 +4707,7 @@
     893@@ -4272,10 +4411,10 @@
     894        irix*)
     895                if test "$cf_cv_ld_rpath" = yes ; then
     896                        if test "$GCC" = yes; then
     897-                               cf_ld_rpath_opt="-Wl,-rpath,"
     898+                               LD_RPATH_OPT="-Wl,-rpath,"
     899                                EXTRA_LDFLAGS="-Wl,-rpath,\${libdir} $EXTRA_LDFLAGS"
     900                        else
     901-                               cf_ld_rpath_opt="-rpath "
     902+                               LD_RPATH_OPT="-rpath "
     903                                EXTRA_LDFLAGS="-rpath \${libdir} $EXTRA_LDFLAGS"
     904                        fi
     905                fi
     906@@ -4294,7 +4433,7 @@
     907                        LOCAL_LDFLAGS2="$LOCAL_LDFLAGS"
     908                fi
     909                if test "$cf_cv_ld_rpath" = yes ; then
     910-                       cf_ld_rpath_opt="-Wl,-rpath,"
     911+                       LD_RPATH_OPT="-Wl,-rpath,"
     912                        EXTRA_LDFLAGS="-Wl,-rpath,\${libdir} $EXTRA_LDFLAGS"
     913                fi
     914                CF_SHARED_SONAME
     915@@ -4306,7 +4445,7 @@
     916                        LOCAL_LDFLAGS2="$LOCAL_LDFLAGS"
     917                fi
     918                if test "$cf_cv_ld_rpath" = yes ; then
     919-                       cf_ld_rpath_opt="-Wl,-rpath,"
     920+                       LD_RPATH_OPT="-Wl,-rpath,"
     921                        EXTRA_LDFLAGS="-Wl,-rpath,\${libdir} $EXTRA_LDFLAGS"
     922                fi
     923                CC_SHARED_OPTS="$CC_SHARED_OPTS -DPIC"
     924@@ -4323,7 +4462,7 @@
     925                if test "$DFT_LWR_MODEL" = "shared" && test "$cf_cv_ld_rpath" = yes ; then
     926                        LOCAL_LDFLAGS="-rpath \$(LOCAL_LIBDIR)"
     927                        LOCAL_LDFLAGS2="-rpath \${libdir} $LOCAL_LDFLAGS"
     928-                       cf_ld_rpath_opt="-rpath "
     929+                       LD_RPATH_OPT="-rpath "
     930                        EXTRA_LDFLAGS="-rpath \${libdir} $EXTRA_LDFLAGS"
     931                fi
     932                CF_SHARED_SONAME
     933@@ -4331,7 +4470,7 @@
     934                ;;
     935        netbsd*)
     936                CC_SHARED_OPTS="$CC_SHARED_OPTS -DPIC"
     937-               test "$cf_cv_ld_rpath" = yes && cf_ld_rpath_opt="-Wl,-rpath,"
     938+               test "$cf_cv_ld_rpath" = yes && LD_RPATH_OPT="-Wl,-rpath,"
     939                if test "$DFT_LWR_MODEL" = "shared" && test "$cf_cv_ld_rpath" = yes ; then
     940                        LOCAL_LDFLAGS="-Wl,-rpath,\$(LOCAL_LIBDIR)"
     941                        LOCAL_LDFLAGS2="$LOCAL_LDFLAGS"
     942@@ -4365,7 +4504,7 @@
     943                        LOCAL_LDFLAGS2="$LOCAL_LDFLAGS"
     944                fi
     945                if test "$cf_cv_ld_rpath" = yes ; then
     946-                       cf_ld_rpath_opt="-rpath"
     947+                       LD_RPATH_OPT="-rpath"
     948                        # EXTRA_LDFLAGS="$LOCAL_LDFLAGS $EXTRA_LDFLAGS"
     949                fi
     950                cf_cv_rm_so_locs=yes
     951@@ -4400,12 +4539,19 @@
     952                        LOCAL_LDFLAGS2="$LOCAL_LDFLAGS"
     953                fi
     954                if test "$cf_cv_ld_rpath" = yes ; then
     955-                       cf_ld_rpath_opt="-R"
     956+                       LD_RPATH_OPT="-R"
     957                        EXTRA_LDFLAGS="$LOCAL_LDFLAGS $EXTRA_LDFLAGS"
     958                fi
     959                CF_SHARED_SONAME
     960                if test "$GCC" != yes; then
     961-                       CC_SHARED_OPTS='-xcode=pic32'
     962+                       cf_save_CFLAGS="$CFLAGS"
     963+                       for cf_shared_opts in -xcode=pic13 -xcode=pic32 -Kpic -KPIC -O
     964+                       do
     965+                               CFLAGS="$cf_shared_opts $cf_save_CFLAGS"
     966+                               AC_TRY_COMPILE([#include <stdio.h>],[printf("Hello\n");],[break])
     967+                       done
     968+                       CFLAGS="$cf_save_CFLAGS"
     969+                       CC_SHARED_OPTS=$cf_shared_opts
     970                        MK_SHARED_LIB='${CC} -dy -G -h '$cf_cv_shared_soname' -o $[@]'
     971                else
     972                        MK_SHARED_LIB='${CC} -shared -dy -G -h '$cf_cv_shared_soname' -o $[@]'
     973@@ -4438,18 +4584,19 @@
     974                ;;
     975        esac
     976 
     977-       if test -n "$cf_ld_rpath_opt" ; then
     978+       if test -n "$LD_RPATH_OPT" ; then
     979                AC_MSG_CHECKING(if we need a space after rpath option)
     980                cf_save_LIBS="$LIBS"
     981-               LIBS="$LIBS ${cf_ld_rpath_opt}$libdir"
     982+               LIBS="$LIBS ${LD_RPATH_OPT}$libdir"
     983                AC_TRY_LINK(, , cf_rpath_space=no, cf_rpath_space=yes)
     984                LIBS="$cf_save_LIBS"
     985                AC_MSG_RESULT($cf_rpath_space)
     986-               test "$cf_rpath_space" = yes && cf_ld_rpath_opt="$cf_ld_rpath_opt "
     987-               MK_SHARED_LIB="$MK_SHARED_LIB $cf_ld_rpath_opt\${libdir}"
     988+               test "$cf_rpath_space" = yes && LD_RPATH_OPT="$LD_RPATH_OPT "
     989+               MK_SHARED_LIB="$MK_SHARED_LIB $LD_RPATH_OPT\${libdir}"
     990        fi
     991 
     992        AC_SUBST(CC_SHARED_OPTS)
     993+       AC_SUBST(LD_RPATH_OPT)
     994        AC_SUBST(LD_SHARED_OPTS)
     995        AC_SUBST(MK_SHARED_LIB)
     996        AC_SUBST(LINK_PROGS)
     997@@ -4642,7 +4789,7 @@
    662998 fi
    663999 ])dnl
    … …  
    6681004 dnl For each parameter, test if the source-directory exists, and if it contains
    6691005 dnl a 'modules' file.  If so, add to the list $cf_cv_src_modules which we'll
    670 @@ -4717,7 +4782,11 @@
     1006@@ -4717,7 +4864,11 @@
    6711007 AC_SUBST(TEST_ARG2)
    6721008 AC_SUBST(TEST_DEP2)
    … …  
    6811017 do
    6821018        SRC_SUBDIRS="$SRC_SUBDIRS $cf_dir"
    683 @@ -4728,8 +4797,8 @@
     1019@@ -4728,8 +4879,8 @@
    6841020 
    6851021 ADA_SUBDIRS=
    … …  
    6921028 
    6931029 SUB_MAKEFILES=
    694 @@ -4739,11 +4808,11 @@
     1030@@ -4739,11 +4890,11 @@
    6951031 done
    6961032 
    … …  
    7091045 ])dnl
    7101046 dnl ---------------------------------------------------------------------------
    711 @@ -5241,7 +5310,7 @@
     1047@@ -5241,7 +5392,7 @@
    7121048 fi
    7131049 ])
    … …  
    7181054 dnl Provide a configure option to incorporate libtool.  Define several useful
    7191055 dnl symbols for the makefile rules.
    720 @@ -5261,18 +5330,18 @@
     1056@@ -5261,18 +5412,18 @@
    7211057 dnl            echo cannot find libtool.m4 file
    7221058 dnl            exit 1
    … …  
    7411077 dnl
    7421078 AC_DEFUN([CF_WITH_LIBTOOL],
    743 @@ -5306,15 +5375,15 @@
     1079@@ -5306,15 +5457,15 @@
    7441080        AC_PROG_LIBTOOL
    7451081        # missing_content_AC_PROG_LIBTOOL}}
    … …  
    7631099        LIB_CREATE='${LIBTOOL} --mode=link ${CC} -rpath ${DESTDIR}${libdir} -version-info `cut -f1 ${srcdir}/VERSION` ${LIBTOOL_OPTS} -o'
    7641100        LIB_OBJECT='${OBJECTS:.o=.lo}'
    765 @@ -5535,7 +5604,7 @@
     1101@@ -5535,7 +5686,7 @@
    7661102        [USE_VALGRIND])
    7671103 ])dnl
    … …  
    7721108 dnl Try to get _XOPEN_SOURCE defined properly that we can use POSIX functions,
    7731109 dnl or adapt to the vendor's definitions to get equivalent functionality,
    774 @@ -5552,7 +5621,7 @@
     1110@@ -5552,7 +5703,7 @@
    7751111 cf_POSIX_C_SOURCE=ifelse($2,,199506L,$2)
    7761112 
    … …  
    7811117        ;;
    7821118 freebsd*|dragonfly*) #(vi
    783 @@ -5569,7 +5638,7 @@
     1119@@ -5569,7 +5720,7 @@
    7841120 irix[[56]].*) #(vi
    7851121        CPPFLAGS="$CPPFLAGS -D_SGI_SOURCE"
    … …  
    7901126        ;;
    7911127 mirbsd*) #(vi
     1128diff -Naur ncurses-5.7.orig/c++/Makefile.in ncurses-5.7/c++/Makefile.in
     1129--- ncurses-5.7.orig/c++/Makefile.in    2007-04-28 08:29:12.000000000 -0700
     1130+++ ncurses-5.7/c++/Makefile.in 2009-01-05 03:39:10.000000000 -0800
     1131@@ -1,6 +1,6 @@
     1132-# $Id: Makefile.in,v 1.84 2007/04/28 15:29:12 tom Exp $
     1133+# $Id: Makefile.in,v 1.85 2009/01/03 19:10:40 tom Exp $
     1134 ##############################################################################
     1135-# Copyright (c) 1998-2006,2007 Free Software Foundation, Inc.                #
     1136+# Copyright (c) 1998-2007,2009 Free Software Foundation, Inc.                #
     1137 #                                                                            #
     1138 # Permission is hereby granted, free of charge, to any person obtaining a    #
     1139 # copy of this software and associated documentation files (the "Software"), #
     1140@@ -61,10 +61,10 @@
     1141 INSTALL_DATA   = @INSTALL_DATA@
     1142 
     1143 AR             = @AR@
     1144-AR_OPTS                = @AR_OPTS@
     1145+ARFLAGS                = @ARFLAGS@
     1146 
     1147 CXX_AR         = @CXX_AR@
     1148-CXX_AR_OPTS    = @CXX_AR_OPTS@
     1149+CXX_ARFLAGS    = @CXX_ARFLAGS@
     1150 RANLIB         = @LIB_PREP@
     1151 
     1152 CXX            = @CXX@
     1153@@ -153,7 +153,7 @@
     1154        $(MODEL)/cursesmain$o
     1155 
     1156 ../lib/$(LIBNAME_NORMAL) : $(LIB_OBJS)
     1157-       $(CXX_AR) $(CXX_AR_OPTS) $@ $?
     1158+       $(CXX_AR) $(CXX_ARFLAGS) $@ $?
     1159        $(RANLIB) $@
     1160 
     1161 ../lib/$(LIBNAME_LIBTOOL) : $(LIB_OBJS)
    7921162diff -Naur ncurses-5.7.orig/c++/cursesw.cc ncurses-5.7/c++/cursesw.cc
    7931163--- ncurses-5.7.orig/c++/cursesw.cc     2007-12-15 15:01:57.000000000 -0800
    794 +++ ncurses-5.7/c++/cursesw.cc  2008-12-29 20:11:45.000000000 -0800
     1164+++ ncurses-5.7/c++/cursesw.cc  2009-01-05 03:38:57.000000000 -0800
    7951165@@ -1,6 +1,6 @@
    7961166 // * this is for making emacs happy: -*-Mode: C++;-*-
    … …  
    8271197 }
    8281198 #endif
     1199diff -Naur ncurses-5.7.orig/config.guess ncurses-5.7/config.guess
     1200--- ncurses-5.7.orig/config.guess       2008-08-30 13:25:07.000000000 -0700
     1201+++ ncurses-5.7/config.guess    2009-01-05 03:39:10.000000000 -0800
     1202@@ -4,7 +4,7 @@
     1203 #   2000, 2001, 2002, 2003, 2004, 2005, 2006, 2007, 2008
     1204 #   Free Software Foundation, Inc.
     1205 
     1206-timestamp='2008-04-14'
     1207+timestamp='2008-12-19'
     1208 
     1209 # This file is free software; you can redistribute it and/or modify it
     1210 # under the terms of the GNU General Public License as published by
     1211@@ -331,7 +331,20 @@
     1212        echo sparc-sun-solaris2`echo ${UNAME_RELEASE}|sed -e 's/[^.]*//'`
     1213        exit ;;
     1214     i86pc:SunOS:5.*:* | i86xen:SunOS:5.*:*)
     1215-       echo i386-pc-solaris2`echo ${UNAME_RELEASE}|sed -e 's/[^.]*//'`
     1216+       eval $set_cc_for_build
     1217+       SUN_ARCH="i386"
     1218+       # If there is a compiler, see if it is configured for 64-bit objects.
     1219+       # Note that the Sun cc does not turn __LP64__ into 1 like gcc does.
     1220+       # This test works for both compilers.
     1221+       if [ "$CC_FOR_BUILD" != 'no_compiler_found' ]; then
     1222+           if (echo '#ifdef __amd64'; echo IS_64BIT_ARCH; echo '#endif') | \
     1223+               (CCOPTS= $CC_FOR_BUILD -E - 2>/dev/null) | \
     1224+               grep IS_64BIT_ARCH >/dev/null
     1225+           then
     1226+               SUN_ARCH="x86_64"
     1227+           fi
     1228+       fi
     1229+       echo ${SUN_ARCH}-pc-solaris2`echo ${UNAME_RELEASE}|sed -e 's/[^.]*//'`
     1230        exit ;;
     1231     sun4*:SunOS:6*:*)
     1232        # According to config.sub, this is the proper way to canonicalize
     1233@@ -796,7 +809,7 @@
     1234            x86)
     1235                echo i586-pc-interix${UNAME_RELEASE}
     1236                exit ;;
     1237-           EM64T | authenticamd)
     1238+           EM64T | authenticamd | genuineintel)
     1239                echo x86_64-unknown-interix${UNAME_RELEASE}
     1240                exit ;;
     1241            IA64)
     1242@@ -935,6 +948,9 @@
     1243        if test "$?" = 0 ; then LIBC="libc1" ; else LIBC="" ; fi
     1244        echo ${UNAME_MACHINE}-unknown-linux-gnu${LIBC}
     1245        exit ;;
     1246+    padre:Linux:*:*)
     1247+       echo sparc-unknown-linux-gnu
     1248+       exit ;;
     1249     parisc:Linux:*:* | hppa:Linux:*:*)
     1250        # Look for CPU level
     1251        case `grep '^cpu[^a-z]*:' /proc/cpuinfo 2>/dev/null | cut -d' ' -f2` in
     1252@@ -1138,6 +1154,16 @@
     1253     3[34]??:*:4.0:* | 3[34]??,*:*:4.0:*)
     1254         /bin/uname -p 2>/dev/null | grep 86 >/dev/null \
     1255           && { echo i486-ncr-sysv4; exit; } ;;
     1256+    NCR*:*:4.2:* | MPRAS*:*:4.2:*)
     1257+       OS_REL='.3'
     1258+       test -r /etc/.relid \
     1259+           && OS_REL=.`sed -n 's/[^ ]* [^ ]* \([0-9][0-9]\).*/\1/p' < /etc/.relid`
     1260+       /bin/uname -p 2>/dev/null | grep 86 >/dev/null \
     1261+           && { echo i486-ncr-sysv4.3${OS_REL}; exit; }
     1262+       /bin/uname -p 2>/dev/null | /bin/grep entium >/dev/null \
     1263+           && { echo i586-ncr-sysv4.3${OS_REL}; exit; }
     1264+       /bin/uname -p 2>/dev/null | /bin/grep pteron >/dev/null \
     1265+           && { echo i586-ncr-sysv4.3${OS_REL}; exit; } ;;
     1266     m68*:LynxOS:2.*:* | m68*:LynxOS:3.0*:*)
     1267        echo m68k-unknown-lynxos${UNAME_RELEASE}
     1268        exit ;;
     1269diff -Naur ncurses-5.7.orig/config.sub ncurses-5.7/config.sub
     1270--- ncurses-5.7.orig/config.sub 2008-08-30 13:25:02.000000000 -0700
     1271+++ ncurses-5.7/config.sub      2009-01-05 03:39:10.000000000 -0800
     1272@@ -4,7 +4,7 @@
     1273 #   2000, 2001, 2002, 2003, 2004, 2005, 2006, 2007, 2008
     1274 #   Free Software Foundation, Inc.
     1275 
     1276-timestamp='2008-06-16'
     1277+timestamp='2008-12-11'
     1278 
     1279 # This file is (in principle) common to ALL GNU software.
     1280 # The presence of a machine in this file suggests that SOME GNU software
     1281@@ -249,6 +249,7 @@
     1282        | h8300 | h8500 | hppa | hppa1.[01] | hppa2.0 | hppa2.0[nw] | hppa64 \
     1283        | i370 | i860 | i960 | ia64 \
     1284        | ip2k | iq2000 \
     1285+       | lm32 \
     1286        | m32c | m32r | m32rle | m68000 | m68k | m88k \
     1287        | maxq | mb | microblaze | mcore | mep | metag \
     1288        | mips | mipsbe | mipseb | mipsel | mipsle \
     1289@@ -279,7 +280,7 @@
     1290        | powerpc | powerpc64 | powerpc64le | powerpcle | ppcbe \
     1291        | pyramid \
     1292        | score \
     1293-       | sh | sh[1234] | sh[24]a | sh[23]e | sh[34]eb | sheb | shbe | shle | sh[1234]le | sh3ele \
     1294+       | sh | sh[1234] | sh[24]a | sh[24]aeb | sh[23]e | sh[34]eb | sheb | shbe | shle | sh[1234]le | sh3ele \
     1295        | sh64 | sh64le \
     1296        | sparc | sparc64 | sparc64b | sparc64v | sparc86x | sparclet | sparclite \
     1297        | sparcv8 | sparcv9 | sparcv9b | sparcv9v \
     1298@@ -288,7 +289,7 @@
     1299        | v850 | v850e \
     1300        | we32k \
     1301        | x86 | xc16x | xscale | xscalee[bl] | xstormy16 | xtensa \
     1302-       | z8k)
     1303+       | z8k | z80)
     1304                basic_machine=$basic_machine-unknown
     1305                ;;
     1306        m6811 | m68hc11 | m6812 | m68hc12)
     1307@@ -331,6 +332,7 @@
     1308        | hppa-* | hppa1.[01]-* | hppa2.0-* | hppa2.0[nw]-* | hppa64-* \
     1309        | i*86-* | i860-* | i960-* | ia64-* \
     1310        | ip2k-* | iq2000-* \
     1311+       | lm32-* \
     1312        | m32c-* | m32r-* | m32rle-* \
     1313        | m68000-* | m680[012346]0-* | m68360-* | m683?2-* | m68k-* \
     1314        | m88110-* | m88k-* | maxq-* | mcore-* | metag-* \
     1315@@ -362,7 +364,7 @@
     1316        | powerpc-* | powerpc64-* | powerpc64le-* | powerpcle-* | ppcbe-* \
     1317        | pyramid-* \
     1318        | romp-* | rs6000-* \
     1319-       | sh-* | sh[1234]-* | sh[24]a-* | sh[23]e-* | sh[34]eb-* | sheb-* | shbe-* \
     1320+       | sh-* | sh[1234]-* | sh[24]a-* | sh[24]aeb-* | sh[23]e-* | sh[34]eb-* | sheb-* | shbe-* \
     1321        | shle-* | sh[1234]le-* | sh3ele-* | sh64-* | sh64le-* \
     1322        | sparc-* | sparc64-* | sparc64b-* | sparc64v-* | sparc86x-* | sparclet-* \
     1323        | sparclite-* \
     1324@@ -375,7 +377,7 @@
     1325        | x86-* | x86_64-* | xc16x-* | xps100-* | xscale-* | xscalee[bl]-* \
     1326        | xstormy16-* | xtensa*-* \
     1327        | ymp-* \
     1328-       | z8k-*)
     1329+       | z8k-* | z80-*)
     1330                ;;
     1331        # Recognize the basic CPU types without company name, with glob match.
     1332        xtensa*)
     1333@@ -1140,6 +1142,10 @@
     1334                basic_machine=z8k-unknown
     1335                os=-sim
     1336                ;;
     1337+       z80-*-coff)
     1338+               basic_machine=z80-unknown
     1339+               os=-sim
     1340+               ;;
     1341        none)
     1342                basic_machine=none-none
     1343                os=-none
     1344@@ -1178,7 +1184,7 @@
     1345        we32k)
     1346                basic_machine=we32k-att
     1347                ;;
     1348-       sh[1234] | sh[24]a | sh[34]eb | sh[1234]le | sh[23]ele)
     1349+       sh[1234] | sh[24]a | sh[24]aeb | sh[34]eb | sh[1234]le | sh[23]ele)
     1350                basic_machine=sh-unknown
     1351                ;;
     1352        sparc | sparcv8 | sparcv9 | sparcv9b | sparcv9v)
    8291353diff -Naur ncurses-5.7.orig/configure ncurses-5.7/configure
    8301354--- ncurses-5.7.orig/configure  2008-10-25 17:04:38.000000000 -0700
    831 +++ ncurses-5.7/configure       2008-12-29 20:12:06.000000000 -0800
     1355+++ ncurses-5.7/configure       2009-01-05 03:39:10.000000000 -0800
    8321356@@ -1,7 +1,7 @@
    8331357 #! /bin/sh
    8341358-# From configure.in Revision: 1.454 .
    835 +# From configure.in Revision: 1.457 .
     1359+# From configure.in Revision: 1.461 .
    8361360 # Guess values for system-dependent variables and create Makefiles.
    8371361-# Generated by Autoconf 2.52.20080325.
    … …  
    8401364 # Copyright 1992, 1993, 1994, 1995, 1996, 1998, 1999, 2000, 2001
    8411365 # Free Software Foundation, Inc.
    842 @@ -697,6 +697,7 @@
     1366@@ -697,8 +697,11 @@
    8431367   --without-cxx           do not adjust ncurses bool to match C++
    8441368   --without-cxx-binding   do not build C++ binding and demo
    … …  
    8471371   --without-progs         suppress build with programs (e.g., tic)
    8481372   --without-curses-h      install curses.h as ncurses.h only
     1373+  --with-pkg-config{=path} enable/disable use of pkg-config
     1374+  --enable-pc-files       generate and install .pc files for pkg-config
    8491375   --enable-mixed-case     tic should assume mixed-case filenames
    850 @@ -870,7 +871,7 @@
     1376   --with-install-prefix   prefixes actual install-location ($DESTDIR)
     1377 Build-Tools Needed to Compile Temporary Applications for Cross-compiling:
     1378@@ -870,7 +873,7 @@
    8511379 running configure, to aid debugging if configure makes a mistake.
    8521380 
    … …  
    8571385   $ $0 $@
    8581386 
    859 @@ -994,7 +995,7 @@
     1387@@ -994,7 +997,7 @@
    8601388 fi
    8611389 for ac_site_file in $CONFIG_SITE; do
    8621390   if test -r "$ac_site_file"; then
    8631391-    { echo "$as_me:997: loading site script $ac_site_file" >&5
    864 +    { echo "$as_me:998: loading site script $ac_site_file" >&5
     1392+    { echo "$as_me:1000: loading site script $ac_site_file" >&5
    8651393 echo "$as_me: loading site script $ac_site_file" >&6;}
    8661394     cat "$ac_site_file" >&5
    8671395     . "$ac_site_file"
    868 @@ -1005,7 +1006,7 @@
     1396@@ -1005,7 +1008,7 @@
    8691397   # Some versions of bash will fail to source /dev/null (special
    8701398   # files actually), so we avoid doing that.
    8711399   if test -f "$cache_file"; then
    8721400-    { echo "$as_me:1008: loading cache $cache_file" >&5
    873 +    { echo "$as_me:1009: loading cache $cache_file" >&5
     1401+    { echo "$as_me:1011: loading cache $cache_file" >&5
    8741402 echo "$as_me: loading cache $cache_file" >&6;}
    8751403     case $cache_file in
    8761404       [\\/]* | ?:[\\/]* ) . $cache_file;;
    877 @@ -1013,7 +1014,7 @@
     1405@@ -1013,7 +1016,7 @@
    8781406     esac
    8791407   fi
    8801408 else
    8811409-  { echo "$as_me:1016: creating cache $cache_file" >&5
    882 +  { echo "$as_me:1017: creating cache $cache_file" >&5
     1410+  { echo "$as_me:1019: creating cache $cache_file" >&5
    8831411 echo "$as_me: creating cache $cache_file" >&6;}
    8841412   >$cache_file
    8851413 fi
    886 @@ -1029,21 +1030,21 @@
     1414@@ -1029,21 +1032,21 @@
    8871415   eval ac_new_val="\$ac_env_${ac_var}_value"
    8881416   case $ac_old_set,$ac_new_set in
    8891417     set,)
    8901418-      { echo "$as_me:1032: error: \`$ac_var' was set to \`$ac_old_val' in the previous run" >&5
    891 +      { echo "$as_me:1033: error: \`$ac_var' was set to \`$ac_old_val' in the previous run" >&5
     1419+      { echo "$as_me:1035: error: \`$ac_var' was set to \`$ac_old_val' in the previous run" >&5
    8921420 echo "$as_me: error: \`$ac_var' was set to \`$ac_old_val' in the previous run" >&2;}
    8931421       ac_cache_corrupted=: ;;
    8941422     ,set)
    8951423-      { echo "$as_me:1036: error: \`$ac_var' was not set in the previous run" >&5
    896 +      { echo "$as_me:1037: error: \`$ac_var' was not set in the previous run" >&5
     1424+      { echo "$as_me:1039: error: \`$ac_var' was not set in the previous run" >&5
    8971425 echo "$as_me: error: \`$ac_var' was not set in the previous run" >&2;}
    8981426       ac_cache_corrupted=: ;;
    … …  
    9011429       if test "x$ac_old_val" != "x$ac_new_val"; then
    9021430-        { echo "$as_me:1042: error: \`$ac_var' has changed since the previous run:" >&5
    903 +        { echo "$as_me:1043: error: \`$ac_var' has changed since the previous run:" >&5
     1431+        { echo "$as_me:1045: error: \`$ac_var' has changed since the previous run:" >&5
    9041432 echo "$as_me: error: \`$ac_var' has changed since the previous run:" >&2;}
    9051433-        { echo "$as_me:1044:   former value:  $ac_old_val" >&5
    906 +        { echo "$as_me:1045:   former value:  $ac_old_val" >&5
     1434+        { echo "$as_me:1047:   former value:  $ac_old_val" >&5
    9071435 echo "$as_me:   former value:  $ac_old_val" >&2;}
    9081436-        { echo "$as_me:1046:   current value: $ac_new_val" >&5
    909 +        { echo "$as_me:1047:   current value: $ac_new_val" >&5
     1437+        { echo "$as_me:1049:   current value: $ac_new_val" >&5
    9101438 echo "$as_me:   current value: $ac_new_val" >&2;}
    9111439         ac_cache_corrupted=:
    9121440       fi;;
    913 @@ -1062,9 +1063,9 @@
     1441@@ -1062,9 +1065,9 @@
    9141442   fi
    9151443 done
    9161444 if $ac_cache_corrupted; then
    9171445-  { echo "$as_me:1065: error: changes in the environment can compromise the build" >&5
    918 +  { echo "$as_me:1066: error: changes in the environment can compromise the build" >&5
     1446+  { echo "$as_me:1068: error: changes in the environment can compromise the build" >&5
    9191447 echo "$as_me: error: changes in the environment can compromise the build" >&2;}
    9201448-  { { echo "$as_me:1067: error: run \`make distclean' and/or \`rm $cache_file' and start over" >&5
    921 +  { { echo "$as_me:1068: error: run \`make distclean' and/or \`rm $cache_file' and start over" >&5
     1449+  { { echo "$as_me:1070: error: run \`make distclean' and/or \`rm $cache_file' and start over" >&5
    9221450 echo "$as_me: error: run \`make distclean' and/or \`rm $cache_file' and start over" >&2;}
    9231451    { (exit 1); exit 1; }; }
    9241452 fi
    925 @@ -1085,10 +1086,10 @@
     1453@@ -1085,10 +1088,10 @@
    9261454 echo "#! $SHELL" >conftest.sh
    9271455 echo  "exit 0"   >>conftest.sh
    9281456 chmod +x conftest.sh
    9291457-if { (echo "$as_me:1088: PATH=\".;.\"; conftest.sh") >&5
    930 +if { (echo "$as_me:1089: PATH=\".;.\"; conftest.sh") >&5
     1458+if { (echo "$as_me:1091: PATH=\".;.\"; conftest.sh") >&5
    9311459   (PATH=".;."; conftest.sh) 2>&5
    9321460   ac_status=$?
    9331461-  echo "$as_me:1091: \$? = $ac_status" >&5
    934 +  echo "$as_me:1092: \$? = $ac_status" >&5
     1462+  echo "$as_me:1094: \$? = $ac_status" >&5
    9351463   (exit $ac_status); }; then
    9361464   ac_path_separator=';'
    9371465 else
    938 @@ -1101,7 +1102,7 @@
     1466@@ -1101,7 +1104,7 @@
    9391467 
    9401468 top_builddir=`pwd`
    9411469 
    9421470-echo "$as_me:1104: checking for egrep" >&5
    943 +echo "$as_me:1105: checking for egrep" >&5
     1471+echo "$as_me:1107: checking for egrep" >&5
    9441472 echo $ECHO_N "checking for egrep... $ECHO_C" >&6
    9451473 if test "${ac_cv_prog_egrep+set}" = set; then
    9461474   echo $ECHO_N "(cached) $ECHO_C" >&6
    947 @@ -1111,11 +1112,11 @@
     1475@@ -1111,11 +1114,11 @@
    9481476     else ac_cv_prog_egrep='egrep'
    9491477     fi
    9501478 fi
    9511479-echo "$as_me:1114: result: $ac_cv_prog_egrep" >&5
    952 +echo "$as_me:1115: result: $ac_cv_prog_egrep" >&5
     1480+echo "$as_me:1117: result: $ac_cv_prog_egrep" >&5
    9531481 echo "${ECHO_T}$ac_cv_prog_egrep" >&6
    9541482  EGREP=$ac_cv_prog_egrep
    9551483 
    9561484-test -z "$EGREP" && { { echo "$as_me:1118: error: No egrep program found" >&5
    957 +test -z "$EGREP" && { { echo "$as_me:1119: error: No egrep program found" >&5
     1485+test -z "$EGREP" && { { echo "$as_me:1121: error: No egrep program found" >&5
    9581486 echo "$as_me: error: No egrep program found" >&2;}
    9591487    { (exit 1); exit 1; }; }
    9601488 
    961 @@ -1125,7 +1126,7 @@
     1489@@ -1125,7 +1128,7 @@
    9621490 cf_cv_abi_version=${NCURSES_MAJOR}
    9631491 cf_cv_rel_version=${NCURSES_MAJOR}.${NCURSES_MINOR}
    9641492 cf_cv_timestamp=`date`
    9651493-echo "$as_me:1128: result: Configuring NCURSES $cf_cv_rel_version ABI $cf_cv_abi_version ($cf_cv_timestamp)" >&5
    966 +echo "$as_me:1129: result: Configuring NCURSES $cf_cv_rel_version ABI $cf_cv_abi_version ($cf_cv_timestamp)" >&5
     1494+echo "$as_me:1131: result: Configuring NCURSES $cf_cv_rel_version ABI $cf_cv_abi_version ($cf_cv_timestamp)" >&5
    9671495 echo "${ECHO_T}Configuring NCURSES $cf_cv_rel_version ABI $cf_cv_abi_version ($cf_cv_timestamp)" >&6
    9681496 
    9691497 test -z "$cf_cv_rel_version" && cf_cv_rel_version=0.0
    970 @@ -1133,7 +1134,7 @@
     1498@@ -1133,7 +1136,7 @@
    9711499 # Check whether --with-rel-version or --without-rel-version was given.
    9721500 if test "${with_rel_version+set}" = set; then
    9731501   withval="$with_rel_version"
    9741502-  { echo "$as_me:1136: WARNING: overriding release version $cf_cv_rel_version to $withval" >&5
    975 +  { echo "$as_me:1137: WARNING: overriding release version $cf_cv_rel_version to $withval" >&5
     1503+  { echo "$as_me:1139: WARNING: overriding release version $cf_cv_rel_version to $withval" >&5
    9761504 echo "$as_me: WARNING: overriding release version $cf_cv_rel_version to $withval" >&2;}
    9771505  cf_cv_rel_version=$withval
    9781506 fi;
    979 @@ -1146,13 +1147,13 @@
     1507@@ -1146,13 +1149,13 @@
    9801508   [0-9]*) #(vi
    9811509        ;;
    9821510   *)
    9831511-       { { echo "$as_me:1149: error: Release major-version is not a number: $NCURSES_MAJOR" >&5
    984 +       { { echo "$as_me:1150: error: Release major-version is not a number: $NCURSES_MAJOR" >&5
     1512+       { { echo "$as_me:1152: error: Release major-version is not a number: $NCURSES_MAJOR" >&5
    9851513 echo "$as_me: error: Release major-version is not a number: $NCURSES_MAJOR" >&2;}
    9861514    { (exit 1); exit 1; }; }
    … …  
    9891517 else
    9901518-  { { echo "$as_me:1155: error: Release major-version value is empty" >&5
    991 +  { { echo "$as_me:1156: error: Release major-version value is empty" >&5
     1519+  { { echo "$as_me:1158: error: Release major-version value is empty" >&5
    9921520 echo "$as_me: error: Release major-version value is empty" >&2;}
    9931521    { (exit 1); exit 1; }; }
    9941522 fi
    995 @@ -1162,13 +1163,13 @@
     1523@@ -1162,13 +1165,13 @@
    9961524   [0-9]*) #(vi
    9971525        ;;
    9981526   *)
    9991527-       { { echo "$as_me:1165: error: Release minor-version is not a number: $NCURSES_MINOR" >&5
    1000 +       { { echo "$as_me:1166: error: Release minor-version is not a number: $NCURSES_MINOR" >&5
     1528+       { { echo "$as_me:1168: error: Release minor-version is not a number: $NCURSES_MINOR" >&5
    10011529 echo "$as_me: error: Release minor-version is not a number: $NCURSES_MINOR" >&2;}
    10021530    { (exit 1); exit 1; }; }
    … …  
    10051533 else
    10061534-  { { echo "$as_me:1171: error: Release minor-version value is empty" >&5
    1007 +  { { echo "$as_me:1172: error: Release minor-version value is empty" >&5
     1535+  { { echo "$as_me:1174: error: Release minor-version value is empty" >&5
    10081536 echo "$as_me: error: Release minor-version value is empty" >&2;}
    10091537    { (exit 1); exit 1; }; }
    10101538 fi
    1011 @@ -1178,7 +1179,7 @@
     1539@@ -1178,7 +1181,7 @@
    10121540 # Check whether --with-abi-version or --without-abi-version was given.
    10131541 if test "${with_abi_version+set}" = set; then
    10141542   withval="$with_abi_version"
    10151543-  { echo "$as_me:1181: WARNING: overriding ABI version $cf_cv_abi_version to $withval" >&5
    1016 +  { echo "$as_me:1182: WARNING: overriding ABI version $cf_cv_abi_version to $withval" >&5
     1544+  { echo "$as_me:1184: WARNING: overriding ABI version $cf_cv_abi_version to $withval" >&5
    10171545 echo "$as_me: WARNING: overriding ABI version $cf_cv_abi_version to $withval" >&2;}
    10181546  cf_cv_abi_version=$withval
    10191547 fi;
    1020 @@ -1188,13 +1189,13 @@
     1548@@ -1188,13 +1191,13 @@
    10211549   [0-9]*) #(vi
    10221550        ;;
    10231551   *)
    10241552-       { { echo "$as_me:1191: error: ABI version is not a number: $cf_cv_abi_version" >&5
    1025 +       { { echo "$as_me:1192: error: ABI version is not a number: $cf_cv_abi_version" >&5
     1553+       { { echo "$as_me:1194: error: ABI version is not a number: $cf_cv_abi_version" >&5
    10261554 echo "$as_me: error: ABI version is not a number: $cf_cv_abi_version" >&2;}
    10271555    { (exit 1); exit 1; }; }
    … …  
    10301558 else
    10311559-  { { echo "$as_me:1197: error: ABI version value is empty" >&5
    1032 +  { { echo "$as_me:1198: error: ABI version value is empty" >&5
     1560+  { { echo "$as_me:1200: error: ABI version value is empty" >&5
    10331561 echo "$as_me: error: ABI version value is empty" >&2;}
    10341562    { (exit 1); exit 1; }; }
    10351563 fi
    1036 @@ -1216,7 +1217,7 @@
     1564@@ -1216,7 +1219,7 @@
    10371565   fi
    10381566 done
    10391567 if test -z "$ac_aux_dir"; then
    10401568-  { { echo "$as_me:1219: error: cannot find install-sh or install.sh in $srcdir $srcdir/.. $srcdir/../.." >&5
    1041 +  { { echo "$as_me:1220: error: cannot find install-sh or install.sh in $srcdir $srcdir/.. $srcdir/../.." >&5
     1569+  { { echo "$as_me:1222: error: cannot find install-sh or install.sh in $srcdir $srcdir/.. $srcdir/../.." >&5
    10421570 echo "$as_me: error: cannot find install-sh or install.sh in $srcdir $srcdir/.. $srcdir/../.." >&2;}
    10431571    { (exit 1); exit 1; }; }
    10441572 fi
    1045 @@ -1226,11 +1227,11 @@
     1573@@ -1226,11 +1229,11 @@
    10461574 
    10471575 # Make sure we can run config.sub.
    10481576 $ac_config_sub sun4 >/dev/null 2>&1 ||
    10491577-  { { echo "$as_me:1229: error: cannot run $ac_config_sub" >&5
    1050 +  { { echo "$as_me:1230: error: cannot run $ac_config_sub" >&5
     1578+  { { echo "$as_me:1232: error: cannot run $ac_config_sub" >&5
    10511579 echo "$as_me: error: cannot run $ac_config_sub" >&2;}
    10521580    { (exit 1); exit 1; }; }
    10531581 
    10541582-echo "$as_me:1233: checking build system type" >&5
    1055 +echo "$as_me:1234: checking build system type" >&5
     1583+echo "$as_me:1236: checking build system type" >&5
    10561584 echo $ECHO_N "checking build system type... $ECHO_C" >&6
    10571585 if test "${ac_cv_build+set}" = set; then
    10581586   echo $ECHO_N "(cached) $ECHO_C" >&6
    1059 @@ -1239,23 +1240,23 @@
     1587@@ -1239,23 +1242,23 @@
    10601588 test -z "$ac_cv_build_alias" &&
    10611589   ac_cv_build_alias=`$ac_config_guess`
    10621590 test -z "$ac_cv_build_alias" &&
    10631591-  { { echo "$as_me:1242: error: cannot guess build type; you must specify one" >&5
    1064 +  { { echo "$as_me:1243: error: cannot guess build type; you must specify one" >&5
     1592+  { { echo "$as_me:1245: error: cannot guess build type; you must specify one" >&5
    10651593 echo "$as_me: error: cannot guess build type; you must specify one" >&2;}
    10661594    { (exit 1); exit 1; }; }
    10671595 ac_cv_build=`$ac_config_sub $ac_cv_build_alias` ||
    10681596-  { { echo "$as_me:1246: error: $ac_config_sub $ac_cv_build_alias failed." >&5
    1069 +  { { echo "$as_me:1247: error: $ac_config_sub $ac_cv_build_alias failed." >&5
     1597+  { { echo "$as_me:1249: error: $ac_config_sub $ac_cv_build_alias failed." >&5
    10701598 echo "$as_me: error: $ac_config_sub $ac_cv_build_alias failed." >&2;}
    10711599    { (exit 1); exit 1; }; }
    … …  
    10731601 fi
    10741602-echo "$as_me:1251: result: $ac_cv_build" >&5
    1075 +echo "$as_me:1252: result: $ac_cv_build" >&5
     1603+echo "$as_me:1254: result: $ac_cv_build" >&5
    10761604 echo "${ECHO_T}$ac_cv_build" >&6
    10771605 build=$ac_cv_build
    … …  
    10811609 
    10821610-echo "$as_me:1258: checking host system type" >&5
    1083 +echo "$as_me:1259: checking host system type" >&5
     1611+echo "$as_me:1261: checking host system type" >&5
    10841612 echo $ECHO_N "checking host system type... $ECHO_C" >&6
    10851613 if test "${ac_cv_host+set}" = set; then
    10861614   echo $ECHO_N "(cached) $ECHO_C" >&6
    1087 @@ -1264,12 +1265,12 @@
     1615@@ -1264,12 +1267,12 @@
    10881616 test -z "$ac_cv_host_alias" &&
    10891617   ac_cv_host_alias=$ac_cv_build_alias
    10901618 ac_cv_host=`$ac_config_sub $ac_cv_host_alias` ||
    10911619-  { { echo "$as_me:1267: error: $ac_config_sub $ac_cv_host_alias failed" >&5
    1092 +  { { echo "$as_me:1268: error: $ac_config_sub $ac_cv_host_alias failed" >&5
     1620+  { { echo "$as_me:1270: error: $ac_config_sub $ac_cv_host_alias failed" >&5
    10931621 echo "$as_me: error: $ac_config_sub $ac_cv_host_alias failed" >&2;}
    10941622    { (exit 1); exit 1; }; }
    … …  
    10961624 fi
    10971625-echo "$as_me:1272: result: $ac_cv_host" >&5
    1098 +echo "$as_me:1273: result: $ac_cv_host" >&5
     1626+echo "$as_me:1275: result: $ac_cv_host" >&5
    10991627 echo "${ECHO_T}$ac_cv_host" >&6
    11001628 host=$ac_cv_host
    11011629 host_cpu=`echo $ac_cv_host | sed 's/^\([^-]*\)-\([^-]*\)-\(.*\)$/\1/'`
    1102 @@ -1277,7 +1278,7 @@
     1630@@ -1277,7 +1280,7 @@
    11031631 host_os=`echo $ac_cv_host | sed 's/^\([^-]*\)-\([^-]*\)-\(.*\)$/\3/'`
    11041632 
    11051633 if test -f $srcdir/config.guess || test -f $ac_aux_dir/config.guess ; then
    11061634-       echo "$as_me:1280: checking target system type" >&5
    1107 +       echo "$as_me:1281: checking target system type" >&5
     1635+       echo "$as_me:1283: checking target system type" >&5
    11081636 echo $ECHO_N "checking target system type... $ECHO_C" >&6
    11091637 if test "${ac_cv_target+set}" = set; then
    11101638   echo $ECHO_N "(cached) $ECHO_C" >&6
    1111 @@ -1286,12 +1287,12 @@
     1639@@ -1286,12 +1289,12 @@
    11121640 test "x$ac_cv_target_alias" = "x" &&
    11131641   ac_cv_target_alias=$ac_cv_host_alias
    11141642 ac_cv_target=`$ac_config_sub $ac_cv_target_alias` ||
    11151643-  { { echo "$as_me:1289: error: $ac_config_sub $ac_cv_target_alias failed" >&5
    1116 +  { { echo "$as_me:1290: error: $ac_config_sub $ac_cv_target_alias failed" >&5
     1644+  { { echo "$as_me:1292: error: $ac_config_sub $ac_cv_target_alias failed" >&5
    11171645 echo "$as_me: error: $ac_config_sub $ac_cv_target_alias failed" >&2;}
    11181646    { (exit 1); exit 1; }; }
    … …  
    11201648 fi
    11211649-echo "$as_me:1294: result: $ac_cv_target" >&5
    1122 +echo "$as_me:1295: result: $ac_cv_target" >&5
     1650+echo "$as_me:1297: result: $ac_cv_target" >&5
    11231651 echo "${ECHO_T}$ac_cv_target" >&6
    11241652 target=$ac_cv_target
    11251653 target_cpu=`echo $ac_cv_target | sed 's/^\([^-]*\)-\([^-]*\)-\(.*\)$/\1/'`
    1126 @@ -1322,13 +1323,13 @@
     1654@@ -1322,13 +1325,13 @@
    11271655 fi
    11281656 
    11291657 test -z "$system_name" && system_name="$cf_cv_system_name"
    11301658-test -n "$cf_cv_system_name" && echo "$as_me:1325: result: Configuring for $cf_cv_system_name" >&5
    1131 +test -n "$cf_cv_system_name" && echo "$as_me:1326: result: Configuring for $cf_cv_system_name" >&5
     1659+test -n "$cf_cv_system_name" && echo "$as_me:1328: result: Configuring for $cf_cv_system_name" >&5
    11321660 echo "${ECHO_T}Configuring for $cf_cv_system_name" >&6
    11331661 
    11341662 if test ".$system_name" != ".$cf_cv_system_name" ; then
    11351663-       echo "$as_me:1329: result: Cached system name ($system_name) does not agree with actual ($cf_cv_system_name)" >&5
    1136 +       echo "$as_me:1330: result: Cached system name ($system_name) does not agree with actual ($cf_cv_system_name)" >&5
     1664+       echo "$as_me:1332: result: Cached system name ($system_name) does not agree with actual ($cf_cv_system_name)" >&5
    11371665 echo "${ECHO_T}Cached system name ($system_name) does not agree with actual ($cf_cv_system_name)" >&6
    11381666-       { { echo "$as_me:1331: error: \"Please remove config.cache and try again.\"" >&5
    1139 +       { { echo "$as_me:1332: error: \"Please remove config.cache and try again.\"" >&5
     1667+       { { echo "$as_me:1334: error: \"Please remove config.cache and try again.\"" >&5
    11401668 echo "$as_me: error: \"Please remove config.cache and try again.\"" >&2;}
    11411669    { (exit 1); exit 1; }; }
    11421670 fi
    1143 @@ -1336,7 +1337,7 @@
     1671@@ -1336,7 +1339,7 @@
    11441672 # Check whether --with-system-type or --without-system-type was given.
    11451673 if test "${with_system_type+set}" = set; then
    11461674   withval="$with_system_type"
    11471675-  { echo "$as_me:1339: WARNING: overriding system type to $withval" >&5
    1148 +  { echo "$as_me:1340: WARNING: overriding system type to $withval" >&5
     1676+  { echo "$as_me:1342: WARNING: overriding system type to $withval" >&5
    11491677 echo "$as_me: WARNING: overriding system type to $withval" >&2;}
    11501678  cf_cv_system_name=$withval
    11511679 fi;
    1152 @@ -1346,7 +1347,7 @@
     1680@@ -1346,7 +1349,7 @@
    11531681 
    11541682 ###    Default install-location
    11551683 
    11561684-echo "$as_me:1349: checking for prefix" >&5
    1157 +echo "$as_me:1350: checking for prefix" >&5
     1685+echo "$as_me:1352: checking for prefix" >&5
    11581686 echo $ECHO_N "checking for prefix... $ECHO_C" >&6
    11591687 if test "x$prefix" = "xNONE" ; then
    11601688        case "$cf_cv_system_name" in
    1161 @@ -1358,11 +1359,11 @@
     1689@@ -1358,11 +1361,11 @@
    11621690                ;;
    11631691        esac
    11641692 fi
    11651693-echo "$as_me:1361: result: $prefix" >&5
    1166 +echo "$as_me:1362: result: $prefix" >&5
     1694+echo "$as_me:1364: result: $prefix" >&5
    11671695 echo "${ECHO_T}$prefix" >&6
    11681696 
    11691697 if test "x$prefix" = "xNONE" ; then
    11701698-echo "$as_me:1365: checking for default include-directory" >&5
    1171 +echo "$as_me:1366: checking for default include-directory" >&5
     1699+echo "$as_me:1368: checking for default include-directory" >&5
    11721700 echo $ECHO_N "checking for default include-directory... $ECHO_C" >&6
    11731701 test -n "$verbose" && echo 1>&6
    11741702 for cf_symbol in \
    1175 @@ -1385,7 +1386,7 @@
     1703@@ -1385,7 +1388,7 @@
    11761704        fi
    11771705        test -n "$verbose"  && echo "   tested $cf_dir" 1>&6
    11781706 done
    11791707-echo "$as_me:1388: result: $includedir" >&5
    1180 +echo "$as_me:1389: result: $includedir" >&5
     1708+echo "$as_me:1391: result: $includedir" >&5
    11811709 echo "${ECHO_T}$includedir" >&6
    11821710 fi
    11831711 
    1184 @@ -1399,7 +1400,7 @@
     1712@@ -1399,7 +1402,7 @@
    11851713 if test -n "$ac_tool_prefix"; then
    11861714   # Extract the first word of "${ac_tool_prefix}gcc", so it can be a program name with args.
    11871715 set dummy ${ac_tool_prefix}gcc; ac_word=$2
    11881716-echo "$as_me:1402: checking for $ac_word" >&5
    1189 +echo "$as_me:1403: checking for $ac_word" >&5
     1717+echo "$as_me:1405: checking for $ac_word" >&5
    11901718 echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6
    11911719 if test "${ac_cv_prog_CC+set}" = set; then
    11921720   echo $ECHO_N "(cached) $ECHO_C" >&6
    1193 @@ -1414,7 +1415,7 @@
     1721@@ -1414,7 +1417,7 @@
    11941722   test -z "$ac_dir" && ac_dir=.
    11951723   $as_executable_p "$ac_dir/$ac_word" || continue
    11961724 ac_cv_prog_CC="${ac_tool_prefix}gcc"
    11971725-echo "$as_me:1417: found $ac_dir/$ac_word" >&5
    1198 +echo "$as_me:1418: found $ac_dir/$ac_word" >&5
     1726+echo "$as_me:1420: found $ac_dir/$ac_word" >&5
    11991727 break
    12001728 done
    12011729 
    1202 @@ -1422,10 +1423,10 @@
     1730@@ -1422,10 +1425,10 @@
    12031731 fi
    12041732 CC=$ac_cv_prog_CC
    12051733 if test -n "$CC"; then
    12061734-  echo "$as_me:1425: result: $CC" >&5
    1207 +  echo "$as_me:1426: result: $CC" >&5
     1735+  echo "$as_me:1428: result: $CC" >&5
    12081736 echo "${ECHO_T}$CC" >&6
    12091737 else
    12101738-  echo "$as_me:1428: result: no" >&5
    1211 +  echo "$as_me:1429: result: no" >&5
     1739+  echo "$as_me:1431: result: no" >&5
    12121740 echo "${ECHO_T}no" >&6
    12131741 fi
    12141742 
    1215 @@ -1434,7 +1435,7 @@
     1743@@ -1434,7 +1437,7 @@
    12161744   ac_ct_CC=$CC
    12171745   # Extract the first word of "gcc", so it can be a program name with args.
    12181746 set dummy gcc; ac_word=$2
    12191747-echo "$as_me:1437: checking for $ac_word" >&5
    1220 +echo "$as_me:1438: checking for $ac_word" >&5
     1748+echo "$as_me:1440: checking for $ac_word" >&5
    12211749 echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6
    12221750 if test "${ac_cv_prog_ac_ct_CC+set}" = set; then
    12231751   echo $ECHO_N "(cached) $ECHO_C" >&6
    1224 @@ -1449,7 +1450,7 @@
     1752@@ -1449,7 +1452,7 @@
    12251753   test -z "$ac_dir" && ac_dir=.
    12261754   $as_executable_p "$ac_dir/$ac_word" || continue
    12271755 ac_cv_prog_ac_ct_CC="gcc"
    12281756-echo "$as_me:1452: found $ac_dir/$ac_word" >&5
    1229 +echo "$as_me:1453: found $ac_dir/$ac_word" >&5
     1757+echo "$as_me:1455: found $ac_dir/$ac_word" >&5
    12301758 break
    12311759 done
    12321760 
    1233 @@ -1457,10 +1458,10 @@
     1761@@ -1457,10 +1460,10 @@
    12341762 fi
    12351763 ac_ct_CC=$ac_cv_prog_ac_ct_CC
    12361764 if test -n "$ac_ct_CC"; then
    12371765-  echo "$as_me:1460: result: $ac_ct_CC" >&5
    1238 +  echo "$as_me:1461: result: $ac_ct_CC" >&5
     1766+  echo "$as_me:1463: result: $ac_ct_CC" >&5
    12391767 echo "${ECHO_T}$ac_ct_CC" >&6
    12401768 else
    12411769-  echo "$as_me:1463: result: no" >&5
    1242 +  echo "$as_me:1464: result: no" >&5
     1770+  echo "$as_me:1466: result: no" >&5
    12431771 echo "${ECHO_T}no" >&6
    12441772 fi
    12451773 
    1246 @@ -1473,7 +1474,7 @@
     1774@@ -1473,7 +1476,7 @@
    12471775   if test -n "$ac_tool_prefix"; then
    12481776   # Extract the first word of "${ac_tool_prefix}cc", so it can be a program name with args.
    12491777 set dummy ${ac_tool_prefix}cc; ac_word=$2
    12501778-echo "$as_me:1476: checking for $ac_word" >&5
    1251 +echo "$as_me:1477: checking for $ac_word" >&5
     1779+echo "$as_me:1479: checking for $ac_word" >&5
    12521780 echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6
    12531781 if test "${ac_cv_prog_CC+set}" = set; then
    12541782   echo $ECHO_N "(cached) $ECHO_C" >&6
    1255 @@ -1488,7 +1489,7 @@
     1783@@ -1488,7 +1491,7 @@
    12561784   test -z "$ac_dir" && ac_dir=.
    12571785   $as_executable_p "$ac_dir/$ac_word" || continue
    12581786 ac_cv_prog_CC="${ac_tool_prefix}cc"
    12591787-echo "$as_me:1491: found $ac_dir/$ac_word" >&5
    1260 +echo "$as_me:1492: found $ac_dir/$ac_word" >&5
     1788+echo "$as_me:1494: found $ac_dir/$ac_word" >&5
    12611789 break
    12621790 done
    12631791 
    1264 @@ -1496,10 +1497,10 @@
     1792@@ -1496,10 +1499,10 @@
    12651793 fi
    12661794 CC=$ac_cv_prog_CC
    12671795 if test -n "$CC"; then
    12681796-  echo "$as_me:1499: result: $CC" >&5
    1269 +  echo "$as_me:1500: result: $CC" >&5
     1797+  echo "$as_me:1502: result: $CC" >&5
    12701798 echo "${ECHO_T}$CC" >&6
    12711799 else
    12721800-  echo "$as_me:1502: result: no" >&5
    1273 +  echo "$as_me:1503: result: no" >&5
     1801+  echo "$as_me:1505: result: no" >&5
    12741802 echo "${ECHO_T}no" >&6
    12751803 fi
    12761804 
    1277 @@ -1508,7 +1509,7 @@
     1805@@ -1508,7 +1511,7 @@
    12781806   ac_ct_CC=$CC
    12791807   # Extract the first word of "cc", so it can be a program name with args.
    12801808 set dummy cc; ac_word=$2
    12811809-echo "$as_me:1511: checking for $ac_word" >&5
    1282 +echo "$as_me:1512: checking for $ac_word" >&5
     1810+echo "$as_me:1514: checking for $ac_word" >&5
    12831811 echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6
    12841812 if test "${ac_cv_prog_ac_ct_CC+set}" = set; then
    12851813   echo $ECHO_N "(cached) $ECHO_C" >&6
    1286 @@ -1523,7 +1524,7 @@
     1814@@ -1523,7 +1526,7 @@
    12871815   test -z "$ac_dir" && ac_dir=.
    12881816   $as_executable_p "$ac_dir/$ac_word" || continue
    12891817 ac_cv_prog_ac_ct_CC="cc"
    12901818-echo "$as_me:1526: found $ac_dir/$ac_word" >&5
    1291 +echo "$as_me:1527: found $ac_dir/$ac_word" >&5
     1819+echo "$as_me:1529: found $ac_dir/$ac_word" >&5
    12921820 break
    12931821 done
    12941822 
    1295 @@ -1531,10 +1532,10 @@
     1823@@ -1531,10 +1534,10 @@
    12961824 fi
    12971825 ac_ct_CC=$ac_cv_prog_ac_ct_CC
    12981826 if test -n "$ac_ct_CC"; then
    12991827-  echo "$as_me:1534: result: $ac_ct_CC" >&5
    1300 +  echo "$as_me:1535: result: $ac_ct_CC" >&5
     1828+  echo "$as_me:1537: result: $ac_ct_CC" >&5
    13011829 echo "${ECHO_T}$ac_ct_CC" >&6
    13021830 else
    13031831-  echo "$as_me:1537: result: no" >&5
    1304 +  echo "$as_me:1538: result: no" >&5
     1832+  echo "$as_me:1540: result: no" >&5
    13051833 echo "${ECHO_T}no" >&6
    13061834 fi
    13071835 
    1308 @@ -1547,7 +1548,7 @@
     1836@@ -1547,7 +1550,7 @@
    13091837 if test -z "$CC"; then
    13101838   # Extract the first word of "cc", so it can be a program name with args.
    13111839 set dummy cc; ac_word=$2
    13121840-echo "$as_me:1550: checking for $ac_word" >&5
    1313 +echo "$as_me:1551: checking for $ac_word" >&5
     1841+echo "$as_me:1553: checking for $ac_word" >&5
    13141842 echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6
    13151843 if test "${ac_cv_prog_CC+set}" = set; then
    13161844   echo $ECHO_N "(cached) $ECHO_C" >&6
    1317 @@ -1567,7 +1568,7 @@
     1845@@ -1567,7 +1570,7 @@
    13181846   continue
    13191847 fi
    13201848 ac_cv_prog_CC="cc"
    13211849-echo "$as_me:1570: found $ac_dir/$ac_word" >&5
    1322 +echo "$as_me:1571: found $ac_dir/$ac_word" >&5
     1850+echo "$as_me:1573: found $ac_dir/$ac_word" >&5
    13231851 break
    13241852 done
    13251853 
    1326 @@ -1589,10 +1590,10 @@
     1854@@ -1589,10 +1592,10 @@
    13271855 fi
    13281856 CC=$ac_cv_prog_CC
    13291857 if test -n "$CC"; then
    13301858-  echo "$as_me:1592: result: $CC" >&5
    1331 +  echo "$as_me:1593: result: $CC" >&5
     1859+  echo "$as_me:1595: result: $CC" >&5
    13321860 echo "${ECHO_T}$CC" >&6
    13331861 else
    13341862-  echo "$as_me:1595: result: no" >&5
    1335 +  echo "$as_me:1596: result: no" >&5
     1863+  echo "$as_me:1598: result: no" >&5
    13361864 echo "${ECHO_T}no" >&6
    13371865 fi
    13381866 
    1339 @@ -1603,7 +1604,7 @@
     1867@@ -1603,7 +1606,7 @@
    13401868   do
    13411869     # Extract the first word of "$ac_tool_prefix$ac_prog", so it can be a program name with args.
    13421870 set dummy $ac_tool_prefix$ac_prog; ac_word=$2
    13431871-echo "$as_me:1606: checking for $ac_word" >&5
    1344 +echo "$as_me:1607: checking for $ac_word" >&5
     1872+echo "$as_me:1609: checking for $ac_word" >&5
    13451873 echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6
    13461874 if test "${ac_cv_prog_CC+set}" = set; then
    13471875   echo $ECHO_N "(cached) $ECHO_C" >&6
    1348 @@ -1618,7 +1619,7 @@
     1876@@ -1618,7 +1621,7 @@
    13491877   test -z "$ac_dir" && ac_dir=.
    13501878   $as_executable_p "$ac_dir/$ac_word" || continue
    13511879 ac_cv_prog_CC="$ac_tool_prefix$ac_prog"
    13521880-echo "$as_me:1621: found $ac_dir/$ac_word" >&5
    1353 +echo "$as_me:1622: found $ac_dir/$ac_word" >&5
     1881+echo "$as_me:1624: found $ac_dir/$ac_word" >&5
    13541882 break
    13551883 done
    13561884 
    1357 @@ -1626,10 +1627,10 @@
     1885@@ -1626,10 +1629,10 @@
    13581886 fi
    13591887 CC=$ac_cv_prog_CC
    13601888 if test -n "$CC"; then
    13611889-  echo "$as_me:1629: result: $CC" >&5
    1362 +  echo "$as_me:1630: result: $CC" >&5
     1890+  echo "$as_me:1632: result: $CC" >&5
    13631891 echo "${ECHO_T}$CC" >&6
    13641892 else
    13651893-  echo "$as_me:1632: result: no" >&5
    1366 +  echo "$as_me:1633: result: no" >&5
     1894+  echo "$as_me:1635: result: no" >&5
    13671895 echo "${ECHO_T}no" >&6
    13681896 fi
    13691897 
    1370 @@ -1642,7 +1643,7 @@
     1898@@ -1642,7 +1645,7 @@
    13711899 do
    13721900   # Extract the first word of "$ac_prog", so it can be a program name with args.
    13731901 set dummy $ac_prog; ac_word=$2
    13741902-echo "$as_me:1645: checking for $ac_word" >&5
    1375 +echo "$as_me:1646: checking for $ac_word" >&5
     1903+echo "$as_me:1648: checking for $ac_word" >&5
    13761904 echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6
    13771905 if test "${ac_cv_prog_ac_ct_CC+set}" = set; then
    13781906   echo $ECHO_N "(cached) $ECHO_C" >&6
    1379 @@ -1657,7 +1658,7 @@
     1907@@ -1657,7 +1660,7 @@
    13801908   test -z "$ac_dir" && ac_dir=.
    13811909   $as_executable_p "$ac_dir/$ac_word" || continue
    13821910 ac_cv_prog_ac_ct_CC="$ac_prog"
    13831911-echo "$as_me:1660: found $ac_dir/$ac_word" >&5
    1384 +echo "$as_me:1661: found $ac_dir/$ac_word" >&5
     1912+echo "$as_me:1663: found $ac_dir/$ac_word" >&5
    13851913 break
    13861914 done
    13871915 
    1388 @@ -1665,10 +1666,10 @@
     1916@@ -1665,10 +1668,10 @@
    13891917 fi
    13901918 ac_ct_CC=$ac_cv_prog_ac_ct_CC
    13911919 if test -n "$ac_ct_CC"; then
    13921920-  echo "$as_me:1668: result: $ac_ct_CC" >&5
    1393 +  echo "$as_me:1669: result: $ac_ct_CC" >&5
     1921+  echo "$as_me:1671: result: $ac_ct_CC" >&5
    13941922 echo "${ECHO_T}$ac_ct_CC" >&6
    13951923 else
    13961924-  echo "$as_me:1671: result: no" >&5
    1397 +  echo "$as_me:1672: result: no" >&5
     1925+  echo "$as_me:1674: result: no" >&5
    13981926 echo "${ECHO_T}no" >&6
    13991927 fi
    14001928 
    1401 @@ -1680,32 +1681,32 @@
     1929@@ -1680,32 +1683,32 @@
    14021930 
    14031931 fi
    14041932 
    14051933-test -z "$CC" && { { echo "$as_me:1683: error: no acceptable cc found in \$PATH" >&5
    1406 +test -z "$CC" && { { echo "$as_me:1684: error: no acceptable cc found in \$PATH" >&5
     1934+test -z "$CC" && { { echo "$as_me:1686: error: no acceptable cc found in \$PATH" >&5
    14071935 echo "$as_me: error: no acceptable cc found in \$PATH" >&2;}
    14081936    { (exit 1); exit 1; }; }
    … …  
    14101938 # Provide some information about the compiler.
    14111939-echo "$as_me:1688:" \
    1412 +echo "$as_me:1689:" \
     1940+echo "$as_me:1691:" \
    14131941      "checking for C compiler version" >&5
    14141942 ac_compiler=`set X $ac_compile; echo $2`
    14151943-{ (eval echo "$as_me:1691: \"$ac_compiler --version </dev/null >&5\"") >&5
    1416 +{ (eval echo "$as_me:1692: \"$ac_compiler --version </dev/null >&5\"") >&5
     1944+{ (eval echo "$as_me:1694: \"$ac_compiler --version </dev/null >&5\"") >&5
    14171945   (eval $ac_compiler --version </dev/null >&5) 2>&5
    14181946   ac_status=$?
    14191947-  echo "$as_me:1694: \$? = $ac_status" >&5
    1420 +  echo "$as_me:1695: \$? = $ac_status" >&5
     1948+  echo "$as_me:1697: \$? = $ac_status" >&5
    14211949   (exit $ac_status); }
    14221950-{ (eval echo "$as_me:1696: \"$ac_compiler -v </dev/null >&5\"") >&5
    1423 +{ (eval echo "$as_me:1697: \"$ac_compiler -v </dev/null >&5\"") >&5
     1951+{ (eval echo "$as_me:1699: \"$ac_compiler -v </dev/null >&5\"") >&5
    14241952   (eval $ac_compiler -v </dev/null >&5) 2>&5
    14251953   ac_status=$?
    14261954-  echo "$as_me:1699: \$? = $ac_status" >&5
    1427 +  echo "$as_me:1700: \$? = $ac_status" >&5
     1955+  echo "$as_me:1702: \$? = $ac_status" >&5
    14281956   (exit $ac_status); }
    14291957-{ (eval echo "$as_me:1701: \"$ac_compiler -V </dev/null >&5\"") >&5
    1430 +{ (eval echo "$as_me:1702: \"$ac_compiler -V </dev/null >&5\"") >&5
     1958+{ (eval echo "$as_me:1704: \"$ac_compiler -V </dev/null >&5\"") >&5
    14311959   (eval $ac_compiler -V </dev/null >&5) 2>&5
    14321960   ac_status=$?
    14331961-  echo "$as_me:1704: \$? = $ac_status" >&5
    1434 +  echo "$as_me:1705: \$? = $ac_status" >&5
     1962+  echo "$as_me:1707: \$? = $ac_status" >&5
    14351963   (exit $ac_status); }
    14361964 
    14371965 cat >conftest.$ac_ext <<_ACEOF
    14381966-#line 1708 "configure"
    1439 +#line 1709 "configure"
     1967+#line 1711 "configure"
    14401968 #include "confdefs.h"
    14411969 
    14421970 int
    1443 @@ -1721,13 +1722,13 @@
     1971@@ -1721,13 +1724,13 @@
    14441972 # Try to create an executable without -o first, disregard a.out.
    14451973 # It will help us diagnose broken compilers, and finding out an intuition
    14461974 # of exeext.
    14471975-echo "$as_me:1724: checking for C compiler default output" >&5
    1448 +echo "$as_me:1725: checking for C compiler default output" >&5
     1976+echo "$as_me:1727: checking for C compiler default output" >&5
    14491977 echo $ECHO_N "checking for C compiler default output... $ECHO_C" >&6
    14501978 ac_link_default=`echo "$ac_link" | sed 's/ -o *conftest[^ ]*//'`
    14511979-if { (eval echo "$as_me:1727: \"$ac_link_default\"") >&5
    1452 +if { (eval echo "$as_me:1728: \"$ac_link_default\"") >&5
     1980+if { (eval echo "$as_me:1730: \"$ac_link_default\"") >&5
    14531981   (eval $ac_link_default) 2>&5
    14541982   ac_status=$?
    14551983-  echo "$as_me:1730: \$? = $ac_status" >&5
    1456 +  echo "$as_me:1731: \$? = $ac_status" >&5
     1984+  echo "$as_me:1733: \$? = $ac_status" >&5
    14571985   (exit $ac_status); }; then
    14581986   # Find the output, starting from the most likely.  This scheme is
    14591987 # not robust to junk in `.', hence go to wildcards (a.*) only as a last
    1460 @@ -1736,7 +1737,7 @@
     1988@@ -1736,7 +1739,7 @@
    14611989                 ls a.out conftest 2>/dev/null;
    14621990                 ls a.* conftest.* 2>/dev/null`; do
    … …  
    14671995             # certainly right.
    14681996             break;;
    1469 @@ -1750,34 +1751,34 @@
     1997@@ -1750,34 +1753,34 @@
    14701998 else
    14711999   echo "$as_me: failed program was:" >&5
    14722000 cat conftest.$ac_ext >&5
    14732001-{ { echo "$as_me:1753: error: C compiler cannot create executables" >&5
    1474 +{ { echo "$as_me:1754: error: C compiler cannot create executables" >&5
     2002+{ { echo "$as_me:1756: error: C compiler cannot create executables" >&5
    14752003 echo "$as_me: error: C compiler cannot create executables" >&2;}
    14762004    { (exit 77); exit 77; }; }
    … …  
    14792007 ac_exeext=$ac_cv_exeext
    14802008-echo "$as_me:1759: result: $ac_file" >&5
    1481 +echo "$as_me:1760: result: $ac_file" >&5
     2009+echo "$as_me:1762: result: $ac_file" >&5
    14822010 echo "${ECHO_T}$ac_file" >&6
    14832011 
    … …  
    14852013 # the compiler is broken, or we cross compile.
    14862014-echo "$as_me:1764: checking whether the C compiler works" >&5
    1487 +echo "$as_me:1765: checking whether the C compiler works" >&5
     2015+echo "$as_me:1767: checking whether the C compiler works" >&5
    14882016 echo $ECHO_N "checking whether the C compiler works... $ECHO_C" >&6
    14892017 # FIXME: These cross compiler hacks should be removed for Autoconf 3.0
    … …  
    14922020   if { ac_try='./$ac_file'
    14932021-  { (eval echo "$as_me:1770: \"$ac_try\"") >&5
    1494 +  { (eval echo "$as_me:1771: \"$ac_try\"") >&5
     2022+  { (eval echo "$as_me:1773: \"$ac_try\"") >&5
    14952023   (eval $ac_try) 2>&5
    14962024   ac_status=$?
    14972025-  echo "$as_me:1773: \$? = $ac_status" >&5
    1498 +  echo "$as_me:1774: \$? = $ac_status" >&5
     2026+  echo "$as_me:1776: \$? = $ac_status" >&5
    14992027   (exit $ac_status); }; }; then
    15002028     cross_compiling=no
    … …  
    15042032     else
    15052033-       { { echo "$as_me:1780: error: cannot run C compiled programs.
    1506 +       { { echo "$as_me:1781: error: cannot run C compiled programs.
     2034+       { { echo "$as_me:1783: error: cannot run C compiled programs.
    15072035 If you meant to cross compile, use \`--host'." >&5
    15082036 echo "$as_me: error: cannot run C compiled programs.
    15092037 If you meant to cross compile, use \`--host'." >&2;}
    1510 @@ -1785,24 +1786,24 @@
     2038@@ -1785,24 +1788,24 @@
    15112039     fi
    15122040   fi
    15132041 fi
    15142042-echo "$as_me:1788: result: yes" >&5
    1515 +echo "$as_me:1789: result: yes" >&5
     2043+echo "$as_me:1791: result: yes" >&5
    15162044 echo "${ECHO_T}yes" >&6
    15172045 
    … …  
    15212049 # the compiler is broken, or we cross compile.
    15222050-echo "$as_me:1795: checking whether we are cross compiling" >&5
    1523 +echo "$as_me:1796: checking whether we are cross compiling" >&5
     2051+echo "$as_me:1798: checking whether we are cross compiling" >&5
    15242052 echo $ECHO_N "checking whether we are cross compiling... $ECHO_C" >&6
    15252053-echo "$as_me:1797: result: $cross_compiling" >&5
    1526 +echo "$as_me:1798: result: $cross_compiling" >&5
     2054+echo "$as_me:1800: result: $cross_compiling" >&5
    15272055 echo "${ECHO_T}$cross_compiling" >&6
    15282056 
    15292057-echo "$as_me:1800: checking for executable suffix" >&5
    1530 +echo "$as_me:1801: checking for executable suffix" >&5
     2058+echo "$as_me:1803: checking for executable suffix" >&5
    15312059 echo $ECHO_N "checking for executable suffix... $ECHO_C" >&6
    15322060-if { (eval echo "$as_me:1802: \"$ac_link\"") >&5
    1533 +if { (eval echo "$as_me:1803: \"$ac_link\"") >&5
     2061+if { (eval echo "$as_me:1805: \"$ac_link\"") >&5
    15342062   (eval $ac_link) 2>&5
    15352063   ac_status=$?
    15362064-  echo "$as_me:1805: \$? = $ac_status" >&5
    1537 +  echo "$as_me:1806: \$? = $ac_status" >&5
     2065+  echo "$as_me:1808: \$? = $ac_status" >&5
    15382066   (exit $ac_status); }; then
    15392067   # If both `conftest.exe' and `conftest' are `present' (well, observable)
    15402068 # catch `conftest.exe'.  For instance with Cygwin, `ls conftest' will
    1541 @@ -1810,7 +1811,7 @@
     2069@@ -1810,7 +1813,7 @@
    15422070 # `rm'.
    15432071 for ac_file in `(ls conftest.exe; ls conftest; ls conftest.*) 2>/dev/null`; do
    … …  
    15482076           export ac_cv_exeext
    15492077           break;;
    1550 @@ -1818,25 +1819,25 @@
     2078@@ -1818,25 +1821,25 @@
    15512079   esac
    15522080 done
    15532081 else
    15542082-  { { echo "$as_me:1821: error: cannot compute EXEEXT: cannot compile and link" >&5
    1555 +  { { echo "$as_me:1822: error: cannot compute EXEEXT: cannot compile and link" >&5
     2083+  { { echo "$as_me:1824: error: cannot compute EXEEXT: cannot compile and link" >&5
    15562084 echo "$as_me: error: cannot compute EXEEXT: cannot compile and link" >&2;}
    15572085    { (exit 1); exit 1; }; }
    … …  
    15602088 rm -f conftest$ac_cv_exeext
    15612089-echo "$as_me:1827: result: $ac_cv_exeext" >&5
    1562 +echo "$as_me:1828: result: $ac_cv_exeext" >&5
     2090+echo "$as_me:1830: result: $ac_cv_exeext" >&5
    15632091 echo "${ECHO_T}$ac_cv_exeext" >&6
    15642092 
    … …  
    15672095 ac_exeext=$EXEEXT
    15682096-echo "$as_me:1833: checking for object suffix" >&5
    1569 +echo "$as_me:1834: checking for object suffix" >&5
     2097+echo "$as_me:1836: checking for object suffix" >&5
    15702098 echo $ECHO_N "checking for object suffix... $ECHO_C" >&6
    15712099 if test "${ac_cv_objext+set}" = set; then
    … …  
    15742102   cat >conftest.$ac_ext <<_ACEOF
    15752103-#line 1839 "configure"
    1576 +#line 1840 "configure"
     2104+#line 1842 "configure"
    15772105 #include "confdefs.h"
    15782106 
    15792107 int
    1580 @@ -1848,14 +1849,14 @@
     2108@@ -1848,14 +1851,14 @@
    15812109 }
    15822110 _ACEOF
    15832111 rm -f conftest.o conftest.obj
    15842112-if { (eval echo "$as_me:1851: \"$ac_compile\"") >&5
    1585 +if { (eval echo "$as_me:1852: \"$ac_compile\"") >&5
     2113+if { (eval echo "$as_me:1854: \"$ac_compile\"") >&5
    15862114   (eval $ac_compile) 2>&5
    15872115   ac_status=$?
    15882116-  echo "$as_me:1854: \$? = $ac_status" >&5
    1589 +  echo "$as_me:1855: \$? = $ac_status" >&5
     2117+  echo "$as_me:1857: \$? = $ac_status" >&5
    15902118   (exit $ac_status); }; then
    15912119   for ac_file in `(ls conftest.o conftest.obj; ls conftest.*) 2>/dev/null`; do
    … …  
    15962124        break;;
    15972125   esac
    1598 @@ -1863,24 +1864,24 @@
     2126@@ -1863,24 +1866,24 @@
    15992127 else
    16002128   echo "$as_me: failed program was:" >&5
    16012129 cat conftest.$ac_ext >&5
    16022130-{ { echo "$as_me:1866: error: cannot compute OBJEXT: cannot compile" >&5
    1603 +{ { echo "$as_me:1867: error: cannot compute OBJEXT: cannot compile" >&5
     2131+{ { echo "$as_me:1869: error: cannot compute OBJEXT: cannot compile" >&5
    16042132 echo "$as_me: error: cannot compute OBJEXT: cannot compile" >&2;}
    16052133    { (exit 1); exit 1; }; }
    … …  
    16092137 fi
    16102138-echo "$as_me:1873: result: $ac_cv_objext" >&5
    1611 +echo "$as_me:1874: result: $ac_cv_objext" >&5
     2139+echo "$as_me:1876: result: $ac_cv_objext" >&5
    16122140 echo "${ECHO_T}$ac_cv_objext" >&6
    16132141 OBJEXT=$ac_cv_objext
    16142142 ac_objext=$OBJEXT
    16152143-echo "$as_me:1877: checking whether we are using the GNU C compiler" >&5
    1616 +echo "$as_me:1878: checking whether we are using the GNU C compiler" >&5
     2144+echo "$as_me:1880: checking whether we are using the GNU C compiler" >&5
    16172145 echo $ECHO_N "checking whether we are using the GNU C compiler... $ECHO_C" >&6
    16182146 if test "${ac_cv_c_compiler_gnu+set}" = set; then
    … …  
    16212149   cat >conftest.$ac_ext <<_ACEOF
    16222150-#line 1883 "configure"
    1623 +#line 1884 "configure"
     2151+#line 1886 "configure"
    16242152 #include "confdefs.h"
    16252153 
    16262154 int
    1627 @@ -1895,16 +1896,16 @@
     2155@@ -1895,16 +1898,16 @@
    16282156 }
    16292157 _ACEOF
    16302158 rm -f conftest.$ac_objext
    16312159-if { (eval echo "$as_me:1898: \"$ac_compile\"") >&5
    1632 +if { (eval echo "$as_me:1899: \"$ac_compile\"") >&5
     2160+if { (eval echo "$as_me:1901: \"$ac_compile\"") >&5
    16332161   (eval $ac_compile) 2>&5
    16342162   ac_status=$?
    16352163-  echo "$as_me:1901: \$? = $ac_status" >&5
    1636 +  echo "$as_me:1902: \$? = $ac_status" >&5
     2164+  echo "$as_me:1904: \$? = $ac_status" >&5
    16372165   (exit $ac_status); } &&
    16382166          { ac_try='test -s conftest.$ac_objext'
    16392167-  { (eval echo "$as_me:1904: \"$ac_try\"") >&5
    1640 +  { (eval echo "$as_me:1905: \"$ac_try\"") >&5
     2168+  { (eval echo "$as_me:1907: \"$ac_try\"") >&5
    16412169   (eval $ac_try) 2>&5
    16422170   ac_status=$?
    16432171-  echo "$as_me:1907: \$? = $ac_status" >&5
    1644 +  echo "$as_me:1908: \$? = $ac_status" >&5
     2172+  echo "$as_me:1910: \$? = $ac_status" >&5
    16452173   (exit $ac_status); }; }; then
    16462174   ac_compiler_gnu=yes
    16472175 else
    1648 @@ -1916,19 +1917,19 @@
     2176@@ -1916,19 +1919,19 @@
    16492177 ac_cv_c_compiler_gnu=$ac_compiler_gnu
    16502178 
    16512179 fi
    16522180-echo "$as_me:1919: result: $ac_cv_c_compiler_gnu" >&5
    1653 +echo "$as_me:1920: result: $ac_cv_c_compiler_gnu" >&5
     2181+echo "$as_me:1922: result: $ac_cv_c_compiler_gnu" >&5
    16542182 echo "${ECHO_T}$ac_cv_c_compiler_gnu" >&6
    16552183 GCC=`test $ac_compiler_gnu = yes && echo yes`
    … …  
    16582186 CFLAGS="-g"
    16592187-echo "$as_me:1925: checking whether $CC accepts -g" >&5
    1660 +echo "$as_me:1926: checking whether $CC accepts -g" >&5
     2188+echo "$as_me:1928: checking whether $CC accepts -g" >&5
    16612189 echo $ECHO_N "checking whether $CC accepts -g... $ECHO_C" >&6
    16622190 if test "${ac_cv_prog_cc_g+set}" = set; then
    … …  
    16652193   cat >conftest.$ac_ext <<_ACEOF
    16662194-#line 1931 "configure"
    1667 +#line 1932 "configure"
     2195+#line 1934 "configure"
    16682196 #include "confdefs.h"
    16692197 
    16702198 int
    1671 @@ -1940,16 +1941,16 @@
     2199@@ -1940,16 +1943,16 @@
    16722200 }
    16732201 _ACEOF
    16742202 rm -f conftest.$ac_objext
    16752203-if { (eval echo "$as_me:1943: \"$ac_compile\"") >&5
    1676 +if { (eval echo "$as_me:1944: \"$ac_compile\"") >&5
     2204+if { (eval echo "$as_me:1946: \"$ac_compile\"") >&5
    16772205   (eval $ac_compile) 2>&5
    16782206   ac_status=$?
    16792207-  echo "$as_me:1946: \$? = $ac_status" >&5
    1680 +  echo "$as_me:1947: \$? = $ac_status" >&5
     2208+  echo "$as_me:1949: \$? = $ac_status" >&5
    16812209   (exit $ac_status); } &&
    16822210          { ac_try='test -s conftest.$ac_objext'
    16832211-  { (eval echo "$as_me:1949: \"$ac_try\"") >&5
    1684 +  { (eval echo "$as_me:1950: \"$ac_try\"") >&5
     2212+  { (eval echo "$as_me:1952: \"$ac_try\"") >&5
    16852213   (eval $ac_try) 2>&5
    16862214   ac_status=$?
    16872215-  echo "$as_me:1952: \$? = $ac_status" >&5
    1688 +  echo "$as_me:1953: \$? = $ac_status" >&5
     2216+  echo "$as_me:1955: \$? = $ac_status" >&5
    16892217   (exit $ac_status); }; }; then
    16902218   ac_cv_prog_cc_g=yes
    16912219 else
    1692 @@ -1959,7 +1960,7 @@
     2220@@ -1959,7 +1962,7 @@
    16932221 fi
    16942222 rm -f conftest.$ac_objext conftest.$ac_ext
    16952223 fi
    16962224-echo "$as_me:1962: result: $ac_cv_prog_cc_g" >&5
    1697 +echo "$as_me:1963: result: $ac_cv_prog_cc_g" >&5
     2225+echo "$as_me:1965: result: $ac_cv_prog_cc_g" >&5
    16982226 echo "${ECHO_T}$ac_cv_prog_cc_g" >&6
    16992227 if test "$ac_test_CFLAGS" = set; then
    17002228   CFLAGS=$ac_save_CFLAGS
    1701 @@ -1986,16 +1987,16 @@
     2229@@ -1986,16 +1989,16 @@
    17022230 #endif
    17032231 _ACEOF
    17042232 rm -f conftest.$ac_objext
    17052233-if { (eval echo "$as_me:1989: \"$ac_compile\"") >&5
    1706 +if { (eval echo "$as_me:1990: \"$ac_compile\"") >&5
     2234+if { (eval echo "$as_me:1992: \"$ac_compile\"") >&5
    17072235   (eval $ac_compile) 2>&5
    17082236   ac_status=$?
    17092237-  echo "$as_me:1992: \$? = $ac_status" >&5
    1710 +  echo "$as_me:1993: \$? = $ac_status" >&5
     2238+  echo "$as_me:1995: \$? = $ac_status" >&5
    17112239   (exit $ac_status); } &&
    17122240          { ac_try='test -s conftest.$ac_objext'
    17132241-  { (eval echo "$as_me:1995: \"$ac_try\"") >&5
    1714 +  { (eval echo "$as_me:1996: \"$ac_try\"") >&5
     2242+  { (eval echo "$as_me:1998: \"$ac_try\"") >&5
    17152243   (eval $ac_try) 2>&5
    17162244   ac_status=$?
    17172245-  echo "$as_me:1998: \$? = $ac_status" >&5
    1718 +  echo "$as_me:1999: \$? = $ac_status" >&5
     2246+  echo "$as_me:2001: \$? = $ac_status" >&5
    17192247   (exit $ac_status); }; }; then
    17202248   for ac_declaration in \
    17212249    ''\
    1722 @@ -2007,7 +2008,7 @@
     2250@@ -2007,7 +2010,7 @@
    17232251    'void exit (int);'
    17242252 do
    17252253   cat >conftest.$ac_ext <<_ACEOF
    17262254-#line 2010 "configure"
    1727 +#line 2011 "configure"
     2255+#line 2013 "configure"
    17282256 #include "confdefs.h"
    17292257 #include <stdlib.h>
    17302258 $ac_declaration
    1731 @@ -2020,16 +2021,16 @@
     2259@@ -2020,16 +2023,16 @@
    17322260 }
    17332261 _ACEOF
    17342262 rm -f conftest.$ac_objext
    17352263-if { (eval echo "$as_me:2023: \"$ac_compile\"") >&5
    1736 +if { (eval echo "$as_me:2024: \"$ac_compile\"") >&5
     2264+if { (eval echo "$as_me:2026: \"$ac_compile\"") >&5
    17372265   (eval $ac_compile) 2>&5
    17382266   ac_status=$?
    17392267-  echo "$as_me:2026: \$? = $ac_status" >&5
    1740 +  echo "$as_me:2027: \$? = $ac_status" >&5
     2268+  echo "$as_me:2029: \$? = $ac_status" >&5
    17412269   (exit $ac_status); } &&
    17422270          { ac_try='test -s conftest.$ac_objext'
    17432271-  { (eval echo "$as_me:2029: \"$ac_try\"") >&5
    1744 +  { (eval echo "$as_me:2030: \"$ac_try\"") >&5
     2272+  { (eval echo "$as_me:2032: \"$ac_try\"") >&5
    17452273   (eval $ac_try) 2>&5
    17462274   ac_status=$?
    17472275-  echo "$as_me:2032: \$? = $ac_status" >&5
    1748 +  echo "$as_me:2033: \$? = $ac_status" >&5
     2276+  echo "$as_me:2035: \$? = $ac_status" >&5
    17492277   (exit $ac_status); }; }; then
    17502278   :
    17512279 else
    1752 @@ -2039,7 +2040,7 @@
     2280@@ -2039,7 +2042,7 @@
    17532281 fi
    17542282 rm -f conftest.$ac_objext conftest.$ac_ext
    17552283   cat >conftest.$ac_ext <<_ACEOF
    17562284-#line 2042 "configure"
    1757 +#line 2043 "configure"
     2285+#line 2045 "configure"
    17582286 #include "confdefs.h"
    17592287 $ac_declaration
    17602288 int
    1761 @@ -2051,16 +2052,16 @@
     2289@@ -2051,16 +2054,16 @@
    17622290 }
    17632291 _ACEOF
    17642292 rm -f conftest.$ac_objext
    17652293-if { (eval echo "$as_me:2054: \"$ac_compile\"") >&5
    1766 +if { (eval echo "$as_me:2055: \"$ac_compile\"") >&5
     2294+if { (eval echo "$as_me:2057: \"$ac_compile\"") >&5
    17672295   (eval $ac_compile) 2>&5
    17682296   ac_status=$?
    17692297-  echo "$as_me:2057: \$? = $ac_status" >&5
    1770 +  echo "$as_me:2058: \$? = $ac_status" >&5
     2298+  echo "$as_me:2060: \$? = $ac_status" >&5
    17712299   (exit $ac_status); } &&
    17722300          { ac_try='test -s conftest.$ac_objext'
    17732301-  { (eval echo "$as_me:2060: \"$ac_try\"") >&5
    1774 +  { (eval echo "$as_me:2061: \"$ac_try\"") >&5
     2302+  { (eval echo "$as_me:2063: \"$ac_try\"") >&5
    17752303   (eval $ac_try) 2>&5
    17762304   ac_status=$?
    17772305-  echo "$as_me:2063: \$? = $ac_status" >&5
    1778 +  echo "$as_me:2064: \$? = $ac_status" >&5
     2306+  echo "$as_me:2066: \$? = $ac_status" >&5
    17792307   (exit $ac_status); }; }; then
    17802308   break
    17812309 else
    1782 @@ -2090,11 +2091,11 @@
     2310@@ -2090,11 +2093,11 @@
    17832311 
    17842312 GCC_VERSION=none
    17852313 if test "$GCC" = yes ; then
    17862314-       echo "$as_me:2093: checking version of $CC" >&5
    1787 +       echo "$as_me:2094: checking version of $CC" >&5
     2315+       echo "$as_me:2096: checking version of $CC" >&5
    17882316 echo $ECHO_N "checking version of $CC... $ECHO_C" >&6
    17892317        GCC_VERSION="`${CC} --version| sed -e '2,$d' -e 's/^.*(GCC) //' -e 's/^[^0-9.]*//' -e 's/[^0-9.].*//'`"
    17902318        test -z "$GCC_VERSION" && GCC_VERSION=unknown
    17912319-       echo "$as_me:2097: result: $GCC_VERSION" >&5
    1792 +       echo "$as_me:2098: result: $GCC_VERSION" >&5
     2320+       echo "$as_me:2100: result: $GCC_VERSION" >&5
    17932321 echo "${ECHO_T}$GCC_VERSION" >&6
    17942322 fi
    17952323 
    1796 @@ -2104,7 +2105,7 @@
     2324@@ -2104,7 +2107,7 @@
    17972325 ac_link='$CC -o conftest$ac_exeext $CFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5'
    17982326 ac_compiler_gnu=$ac_cv_c_compiler_gnu
    17992327 ac_main_return=return
    18002328-echo "$as_me:2107: checking how to run the C preprocessor" >&5
    1801 +echo "$as_me:2108: checking how to run the C preprocessor" >&5
     2329+echo "$as_me:2110: checking how to run the C preprocessor" >&5
    18022330 echo $ECHO_N "checking how to run the C preprocessor... $ECHO_C" >&6
    18032331 # On Suns, sometimes $CPP names a directory.
    18042332 if test -n "$CPP" && test -d "$CPP"; then
    1805 @@ -2125,18 +2126,18 @@
     2333@@ -2125,18 +2128,18 @@
    18062334   # On the NeXT, cc -E runs the code through the compiler's parser,
    18072335   # not just through cpp. "Syntax error" is here to catch this case.
    18082336   cat >conftest.$ac_ext <<_ACEOF
    18092337-#line 2128 "configure"
    1810 +#line 2129 "configure"
     2338+#line 2131 "configure"
    18112339 #include "confdefs.h"
    18122340 #include <assert.h>
    … …  
    18142342 _ACEOF
    18152343-if { (eval echo "$as_me:2133: \"$ac_cpp conftest.$ac_ext\"") >&5
    1816 +if { (eval echo "$as_me:2134: \"$ac_cpp conftest.$ac_ext\"") >&5
     2344+if { (eval echo "$as_me:2136: \"$ac_cpp conftest.$ac_ext\"") >&5
    18172345   (eval $ac_cpp conftest.$ac_ext) 2>conftest.er1
    18182346   ac_status=$?
    … …  
    18212349   cat conftest.err >&5
    18222350-  echo "$as_me:2139: \$? = $ac_status" >&5
    1823 +  echo "$as_me:2140: \$? = $ac_status" >&5
     2351+  echo "$as_me:2142: \$? = $ac_status" >&5
    18242352   (exit $ac_status); } >/dev/null; then
    18252353   if test -s conftest.err; then
    18262354     ac_cpp_err=$ac_c_preproc_warn_flag
    1827 @@ -2159,17 +2160,17 @@
     2355@@ -2159,17 +2162,17 @@
    18282356   # OK, works on sane cases.  Now check whether non-existent headers
    18292357   # can be detected and how.
    18302358   cat >conftest.$ac_ext <<_ACEOF
    18312359-#line 2162 "configure"
    1832 +#line 2163 "configure"
     2360+#line 2165 "configure"
    18332361 #include "confdefs.h"
    18342362 #include <ac_nonexistent.h>
    18352363 _ACEOF
    18362364-if { (eval echo "$as_me:2166: \"$ac_cpp conftest.$ac_ext\"") >&5
    1837 +if { (eval echo "$as_me:2167: \"$ac_cpp conftest.$ac_ext\"") >&5
     2365+if { (eval echo "$as_me:2169: \"$ac_cpp conftest.$ac_ext\"") >&5
    18382366   (eval $ac_cpp conftest.$ac_ext) 2>conftest.er1
    18392367   ac_status=$?
    … …  
    18422370   cat conftest.err >&5
    18432371-  echo "$as_me:2172: \$? = $ac_status" >&5
    1844 +  echo "$as_me:2173: \$? = $ac_status" >&5
     2372+  echo "$as_me:2175: \$? = $ac_status" >&5
    18452373   (exit $ac_status); } >/dev/null; then
    18462374   if test -s conftest.err; then
    18472375     ac_cpp_err=$ac_c_preproc_warn_flag
    1848 @@ -2206,7 +2207,7 @@
     2376@@ -2206,7 +2209,7 @@
    18492377 else
    18502378   ac_cv_prog_CPP=$CPP
    18512379 fi
    18522380-echo "$as_me:2209: result: $CPP" >&5
    1853 +echo "$as_me:2210: result: $CPP" >&5
     2381+echo "$as_me:2212: result: $CPP" >&5
    18542382 echo "${ECHO_T}$CPP" >&6
    18552383 ac_preproc_ok=false
    18562384 for ac_c_preproc_warn_flag in '' yes
    1857 @@ -2216,18 +2217,18 @@
     2385@@ -2216,18 +2219,18 @@
    18582386   # On the NeXT, cc -E runs the code through the compiler's parser,
    18592387   # not just through cpp. "Syntax error" is here to catch this case.
    18602388   cat >conftest.$ac_ext <<_ACEOF
    18612389-#line 2219 "configure"
    1862 +#line 2220 "configure"
     2390+#line 2222 "configure"
    18632391 #include "confdefs.h"
    18642392 #include <assert.h>
    … …  
    18662394 _ACEOF
    18672395-if { (eval echo "$as_me:2224: \"$ac_cpp conftest.$ac_ext\"") >&5
    1868 +if { (eval echo "$as_me:2225: \"$ac_cpp conftest.$ac_ext\"") >&5
     2396+if { (eval echo "$as_me:2227: \"$ac_cpp conftest.$ac_ext\"") >&5
    18692397   (eval $ac_cpp conftest.$ac_ext) 2>conftest.er1
    18702398   ac_status=$?
    … …  
    18732401   cat conftest.err >&5
    18742402-  echo "$as_me:2230: \$? = $ac_status" >&5
    1875 +  echo "$as_me:2231: \$? = $ac_status" >&5
     2403+  echo "$as_me:2233: \$? = $ac_status" >&5
    18762404   (exit $ac_status); } >/dev/null; then
    18772405   if test -s conftest.err; then
    18782406     ac_cpp_err=$ac_c_preproc_warn_flag
    1879 @@ -2250,17 +2251,17 @@
     2407@@ -2250,17 +2253,17 @@
    18802408   # OK, works on sane cases.  Now check whether non-existent headers
    18812409   # can be detected and how.
    18822410   cat >conftest.$ac_ext <<_ACEOF
    18832411-#line 2253 "configure"
    1884 +#line 2254 "configure"
     2412+#line 2256 "configure"
    18852413 #include "confdefs.h"
    18862414 #include <ac_nonexistent.h>
    18872415 _ACEOF
    18882416-if { (eval echo "$as_me:2257: \"$ac_cpp conftest.$ac_ext\"") >&5
    1889 +if { (eval echo "$as_me:2258: \"$ac_cpp conftest.$ac_ext\"") >&5
     2417+if { (eval echo "$as_me:2260: \"$ac_cpp conftest.$ac_ext\"") >&5
    18902418   (eval $ac_cpp conftest.$ac_ext) 2>conftest.er1
    18912419   ac_status=$?
    … …  
    18942422   cat conftest.err >&5
    18952423-  echo "$as_me:2263: \$? = $ac_status" >&5
    1896 +  echo "$as_me:2264: \$? = $ac_status" >&5
     2424+  echo "$as_me:2266: \$? = $ac_status" >&5
    18972425   (exit $ac_status); } >/dev/null; then
    18982426   if test -s conftest.err; then
    18992427     ac_cpp_err=$ac_c_preproc_warn_flag
    1900 @@ -2288,7 +2289,7 @@
     2428@@ -2288,7 +2291,7 @@
    19012429 if $ac_preproc_ok; then
    19022430   :
    19032431 else
    19042432-  { { echo "$as_me:2291: error: C preprocessor \"$CPP\" fails sanity check" >&5
    1905 +  { { echo "$as_me:2292: error: C preprocessor \"$CPP\" fails sanity check" >&5
     2433+  { { echo "$as_me:2294: error: C preprocessor \"$CPP\" fails sanity check" >&5
    19062434 echo "$as_me: error: C preprocessor \"$CPP\" fails sanity check" >&2;}
    19072435    { (exit 1); exit 1; }; }
    19082436 fi
    1909 @@ -2301,14 +2302,14 @@
     2437@@ -2301,14 +2304,14 @@
    19102438 ac_main_return=return
    19112439 
    19122440 if test $ac_cv_c_compiler_gnu = yes; then
    19132441-    echo "$as_me:2304: checking whether $CC needs -traditional" >&5
    1914 +    echo "$as_me:2305: checking whether $CC needs -traditional" >&5
     2442+    echo "$as_me:2307: checking whether $CC needs -traditional" >&5
    19152443 echo $ECHO_N "checking whether $CC needs -traditional... $ECHO_C" >&6
    19162444 if test "${ac_cv_prog_gcc_traditional+set}" = set; then
    … …  
    19202448   cat >conftest.$ac_ext <<_ACEOF
    19212449-#line 2311 "configure"
    1922 +#line 2312 "configure"
     2450+#line 2314 "configure"
    19232451 #include "confdefs.h"
    19242452 #include <sgtty.h>
    19252453 int Autoconf = TIOCGETP;
    1926 @@ -2323,7 +2324,7 @@
     2454@@ -2323,7 +2326,7 @@
    19272455 
    19282456   if test $ac_cv_prog_gcc_traditional = no; then
    19292457     cat >conftest.$ac_ext <<_ACEOF
    19302458-#line 2326 "configure"
    1931 +#line 2327 "configure"
     2459+#line 2329 "configure"
    19322460 #include "confdefs.h"
    19332461 #include <termio.h>
    19342462 int Autoconf = TCGETA;
    1935 @@ -2336,14 +2337,14 @@
     2463@@ -2336,14 +2339,14 @@
    19362464 
    19372465   fi
    19382466 fi
    19392467-echo "$as_me:2339: result: $ac_cv_prog_gcc_traditional" >&5
    1940 +echo "$as_me:2340: result: $ac_cv_prog_gcc_traditional" >&5
     2468+echo "$as_me:2342: result: $ac_cv_prog_gcc_traditional" >&5
    19412469 echo "${ECHO_T}$ac_cv_prog_gcc_traditional" >&6
    19422470   if test $ac_cv_prog_gcc_traditional = yes; then
    … …  
    19462474 
    19472475-echo "$as_me:2346: checking whether $CC understands -c and -o together" >&5
    1948 +echo "$as_me:2347: checking whether $CC understands -c and -o together" >&5
     2476+echo "$as_me:2349: checking whether $CC understands -c and -o together" >&5
    19492477 echo $ECHO_N "checking whether $CC understands -c and -o together... $ECHO_C" >&6
    19502478 if test "${cf_cv_prog_CC_c_o+set}" = set; then
    19512479   echo $ECHO_N "(cached) $ECHO_C" >&6
    1952 @@ -2359,15 +2360,15 @@
     2480@@ -2359,15 +2362,15 @@
    19532481 # We do the test twice because some compilers refuse to overwrite an
    19542482 # existing .o file with -o, though they will create one.
    19552483 ac_try='$CC -c conftest.$ac_ext -o conftest2.$ac_objext >&5'
    19562484-if { (eval echo "$as_me:2362: \"$ac_try\"") >&5
    1957 +if { (eval echo "$as_me:2363: \"$ac_try\"") >&5
     2485+if { (eval echo "$as_me:2365: \"$ac_try\"") >&5
    19582486   (eval $ac_try) 2>&5
    19592487   ac_status=$?
    19602488-  echo "$as_me:2365: \$? = $ac_status" >&5
    1961 +  echo "$as_me:2366: \$? = $ac_status" >&5
     2489+  echo "$as_me:2368: \$? = $ac_status" >&5
    19622490   (exit $ac_status); } &&
    19632491-  test -f conftest2.$ac_objext && { (eval echo "$as_me:2367: \"$ac_try\"") >&5
    1964 +  test -f conftest2.$ac_objext && { (eval echo "$as_me:2368: \"$ac_try\"") >&5
     2492+  test -f conftest2.$ac_objext && { (eval echo "$as_me:2370: \"$ac_try\"") >&5
    19652493   (eval $ac_try) 2>&5
    19662494   ac_status=$?
    19672495-  echo "$as_me:2370: \$? = $ac_status" >&5
    1968 +  echo "$as_me:2371: \$? = $ac_status" >&5
     2496+  echo "$as_me:2373: \$? = $ac_status" >&5
    19692497   (exit $ac_status); };
    19702498 then
    19712499   eval cf_cv_prog_CC_c_o=yes
    1972 @@ -2378,19 +2379,19 @@
     2500@@ -2378,19 +2381,19 @@
    19732501 
    19742502 fi
    19752503 if test $cf_cv_prog_CC_c_o = yes; then
    19762504-  echo "$as_me:2381: result: yes" >&5
    1977 +  echo "$as_me:2382: result: yes" >&5
     2505+  echo "$as_me:2384: result: yes" >&5
    19782506 echo "${ECHO_T}yes" >&6
    19792507 else
    19802508-  echo "$as_me:2384: result: no" >&5
    1981 +  echo "$as_me:2385: result: no" >&5
     2509+  echo "$as_me:2387: result: no" >&5
    19822510 echo "${ECHO_T}no" >&6
    19832511 fi
    19842512 
    19852513-echo "$as_me:2388: checking for POSIXized ISC" >&5
    1986 +echo "$as_me:2389: checking for POSIXized ISC" >&5
     2514+echo "$as_me:2391: checking for POSIXized ISC" >&5
    19872515 echo $ECHO_N "checking for POSIXized ISC... $ECHO_C" >&6
    19882516 if test -d /etc/conf/kconfig.d &&
    … …  
    19902518 then
    19912519-  echo "$as_me:2393: result: yes" >&5
    1992 +  echo "$as_me:2394: result: yes" >&5
     2520+  echo "$as_me:2396: result: yes" >&5
    19932521 echo "${ECHO_T}yes" >&6
    19942522   ISC=yes # If later tests want to check for ISC.
    19952523 
    1996 @@ -2404,12 +2405,12 @@
     2524@@ -2404,12 +2407,12 @@
    19972525     CC="$CC -Xp"
    19982526   fi
    19992527 else
    20002528-  echo "$as_me:2407: result: no" >&5
    2001 +  echo "$as_me:2408: result: no" >&5
     2529+  echo "$as_me:2410: result: no" >&5
    20022530 echo "${ECHO_T}no" >&6
    20032531   ISC=
    … …  
    20052533 
    20062534-echo "$as_me:2412: checking for ${CC-cc} option to accept ANSI C" >&5
    2007 +echo "$as_me:2413: checking for ${CC-cc} option to accept ANSI C" >&5
     2535+echo "$as_me:2415: checking for ${CC-cc} option to accept ANSI C" >&5
    20082536 echo $ECHO_N "checking for ${CC-cc} option to accept ANSI C... $ECHO_C" >&6
    20092537 if test "${cf_cv_ansi_cc+set}" = set; then
    20102538   echo $ECHO_N "(cached) $ECHO_C" >&6
    2011 @@ -2503,7 +2504,7 @@
     2539@@ -2503,7 +2506,7 @@
    20122540 fi
    20132541 
    20142542        cat >conftest.$ac_ext <<_ACEOF
    20152543-#line 2506 "configure"
    2016 +#line 2507 "configure"
     2544+#line 2509 "configure"
    20172545 #include "confdefs.h"
    20182546 
    20192547 #ifndef CC_HAS_PROTOS
    2020 @@ -2524,16 +2525,16 @@
     2548@@ -2524,16 +2527,16 @@
    20212549 }
    20222550 _ACEOF
    20232551 rm -f conftest.$ac_objext
    20242552-if { (eval echo "$as_me:2527: \"$ac_compile\"") >&5
    2025 +if { (eval echo "$as_me:2528: \"$ac_compile\"") >&5
     2553+if { (eval echo "$as_me:2530: \"$ac_compile\"") >&5
    20262554   (eval $ac_compile) 2>&5
    20272555   ac_status=$?
    20282556-  echo "$as_me:2530: \$? = $ac_status" >&5
    2029 +  echo "$as_me:2531: \$? = $ac_status" >&5
     2557+  echo "$as_me:2533: \$? = $ac_status" >&5
    20302558   (exit $ac_status); } &&
    20312559          { ac_try='test -s conftest.$ac_objext'
    20322560-  { (eval echo "$as_me:2533: \"$ac_try\"") >&5
    2033 +  { (eval echo "$as_me:2534: \"$ac_try\"") >&5
     2561+  { (eval echo "$as_me:2536: \"$ac_try\"") >&5
    20342562   (eval $ac_try) 2>&5
    20352563   ac_status=$?
    20362564-  echo "$as_me:2536: \$? = $ac_status" >&5
    2037 +  echo "$as_me:2537: \$? = $ac_status" >&5
     2565+  echo "$as_me:2539: \$? = $ac_status" >&5
    20382566   (exit $ac_status); }; }; then
    20392567   cf_cv_ansi_cc="$cf_arg"; break
    20402568 else
    2041 @@ -2546,7 +2547,7 @@
     2569@@ -2546,7 +2549,7 @@
    20422570 CPPFLAGS="$cf_save_CPPFLAGS"
    20432571 
    20442572 fi
    20452573-echo "$as_me:2549: result: $cf_cv_ansi_cc" >&5
    2046 +echo "$as_me:2550: result: $cf_cv_ansi_cc" >&5
     2574+echo "$as_me:2552: result: $cf_cv_ansi_cc" >&5
    20472575 echo "${ECHO_T}$cf_cv_ansi_cc" >&6
    20482576 
    20492577 if test "$cf_cv_ansi_cc" != "no"; then
    2050 @@ -2629,7 +2630,7 @@
     2578@@ -2629,7 +2632,7 @@
    20512579 fi
    20522580 
    20532581 if test "$cf_cv_ansi_cc" = "no"; then
    20542582-       { { echo "$as_me:2632: error: Your compiler does not appear to recognize prototypes.
    2055 +       { { echo "$as_me:2633: error: Your compiler does not appear to recognize prototypes.
     2583+       { { echo "$as_me:2635: error: Your compiler does not appear to recognize prototypes.
    20562584 You have the following choices:
    20572585        a. adjust your compiler options
    20582586        b. get an up-to-date compiler
    2059 @@ -2663,13 +2664,13 @@
     2587@@ -2663,13 +2666,13 @@
    20602588   LDCONFIG=:
    20612589 else
    … …  
    20692597 set dummy ldconfig; ac_word=$2
    20702598-echo "$as_me:2672: checking for $ac_word" >&5
    2071 +echo "$as_me:2673: checking for $ac_word" >&5
     2599+echo "$as_me:2675: checking for $ac_word" >&5
    20722600 echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6
    20732601 if test "${ac_cv_path_LDCONFIG+set}" = set; then
    20742602   echo $ECHO_N "(cached) $ECHO_C" >&6
    2075 @@ -2686,7 +2687,7 @@
     2603@@ -2686,7 +2689,7 @@
    20762604   test -z "$ac_dir" && ac_dir=.
    20772605   if $as_executable_p "$ac_dir/$ac_word"; then
    20782606    ac_cv_path_LDCONFIG="$ac_dir/$ac_word"
    20792607-   echo "$as_me:2689: found $ac_dir/$ac_word" >&5
    2080 +   echo "$as_me:2690: found $ac_dir/$ac_word" >&5
     2608+   echo "$as_me:2692: found $ac_dir/$ac_word" >&5
    20812609    break
    20822610 fi
    20832611 done
    2084 @@ -2697,10 +2698,10 @@
     2612@@ -2697,10 +2700,10 @@
    20852613 LDCONFIG=$ac_cv_path_LDCONFIG
    20862614 
    20872615 if test -n "$LDCONFIG"; then
    20882616-  echo "$as_me:2700: result: $LDCONFIG" >&5
    2089 +  echo "$as_me:2701: result: $LDCONFIG" >&5
     2617+  echo "$as_me:2703: result: $LDCONFIG" >&5
    20902618 echo "${ECHO_T}$LDCONFIG" >&6
    20912619 else
    20922620-  echo "$as_me:2703: result: no" >&5
    2093 +  echo "$as_me:2704: result: no" >&5
     2621+  echo "$as_me:2706: result: no" >&5
    20942622 echo "${ECHO_T}no" >&6
    20952623 fi
    20962624 
    2097 @@ -2708,7 +2709,7 @@
     2625@@ -2708,7 +2711,7 @@
    20982626 esac
    20992627 fi
    21002628 
    21012629-echo "$as_me:2711: checking if you want to ensure bool is consistent with C++" >&5
    2102 +echo "$as_me:2712: checking if you want to ensure bool is consistent with C++" >&5
     2630+echo "$as_me:2714: checking if you want to ensure bool is consistent with C++" >&5
    21032631 echo $ECHO_N "checking if you want to ensure bool is consistent with C++... $ECHO_C" >&6
    21042632 
    21052633 # Check whether --with-cxx or --without-cxx was given.
    2106 @@ -2718,7 +2719,7 @@
     2634@@ -2718,7 +2721,7 @@
    21072635 else
    21082636   cf_with_cxx=yes
    21092637 fi;
    21102638-echo "$as_me:2721: result: $cf_with_cxx" >&5
    2111 +echo "$as_me:2722: result: $cf_with_cxx" >&5
     2639+echo "$as_me:2724: result: $cf_with_cxx" >&5
    21122640 echo "${ECHO_T}$cf_with_cxx" >&6
    21132641 if test "X$cf_with_cxx" = Xno ; then
    21142642        CXX=""
    2115 @@ -2736,7 +2737,7 @@
     2643@@ -2736,7 +2739,7 @@
    21162644   do
    21172645     # Extract the first word of "$ac_tool_prefix$ac_prog", so it can be a program name with args.
    21182646 set dummy $ac_tool_prefix$ac_prog; ac_word=$2
    21192647-echo "$as_me:2739: checking for $ac_word" >&5
    2120 +echo "$as_me:2740: checking for $ac_word" >&5
     2648+echo "$as_me:2742: checking for $ac_word" >&5
    21212649 echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6
    21222650 if test "${ac_cv_prog_CXX+set}" = set; then
    21232651   echo $ECHO_N "(cached) $ECHO_C" >&6
    2124 @@ -2751,7 +2752,7 @@
     2652@@ -2751,7 +2754,7 @@
    21252653   test -z "$ac_dir" && ac_dir=.
    21262654   $as_executable_p "$ac_dir/$ac_word" || continue
    21272655 ac_cv_prog_CXX="$ac_tool_prefix$ac_prog"
    21282656-echo "$as_me:2754: found $ac_dir/$ac_word" >&5
    2129 +echo "$as_me:2755: found $ac_dir/$ac_word" >&5
     2657+echo "$as_me:2757: found $ac_dir/$ac_word" >&5
    21302658 break
    21312659 done
    21322660 
    2133 @@ -2759,10 +2760,10 @@
     2661@@ -2759,10 +2762,10 @@
    21342662 fi
    21352663 CXX=$ac_cv_prog_CXX
    21362664 if test -n "$CXX"; then
    21372665-  echo "$as_me:2762: result: $CXX" >&5
    2138 +  echo "$as_me:2763: result: $CXX" >&5
     2666+  echo "$as_me:2765: result: $CXX" >&5
    21392667 echo "${ECHO_T}$CXX" >&6
    21402668 else
    21412669-  echo "$as_me:2765: result: no" >&5
    2142 +  echo "$as_me:2766: result: no" >&5
     2670+  echo "$as_me:2768: result: no" >&5
    21432671 echo "${ECHO_T}no" >&6
    21442672 fi
    21452673 
    2146 @@ -2775,7 +2776,7 @@
     2674@@ -2775,7 +2778,7 @@
    21472675 do
    21482676   # Extract the first word of "$ac_prog", so it can be a program name with args.
    21492677 set dummy $ac_prog; ac_word=$2
    21502678-echo "$as_me:2778: checking for $ac_word" >&5
    2151 +echo "$as_me:2779: checking for $ac_word" >&5
     2679+echo "$as_me:2781: checking for $ac_word" >&5
    21522680 echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6
    21532681 if test "${ac_cv_prog_ac_ct_CXX+set}" = set; then
    21542682   echo $ECHO_N "(cached) $ECHO_C" >&6
    2155 @@ -2790,7 +2791,7 @@
     2683@@ -2790,7 +2793,7 @@
    21562684   test -z "$ac_dir" && ac_dir=.
    21572685   $as_executable_p "$ac_dir/$ac_word" || continue
    21582686 ac_cv_prog_ac_ct_CXX="$ac_prog"
    21592687-echo "$as_me:2793: found $ac_dir/$ac_word" >&5
    2160 +echo "$as_me:2794: found $ac_dir/$ac_word" >&5
     2688+echo "$as_me:2796: found $ac_dir/$ac_word" >&5
    21612689 break
    21622690 done
    21632691 
    2164 @@ -2798,10 +2799,10 @@
     2692@@ -2798,10 +2801,10 @@
    21652693 fi
    21662694 ac_ct_CXX=$ac_cv_prog_ac_ct_CXX
    21672695 if test -n "$ac_ct_CXX"; then
    21682696-  echo "$as_me:2801: result: $ac_ct_CXX" >&5
    2169 +  echo "$as_me:2802: result: $ac_ct_CXX" >&5
     2697+  echo "$as_me:2804: result: $ac_ct_CXX" >&5
    21702698 echo "${ECHO_T}$ac_ct_CXX" >&6
    21712699 else
    21722700-  echo "$as_me:2804: result: no" >&5
    2173 +  echo "$as_me:2805: result: no" >&5
     2701+  echo "$as_me:2807: result: no" >&5
    21742702 echo "${ECHO_T}no" >&6
    21752703 fi
    21762704 
    2177 @@ -2813,32 +2814,32 @@
     2705@@ -2813,32 +2816,32 @@
    21782706 fi
    21792707 
    21802708 # Provide some information about the compiler.
    21812709-echo "$as_me:2816:" \
    2182 +echo "$as_me:2817:" \
     2710+echo "$as_me:2819:" \
    21832711      "checking for C++ compiler version" >&5
    21842712 ac_compiler=`set X $ac_compile; echo $2`
    21852713-{ (eval echo "$as_me:2819: \"$ac_compiler --version </dev/null >&5\"") >&5
    2186 +{ (eval echo "$as_me:2820: \"$ac_compiler --version </dev/null >&5\"") >&5
     2714+{ (eval echo "$as_me:2822: \"$ac_compiler --version </dev/null >&5\"") >&5
    21872715   (eval $ac_compiler --version </dev/null >&5) 2>&5
    21882716   ac_status=$?
    21892717-  echo "$as_me:2822: \$? = $ac_status" >&5
    2190 +  echo "$as_me:2823: \$? = $ac_status" >&5
     2718+  echo "$as_me:2825: \$? = $ac_status" >&5
    21912719   (exit $ac_status); }
    21922720-{ (eval echo "$as_me:2824: \"$ac_compiler -v </dev/null >&5\"") >&5
    2193 +{ (eval echo "$as_me:2825: \"$ac_compiler -v </dev/null >&5\"") >&5
     2721+{ (eval echo "$as_me:2827: \"$ac_compiler -v </dev/null >&5\"") >&5
    21942722   (eval $ac_compiler -v </dev/null >&5) 2>&5
    21952723   ac_status=$?
    21962724-  echo "$as_me:2827: \$? = $ac_status" >&5
    2197 +  echo "$as_me:2828: \$? = $ac_status" >&5
     2725+  echo "$as_me:2830: \$? = $ac_status" >&5
    21982726   (exit $ac_status); }
    21992727-{ (eval echo "$as_me:2829: \"$ac_compiler -V </dev/null >&5\"") >&5
    2200 +{ (eval echo "$as_me:2830: \"$ac_compiler -V </dev/null >&5\"") >&5
     2728+{ (eval echo "$as_me:2832: \"$ac_compiler -V </dev/null >&5\"") >&5
    22012729   (eval $ac_compiler -V </dev/null >&5) 2>&5
    22022730   ac_status=$?
    22032731-  echo "$as_me:2832: \$? = $ac_status" >&5
    2204 +  echo "$as_me:2833: \$? = $ac_status" >&5
     2732+  echo "$as_me:2835: \$? = $ac_status" >&5
    22052733   (exit $ac_status); }
    22062734 
    22072735-echo "$as_me:2835: checking whether we are using the GNU C++ compiler" >&5
    2208 +echo "$as_me:2836: checking whether we are using the GNU C++ compiler" >&5
     2736+echo "$as_me:2838: checking whether we are using the GNU C++ compiler" >&5
    22092737 echo $ECHO_N "checking whether we are using the GNU C++ compiler... $ECHO_C" >&6
    22102738 if test "${ac_cv_cxx_compiler_gnu+set}" = set; then
    … …  
    22132741   cat >conftest.$ac_ext <<_ACEOF
    22142742-#line 2841 "configure"
    2215 +#line 2842 "configure"
     2743+#line 2844 "configure"
    22162744 #include "confdefs.h"
    22172745 
    22182746 int
    2219 @@ -2853,16 +2854,16 @@
     2747@@ -2853,16 +2856,16 @@
    22202748 }
    22212749 _ACEOF
    22222750 rm -f conftest.$ac_objext
    22232751-if { (eval echo "$as_me:2856: \"$ac_compile\"") >&5
    2224 +if { (eval echo "$as_me:2857: \"$ac_compile\"") >&5
     2752+if { (eval echo "$as_me:2859: \"$ac_compile\"") >&5
    22252753   (eval $ac_compile) 2>&5
    22262754   ac_status=$?
    22272755-  echo "$as_me:2859: \$? = $ac_status" >&5
    2228 +  echo "$as_me:2860: \$? = $ac_status" >&5
     2756+  echo "$as_me:2862: \$? = $ac_status" >&5
    22292757   (exit $ac_status); } &&
    22302758          { ac_try='test -s conftest.$ac_objext'
    22312759-  { (eval echo "$as_me:2862: \"$ac_try\"") >&5
    2232 +  { (eval echo "$as_me:2863: \"$ac_try\"") >&5
     2760+  { (eval echo "$as_me:2865: \"$ac_try\"") >&5
    22332761   (eval $ac_try) 2>&5
    22342762   ac_status=$?
    22352763-  echo "$as_me:2865: \$? = $ac_status" >&5
    2236 +  echo "$as_me:2866: \$? = $ac_status" >&5
     2764+  echo "$as_me:2868: \$? = $ac_status" >&5
    22372765   (exit $ac_status); }; }; then
    22382766   ac_compiler_gnu=yes
    22392767 else
    2240 @@ -2874,19 +2875,19 @@
     2768@@ -2874,19 +2877,19 @@
    22412769 ac_cv_cxx_compiler_gnu=$ac_compiler_gnu
    22422770 
    22432771 fi
    22442772-echo "$as_me:2877: result: $ac_cv_cxx_compiler_gnu" >&5
    2245 +echo "$as_me:2878: result: $ac_cv_cxx_compiler_gnu" >&5
     2773+echo "$as_me:2880: result: $ac_cv_cxx_compiler_gnu" >&5
    22462774 echo "${ECHO_T}$ac_cv_cxx_compiler_gnu" >&6
    22472775 GXX=`test $ac_compiler_gnu = yes && echo yes`
    … …  
    22502778 CXXFLAGS="-g"
    22512779-echo "$as_me:2883: checking whether $CXX accepts -g" >&5
    2252 +echo "$as_me:2884: checking whether $CXX accepts -g" >&5
     2780+echo "$as_me:2886: checking whether $CXX accepts -g" >&5
    22532781 echo $ECHO_N "checking whether $CXX accepts -g... $ECHO_C" >&6
    22542782 if test "${ac_cv_prog_cxx_g+set}" = set; then
    … …  
    22572785   cat >conftest.$ac_ext <<_ACEOF
    22582786-#line 2889 "configure"
    2259 +#line 2890 "configure"
     2787+#line 2892 "configure"
    22602788 #include "confdefs.h"
    22612789 
    22622790 int
    2263 @@ -2898,16 +2899,16 @@
     2791@@ -2898,16 +2901,16 @@
    22642792 }
    22652793 _ACEOF
    22662794 rm -f conftest.$ac_objext
    22672795-if { (eval echo "$as_me:2901: \"$ac_compile\"") >&5
    2268 +if { (eval echo "$as_me:2902: \"$ac_compile\"") >&5
     2796+if { (eval echo "$as_me:2904: \"$ac_compile\"") >&5
    22692797   (eval $ac_compile) 2>&5
    22702798   ac_status=$?
    22712799-  echo "$as_me:2904: \$? = $ac_status" >&5
    2272 +  echo "$as_me:2905: \$? = $ac_status" >&5
     2800+  echo "$as_me:2907: \$? = $ac_status" >&5
    22732801   (exit $ac_status); } &&
    22742802          { ac_try='test -s conftest.$ac_objext'
    22752803-  { (eval echo "$as_me:2907: \"$ac_try\"") >&5
    2276 +  { (eval echo "$as_me:2908: \"$ac_try\"") >&5
     2804+  { (eval echo "$as_me:2910: \"$ac_try\"") >&5
    22772805   (eval $ac_try) 2>&5
    22782806   ac_status=$?
    22792807-  echo "$as_me:2910: \$? = $ac_status" >&5
    2280 +  echo "$as_me:2911: \$? = $ac_status" >&5
     2808+  echo "$as_me:2913: \$? = $ac_status" >&5
    22812809   (exit $ac_status); }; }; then
    22822810   ac_cv_prog_cxx_g=yes
    22832811 else
    2284 @@ -2917,7 +2918,7 @@
     2812@@ -2917,7 +2920,7 @@
    22852813 fi
    22862814 rm -f conftest.$ac_objext conftest.$ac_ext
    22872815 fi
    22882816-echo "$as_me:2920: result: $ac_cv_prog_cxx_g" >&5
    2289 +echo "$as_me:2921: result: $ac_cv_prog_cxx_g" >&5
     2817+echo "$as_me:2923: result: $ac_cv_prog_cxx_g" >&5
    22902818 echo "${ECHO_T}$ac_cv_prog_cxx_g" >&6
    22912819 if test "$ac_test_CXXFLAGS" = set; then
    22922820   CXXFLAGS=$ac_save_CXXFLAGS
    2293 @@ -2944,7 +2945,7 @@
     2821@@ -2944,7 +2947,7 @@
    22942822    'void exit (int);'
    22952823 do
    22962824   cat >conftest.$ac_ext <<_ACEOF
    22972825-#line 2947 "configure"
    2298 +#line 2948 "configure"
     2826+#line 2950 "configure"
    22992827 #include "confdefs.h"
    23002828 #include <stdlib.h>
    23012829 $ac_declaration
    2302 @@ -2957,16 +2958,16 @@
     2830@@ -2957,16 +2960,16 @@
    23032831 }
    23042832 _ACEOF
    23052833 rm -f conftest.$ac_objext
    23062834-if { (eval echo "$as_me:2960: \"$ac_compile\"") >&5
    2307 +if { (eval echo "$as_me:2961: \"$ac_compile\"") >&5
     2835+if { (eval echo "$as_me:2963: \"$ac_compile\"") >&5
    23082836   (eval $ac_compile) 2>&5
    23092837   ac_status=$?
    23102838-  echo "$as_me:2963: \$? = $ac_status" >&5
    2311 +  echo "$as_me:2964: \$? = $ac_status" >&5
     2839+  echo "$as_me:2966: \$? = $ac_status" >&5
    23122840   (exit $ac_status); } &&
    23132841          { ac_try='test -s conftest.$ac_objext'
    23142842-  { (eval echo "$as_me:2966: \"$ac_try\"") >&5
    2315 +  { (eval echo "$as_me:2967: \"$ac_try\"") >&5
     2843+  { (eval echo "$as_me:2969: \"$ac_try\"") >&5
    23162844   (eval $ac_try) 2>&5
    23172845   ac_status=$?
    23182846-  echo "$as_me:2969: \$? = $ac_status" >&5
    2319 +  echo "$as_me:2970: \$? = $ac_status" >&5
     2847+  echo "$as_me:2972: \$? = $ac_status" >&5
    23202848   (exit $ac_status); }; }; then
    23212849   :
    23222850 else
    2323 @@ -2976,7 +2977,7 @@
     2851@@ -2976,7 +2979,7 @@
    23242852 fi
    23252853 rm -f conftest.$ac_objext conftest.$ac_ext
    23262854   cat >conftest.$ac_ext <<_ACEOF
    23272855-#line 2979 "configure"
    2328 +#line 2980 "configure"
     2856+#line 2982 "configure"
    23292857 #include "confdefs.h"
    23302858 $ac_declaration
    23312859 int
    2332 @@ -2988,16 +2989,16 @@
     2860@@ -2988,16 +2991,16 @@
    23332861 }
    23342862 _ACEOF
    23352863 rm -f conftest.$ac_objext
    23362864-if { (eval echo "$as_me:2991: \"$ac_compile\"") >&5
    2337 +if { (eval echo "$as_me:2992: \"$ac_compile\"") >&5
     2865+if { (eval echo "$as_me:2994: \"$ac_compile\"") >&5
    23382866   (eval $ac_compile) 2>&5
    23392867   ac_status=$?
    23402868-  echo "$as_me:2994: \$? = $ac_status" >&5
    2341 +  echo "$as_me:2995: \$? = $ac_status" >&5
     2869+  echo "$as_me:2997: \$? = $ac_status" >&5
    23422870   (exit $ac_status); } &&
    23432871          { ac_try='test -s conftest.$ac_objext'
    23442872-  { (eval echo "$as_me:2997: \"$ac_try\"") >&5
    2345 +  { (eval echo "$as_me:2998: \"$ac_try\"") >&5
     2873+  { (eval echo "$as_me:3000: \"$ac_try\"") >&5
    23462874   (eval $ac_try) 2>&5
    23472875   ac_status=$?
    23482876-  echo "$as_me:3000: \$? = $ac_status" >&5
    2349 +  echo "$as_me:3001: \$? = $ac_status" >&5
     2877+  echo "$as_me:3003: \$? = $ac_status" >&5
    23502878   (exit $ac_status); }; }; then
    23512879   break
    23522880 else
    2353 @@ -3024,7 +3025,7 @@
     2881@@ -3024,7 +3027,7 @@
    23542882        if test "$CXX" = "g++" ; then
    23552883                # Extract the first word of "g++", so it can be a program name with args.
    23562884 set dummy g++; ac_word=$2
    23572885-echo "$as_me:3027: checking for $ac_word" >&5
    2358 +echo "$as_me:3028: checking for $ac_word" >&5
     2886+echo "$as_me:3030: checking for $ac_word" >&5
    23592887 echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6
    23602888 if test "${ac_cv_path_CXX+set}" = set; then
    23612889   echo $ECHO_N "(cached) $ECHO_C" >&6
    2362 @@ -3041,7 +3042,7 @@
     2890@@ -3041,7 +3044,7 @@
    23632891   test -z "$ac_dir" && ac_dir=.
    23642892   if $as_executable_p "$ac_dir/$ac_word"; then
    23652893    ac_cv_path_CXX="$ac_dir/$ac_word"
    23662894-   echo "$as_me:3044: found $ac_dir/$ac_word" >&5
    2367 +   echo "$as_me:3045: found $ac_dir/$ac_word" >&5
     2895+   echo "$as_me:3047: found $ac_dir/$ac_word" >&5
    23682896    break
    23692897 fi
    23702898 done
    2371 @@ -3052,16 +3053,16 @@
     2899@@ -3052,16 +3055,16 @@
    23722900 CXX=$ac_cv_path_CXX
    23732901 
    23742902 if test -n "$CXX"; then
    23752903-  echo "$as_me:3055: result: $CXX" >&5
    2376 +  echo "$as_me:3056: result: $CXX" >&5
     2904+  echo "$as_me:3058: result: $CXX" >&5
    23772905 echo "${ECHO_T}$CXX" >&6
    23782906 else
    23792907-  echo "$as_me:3058: result: no" >&5
    2380 +  echo "$as_me:3059: result: no" >&5
     2908+  echo "$as_me:3061: result: no" >&5
    23812909 echo "${ECHO_T}no" >&6
    23822910 fi
    … …  
    23852913        if test "$CXX" = "g++" ; then
    23862914-               { echo "$as_me:3064: WARNING: ignoring hardcoded g++" >&5
    2387 +               { echo "$as_me:3065: WARNING: ignoring hardcoded g++" >&5
     2915+               { echo "$as_me:3067: WARNING: ignoring hardcoded g++" >&5
    23882916 echo "$as_me: WARNING: ignoring hardcoded g++" >&2;}
    23892917                cf_with_cxx=no; CXX=""; GXX="";
    23902918        fi
    2391 @@ -3069,11 +3070,11 @@
     2919@@ -3069,11 +3072,11 @@
    23922920 
    23932921 GXX_VERSION=none
    23942922 if test "$GXX" = yes; then
    23952923-       echo "$as_me:3072: checking version of g++" >&5
    2396 +       echo "$as_me:3073: checking version of g++" >&5
     2924+       echo "$as_me:3075: checking version of g++" >&5
    23972925 echo $ECHO_N "checking version of g++... $ECHO_C" >&6
    23982926        GXX_VERSION="`${CXX-g++} --version| sed -e '2,$d' -e 's/^.*(GCC) //' -e 's/^[^0-9.]*//' -e 's/[^0-9.].*//'`"
    23992927        test -z "$GXX_VERSION" && GXX_VERSION=unknown
    24002928-       echo "$as_me:3076: result: $GXX_VERSION" >&5
    2401 +       echo "$as_me:3077: result: $GXX_VERSION" >&5
     2929+       echo "$as_me:3079: result: $GXX_VERSION" >&5
    24022930 echo "${ECHO_T}$GXX_VERSION" >&6
    24032931 fi
    24042932 
    2405 @@ -3081,12 +3082,12 @@
     2933@@ -3081,12 +3084,12 @@
    24062934 1*|2.[0-6]*)
    24072935        # GXX=""; CXX=""; ac_cv_prog_gxx=no
    24082936        # cf_cxx_library=no
    24092937-       { echo "$as_me:3084: WARNING: templates do not work" >&5
    2410 +       { echo "$as_me:3085: WARNING: templates do not work" >&5
     2938+       { echo "$as_me:3087: WARNING: templates do not work" >&5
    24112939 echo "$as_me: WARNING: templates do not work" >&2;}
    24122940        ;;
    … …  
    24142942 
    24152943-echo "$as_me:3089: checking if you want to build C++ binding and demo" >&5
    2416 +echo "$as_me:3090: checking if you want to build C++ binding and demo" >&5
     2944+echo "$as_me:3092: checking if you want to build C++ binding and demo" >&5
    24172945 echo $ECHO_N "checking if you want to build C++ binding and demo... $ECHO_C" >&6
    24182946 
    24192947 # Check whether --with-cxx-binding or --without-cxx-binding was given.
    2420 @@ -3096,10 +3097,10 @@
     2948@@ -3096,10 +3099,10 @@
    24212949 else
    24222950   cf_with_cxx_binding=$cf_with_cxx
    24232951 fi;
    24242952-echo "$as_me:3099: result: $cf_with_cxx_binding" >&5
    2425 +echo "$as_me:3100: result: $cf_with_cxx_binding" >&5
     2953+echo "$as_me:3102: result: $cf_with_cxx_binding" >&5
    24262954 echo "${ECHO_T}$cf_with_cxx_binding" >&6
    24272955 
    24282956-echo "$as_me:3102: checking if you want to build with Ada95" >&5
    2429 +echo "$as_me:3103: checking if you want to build with Ada95" >&5
     2957+echo "$as_me:3105: checking if you want to build with Ada95" >&5
    24302958 echo $ECHO_N "checking if you want to build with Ada95... $ECHO_C" >&6
    24312959 
    24322960 # Check whether --with-ada or --without-ada was given.
    2433 @@ -3109,10 +3110,23 @@
     2961@@ -3109,10 +3112,23 @@
    24342962 else
    24352963   cf_with_ada=yes
    24362964 fi;
    24372965-echo "$as_me:3112: result: $cf_with_ada" >&5
    2438 +echo "$as_me:3113: result: $cf_with_ada" >&5
     2966+echo "$as_me:3115: result: $cf_with_ada" >&5
    24392967 echo "${ECHO_T}$cf_with_ada" >&6
    24402968 
    24412969-echo "$as_me:3115: checking if you want to build programs such as tic" >&5
    2442 +echo "$as_me:3116: checking if you want to install manpages" >&5
     2970+echo "$as_me:3118: checking if you want to install manpages" >&5
    24432971+echo $ECHO_N "checking if you want to install manpages... $ECHO_C" >&6
    24442972+
    … …  
    24502978+  cf_with_manpages=yes
    24512979+fi;
    2452 +echo "$as_me:3126: result: $cf_with_manpages" >&5
     2980+echo "$as_me:3128: result: $cf_with_manpages" >&5
    24532981+echo "${ECHO_T}$cf_with_manpages" >&6
    24542982+
    2455 +echo "$as_me:3129: checking if you want to build programs such as tic" >&5
     2983+echo "$as_me:3131: checking if you want to build programs such as tic" >&5
    24562984 echo $ECHO_N "checking if you want to build programs such as tic... $ECHO_C" >&6
    24572985 
    24582986 # Check whether --with-progs or --without-progs was given.
    2459 @@ -3122,10 +3136,10 @@
     2987@@ -3122,10 +3138,10 @@
    24602988 else
    24612989   cf_with_progs=yes
    24622990 fi;
    24632991-echo "$as_me:3125: result: $cf_with_progs" >&5
    2464 +echo "$as_me:3139: result: $cf_with_progs" >&5
     2992+echo "$as_me:3141: result: $cf_with_progs" >&5
    24652993 echo "${ECHO_T}$cf_with_progs" >&6
    24662994 
    24672995-echo "$as_me:3128: checking if you wish to install curses.h" >&5
    2468 +echo "$as_me:3142: checking if you wish to install curses.h" >&5
     2996+echo "$as_me:3144: checking if you wish to install curses.h" >&5
    24692997 echo $ECHO_N "checking if you wish to install curses.h... $ECHO_C" >&6
    24702998 
    24712999 # Check whether --with-curses-h or --without-curses-h was given.
    2472 @@ -3135,7 +3149,7 @@
     3000@@ -3135,7 +3151,7 @@
    24733001 else
    24743002   with_curses_h=yes
    24753003 fi;
    24763004-echo "$as_me:3138: result: $with_curses_h" >&5
    2477 +echo "$as_me:3152: result: $with_curses_h" >&5
     3005+echo "$as_me:3154: result: $with_curses_h" >&5
    24783006 echo "${ECHO_T}$with_curses_h" >&6
    24793007 
    24803008 modules_to_build="ncurses"
    2481 @@ -3161,7 +3175,7 @@
     3009@@ -3161,7 +3177,7 @@
    24823010 do
    24833011   # Extract the first word of "$ac_prog", so it can be a program name with args.
    24843012 set dummy $ac_prog; ac_word=$2
    24853013-echo "$as_me:3164: checking for $ac_word" >&5
    2486 +echo "$as_me:3178: checking for $ac_word" >&5
     3014+echo "$as_me:3180: checking for $ac_word" >&5
    24873015 echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6
    24883016 if test "${ac_cv_prog_AWK+set}" = set; then
    24893017   echo $ECHO_N "(cached) $ECHO_C" >&6
    2490 @@ -3176,7 +3190,7 @@
     3018@@ -3176,7 +3192,7 @@
    24913019   test -z "$ac_dir" && ac_dir=.
    24923020   $as_executable_p "$ac_dir/$ac_word" || continue
    24933021 ac_cv_prog_AWK="$ac_prog"
    24943022-echo "$as_me:3179: found $ac_dir/$ac_word" >&5
    2495 +echo "$as_me:3193: found $ac_dir/$ac_word" >&5
     3023+echo "$as_me:3195: found $ac_dir/$ac_word" >&5
    24963024 break
    24973025 done
    24983026 
    2499 @@ -3184,21 +3198,21 @@
     3027@@ -3184,21 +3200,21 @@
    25003028 fi
    25013029 AWK=$ac_cv_prog_AWK
    25023030 if test -n "$AWK"; then
    25033031-  echo "$as_me:3187: result: $AWK" >&5
    2504 +  echo "$as_me:3201: result: $AWK" >&5
     3032+  echo "$as_me:3203: result: $AWK" >&5
    25053033 echo "${ECHO_T}$AWK" >&6
    25063034 else
    25073035-  echo "$as_me:3190: result: no" >&5
    2508 +  echo "$as_me:3204: result: no" >&5
     3036+  echo "$as_me:3206: result: no" >&5
    25093037 echo "${ECHO_T}no" >&6
    25103038 fi
    … …  
    25143042 
    25153043-test -z "$AWK" && { { echo "$as_me:3197: error: No awk program found" >&5
    2516 +test -z "$AWK" && { { echo "$as_me:3211: error: No awk program found" >&5
     3044+test -z "$AWK" && { { echo "$as_me:3213: error: No awk program found" >&5
    25173045 echo "$as_me: error: No awk program found" >&2;}
    25183046    { (exit 1); exit 1; }; }
    25193047 
    25203048-echo "$as_me:3201: checking for egrep" >&5
    2521 +echo "$as_me:3215: checking for egrep" >&5
     3049+echo "$as_me:3217: checking for egrep" >&5
    25223050 echo $ECHO_N "checking for egrep... $ECHO_C" >&6
    25233051 if test "${ac_cv_prog_egrep+set}" = set; then
    25243052   echo $ECHO_N "(cached) $ECHO_C" >&6
    2525 @@ -3208,11 +3222,11 @@
     3053@@ -3208,11 +3224,11 @@
    25263054     else ac_cv_prog_egrep='egrep'
    25273055     fi
    25283056 fi
    25293057-echo "$as_me:3211: result: $ac_cv_prog_egrep" >&5
    2530 +echo "$as_me:3225: result: $ac_cv_prog_egrep" >&5
     3058+echo "$as_me:3227: result: $ac_cv_prog_egrep" >&5
    25313059 echo "${ECHO_T}$ac_cv_prog_egrep" >&6
    25323060  EGREP=$ac_cv_prog_egrep
    25333061 
    25343062-test -z "$EGREP" && { { echo "$as_me:3215: error: No egrep program found" >&5
    2535 +test -z "$EGREP" && { { echo "$as_me:3229: error: No egrep program found" >&5
     3063+test -z "$EGREP" && { { echo "$as_me:3231: error: No egrep program found" >&5
    25363064 echo "$as_me: error: No egrep program found" >&2;}
    25373065    { (exit 1); exit 1; }; }
    25383066 
    2539 @@ -3228,7 +3242,7 @@
     3067@@ -3228,7 +3244,7 @@
    25403068 # AFS /usr/afsws/bin/install, which mishandles nonexistent args
    25413069 # SVR4 /usr/ucb/install, which tries to use the nonexistent group "staff"
    25423070 # ./install, which can be erroneously created by make from ./install.sh.
    25433071-echo "$as_me:3231: checking for a BSD compatible install" >&5
    2544 +echo "$as_me:3245: checking for a BSD compatible install" >&5
     3072+echo "$as_me:3247: checking for a BSD compatible install" >&5
    25453073 echo $ECHO_N "checking for a BSD compatible install... $ECHO_C" >&6
    25463074 if test -z "$INSTALL"; then
    25473075 if test "${ac_cv_path_install+set}" = set; then
    2548 @@ -3277,7 +3291,7 @@
     3076@@ -3277,7 +3293,7 @@
    25493077     INSTALL=$ac_install_sh
    25503078   fi
    25513079 fi
    25523080-echo "$as_me:3280: result: $INSTALL" >&5
    2553 +echo "$as_me:3294: result: $INSTALL" >&5
     3081+echo "$as_me:3296: result: $INSTALL" >&5
    25543082 echo "${ECHO_T}$INSTALL" >&6
    25553083 
    25563084 # Use test -z because SunOS4 sh mishandles braces in ${var-val}.
    2557 @@ -3302,7 +3316,7 @@
     3085@@ -3302,7 +3318,7 @@
    25583086 do
    25593087   # Extract the first word of "$ac_prog", so it can be a program name with args.
    25603088 set dummy $ac_prog; ac_word=$2
    25613089-echo "$as_me:3305: checking for $ac_word" >&5
    2562 +echo "$as_me:3319: checking for $ac_word" >&5
     3090+echo "$as_me:3321: checking for $ac_word" >&5
    25633091 echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6
    25643092 if test "${ac_cv_prog_LINT+set}" = set; then
    25653093   echo $ECHO_N "(cached) $ECHO_C" >&6
    2566 @@ -3317,7 +3331,7 @@
     3094@@ -3317,7 +3333,7 @@
    25673095   test -z "$ac_dir" && ac_dir=.
    25683096   $as_executable_p "$ac_dir/$ac_word" || continue
    25693097 ac_cv_prog_LINT="$ac_prog"
    25703098-echo "$as_me:3320: found $ac_dir/$ac_word" >&5
    2571 +echo "$as_me:3334: found $ac_dir/$ac_word" >&5
     3099+echo "$as_me:3336: found $ac_dir/$ac_word" >&5
    25723100 break
    25733101 done
    25743102 
    2575 @@ -3325,28 +3339,28 @@
     3103@@ -3325,28 +3341,28 @@
    25763104 fi
    25773105 LINT=$ac_cv_prog_LINT
    25783106 if test -n "$LINT"; then
    25793107-  echo "$as_me:3328: result: $LINT" >&5
    2580 +  echo "$as_me:3342: result: $LINT" >&5
     3108+  echo "$as_me:3344: result: $LINT" >&5
    25813109 echo "${ECHO_T}$LINT" >&6
    25823110 else
    25833111-  echo "$as_me:3331: result: no" >&5
    2584 +  echo "$as_me:3345: result: no" >&5
     3112+  echo "$as_me:3347: result: no" >&5
    25853113 echo "${ECHO_T}no" >&6
    25863114 fi
    … …  
    25903118 
    25913119-echo "$as_me:3338: checking whether ln -s works" >&5
    2592 +echo "$as_me:3352: checking whether ln -s works" >&5
     3120+echo "$as_me:3354: checking whether ln -s works" >&5
    25933121 echo $ECHO_N "checking whether ln -s works... $ECHO_C" >&6
    25943122 LN_S=$as_ln_s
    25953123 if test "$LN_S" = "ln -s"; then
    25963124-  echo "$as_me:3342: result: yes" >&5
    2597 +  echo "$as_me:3356: result: yes" >&5
     3125+  echo "$as_me:3358: result: yes" >&5
    25983126 echo "${ECHO_T}yes" >&6
    25993127 else
    26003128-  echo "$as_me:3345: result: no, using $LN_S" >&5
    2601 +  echo "$as_me:3359: result: no, using $LN_S" >&5
     3129+  echo "$as_me:3361: result: no, using $LN_S" >&5
    26023130 echo "${ECHO_T}no, using $LN_S" >&6
    26033131 fi
    26043132 
    26053133-echo "$as_me:3349: checking for long file names" >&5
    2606 +echo "$as_me:3363: checking for long file names" >&5
     3134+echo "$as_me:3365: checking for long file names" >&5
    26073135 echo $ECHO_N "checking for long file names... $ECHO_C" >&6
    26083136 if test "${ac_cv_sys_long_file_names+set}" = set; then
    26093137   echo $ECHO_N "(cached) $ECHO_C" >&6
    2610 @@ -3385,7 +3399,7 @@
     3138@@ -3385,7 +3401,7 @@
    26113139   rm -rf $ac_xdir 2>/dev/null
    26123140 done
    26133141 fi
    26143142-echo "$as_me:3388: result: $ac_cv_sys_long_file_names" >&5
    2615 +echo "$as_me:3402: result: $ac_cv_sys_long_file_names" >&5
     3143+echo "$as_me:3404: result: $ac_cv_sys_long_file_names" >&5
    26163144 echo "${ECHO_T}$ac_cv_sys_long_file_names" >&6
    26173145 if test $ac_cv_sys_long_file_names = yes; then
    26183146 
    2619 @@ -3395,7 +3409,7 @@
     3147@@ -3395,7 +3411,136 @@
    26203148 
    26213149 fi
    26223150 
    26233151-echo "$as_me:3398: checking if we should assume mixed-case filenames" >&5
    2624 +echo "$as_me:3412: checking if we should assume mixed-case filenames" >&5
     3152+# if we find pkg-config, check if we should install the ".pc" files.
     3153+
     3154+echo "$as_me:3416: checking if you want to use pkg-config" >&5
     3155+echo $ECHO_N "checking if you want to use pkg-config... $ECHO_C" >&6
     3156+
     3157+# Check whether --with-pkg-config or --without-pkg-config was given.
     3158+if test "${with_pkg_config+set}" = set; then
     3159+  withval="$with_pkg_config"
     3160+  cf_pkg_config=$withval
     3161+else
     3162+  cf_pkg_config=yes
     3163+fi;
     3164+echo "$as_me:3426: result: $cf_pkg_config" >&5
     3165+echo "${ECHO_T}$cf_pkg_config" >&6
     3166+
     3167+case $cf_pkg_config in
     3168+no)
     3169+       PKG_CONFIG=none
     3170+       ;;
     3171+yes)
     3172+       # Extract the first word of "pkg-config", so it can be a program name with args.
     3173+set dummy pkg-config; ac_word=$2
     3174+echo "$as_me:3436: checking for $ac_word" >&5
     3175+echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6
     3176+if test "${ac_cv_path_PKG_CONFIG+set}" = set; then
     3177+  echo $ECHO_N "(cached) $ECHO_C" >&6
     3178+else
     3179+  case $PKG_CONFIG in
     3180+  [\\/]* | ?:[\\/]*)
     3181+  ac_cv_path_PKG_CONFIG="$PKG_CONFIG" # Let the user override the test with a path.
     3182+  ;;
     3183+  *)
     3184+  ac_save_IFS=$IFS; IFS=$ac_path_separator
     3185+ac_dummy="$PATH"
     3186+for ac_dir in $ac_dummy; do
     3187+  IFS=$ac_save_IFS
     3188+  test -z "$ac_dir" && ac_dir=.
     3189+  if $as_executable_p "$ac_dir/$ac_word"; then
     3190+   ac_cv_path_PKG_CONFIG="$ac_dir/$ac_word"
     3191+   echo "$as_me:3453: found $ac_dir/$ac_word" >&5
     3192+   break
     3193+fi
     3194+done
     3195+
     3196+  test -z "$ac_cv_path_PKG_CONFIG" && ac_cv_path_PKG_CONFIG="none"
     3197+  ;;
     3198+esac
     3199+fi
     3200+PKG_CONFIG=$ac_cv_path_PKG_CONFIG
     3201+
     3202+if test -n "$PKG_CONFIG"; then
     3203+  echo "$as_me:3465: result: $PKG_CONFIG" >&5
     3204+echo "${ECHO_T}$PKG_CONFIG" >&6
     3205+else
     3206+  echo "$as_me:3468: result: no" >&5
     3207+echo "${ECHO_T}no" >&6
     3208+fi
     3209+
     3210+       ;;
     3211+*)
     3212+       PKG_CONFIG=$withval
     3213+       ;;
     3214+esac
     3215+
     3216+test -z "$PKG_CONFIG" && PKG_CONFIG=none
     3217+if test "$PKG_CONFIG" != none ; then
     3218+
     3219+if test "x$prefix" != xNONE; then
     3220+  cf_path_syntax="$prefix"
     3221+else
     3222+  cf_path_syntax="$ac_default_prefix"
     3223+fi
     3224+
     3225+case ".$PKG_CONFIG" in #(vi
     3226+.\$\(*\)*|.\'*\'*) #(vi
     3227+  ;;
     3228+..|./*|.\\*) #(vi
     3229+  ;;
     3230+.[a-zA-Z]:[\\/]*) #(vi OS/2 EMX
     3231+  ;;
     3232+.\${*prefix}*) #(vi
     3233+  eval PKG_CONFIG="$PKG_CONFIG"
     3234+  case ".$PKG_CONFIG" in #(vi
     3235+  .NONE/*)
     3236+    PKG_CONFIG=`echo $PKG_CONFIG | sed -e s%NONE%$cf_path_syntax%`
     3237+    ;;
     3238+  esac
     3239+  ;; #(vi
     3240+.no|.NONE/*)
     3241+  PKG_CONFIG=`echo $PKG_CONFIG | sed -e s%NONE%$cf_path_syntax%`
     3242+  ;;
     3243+*)
     3244+  { { echo "$as_me:3506: error: expected a pathname, not \"$PKG_CONFIG\"" >&5
     3245+echo "$as_me: error: expected a pathname, not \"$PKG_CONFIG\"" >&2;}
     3246+   { (exit 1); exit 1; }; }
     3247+  ;;
     3248+esac
     3249+
     3250+fi
     3251+
     3252+if test "$PKG_CONFIG" != no ; then
     3253+       echo "$as_me:3515: checking if we should install .pc files for $PKG_CONFIG" >&5
     3254+echo $ECHO_N "checking if we should install .pc files for $PKG_CONFIG... $ECHO_C" >&6
     3255+
     3256+       # Leave this as something that can be overridden in the environment.
     3257+       if test -z "$PKG_CONFIG_LIBDIR" ; then
     3258+               PKG_CONFIG_LIBDIR=`echo "$PKG_CONFIG" | sed -e 's,/[^/]*/[^/]*$,,'`/lib/pkgconfig
     3259+       fi
     3260+
     3261+       if test -d "$PKG_CONFIG_LIBDIR" ; then
     3262+
     3263+# Check whether --enable-pc-files or --disable-pc-files was given.
     3264+if test "${enable_pc_files+set}" = set; then
     3265+  enableval="$enable_pc_files"
     3266+  enable_pc_files=$enableval
     3267+else
     3268+  enable_pc_files=no
     3269+fi;
     3270+               echo "$as_me:3532: result: $enable_pc_files" >&5
     3271+echo "${ECHO_T}$enable_pc_files" >&6
     3272+       else
     3273+               echo "$as_me:3535: result: no" >&5
     3274+echo "${ECHO_T}no" >&6
     3275+               { echo "$as_me:3537: WARNING: did not find library $PKG_CONFIG_LIBDIR" >&5
     3276+echo "$as_me: WARNING: did not find library $PKG_CONFIG_LIBDIR" >&2;}
     3277+               enable_pc_files=no
     3278+       fi
     3279+fi
     3280+
     3281+echo "$as_me:3543: checking if we should assume mixed-case filenames" >&5
    26253282 echo $ECHO_N "checking if we should assume mixed-case filenames... $ECHO_C" >&6
    26263283 
    26273284 # Check whether --enable-mixed-case or --disable-mixed-case was given.
    2628 @@ -3405,11 +3419,11 @@
     3285@@ -3405,11 +3550,11 @@
    26293286 else
    26303287   enable_mixedcase=auto
    26313288 fi;
    26323289-echo "$as_me:3408: result: $enable_mixedcase" >&5
    2633 +echo "$as_me:3422: result: $enable_mixedcase" >&5
     3290+echo "$as_me:3553: result: $enable_mixedcase" >&5
    26343291 echo "${ECHO_T}$enable_mixedcase" >&6
    26353292 if test "$enable_mixedcase" = "auto" ; then
    26363293 
    26373294-echo "$as_me:3412: checking if filesystem supports mixed-case filenames" >&5
    2638 +echo "$as_me:3426: checking if filesystem supports mixed-case filenames" >&5
     3295+echo "$as_me:3557: checking if filesystem supports mixed-case filenames" >&5
    26393296 echo $ECHO_N "checking if filesystem supports mixed-case filenames... $ECHO_C" >&6
    26403297 if test "${cf_cv_mixedcase+set}" = set; then
    26413298   echo $ECHO_N "(cached) $ECHO_C" >&6
    2642 @@ -3436,7 +3450,7 @@
     3299@@ -3436,7 +3581,7 @@
    26433300 fi
    26443301 
    26453302 fi
    26463303-echo "$as_me:3439: result: $cf_cv_mixedcase" >&5
    2647 +echo "$as_me:3453: result: $cf_cv_mixedcase" >&5
     3304+echo "$as_me:3584: result: $cf_cv_mixedcase" >&5
    26483305 echo "${ECHO_T}$cf_cv_mixedcase" >&6
    26493306 test "$cf_cv_mixedcase" = yes && cat >>confdefs.h <<\EOF
    26503307 #define MIXEDCASE_FILENAMES 1
    2651 @@ -3453,7 +3467,7 @@
     3308@@ -3453,7 +3598,7 @@
    26523309 fi
    26533310 
    26543311 # do this after mixed-case option (tags/TAGS is not as important as tic).
    26553312-echo "$as_me:3456: checking whether ${MAKE-make} sets \${MAKE}" >&5
    2656 +echo "$as_me:3470: checking whether ${MAKE-make} sets \${MAKE}" >&5
     3313+echo "$as_me:3601: checking whether ${MAKE-make} sets \${MAKE}" >&5
    26573314 echo $ECHO_N "checking whether ${MAKE-make} sets \${MAKE}... $ECHO_C" >&6
    26583315 set dummy ${MAKE-make}; ac_make=`echo "$2" | sed 'y,./+-,__p_,'`
    26593316 if eval "test \"\${ac_cv_prog_make_${ac_make}_set+set}\" = set"; then
    2660 @@ -3473,18 +3487,18 @@
     3317@@ -3473,18 +3618,18 @@
    26613318 rm -f conftest.make
    26623319 fi
    26633320 if eval "test \"`echo '$ac_cv_prog_make_'${ac_make}_set`\" = yes"; then
    26643321-  echo "$as_me:3476: result: yes" >&5
    2665 +  echo "$as_me:3490: result: yes" >&5
     3322+  echo "$as_me:3621: result: yes" >&5
    26663323 echo "${ECHO_T}yes" >&6
    26673324   SET_MAKE=
    26683325 else
    26693326-  echo "$as_me:3480: result: no" >&5
    2670 +  echo "$as_me:3494: result: no" >&5
     3327+  echo "$as_me:3625: result: no" >&5
    26713328 echo "${ECHO_T}no" >&6
    26723329   SET_MAKE="MAKE=${MAKE-make}"
    … …  
    26763333 set dummy ctags; ac_word=$2
    26773334-echo "$as_me:3487: checking for $ac_word" >&5
    2678 +echo "$as_me:3501: checking for $ac_word" >&5
     3335+echo "$as_me:3632: checking for $ac_word" >&5
    26793336 echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6
    26803337 if test "${ac_cv_prog_MAKE_LOWER_TAGS+set}" = set; then
    26813338   echo $ECHO_N "(cached) $ECHO_C" >&6
    2682 @@ -3499,7 +3513,7 @@
     3339@@ -3499,7 +3644,7 @@
    26833340   test -z "$ac_dir" && ac_dir=.
    26843341   $as_executable_p "$ac_dir/$ac_word" || continue
    26853342 ac_cv_prog_MAKE_LOWER_TAGS="yes"
    26863343-echo "$as_me:3502: found $ac_dir/$ac_word" >&5
    2687 +echo "$as_me:3516: found $ac_dir/$ac_word" >&5
     3344+echo "$as_me:3647: found $ac_dir/$ac_word" >&5
    26883345 break
    26893346 done
    26903347 
    2691 @@ -3508,17 +3522,17 @@
     3348@@ -3508,17 +3653,17 @@
    26923349 fi
    26933350 MAKE_LOWER_TAGS=$ac_cv_prog_MAKE_LOWER_TAGS
    26943351 if test -n "$MAKE_LOWER_TAGS"; then
    26953352-  echo "$as_me:3511: result: $MAKE_LOWER_TAGS" >&5
    2696 +  echo "$as_me:3525: result: $MAKE_LOWER_TAGS" >&5
     3353+  echo "$as_me:3656: result: $MAKE_LOWER_TAGS" >&5
    26973354 echo "${ECHO_T}$MAKE_LOWER_TAGS" >&6
    26983355 else
    26993356-  echo "$as_me:3514: result: no" >&5
    2700 +  echo "$as_me:3528: result: no" >&5
     3357+  echo "$as_me:3659: result: no" >&5
    27013358 echo "${ECHO_T}no" >&6
    27023359 fi
    … …  
    27063363 set dummy etags; ac_word=$2
    27073364-echo "$as_me:3521: checking for $ac_word" >&5
    2708 +echo "$as_me:3535: checking for $ac_word" >&5
     3365+echo "$as_me:3666: checking for $ac_word" >&5
    27093366 echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6
    27103367 if test "${ac_cv_prog_MAKE_UPPER_TAGS+set}" = set; then
    27113368   echo $ECHO_N "(cached) $ECHO_C" >&6
    2712 @@ -3533,7 +3547,7 @@
     3369@@ -3533,7 +3678,7 @@
    27133370   test -z "$ac_dir" && ac_dir=.
    27143371   $as_executable_p "$ac_dir/$ac_word" || continue
    27153372 ac_cv_prog_MAKE_UPPER_TAGS="yes"
    27163373-echo "$as_me:3536: found $ac_dir/$ac_word" >&5
    2717 +echo "$as_me:3550: found $ac_dir/$ac_word" >&5
     3374+echo "$as_me:3681: found $ac_dir/$ac_word" >&5
    27183375 break
    27193376 done
    27203377 
    2721 @@ -3542,10 +3556,10 @@
     3378@@ -3542,10 +3687,10 @@
    27223379 fi
    27233380 MAKE_UPPER_TAGS=$ac_cv_prog_MAKE_UPPER_TAGS
    27243381 if test -n "$MAKE_UPPER_TAGS"; then
    27253382-  echo "$as_me:3545: result: $MAKE_UPPER_TAGS" >&5
    2726 +  echo "$as_me:3559: result: $MAKE_UPPER_TAGS" >&5
     3383+  echo "$as_me:3690: result: $MAKE_UPPER_TAGS" >&5
    27273384 echo "${ECHO_T}$MAKE_UPPER_TAGS" >&6
    27283385 else
    27293386-  echo "$as_me:3548: result: no" >&5
    2730 +  echo "$as_me:3562: result: no" >&5
     3387+  echo "$as_me:3693: result: no" >&5
    27313388 echo "${ECHO_T}no" >&6
    27323389 fi
    27333390 
    2734 @@ -3565,7 +3579,7 @@
     3391@@ -3565,7 +3710,7 @@
    27353392        MAKE_LOWER_TAGS="#"
    27363393 fi
    27373394 
    27383395-echo "$as_me:3568: checking for makeflags variable" >&5
    2739 +echo "$as_me:3582: checking for makeflags variable" >&5
     3396+echo "$as_me:3713: checking for makeflags variable" >&5
    27403397 echo $ECHO_N "checking for makeflags variable... $ECHO_C" >&6
    27413398 if test "${cf_cv_makeflags+set}" = set; then
    27423399   echo $ECHO_N "(cached) $ECHO_C" >&6
    2743 @@ -3599,13 +3613,13 @@
     3400@@ -3599,13 +3744,13 @@
    27443401        rm -f cf_makeflags.tmp
    27453402 
    27463403 fi
    27473404-echo "$as_me:3602: result: $cf_cv_makeflags" >&5
    2748 +echo "$as_me:3616: result: $cf_cv_makeflags" >&5
     3405+echo "$as_me:3747: result: $cf_cv_makeflags" >&5
    27493406 echo "${ECHO_T}$cf_cv_makeflags" >&6
    27503407 
    … …  
    27533410 set dummy ${ac_tool_prefix}ranlib; ac_word=$2
    27543411-echo "$as_me:3608: checking for $ac_word" >&5
    2755 +echo "$as_me:3622: checking for $ac_word" >&5
     3412+echo "$as_me:3753: checking for $ac_word" >&5
    27563413 echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6
    27573414 if test "${ac_cv_prog_RANLIB+set}" = set; then
    27583415   echo $ECHO_N "(cached) $ECHO_C" >&6
    2759 @@ -3620,7 +3634,7 @@
     3416@@ -3620,7 +3765,7 @@
    27603417   test -z "$ac_dir" && ac_dir=.
    27613418   $as_executable_p "$ac_dir/$ac_word" || continue
    27623419 ac_cv_prog_RANLIB="${ac_tool_prefix}ranlib"
    27633420-echo "$as_me:3623: found $ac_dir/$ac_word" >&5
    2764 +echo "$as_me:3637: found $ac_dir/$ac_word" >&5
     3421+echo "$as_me:3768: found $ac_dir/$ac_word" >&5
    27653422 break
    27663423 done
    27673424 
    2768 @@ -3628,10 +3642,10 @@
     3425@@ -3628,10 +3773,10 @@
    27693426 fi
    27703427 RANLIB=$ac_cv_prog_RANLIB
    27713428 if test -n "$RANLIB"; then
    27723429-  echo "$as_me:3631: result: $RANLIB" >&5
    2773 +  echo "$as_me:3645: result: $RANLIB" >&5
     3430+  echo "$as_me:3776: result: $RANLIB" >&5
    27743431 echo "${ECHO_T}$RANLIB" >&6
    27753432 else
    27763433-  echo "$as_me:3634: result: no" >&5
    2777 +  echo "$as_me:3648: result: no" >&5
     3434+  echo "$as_me:3779: result: no" >&5
    27783435 echo "${ECHO_T}no" >&6
    27793436 fi
    27803437 
    2781 @@ -3640,7 +3654,7 @@
     3438@@ -3640,7 +3785,7 @@
    27823439   ac_ct_RANLIB=$RANLIB
    27833440   # Extract the first word of "ranlib", so it can be a program name with args.
    27843441 set dummy ranlib; ac_word=$2
    27853442-echo "$as_me:3643: checking for $ac_word" >&5
    2786 +echo "$as_me:3657: checking for $ac_word" >&5
     3443+echo "$as_me:3788: checking for $ac_word" >&5
    27873444 echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6
    27883445 if test "${ac_cv_prog_ac_ct_RANLIB+set}" = set; then
    27893446   echo $ECHO_N "(cached) $ECHO_C" >&6
    2790 @@ -3655,7 +3669,7 @@
     3447@@ -3655,7 +3800,7 @@
    27913448   test -z "$ac_dir" && ac_dir=.
    27923449   $as_executable_p "$ac_dir/$ac_word" || continue
    27933450 ac_cv_prog_ac_ct_RANLIB="ranlib"
    27943451-echo "$as_me:3658: found $ac_dir/$ac_word" >&5
    2795 +echo "$as_me:3672: found $ac_dir/$ac_word" >&5
     3452+echo "$as_me:3803: found $ac_dir/$ac_word" >&5
    27963453 break
    27973454 done
    27983455 
    2799 @@ -3664,10 +3678,10 @@
     3456@@ -3664,10 +3809,10 @@
    28003457 fi
    28013458 ac_ct_RANLIB=$ac_cv_prog_ac_ct_RANLIB
    28023459 if test -n "$ac_ct_RANLIB"; then
    28033460-  echo "$as_me:3667: result: $ac_ct_RANLIB" >&5
    2804 +  echo "$as_me:3681: result: $ac_ct_RANLIB" >&5
     3461+  echo "$as_me:3812: result: $ac_ct_RANLIB" >&5
    28053462 echo "${ECHO_T}$ac_ct_RANLIB" >&6
    28063463 else
    28073464-  echo "$as_me:3670: result: no" >&5
    2808 +  echo "$as_me:3684: result: no" >&5
     3465+  echo "$as_me:3815: result: no" >&5
    28093466 echo "${ECHO_T}no" >&6
    28103467 fi
    28113468 
    2812 @@ -3679,7 +3693,7 @@
     3469@@ -3679,7 +3824,7 @@
    28133470 if test -n "$ac_tool_prefix"; then
    28143471   # Extract the first word of "${ac_tool_prefix}ld", so it can be a program name with args.
    28153472 set dummy ${ac_tool_prefix}ld; ac_word=$2
    28163473-echo "$as_me:3682: checking for $ac_word" >&5
    2817 +echo "$as_me:3696: checking for $ac_word" >&5
     3474+echo "$as_me:3827: checking for $ac_word" >&5
    28183475 echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6
    28193476 if test "${ac_cv_prog_LD+set}" = set; then
    28203477   echo $ECHO_N "(cached) $ECHO_C" >&6
    2821 @@ -3694,7 +3708,7 @@
     3478@@ -3694,7 +3839,7 @@
    28223479   test -z "$ac_dir" && ac_dir=.
    28233480   $as_executable_p "$ac_dir/$ac_word" || continue
    28243481 ac_cv_prog_LD="${ac_tool_prefix}ld"
    28253482-echo "$as_me:3697: found $ac_dir/$ac_word" >&5
    2826 +echo "$as_me:3711: found $ac_dir/$ac_word" >&5
     3483+echo "$as_me:3842: found $ac_dir/$ac_word" >&5
    28273484 break
    28283485 done
    28293486 
    2830 @@ -3702,10 +3716,10 @@
     3487@@ -3702,10 +3847,10 @@
    28313488 fi
    28323489 LD=$ac_cv_prog_LD
    28333490 if test -n "$LD"; then
    28343491-  echo "$as_me:3705: result: $LD" >&5
    2835 +  echo "$as_me:3719: result: $LD" >&5
     3492+  echo "$as_me:3850: result: $LD" >&5
    28363493 echo "${ECHO_T}$LD" >&6
    28373494 else
    28383495-  echo "$as_me:3708: result: no" >&5
    2839 +  echo "$as_me:3722: result: no" >&5
     3496+  echo "$as_me:3853: result: no" >&5
    28403497 echo "${ECHO_T}no" >&6
    28413498 fi
    28423499 
    2843 @@ -3714,7 +3728,7 @@
     3500@@ -3714,7 +3859,7 @@
    28443501   ac_ct_LD=$LD
    28453502   # Extract the first word of "ld", so it can be a program name with args.
    28463503 set dummy ld; ac_word=$2
    28473504-echo "$as_me:3717: checking for $ac_word" >&5
    2848 +echo "$as_me:3731: checking for $ac_word" >&5
     3505+echo "$as_me:3862: checking for $ac_word" >&5
    28493506 echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6
    28503507 if test "${ac_cv_prog_ac_ct_LD+set}" = set; then
    28513508   echo $ECHO_N "(cached) $ECHO_C" >&6
    2852 @@ -3729,7 +3743,7 @@
     3509@@ -3729,7 +3874,7 @@
    28533510   test -z "$ac_dir" && ac_dir=.
    28543511   $as_executable_p "$ac_dir/$ac_word" || continue
    28553512 ac_cv_prog_ac_ct_LD="ld"
    28563513-echo "$as_me:3732: found $ac_dir/$ac_word" >&5
    2857 +echo "$as_me:3746: found $ac_dir/$ac_word" >&5
     3514+echo "$as_me:3877: found $ac_dir/$ac_word" >&5
    28583515 break
    28593516 done
    28603517 
    2861 @@ -3738,10 +3752,10 @@
     3518@@ -3738,10 +3883,10 @@
    28623519 fi
    28633520 ac_ct_LD=$ac_cv_prog_ac_ct_LD
    28643521 if test -n "$ac_ct_LD"; then
    28653522-  echo "$as_me:3741: result: $ac_ct_LD" >&5
    2866 +  echo "$as_me:3755: result: $ac_ct_LD" >&5
     3523+  echo "$as_me:3886: result: $ac_ct_LD" >&5
    28673524 echo "${ECHO_T}$ac_ct_LD" >&6
    28683525 else
    28693526-  echo "$as_me:3744: result: no" >&5
    2870 +  echo "$as_me:3758: result: no" >&5
     3527+  echo "$as_me:3889: result: no" >&5
    28713528 echo "${ECHO_T}no" >&6
    28723529 fi
    28733530 
    2874 @@ -3753,7 +3767,7 @@
     3531@@ -3753,7 +3898,7 @@
    28753532 if test -n "$ac_tool_prefix"; then
    28763533   # Extract the first word of "${ac_tool_prefix}ar", so it can be a program name with args.
    28773534 set dummy ${ac_tool_prefix}ar; ac_word=$2
    28783535-echo "$as_me:3756: checking for $ac_word" >&5
    2879 +echo "$as_me:3770: checking for $ac_word" >&5
     3536+echo "$as_me:3901: checking for $ac_word" >&5
    28803537 echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6
    28813538 if test "${ac_cv_prog_AR+set}" = set; then
    28823539   echo $ECHO_N "(cached) $ECHO_C" >&6
    2883 @@ -3768,7 +3782,7 @@
     3540@@ -3768,7 +3913,7 @@
    28843541   test -z "$ac_dir" && ac_dir=.
    28853542   $as_executable_p "$ac_dir/$ac_word" || continue
    28863543 ac_cv_prog_AR="${ac_tool_prefix}ar"
    28873544-echo "$as_me:3771: found $ac_dir/$ac_word" >&5
    2888 +echo "$as_me:3785: found $ac_dir/$ac_word" >&5
     3545+echo "$as_me:3916: found $ac_dir/$ac_word" >&5
    28893546 break
    28903547 done
    28913548 
    2892 @@ -3776,10 +3790,10 @@
     3549@@ -3776,10 +3921,10 @@
    28933550 fi
    28943551 AR=$ac_cv_prog_AR
    28953552 if test -n "$AR"; then
    28963553-  echo "$as_me:3779: result: $AR" >&5
    2897 +  echo "$as_me:3793: result: $AR" >&5
     3554+  echo "$as_me:3924: result: $AR" >&5
    28983555 echo "${ECHO_T}$AR" >&6
    28993556 else
    29003557-  echo "$as_me:3782: result: no" >&5
    2901 +  echo "$as_me:3796: result: no" >&5
     3558+  echo "$as_me:3927: result: no" >&5
    29023559 echo "${ECHO_T}no" >&6
    29033560 fi
    29043561 
    2905 @@ -3788,7 +3802,7 @@
     3562@@ -3788,7 +3933,7 @@
    29063563   ac_ct_AR=$AR
    29073564   # Extract the first word of "ar", so it can be a program name with args.
    29083565 set dummy ar; ac_word=$2
    29093566-echo "$as_me:3791: checking for $ac_word" >&5
    2910 +echo "$as_me:3805: checking for $ac_word" >&5
     3567+echo "$as_me:3936: checking for $ac_word" >&5
    29113568 echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6
    29123569 if test "${ac_cv_prog_ac_ct_AR+set}" = set; then
    29133570   echo $ECHO_N "(cached) $ECHO_C" >&6
    2914 @@ -3803,7 +3817,7 @@
     3571@@ -3803,7 +3948,7 @@
    29153572   test -z "$ac_dir" && ac_dir=.
    29163573   $as_executable_p "$ac_dir/$ac_word" || continue
    29173574 ac_cv_prog_ac_ct_AR="ar"
    29183575-echo "$as_me:3806: found $ac_dir/$ac_word" >&5
    2919 +echo "$as_me:3820: found $ac_dir/$ac_word" >&5
     3576+echo "$as_me:3951: found $ac_dir/$ac_word" >&5
    29203577 break
    29213578 done
    29223579 
    2923 @@ -3812,10 +3826,10 @@
     3580@@ -3812,10 +3957,10 @@
    29243581 fi
    29253582 ac_ct_AR=$ac_cv_prog_ac_ct_AR
    29263583 if test -n "$ac_ct_AR"; then
    29273584-  echo "$as_me:3815: result: $ac_ct_AR" >&5
    2928 +  echo "$as_me:3829: result: $ac_ct_AR" >&5
     3585+  echo "$as_me:3960: result: $ac_ct_AR" >&5
    29293586 echo "${ECHO_T}$ac_ct_AR" >&6
    29303587 else
    29313588-  echo "$as_me:3818: result: no" >&5
    2932 +  echo "$as_me:3832: result: no" >&5
     3589+  echo "$as_me:3963: result: no" >&5
    29333590 echo "${ECHO_T}no" >&6
    29343591 fi
    29353592 
    2936 @@ -3828,7 +3842,7 @@
     3593@@ -3824,25 +3969,123 @@
     3594   AR="$ac_cv_prog_AR"
     3595 fi
     3596 
     3597-if test "${cf_cv_subst_AR_OPTS+set}" = set; then
     3598+if test -n "$ac_tool_prefix"; then
     3599+  # Extract the first word of "${ac_tool_prefix}ar", so it can be a program name with args.
     3600+set dummy ${ac_tool_prefix}ar; ac_word=$2
     3601+echo "$as_me:3975: checking for $ac_word" >&5
     3602+echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6
     3603+if test "${ac_cv_prog_AR+set}" = set; then
    29373604   echo $ECHO_N "(cached) $ECHO_C" >&6
    29383605 else
     3606+  if test -n "$AR"; then
     3607+  ac_cv_prog_AR="$AR" # Let the user override the test.
     3608+else
     3609+  ac_save_IFS=$IFS; IFS=$ac_path_separator
     3610+ac_dummy="$PATH"
     3611+for ac_dir in $ac_dummy; do
     3612+  IFS=$ac_save_IFS
     3613+  test -z "$ac_dir" && ac_dir=.
     3614+  $as_executable_p "$ac_dir/$ac_word" || continue
     3615+ac_cv_prog_AR="${ac_tool_prefix}ar"
     3616+echo "$as_me:3990: found $ac_dir/$ac_word" >&5
     3617+break
     3618+done
    29393619 
    29403620-echo "$as_me:3831: checking for archiver options (symbol AR_OPTS)" >&5
    2941 +echo "$as_me:3845: checking for archiver options (symbol AR_OPTS)" >&5
    2942  echo $ECHO_N "checking for archiver options (symbol AR_OPTS)... $ECHO_C" >&6
    2943  
    2944  if test -z "$AR_OPTS" ; then
    2945 @@ -3837,12 +3851,12 @@
    2946  fi
    2947  
    2948  cf_cv_subst_AR_OPTS=$AR_OPTS
     3621-echo $ECHO_N "checking for archiver options (symbol AR_OPTS)... $ECHO_C" >&6
     3622+fi
     3623+fi
     3624+AR=$ac_cv_prog_AR
     3625+if test -n "$AR"; then
     3626+  echo "$as_me:3998: result: $AR" >&5
     3627+echo "${ECHO_T}$AR" >&6
     3628+else
     3629+  echo "$as_me:4001: result: no" >&5
     3630+echo "${ECHO_T}no" >&6
     3631+fi
     3632 
     3633-if test -z "$AR_OPTS" ; then
     3634-       AR_OPTS=rv
     3635+fi
     3636+if test -z "$ac_cv_prog_AR"; then
     3637+  ac_ct_AR=$AR
     3638+  # Extract the first word of "ar", so it can be a program name with args.
     3639+set dummy ar; ac_word=$2
     3640+echo "$as_me:4010: checking for $ac_word" >&5
     3641+echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6
     3642+if test "${ac_cv_prog_ac_ct_AR+set}" = set; then
     3643+  echo $ECHO_N "(cached) $ECHO_C" >&6
     3644+else
     3645+  if test -n "$ac_ct_AR"; then
     3646+  ac_cv_prog_ac_ct_AR="$ac_ct_AR" # Let the user override the test.
     3647+else
     3648+  ac_save_IFS=$IFS; IFS=$ac_path_separator
     3649+ac_dummy="$PATH"
     3650+for ac_dir in $ac_dummy; do
     3651+  IFS=$ac_save_IFS
     3652+  test -z "$ac_dir" && ac_dir=.
     3653+  $as_executable_p "$ac_dir/$ac_word" || continue
     3654+ac_cv_prog_ac_ct_AR="ar"
     3655+echo "$as_me:4025: found $ac_dir/$ac_word" >&5
     3656+break
     3657+done
     3658 
     3659+  test -z "$ac_cv_prog_ac_ct_AR" && ac_cv_prog_ac_ct_AR="ar"
     3660+fi
     3661 fi
     3662+ac_ct_AR=$ac_cv_prog_ac_ct_AR
     3663+if test -n "$ac_ct_AR"; then
     3664+  echo "$as_me:4034: result: $ac_ct_AR" >&5
     3665+echo "${ECHO_T}$ac_ct_AR" >&6
     3666+else
     3667+  echo "$as_me:4037: result: no" >&5
     3668+echo "${ECHO_T}no" >&6
     3669+fi
     3670+
     3671+  AR=$ac_ct_AR
     3672+else
     3673+  AR="$ac_cv_prog_AR"
     3674+fi
     3675+
     3676+echo "$as_me:4046: checking for options to update archives" >&5
     3677+echo $ECHO_N "checking for options to update archives... $ECHO_C" >&6
     3678+if test "${cf_cv_ar_flags+set}" = set; then
     3679+  echo $ECHO_N "(cached) $ECHO_C" >&6
     3680+else
     3681+
     3682+       cf_cv_ar_flags=unknown
     3683+       for cf_ar_flags in -curv curv -crv crv -cqv cqv -rv rv
     3684+       do
     3685+               rm -f conftest.$ac_cv_objext
     3686+               rm -f conftest.a
     3687+
     3688+               cat >conftest.$ac_ext <<EOF
     3689+#line 4059 "configure"
     3690+int    testdata[3] = { 123, 456, 789 };
     3691+EOF
     3692+               if { (eval echo "$as_me:4062: \"$ac_compile\"") >&5
     3693+  (eval $ac_compile) 2>&5
     3694+  ac_status=$?
     3695+  echo "$as_me:4065: \$? = $ac_status" >&5
     3696+  (exit $ac_status); } ; then
     3697+                       $AR $cf_ar_flags conftest.a conftest.$ac_cv_objext 2>&5 1>/dev/null
     3698+                       if test -f conftest.a ; then
     3699+                               cf_cv_ar_flags=$cf_ar_flags
     3700+                               break
     3701+                       fi
     3702+               else
     3703+                       test -n "$verbose" && echo "    cannot compile test-program" 1>&6
     3704 
     3705-cf_cv_subst_AR_OPTS=$AR_OPTS
    29493706-echo "$as_me:3840: result: $AR_OPTS" >&5
    2950 +echo "$as_me:3854: result: $AR_OPTS" >&5
    2951  echo "${ECHO_T}$AR_OPTS" >&6
    2952  
    2953  fi
     3707-echo "${ECHO_T}$AR_OPTS" >&6
     3708+echo "${as_me-configure}:4075: testing cannot compile test-program ..." 1>&5
     3709+
     3710+                       break
     3711+               fi
     3712+       done
     3713+       rm -f conftest.a conftest.$ac_ext conftest.$ac_cv_objext
     3714 
     3715 fi
     3716+echo "$as_me:4083: result: $cf_cv_ar_flags" >&5
     3717+echo "${ECHO_T}$cf_cv_ar_flags" >&6
    29543718 
    29553719-echo "$as_me:3845: checking if you have specified an install-prefix" >&5
    2956 +echo "$as_me:3859: checking if you have specified an install-prefix" >&5
     3720+ARFLAGS=$cf_cv_ar_flags
     3721+
     3722+echo "$as_me:4088: checking if you have specified an install-prefix" >&5
    29573723 echo $ECHO_N "checking if you have specified an install-prefix... $ECHO_C" >&6
    29583724 
    29593725 # Check whether --with-install-prefix or --without-install-prefix was given.
    2960 @@ -3855,7 +3869,7 @@
     3726@@ -3855,7 +4098,7 @@
    29613727                ;;
    29623728        esac
    29633729 fi;
    29643730-echo "$as_me:3858: result: $DESTDIR" >&5
    2965 +echo "$as_me:3872: result: $DESTDIR" >&5
     3731+echo "$as_me:4101: result: $DESTDIR" >&5
    29663732 echo "${ECHO_T}$DESTDIR" >&6
    29673733 
    29683734 ###############################################################################
    2969 @@ -3883,7 +3897,7 @@
     3735@@ -3883,7 +4126,7 @@
    29703736 do
    29713737   # Extract the first word of "$ac_prog", so it can be a program name with args.
    29723738 set dummy $ac_prog; ac_word=$2
    29733739-echo "$as_me:3886: checking for $ac_word" >&5
    2974 +echo "$as_me:3900: checking for $ac_word" >&5
     3740+echo "$as_me:4129: checking for $ac_word" >&5
    29753741 echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6
    29763742 if test "${ac_cv_prog_BUILD_CC+set}" = set; then
    29773743   echo $ECHO_N "(cached) $ECHO_C" >&6
    2978 @@ -3898,7 +3912,7 @@
     3744@@ -3898,7 +4141,7 @@
    29793745   test -z "$ac_dir" && ac_dir=.
    29803746   $as_executable_p "$ac_dir/$ac_word" || continue
    29813747 ac_cv_prog_BUILD_CC="$ac_prog"
    29823748-echo "$as_me:3901: found $ac_dir/$ac_word" >&5
    2983 +echo "$as_me:3915: found $ac_dir/$ac_word" >&5
     3749+echo "$as_me:4144: found $ac_dir/$ac_word" >&5
    29843750 break
    29853751 done
    29863752 
    2987 @@ -3906,10 +3920,10 @@
     3753@@ -3906,10 +4149,10 @@
    29883754 fi
    29893755 BUILD_CC=$ac_cv_prog_BUILD_CC
    29903756 if test -n "$BUILD_CC"; then
    29913757-  echo "$as_me:3909: result: $BUILD_CC" >&5
    2992 +  echo "$as_me:3923: result: $BUILD_CC" >&5
     3758+  echo "$as_me:4152: result: $BUILD_CC" >&5
    29933759 echo "${ECHO_T}$BUILD_CC" >&6
    29943760 else
    29953761-  echo "$as_me:3912: result: no" >&5
    2996 +  echo "$as_me:3926: result: no" >&5
     3762+  echo "$as_me:4155: result: no" >&5
    29973763 echo "${ECHO_T}no" >&6
    29983764 fi
    29993765 
    3000 @@ -3917,12 +3931,12 @@
     3766@@ -3917,12 +4160,12 @@
    30013767 done
    30023768 
    30033769 fi;
    30043770-       echo "$as_me:3920: checking for native build C compiler" >&5
    3005 +       echo "$as_me:3934: checking for native build C compiler" >&5
     3771+       echo "$as_me:4163: checking for native build C compiler" >&5
    30063772 echo $ECHO_N "checking for native build C compiler... $ECHO_C" >&6
    30073773-       echo "$as_me:3922: result: $BUILD_CC" >&5
    3008 +       echo "$as_me:3936: result: $BUILD_CC" >&5
     3774+       echo "$as_me:4165: result: $BUILD_CC" >&5
    30093775 echo "${ECHO_T}$BUILD_CC" >&6
    30103776 
    30113777-       echo "$as_me:3925: checking for native build C preprocessor" >&5
    3012 +       echo "$as_me:3939: checking for native build C preprocessor" >&5
     3778+       echo "$as_me:4168: checking for native build C preprocessor" >&5
    30133779 echo $ECHO_N "checking for native build C preprocessor... $ECHO_C" >&6
    30143780 
    30153781 # Check whether --with-build-cpp or --without-build-cpp was given.
    3016 @@ -3932,10 +3946,10 @@
     3782@@ -3932,10 +4175,10 @@
    30173783 else
    30183784   BUILD_CPP='${BUILD_CC} -E'
    30193785 fi;
    30203786-       echo "$as_me:3935: result: $BUILD_CPP" >&5
    3021 +       echo "$as_me:3949: result: $BUILD_CPP" >&5
     3787+       echo "$as_me:4178: result: $BUILD_CPP" >&5
    30223788 echo "${ECHO_T}$BUILD_CPP" >&6
    30233789 
    30243790-       echo "$as_me:3938: checking for native build C flags" >&5
    3025 +       echo "$as_me:3952: checking for native build C flags" >&5
     3791+       echo "$as_me:4181: checking for native build C flags" >&5
    30263792 echo $ECHO_N "checking for native build C flags... $ECHO_C" >&6
    30273793 
    30283794 # Check whether --with-build-cflags or --without-build-cflags was given.
    3029 @@ -3943,10 +3957,10 @@
     3795@@ -3943,10 +4186,10 @@
    30303796   withval="$with_build_cflags"
    30313797   BUILD_CFLAGS="$withval"
    30323798 fi;
    30333799-       echo "$as_me:3946: result: $BUILD_CFLAGS" >&5
    3034 +       echo "$as_me:3960: result: $BUILD_CFLAGS" >&5
     3800+       echo "$as_me:4189: result: $BUILD_CFLAGS" >&5
    30353801 echo "${ECHO_T}$BUILD_CFLAGS" >&6
    30363802 
    30373803-       echo "$as_me:3949: checking for native build C preprocessor-flags" >&5
    3038 +       echo "$as_me:3963: checking for native build C preprocessor-flags" >&5
     3804+       echo "$as_me:4192: checking for native build C preprocessor-flags" >&5
    30393805 echo $ECHO_N "checking for native build C preprocessor-flags... $ECHO_C" >&6
    30403806 
    30413807 # Check whether --with-build-cppflags or --without-build-cppflags was given.
    3042 @@ -3954,10 +3968,10 @@
     3808@@ -3954,10 +4197,10 @@
    30433809   withval="$with_build_cppflags"
    30443810   BUILD_CPPFLAGS="$withval"
    30453811 fi;
    30463812-       echo "$as_me:3957: result: $BUILD_CPPFLAGS" >&5
    3047 +       echo "$as_me:3971: result: $BUILD_CPPFLAGS" >&5
     3813+       echo "$as_me:4200: result: $BUILD_CPPFLAGS" >&5
    30483814 echo "${ECHO_T}$BUILD_CPPFLAGS" >&6
    30493815 
    30503816-       echo "$as_me:3960: checking for native build linker-flags" >&5
    3051 +       echo "$as_me:3974: checking for native build linker-flags" >&5
     3817+       echo "$as_me:4203: checking for native build linker-flags" >&5
    30523818 echo $ECHO_N "checking for native build linker-flags... $ECHO_C" >&6
    30533819 
    30543820 # Check whether --with-build-ldflags or --without-build-ldflags was given.
    3055 @@ -3965,10 +3979,10 @@
     3821@@ -3965,10 +4208,10 @@
    30563822   withval="$with_build_ldflags"
    30573823   BUILD_LDFLAGS="$withval"
    30583824 fi;
    30593825-       echo "$as_me:3968: result: $BUILD_LDFLAGS" >&5
    3060 +       echo "$as_me:3982: result: $BUILD_LDFLAGS" >&5
     3826+       echo "$as_me:4211: result: $BUILD_LDFLAGS" >&5
    30613827 echo "${ECHO_T}$BUILD_LDFLAGS" >&6
    30623828 
    30633829-       echo "$as_me:3971: checking for native build linker-libraries" >&5
    3064 +       echo "$as_me:3985: checking for native build linker-libraries" >&5
     3830+       echo "$as_me:4214: checking for native build linker-libraries" >&5
    30653831 echo $ECHO_N "checking for native build linker-libraries... $ECHO_C" >&6
    30663832 
    30673833 # Check whether --with-build-libs or --without-build-libs was given.
    3068 @@ -3976,7 +3990,7 @@
     3834@@ -3976,7 +4219,7 @@
    30693835   withval="$with_build_libs"
    30703836   BUILD_LIBS="$withval"
    30713837 fi;
    30723838-       echo "$as_me:3979: result: $BUILD_LIBS" >&5
    3073 +       echo "$as_me:3993: result: $BUILD_LIBS" >&5
     3839+       echo "$as_me:4222: result: $BUILD_LIBS" >&5
    30743840 echo "${ECHO_T}$BUILD_LIBS" >&6
    30753841 
    30763842        # this assumes we're on Unix.
    3077 @@ -3986,7 +4000,7 @@
     3843@@ -3986,7 +4229,7 @@
    30783844        : ${BUILD_CC:='${CC}'}
    30793845 
    30803846        if ( test "$BUILD_CC" = "$CC" || test "$BUILD_CC" = '${CC}' ) ; then
    30813847-               { { echo "$as_me:3989: error: Cross-build requires two compilers.
    3082 +               { { echo "$as_me:4003: error: Cross-build requires two compilers.
     3848+               { { echo "$as_me:4232: error: Cross-build requires two compilers.
    30833849 Use --with-build-cc to specify the native compiler." >&5
    30843850 echo "$as_me: error: Cross-build requires two compilers.
    30853851 Use --with-build-cc to specify the native compiler." >&2;}
    3086 @@ -4027,7 +4041,7 @@
     3852@@ -4027,7 +4270,7 @@
    30873853 LIB_INSTALL=
    30883854 LIB_UNINSTALL=
    30893855 
    30903856-echo "$as_me:4030: checking if you want to build libraries with libtool" >&5
    3091 +echo "$as_me:4044: checking if you want to build libraries with libtool" >&5
     3857+echo "$as_me:4273: checking if you want to build libraries with libtool" >&5
    30923858 echo $ECHO_N "checking if you want to build libraries with libtool... $ECHO_C" >&6
    30933859 
    30943860 # Check whether --with-libtool or --without-libtool was given.
    3095 @@ -4037,11 +4051,11 @@
     3861@@ -4037,11 +4280,11 @@
    30963862 else
    30973863   with_libtool=no
    30983864 fi;
    30993865-echo "$as_me:4040: result: $with_libtool" >&5
    3100 +echo "$as_me:4054: result: $with_libtool" >&5
     3866+echo "$as_me:4283: result: $with_libtool" >&5
    31013867 echo "${ECHO_T}$with_libtool" >&6
    31023868 if test "$with_libtool" != "no"; then
    … …  
    31073873 if test "x$prefix" != xNONE; then
    31083874   cf_path_syntax="$prefix"
    3109 @@ -4068,7 +4082,7 @@
     3875@@ -4068,7 +4311,7 @@
    31103876   with_libtool=`echo $with_libtool | sed -e s%NONE%$cf_path_syntax%`
    31113877   ;;
    31123878 *)
    31133879-  { { echo "$as_me:4071: error: expected a pathname, not \"$with_libtool\"" >&5
    3114 +  { { echo "$as_me:4085: error: expected a pathname, not \"$with_libtool\"" >&5
     3880+  { { echo "$as_me:4314: error: expected a pathname, not \"$with_libtool\"" >&5
    31153881 echo "$as_me: error: expected a pathname, not \"$with_libtool\"" >&2;}
    31163882    { (exit 1); exit 1; }; }
    31173883   ;;
    3118 @@ -4076,9 +4090,9 @@
     3884@@ -4076,9 +4319,9 @@
    31193885 
    31203886                LIBTOOL=$with_libtool
    … …  
    31243890 set dummy libtool; ac_word=$2
    31253891-echo "$as_me:4081: checking for $ac_word" >&5
    3126 +echo "$as_me:4095: checking for $ac_word" >&5
     3892+echo "$as_me:4324: checking for $ac_word" >&5
    31273893 echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6
    31283894 if test "${ac_cv_path_LIBTOOL+set}" = set; then
    31293895   echo $ECHO_N "(cached) $ECHO_C" >&6
    3130 @@ -4095,7 +4109,7 @@
     3896@@ -4095,7 +4338,7 @@
    31313897   test -z "$ac_dir" && ac_dir=.
    31323898   if $as_executable_p "$ac_dir/$ac_word"; then
    31333899    ac_cv_path_LIBTOOL="$ac_dir/$ac_word"
    31343900-   echo "$as_me:4098: found $ac_dir/$ac_word" >&5
    3135 +   echo "$as_me:4112: found $ac_dir/$ac_word" >&5
     3901+   echo "$as_me:4341: found $ac_dir/$ac_word" >&5
    31363902    break
    31373903 fi
    31383904 done
    3139 @@ -4106,19 +4120,19 @@
     3905@@ -4106,19 +4349,19 @@
    31403906 LIBTOOL=$ac_cv_path_LIBTOOL
    31413907 
    31423908 if test -n "$LIBTOOL"; then
    31433909-  echo "$as_me:4109: result: $LIBTOOL" >&5
    3144 +  echo "$as_me:4123: result: $LIBTOOL" >&5
     3910+  echo "$as_me:4352: result: $LIBTOOL" >&5
    31453911 echo "${ECHO_T}$LIBTOOL" >&6
    31463912 else
    31473913-  echo "$as_me:4112: result: no" >&5
    3148 +  echo "$as_me:4126: result: no" >&5
     3914+  echo "$as_me:4355: result: no" >&5
    31493915 echo "${ECHO_T}no" >&6
    31503916 fi
    … …  
    31553921+       fi
    31563922+       if test -z "$LIBTOOL" ; then
    3157 +               { { echo "$as_me:4132: error: Cannot find libtool" >&5
     3923+               { { echo "$as_me:4361: error: Cannot find libtool" >&5
    31583924 echo "$as_me: error: Cannot find libtool" >&2;}
    31593925    { (exit 1); exit 1; }; }
    … …  
    31633929        LIB_OBJECT='${OBJECTS:.o=.lo}'
    31643930        LIB_SUFFIX=.la
    3165 @@ -4130,17 +4144,17 @@
     3931@@ -4130,17 +4373,17 @@
    31663932        LIB_PREP=:
    31673933 
    31683934        # Show the version of libtool
    31693935-       echo "$as_me:4133: checking version of libtool" >&5
    3170 +       echo "$as_me:4147: checking version of libtool" >&5
     3936+       echo "$as_me:4376: checking version of libtool" >&5
    31713937 echo $ECHO_N "checking version of libtool... $ECHO_C" >&6
    31723938 
    … …  
    31763942        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.].*//'`
    31773943-       echo "$as_me:4140: result: $cf_cv_libtool_version" >&5
    3178 +       echo "$as_me:4154: result: $cf_cv_libtool_version" >&5
     3944+       echo "$as_me:4383: result: $cf_cv_libtool_version" >&5
    31793945 echo "${ECHO_T}$cf_cv_libtool_version" >&6
    31803946        if test -z "$cf_cv_libtool_version" ; then
    31813947-               { { echo "$as_me:4143: error: This is not GNU libtool" >&5
    3182 +               { { echo "$as_me:4157: error: This is not GNU libtool" >&5
     3948+               { { echo "$as_me:4386: error: This is not GNU libtool" >&5
    31833949 echo "$as_me: error: This is not GNU libtool" >&2;}
    31843950    { (exit 1); exit 1; }; }
    31853951        fi
    3186 @@ -4168,7 +4182,7 @@
     3952@@ -4168,7 +4411,7 @@
    31873953 
    31883954 else
    31893955 
    31903956-echo "$as_me:4171: checking if you want to build shared libraries" >&5
    3191 +echo "$as_me:4185: checking if you want to build shared libraries" >&5
     3957+echo "$as_me:4414: checking if you want to build shared libraries" >&5
    31923958 echo $ECHO_N "checking if you want to build shared libraries... $ECHO_C" >&6
    31933959 
    31943960 # Check whether --with-shared or --without-shared was given.
    3195 @@ -4178,11 +4192,11 @@
     3961@@ -4178,11 +4421,11 @@
    31963962 else
    31973963   with_shared=no
    31983964 fi;
    31993965-echo "$as_me:4181: result: $with_shared" >&5
    3200 +echo "$as_me:4195: result: $with_shared" >&5
     3966+echo "$as_me:4424: result: $with_shared" >&5
    32013967 echo "${ECHO_T}$with_shared" >&6
    32023968 test "$with_shared" = "yes" && cf_list_models="$cf_list_models shared"
    32033969 
    32043970-echo "$as_me:4185: checking if you want to build static libraries" >&5
    3205 +echo "$as_me:4199: checking if you want to build static libraries" >&5
     3971+echo "$as_me:4428: checking if you want to build static libraries" >&5
    32063972 echo $ECHO_N "checking if you want to build static libraries... $ECHO_C" >&6
    32073973 
    32083974 # Check whether --with-normal or --without-normal was given.
    3209 @@ -4192,11 +4206,11 @@
     3975@@ -4192,11 +4435,11 @@
    32103976 else
    32113977   with_normal=yes
    32123978 fi;
    32133979-echo "$as_me:4195: result: $with_normal" >&5
    3214 +echo "$as_me:4209: result: $with_normal" >&5
     3980+echo "$as_me:4438: result: $with_normal" >&5
    32153981 echo "${ECHO_T}$with_normal" >&6
    32163982 test "$with_normal" = "yes" && cf_list_models="$cf_list_models normal"
    32173983 
    32183984-echo "$as_me:4199: checking if you want to build debug libraries" >&5
    3219 +echo "$as_me:4213: checking if you want to build debug libraries" >&5
     3985+echo "$as_me:4442: checking if you want to build debug libraries" >&5
    32203986 echo $ECHO_N "checking if you want to build debug libraries... $ECHO_C" >&6
    32213987 
    32223988 # Check whether --with-debug or --without-debug was given.
    3223 @@ -4206,11 +4220,11 @@
     3989@@ -4206,11 +4449,11 @@
    32243990 else
    32253991   with_debug=yes
    32263992 fi;
    32273993-echo "$as_me:4209: result: $with_debug" >&5
    3228 +echo "$as_me:4223: result: $with_debug" >&5
     3994+echo "$as_me:4452: result: $with_debug" >&5
    32293995 echo "${ECHO_T}$with_debug" >&6
    32303996 test "$with_debug" = "yes" && cf_list_models="$cf_list_models debug"
    32313997 
    32323998-echo "$as_me:4213: checking if you want to build profiling libraries" >&5
    3233 +echo "$as_me:4227: checking if you want to build profiling libraries" >&5
     3999+echo "$as_me:4456: checking if you want to build profiling libraries" >&5
    32344000 echo $ECHO_N "checking if you want to build profiling libraries... $ECHO_C" >&6
    32354001 
    32364002 # Check whether --with-profile or --without-profile was given.
    3237 @@ -4220,7 +4234,7 @@
     4003@@ -4220,7 +4463,7 @@
    32384004 else
    32394005   with_profile=no
    32404006 fi;
    32414007-echo "$as_me:4223: result: $with_profile" >&5
    3242 +echo "$as_me:4237: result: $with_profile" >&5
     4008+echo "$as_me:4466: result: $with_profile" >&5
    32434009 echo "${ECHO_T}$with_profile" >&6
    32444010 test "$with_profile" = "yes" && cf_list_models="$cf_list_models profile"
    32454011 
    3246 @@ -4228,19 +4242,19 @@
     4012@@ -4228,19 +4471,19 @@
    32474013 
    32484014 ###############################################################################
    32494015 
    32504016-echo "$as_me:4231: checking for specified models" >&5
    3251 +echo "$as_me:4245: checking for specified models" >&5
     4017+echo "$as_me:4474: checking for specified models" >&5
    32524018 echo $ECHO_N "checking for specified models... $ECHO_C" >&6
    32534019 test -z "$cf_list_models" && cf_list_models=normal
    32544020 test "$with_libtool" != "no" && cf_list_models=libtool
    32554021-echo "$as_me:4235: result: $cf_list_models" >&5
    3256 +echo "$as_me:4249: result: $cf_list_models" >&5
     4022+echo "$as_me:4478: result: $cf_list_models" >&5
    32574023 echo "${ECHO_T}$cf_list_models" >&6
    32584024 
    … …  
    32604026 ### up test-applications.
    32614027-echo "$as_me:4240: checking for default model" >&5
    3262 +echo "$as_me:4254: checking for default model" >&5
     4028+echo "$as_me:4483: checking for default model" >&5
    32634029 echo $ECHO_N "checking for default model... $ECHO_C" >&6
    32644030 DFT_LWR_MODEL=`echo "$cf_list_models" | $AWK '{print $1}'`
    32654031-echo "$as_me:4243: result: $DFT_LWR_MODEL" >&5
    3266 +echo "$as_me:4257: result: $DFT_LWR_MODEL" >&5
     4032+echo "$as_me:4486: result: $DFT_LWR_MODEL" >&5
    32674033 echo "${ECHO_T}$DFT_LWR_MODEL" >&6
    32684034 
    32694035 DFT_UPR_MODEL=`echo "$DFT_LWR_MODEL" | sed y%abcdefghijklmnopqrstuvwxyz./-%ABCDEFGHIJKLMNOPQRSTUVWXYZ___%`
    3270 @@ -4269,7 +4283,7 @@
     4036@@ -4269,7 +4512,7 @@
    32714037 
    32724038 ###############################################################################
    32734039 
    32744040-echo "$as_me:4272: checking if you want to build a separate terminfo library" >&5
    3275 +echo "$as_me:4286: checking if you want to build a separate terminfo library" >&5
     4041+echo "$as_me:4515: checking if you want to build a separate terminfo library" >&5
    32764042 echo $ECHO_N "checking if you want to build a separate terminfo library... $ECHO_C" >&6
    32774043 
    32784044 # Check whether --with-termlib or --without-termlib was given.
    3279 @@ -4279,10 +4293,10 @@
     4045@@ -4279,10 +4522,10 @@
    32804046 else
    32814047   with_termlib=no
    32824048 fi;
    32834049-echo "$as_me:4282: result: $with_termlib" >&5
    3284 +echo "$as_me:4296: result: $with_termlib" >&5
     4050+echo "$as_me:4525: result: $with_termlib" >&5
    32854051 echo "${ECHO_T}$with_termlib" >&6
    32864052 
    32874053-echo "$as_me:4285: checking if you want to build a separate tic library" >&5
    3288 +echo "$as_me:4299: checking if you want to build a separate tic library" >&5
     4054+echo "$as_me:4528: checking if you want to build a separate tic library" >&5
    32894055 echo $ECHO_N "checking if you want to build a separate tic library... $ECHO_C" >&6
    32904056 
    32914057 # Check whether --with-ticlib or --without-ticlib was given.
    3292 @@ -4292,13 +4306,13 @@
     4058@@ -4292,13 +4535,13 @@
    32934059 else
    32944060   with_ticlib=no
    32954061 fi;
    32964062-echo "$as_me:4295: result: $with_ticlib" >&5
    3297 +echo "$as_me:4309: result: $with_ticlib" >&5
     4063+echo "$as_me:4538: result: $with_ticlib" >&5
    32984064 echo "${ECHO_T}$with_ticlib" >&6
    32994065 
    … …  
    33024068 
    33034069-echo "$as_me:4301: checking if you want to link with the GPM mouse library" >&5
    3304 +echo "$as_me:4315: checking if you want to link with the GPM mouse library" >&5
     4070+echo "$as_me:4544: checking if you want to link with the GPM mouse library" >&5
    33054071 echo $ECHO_N "checking if you want to link with the GPM mouse library... $ECHO_C" >&6
    33064072 
    33074073 # Check whether --with-gpm or --without-gpm was given.
    3308 @@ -4308,27 +4322,27 @@
     4074@@ -4308,27 +4551,27 @@
    33094075 else
    33104076   with_gpm=maybe
    33114077 fi;
    33124078-echo "$as_me:4311: result: $with_gpm" >&5
    3313 +echo "$as_me:4325: result: $with_gpm" >&5
     4079+echo "$as_me:4554: result: $with_gpm" >&5
    33144080 echo "${ECHO_T}$with_gpm" >&6
    33154081 
    33164082 if test "$with_gpm" != no ; then
    33174083-       echo "$as_me:4315: checking for gpm.h" >&5
    3318 +       echo "$as_me:4329: checking for gpm.h" >&5
     4084+       echo "$as_me:4558: checking for gpm.h" >&5
    33194085 echo $ECHO_N "checking for gpm.h... $ECHO_C" >&6
    33204086 if test "${ac_cv_header_gpm_h+set}" = set; then
    … …  
    33234089   cat >conftest.$ac_ext <<_ACEOF
    33244090-#line 4321 "configure"
    3325 +#line 4335 "configure"
     4091+#line 4564 "configure"
    33264092 #include "confdefs.h"
    33274093 #include <gpm.h>
    33284094 _ACEOF
    33294095-if { (eval echo "$as_me:4325: \"$ac_cpp conftest.$ac_ext\"") >&5
    3330 +if { (eval echo "$as_me:4339: \"$ac_cpp conftest.$ac_ext\"") >&5
     4096+if { (eval echo "$as_me:4568: \"$ac_cpp conftest.$ac_ext\"") >&5
    33314097   (eval $ac_cpp conftest.$ac_ext) 2>conftest.er1
    33324098   ac_status=$?
    … …  
    33354101   cat conftest.err >&5
    33364102-  echo "$as_me:4331: \$? = $ac_status" >&5
    3337 +  echo "$as_me:4345: \$? = $ac_status" >&5
     4103+  echo "$as_me:4574: \$? = $ac_status" >&5
    33384104   (exit $ac_status); } >/dev/null; then
    33394105   if test -s conftest.err; then
    33404106     ac_cpp_err=$ac_c_preproc_warn_flag
    3341 @@ -4347,7 +4361,7 @@
     4107@@ -4347,7 +4590,7 @@
    33424108 fi
    33434109 rm -f conftest.err conftest.$ac_ext
    33444110 fi
    33454111-echo "$as_me:4350: result: $ac_cv_header_gpm_h" >&5
    3346 +echo "$as_me:4364: result: $ac_cv_header_gpm_h" >&5
     4112+echo "$as_me:4593: result: $ac_cv_header_gpm_h" >&5
    33474113 echo "${ECHO_T}$ac_cv_header_gpm_h" >&6
    33484114 if test $ac_cv_header_gpm_h = yes; then
    33494115 
    3350 @@ -4358,14 +4372,14 @@
     4116@@ -4358,14 +4601,14 @@
    33514117                if test "$with_gpm" != yes && test "$with_gpm" != maybe ; then
    33524118                        test -n "$verbose" && echo "    assuming we really have GPM library" 1>&6
    33534119 
    33544120-echo "${as_me-configure}:4361: testing assuming we really have GPM library ..." 1>&5
    3355 +echo "${as_me-configure}:4375: testing assuming we really have GPM library ..." 1>&5
     4121+echo "${as_me-configure}:4604: testing assuming we really have GPM library ..." 1>&5
    33564122 
    33574123                        cat >>confdefs.h <<\EOF
    … …  
    33614127                else
    33624128-                       echo "$as_me:4368: checking for Gpm_Open in -lgpm" >&5
    3363 +                       echo "$as_me:4382: checking for Gpm_Open in -lgpm" >&5
     4129+                       echo "$as_me:4611: checking for Gpm_Open in -lgpm" >&5
    33644130 echo $ECHO_N "checking for Gpm_Open in -lgpm... $ECHO_C" >&6
    33654131 if test "${ac_cv_lib_gpm_Gpm_Open+set}" = set; then
    33664132   echo $ECHO_N "(cached) $ECHO_C" >&6
    3367 @@ -4373,7 +4387,7 @@
     4133@@ -4373,7 +4616,7 @@
    33684134   ac_check_lib_save_LIBS=$LIBS
    33694135 LIBS="-lgpm  $LIBS"
    33704136 cat >conftest.$ac_ext <<_ACEOF
    33714137-#line 4376 "configure"
    3372 +#line 4390 "configure"
     4138+#line 4619 "configure"
    33734139 #include "confdefs.h"
    33744140 
    33754141 /* Override any gcc2 internal prototype to avoid an error.  */
    3376 @@ -4392,16 +4406,16 @@
     4142@@ -4392,16 +4635,16 @@
    33774143 }
    33784144 _ACEOF
    33794145 rm -f conftest.$ac_objext conftest$ac_exeext
    33804146-if { (eval echo "$as_me:4395: \"$ac_link\"") >&5
    3381 +if { (eval echo "$as_me:4409: \"$ac_link\"") >&5
     4147+if { (eval echo "$as_me:4638: \"$ac_link\"") >&5
    33824148   (eval $ac_link) 2>&5
    33834149   ac_status=$?
    33844150-  echo "$as_me:4398: \$? = $ac_status" >&5
    3385 +  echo "$as_me:4412: \$? = $ac_status" >&5
     4151+  echo "$as_me:4641: \$? = $ac_status" >&5
    33864152   (exit $ac_status); } &&
    33874153          { ac_try='test -s conftest$ac_exeext'
    33884154-  { (eval echo "$as_me:4401: \"$ac_try\"") >&5
    3389 +  { (eval echo "$as_me:4415: \"$ac_try\"") >&5
     4155+  { (eval echo "$as_me:4644: \"$ac_try\"") >&5
    33904156   (eval $ac_try) 2>&5
    33914157   ac_status=$?
    33924158-  echo "$as_me:4404: \$? = $ac_status" >&5
    3393 +  echo "$as_me:4418: \$? = $ac_status" >&5
     4159+  echo "$as_me:4647: \$? = $ac_status" >&5
    33944160   (exit $ac_status); }; }; then
    33954161   ac_cv_lib_gpm_Gpm_Open=yes
    33964162 else
    3397 @@ -4412,13 +4426,13 @@
     4163@@ -4412,13 +4655,13 @@
    33984164 rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
    33994165 LIBS=$ac_check_lib_save_LIBS
    34004166 fi
    34014167-echo "$as_me:4415: result: $ac_cv_lib_gpm_Gpm_Open" >&5
    3402 +echo "$as_me:4429: result: $ac_cv_lib_gpm_Gpm_Open" >&5
     4168+echo "$as_me:4658: result: $ac_cv_lib_gpm_Gpm_Open" >&5
    34034169 echo "${ECHO_T}$ac_cv_lib_gpm_Gpm_Open" >&6
    34044170 if test $ac_cv_lib_gpm_Gpm_Open = yes; then
    … …  
    34074173 
    34084174-                               { { echo "$as_me:4421: error: Cannot link with GPM library" >&5
    3409 +                               { { echo "$as_me:4435: error: Cannot link with GPM library" >&5
     4175+                               { { echo "$as_me:4664: error: Cannot link with GPM library" >&5
    34104176 echo "$as_me: error: Cannot link with GPM library" >&2;}
    34114177    { (exit 1); exit 1; }; }
    34124178                fi
    3413 @@ -4428,7 +4442,7 @@
     4179@@ -4428,7 +4671,7 @@
    34144180 
    34154181 else
    34164182 
    34174183-               test "$with_gpm" != maybe && { echo "$as_me:4431: WARNING: Cannot find GPM header" >&5
    3418 +               test "$with_gpm" != maybe && { echo "$as_me:4445: WARNING: Cannot find GPM header" >&5
     4184+               test "$with_gpm" != maybe && { echo "$as_me:4674: WARNING: Cannot find GPM header" >&5
    34194185 echo "$as_me: WARNING: Cannot find GPM header" >&2;}
    34204186                with_gpm=no
    34214187 
    3422 @@ -4437,7 +4451,7 @@
     4188@@ -4437,7 +4680,7 @@
    34234189 fi
    34244190 
    34254191 if test "$with_gpm" != no ; then
    34264192-       echo "$as_me:4440: checking if you want to load GPM dynamically" >&5
    3427 +       echo "$as_me:4454: checking if you want to load GPM dynamically" >&5
     4193+       echo "$as_me:4683: checking if you want to load GPM dynamically" >&5
    34284194 echo $ECHO_N "checking if you want to load GPM dynamically... $ECHO_C" >&6
    34294195 
    34304196 # Check whether --with-dlsym or --without-dlsym was given.
    3431 @@ -4447,18 +4461,18 @@
     4197@@ -4447,18 +4690,18 @@
    34324198 else
    34334199   with_dlsym=yes
    34344200 fi;
    34354201-       echo "$as_me:4450: result: $with_dlsym" >&5
    3436 +       echo "$as_me:4464: result: $with_dlsym" >&5
     4202+       echo "$as_me:4693: result: $with_dlsym" >&5
    34374203 echo "${ECHO_T}$with_dlsym" >&6
    34384204        if test "$with_dlsym" = yes ; then
    … …  
    34404206 cf_have_dlsym=no
    34414207-echo "$as_me:4455: checking for dlsym" >&5
    3442 +echo "$as_me:4469: checking for dlsym" >&5
     4208+echo "$as_me:4698: checking for dlsym" >&5
    34434209 echo $ECHO_N "checking for dlsym... $ECHO_C" >&6
    34444210 if test "${ac_cv_func_dlsym+set}" = set; then
    … …  
    34474213   cat >conftest.$ac_ext <<_ACEOF
    34484214-#line 4461 "configure"
    3449 +#line 4475 "configure"
     4215+#line 4704 "configure"
    34504216 #include "confdefs.h"
    34514217 /* System header to define __stub macros and hopefully few prototypes,
    34524218     which can conflict with char dlsym (); below.  */
    3453 @@ -4489,16 +4503,16 @@
     4219@@ -4489,16 +4732,16 @@
    34544220 }
    34554221 _ACEOF
    34564222 rm -f conftest.$ac_objext conftest$ac_exeext
    34574223-if { (eval echo "$as_me:4492: \"$ac_link\"") >&5
    3458 +if { (eval echo "$as_me:4506: \"$ac_link\"") >&5
     4224+if { (eval echo "$as_me:4735: \"$ac_link\"") >&5
    34594225   (eval $ac_link) 2>&5
    34604226   ac_status=$?
    34614227-  echo "$as_me:4495: \$? = $ac_status" >&5
    3462 +  echo "$as_me:4509: \$? = $ac_status" >&5
     4228+  echo "$as_me:4738: \$? = $ac_status" >&5
    34634229   (exit $ac_status); } &&
    34644230          { ac_try='test -s conftest$ac_exeext'
    34654231-  { (eval echo "$as_me:4498: \"$ac_try\"") >&5
    3466 +  { (eval echo "$as_me:4512: \"$ac_try\"") >&5
     4232+  { (eval echo "$as_me:4741: \"$ac_try\"") >&5
    34674233   (eval $ac_try) 2>&5
    34684234   ac_status=$?
    34694235-  echo "$as_me:4501: \$? = $ac_status" >&5
    3470 +  echo "$as_me:4515: \$? = $ac_status" >&5
     4236+  echo "$as_me:4744: \$? = $ac_status" >&5
    34714237   (exit $ac_status); }; }; then
    34724238   ac_cv_func_dlsym=yes
    34734239 else
    3474 @@ -4508,14 +4522,14 @@
     4240@@ -4508,14 +4751,14 @@
    34754241 fi
    34764242 rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
    34774243 fi
    34784244-echo "$as_me:4511: result: $ac_cv_func_dlsym" >&5
    3479 +echo "$as_me:4525: result: $ac_cv_func_dlsym" >&5
     4245+echo "$as_me:4754: result: $ac_cv_func_dlsym" >&5
    34804246 echo "${ECHO_T}$ac_cv_func_dlsym" >&6
    34814247 if test $ac_cv_func_dlsym = yes; then
    … …  
    34854251 cf_have_libdl=no
    34864252-echo "$as_me:4518: checking for dlsym in -ldl" >&5
    3487 +echo "$as_me:4532: checking for dlsym in -ldl" >&5
     4253+echo "$as_me:4761: checking for dlsym in -ldl" >&5
    34884254 echo $ECHO_N "checking for dlsym in -ldl... $ECHO_C" >&6
    34894255 if test "${ac_cv_lib_dl_dlsym+set}" = set; then
    34904256   echo $ECHO_N "(cached) $ECHO_C" >&6
    3491 @@ -4523,7 +4537,7 @@
     4257@@ -4523,7 +4766,7 @@
    34924258   ac_check_lib_save_LIBS=$LIBS
    34934259 LIBS="-ldl  $LIBS"
    34944260 cat >conftest.$ac_ext <<_ACEOF
    34954261-#line 4526 "configure"
    3496 +#line 4540 "configure"
     4262+#line 4769 "configure"
    34974263 #include "confdefs.h"
    34984264 
    34994265 /* Override any gcc2 internal prototype to avoid an error.  */
    3500 @@ -4542,16 +4556,16 @@
     4266@@ -4542,16 +4785,16 @@
    35014267 }
    35024268 _ACEOF
    35034269 rm -f conftest.$ac_objext conftest$ac_exeext
    35044270-if { (eval echo "$as_me:4545: \"$ac_link\"") >&5
    3505 +if { (eval echo "$as_me:4559: \"$ac_link\"") >&5
     4271+if { (eval echo "$as_me:4788: \"$ac_link\"") >&5
    35064272   (eval $ac_link) 2>&5
    35074273   ac_status=$?
    35084274-  echo "$as_me:4548: \$? = $ac_status" >&5
    3509 +  echo "$as_me:4562: \$? = $ac_status" >&5
     4275+  echo "$as_me:4791: \$? = $ac_status" >&5
    35104276   (exit $ac_status); } &&
    35114277          { ac_try='test -s conftest$ac_exeext'
    35124278-  { (eval echo "$as_me:4551: \"$ac_try\"") >&5
    3513 +  { (eval echo "$as_me:4565: \"$ac_try\"") >&5
     4279+  { (eval echo "$as_me:4794: \"$ac_try\"") >&5
    35144280   (eval $ac_try) 2>&5
    35154281   ac_status=$?
    35164282-  echo "$as_me:4554: \$? = $ac_status" >&5
    3517 +  echo "$as_me:4568: \$? = $ac_status" >&5
     4283+  echo "$as_me:4797: \$? = $ac_status" >&5
    35184284   (exit $ac_status); }; }; then
    35194285   ac_cv_lib_dl_dlsym=yes
    35204286 else
    3521 @@ -4562,7 +4576,7 @@
     4287@@ -4562,7 +4805,7 @@
    35224288 rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
    35234289 LIBS=$ac_check_lib_save_LIBS
    35244290 fi
    35254291-echo "$as_me:4565: result: $ac_cv_lib_dl_dlsym" >&5
    3526 +echo "$as_me:4579: result: $ac_cv_lib_dl_dlsym" >&5
     4292+echo "$as_me:4808: result: $ac_cv_lib_dl_dlsym" >&5
    35274293 echo "${ECHO_T}$ac_cv_lib_dl_dlsym" >&6
    35284294 if test $ac_cv_lib_dl_dlsym = yes; then
    35294295 
    3530 @@ -4575,10 +4589,10 @@
     4296@@ -4575,10 +4818,10 @@
    35314297 if test "$cf_have_dlsym" = yes ; then
    35324298        test "$cf_have_libdl" = yes && LIBS="-ldl $LIBS"
    35334299 
    35344300-       echo "$as_me:4578: checking whether able to link to dl*() functions" >&5
    3535 +       echo "$as_me:4592: checking whether able to link to dl*() functions" >&5
     4301+       echo "$as_me:4821: checking whether able to link to dl*() functions" >&5
    35364302 echo $ECHO_N "checking whether able to link to dl*() functions... $ECHO_C" >&6
    35374303        cat >conftest.$ac_ext <<_ACEOF
    35384304-#line 4581 "configure"
    3539 +#line 4595 "configure"
     4305+#line 4824 "configure"
    35404306 #include "confdefs.h"
    35414307 #include <dlfcn.h>
    35424308 int
    3543 @@ -4596,16 +4610,16 @@
     4309@@ -4596,16 +4839,16 @@
    35444310 }
    35454311 _ACEOF
    35464312 rm -f conftest.$ac_objext conftest$ac_exeext
    35474313-if { (eval echo "$as_me:4599: \"$ac_link\"") >&5
    3548 +if { (eval echo "$as_me:4613: \"$ac_link\"") >&5
     4314+if { (eval echo "$as_me:4842: \"$ac_link\"") >&5
    35494315   (eval $ac_link) 2>&5
    35504316   ac_status=$?
    35514317-  echo "$as_me:4602: \$? = $ac_status" >&5
    3552 +  echo "$as_me:4616: \$? = $ac_status" >&5
     4318+  echo "$as_me:4845: \$? = $ac_status" >&5
    35534319   (exit $ac_status); } &&
    35544320          { ac_try='test -s conftest$ac_exeext'
    35554321-  { (eval echo "$as_me:4605: \"$ac_try\"") >&5
    3556 +  { (eval echo "$as_me:4619: \"$ac_try\"") >&5
     4322+  { (eval echo "$as_me:4848: \"$ac_try\"") >&5
    35574323   (eval $ac_try) 2>&5
    35584324   ac_status=$?
    35594325-  echo "$as_me:4608: \$? = $ac_status" >&5
    3560 +  echo "$as_me:4622: \$? = $ac_status" >&5
     4326+  echo "$as_me:4851: \$? = $ac_status" >&5
    35614327   (exit $ac_status); }; }; then
    35624328 
    35634329                cat >>confdefs.h <<\EOF
    3564 @@ -4616,15 +4630,15 @@
     4330@@ -4616,15 +4859,15 @@
    35654331   echo "$as_me: failed program was:" >&5
    35664332 cat conftest.$ac_ext >&5
    35674333 
    35684334-               { { echo "$as_me:4619: error: Cannot link test program for libdl" >&5
    3569 +               { { echo "$as_me:4633: error: Cannot link test program for libdl" >&5
     4335+               { { echo "$as_me:4862: error: Cannot link test program for libdl" >&5
    35704336 echo "$as_me: error: Cannot link test program for libdl" >&2;}
    35714337    { (exit 1); exit 1; }; }
    … …  
    35734339 rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
    35744340-       echo "$as_me:4624: result: ok" >&5
    3575 +       echo "$as_me:4638: result: ok" >&5
     4341+       echo "$as_me:4867: result: ok" >&5
    35764342 echo "${ECHO_T}ok" >&6
    35774343 else
    35784344-       { { echo "$as_me:4627: error: Cannot find dlsym function" >&5
    3579 +       { { echo "$as_me:4641: error: Cannot find dlsym function" >&5
     4345+       { { echo "$as_me:4870: error: Cannot find dlsym function" >&5
    35804346 echo "$as_me: error: Cannot find dlsym function" >&2;}
    35814347    { (exit 1); exit 1; }; }
    35824348 fi
    3583 @@ -4632,12 +4646,12 @@
     4349@@ -4632,12 +4875,12 @@
    35844350                if test "$with_gpm" != yes ; then
    35854351                        test -n "$verbose" && echo "    assuming soname for gpm is $with_gpm" 1>&6
    35864352 
    35874353-echo "${as_me-configure}:4635: testing assuming soname for gpm is $with_gpm ..." 1>&5
    3588 +echo "${as_me-configure}:4649: testing assuming soname for gpm is $with_gpm ..." 1>&5
     4354+echo "${as_me-configure}:4878: testing assuming soname for gpm is $with_gpm ..." 1>&5
    35894355 
    35904356                        cf_cv_gpm_soname="$with_gpm"
    … …  
    35924358 
    35934359-echo "$as_me:4640: checking for soname of gpm library" >&5
    3594 +echo "$as_me:4654: checking for soname of gpm library" >&5
     4360+echo "$as_me:4883: checking for soname of gpm library" >&5
    35954361 echo $ECHO_N "checking for soname of gpm library... $ECHO_C" >&6
    35964362 if test "${cf_cv_gpm_soname+set}" = set; then
    35974363   echo $ECHO_N "(cached) $ECHO_C" >&6
    3598 @@ -4655,15 +4669,15 @@
     4364@@ -4655,15 +4898,15 @@
    35994365 CF_EOF
    36004366 cf_save_LIBS="$LIBS"
    36014367        LIBS="-lgpm $LIBS"
    36024368-       if { (eval echo "$as_me:4658: \"$ac_compile\"") >&5
    3603 +       if { (eval echo "$as_me:4672: \"$ac_compile\"") >&5
     4369+       if { (eval echo "$as_me:4901: \"$ac_compile\"") >&5
    36044370   (eval $ac_compile) 2>&5
    36054371   ac_status=$?
    36064372-  echo "$as_me:4661: \$? = $ac_status" >&5
    3607 +  echo "$as_me:4675: \$? = $ac_status" >&5
     4373+  echo "$as_me:4904: \$? = $ac_status" >&5
    36084374   (exit $ac_status); } ; then
    36094375-               if { (eval echo "$as_me:4663: \"$ac_link\"") >&5
    3610 +               if { (eval echo "$as_me:4677: \"$ac_link\"") >&5
     4376+               if { (eval echo "$as_me:4906: \"$ac_link\"") >&5
    36114377   (eval $ac_link) 2>&5
    36124378   ac_status=$?
    36134379-  echo "$as_me:4666: \$? = $ac_status" >&5
    3614 +  echo "$as_me:4680: \$? = $ac_status" >&5
     4380+  echo "$as_me:4909: \$? = $ac_status" >&5
    36154381   (exit $ac_status); } ; then
    36164382                        cf_cv_gpm_soname=`ldd conftest$ac_exeext 2>/dev/null | sed -e 's,^.*/,,' -e 's, .*$,,' | fgrep libgpm.`
    36174383                        test -z "$cf_cv_gpm_soname" && cf_cv_gpm_soname=unknown
    3618 @@ -4674,7 +4688,7 @@
     4384@@ -4674,7 +4917,7 @@
    36194385 fi
    36204386 
    36214387 fi
    36224388-echo "$as_me:4677: result: $cf_cv_gpm_soname" >&5
    3623 +echo "$as_me:4691: result: $cf_cv_gpm_soname" >&5
     4389+echo "$as_me:4920: result: $cf_cv_gpm_soname" >&5
    36244390 echo "${ECHO_T}$cf_cv_gpm_soname" >&6
    36254391 
    36264392                fi
    3627 @@ -4690,7 +4704,7 @@
     4393@@ -4690,7 +4933,7 @@
    36284394 #define HAVE_LIBGPM 1
    36294395 EOF
    36304396 
    36314397-echo "$as_me:4693: checking for Gpm_Wgetch in -lgpm" >&5
    3632 +echo "$as_me:4707: checking for Gpm_Wgetch in -lgpm" >&5
     4398+echo "$as_me:4936: checking for Gpm_Wgetch in -lgpm" >&5
    36334399 echo $ECHO_N "checking for Gpm_Wgetch in -lgpm... $ECHO_C" >&6
    36344400 if test "${ac_cv_lib_gpm_Gpm_Wgetch+set}" = set; then
    36354401   echo $ECHO_N "(cached) $ECHO_C" >&6
    3636 @@ -4698,7 +4712,7 @@
     4402@@ -4698,7 +4941,7 @@
    36374403   ac_check_lib_save_LIBS=$LIBS
    36384404 LIBS="-lgpm  $LIBS"
    36394405 cat >conftest.$ac_ext <<_ACEOF
    36404406-#line 4701 "configure"
    3641 +#line 4715 "configure"
     4407+#line 4944 "configure"
    36424408 #include "confdefs.h"
    36434409 
    36444410 /* Override any gcc2 internal prototype to avoid an error.  */
    3645 @@ -4717,16 +4731,16 @@
     4411@@ -4717,16 +4960,16 @@
    36464412 }
    36474413 _ACEOF
    36484414 rm -f conftest.$ac_objext conftest$ac_exeext
    36494415-if { (eval echo "$as_me:4720: \"$ac_link\"") >&5
    3650 +if { (eval echo "$as_me:4734: \"$ac_link\"") >&5
     4416+if { (eval echo "$as_me:4963: \"$ac_link\"") >&5
    36514417   (eval $ac_link) 2>&5
    36524418   ac_status=$?
    36534419-  echo "$as_me:4723: \$? = $ac_status" >&5
    3654 +  echo "$as_me:4737: \$? = $ac_status" >&5
     4420+  echo "$as_me:4966: \$? = $ac_status" >&5
    36554421   (exit $ac_status); } &&
    36564422          { ac_try='test -s conftest$ac_exeext'
    36574423-  { (eval echo "$as_me:4726: \"$ac_try\"") >&5
    3658 +  { (eval echo "$as_me:4740: \"$ac_try\"") >&5
     4424+  { (eval echo "$as_me:4969: \"$ac_try\"") >&5
    36594425   (eval $ac_try) 2>&5
    36604426   ac_status=$?
    36614427-  echo "$as_me:4729: \$? = $ac_status" >&5
    3662 +  echo "$as_me:4743: \$? = $ac_status" >&5
     4428+  echo "$as_me:4972: \$? = $ac_status" >&5
    36634429   (exit $ac_status); }; }; then
    36644430   ac_cv_lib_gpm_Gpm_Wgetch=yes
    36654431 else
    3666 @@ -4737,11 +4751,11 @@
     4432@@ -4737,11 +4980,11 @@
    36674433 rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
    36684434 LIBS=$ac_check_lib_save_LIBS
    36694435 fi
    36704436-echo "$as_me:4740: result: $ac_cv_lib_gpm_Gpm_Wgetch" >&5
    3671 +echo "$as_me:4754: result: $ac_cv_lib_gpm_Gpm_Wgetch" >&5
     4437+echo "$as_me:4983: result: $ac_cv_lib_gpm_Gpm_Wgetch" >&5
    36724438 echo "${ECHO_T}$ac_cv_lib_gpm_Gpm_Wgetch" >&6
    36734439 if test $ac_cv_lib_gpm_Gpm_Wgetch = yes; then
    36744440 
    36754441-echo "$as_me:4744: checking if GPM is weakly bound to curses library" >&5
    3676 +echo "$as_me:4758: checking if GPM is weakly bound to curses library" >&5
     4442+echo "$as_me:4987: checking if GPM is weakly bound to curses library" >&5
    36774443 echo $ECHO_N "checking if GPM is weakly bound to curses library... $ECHO_C" >&6
    36784444 if test "${cf_cv_check_gpm_wgetch+set}" = set; then
    36794445   echo $ECHO_N "(cached) $ECHO_C" >&6
    3680 @@ -4765,15 +4779,15 @@
     4446@@ -4765,15 +5008,15 @@
    36814447        # to rely on the static library, noting that some packagers may not
    36824448        # include it.
    36834449        LIBS="-static -lgpm -dynamic $LIBS"
    36844450-       if { (eval echo "$as_me:4768: \"$ac_compile\"") >&5
    3685 +       if { (eval echo "$as_me:4782: \"$ac_compile\"") >&5
     4451+       if { (eval echo "$as_me:5011: \"$ac_compile\"") >&5
    36864452   (eval $ac_compile) 2>&5
    36874453   ac_status=$?
    36884454-  echo "$as_me:4771: \$? = $ac_status" >&5
    3689 +  echo "$as_me:4785: \$? = $ac_status" >&5
     4455+  echo "$as_me:5014: \$? = $ac_status" >&5
    36904456   (exit $ac_status); } ; then
    36914457-               if { (eval echo "$as_me:4773: \"$ac_link\"") >&5
    3692 +               if { (eval echo "$as_me:4787: \"$ac_link\"") >&5
     4458+               if { (eval echo "$as_me:5016: \"$ac_link\"") >&5
    36934459   (eval $ac_link) 2>&5
    36944460   ac_status=$?
    36954461-  echo "$as_me:4776: \$? = $ac_status" >&5
    3696 +  echo "$as_me:4790: \$? = $ac_status" >&5
     4462+  echo "$as_me:5019: \$? = $ac_status" >&5
    36974463   (exit $ac_status); } ; then
    36984464                        cf_cv_check_gpm_wgetch=`nm conftest$ac_exeext | egrep '\<wgetch\>' | egrep '\<[vVwW]\>'`
    36994465                        test -n "$cf_cv_check_gpm_wgetch" && cf_cv_check_gpm_wgetch=yes
    3700 @@ -4785,11 +4799,11 @@
     4466@@ -4785,11 +5028,11 @@
    37014467 fi
    37024468 
    37034469 fi
    37044470-echo "$as_me:4788: result: $cf_cv_check_gpm_wgetch" >&5
    3705 +echo "$as_me:4802: result: $cf_cv_check_gpm_wgetch" >&5
     4471+echo "$as_me:5031: result: $cf_cv_check_gpm_wgetch" >&5
    37064472 echo "${ECHO_T}$cf_cv_check_gpm_wgetch" >&6
    37074473 
    37084474 if test "$cf_cv_check_gpm_wgetch" != yes ; then
    37094475-       { echo "$as_me:4792: WARNING: GPM library is already linked with curses - read the FAQ" >&5
    3710 +       { echo "$as_me:4806: WARNING: GPM library is already linked with curses - read the FAQ" >&5
     4476+       { echo "$as_me:5035: WARNING: GPM library is already linked with curses - read the FAQ" >&5
    37114477 echo "$as_me: WARNING: GPM library is already linked with curses - read the FAQ" >&2;}
    37124478 fi
    37134479 
    3714 @@ -4799,7 +4813,7 @@
     4480@@ -4799,7 +5042,7 @@
    37154481 
    37164482 # not everyone has "test -c"
    37174483 if test -c /dev/sysmouse 2>/dev/null ; then
    37184484-echo "$as_me:4802: checking if you want to use sysmouse" >&5
    3719 +echo "$as_me:4816: checking if you want to use sysmouse" >&5
     4485+echo "$as_me:5045: checking if you want to use sysmouse" >&5
    37204486 echo $ECHO_N "checking if you want to use sysmouse... $ECHO_C" >&6
    37214487 
    37224488 # Check whether --with-sysmouse or --without-sysmouse was given.
    3723 @@ -4811,7 +4825,7 @@
     4489@@ -4811,7 +5054,7 @@
    37244490 fi;
    37254491        if test "$cf_with_sysmouse" != no ; then
    37264492        cat >conftest.$ac_ext <<_ACEOF
    37274493-#line 4814 "configure"
    3728 +#line 4828 "configure"
     4494+#line 5057 "configure"
    37294495 #include "confdefs.h"
    37304496 
    37314497 #include <osreldate.h>
    3732 @@ -4834,16 +4848,16 @@
     4498@@ -4834,16 +5077,16 @@
    37334499 }
    37344500 _ACEOF
    37354501 rm -f conftest.$ac_objext
    37364502-if { (eval echo "$as_me:4837: \"$ac_compile\"") >&5
    3737 +if { (eval echo "$as_me:4851: \"$ac_compile\"") >&5
     4503+if { (eval echo "$as_me:5080: \"$ac_compile\"") >&5
    37384504   (eval $ac_compile) 2>&5
    37394505   ac_status=$?
    37404506-  echo "$as_me:4840: \$? = $ac_status" >&5
    3741 +  echo "$as_me:4854: \$? = $ac_status" >&5
     4507+  echo "$as_me:5083: \$? = $ac_status" >&5
    37424508   (exit $ac_status); } &&
    37434509          { ac_try='test -s conftest.$ac_objext'
    37444510-  { (eval echo "$as_me:4843: \"$ac_try\"") >&5
    3745 +  { (eval echo "$as_me:4857: \"$ac_try\"") >&5
     4511+  { (eval echo "$as_me:5086: \"$ac_try\"") >&5
    37464512   (eval $ac_try) 2>&5
    37474513   ac_status=$?
    37484514-  echo "$as_me:4846: \$? = $ac_status" >&5
    3749 +  echo "$as_me:4860: \$? = $ac_status" >&5
     4515+  echo "$as_me:5089: \$? = $ac_status" >&5
    37504516   (exit $ac_status); }; }; then
    37514517   cf_with_sysmouse=yes
    37524518 else
    3753 @@ -4853,7 +4867,7 @@
     4519@@ -4853,7 +5096,7 @@
    37544520 fi
    37554521 rm -f conftest.$ac_objext conftest.$ac_ext
    37564522        fi
    37574523-echo "$as_me:4856: result: $cf_with_sysmouse" >&5
    3758 +echo "$as_me:4870: result: $cf_with_sysmouse" >&5
     4524+echo "$as_me:5099: result: $cf_with_sysmouse" >&5
    37594525 echo "${ECHO_T}$cf_with_sysmouse" >&6
    37604526 test "$cf_with_sysmouse" = yes && cat >>confdefs.h <<\EOF
    37614527 #define USE_SYSMOUSE 1
    3762 @@ -4871,7 +4885,7 @@
     4528@@ -4871,7 +5114,7 @@
    37634529        test -n "$GXX" && test "${ac_cv_prog_cxx_g}" != yes && CXX_G_OPT=''
    37644530 fi
    37654531 
    37664532-echo "$as_me:4874: checking for default loader flags" >&5
    3767 +echo "$as_me:4888: checking for default loader flags" >&5
     4533+echo "$as_me:5117: checking for default loader flags" >&5
    37684534 echo $ECHO_N "checking for default loader flags... $ECHO_C" >&6
    37694535 case $DFT_LWR_MODEL in
    37704536 libtool) LD_MODEL=''   ;;
    3771 @@ -4880,13 +4894,13 @@
     4537@@ -4880,13 +5123,13 @@
    37724538 profile) LD_MODEL='-pg';;
    37734539 shared)  LD_MODEL=''   ;;
    37744540 esac
    37754541-echo "$as_me:4883: result: $LD_MODEL" >&5
    3776 +echo "$as_me:4897: result: $LD_MODEL" >&5
     4542+echo "$as_me:5126: result: $LD_MODEL" >&5
    37774543 echo "${ECHO_T}$LD_MODEL" >&6
    37784544 
    … …  
    37814547 
    37824548-echo "$as_me:4889: checking if rpath option should be used" >&5
    3783 +echo "$as_me:4903: checking if rpath option should be used" >&5
     4549+echo "$as_me:5132: checking if rpath option should be used" >&5
    37844550 echo $ECHO_N "checking if rpath option should be used... $ECHO_C" >&6
    37854551 
    37864552 # Check whether --enable-rpath or --disable-rpath was given.
    3787 @@ -4896,10 +4910,10 @@
     4553@@ -4896,10 +5139,10 @@
    37884554 else
    37894555   cf_cv_ld_rpath=no
    37904556 fi;
    37914557-echo "$as_me:4899: result: $cf_cv_ld_rpath" >&5
    3792 +echo "$as_me:4913: result: $cf_cv_ld_rpath" >&5
     4558+echo "$as_me:5142: result: $cf_cv_ld_rpath" >&5
    37934559 echo "${ECHO_T}$cf_cv_ld_rpath" >&6
    37944560 
    37954561-echo "$as_me:4902: checking if shared libraries should be relinked during install" >&5
    3796 +echo "$as_me:4916: checking if shared libraries should be relinked during install" >&5
     4562+echo "$as_me:5145: checking if shared libraries should be relinked during install" >&5
    37974563 echo $ECHO_N "checking if shared libraries should be relinked during install... $ECHO_C" >&6
    37984564 
    37994565 # Check whether --enable-relink or --disable-relink was given.
    3800 @@ -4909,7 +4923,7 @@
     4566@@ -4909,19 +5152,20 @@
    38014567 else
    38024568   cf_cv_do_relink=yes
    38034569 fi;
    38044570-echo "$as_me:4912: result: $cf_cv_do_relink" >&5
    3805 +echo "$as_me:4926: result: $cf_cv_do_relink" >&5
     4571+echo "$as_me:5155: result: $cf_cv_do_relink" >&5
    38064572 echo "${ECHO_T}$cf_cv_do_relink" >&6
    38074573        ;;
    38084574 esac
    3809 @@ -4921,7 +4935,7 @@
     4575 
     4576        LOCAL_LDFLAGS=
     4577        LOCAL_LDFLAGS2=
     4578+       LD_RPATH_OPT=
     4579        LD_SHARED_OPTS=
     4580        INSTALL_LIB="-m 644"
    38104581 
    38114582        cf_cv_do_symlinks=no
    38124583 
    38134584-       echo "$as_me:4924: checking if release/abi version should be used for shared libs" >&5
    3814 +       echo "$as_me:4938: checking if release/abi version should be used for shared libs" >&5
     4585+       echo "$as_me:5168: checking if release/abi version should be used for shared libs" >&5
    38154586 echo $ECHO_N "checking if release/abi version should be used for shared libs... $ECHO_C" >&6
    38164587 
    38174588 # Check whether --with-shlib-version or --without-shlib-version was given.
    3818 @@ -4936,7 +4950,7 @@
     4589@@ -4936,7 +5180,7 @@
    38194590                cf_cv_shlib_version=$withval
    38204591                ;;
    38214592        *)
    38224593-               { { echo "$as_me:4939: error: option value must be one of: rel, abi, auto or no" >&5
    3823 +               { { echo "$as_me:4953: error: option value must be one of: rel, abi, auto or no" >&5
     4594+               { { echo "$as_me:5183: error: option value must be one of: rel, abi, auto or no" >&5
    38244595 echo "$as_me: error: option value must be one of: rel, abi, auto or no" >&2;}
    38254596    { (exit 1); exit 1; }; }
    38264597                ;;
    3827 @@ -4945,7 +4959,7 @@
     4598@@ -4945,7 +5189,7 @@
    38284599 else
    38294600   cf_cv_shlib_version=auto
    38304601 fi;
    38314602-       echo "$as_me:4948: result: $cf_cv_shlib_version" >&5
    3832 +       echo "$as_me:4962: result: $cf_cv_shlib_version" >&5
     4603+       echo "$as_me:5192: result: $cf_cv_shlib_version" >&5
    38334604 echo "${ECHO_T}$cf_cv_shlib_version" >&6
    38344605 
    38354606        cf_cv_rm_so_locs=no
    3836 @@ -4954,14 +4968,14 @@
     4607@@ -4954,14 +5198,14 @@
    38374608        CC_SHARED_OPTS=
    38384609        if test "$GCC" = yes
    38394610        then
    38404611-               echo "$as_me:4957: checking which $CC option to use" >&5
    3841 +               echo "$as_me:4971: checking which $CC option to use" >&5
     4612+               echo "$as_me:5201: checking which $CC option to use" >&5
    38424613 echo $ECHO_N "checking which $CC option to use... $ECHO_C" >&6
    38434614                cf_save_CFLAGS="$CFLAGS"
    … …  
    38474618                        cat >conftest.$ac_ext <<_ACEOF
    38484619-#line 4964 "configure"
    3849 +#line 4978 "configure"
     4620+#line 5208 "configure"
    38504621 #include "confdefs.h"
    38514622 #include <stdio.h>
    38524623 int
    3853 @@ -4973,16 +4987,16 @@
     4624@@ -4973,16 +5217,16 @@
    38544625 }
    38554626 _ACEOF
    38564627 rm -f conftest.$ac_objext
    38574628-if { (eval echo "$as_me:4976: \"$ac_compile\"") >&5
    3858 +if { (eval echo "$as_me:4990: \"$ac_compile\"") >&5
     4629+if { (eval echo "$as_me:5220: \"$ac_compile\"") >&5
    38594630   (eval $ac_compile) 2>&5
    38604631   ac_status=$?
    38614632-  echo "$as_me:4979: \$? = $ac_status" >&5
    3862 +  echo "$as_me:4993: \$? = $ac_status" >&5
     4633+  echo "$as_me:5223: \$? = $ac_status" >&5
    38634634   (exit $ac_status); } &&
    38644635          { ac_try='test -s conftest.$ac_objext'
    38654636-  { (eval echo "$as_me:4982: \"$ac_try\"") >&5
    3866 +  { (eval echo "$as_me:4996: \"$ac_try\"") >&5
     4637+  { (eval echo "$as_me:5226: \"$ac_try\"") >&5
    38674638   (eval $ac_try) 2>&5
    38684639   ac_status=$?
    38694640-  echo "$as_me:4985: \$? = $ac_status" >&5
    3870 +  echo "$as_me:4999: \$? = $ac_status" >&5
     4641+  echo "$as_me:5229: \$? = $ac_status" >&5
    38714642   (exit $ac_status); }; }; then
    38724643   break
    38734644 else
    3874 @@ -4991,7 +5005,7 @@
     4645@@ -4991,7 +5235,7 @@
    38754646 fi
    38764647 rm -f conftest.$ac_objext conftest.$ac_ext
    38774648                done
    38784649-               echo "$as_me:4994: result: $CC_SHARED_OPTS" >&5
    3879 +               echo "$as_me:5008: result: $CC_SHARED_OPTS" >&5
     4650+               echo "$as_me:5238: result: $CC_SHARED_OPTS" >&5
    38804651 echo "${ECHO_T}$CC_SHARED_OPTS" >&6
    38814652                CFLAGS="$cf_save_CFLAGS"
    38824653        fi
    3883 @@ -4999,6 +5013,12 @@
     4654@@ -4999,6 +5243,12 @@
    38844655        cf_cv_shlib_version_infix=no
    38854656 
    … …  
    38944665                MK_SHARED_LIB='${CC} ${CFLAGS} -o $@ -Xlinker -soname=`basename $@` -nostart -e 0'
    38954666                ;;
    3896 @@ -5027,7 +5047,7 @@
     4667@@ -5027,7 +5277,7 @@
    38974668                MK_SHARED_LIB='${CC} ${CFLAGS} -dynamiclib -install_name ${libdir}/`basename $@` -compatibility_version ${ABI_VERSION} -current_version ${ABI_VERSION} -o $@'
    38984669                test "$cf_cv_shlib_version" = auto && cf_cv_shlib_version=abi
    38994670                cf_cv_shlib_version_infix=yes
    39004671-               echo "$as_me:5030: checking if ld -search_paths_first works" >&5
    3901 +               echo "$as_me:5050: checking if ld -search_paths_first works" >&5
     4672+               echo "$as_me:5280: checking if ld -search_paths_first works" >&5
    39024673 echo $ECHO_N "checking if ld -search_paths_first works... $ECHO_C" >&6
    39034674 if test "${cf_cv_ldflags_search_paths_first+set}" = set; then
    39044675   echo $ECHO_N "(cached) $ECHO_C" >&6
    3905 @@ -5036,7 +5056,7 @@
     4676@@ -5036,7 +5286,7 @@
    39064677                        cf_save_LDFLAGS=$LDFLAGS
    39074678                        LDFLAGS="$LDFLAGS -Wl,-search_paths_first"
    39084679                        cat >conftest.$ac_ext <<_ACEOF
    39094680-#line 5039 "configure"
    3910 +#line 5059 "configure"
     4681+#line 5289 "configure"
    39114682 #include "confdefs.h"
    39124683 
    39134684 int
    3914 @@ -5048,16 +5068,16 @@
     4685@@ -5048,16 +5298,16 @@
    39154686 }
    39164687 _ACEOF
    39174688 rm -f conftest.$ac_objext conftest$ac_exeext
    39184689-if { (eval echo "$as_me:5051: \"$ac_link\"") >&5
    3919 +if { (eval echo "$as_me:5071: \"$ac_link\"") >&5
     4690+if { (eval echo "$as_me:5301: \"$ac_link\"") >&5
    39204691   (eval $ac_link) 2>&5
    39214692   ac_status=$?
    39224693-  echo "$as_me:5054: \$? = $ac_status" >&5
    3923 +  echo "$as_me:5074: \$? = $ac_status" >&5
     4694+  echo "$as_me:5304: \$? = $ac_status" >&5
    39244695   (exit $ac_status); } &&
    39254696          { ac_try='test -s conftest$ac_exeext'
    39264697-  { (eval echo "$as_me:5057: \"$ac_try\"") >&5
    3927 +  { (eval echo "$as_me:5077: \"$ac_try\"") >&5
     4698+  { (eval echo "$as_me:5307: \"$ac_try\"") >&5
    39284699   (eval $ac_try) 2>&5
    39294700   ac_status=$?
    39304701-  echo "$as_me:5060: \$? = $ac_status" >&5
    3931 +  echo "$as_me:5080: \$? = $ac_status" >&5
     4702+  echo "$as_me:5310: \$? = $ac_status" >&5
    39324703   (exit $ac_status); }; }; then
    39334704   cf_cv_ldflags_search_paths_first=yes
    39344705 else
    3935 @@ -5068,7 +5088,7 @@
     4706@@ -5068,7 +5318,7 @@
    39364707 rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
    39374708                                LDFLAGS=$cf_save_LDFLAGS
    39384709 fi
    39394710-echo "$as_me:5071: result: $cf_cv_ldflags_search_paths_first" >&5
    3940 +echo "$as_me:5091: result: $cf_cv_ldflags_search_paths_first" >&5
     4711+echo "$as_me:5321: result: $cf_cv_ldflags_search_paths_first" >&5
    39414712 echo "${ECHO_T}$cf_cv_ldflags_search_paths_first" >&6
    39424713                if test $cf_cv_ldflags_search_paths_first = yes; then
    39434714                        LDFLAGS="$LDFLAGS -Wl,-search_paths_first"
    3944 @@ -5285,7 +5305,7 @@
     4715@@ -5090,10 +5340,10 @@
     4716        irix*)
     4717                if test "$cf_cv_ld_rpath" = yes ; then
     4718                        if test "$GCC" = yes; then
     4719-                               cf_ld_rpath_opt="-Wl,-rpath,"
     4720+                               LD_RPATH_OPT="-Wl,-rpath,"
     4721                                EXTRA_LDFLAGS="-Wl,-rpath,\${libdir} $EXTRA_LDFLAGS"
     4722                        else
     4723-                               cf_ld_rpath_opt="-rpath "
     4724+                               LD_RPATH_OPT="-rpath "
     4725                                EXTRA_LDFLAGS="-rpath \${libdir} $EXTRA_LDFLAGS"
     4726                        fi
     4727                fi
     4728@@ -5112,7 +5362,7 @@
     4729                        LOCAL_LDFLAGS2="$LOCAL_LDFLAGS"
     4730                fi
     4731                if test "$cf_cv_ld_rpath" = yes ; then
     4732-                       cf_ld_rpath_opt="-Wl,-rpath,"
     4733+                       LD_RPATH_OPT="-Wl,-rpath,"
     4734                        EXTRA_LDFLAGS="-Wl,-rpath,\${libdir} $EXTRA_LDFLAGS"
     4735                fi
     4736 
     4737@@ -5131,7 +5381,7 @@
     4738                        LOCAL_LDFLAGS2="$LOCAL_LDFLAGS"
     4739                fi
     4740                if test "$cf_cv_ld_rpath" = yes ; then
     4741-                       cf_ld_rpath_opt="-Wl,-rpath,"
     4742+                       LD_RPATH_OPT="-Wl,-rpath,"
     4743                        EXTRA_LDFLAGS="-Wl,-rpath,\${libdir} $EXTRA_LDFLAGS"
     4744                fi
     4745                CC_SHARED_OPTS="$CC_SHARED_OPTS -DPIC"
     4746@@ -5155,7 +5405,7 @@
     4747                if test "$DFT_LWR_MODEL" = "shared" && test "$cf_cv_ld_rpath" = yes ; then
     4748                        LOCAL_LDFLAGS="-rpath \$(LOCAL_LIBDIR)"
     4749                        LOCAL_LDFLAGS2="-rpath \${libdir} $LOCAL_LDFLAGS"
     4750-                       cf_ld_rpath_opt="-rpath "
     4751+                       LD_RPATH_OPT="-rpath "
     4752                        EXTRA_LDFLAGS="-rpath \${libdir} $EXTRA_LDFLAGS"
     4753                fi
     4754 
     4755@@ -5170,7 +5420,7 @@
     4756                ;;
     4757        netbsd*)
     4758                CC_SHARED_OPTS="$CC_SHARED_OPTS -DPIC"
     4759-               test "$cf_cv_ld_rpath" = yes && cf_ld_rpath_opt="-Wl,-rpath,"
     4760+               test "$cf_cv_ld_rpath" = yes && LD_RPATH_OPT="-Wl,-rpath,"
     4761                if test "$DFT_LWR_MODEL" = "shared" && test "$cf_cv_ld_rpath" = yes ; then
     4762                        LOCAL_LDFLAGS="-Wl,-rpath,\$(LOCAL_LIBDIR)"
     4763                        LOCAL_LDFLAGS2="$LOCAL_LDFLAGS"
     4764@@ -5211,7 +5461,7 @@
     4765                        LOCAL_LDFLAGS2="$LOCAL_LDFLAGS"
     4766                fi
     4767                if test "$cf_cv_ld_rpath" = yes ; then
     4768-                       cf_ld_rpath_opt="-rpath"
     4769+                       LD_RPATH_OPT="-rpath"
     4770                        # EXTRA_LDFLAGS="$LOCAL_LDFLAGS $EXTRA_LDFLAGS"
     4771                fi
     4772                cf_cv_rm_so_locs=yes
     4773@@ -5246,7 +5496,7 @@
     4774                        LOCAL_LDFLAGS2="$LOCAL_LDFLAGS"
     4775                fi
     4776                if test "$cf_cv_ld_rpath" = yes ; then
     4777-                       cf_ld_rpath_opt="-R"
     4778+                       LD_RPATH_OPT="-R"
     4779                        EXTRA_LDFLAGS="$LOCAL_LDFLAGS $EXTRA_LDFLAGS"
     4780                fi
     4781 
     4782@@ -5258,7 +5508,43 @@
     4783        fi
     4784 
     4785                if test "$GCC" != yes; then
     4786-                       CC_SHARED_OPTS='-xcode=pic32'
     4787+                       cf_save_CFLAGS="$CFLAGS"
     4788+                       for cf_shared_opts in -xcode=pic13 -xcode=pic32 -Kpic -KPIC -O
     4789+                       do
     4790+                               CFLAGS="$cf_shared_opts $cf_save_CFLAGS"
     4791+                               cat >conftest.$ac_ext <<_ACEOF
     4792+#line 5516 "configure"
     4793+#include "confdefs.h"
     4794+#include <stdio.h>
     4795+int
     4796+main ()
     4797+{
     4798+printf("Hello\n");
     4799+  ;
     4800+  return 0;
     4801+}
     4802+_ACEOF
     4803+rm -f conftest.$ac_objext
     4804+if { (eval echo "$as_me:5528: \"$ac_compile\"") >&5
     4805+  (eval $ac_compile) 2>&5
     4806+  ac_status=$?
     4807+  echo "$as_me:5531: \$? = $ac_status" >&5
     4808+  (exit $ac_status); } &&
     4809+         { ac_try='test -s conftest.$ac_objext'
     4810+  { (eval echo "$as_me:5534: \"$ac_try\"") >&5
     4811+  (eval $ac_try) 2>&5
     4812+  ac_status=$?
     4813+  echo "$as_me:5537: \$? = $ac_status" >&5
     4814+  (exit $ac_status); }; }; then
     4815+  break
     4816+else
     4817+  echo "$as_me: failed program was:" >&5
     4818+cat conftest.$ac_ext >&5
     4819+fi
     4820+rm -f conftest.$ac_objext conftest.$ac_ext
     4821+                       done
     4822+                       CFLAGS="$cf_save_CFLAGS"
     4823+                       CC_SHARED_OPTS=$cf_shared_opts
     4824                        MK_SHARED_LIB='${CC} -dy -G -h '$cf_cv_shared_soname' -o $@'
     4825                else
     4826                        MK_SHARED_LIB='${CC} -shared -dy -G -h '$cf_cv_shared_soname' -o $@'
     4827@@ -5285,20 +5571,20 @@
    39454828                        test "$cf_cv_do_symlinks" = no && cf_cv_do_symlinks=yes
    39464829                        ;;
    39474830                *)
    39484831-                       { echo "$as_me:5288: WARNING: ignored --with-shlib-version" >&5
    3949 +                       { echo "$as_me:5308: WARNING: ignored --with-shlib-version" >&5
     4832+                       { echo "$as_me:5574: WARNING: ignored --with-shlib-version" >&5
    39504833 echo "$as_me: WARNING: ignored --with-shlib-version" >&2;}
    39514834                        ;;
    39524835                esac
    3953 @@ -5293,12 +5313,12 @@
     4836                ;;
    39544837        esac
    39554838 
    3956         if test -n "$cf_ld_rpath_opt" ; then
     4839-       if test -n "$cf_ld_rpath_opt" ; then
    39574840-               echo "$as_me:5296: checking if we need a space after rpath option" >&5
    3958 +               echo "$as_me:5316: checking if we need a space after rpath option" >&5
     4841+       if test -n "$LD_RPATH_OPT" ; then
     4842+               echo "$as_me:5582: checking if we need a space after rpath option" >&5
    39594843 echo $ECHO_N "checking if we need a space after rpath option... $ECHO_C" >&6
    39604844                cf_save_LIBS="$LIBS"
    3961                 LIBS="$LIBS ${cf_ld_rpath_opt}$libdir"
     4845-               LIBS="$LIBS ${cf_ld_rpath_opt}$libdir"
     4846+               LIBS="$LIBS ${LD_RPATH_OPT}$libdir"
    39624847                cat >conftest.$ac_ext <<_ACEOF
    39634848-#line 5301 "configure"
    3964 +#line 5321 "configure"
     4849+#line 5587 "configure"
    39654850 #include "confdefs.h"
    39664851 
    39674852 int
    3968 @@ -5310,16 +5330,16 @@
     4853@@ -5310,16 +5596,16 @@
    39694854 }
    39704855 _ACEOF
    39714856 rm -f conftest.$ac_objext conftest$ac_exeext
    39724857-if { (eval echo "$as_me:5313: \"$ac_link\"") >&5
    3973 +if { (eval echo "$as_me:5333: \"$ac_link\"") >&5
     4858+if { (eval echo "$as_me:5599: \"$ac_link\"") >&5
    39744859   (eval $ac_link) 2>&5
    39754860   ac_status=$?
    39764861-  echo "$as_me:5316: \$? = $ac_status" >&5
    3977 +  echo "$as_me:5336: \$? = $ac_status" >&5
     4862+  echo "$as_me:5602: \$? = $ac_status" >&5
    39784863   (exit $ac_status); } &&
    39794864          { ac_try='test -s conftest$ac_exeext'
    39804865-  { (eval echo "$as_me:5319: \"$ac_try\"") >&5
    3981 +  { (eval echo "$as_me:5339: \"$ac_try\"") >&5
     4866+  { (eval echo "$as_me:5605: \"$ac_try\"") >&5
    39824867   (eval $ac_try) 2>&5
    39834868   ac_status=$?
    39844869-  echo "$as_me:5322: \$? = $ac_status" >&5
    3985 +  echo "$as_me:5342: \$? = $ac_status" >&5
     4870+  echo "$as_me:5608: \$? = $ac_status" >&5
    39864871   (exit $ac_status); }; }; then
    39874872   cf_rpath_space=no
    39884873 else
    3989 @@ -5329,7 +5349,7 @@
     4874@@ -5329,16 +5615,16 @@
    39904875 fi
    39914876 rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
    39924877                LIBS="$cf_save_LIBS"
    39934878-               echo "$as_me:5332: result: $cf_rpath_space" >&5
    3994 +               echo "$as_me:5352: result: $cf_rpath_space" >&5
     4879+               echo "$as_me:5618: result: $cf_rpath_space" >&5
    39954880 echo "${ECHO_T}$cf_rpath_space" >&6
    3996                 test "$cf_rpath_space" = yes && cf_ld_rpath_opt="$cf_ld_rpath_opt "
    3997                 MK_SHARED_LIB="$MK_SHARED_LIB $cf_ld_rpath_opt\${libdir}"
    3998 @@ -5338,7 +5358,7 @@
     4881-               test "$cf_rpath_space" = yes && cf_ld_rpath_opt="$cf_ld_rpath_opt "
     4882-               MK_SHARED_LIB="$MK_SHARED_LIB $cf_ld_rpath_opt\${libdir}"
     4883+               test "$cf_rpath_space" = yes && LD_RPATH_OPT="$LD_RPATH_OPT "
     4884+               MK_SHARED_LIB="$MK_SHARED_LIB $LD_RPATH_OPT\${libdir}"
     4885        fi
     4886 
    39994887 if test "$CC_SHARED_OPTS" = "unknown"; then
    40004888        for model in $cf_list_models; do
    40014889                if test "$model" = "shared"; then
    40024890-                       { { echo "$as_me:5341: error: Shared libraries are not supported in this version" >&5
    4003 +                       { { echo "$as_me:5361: error: Shared libraries are not supported in this version" >&5
     4891+                       { { echo "$as_me:5627: error: Shared libraries are not supported in this version" >&5
    40044892 echo "$as_me: error: Shared libraries are not supported in this version" >&2;}
    40054893    { (exit 1); exit 1; }; }
    40064894                fi
    4007 @@ -5348,7 +5368,7 @@
     4895@@ -5348,7 +5634,7 @@
    40084896 ###############################################################################
    40094897 
    40104898 ###    use option --disable-overwrite to leave out the link to -lcurses
    40114899-echo "$as_me:5351: checking if you wish to install ncurses overwriting curses" >&5
    4012 +echo "$as_me:5371: checking if you wish to install ncurses overwriting curses" >&5
     4900+echo "$as_me:5637: checking if you wish to install ncurses overwriting curses" >&5
    40134901 echo $ECHO_N "checking if you wish to install ncurses overwriting curses... $ECHO_C" >&6
    40144902 
    40154903 # Check whether --enable-overwrite or --disable-overwrite was given.
    4016 @@ -5358,10 +5378,10 @@
     4904@@ -5358,10 +5644,10 @@
    40174905 else
    40184906   if test "$prefix" = "/usr" ; then with_overwrite=yes; else with_overwrite=no; fi
    40194907 fi;
    40204908-echo "$as_me:5361: result: $with_overwrite" >&5
    4021 +echo "$as_me:5381: result: $with_overwrite" >&5
     4909+echo "$as_me:5647: result: $with_overwrite" >&5
    40224910 echo "${ECHO_T}$with_overwrite" >&6
    40234911 
    40244912-echo "$as_me:5364: checking if external terminfo-database is used" >&5
    4025 +echo "$as_me:5384: checking if external terminfo-database is used" >&5
     4913+echo "$as_me:5650: checking if external terminfo-database is used" >&5
    40264914 echo $ECHO_N "checking if external terminfo-database is used... $ECHO_C" >&6
    40274915 
    40284916 # Check whether --enable-database or --disable-database was given.
    4029 @@ -5371,7 +5391,7 @@
     4917@@ -5371,7 +5657,7 @@
    40304918 else
    40314919   use_database=yes
    40324920 fi;
    40334921-echo "$as_me:5374: result: $use_database" >&5
    4034 +echo "$as_me:5394: result: $use_database" >&5
     4922+echo "$as_me:5660: result: $use_database" >&5
    40354923 echo "${ECHO_T}$use_database" >&6
    40364924 
    40374925 case $host_os in #(vi
    4038 @@ -5393,7 +5413,7 @@
     4926@@ -5393,7 +5679,7 @@
    40394927 #define USE_DATABASE 1
    40404928 EOF
    40414929 
    40424930-       echo "$as_me:5396: checking which terminfo source-file will be installed" >&5
    4043 +       echo "$as_me:5416: checking which terminfo source-file will be installed" >&5
     4931+       echo "$as_me:5682: checking which terminfo source-file will be installed" >&5
    40444932 echo $ECHO_N "checking which terminfo source-file will be installed... $ECHO_C" >&6
    40454933 
    40464934 # Check whether --enable-database or --disable-database was given.
    4047 @@ -5401,10 +5421,10 @@
     4935@@ -5401,10 +5687,10 @@
    40484936   enableval="$enable_database"
    40494937   TERMINFO_SRC=$withval
    40504938 fi;
    40514939-       echo "$as_me:5404: result: $TERMINFO_SRC" >&5
    4052 +       echo "$as_me:5424: result: $TERMINFO_SRC" >&5
     4940+       echo "$as_me:5690: result: $TERMINFO_SRC" >&5
    40534941 echo "${ECHO_T}$TERMINFO_SRC" >&6
    40544942 
    40554943-       echo "$as_me:5407: checking whether to use hashed database instead of directory/tree" >&5
    4056 +       echo "$as_me:5427: checking whether to use hashed database instead of directory/tree" >&5
     4944+       echo "$as_me:5693: checking whether to use hashed database instead of directory/tree" >&5
    40574945 echo $ECHO_N "checking whether to use hashed database instead of directory/tree... $ECHO_C" >&6
    40584946 
    40594947 # Check whether --with-hashed-db or --without-hashed-db was given.
    4060 @@ -5414,13 +5434,13 @@
     4948@@ -5414,13 +5700,13 @@
    40614949 else
    40624950   with_hashed_db=no
    40634951 fi;
    40644952-       echo "$as_me:5417: result: $with_hashed_db" >&5
    4065 +       echo "$as_me:5437: result: $with_hashed_db" >&5
     4953+       echo "$as_me:5703: result: $with_hashed_db" >&5
    40664954 echo "${ECHO_T}$with_hashed_db" >&6
    40674955 else
    … …  
    40704958 
    40714959-echo "$as_me:5423: checking for list of fallback descriptions" >&5
    4072 +echo "$as_me:5443: checking for list of fallback descriptions" >&5
     4960+echo "$as_me:5709: checking for list of fallback descriptions" >&5
    40734961 echo $ECHO_N "checking for list of fallback descriptions... $ECHO_C" >&6
    40744962 
    40754963 # Check whether --with-fallbacks or --without-fallbacks was given.
    4076 @@ -5430,11 +5450,11 @@
     4964@@ -5430,11 +5716,11 @@
    40774965 else
    40784966   with_fallback=
    40794967 fi;
    40804968-echo "$as_me:5433: result: $with_fallback" >&5
    4081 +echo "$as_me:5453: result: $with_fallback" >&5
     4969+echo "$as_me:5719: result: $with_fallback" >&5
    40824970 echo "${ECHO_T}$with_fallback" >&6
    40834971 FALLBACK_LIST=`echo "$with_fallback" | sed -e 's/,/ /g'`
    40844972 
    40854973-echo "$as_me:5437: checking if you want modern xterm or antique" >&5
    4086 +echo "$as_me:5457: checking if you want modern xterm or antique" >&5
     4974+echo "$as_me:5723: checking if you want modern xterm or antique" >&5
    40874975 echo $ECHO_N "checking if you want modern xterm or antique... $ECHO_C" >&6
    40884976 
    40894977 # Check whether --with-xterm-new or --without-xterm-new was given.
    4090 @@ -5448,7 +5468,7 @@
     4978@@ -5448,7 +5734,7 @@
    40914979 no)    with_xterm_new=xterm-old;;
    40924980 *)     with_xterm_new=xterm-new;;
    40934981 esac
    40944982-echo "$as_me:5451: result: $with_xterm_new" >&5
    4095 +echo "$as_me:5471: result: $with_xterm_new" >&5
     4983+echo "$as_me:5737: result: $with_xterm_new" >&5
    40964984 echo "${ECHO_T}$with_xterm_new" >&6
    40974985 WHICH_XTERM=$with_xterm_new
    40984986 
    4099 @@ -5458,7 +5478,7 @@
     4987@@ -5458,7 +5744,7 @@
    41004988        MAKE_TERMINFO="#"
    41014989 else
    41024990 
    41034991-echo "$as_me:5461: checking for list of terminfo directories" >&5
    4104 +echo "$as_me:5481: checking for list of terminfo directories" >&5
     4992+echo "$as_me:5747: checking for list of terminfo directories" >&5
    41054993 echo $ECHO_N "checking for list of terminfo directories... $ECHO_C" >&6
    41064994 
    41074995 # Check whether --with-terminfo-dirs or --without-terminfo-dirs was given.
    4108 @@ -5498,7 +5518,7 @@
     4996@@ -5498,7 +5784,7 @@
    41094997   cf_src_path=`echo $cf_src_path | sed -e s%NONE%$cf_path_syntax%`
    41104998   ;;
    41114999 *)
    41125000-  { { echo "$as_me:5501: error: expected a pathname, not \"$cf_src_path\"" >&5
    4113 +  { { echo "$as_me:5521: error: expected a pathname, not \"$cf_src_path\"" >&5
     5001+  { { echo "$as_me:5787: error: expected a pathname, not \"$cf_src_path\"" >&5
    41145002 echo "$as_me: error: expected a pathname, not \"$cf_src_path\"" >&2;}
    41155003    { (exit 1); exit 1; }; }
    41165004   ;;
    4117 @@ -5511,13 +5531,13 @@
     5005@@ -5511,13 +5797,13 @@
    41185006 
    41195007 eval 'TERMINFO_DIRS="$cf_dst_path"'
    41205008 
    41215009-echo "$as_me:5514: result: $TERMINFO_DIRS" >&5
    4122 +echo "$as_me:5534: result: $TERMINFO_DIRS" >&5
     5010+echo "$as_me:5800: result: $TERMINFO_DIRS" >&5
    41235011 echo "${ECHO_T}$TERMINFO_DIRS" >&6
    41245012 test -n "$TERMINFO_DIRS" && cat >>confdefs.h <<EOF
    … …  
    41275015 
    41285016-echo "$as_me:5520: checking for default terminfo directory" >&5
    4129 +echo "$as_me:5540: checking for default terminfo directory" >&5
     5017+echo "$as_me:5806: checking for default terminfo directory" >&5
    41305018 echo $ECHO_N "checking for default terminfo directory... $ECHO_C" >&6
    41315019 
    41325020 # Check whether --with-default-terminfo-dir or --without-default-terminfo-dir was given.
    4133 @@ -5553,7 +5573,7 @@
     5021@@ -5553,7 +5839,7 @@
    41345022   withval=`echo $withval | sed -e s%NONE%$cf_path_syntax%`
    41355023   ;;
    41365024 *)
    41375025-  { { echo "$as_me:5556: error: expected a pathname, not \"$withval\"" >&5
    4138 +  { { echo "$as_me:5576: error: expected a pathname, not \"$withval\"" >&5
     5026+  { { echo "$as_me:5842: error: expected a pathname, not \"$withval\"" >&5
    41395027 echo "$as_me: error: expected a pathname, not \"$withval\"" >&2;}
    41405028    { (exit 1); exit 1; }; }
    41415029   ;;
    4142 @@ -5562,7 +5582,7 @@
     5030@@ -5562,7 +5848,7 @@
    41435031 fi
    41445032 TERMINFO="$withval"
    41455033 
    41465034-echo "$as_me:5565: result: $TERMINFO" >&5
    4147 +echo "$as_me:5585: result: $TERMINFO" >&5
     5035+echo "$as_me:5851: result: $TERMINFO" >&5
    41485036 echo "${ECHO_T}$TERMINFO" >&6
    41495037 cat >>confdefs.h <<EOF
    41505038 #define TERMINFO "$TERMINFO"
    4151 @@ -5572,7 +5592,7 @@
     5039@@ -5572,7 +5858,7 @@
    41525040 
    41535041 ###    use option --disable-big-core to make tic run on small machines
    41545042 ###    We need 4Mb, check if we can allocate 50% more than that.
    41555043-echo "$as_me:5575: checking if big-core option selected" >&5
    4156 +echo "$as_me:5595: checking if big-core option selected" >&5
     5044+echo "$as_me:5861: checking if big-core option selected" >&5
    41575045 echo $ECHO_N "checking if big-core option selected... $ECHO_C" >&6
    41585046 
    41595047 # Check whether --enable-big-core or --disable-big-core was given.
    4160 @@ -5584,7 +5604,7 @@
     5048@@ -5584,7 +5870,7 @@
    41615049   with_big_core=no
    41625050 else
    41635051   cat >conftest.$ac_ext <<_ACEOF
    41645052-#line 5587 "configure"
    4165 +#line 5607 "configure"
     5053+#line 5873 "configure"
    41665054 #include "confdefs.h"
    41675055 
    41685056 #include <stdlib.h>
    4169 @@ -5598,15 +5618,15 @@
     5057@@ -5598,15 +5884,15 @@
    41705058 }
    41715059 _ACEOF
    41725060 rm -f conftest$ac_exeext
    41735061-if { (eval echo "$as_me:5601: \"$ac_link\"") >&5
    4174 +if { (eval echo "$as_me:5621: \"$ac_link\"") >&5
     5062+if { (eval echo "$as_me:5887: \"$ac_link\"") >&5
    41755063   (eval $ac_link) 2>&5
    41765064   ac_status=$?
    41775065-  echo "$as_me:5604: \$? = $ac_status" >&5
    4178 +  echo "$as_me:5624: \$? = $ac_status" >&5
     5066+  echo "$as_me:5890: \$? = $ac_status" >&5
    41795067   (exit $ac_status); } && { ac_try='./conftest$ac_exeext'
    41805068-  { (eval echo "$as_me:5606: \"$ac_try\"") >&5
    4181 +  { (eval echo "$as_me:5626: \"$ac_try\"") >&5
     5069+  { (eval echo "$as_me:5892: \"$ac_try\"") >&5
    41825070   (eval $ac_try) 2>&5
    41835071   ac_status=$?
    41845072-  echo "$as_me:5609: \$? = $ac_status" >&5
    4185 +  echo "$as_me:5629: \$? = $ac_status" >&5
     5073+  echo "$as_me:5895: \$? = $ac_status" >&5
    41865074   (exit $ac_status); }; }; then
    41875075   with_big_core=yes
    41885076 else
    4189 @@ -5618,7 +5638,7 @@
     5077@@ -5618,7 +5904,7 @@
    41905078 rm -f core core.* *.core conftest$ac_exeext conftest.$ac_objext conftest.$ac_ext
    41915079 fi
    41925080 fi;
    41935081-echo "$as_me:5621: result: $with_big_core" >&5
    4194 +echo "$as_me:5641: result: $with_big_core" >&5
     5082+echo "$as_me:5907: result: $with_big_core" >&5
    41955083 echo "${ECHO_T}$with_big_core" >&6
    41965084 test "$with_big_core" = "yes" && cat >>confdefs.h <<\EOF
    41975085 #define HAVE_BIG_CORE 1
    4198 @@ -5627,7 +5647,7 @@
     5086@@ -5627,7 +5913,7 @@
    41995087 ### ISO C only guarantees 512-char strings, we have tables which load faster
    42005088 ### when constructed using "big" strings.  More than the C compiler, the awk
    42015089 ### program is a limit on most vendor UNIX systems.  Check that we can build.
    42025090-echo "$as_me:5630: checking if big-strings option selected" >&5
    4203 +echo "$as_me:5650: checking if big-strings option selected" >&5
     5091+echo "$as_me:5916: checking if big-strings option selected" >&5
    42045092 echo $ECHO_N "checking if big-strings option selected... $ECHO_C" >&6
    42055093 
    42065094 # Check whether --enable-big-strings or --disable-big-strings was given.
    4207 @@ -5636,29 +5656,29 @@
     5095@@ -5636,29 +5922,29 @@
    42085096   with_big_strings=$enableval
    42095097 else
    … …  
    42385126 fi;
    42395127-echo "$as_me:5654: result: $with_big_strings" >&5
    4240 +echo "$as_me:5674: result: $with_big_strings" >&5
     5128+echo "$as_me:5940: result: $with_big_strings" >&5
    42415129 echo "${ECHO_T}$with_big_strings" >&6
    42425130 
    … …  
    42465134 ###    use option --enable-termcap to compile in the termcap fallback support
    42475135-echo "$as_me:5661: checking if you want termcap-fallback support" >&5
    4248 +echo "$as_me:5681: checking if you want termcap-fallback support" >&5
     5136+echo "$as_me:5947: checking if you want termcap-fallback support" >&5
    42495137 echo $ECHO_N "checking if you want termcap-fallback support... $ECHO_C" >&6
    42505138 
    42515139 # Check whether --enable-termcap or --disable-termcap was given.
    4252 @@ -5668,13 +5688,13 @@
     5140@@ -5668,13 +5954,13 @@
    42535141 else
    42545142   with_termcap=no
    42555143 fi;
    42565144-echo "$as_me:5671: result: $with_termcap" >&5
    4257 +echo "$as_me:5691: result: $with_termcap" >&5
     5145+echo "$as_me:5957: result: $with_termcap" >&5
    42585146 echo "${ECHO_T}$with_termcap" >&6
    42595147 
    … …  
    42625150                if test -z "$with_fallback" ; then
    42635151-                       { { echo "$as_me:5677: error: You have disabled the database w/o specifying fallbacks" >&5
    4264 +                       { { echo "$as_me:5697: error: You have disabled the database w/o specifying fallbacks" >&5
     5152+                       { { echo "$as_me:5963: error: You have disabled the database w/o specifying fallbacks" >&5
    42655153 echo "$as_me: error: You have disabled the database w/o specifying fallbacks" >&2;}
    42665154    { (exit 1); exit 1; }; }
    42675155                fi
    4268 @@ -5686,7 +5706,7 @@
     5156@@ -5686,7 +5972,7 @@
    42695157 else
    42705158 
    42715159 if test "$with_ticlib" != no ; then
    42725160-       { { echo "$as_me:5689: error: Options --with-ticlib and --enable-termcap cannot be combined" >&5
    4273 +       { { echo "$as_me:5709: error: Options --with-ticlib and --enable-termcap cannot be combined" >&5
     5161+       { { echo "$as_me:5975: error: Options --with-ticlib and --enable-termcap cannot be combined" >&5
    42745162 echo "$as_me: error: Options --with-ticlib and --enable-termcap cannot be combined" >&2;}
    42755163    { (exit 1); exit 1; }; }
    42765164 fi
    4277 @@ -5695,7 +5715,7 @@
     5165@@ -5695,7 +5981,7 @@
    42785166 #define USE_TERMCAP 1
    42795167 EOF
    42805168 
    42815169-echo "$as_me:5698: checking for list of termcap files" >&5
    4282 +echo "$as_me:5718: checking for list of termcap files" >&5
     5170+echo "$as_me:5984: checking for list of termcap files" >&5
    42835171 echo $ECHO_N "checking for list of termcap files... $ECHO_C" >&6
    42845172 
    42855173 # Check whether --with-termpath or --without-termpath was given.
    4286 @@ -5735,7 +5755,7 @@
     5174@@ -5735,7 +6021,7 @@
    42875175   cf_src_path=`echo $cf_src_path | sed -e s%NONE%$cf_path_syntax%`
    42885176   ;;
    42895177 *)
    42905178-  { { echo "$as_me:5738: error: expected a pathname, not \"$cf_src_path\"" >&5
    4291 +  { { echo "$as_me:5758: error: expected a pathname, not \"$cf_src_path\"" >&5
     5179+  { { echo "$as_me:6024: error: expected a pathname, not \"$cf_src_path\"" >&5
    42925180 echo "$as_me: error: expected a pathname, not \"$cf_src_path\"" >&2;}
    42935181    { (exit 1); exit 1; }; }
    42945182   ;;
    4295 @@ -5748,14 +5768,14 @@
     5183@@ -5748,14 +6034,14 @@
    42965184 
    42975185 eval 'TERMPATH="$cf_dst_path"'
    42985186 
    42995187-echo "$as_me:5751: result: $TERMPATH" >&5
    4300 +echo "$as_me:5771: result: $TERMPATH" >&5
     5188+echo "$as_me:6037: result: $TERMPATH" >&5
    43015189 echo "${ECHO_T}$TERMPATH" >&6
    43025190 test -n "$TERMPATH" && cat >>confdefs.h <<EOF
    … …  
    43065194 ###    use option --enable-getcap to use a hacked getcap for reading termcaps
    43075195-echo "$as_me:5758: checking if fast termcap-loader is needed" >&5
    4308 +echo "$as_me:5778: checking if fast termcap-loader is needed" >&5
     5196+echo "$as_me:6044: checking if fast termcap-loader is needed" >&5
    43095197 echo $ECHO_N "checking if fast termcap-loader is needed... $ECHO_C" >&6
    43105198 
    43115199 # Check whether --enable-getcap or --disable-getcap was given.
    4312 @@ -5765,13 +5785,13 @@
     5200@@ -5765,13 +6051,13 @@
    43135201 else
    43145202   with_getcap=no
    43155203 fi;
    43165204-echo "$as_me:5768: result: $with_getcap" >&5
    4317 +echo "$as_me:5788: result: $with_getcap" >&5
     5205+echo "$as_me:6054: result: $with_getcap" >&5
    43185206 echo "${ECHO_T}$with_getcap" >&6
    43195207 test "$with_getcap" = "yes" && cat >>confdefs.h <<\EOF
    … …  
    43225210 
    43235211-echo "$as_me:5774: checking if translated termcaps will be cached in ~/.terminfo" >&5
    4324 +echo "$as_me:5794: checking if translated termcaps will be cached in ~/.terminfo" >&5
     5212+echo "$as_me:6060: checking if translated termcaps will be cached in ~/.terminfo" >&5
    43255213 echo $ECHO_N "checking if translated termcaps will be cached in ~/.terminfo... $ECHO_C" >&6
    43265214 
    43275215 # Check whether --enable-getcap-cache or --disable-getcap-cache was given.
    4328 @@ -5781,7 +5801,7 @@
     5216@@ -5781,7 +6067,7 @@
    43295217 else
    43305218   with_getcap_cache=no
    43315219 fi;
    43325220-echo "$as_me:5784: result: $with_getcap_cache" >&5
    4333 +echo "$as_me:5804: result: $with_getcap_cache" >&5
     5221+echo "$as_me:6070: result: $with_getcap_cache" >&5
    43345222 echo "${ECHO_T}$with_getcap_cache" >&6
    43355223 test "$with_getcap_cache" = "yes" && cat >>confdefs.h <<\EOF
    43365224 #define USE_GETCAP_CACHE 1
    4337 @@ -5790,7 +5810,7 @@
     5225@@ -5790,7 +6076,7 @@
    43385226 fi
    43395227 
    43405228 ###   Use option --disable-home-terminfo to completely remove ~/.terminfo
    43415229-echo "$as_me:5793: checking if ~/.terminfo is wanted" >&5
    4342 +echo "$as_me:5813: checking if ~/.terminfo is wanted" >&5
     5230+echo "$as_me:6079: checking if ~/.terminfo is wanted" >&5
    43435231 echo $ECHO_N "checking if ~/.terminfo is wanted... $ECHO_C" >&6
    43445232 
    43455233 # Check whether --enable-home-terminfo or --disable-home-terminfo was given.
    4346 @@ -5800,13 +5820,13 @@
     5234@@ -5800,13 +6086,13 @@
    43475235 else
    43485236   with_home_terminfo=yes
    43495237 fi;
    43505238-echo "$as_me:5803: result: $with_home_terminfo" >&5
    4351 +echo "$as_me:5823: result: $with_home_terminfo" >&5
     5239+echo "$as_me:6089: result: $with_home_terminfo" >&5
    43525240 echo "${ECHO_T}$with_home_terminfo" >&6
    43535241 test "$with_home_terminfo" = "yes" && cat >>confdefs.h <<\EOF
    … …  
    43565244 
    43575245-echo "$as_me:5809: checking if you want to use restricted environment when running as root" >&5
    4358 +echo "$as_me:5829: checking if you want to use restricted environment when running as root" >&5
     5246+echo "$as_me:6095: checking if you want to use restricted environment when running as root" >&5
    43595247 echo $ECHO_N "checking if you want to use restricted environment when running as root... $ECHO_C" >&6
    43605248 
    43615249 # Check whether --enable-root-environ or --disable-root-environ was given.
    4362 @@ -5816,7 +5836,7 @@
     5250@@ -5816,7 +6102,7 @@
    43635251 else
    43645252   with_root_environ=yes
    43655253 fi;
    43665254-echo "$as_me:5819: result: $with_root_environ" >&5
    4367 +echo "$as_me:5839: result: $with_root_environ" >&5
     5255+echo "$as_me:6105: result: $with_root_environ" >&5
    43685256 echo "${ECHO_T}$with_root_environ" >&6
    43695257 test "$with_root_environ" = yes && cat >>confdefs.h <<\EOF
    43705258 #define USE_ROOT_ENVIRON 1
    4371 @@ -5830,13 +5850,13 @@
     5259@@ -5830,13 +6116,13 @@
    43725260        unlink
    43735261 do
    43745262 as_ac_var=`echo "ac_cv_func_$ac_func" | $as_tr_sh`
    43755263-echo "$as_me:5833: checking for $ac_func" >&5
    4376 +echo "$as_me:5853: checking for $ac_func" >&5
     5264+echo "$as_me:6119: checking for $ac_func" >&5
    43775265 echo $ECHO_N "checking for $ac_func... $ECHO_C" >&6
    43785266 if eval "test \"\${$as_ac_var+set}\" = set"; then
    … …  
    43815269   cat >conftest.$ac_ext <<_ACEOF
    43825270-#line 5839 "configure"
    4383 +#line 5859 "configure"
     5271+#line 6125 "configure"
    43845272 #include "confdefs.h"
    43855273 /* System header to define __stub macros and hopefully few prototypes,
    43865274     which can conflict with char $ac_func (); below.  */
    4387 @@ -5867,16 +5887,16 @@
     5275@@ -5867,16 +6153,16 @@
    43885276 }
    43895277 _ACEOF
    43905278 rm -f conftest.$ac_objext conftest$ac_exeext
    43915279-if { (eval echo "$as_me:5870: \"$ac_link\"") >&5
    4392 +if { (eval echo "$as_me:5890: \"$ac_link\"") >&5
     5280+if { (eval echo "$as_me:6156: \"$ac_link\"") >&5
    43935281   (eval $ac_link) 2>&5
    43945282   ac_status=$?
    43955283-  echo "$as_me:5873: \$? = $ac_status" >&5
    4396 +  echo "$as_me:5893: \$? = $ac_status" >&5
     5284+  echo "$as_me:6159: \$? = $ac_status" >&5
    43975285   (exit $ac_status); } &&
    43985286          { ac_try='test -s conftest$ac_exeext'
    43995287-  { (eval echo "$as_me:5876: \"$ac_try\"") >&5
    4400 +  { (eval echo "$as_me:5896: \"$ac_try\"") >&5
     5288+  { (eval echo "$as_me:6162: \"$ac_try\"") >&5
    44015289   (eval $ac_try) 2>&5
    44025290   ac_status=$?
    44035291-  echo "$as_me:5879: \$? = $ac_status" >&5
    4404 +  echo "$as_me:5899: \$? = $ac_status" >&5
     5292+  echo "$as_me:6165: \$? = $ac_status" >&5
    44055293   (exit $ac_status); }; }; then
    44065294   eval "$as_ac_var=yes"
    44075295 else
    4408 @@ -5886,7 +5906,7 @@
     5296@@ -5886,7 +6172,7 @@
    44095297 fi
    44105298 rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
    44115299 fi
    44125300-echo "$as_me:5889: result: `eval echo '${'$as_ac_var'}'`" >&5
    4413 +echo "$as_me:5909: result: `eval echo '${'$as_ac_var'}'`" >&5
     5301+echo "$as_me:6175: result: `eval echo '${'$as_ac_var'}'`" >&5
    44145302 echo "${ECHO_T}`eval echo '${'$as_ac_var'}'`" >&6
    44155303 if test `eval echo '${'$as_ac_var'}'` = yes; then
    44165304   cat >>confdefs.h <<EOF
    4417 @@ -5903,13 +5923,13 @@
     5305@@ -5903,13 +6189,13 @@
    44185306                symlink
    44195307 do
    44205308 as_ac_var=`echo "ac_cv_func_$ac_func" | $as_tr_sh`
    44215309-echo "$as_me:5906: checking for $ac_func" >&5
    4422 +echo "$as_me:5926: checking for $ac_func" >&5
     5310+echo "$as_me:6192: checking for $ac_func" >&5
    44235311 echo $ECHO_N "checking for $ac_func... $ECHO_C" >&6
    44245312 if eval "test \"\${$as_ac_var+set}\" = set"; then
    … …  
    44275315   cat >conftest.$ac_ext <<_ACEOF
    44285316-#line 5912 "configure"
    4429 +#line 5932 "configure"
     5317+#line 6198 "configure"
    44305318 #include "confdefs.h"
    44315319 /* System header to define __stub macros and hopefully few prototypes,
    44325320     which can conflict with char $ac_func (); below.  */
    4433 @@ -5940,16 +5960,16 @@
     5321@@ -5940,16 +6226,16 @@
    44345322 }
    44355323 _ACEOF
    44365324 rm -f conftest.$ac_objext conftest$ac_exeext
    44375325-if { (eval echo "$as_me:5943: \"$ac_link\"") >&5
    4438 +if { (eval echo "$as_me:5963: \"$ac_link\"") >&5
     5326+if { (eval echo "$as_me:6229: \"$ac_link\"") >&5
    44395327   (eval $ac_link) 2>&5
    44405328   ac_status=$?
    44415329-  echo "$as_me:5946: \$? = $ac_status" >&5
    4442 +  echo "$as_me:5966: \$? = $ac_status" >&5
     5330+  echo "$as_me:6232: \$? = $ac_status" >&5
    44435331   (exit $ac_status); } &&
    44445332          { ac_try='test -s conftest$ac_exeext'
    44455333-  { (eval echo "$as_me:5949: \"$ac_try\"") >&5
    4446 +  { (eval echo "$as_me:5969: \"$ac_try\"") >&5
     5334+  { (eval echo "$as_me:6235: \"$ac_try\"") >&5
    44475335   (eval $ac_try) 2>&5
    44485336   ac_status=$?
    44495337-  echo "$as_me:5952: \$? = $ac_status" >&5
    4450 +  echo "$as_me:5972: \$? = $ac_status" >&5
     5338+  echo "$as_me:6238: \$? = $ac_status" >&5
    44515339   (exit $ac_status); }; }; then
    44525340   eval "$as_ac_var=yes"
    44535341 else
    4454 @@ -5959,7 +5979,7 @@
     5342@@ -5959,7 +6245,7 @@
    44555343 fi
    44565344 rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
    44575345 fi
    44585346-echo "$as_me:5962: result: `eval echo '${'$as_ac_var'}'`" >&5
    4459 +echo "$as_me:5982: result: `eval echo '${'$as_ac_var'}'`" >&5
     5347+echo "$as_me:6248: result: `eval echo '${'$as_ac_var'}'`" >&5
    44605348 echo "${ECHO_T}`eval echo '${'$as_ac_var'}'`" >&6
    44615349 if test `eval echo '${'$as_ac_var'}'` = yes; then
    44625350   cat >>confdefs.h <<EOF
    4463 @@ -5970,7 +5990,7 @@
     5351@@ -5970,7 +6256,7 @@
    44645352 done
    44655353 
    44665354 else
    44675355-       echo "$as_me:5973: checking if link/symlink functions work" >&5
    4468 +       echo "$as_me:5993: checking if link/symlink functions work" >&5
     5356+       echo "$as_me:6259: checking if link/symlink functions work" >&5
    44695357 echo $ECHO_N "checking if link/symlink functions work... $ECHO_C" >&6
    44705358 if test "${cf_cv_link_funcs+set}" = set; then
    44715359   echo $ECHO_N "(cached) $ECHO_C" >&6
    4472 @@ -5983,7 +6003,7 @@
     5360@@ -5983,7 +6269,7 @@
    44735361                        eval 'ac_cv_func_'$cf_func'=error'
    44745362 else
    44755363   cat >conftest.$ac_ext <<_ACEOF
    44765364-#line 5986 "configure"
    4477 +#line 6006 "configure"
     5365+#line 6272 "configure"
    44785366 #include "confdefs.h"
    44795367 
    44805368 #include <sys/types.h>
    4481 @@ -6013,15 +6033,15 @@
     5369@@ -6013,15 +6299,15 @@
    44825370 
    44835371 _ACEOF
    44845372 rm -f conftest$ac_exeext
    44855373-if { (eval echo "$as_me:6016: \"$ac_link\"") >&5
    4486 +if { (eval echo "$as_me:6036: \"$ac_link\"") >&5
     5374+if { (eval echo "$as_me:6302: \"$ac_link\"") >&5
    44875375   (eval $ac_link) 2>&5
    44885376   ac_status=$?
    44895377-  echo "$as_me:6019: \$? = $ac_status" >&5
    4490 +  echo "$as_me:6039: \$? = $ac_status" >&5
     5378+  echo "$as_me:6305: \$? = $ac_status" >&5
    44915379   (exit $ac_status); } && { ac_try='./conftest$ac_exeext'
    44925380-  { (eval echo "$as_me:6021: \"$ac_try\"") >&5
    4493 +  { (eval echo "$as_me:6041: \"$ac_try\"") >&5
     5381+  { (eval echo "$as_me:6307: \"$ac_try\"") >&5
    44945382   (eval $ac_try) 2>&5
    44955383   ac_status=$?
    44965384-  echo "$as_me:6024: \$? = $ac_status" >&5
    4497 +  echo "$as_me:6044: \$? = $ac_status" >&5
     5385+  echo "$as_me:6310: \$? = $ac_status" >&5
    44985386   (exit $ac_status); }; }; then
    44995387 
    45005388                        cf_cv_link_funcs="$cf_cv_link_funcs $cf_func"
    4501 @@ -6039,7 +6059,7 @@
     5389@@ -6039,7 +6325,7 @@
    45025390                test -z "$cf_cv_link_funcs" && cf_cv_link_funcs=no
    45035391 
    45045392 fi
    45055393-echo "$as_me:6042: result: $cf_cv_link_funcs" >&5
    4506 +echo "$as_me:6062: result: $cf_cv_link_funcs" >&5
     5394+echo "$as_me:6328: result: $cf_cv_link_funcs" >&5
    45075395 echo "${ECHO_T}$cf_cv_link_funcs" >&6
    45085396        test "$ac_cv_func_link"    = yes && cat >>confdefs.h <<\EOF
    45095397 #define HAVE_LINK 1
    4510 @@ -6057,7 +6077,7 @@
     5398@@ -6057,7 +6343,7 @@
    45115399 # soft links (symbolic links) are useful for some systems where hard links do
    45125400 # not work, or to make it simpler to copy terminfo trees around.
    45135401 if test "$ac_cv_func_symlink" = yes ; then
    45145402-    echo "$as_me:6060: checking if tic should use symbolic links" >&5
    4515 +    echo "$as_me:6080: checking if tic should use symbolic links" >&5
     5403+    echo "$as_me:6346: checking if tic should use symbolic links" >&5
    45165404 echo $ECHO_N "checking if tic should use symbolic links... $ECHO_C" >&6
    45175405 
    45185406 # Check whether --enable-symlinks or --disable-symlinks was given.
    4519 @@ -6067,21 +6087,21 @@
     5407@@ -6067,21 +6353,21 @@
    45205408 else
    45215409   with_symlinks=no
    45225410 fi;
    45235411-    echo "$as_me:6070: result: $with_symlinks" >&5
    4524 +    echo "$as_me:6090: result: $with_symlinks" >&5
     5412+    echo "$as_me:6356: result: $with_symlinks" >&5
    45255413 echo "${ECHO_T}$with_symlinks" >&6
    45265414 fi
    … …  
    45305418 if test "$with_symlinks" = no ; then
    45315419-    echo "$as_me:6077: checking if tic should use hard links" >&5
    4532 +    echo "$as_me:6097: checking if tic should use hard links" >&5
     5420+    echo "$as_me:6363: checking if tic should use hard links" >&5
    45335421 echo $ECHO_N "checking if tic should use hard links... $ECHO_C" >&6
    45345422     if test "$ac_cv_func_link" = yes ; then
    … …  
    45385426     fi
    45395427-    echo "$as_me:6084: result: $with_links" >&5
    4540 +    echo "$as_me:6104: result: $with_links" >&5
     5428+    echo "$as_me:6370: result: $with_links" >&5
    45415429 echo "${ECHO_T}$with_links" >&6
    45425430 fi
    45435431 
    4544 @@ -6094,7 +6114,7 @@
     5432@@ -6094,7 +6380,7 @@
    45455433 EOF
    45465434 
    45475435 ###   use option --enable-broken-linker to force on use of broken-linker support
    45485436-echo "$as_me:6097: checking if you want broken-linker support code" >&5
    4549 +echo "$as_me:6117: checking if you want broken-linker support code" >&5
     5437+echo "$as_me:6383: checking if you want broken-linker support code" >&5
    45505438 echo $ECHO_N "checking if you want broken-linker support code... $ECHO_C" >&6
    45515439 
    45525440 # Check whether --enable-broken_linker or --disable-broken_linker was given.
    4553 @@ -6104,7 +6124,7 @@
     5441@@ -6104,7 +6390,7 @@
    45545442 else
    45555443   with_broken_linker=${BROKEN_LINKER-no}
    45565444 fi;
    45575445-echo "$as_me:6107: result: $with_broken_linker" >&5
    4558 +echo "$as_me:6127: result: $with_broken_linker" >&5
     5446+echo "$as_me:6393: result: $with_broken_linker" >&5
    45595447 echo "${ECHO_T}$with_broken_linker" >&6
    45605448 
    45615449 BROKEN_LINKER=0
    4562 @@ -6124,14 +6144,14 @@
     5450@@ -6124,14 +6410,14 @@
    45635451                BROKEN_LINKER=1
    45645452                test -n "$verbose" && echo "    cygwin linker is broken anyway" 1>&6
    45655453 
    45665454-echo "${as_me-configure}:6127: testing cygwin linker is broken anyway ..." 1>&5
    4567 +echo "${as_me-configure}:6147: testing cygwin linker is broken anyway ..." 1>&5
     5455+echo "${as_me-configure}:6413: testing cygwin linker is broken anyway ..." 1>&5
    45685456 
    45695457                ;;
    … …  
    45735461 ###   use option --enable-bsdpad to have tputs process BSD-style prefix padding
    45745462-echo "$as_me:6134: checking if tputs should process BSD-style prefix padding" >&5
    4575 +echo "$as_me:6154: checking if tputs should process BSD-style prefix padding" >&5
     5463+echo "$as_me:6420: checking if tputs should process BSD-style prefix padding" >&5
    45765464 echo $ECHO_N "checking if tputs should process BSD-style prefix padding... $ECHO_C" >&6
    45775465 
    45785466 # Check whether --enable-bsdpad or --disable-bsdpad was given.
    4579 @@ -6141,7 +6161,7 @@
     5467@@ -6141,7 +6427,7 @@
    45805468 else
    45815469   with_bsdpad=no
    45825470 fi;
    45835471-echo "$as_me:6144: result: $with_bsdpad" >&5
    4584 +echo "$as_me:6164: result: $with_bsdpad" >&5
     5472+echo "$as_me:6430: result: $with_bsdpad" >&5
    45855473 echo "${ECHO_T}$with_bsdpad" >&6
    45865474 test "$with_bsdpad" = yes && cat >>confdefs.h <<\EOF
    45875475 #define BSD_TPUTS 1
    4588 @@ -6158,7 +6178,7 @@
     5476@@ -6158,7 +6444,7 @@
    45895477 
    45905478 # Check to define _XOPEN_SOURCE "automatically"
    45915479 
    45925480-echo "$as_me:6161: checking if $CC -U and -D options work together" >&5
    4593 +echo "$as_me:6181: checking if $CC -U and -D options work together" >&5
     5481+echo "$as_me:6447: checking if $CC -U and -D options work together" >&5
    45945482 echo $ECHO_N "checking if $CC -U and -D options work together... $ECHO_C" >&6
    45955483 if test "${cf_cv_cc_u_d_options+set}" = set; then
    45965484   echo $ECHO_N "(cached) $ECHO_C" >&6
    4597 @@ -6167,7 +6187,7 @@
     5485@@ -6167,7 +6453,7 @@
    45985486        cf_save_CPPFLAGS="$CPPFLAGS"
    45995487        CPPFLAGS="-UU_D_OPTIONS -DU_D_OPTIONS -DD_U_OPTIONS -UD_U_OPTIONS"
    46005488        cat >conftest.$ac_ext <<_ACEOF
    46015489-#line 6170 "configure"
    4602 +#line 6190 "configure"
     5490+#line 6456 "configure"
    46035491 #include "confdefs.h"
    46045492 
    46055493 int
    4606 @@ -6186,16 +6206,16 @@
     5494@@ -6186,16 +6472,16 @@
    46075495 }
    46085496 _ACEOF
    46095497 rm -f conftest.$ac_objext
    46105498-if { (eval echo "$as_me:6189: \"$ac_compile\"") >&5
    4611 +if { (eval echo "$as_me:6209: \"$ac_compile\"") >&5
     5499+if { (eval echo "$as_me:6475: \"$ac_compile\"") >&5
    46125500   (eval $ac_compile) 2>&5
    46135501   ac_status=$?
    46145502-  echo "$as_me:6192: \$? = $ac_status" >&5
    4615 +  echo "$as_me:6212: \$? = $ac_status" >&5
     5503+  echo "$as_me:6478: \$? = $ac_status" >&5
    46165504   (exit $ac_status); } &&
    46175505          { ac_try='test -s conftest.$ac_objext'
    46185506-  { (eval echo "$as_me:6195: \"$ac_try\"") >&5
    4619 +  { (eval echo "$as_me:6215: \"$ac_try\"") >&5
     5507+  { (eval echo "$as_me:6481: \"$ac_try\"") >&5
    46205508   (eval $ac_try) 2>&5
    46215509   ac_status=$?
    46225510-  echo "$as_me:6198: \$? = $ac_status" >&5
    4623 +  echo "$as_me:6218: \$? = $ac_status" >&5
     5511+  echo "$as_me:6484: \$? = $ac_status" >&5
    46245512   (exit $ac_status); }; }; then
    46255513 
    46265514        cf_cv_cc_u_d_options=yes
    4627 @@ -6209,14 +6229,14 @@
     5515@@ -6209,14 +6495,14 @@
    46285516        CPPFLAGS="$cf_save_CPPFLAGS"
    46295517 
    46305518 fi
    46315519-echo "$as_me:6212: result: $cf_cv_cc_u_d_options" >&5
    4632 +echo "$as_me:6232: result: $cf_cv_cc_u_d_options" >&5
     5520+echo "$as_me:6498: result: $cf_cv_cc_u_d_options" >&5
    46335521 echo "${ECHO_T}$cf_cv_cc_u_d_options" >&6
    46345522 
    … …  
    46425530        ;;
    46435531 freebsd*|dragonfly*) #(vi
    4644 @@ -6233,16 +6253,16 @@
     5532@@ -6233,16 +6519,16 @@
    46455533 irix[56].*) #(vi
    46465534        CPPFLAGS="$CPPFLAGS -D_SGI_SOURCE"
    … …  
    46505538 
    46515539-echo "$as_me:6238: checking if we must define _GNU_SOURCE" >&5
    4652 +echo "$as_me:6258: checking if we must define _GNU_SOURCE" >&5
     5540+echo "$as_me:6524: checking if we must define _GNU_SOURCE" >&5
    46535541 echo $ECHO_N "checking if we must define _GNU_SOURCE... $ECHO_C" >&6
    46545542 if test "${cf_cv_gnu_source+set}" = set; then
    … …  
    46585546 cat >conftest.$ac_ext <<_ACEOF
    46595547-#line 6245 "configure"
    4660 +#line 6265 "configure"
     5548+#line 6531 "configure"
    46615549 #include "confdefs.h"
    46625550 #include <sys/types.h>
    46635551 int
    4664 @@ -6257,16 +6277,16 @@
     5552@@ -6257,16 +6543,16 @@
    46655553 }
    46665554 _ACEOF
    46675555 rm -f conftest.$ac_objext
    46685556-if { (eval echo "$as_me:6260: \"$ac_compile\"") >&5
    4669 +if { (eval echo "$as_me:6280: \"$ac_compile\"") >&5
     5557+if { (eval echo "$as_me:6546: \"$ac_compile\"") >&5
    46705558   (eval $ac_compile) 2>&5
    46715559   ac_status=$?
    46725560-  echo "$as_me:6263: \$? = $ac_status" >&5
    4673 +  echo "$as_me:6283: \$? = $ac_status" >&5
     5561+  echo "$as_me:6549: \$? = $ac_status" >&5
    46745562   (exit $ac_status); } &&
    46755563          { ac_try='test -s conftest.$ac_objext'
    46765564-  { (eval echo "$as_me:6266: \"$ac_try\"") >&5
    4677 +  { (eval echo "$as_me:6286: \"$ac_try\"") >&5
     5565+  { (eval echo "$as_me:6552: \"$ac_try\"") >&5
    46785566<