diff options
34 files changed, 4819 insertions, 1939 deletions
diff --git a/contrib/dialog/CHANGES b/contrib/dialog/CHANGES index 193fa21..d5d61a6 100644 --- a/contrib/dialog/CHANGES +++ b/contrib/dialog/CHANGES @@ -1,9 +1,38 @@ --- $Id: CHANGES,v 1.458 2013/05/24 00:23:22 tom Exp $ +-- $Id: CHANGES,v 1.476 2013/09/24 00:06:47 tom Exp $ -- Thomas E. Dickey <dickey@invisible-island.net> This version of dialog was originally from a Debian snapshot. I've done this to it: +2013/09/23 + + fix samples/inputbox6-utf8, which had depended unnecessarily on bash. + + improve memory caching for wide-character manipulation in gauge + widget (report by Devin Teske). + + add dlg_reallocate_gauge (discussion with Devin Teske). + + updated configure macros to use msys changes from ncurses. + + update config.guess, config.sub + +2013/09/02 + + modify makefile rule to make the ".png" filenames created by groff + predictable. + + add option --help-tags to allow scripts to get the item's tag field + consistently from help- and help-item button results rather than + getting the item's text for the latter (discussion with Florent + Rougon). + + correct manpage discussion of DIALOG_ITEM_HELP versus --item-help, + as well as --help-button return status (report by Florent Rougon). + + correct limit used for --hline option (report by Devin Teske, + cf: 2011/06/30). + + do not print empty "[]" if a --hline option was given with an empty + value (report by Devin Teske). + + miscellaneous configure script fixes/updates. In particular, add + option --with-shared which builds shared libraries without a libtool + dependency. + + add FreeBSD port-files for test-builds. + + update lt.po, add fa.po from + http://translationproject.org/latest/dialog/ + + update config.guess, config.sub + 2013/05/23 + modify ifdef in arrows.c to work around packages which use the wide-character ncursesw headers with the ncurses library (report @@ -298,7 +327,7 @@ to it: separate ncurses' header files. + CF_DISABLE_RPATH_HACK, fix garbled message + CF_LD_RPATH_OPT, add mirbsd - + CF_MAKEFLAGS, filter out GNU make's entering/leaving messages. + + CF_MAKEFLAGS, filter out GNU make's entering/leaving messages. This only appeared when using the macro in a dpkg script, though it should have in other cases. + CF_RPATH_HACK, add a check for libraries not found, e.g., from diff --git a/contrib/dialog/VERSION b/contrib/dialog/VERSION index 4001e25..b6b52c5 100644 --- a/contrib/dialog/VERSION +++ b/contrib/dialog/VERSION @@ -1 +1 @@ -11:1:0 1.2 20130523 +11:1:0 1.2 20130923 diff --git a/contrib/dialog/aclocal.m4 b/contrib/dialog/aclocal.m4 index 4fb129e..35f94c5 100644 --- a/contrib/dialog/aclocal.m4 +++ b/contrib/dialog/aclocal.m4 @@ -1,7 +1,7 @@ dnl macros used for DIALOG configure script -dnl $Id: aclocal.m4,v 1.90 2012/12/02 20:07:30 tom Exp $ +dnl $Id: aclocal.m4,v 1.94 2013/09/22 14:26:24 tom Exp $ dnl --------------------------------------------------------------------------- -dnl Copyright 1999-2011,2012 -- Thomas E. Dickey +dnl Copyright 1999-2012,2013 -- Thomas E. Dickey dnl dnl Permission is hereby granted, free of charge, to any person obtaining a dnl copy of this software and associated documentation files (the @@ -590,7 +590,7 @@ changequote([,])dnl AC_SUBST(GENCAT) ])dnl dnl --------------------------------------------------------------------------- -dnl CF_ACVERSION_CHECK version: 3 updated: 2012/10/03 18:39:53 +dnl CF_ACVERSION_CHECK version: 4 updated: 2013/03/04 19:52:56 dnl ------------------ dnl Conditionally generate script according to whether we're using a given autoconf. dnl @@ -599,6 +599,7 @@ dnl $2 = code to use if AC_ACVERSION is at least as high as $1. dnl $3 = code to use if AC_ACVERSION is older than $1. define([CF_ACVERSION_CHECK], [ +ifdef([AC_ACVERSION], ,[m4_copy([m4_PACKAGE_VERSION],[AC_ACVERSION])])dnl ifdef([m4_version_compare], [m4_if(m4_version_compare(m4_defn([AC_ACVERSION]), [$1]), -1, [$3], [$2])], [CF_ACVERSION_COMPARE( @@ -1125,6 +1126,27 @@ if test ".$system_name" != ".$cf_cv_system_name" ; then fi ])dnl dnl --------------------------------------------------------------------------- +dnl CF_CHECK_LIBTOOL_VERSION version: 1 updated: 2013/04/06 18:03:09 +dnl ------------------------ +dnl Show the version of libtool +dnl +dnl Save the version in a cache variable - this is not entirely a good thing, +dnl but the version string from libtool is very ugly, and for bug reports it +dnl might be useful to have the original string. +AC_DEFUN([CF_CHECK_LIBTOOL_VERSION],[ +if test -n "$LIBTOOL" && test "$LIBTOOL" != none +then + AC_MSG_CHECKING(version of $LIBTOOL) + CF_LIBTOOL_VERSION + AC_MSG_RESULT($cf_cv_libtool_version) + if test -z "$cf_cv_libtool_version" ; then + AC_MSG_ERROR(This is not GNU libtool) + fi +else + AC_MSG_ERROR(GNU libtool has not been found) +fi +])dnl +dnl --------------------------------------------------------------------------- dnl CF_CLANG_COMPILER version: 1 updated: 2012/06/16 14:55:39 dnl ----------------- dnl Check if the given compiler is really clang. clang's C driver defines @@ -1293,7 +1315,7 @@ fi AC_CHECK_HEADERS($cf_cv_ncurses_header) ])dnl dnl --------------------------------------------------------------------------- -dnl CF_CURSES_LIBS version: 36 updated: 2012/07/07 21:02:48 +dnl CF_CURSES_LIBS version: 37 updated: 2013/02/09 17:33:50 dnl -------------- dnl Look for the curses libraries. Older curses implementations may require dnl termcap/termlib to be linked as well. Call CF_CURSES_CPPFLAGS first. @@ -1330,7 +1352,7 @@ hpux10.*) #(vi ac_cv_func_initscr=yes ])]) fi - ;; + ;; linux*) case `arch 2>/dev/null` in x86_64) @@ -1345,7 +1367,7 @@ linux*) CF_ADD_LIBDIR(/lib) ;; esac - ;; + ;; sunos3*|sunos4*) if test "x$cf_cv_screen" = "xcurses_5lib" then @@ -1359,59 +1381,63 @@ sunos3*|sunos4*) esac if test ".$ac_cv_func_initscr" != .yes ; then - cf_save_LIBS="$LIBS" - cf_term_lib="" - cf_curs_lib="" + cf_save_LIBS="$LIBS" - if test ".${cf_cv_ncurses_version:-no}" != .no - then - cf_check_list="ncurses curses cursesX" - else - cf_check_list="cursesX curses ncurses" - fi + if test ".${cf_cv_ncurses_version:-no}" != .no + then + cf_check_list="ncurses curses cursesX" + else + cf_check_list="cursesX curses ncurses" + fi - # Check for library containing tgoto. Do this before curses library - # because it may be needed to link the test-case for initscr. - AC_CHECK_FUNC(tgoto,[cf_term_lib=predefined],[ - for cf_term_lib in $cf_check_list otermcap termcap tinfo termlib unknown - do - AC_CHECK_LIB($cf_term_lib,tgoto,[break]) - done - ]) + # Check for library containing tgoto. Do this before curses library + # because it may be needed to link the test-case for initscr. + if test "x$cf_term_lib" = x + then + AC_CHECK_FUNC(tgoto,[cf_term_lib=predefined],[ + for cf_term_lib in $cf_check_list otermcap termcap tinfo termlib unknown + do + AC_CHECK_LIB($cf_term_lib,tgoto,[break]) + done + ]) + fi - # Check for library containing initscr - test "$cf_term_lib" != predefined && test "$cf_term_lib" != unknown && LIBS="-l$cf_term_lib $cf_save_LIBS" - for cf_curs_lib in $cf_check_list xcurses jcurses pdcurses unknown - do - AC_CHECK_LIB($cf_curs_lib,initscr,[break]) - done - test $cf_curs_lib = unknown && AC_MSG_ERROR(no curses library found) - - LIBS="-l$cf_curs_lib $cf_save_LIBS" - if test "$cf_term_lib" = unknown ; then - AC_MSG_CHECKING(if we can link with $cf_curs_lib library) - AC_TRY_LINK([#include <${cf_cv_ncurses_header:-curses.h}>], - [initscr()], - [cf_result=yes], - [cf_result=no]) - AC_MSG_RESULT($cf_result) - test $cf_result = no && AC_MSG_ERROR(Cannot link curses library) - elif test "$cf_curs_lib" = "$cf_term_lib" ; then - : - elif test "$cf_term_lib" != predefined ; then - AC_MSG_CHECKING(if we need both $cf_curs_lib and $cf_term_lib libraries) - AC_TRY_LINK([#include <${cf_cv_ncurses_header:-curses.h}>], - [initscr(); tgoto((char *)0, 0, 0);], - [cf_result=no], - [ - LIBS="-l$cf_curs_lib -l$cf_term_lib $cf_save_LIBS" - AC_TRY_LINK([#include <${cf_cv_ncurses_header:-curses.h}>], - [initscr()], - [cf_result=yes], - [cf_result=error]) - ]) - AC_MSG_RESULT($cf_result) - fi + # Check for library containing initscr + test "$cf_term_lib" != predefined && test "$cf_term_lib" != unknown && LIBS="-l$cf_term_lib $cf_save_LIBS" + if test "x$cf_curs_lib" = x + then + for cf_curs_lib in $cf_check_list xcurses jcurses pdcurses unknown + do + AC_CHECK_LIB($cf_curs_lib,initscr,[break]) + done + fi + test $cf_curs_lib = unknown && AC_MSG_ERROR(no curses library found) + + LIBS="-l$cf_curs_lib $cf_save_LIBS" + if test "$cf_term_lib" = unknown ; then + AC_MSG_CHECKING(if we can link with $cf_curs_lib library) + AC_TRY_LINK([#include <${cf_cv_ncurses_header:-curses.h}>], + [initscr()], + [cf_result=yes], + [cf_result=no]) + AC_MSG_RESULT($cf_result) + test $cf_result = no && AC_MSG_ERROR(Cannot link curses library) + elif test "$cf_curs_lib" = "$cf_term_lib" ; then + : + elif test "$cf_term_lib" != predefined ; then + AC_MSG_CHECKING(if we need both $cf_curs_lib and $cf_term_lib libraries) + AC_TRY_LINK([#include <${cf_cv_ncurses_header:-curses.h}>], + [initscr(); tgoto((char *)0, 0, 0);], + [cf_result=no], + [ + LIBS="-l$cf_curs_lib -l$cf_term_lib $cf_save_LIBS" + AC_TRY_LINK([#include <${cf_cv_ncurses_header:-curses.h}>], + [initscr()], + [cf_result=yes], + [cf_result=error]) + ]) + AC_MSG_RESULT($cf_result) + fi fi fi @@ -1708,6 +1734,20 @@ if test "$cf_disable_rpath_hack" = no ; then fi ]) dnl --------------------------------------------------------------------------- +dnl CF_ENABLE_RPATH version: 2 updated: 2010/03/27 18:39:42 +dnl --------------- +dnl Check if the rpath option should be used, setting cache variable +dnl cf_cv_enable_rpath if so. +AC_DEFUN([CF_ENABLE_RPATH], +[ +AC_MSG_CHECKING(if rpath option should be used) +AC_ARG_ENABLE(rpath, +[ --enable-rpath use rpath option when generating shared libraries], +[cf_cv_enable_rpath=$enableval], +[cf_cv_enable_rpath=no]) +AC_MSG_RESULT($cf_cv_enable_rpath) +])dnl +dnl --------------------------------------------------------------------------- dnl CF_FIND_LIBRARY version: 9 updated: 2008/03/23 14:48:54 dnl --------------- dnl Look for a non-standard library, given parameters for AC_TRY_LINK. We @@ -1888,6 +1928,15 @@ ifelse([$5],,AC_MSG_WARN(Cannot find $3 library),[$5]) fi ])dnl dnl --------------------------------------------------------------------------- +dnl CF_FORGET_TOOL version: 1 updated: 2013/04/06 18:03:09 +dnl -------------- +dnl Forget that we saw the given tool. +AC_DEFUN([CF_FORGET_TOOL],[ +unset ac_cv_prog_ac_ct_$1 +unset ac_ct_$1 +unset $1 +])dnl +dnl --------------------------------------------------------------------------- dnl CF_FUNC_WAIT version: 3 updated: 2012/10/06 08:57:51 dnl ------------ dnl Test for the presence of <sys/wait.h>, 'union wait', arg-type of 'wait()' @@ -2256,7 +2305,7 @@ test -d "$oldincludedir" && { $1="[$]$1 $cf_header_path_list" ])dnl dnl --------------------------------------------------------------------------- -dnl CF_INTEL_COMPILER version: 4 updated: 2010/05/26 05:38:42 +dnl CF_INTEL_COMPILER version: 5 updated: 2013/02/10 10:41:05 dnl ----------------- dnl Check if the given compiler is really the Intel compiler for Linux. It dnl tries to imitate gcc, but does not return an error when it finds a mismatch @@ -2270,6 +2319,7 @@ dnl $1 = GCC (default) or GXX dnl $2 = INTEL_COMPILER (default) or INTEL_CPLUSPLUS dnl $3 = CFLAGS (default) or CXXFLAGS AC_DEFUN([CF_INTEL_COMPILER],[ +AC_REQUIRE([AC_CANONICAL_HOST]) ifelse([$2],,INTEL_COMPILER,[$2])=no if test "$ifelse([$1],,[$1],GCC)" = yes ; then @@ -2415,6 +2465,18 @@ CF_SUBDIR_PATH($1,$2,lib) $1="$cf_library_path_list [$]$1" ])dnl dnl --------------------------------------------------------------------------- +dnl CF_LIBTOOL_VERSION version: 1 updated: 2013/04/06 18:03:09 +dnl ------------------ +AC_DEFUN([CF_LIBTOOL_VERSION],[ +if test -n "$LIBTOOL" && test "$LIBTOOL" != none +then + cf_cv_libtool_version=`$LIBTOOL --version 2>&1 | sed -e '/^$/d' |sed -e '2,$d' -e 's/([[^)]]*)//g' -e 's/^[[^1-9]]*//' -e 's/[[^0-9.]].*//'` +else + cf_cv_libtool_version= +fi +test -z "$cf_cv_libtool_version" && unset cf_cv_libtool_version +])dnl +dnl --------------------------------------------------------------------------- dnl CF_LIB_PREFIX version: 9 updated: 2012/01/21 19:28:10 dnl ------------- dnl Compute the library-prefix for the given host system @@ -2432,6 +2494,69 @@ ifelse($1,,,[$1=$LIB_PREFIX]) AC_SUBST(LIB_PREFIX) ])dnl dnl --------------------------------------------------------------------------- +dnl CF_LIB_SUFFIX version: 22 updated: 2013/09/07 13:54:05 +dnl ------------- +dnl Compute the library file-suffix from the given model name +dnl $1 = model name +dnl $2 = variable to set (the nominal library suffix) +dnl $3 = dependency variable to set (actual filename) +dnl The variable $LIB_SUFFIX, if set, prepends the variable to set. +AC_DEFUN([CF_LIB_SUFFIX], +[ + case X$1 in #(vi + Xlibtool) #(vi + $2='.la' + $3=[$]$2 + ;; + Xdebug) #(vi + $2='_g.a' + $3=[$]$2 + ;; + Xprofile) #(vi + $2='_p.a' + $3=[$]$2 + ;; + Xshared) #(vi + case $cf_cv_system_name in + aix[[5-7]]*) #(vi + $2='.a' + $3=[$]$2 + ;; + cygwin*|msys*|mingw*) #(vi + $2='.dll' + $3='.dll.a' + ;; + darwin*) #(vi + $2='.dylib' + $3=[$]$2 + ;; + hpux*) #(vi + case $target in + ia64*) #(vi + $2='.so' + $3=[$]$2 + ;; + *) #(vi + $2='.sl' + $3=[$]$2 + ;; + esac + ;; + *) #(vi + $2='.so' + $3=[$]$2 + ;; + esac + ;; + *) + $2='.a' + $3=[$]$2 + ;; + esac + test -n "$LIB_SUFFIX" && $2="${LIB_SUFFIX}[$]{$2}" + test -n "$LIB_SUFFIX" && $3="${LIB_SUFFIX}[$]{$3}" +])dnl +dnl --------------------------------------------------------------------------- dnl CF_MAKEFLAGS version: 14 updated: 2011/03/31 19:29:46 dnl ------------ dnl Some 'make' programs support ${MAKEFLAGS}, some ${MFLAGS}, to pass 'make' @@ -2569,7 +2694,7 @@ if test "$cf_cv_mbstate_t" != unknown ; then fi ])dnl dnl --------------------------------------------------------------------------- -dnl CF_MIXEDCASE_FILENAMES version: 4 updated: 2012/10/02 20:55:03 +dnl CF_MIXEDCASE_FILENAMES version: 5 updated: 2013/09/07 13:54:05 dnl ---------------------- dnl Check if the file-system supports mixed-case filenames. If we're able to dnl create a lowercase name and see it as uppercase, it doesn't support that. @@ -2578,7 +2703,7 @@ AC_DEFUN([CF_MIXEDCASE_FILENAMES], AC_CACHE_CHECK(if filesystem supports mixed-case filenames,cf_cv_mixedcase,[ if test "$cross_compiling" = yes ; then case $target_alias in #(vi - *-os2-emx*|*-msdosdjgpp*|*-cygwin*|*-mingw32*|*-uwin*) #(vi + *-os2-emx*|*-msdosdjgpp*|*-cygwin*|*-msys*|*-mingw32*|*-uwin*) #(vi cf_cv_mixedcase=no ;; *) @@ -2959,6 +3084,25 @@ case .$with_cflags in #(vi esac ])dnl dnl --------------------------------------------------------------------------- +dnl CF_NUMBER_SYNTAX version: 1 updated: 2003/09/20 18:12:49 +dnl ---------------- +dnl Check if the given variable is a number. If not, report an error. +dnl $1 is the variable +dnl $2 is the message +AC_DEFUN([CF_NUMBER_SYNTAX],[ +if test -n "$1" ; then + case $1 in #(vi + [[0-9]]*) #(vi + ;; + *) + AC_MSG_ERROR($2 is not a number: $1) + ;; + esac +else + AC_MSG_ERROR($2 value is empty) +fi +])dnl +dnl --------------------------------------------------------------------------- dnl CF_OUR_MESSAGES version: 7 updated: 2004/09/12 19:45:55 dnl --------------- dnl Check if we use the messages included with this program @@ -3049,6 +3193,40 @@ case ".[$]$1" in #(vi esac ])dnl dnl --------------------------------------------------------------------------- +dnl CF_PKG_CONFIG version: 7 updated: 2011/04/29 04:53:22 +dnl ------------- +dnl Check for the package-config program, unless disabled by command-line. +AC_DEFUN([CF_PKG_CONFIG], +[ +AC_MSG_CHECKING(if you want to use pkg-config) +AC_ARG_WITH(pkg-config, + [ --with-pkg-config{=path} enable/disable use of pkg-config], + [cf_pkg_config=$withval], + [cf_pkg_config=yes]) +AC_MSG_RESULT($cf_pkg_config) + +case $cf_pkg_config in #(vi +no) #(vi + PKG_CONFIG=none + ;; +yes) #(vi + CF_ACVERSION_CHECK(2.52, + [AC_PATH_TOOL(PKG_CONFIG, pkg-config, none)], + [AC_PATH_PROG(PKG_CONFIG, pkg-config, none)]) + ;; +*) + PKG_CONFIG=$withval + ;; +esac + +test -z "$PKG_CONFIG" && PKG_CONFIG=none +if test "$PKG_CONFIG" != none ; then + CF_PATH_SYNTAX(PKG_CONFIG) +fi + +AC_SUBST(PKG_CONFIG) +])dnl +dnl --------------------------------------------------------------------------- dnl CF_POSIX_C_SOURCE version: 8 updated: 2010/05/26 05:38:42 dnl ----------------- dnl Define _POSIX_C_SOURCE to the given level, and _POSIX_SOURCE if needed. @@ -3168,6 +3346,28 @@ AC_CHECK_PROGS(LINT, tdlint lint alint splint lclint) AC_SUBST(LINT_OPTS) ])dnl dnl --------------------------------------------------------------------------- +dnl CF_PROG_LN_S version: 2 updated: 2010/08/14 18:25:37 +dnl ------------ +dnl Combine checks for "ln -s" and "ln -sf", updating $LN_S to include "-f" +dnl option if it is supported. +AC_DEFUN([CF_PROG_LN_S],[ +AC_PROG_LN_S +AC_MSG_CHECKING(if $LN_S -f options work) + +rm -f conf$$.src conf$$dst +echo >conf$$.dst +echo first >conf$$.src +if $LN_S -f conf$$.src conf$$.dst 2>/dev/null; then + cf_prog_ln_sf=yes +else + cf_prog_ln_sf=no +fi +rm -f conf$$.dst conf$$src +AC_MSG_RESULT($cf_prog_ln_sf) + +test "$cf_prog_ln_sf" = yes && LN_S="$LN_S -f" +])dnl +dnl --------------------------------------------------------------------------- dnl CF_REMOVE_DEFINE version: 3 updated: 2010/01/09 11:05:50 dnl ---------------- dnl Remove all -U and -D options that refer to the given symbol from a list @@ -3185,7 +3385,7 @@ $1=`echo "$2" | \ -e 's/-[[UD]]'"$3"'\(=[[^ ]]*\)\?[$]//g'` ])dnl dnl --------------------------------------------------------------------------- -dnl CF_RPATH_HACK version: 9 updated: 2011/02/13 13:31:33 +dnl CF_RPATH_HACK version: 11 updated: 2013/09/01 13:02:00 dnl ------------- AC_DEFUN([CF_RPATH_HACK], [ @@ -3202,8 +3402,8 @@ if test -n "$LD_RPATH_OPT" ; then AC_TRY_LINK([#include <stdio.h>], [printf("Hello");], - [cf_rpath_oops=`$cf_ldd_prog conftest$ac_exeext | fgrep ' not found' | sed -e 's% =>.*$%%' |sort -u` - cf_rpath_list=`$cf_ldd_prog conftest$ac_exeext | fgrep / | sed -e 's%^.*[[ ]]/%/%' -e 's%/[[^/]][[^/]]*$%%' |sort -u`]) + [cf_rpath_oops=`$cf_ldd_prog conftest$ac_exeext | fgrep ' not found' | sed -e 's% =>.*$%%' |sort | uniq` + cf_rpath_list=`$cf_ldd_prog conftest$ac_exeext | fgrep / | sed -e 's%^.*[[ ]]/%/%' -e 's%/[[^/]][[^/]]*$%%' |sort | uniq`]) # If we passed the link-test, but get a "not found" on a given library, # this could be due to inept reconfiguration of gcc to make it only @@ -3236,6 +3436,8 @@ AC_TRY_LINK([#include <stdio.h>], CF_RPATH_HACK_2(LIBS) CF_VERBOSE(...checked EXTRA_LDFLAGS $EXTRA_LDFLAGS) +else + AC_MSG_RESULT(no) fi AC_SUBST(EXTRA_LDFLAGS) ])dnl @@ -3300,6 +3502,440 @@ CF_VERBOSE(...checked $1 [$]$1) AC_SUBST(EXTRA_LDFLAGS) ])dnl dnl --------------------------------------------------------------------------- +dnl CF_SHARED_OPTS version: 83 updated: 2013/09/21 17:34:53 +dnl -------------- +dnl -------------- +dnl Attempt to determine the appropriate CC/LD options for creating a shared +dnl library. +dnl +dnl Notes: +dnl a) ${LOCAL_LDFLAGS} is used to link executables that will run within +dnl the build-tree, i.e., by making use of the libraries that are compiled in +dnl $rel_builddir/lib We avoid compiling-in a $rel_builddir/lib path for the +dnl shared library since that can lead to unexpected results at runtime. +dnl b) ${LOCAL_LDFLAGS2} has the same intention but assumes that the shared +dnl libraries are compiled in ../../lib +dnl +dnl The variable 'cf_cv_do_symlinks' is used to control whether we configure +dnl to install symbolic links to the rel/abi versions of shared libraries. +dnl +dnl The variable 'cf_cv_shlib_version' controls whether we use the rel or abi +dnl version when making symbolic links. +dnl +dnl The variable 'cf_cv_shlib_version_infix' controls whether shared library +dnl version numbers are infix (ex: libncurses.<ver>.dylib) or postfix +dnl (ex: libncurses.so.<ver>). +dnl +dnl Some loaders leave 'so_locations' lying around. It's nice to clean up. +AC_DEFUN([CF_SHARED_OPTS], +[ + AC_REQUIRE([CF_LD_RPATH_OPT]) + RM_SHARED_OPTS= + LOCAL_LDFLAGS= + LOCAL_LDFLAGS2= + LD_SHARED_OPTS= + INSTALL_LIB="-m 644" + : ${rel_builddir:=.} + + cf_cv_do_symlinks=no + cf_ld_rpath_opt= + test "$cf_cv_enable_rpath" = yes && cf_ld_rpath_opt="$LD_RPATH_OPT" + + AC_MSG_CHECKING(if release/abi version should be used for shared libs) + AC_ARG_WITH(shlib-version, + [ --with-shlib-version=X Specify rel or abi version for shared libs], + [test -z "$withval" && withval=auto + case $withval in #(vi + yes) #(vi + cf_cv_shlib_version=auto + ;; + rel|abi|auto|no) #(vi + cf_cv_shlib_version=$withval + ;; + *) + AC_MSG_ERROR([option value must be one of: rel, abi, auto or no]) + ;; + esac + ],[cf_cv_shlib_version=auto]) + AC_MSG_RESULT($cf_cv_shlib_version) + + cf_cv_rm_so_locs=no + cf_try_cflags= + + # Some less-capable ports of gcc support only -fpic + CC_SHARED_OPTS= + if test "$GCC" = yes + then + AC_MSG_CHECKING(which $CC option to use) + cf_save_CFLAGS="$CFLAGS" + for CC_SHARED_OPTS in -fPIC -fpic '' + do + CFLAGS="$cf_save_CFLAGS $CC_SHARED_OPTS" + AC_TRY_COMPILE([#include <stdio.h>],[int x = 1],[break],[]) + done + AC_MSG_RESULT($CC_SHARED_OPTS) + CFLAGS="$cf_save_CFLAGS" + fi + + cf_cv_shlib_version_infix=no + + case $cf_cv_system_name in #(vi + aix4.[3-9]*|aix[[5-7]]*) #(vi + if test "$GCC" = yes; then + CC_SHARED_OPTS= + MK_SHARED_LIB='${CC} -shared -Wl,-brtl -Wl,-blibpath:${RPATH_LIST}:/usr/lib -o [$]@' + else + # CC_SHARED_OPTS='-qpic=large -G' + # perhaps "-bM:SRE -bnoentry -bexpall" + MK_SHARED_LIB='${CC} -G -Wl,-brtl -Wl,-blibpath:${RPATH_LIST}:/usr/lib -o [$]@' + fi + ;; + beos*) #(vi + MK_SHARED_LIB='${CC} ${CFLAGS} -o $[@] -Xlinker -soname=`basename $[@]` -nostart -e 0' + ;; + cygwin*) #(vi + CC_SHARED_OPTS= + MK_SHARED_LIB='sh '$rel_builddir'/mk_shared_lib.sh [$]@ [$]{CC} [$]{CFLAGS}' + RM_SHARED_OPTS="$RM_SHARED_OPTS $rel_builddir/mk_shared_lib.sh *.dll.a" + cf_cv_shlib_version=cygdll + cf_cv_shlib_version_infix=cygdll + cat >mk_shared_lib.sh <<-CF_EOF + #!/bin/sh + SHARED_LIB=\[$]1 + IMPORT_LIB=\`echo "\[$]1" | sed -e 's/cyg/lib/' -e 's/[[0-9]]*\.dll[$]/.dll.a/'\` + shift + cat <<-EOF + Linking shared library + ** SHARED_LIB \[$]SHARED_LIB + ** IMPORT_LIB \[$]IMPORT_LIB +EOF + exec \[$]* -shared -Wl,--out-implib=\[$]{IMPORT_LIB} -Wl,--export-all-symbols -o \[$]{SHARED_LIB} +CF_EOF + chmod +x mk_shared_lib.sh + ;; + msys*) #(vi + CC_SHARED_OPTS= + MK_SHARED_LIB='sh '$rel_builddir'/mk_shared_lib.sh [$]@ [$]{CC} [$]{CFLAGS}' + RM_SHARED_OPTS="$RM_SHARED_OPTS $rel_builddir/mk_shared_lib.sh *.dll.a" + cf_cv_shlib_version=msysdll + cf_cv_shlib_version_infix=msysdll + cat >mk_shared_lib.sh <<-CF_EOF + #!/bin/sh + SHARED_LIB=\[$]1 + IMPORT_LIB=\`echo "\[$]1" | sed -e 's/msys-/lib/' -e 's/[[0-9]]*\.dll[$]/.dll.a/'\` + shift + cat <<-EOF + Linking shared library + ** SHARED_LIB \[$]SHARED_LIB + ** IMPORT_LIB \[$]IMPORT_LIB +EOF + exec \[$]* -shared -Wl,--out-implib=\[$]{IMPORT_LIB} -Wl,--export-all-symbols -o \[$]{SHARED_LIB} +CF_EOF + chmod +x mk_shared_lib.sh + ;; + darwin*) #(vi + cf_try_cflags="no-cpp-precomp" + CC_SHARED_OPTS="-dynamic" + MK_SHARED_LIB='${CC} ${CFLAGS} -dynamiclib -install_name ${libdir}/`basename $[@]` -compatibility_version ${ABI_VERSION} -current_version ${ABI_VERSION} -o $[@]' + test "$cf_cv_shlib_version" = auto && cf_cv_shlib_version=abi + cf_cv_shlib_version_infix=yes + AC_CACHE_CHECK([if ld -search_paths_first works], cf_cv_ldflags_search_paths_first, [ + cf_save_LDFLAGS=$LDFLAGS + LDFLAGS="$LDFLAGS -Wl,-search_paths_first" + AC_TRY_LINK(, [int i;], cf_cv_ldflags_search_paths_first=yes, cf_cv_ldflags_search_paths_first=no) + LDFLAGS=$cf_save_LDFLAGS]) + if test $cf_cv_ldflags_search_paths_first = yes; then + LDFLAGS="$LDFLAGS -Wl,-search_paths_first" + fi + ;; + hpux[[7-8]]*) #(vi + # HP-UX 8.07 ld lacks "+b" option used for libdir search-list + if test "$GCC" != yes; then + CC_SHARED_OPTS='+Z' + fi + MK_SHARED_LIB='${LD} -b -o $[@]' + INSTALL_LIB="-m 555" + ;; + hpux*) #(vi + # (tested with gcc 2.7.2 -- I don't have c89) + if test "$GCC" = yes; then + LD_SHARED_OPTS='-Xlinker +b -Xlinker ${libdir}' + else + CC_SHARED_OPTS='+Z' + LD_SHARED_OPTS='-Wl,+b,${libdir}' + fi + MK_SHARED_LIB='${LD} +b ${libdir} -b -o $[@]' + # HP-UX shared libraries must be executable, and should be + # readonly to exploit a quirk in the memory manager. + INSTALL_LIB="-m 555" + ;; + interix*) + test "$cf_cv_shlib_version" = auto && cf_cv_shlib_version=rel + if test "$cf_cv_shlib_version" = rel; then + cf_shared_soname='`basename $@ .${REL_VERSION}`.${ABI_VERSION}' + else + cf_shared_soname='`basename $@`' + fi + CC_SHARED_OPTS= + MK_SHARED_LIB='${CC} -shared -Wl,-rpath,${RPATH_LIST} -Wl,-h,'$cf_shared_soname' -o $@' + ;; + irix*) #(vi + if test "$cf_cv_enable_rpath" = yes ; then + EXTRA_LDFLAGS="${cf_ld_rpath_opt}\${RPATH_LIST} $EXTRA_LDFLAGS" + fi + # tested with IRIX 5.2 and 'cc'. + if test "$GCC" != yes; then + CC_SHARED_OPTS='-KPIC' + MK_SHARED_LIB='${CC} -shared -rdata_shared -soname `basename $[@]` -o $[@]' + else + MK_SHARED_LIB='${CC} -shared -Wl,-soname,`basename $[@]` -o $[@]' + fi + cf_cv_rm_so_locs=yes + ;; + linux*|gnu*|k*bsd*-gnu) #(vi + if test "$DFT_LWR_MODEL" = "shared" ; then + LOCAL_LDFLAGS="${LD_RPATH_OPT}\$(LOCAL_LIBDIR)" + LOCAL_LDFLAGS2="$LOCAL_LDFLAGS" + fi + if test "$cf_cv_enable_rpath" = yes ; then + EXTRA_LDFLAGS="${cf_ld_rpath_opt}\${RPATH_LIST} $EXTRA_LDFLAGS" + fi + CF_SHARED_SONAME + MK_SHARED_LIB='${CC} ${CFLAGS} -shared -Wl,-soname,'$cf_cv_shared_soname',-stats,-lc -o $[@]' + ;; + mingw*) #(vi + cf_cv_shlib_version=mingw + cf_cv_shlib_version_infix=mingw + if test "$DFT_LWR_MODEL" = "shared" ; then + LOCAL_LDFLAGS="-Wl,--enable-auto-import" + LOCAL_LDFLAGS2="$LOCAL_LDFLAGS" + EXTRA_LDFLAGS="-Wl,--enable-auto-import $EXTRA_LDFLAGS" + fi + CC_SHARED_OPTS= + MK_SHARED_LIB='sh '$rel_builddir'/mk_shared_lib.sh [$]@ [$]{CC} [$]{CFLAGS}' + RM_SHARED_OPTS="$RM_SHARED_OPTS $rel_builddir/mk_shared_lib.sh *.dll.a" + cat >mk_shared_lib.sh <<-CF_EOF + #!/bin/sh + SHARED_LIB=\[$]1 + IMPORT_LIB=\`echo "\[$]1" | sed -e 's/[[0-9]]*\.dll[$]/.dll.a/'\` + shift + cat <<-EOF + Linking shared library + ** SHARED_LIB \[$]SHARED_LIB + ** IMPORT_LIB \[$]IMPORT_LIB +EOF + exec \[$]* -shared -Wl,--enable-auto-import,--out-implib=\[$]{IMPORT_LIB} -Wl,--export-all-symbols -o \[$]{SHARED_LIB} +CF_EOF + chmod +x mk_shared_lib.sh + ;; + openbsd[[2-9]].*|mirbsd*) #(vi + if test "$DFT_LWR_MODEL" = "shared" ; then + LOCAL_LDFLAGS="${LD_RPATH_OPT}\$(LOCAL_LIBDIR)" + LOCAL_LDFLAGS2="$LOCAL_LDFLAGS" + fi + if test "$cf_cv_enable_rpath" = yes ; then + EXTRA_LDFLAGS="${cf_ld_rpath_opt}\${RPATH_LIST} $EXTRA_LDFLAGS" + fi + CC_SHARED_OPTS="$CC_SHARED_OPTS -DPIC" + CF_SHARED_SONAME + MK_SHARED_LIB='${CC} ${CFLAGS} -shared -Wl,-Bshareable,-soname,'$cf_cv_shared_soname',-stats,-lc -o $[@]' + ;; + nto-qnx*|openbsd*|freebsd[[12]].*) #(vi + CC_SHARED_OPTS="$CC_SHARED_OPTS -DPIC" + MK_SHARED_LIB='${LD} -Bshareable -o $[@]' + test "$cf_cv_shlib_version" = auto && cf_cv_shlib_version=rel + ;; + dragonfly*|freebsd*) #(vi + CC_SHARED_OPTS="$CC_SHARED_OPTS -DPIC" + if test "$DFT_LWR_MODEL" = "shared" && test "$cf_cv_enable_rpath" = yes ; then + LOCAL_LDFLAGS="${cf_ld_rpath_opt}\$(LOCAL_LIBDIR)" + LOCAL_LDFLAGS2="${cf_ld_rpath_opt}\${RPATH_LIST} $LOCAL_LDFLAGS" + EXTRA_LDFLAGS="${cf_ld_rpath_opt}\${RPATH_LIST} $EXTRA_LDFLAGS" + fi + CF_SHARED_SONAME + MK_SHARED_LIB='${LD} -shared -Bshareable -soname=`basename $[@]` -o $[@]' + ;; + netbsd*) #(vi + CC_SHARED_OPTS="$CC_SHARED_OPTS -DPIC" + if test "$DFT_LWR_MODEL" = "shared" && test "$cf_cv_enable_rpath" = yes ; then + LOCAL_LDFLAGS="${cf_ld_rpath_opt}\$(LOCAL_LIBDIR)" + LOCAL_LDFLAGS2="$LOCAL_LDFLAGS" + EXTRA_LDFLAGS="${cf_ld_rpath_opt}\${RPATH_LIST} $EXTRA_LDFLAGS" + if test "$cf_cv_shlib_version" = auto; then + if test -f /usr/libexec/ld.elf_so; then + cf_cv_shlib_version=abi + else + cf_cv_shlib_version=rel + fi + fi + CF_SHARED_SONAME + MK_SHARED_LIB='${CC} ${CFLAGS} -shared -Wl,-soname,'$cf_cv_shared_soname' -o $[@]' + else + MK_SHARED_LIB='${CC} -Wl,-shared -Wl,-Bshareable -o $[@]' + fi + ;; + osf*|mls+*) #(vi + # tested with OSF/1 V3.2 and 'cc' + # tested with OSF/1 V3.2 and gcc 2.6.3 (but the c++ demo didn't + # link with shared libs). + MK_SHARED_LIB='${LD} -set_version ${REL_VERSION}:${ABI_VERSION} -expect_unresolved "*" -shared -soname `basename $[@]`' + case $host_os in #(vi + osf4*) + MK_SHARED_LIB="${MK_SHARED_LIB} -msym" + ;; + esac + MK_SHARED_LIB="${MK_SHARED_LIB}"' -o $[@]' + if test "$DFT_LWR_MODEL" = "shared" ; then + LOCAL_LDFLAGS="${LD_RPATH_OPT}\$(LOCAL_LIBDIR)" + LOCAL_LDFLAGS2="$LOCAL_LDFLAGS" + fi + cf_cv_rm_so_locs=yes + ;; + sco3.2v5*) # (also uw2* and UW7: hops 13-Apr-98 + # tested with osr5.0.5 + if test "$GCC" != yes; then + CC_SHARED_OPTS='-belf -KPIC' + fi + MK_SHARED_LIB='${LD} -dy -G -h `basename $[@] .${REL_VERSION}`.${ABI_VERSION} -o [$]@' + if test "$cf_cv_enable_rpath" = yes ; then + # only way is to set LD_RUN_PATH but no switch for it + RUN_PATH=$libdir + fi + test "$cf_cv_shlib_version" = auto && cf_cv_shlib_version=rel + LINK_PROGS='LD_RUN_PATH=${libdir}' + LINK_TESTS='Pwd=`pwd`;LD_RUN_PATH=`dirname $${Pwd}`/lib' + ;; + sunos4*) #(vi + # tested with SunOS 4.1.1 and gcc 2.7.0 + if test "$GCC" != yes; then + CC_SHARED_OPTS='-KPIC' + fi + MK_SHARED_LIB='${LD} -assert pure-text -o $[@]' + test "$cf_cv_shlib_version" = auto && cf_cv_shlib_version=rel + ;; + solaris2*) #(vi + # tested with SunOS 5.5.1 (solaris 2.5.1) and gcc 2.7.2 + # tested with SunOS 5.10 (solaris 10) and gcc 3.4.3 + if test "$DFT_LWR_MODEL" = "shared" ; then + LOCAL_LDFLAGS="-R \$(LOCAL_LIBDIR):\${libdir}" + LOCAL_LDFLAGS2="$LOCAL_LDFLAGS" + fi + if test "$cf_cv_enable_rpath" = yes ; then + EXTRA_LDFLAGS="-R \${libdir} $EXTRA_LDFLAGS" + fi + CF_SHARED_SONAME + if test "$GCC" != yes; then + cf_save_CFLAGS="$CFLAGS" + for cf_shared_opts in -xcode=pic32 -xcode=pic13 -KPIC -Kpic -O + do + CFLAGS="$cf_shared_opts $cf_save_CFLAGS" + AC_TRY_COMPILE([#include <stdio.h>],[printf("Hello\n");],[break]) + done + CFLAGS="$cf_save_CFLAGS" + CC_SHARED_OPTS=$cf_shared_opts + MK_SHARED_LIB='${CC} -dy -G -h '$cf_cv_shared_soname' -o $[@]' + else + MK_SHARED_LIB='${CC} -shared -dy -G -h '$cf_cv_shared_soname' -o $[@]' + fi + ;; + sysv5uw7*|unix_sv*) #(vi + # tested with UnixWare 7.1.0 (gcc 2.95.2 and cc) + if test "$GCC" != yes; then + CC_SHARED_OPTS='-KPIC' + fi + MK_SHARED_LIB='${LD} -d y -G -o [$]@' + ;; + *) + CC_SHARED_OPTS='unknown' + MK_SHARED_LIB='echo unknown' + ;; + esac + + # This works if the last tokens in $MK_SHARED_LIB are the -o target. + case "$cf_cv_shlib_version" in #(vi + rel|abi) + case "$MK_SHARED_LIB" in #(vi + *'-o $[@]') #(vi + test "$cf_cv_do_symlinks" = no && cf_cv_do_symlinks=yes + ;; + *) + AC_MSG_WARN(ignored --with-shlib-version) + ;; + esac + ;; + esac + + if test -n "$cf_try_cflags" + then +cat > conftest.$ac_ext <<EOF +#line __oline__ "${as_me:-configure}" +#include <stdio.h> +int main(int argc, char *argv[[]]) +{ + printf("hello\n"); + return (argv[[argc-1]] == 0) ; +} +EOF + cf_save_CFLAGS="$CFLAGS" + for cf_opt in $cf_try_cflags + do + CFLAGS="$cf_save_CFLAGS -$cf_opt" + AC_MSG_CHECKING(if CFLAGS option -$cf_opt works) + if AC_TRY_EVAL(ac_compile); then + AC_MSG_RESULT(yes) + cf_save_CFLAGS="$CFLAGS" + else + AC_MSG_RESULT(no) + fi + done + CFLAGS="$cf_save_CFLAGS" + fi + + + # RPATH_LIST is a colon-separated list of directories + test -n "$cf_ld_rpath_opt" && MK_SHARED_LIB="$MK_SHARED_LIB $cf_ld_rpath_opt\${RPATH_LIST}" + test -z "$RPATH_LIST" && RPATH_LIST="\${libdir}" + + test $cf_cv_rm_so_locs = yes && RM_SHARED_OPTS="$RM_SHARED_OPTS so_locations" + + CF_VERBOSE(CC_SHARED_OPTS: $CC_SHARED_OPTS) + CF_VERBOSE(MK_SHARED_LIB: $MK_SHARED_LIB) + + AC_SUBST(CC_SHARED_OPTS) + AC_SUBST(LD_RPATH_OPT) + AC_SUBST(LD_SHARED_OPTS) + AC_SUBST(MK_SHARED_LIB) + AC_SUBST(RM_SHARED_OPTS) + + AC_SUBST(LINK_PROGS) + AC_SUBST(LINK_TESTS) + + AC_SUBST(EXTRA_LDFLAGS) + AC_SUBST(LOCAL_LDFLAGS) + AC_SUBST(LOCAL_LDFLAGS2) + + AC_SUBST(INSTALL_LIB) + AC_SUBST(RPATH_LIST) +])dnl +dnl --------------------------------------------------------------------------- +dnl CF_SHARED_SONAME version: 3 updated: 2008/09/08 18:34:43 +dnl ---------------- +dnl utility macro for CF_SHARED_OPTS, constructs "$cf_cv_shared_soname" for +dnl substitution into MK_SHARED_LIB string for the "-soname" (or similar) +dnl option. +dnl +dnl $1 is the default that should be used for "$cf_cv_shlib_version". +dnl If missing, use "rel". +define([CF_SHARED_SONAME], +[ + test "$cf_cv_shlib_version" = auto && cf_cv_shlib_version=ifelse($1,,rel,$1) + if test "$cf_cv_shlib_version" = rel; then + cf_cv_shared_soname='`basename $[@] .${REL_VERSION}`.${ABI_VERSION}' + else + cf_cv_shared_soname='`basename $[@]`' + fi +]) +dnl --------------------------------------------------------------------------- dnl CF_SUBDIR_PATH version: 6 updated: 2010/04/21 06:20:50 dnl -------------- dnl Construct a search-list for a nonstandard header/lib-file @@ -3492,7 +4128,7 @@ AC_DEFUN([CF_VERBOSE], CF_MSG_LOG([$1]) ])dnl dnl --------------------------------------------------------------------------- -dnl CF_VERSION_INFO version: 5 updated: 2012/10/06 08:57:51 +dnl CF_VERSION_INFO version: 6 updated: 2013/06/16 10:25:53 dnl --------------- dnl Define several useful symbols derived from the VERSION file. A separate dnl file is preferred to embedding the version numbers in various scripts. @@ -3557,7 +4193,7 @@ else fi # show the actual data that we have for versions: -CF_VERBOSE(VERSION $VERSION) +CF_VERBOSE(ABI VERSION $VERSION) CF_VERBOSE(VERSION_MAJOR $VERSION_MAJOR) CF_VERBOSE(VERSION_MINOR $VERSION_MINOR) CF_VERBOSE(VERSION_PATCH $VERSION_PATCH) @@ -3611,6 +4247,26 @@ fi fi ])dnl dnl --------------------------------------------------------------------------- +dnl CF_WITH_ABI_VERSION version: 1 updated: 2003/09/20 18:12:49 +dnl ------------------- +dnl Allow library's ABI to be overridden. Generally this happens when a +dnl packager has incremented the ABI past that used in the original package, +dnl and wishes to keep doing this. +dnl +dnl $1 is the package name, if any, to derive a corresponding {package}_ABI +dnl symbol. +AC_DEFUN([CF_WITH_ABI_VERSION],[ +test -z "$cf_cv_abi_version" && cf_cv_abi_version=0 +AC_ARG_WITH(abi-version, +[ --with-abi-version=XXX override derived ABI version], +[AC_MSG_WARN(overriding ABI version $cf_cv_abi_version to $withval) + cf_cv_abi_version=$withval]) + CF_NUMBER_SYNTAX($cf_cv_abi_version,ABI version) +ifelse($1,,,[ +$1_ABI=$cf_cv_abi_version +]) +])dnl +dnl --------------------------------------------------------------------------- dnl CF_WITH_CURSES_DIR version: 3 updated: 2010/11/20 17:02:38 dnl ------------------ dnl Wrapper for AC_ARG_WITH to specify directory under which to look for curses @@ -3665,7 +4321,7 @@ if test "$with_dmalloc" = yes ; then fi ])dnl dnl --------------------------------------------------------------------------- -dnl CF_WITH_LIBTOOL version: 28 updated: 2011/07/02 15:40:32 +dnl CF_WITH_LIBTOOL version: 30 updated: 2013/09/07 13:54:05 dnl --------------- dnl Provide a configure option to incorporate libtool. Define several useful dnl symbols for the makefile rules. @@ -3735,7 +4391,14 @@ ifdef([AC_PROG_LIBTOOL],[ CF_PATH_SYNTAX(with_libtool) LIBTOOL=$with_libtool else - AC_PATH_PROG(LIBTOOL,libtool) + AC_CHECK_TOOLS(LIBTOOL,[libtool glibtool],none) + CF_LIBTOOL_VERSION + if test -z "$cf_cv_libtool_version" && test "$LIBTOOL" = libtool + then + CF_FORGET_TOOL(LIBTOOL) + AC_CHECK_TOOLS(LIBTOOL,[glibtool],none) + CF_LIBTOOL_VERSION + fi fi if test -z "$LIBTOOL" ; then AC_MSG_ERROR(Cannot find libtool) @@ -3751,22 +4414,12 @@ ifdef([AC_PROG_LIBTOOL],[ LIB_UNINSTALL='${LIBTOOL} --mode=uninstall' LIB_PREP=: - # Show the version of libtool - AC_MSG_CHECKING(version of libtool) - - # Save the version in a cache variable - this is not entirely a good - # thing, but the version string from libtool is very ugly, and for - # bug reports it might be useful to have the original string. "(" - 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.]].*//'` - AC_MSG_RESULT($cf_cv_libtool_version) - if test -z "$cf_cv_libtool_version" ; then - AC_MSG_ERROR(This is not GNU libtool) - fi + CF_CHECK_LIBTOOL_VERSION # special hack to add -no-undefined (which libtool should do for itself) LT_UNDEF= case "$cf_cv_system_name" in #(vi - cygwin*|mingw32*|uwin*|aix[[4-7]]) #(vi + cygwin*|msys*|mingw32*|uwin*|aix[[4-7]]) #(vi LT_UNDEF=-no-undefined ;; esac @@ -3865,6 +4518,108 @@ CF_NO_LEAKS_OPTION(purify, AC_SUBST(LINK_PREFIX) ])dnl dnl --------------------------------------------------------------------------- +dnl CF_WITH_REL_VERSION version: 1 updated: 2003/09/20 18:12:49 +dnl ------------------- +dnl Allow library's release-version to be overridden. Generally this happens when a +dnl packager has incremented the release-version past that used in the original package, +dnl and wishes to keep doing this. +dnl +dnl $1 is the package name, if any, to derive corresponding {package}_MAJOR +dnl and {package}_MINOR symbols +dnl symbol. +AC_DEFUN([CF_WITH_REL_VERSION],[ +test -z "$cf_cv_rel_version" && cf_cv_rel_version=0.0 +AC_ARG_WITH(rel-version, +[ --with-rel-version=XXX override derived release version], +[AC_MSG_WARN(overriding release version $cf_cv_rel_version to $withval) + cf_cv_rel_version=$withval]) +ifelse($1,,[ + CF_NUMBER_SYNTAX($cf_cv_rel_version,Release version) +],[ + $1_MAJOR=`echo "$cf_cv_rel_version" | sed -e 's/\..*//'` + $1_MINOR=`echo "$cf_cv_rel_version" | sed -e 's/^[[^.]]*//' -e 's/^\.//' -e 's/\..*//'` + CF_NUMBER_SYNTAX([$]$1_MAJOR,Release major-version) + CF_NUMBER_SYNTAX([$]$1_MINOR,Release minor-version) +]) +])dnl +dnl --------------------------------------------------------------------------- +dnl CF_WITH_SHARED_OR_LIBTOOL version: 5 updated: 2013/09/02 09:17:44 +dnl ------------------------- +dnl Provide shared libraries using either autoconf macros (--with-shared) or +dnl using the external libtool script (--with-libtool). +dnl +dnl $1 = program name (all caps preferred) +dnl $1 = release version +dnl $2 = ABI version +define([CF_WITH_SHARED_OR_LIBTOOL],[ + +REL_VERSION=$2 +ABI_VERSION=$3 +cf_cv_rel_version=$REL_VERSION +AC_SUBST(ABI_VERSION) +AC_SUBST(REL_VERSION) + +CF_WITH_REL_VERSION($1) +CF_WITH_ABI_VERSION + +LIB_MODEL=static +DFT_LWR_MODEL=$LIB_MODEL +LIBTOOL_MAKE="#" + +# use to comment-out makefile lines +MAKE_NORMAL= +MAKE_STATIC= +MAKE_SHARED="#" + +CF_WITH_LIBTOOL + +LIB_CREATE="$LIB_CREATE \[$]@" + +if test "$with_libtool" = "yes" ; then + OBJEXT="lo" + LIB_MODEL=libtool + DFT_LWR_MODEL=$LIB_MODEL + LIBTOOL_MAKE= + CF_WITH_LIBTOOL_OPTS + MAKE_NORMAL="#" + MAKE_STATIC="#" + MAKE_SHARED= +else + AC_MSG_CHECKING(if you want to build shared libraries) + AC_ARG_WITH(shared, + [ --with-shared generate shared-libraries], + [with_shared=$withval], + [with_shared=no]) + AC_MSG_RESULT($with_shared) + if test "$with_shared" = "yes" ; then + LIB_MODEL=shared + DFT_LWR_MODEL=$LIB_MODEL + CF_SHARED_OPTS + LIB_PREP=: + LIB_CREATE="[$]MK_SHARED_LIB" + CFLAGS="$CFLAGS $CC_SHARED_OPTS" + MAKE_NORMAL="#" + MAKE_STATIC="#" + MAKE_SHARED= + fi +fi + +LIB_SUFFIX= +CF_LIB_SUFFIX($LIB_MODEL, DFT_LIB_SUFFIX, DFT_DEP_SUFFIX) +LIB_SUFFIX=$DFT_LIB_SUFFIX + +AC_SUBST(DFT_LWR_MODEL) +AC_SUBST(DFT_LIB_SUFFIX) +AC_SUBST(DFT_DEP_SUFFIX) +AC_SUBST(LIB_MODEL) + +AC_SUBST(LIBTOOL_MAKE) + +AC_SUBST(MAKE_NORMAL) +AC_SUBST(MAKE_SHARED) +AC_SUBST(MAKE_STATIC) +])dnl +dnl --------------------------------------------------------------------------- dnl CF_WITH_VALGRIND version: 1 updated: 2006/12/14 18:00:21 dnl ---------------- AC_DEFUN([CF_WITH_VALGRIND],[ @@ -3935,7 +4690,7 @@ AC_TRY_LINK([ test $cf_cv_need_xopen_extension = yes && CPPFLAGS="$CPPFLAGS -D_XOPEN_SOURCE_EXTENDED" ])dnl dnl --------------------------------------------------------------------------- -dnl CF_XOPEN_SOURCE version: 42 updated: 2012/01/07 08:26:49 +dnl CF_XOPEN_SOURCE version: 45 updated: 2013/09/07 14:06:25 dnl --------------- dnl Try to get _XOPEN_SOURCE defined properly that we can use POSIX functions, dnl or adapt to the vendor's definitions to get equivalent functionality, @@ -3945,6 +4700,7 @@ dnl Parameters: dnl $1 is the nominal value for _XOPEN_SOURCE dnl $2 is the nominal value for _POSIX_C_SOURCE AC_DEFUN([CF_XOPEN_SOURCE],[ +AC_REQUIRE([AC_CANONICAL_HOST]) cf_XOPEN_SOURCE=ifelse([$1],,500,[$1]) cf_POSIX_C_SOURCE=ifelse([$2],,199506L,[$2]) @@ -3954,7 +4710,7 @@ case $host_os in #(vi aix[[4-7]]*) #(vi cf_xopen_source="-D_ALL_SOURCE" ;; -cygwin) #(vi +cygwin|msys) #(vi cf_XOPEN_SOURCE=600 ;; darwin[[0-8]].*) #(vi @@ -4053,6 +4809,127 @@ make an error fi ]) dnl --------------------------------------------------------------------------- +dnl CF__ADD_SHLIB_RULES version: 4 updated: 2013/07/22 18:49:24 +dnl ------------------- +dnl Append rules for creating, installing, uninstalling and cleaning library. +dnl In particular, this is needed for shared libraries since there are symbolic +dnl links which depend on configuration choices. +dnl +dnl The logic is controlled by these cache variables: +dnl $cf_cv_do_symlinks +dnl $cf_cv_shlib_version +dnl +dnl The macro uses variables set by CF__DEFINE_SHLIB_VARS +dnl +dnl $1 = makefile to append to +dnl $2 = model (static, shared, libtool) +dnl $3 = objects (dependencies) +dnl $4 = additional libraries needed to link the shared library +define([CF__ADD_SHLIB_RULES],[ + +CF__DEFINE_LIB_TARGET + +case x$2 in +xlibtool|xshared) #(vi + cf_libdeps="ifelse($4,,,[$4])" + ;; +x*) + cf_libdeps= + ;; +esac + +cat >>$1 <<CF_EOF + +# generated by CF__ADD_SHLIB_RULES +# libmodel: $2 +# symlinks: $cf_cv_do_symlinks +# shlibver: $cf_cv_shlib_version + +CF_EOF + +cat >>$1 <<CF_EOF +$cf_libname :: \\ +CF_EOF + +cat >>$1 <<CF_EOF + $3 + @echo linking \[$]@ + \$(LIBTOOL_CREATE) $3 $cf_libdeps +CF_EOF + +if test "x$cf_cv_do_symlinks" = xyes +then +cat >>$1 <<CF_EOF + \$(LN_S) $cf_libname $cf_liblink + \$(LN_S) $cf_liblink $cf_libroot +CF_EOF +fi + +cat >>$1 <<CF_EOF + +install \\ +install.libs :: \$(DESTDIR)\$(libdir)/$cf_libname + +\$(DESTDIR)\$(libdir)/$cf_libname :: \\ + \$(DESTDIR)\$(libdir) \\ + $3 + @echo linking \[$]@ + \$(LIBTOOL_CREATE) $3 $cf_libdeps +CF_EOF + +if test "x$cf_cv_do_symlinks" = xyes +then +cat >>$1 <<CF_EOF + cd \$(DESTDIR)\$(libdir) && (\$(LN_S) $cf_libname $cf_liblink; \$(LN_S) $cf_liblink $cf_libroot; ) +CF_EOF +fi + +if test x$2 = xshared +then +cat >>$1 <<CF_EOF + - test -z "\$(DESTDIR)" && /sbin/ldconfig +CF_EOF +fi + +cat >>$1 <<CF_EOF + +uninstall \\ +uninstall.libs :: + @echo uninstalling \$(DESTDIR)\$(libdir)/$cf_libname +CF_EOF + +if test "x$cf_cv_do_symlinks" = xyes +then +cat >>$1 <<CF_EOF + -rm -f \$(DESTDIR)\$(libdir)/$cf_libroot + -rm -f \$(DESTDIR)\$(libdir)/$cf_liblink +CF_EOF +fi + +cat >>$1 <<CF_EOF + -rm -f \$(DESTDIR)\$(libdir)/$cf_libname + +clean \\ +clean.libs :: +CF_EOF + +if test "x$cf_cv_do_symlinks" = xyes +then +cat >>$1 <<CF_EOF + -rm -f $cf_libroot + -rm -f $cf_liblink +CF_EOF +fi + +cat >>$1 <<CF_EOF + -rm -f $cf_libname + +mostlyclean:: + -rm -f $3 +# end generated by CF__ADD_SHLIB_RULES +CF_EOF +])dnl +dnl --------------------------------------------------------------------------- dnl CF__CURSES_HEAD version: 2 updated: 2010/10/23 15:54:49 dnl --------------- dnl Define a reusable chunk which includes <curses.h> and <term.h> when they @@ -4073,6 +4950,72 @@ char * XCursesProgramName = "test"; #endif ]) dnl --------------------------------------------------------------------------- +dnl CF__CURSES_HEAD version: 2 updated: 2010/10/23 15:54:49 +dnl --------------- +dnl Define a reusable chunk which includes <curses.h> and <term.h> when they +dnl are both available. +define([CF__CURSES_HEAD],[ +#ifdef HAVE_XCURSES +#include <xcurses.h> +char * XCursesProgramName = "test"; +#else +#include <${cf_cv_ncurses_header:-curses.h}> +#if defined(NCURSES_VERSION) && defined(HAVE_NCURSESW_TERM_H) +#include <ncursesw/term.h> +#elif defined(NCURSES_VERSION) && defined(HAVE_NCURSES_TERM_H) +#include <ncurses/term.h> +#elif defined(HAVE_TERM_H) +#include <term.h> +#endif +#endif +]) +dnl --------------------------------------------------------------------------- +dnl CF__DEFINE_LIB_TARGET version: 1 updated: 2013/07/22 18:27:50 +dnl --------------------- +define([CF__DEFINE_LIB_TARGET],[ +cf_libname=\${LIB_BASENAME} +cf_liblink=$cf_libname +cf_libroot=$cf_libname + +if test "x$cf_cv_do_symlinks" = xyes +then + case "x$cf_cv_shlib_version" in #(vi + xrel) #(vi + cf_liblink="\${LIB_ABI_NAME}" + cf_libname="\${LIB_REL_NAME}" + ;; + xabi) + cf_liblink="\${LIB_REL_NAME}" + cf_libname="\${LIB_ABI_NAME}" + ;; + esac +fi +LIB_TARGET=$cf_libname +])dnl +dnl --------------------------------------------------------------------------- +dnl CF__DEFINE_SHLIB_VARS version: 2 updated: 2013/07/27 17:38:32 +dnl --------------------- +dnl Substitute makefile variables useful for CF__ADD_SHLIB_RULES. +dnl +dnl The substitution requires these variables: +dnl LIB_PREFI - "lib" +dnl LIB_ROOTNAME - "foo" +dnl LIB_SUFFIX - ".so" +dnl REL_VERSION - "5.0" +dnl ABI_VERSION - "4.2.4" +define([CF__DEFINE_SHLIB_VARS],[ +CF__DEFINE_LIB_TARGET +SET_SHLIB_VARS="# begin CF__DEFINE_SHLIB_VARS\\ +LIB_BASENAME = ${LIB_PREFIX}\${LIB_ROOTNAME}\${LIB_SUFFIX}\\ +LIB_REL_NAME = \${LIB_BASENAME}.\${REL_VERSION}\\ +LIB_ABI_NAME = \${LIB_BASENAME}.\${ABI_VERSION}\\ +LIB_TARGET = $LIB_TARGET\\ +RM_SHARED_OPTS = $RM_SHARED_OPTS\\ +# end CF__DEFINE_SHLIB_VARS" +AC_SUBST(SET_SHLIB_VARS) +AC_SUBST(LIB_TARGET) +])dnl +dnl --------------------------------------------------------------------------- dnl CF__ICONV_BODY version: 2 updated: 2007/07/26 17:35:47 dnl -------------- dnl Test-code needed for iconv compile-checks @@ -4090,6 +5033,22 @@ define([CF__ICONV_HEAD],[ #include <iconv.h>] )dnl dnl --------------------------------------------------------------------------- +dnl CF__INIT_SHLIB_RULES version: 2 updated: 2013/07/27 17:38:32 +dnl -------------------- +dnl The third parameter to AC_OUTPUT, used to pass variables needed for +dnl CF__ADD_SHLIB_RULES. +define([CF__INIT_SHLIB_RULES],[ +ABI_VERSION="$ABI_VERSION" +REL_VERSION="$REL_VERSION" +LIB_MODEL="$LIB_MODEL" +LIB_PREFIX="$LIB_PREFIX" +LIB_ROOTNAME="$LIB_ROOTNAME" +DFT_DEP_SUFFIX="$DFT_DEP_SUFFIX" +RM_SHARED_OPTS="$RM_SHARED_OPTS" +cf_cv_do_symlinks="$cf_cv_do_symlinks" +cf_cv_shlib_version="$cf_cv_shlib_version" +]) +dnl --------------------------------------------------------------------------- dnl CF__INTL_BODY version: 1 updated: 2007/07/26 17:35:47 dnl ------------- dnl Test-code needed for libintl compile-checks diff --git a/contrib/dialog/arrows.c b/contrib/dialog/arrows.c index 5e5c723..44a90df 100644 --- a/contrib/dialog/arrows.c +++ b/contrib/dialog/arrows.c @@ -1,5 +1,5 @@ /* - * $Id: arrows.c,v 1.50 2013/05/24 00:05:21 tom Exp $ + * $Id: arrows.c,v 1.51 2013/09/02 15:10:09 tom Exp $ * * arrows.c -- draw arrows to indicate end-of-range for lists * @@ -74,9 +74,10 @@ dlg_draw_helpline(WINDOW *win, bool decorations) int bottom; if (dialog_vars.help_line != 0 + && dialog_vars.help_line[0] != 0 && (bottom = getmaxy(win) - 1) > 0) { chtype attr = A_NORMAL; - const int *cols = dlg_index_columns(dialog_vars.help_line); + int cols = dlg_count_columns(dialog_vars.help_line); int other = decorations ? (ON_LEFT + ON_RIGHT) : 0; int avail = (getmaxx(win) - other - 2); int limit = dlg_count_real_columns(dialog_vars.help_line) + 2; @@ -86,7 +87,7 @@ dlg_draw_helpline(WINDOW *win, bool decorations) other = decorations ? ON_LEFT : 0; (void) wmove(win, bottom, other + (avail - limit) / 2); waddch(win, '['); - dlg_print_text(win, dialog_vars.help_line, cols[limit], &attr); + dlg_print_text(win, dialog_vars.help_line, cols, &attr); waddch(win, ']'); wmove(win, cur_y, cur_x); } diff --git a/contrib/dialog/buildlist.c b/contrib/dialog/buildlist.c index cb7c600..2c3e199 100644 --- a/contrib/dialog/buildlist.c +++ b/contrib/dialog/buildlist.c @@ -1,5 +1,5 @@ /* - * $Id: buildlist.c,v 1.57 2013/03/17 13:46:30 tom Exp $ + * $Id: buildlist.c,v 1.59 2013/09/02 17:01:02 tom Exp $ * * buildlist.c -- implements the buildlist dialog * @@ -1027,6 +1027,7 @@ dialog_buildlist(const char *title, bool separate_output = dialog_vars.separate_output; bool show_status = FALSE; int current = 0; + char *help_result; listitems = dlg_calloc(DIALOG_LISTITEM, (size_t) item_no + 1); assert_ptr(listitems, "dialog_buildlist"); @@ -1060,31 +1061,16 @@ dialog_buildlist(const char *title, show_status = TRUE; break; case DLG_EXIT_HELP: - dlg_add_result("HELP "); - show_status = dialog_vars.help_status; - if (USE_ITEM_HELP(listitems[current].help)) { - if (show_status) { - if (separate_output) { - dlg_add_string(listitems[current].help); - dlg_add_separator(); - } else { - dlg_add_quoted(listitems[current].help); - } + dlg_add_help_listitem(&result, &help_result, &listitems[current]); + if ((show_status = dialog_vars.help_status)) { + if (separate_output) { + dlg_add_string(help_result); + dlg_add_separator(); } else { - dlg_add_string(listitems[current].help); + dlg_add_quoted(help_result); } - result = DLG_EXIT_ITEM_HELP; } else { - if (show_status) { - if (separate_output) { - dlg_add_string(listitems[current].name); - dlg_add_separator(); - } else { - dlg_add_quoted(listitems[current].name); - } - } else { - dlg_add_string(listitems[current].name); - } + dlg_add_string(help_result); } break; } diff --git a/contrib/dialog/checklist.c b/contrib/dialog/checklist.c index 0ae18a6..1bb54db 100644 --- a/contrib/dialog/checklist.c +++ b/contrib/dialog/checklist.c @@ -1,5 +1,5 @@ /* - * $Id: checklist.c,v 1.151 2013/03/23 10:51:48 tom Exp $ + * $Id: checklist.c,v 1.153 2013/09/02 17:01:02 tom Exp $ * * checklist.c -- implements the checklist box * @@ -607,6 +607,7 @@ dialog_checklist(const char *title, && (dialog_vars.separate_output)); bool show_status = FALSE; int current = 0; + char *help_result; listitems = dlg_calloc(DIALOG_LISTITEM, (size_t) item_no + 1); assert_ptr(listitems, "dialog_checklist"); @@ -640,31 +641,16 @@ dialog_checklist(const char *title, show_status = TRUE; break; case DLG_EXIT_HELP: - dlg_add_result("HELP "); - show_status = dialog_vars.help_status; - if (USE_ITEM_HELP(listitems[current].help)) { - if (show_status) { - if (separate_output) { - dlg_add_string(listitems[current].help); - dlg_add_separator(); - } else { - dlg_add_quoted(listitems[current].help); - } + dlg_add_help_listitem(&result, &help_result, &listitems[current]); + if ((show_status = dialog_vars.help_status)) { + if (separate_output) { + dlg_add_string(help_result); + dlg_add_separator(); } else { - dlg_add_string(listitems[current].help); + dlg_add_quoted(help_result); } - result = DLG_EXIT_ITEM_HELP; } else { - if (show_status) { - if (separate_output) { - dlg_add_string(listitems[current].name); - dlg_add_separator(); - } else { - dlg_add_quoted(listitems[current].name); - } - } else { - dlg_add_string(listitems[current].name); - } + dlg_add_string(help_result); } break; } diff --git a/contrib/dialog/config.guess b/contrib/dialog/config.guess index 872b96a..b79252d 100755 --- a/contrib/dialog/config.guess +++ b/contrib/dialog/config.guess @@ -1,14 +1,12 @@ #! /bin/sh # Attempt to guess a canonical system name. -# Copyright (C) 1992, 1993, 1994, 1995, 1996, 1997, 1998, 1999, -# 2000, 2001, 2002, 2003, 2004, 2005, 2006, 2007, 2008, 2009, 2010, -# 2011, 2012 Free Software Foundation, Inc. +# Copyright 1992-2013 Free Software Foundation, Inc. -timestamp='2012-09-25' +timestamp='2013-06-10' # This file is free software; you can redistribute it and/or modify it # under the terms of the GNU General Public License as published by -# the Free Software Foundation; either version 2 of the License, or +# the Free Software Foundation; either version 3 of the License, or # (at your option) any later version. # # This program is distributed in the hope that it will be useful, but @@ -22,19 +20,17 @@ timestamp='2012-09-25' # As a special exception to the GNU General Public License, if you # distribute this file as part of a program that contains a # configuration script generated by Autoconf, you may include it under -# the same distribution terms that you use for the rest of that program. - - -# Originally written by Per Bothner. Please send patches (context -# diff format) to <config-patches@gnu.org> and include a ChangeLog -# entry. +# the same distribution terms that you use for the rest of that +# program. This Exception is an additional permission under section 7 +# of the GNU General Public License, version 3 ("GPLv3"). # -# This script attempts to guess a canonical system name similar to -# config.sub. If it succeeds, it prints the system name on stdout, and -# exits with 0. Otherwise, it exits with 1. +# Originally written by Per Bothner. # # You can get the latest version of this script from: # http://git.savannah.gnu.org/gitweb/?p=config.git;a=blob_plain;f=config.guess;hb=HEAD +# +# Please send patches with a ChangeLog entry to config-patches@gnu.org. + me=`echo "$0" | sed -e 's,.*/,,'` @@ -54,9 +50,7 @@ version="\ GNU config.guess ($timestamp) Originally written by Per Bothner. -Copyright (C) 1992, 1993, 1994, 1995, 1996, 1997, 1998, 1999, 2000, -2001, 2002, 2003, 2004, 2005, 2006, 2007, 2008, 2009, 2010, 2011, 2012 -Free Software Foundation, Inc. +Copyright 1992-2013 Free Software Foundation, Inc. This is free software; see the source for copying conditions. There is NO warranty; not even for MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE." @@ -138,6 +132,27 @@ UNAME_RELEASE=`(uname -r) 2>/dev/null` || UNAME_RELEASE=unknown UNAME_SYSTEM=`(uname -s) 2>/dev/null` || UNAME_SYSTEM=unknown UNAME_VERSION=`(uname -v) 2>/dev/null` || UNAME_VERSION=unknown +case "${UNAME_SYSTEM}" in +Linux|GNU|GNU/*) + # If the system lacks a compiler, then just pick glibc. + # We could probably try harder. + LIBC=gnu + + eval $set_cc_for_build + cat <<-EOF > $dummy.c + #include <features.h> + #if defined(__UCLIBC__) + LIBC=uclibc + #elif defined(__dietlibc__) + LIBC=dietlibc + #else + LIBC=gnu + #endif + EOF + eval `$CC_FOR_BUILD -E $dummy.c 2>/dev/null | grep '^LIBC'` + ;; +esac + # Note: order is significant - the case branches are not exclusive. case "${UNAME_MACHINE}:${UNAME_SYSTEM}:${UNAME_RELEASE}:${UNAME_VERSION}" in @@ -859,21 +874,21 @@ EOF exit ;; *:GNU:*:*) # the GNU system - echo `echo ${UNAME_MACHINE}|sed -e 's,[-/].*$,,'`-unknown-gnu`echo ${UNAME_RELEASE}|sed -e 's,/.*$,,'` + echo `echo ${UNAME_MACHINE}|sed -e 's,[-/].*$,,'`-unknown-${LIBC}`echo ${UNAME_RELEASE}|sed -e 's,/.*$,,'` exit ;; *:GNU/*:*:*) # other systems with GNU libc and userland - echo ${UNAME_MACHINE}-unknown-`echo ${UNAME_SYSTEM} | sed 's,^[^/]*/,,' | tr '[A-Z]' '[a-z]'``echo ${UNAME_RELEASE}|sed -e 's/[-(].*//'`-gnu + echo ${UNAME_MACHINE}-unknown-`echo ${UNAME_SYSTEM} | sed 's,^[^/]*/,,' | tr '[A-Z]' '[a-z]'``echo ${UNAME_RELEASE}|sed -e 's/[-(].*//'`-${LIBC} exit ;; i*86:Minix:*:*) echo ${UNAME_MACHINE}-pc-minix exit ;; aarch64:Linux:*:*) - echo ${UNAME_MACHINE}-unknown-linux-gnu + echo ${UNAME_MACHINE}-unknown-linux-${LIBC} exit ;; aarch64_be:Linux:*:*) UNAME_MACHINE=aarch64_be - echo ${UNAME_MACHINE}-unknown-linux-gnu + echo ${UNAME_MACHINE}-unknown-linux-${LIBC} exit ;; alpha:Linux:*:*) case `sed -n '/^cpu model/s/^.*: \(.*\)/\1/p' < /proc/cpuinfo` in @@ -886,59 +901,54 @@ EOF EV68*) UNAME_MACHINE=alphaev68 ;; esac objdump --private-headers /bin/sh | grep -q ld.so.1 - if test "$?" = 0 ; then LIBC="libc1" ; else LIBC="" ; fi - echo ${UNAME_MACHINE}-unknown-linux-gnu${LIBC} + if test "$?" = 0 ; then LIBC="gnulibc1" ; fi + echo ${UNAME_MACHINE}-unknown-linux-${LIBC} + exit ;; + arc:Linux:*:* | arceb:Linux:*:*) + echo ${UNAME_MACHINE}-unknown-linux-${LIBC} exit ;; arm*:Linux:*:*) eval $set_cc_for_build if echo __ARM_EABI__ | $CC_FOR_BUILD -E - 2>/dev/null \ | grep -q __ARM_EABI__ then - echo ${UNAME_MACHINE}-unknown-linux-gnu + echo ${UNAME_MACHINE}-unknown-linux-${LIBC} else if echo __ARM_PCS_VFP | $CC_FOR_BUILD -E - 2>/dev/null \ | grep -q __ARM_PCS_VFP then - echo ${UNAME_MACHINE}-unknown-linux-gnueabi + echo ${UNAME_MACHINE}-unknown-linux-${LIBC}eabi else - echo ${UNAME_MACHINE}-unknown-linux-gnueabihf + echo ${UNAME_MACHINE}-unknown-linux-${LIBC}eabihf fi fi exit ;; avr32*:Linux:*:*) - echo ${UNAME_MACHINE}-unknown-linux-gnu + echo ${UNAME_MACHINE}-unknown-linux-${LIBC} exit ;; cris:Linux:*:*) - echo ${UNAME_MACHINE}-axis-linux-gnu + echo ${UNAME_MACHINE}-axis-linux-${LIBC} exit ;; crisv32:Linux:*:*) - echo ${UNAME_MACHINE}-axis-linux-gnu + echo ${UNAME_MACHINE}-axis-linux-${LIBC} exit ;; frv:Linux:*:*) - echo ${UNAME_MACHINE}-unknown-linux-gnu + echo ${UNAME_MACHINE}-unknown-linux-${LIBC} exit ;; hexagon:Linux:*:*) - echo ${UNAME_MACHINE}-unknown-linux-gnu + echo ${UNAME_MACHINE}-unknown-linux-${LIBC} exit ;; i*86:Linux:*:*) - LIBC=gnu - eval $set_cc_for_build - sed 's/^ //' << EOF >$dummy.c - #ifdef __dietlibc__ - LIBC=dietlibc - #endif -EOF - eval `$CC_FOR_BUILD -E $dummy.c 2>/dev/null | grep '^LIBC'` - echo "${UNAME_MACHINE}-pc-linux-${LIBC}" + echo ${UNAME_MACHINE}-pc-linux-${LIBC} exit ;; ia64:Linux:*:*) - echo ${UNAME_MACHINE}-unknown-linux-gnu + echo ${UNAME_MACHINE}-unknown-linux-${LIBC} exit ;; m32r*:Linux:*:*) - echo ${UNAME_MACHINE}-unknown-linux-gnu + echo ${UNAME_MACHINE}-unknown-linux-${LIBC} exit ;; m68*:Linux:*:*) - echo ${UNAME_MACHINE}-unknown-linux-gnu + echo ${UNAME_MACHINE}-unknown-linux-${LIBC} exit ;; mips:Linux:*:* | mips64:Linux:*:*) eval $set_cc_for_build @@ -957,54 +967,63 @@ EOF #endif EOF eval `$CC_FOR_BUILD -E $dummy.c 2>/dev/null | grep '^CPU'` - test x"${CPU}" != x && { echo "${CPU}-unknown-linux-gnu"; exit; } + test x"${CPU}" != x && { echo "${CPU}-unknown-linux-${LIBC}"; exit; } ;; + or1k:Linux:*:*) + echo ${UNAME_MACHINE}-unknown-linux-${LIBC} + exit ;; or32:Linux:*:*) - echo ${UNAME_MACHINE}-unknown-linux-gnu + echo ${UNAME_MACHINE}-unknown-linux-${LIBC} exit ;; padre:Linux:*:*) - echo sparc-unknown-linux-gnu + echo sparc-unknown-linux-${LIBC} exit ;; parisc64:Linux:*:* | hppa64:Linux:*:*) - echo hppa64-unknown-linux-gnu + echo hppa64-unknown-linux-${LIBC} exit ;; parisc:Linux:*:* | hppa:Linux:*:*) # Look for CPU level case `grep '^cpu[^a-z]*:' /proc/cpuinfo 2>/dev/null | cut -d' ' -f2` in - PA7*) echo hppa1.1-unknown-linux-gnu ;; - PA8*) echo hppa2.0-unknown-linux-gnu ;; - *) echo hppa-unknown-linux-gnu ;; + PA7*) echo hppa1.1-unknown-linux-${LIBC} ;; + PA8*) echo hppa2.0-unknown-linux-${LIBC} ;; + *) echo hppa-unknown-linux-${LIBC} ;; esac exit ;; ppc64:Linux:*:*) - echo powerpc64-unknown-linux-gnu + echo powerpc64-unknown-linux-${LIBC} exit ;; ppc:Linux:*:*) - echo powerpc-unknown-linux-gnu + echo powerpc-unknown-linux-${LIBC} + exit ;; + ppc64le:Linux:*:*) + echo powerpc64le-unknown-linux-${LIBC} + exit ;; + ppcle:Linux:*:*) + echo powerpcle-unknown-linux-${LIBC} exit ;; s390:Linux:*:* | s390x:Linux:*:*) - echo ${UNAME_MACHINE}-ibm-linux + echo ${UNAME_MACHINE}-ibm-linux-${LIBC} exit ;; sh64*:Linux:*:*) - echo ${UNAME_MACHINE}-unknown-linux-gnu + echo ${UNAME_MACHINE}-unknown-linux-${LIBC} exit ;; sh*:Linux:*:*) - echo ${UNAME_MACHINE}-unknown-linux-gnu + echo ${UNAME_MACHINE}-unknown-linux-${LIBC} exit ;; sparc:Linux:*:* | sparc64:Linux:*:*) - echo ${UNAME_MACHINE}-unknown-linux-gnu + echo ${UNAME_MACHINE}-unknown-linux-${LIBC} exit ;; tile*:Linux:*:*) - echo ${UNAME_MACHINE}-unknown-linux-gnu + echo ${UNAME_MACHINE}-unknown-linux-${LIBC} exit ;; vax:Linux:*:*) - echo ${UNAME_MACHINE}-dec-linux-gnu + echo ${UNAME_MACHINE}-dec-linux-${LIBC} exit ;; x86_64:Linux:*:*) - echo ${UNAME_MACHINE}-unknown-linux-gnu + echo ${UNAME_MACHINE}-unknown-linux-${LIBC} exit ;; xtensa*:Linux:*:*) - echo ${UNAME_MACHINE}-unknown-linux-gnu + echo ${UNAME_MACHINE}-unknown-linux-${LIBC} exit ;; i*86:DYNIX/ptx:4*:*) # ptx 4.0 does uname -s correctly, with DYNIX/ptx in there. @@ -1237,19 +1256,21 @@ EOF exit ;; *:Darwin:*:*) UNAME_PROCESSOR=`uname -p` || UNAME_PROCESSOR=unknown - case $UNAME_PROCESSOR in - i386) - eval $set_cc_for_build - if [ "$CC_FOR_BUILD" != 'no_compiler_found' ]; then - if (echo '#ifdef __LP64__'; echo IS_64BIT_ARCH; echo '#endif') | \ - (CCOPTS= $CC_FOR_BUILD -E - 2>/dev/null) | \ - grep IS_64BIT_ARCH >/dev/null - then - UNAME_PROCESSOR="x86_64" - fi - fi ;; - unknown) UNAME_PROCESSOR=powerpc ;; - esac + eval $set_cc_for_build + if test "$UNAME_PROCESSOR" = unknown ; then + UNAME_PROCESSOR=powerpc + fi + if [ "$CC_FOR_BUILD" != 'no_compiler_found' ]; then + if (echo '#ifdef __LP64__'; echo IS_64BIT_ARCH; echo '#endif') | \ + (CCOPTS= $CC_FOR_BUILD -E - 2>/dev/null) | \ + grep IS_64BIT_ARCH >/dev/null + then + case $UNAME_PROCESSOR in + i386) UNAME_PROCESSOR=x86_64 ;; + powerpc) UNAME_PROCESSOR=powerpc64 ;; + esac + fi + fi echo ${UNAME_PROCESSOR}-apple-darwin${UNAME_RELEASE} exit ;; *:procnto*:*:* | *:QNX:[0123456789]*:*) diff --git a/contrib/dialog/config.sub b/contrib/dialog/config.sub index bdda9e4..85a159e 100755 --- a/contrib/dialog/config.sub +++ b/contrib/dialog/config.sub @@ -1,24 +1,18 @@ #! /bin/sh # Configuration validation subroutine script. -# Copyright (C) 1992, 1993, 1994, 1995, 1996, 1997, 1998, 1999, -# 2000, 2001, 2002, 2003, 2004, 2005, 2006, 2007, 2008, 2009, 2010, -# 2011, 2012 Free Software Foundation, Inc. +# Copyright 1992-2013 Free Software Foundation, Inc. -timestamp='2012-08-18' +timestamp='2013-09-05' -# This file is (in principle) common to ALL GNU software. -# The presence of a machine in this file suggests that SOME GNU software -# can handle that machine. It does not imply ALL GNU software can. -# -# This file is free software; you can redistribute it and/or modify -# it under the terms of the GNU General Public License as published by -# the Free Software Foundation; either version 2 of the License, or +# This file is free software; you can redistribute it and/or modify it +# under the terms of the GNU General Public License as published by +# the Free Software Foundation; either version 3 of the License, or # (at your option) any later version. # -# This program is distributed in the hope that it will be useful, -# but WITHOUT ANY WARRANTY; without even the implied warranty of -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -# GNU General Public License for more details. +# This program is distributed in the hope that it will be useful, but +# WITHOUT ANY WARRANTY; without even the implied warranty of +# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU +# General Public License for more details. # # You should have received a copy of the GNU General Public License # along with this program; if not, see <http://www.gnu.org/licenses/>. @@ -26,11 +20,12 @@ timestamp='2012-08-18' # As a special exception to the GNU General Public License, if you # distribute this file as part of a program that contains a # configuration script generated by Autoconf, you may include it under -# the same distribution terms that you use for the rest of that program. +# the same distribution terms that you use for the rest of that +# program. This Exception is an additional permission under section 7 +# of the GNU General Public License, version 3 ("GPLv3"). -# Please send patches to <config-patches@gnu.org>. Submit a context -# diff and a properly formatted GNU ChangeLog entry. +# Please send patches with a ChangeLog entry to config-patches@gnu.org. # # Configuration subroutine to validate and canonicalize a configuration type. # Supply the specified configuration type as an argument. @@ -73,9 +68,7 @@ Report bugs and patches to <config-patches@gnu.org>." version="\ GNU config.sub ($timestamp) -Copyright (C) 1992, 1993, 1994, 1995, 1996, 1997, 1998, 1999, 2000, -2001, 2002, 2003, 2004, 2005, 2006, 2007, 2008, 2009, 2010, 2011, 2012 -Free Software Foundation, Inc. +Copyright 1992-2013 Free Software Foundation, Inc. This is free software; see the source for copying conditions. There is NO warranty; not even for MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE." @@ -156,7 +149,7 @@ case $os in -convergent* | -ncr* | -news | -32* | -3600* | -3100* | -hitachi* |\ -c[123]* | -convex* | -sun | -crds | -omron* | -dg | -ultra | -tti* | \ -harris | -dolphin | -highlevel | -gould | -cbm | -ns | -masscomp | \ - -apple | -axis | -knuth | -cray | -microblaze) + -apple | -axis | -knuth | -cray | -microblaze*) os= basic_machine=$1 ;; @@ -259,10 +252,12 @@ case $basic_machine in | alpha | alphaev[4-8] | alphaev56 | alphaev6[78] | alphapca5[67] \ | alpha64 | alpha64ev[4-8] | alpha64ev56 | alpha64ev6[78] | alpha64pca5[67] \ | am33_2.0 \ - | arc | arm | arm[bl]e | arme[lb] | armv[2345] | armv[345][lb] | avr | avr32 \ - | be32 | be64 \ + | arc | arceb \ + | arm | arm[bl]e | arme[lb] | armv[2-8] | armv[3-8][lb] | armv7[arm] \ + | avr | avr32 \ + | be32 | be64 \ | bfin \ - | c4x | clipper \ + | c4x | c8051 | clipper \ | d10v | d30v | dlx | dsp16xx \ | epiphany \ | fido | fr30 | frv \ @@ -273,7 +268,7 @@ case $basic_machine in | le32 | le64 \ | lm32 \ | m32c | m32r | m32rle | m68000 | m68k | m88k \ - | maxq | mb | microblaze | mcore | mep | metag \ + | maxq | mb | microblaze | microblazeel | mcore | mep | metag \ | mips | mipsbe | mipseb | mipsel | mipsle \ | mips16 \ | mips64 | mips64el \ @@ -291,16 +286,17 @@ case $basic_machine in | mipsisa64r2 | mipsisa64r2el \ | mipsisa64sb1 | mipsisa64sb1el \ | mipsisa64sr71k | mipsisa64sr71kel \ + | mipsr5900 | mipsr5900el \ | mipstx39 | mipstx39el \ | mn10200 | mn10300 \ | moxie \ | mt \ | msp430 \ | nds32 | nds32le | nds32be \ - | nios | nios2 \ + | nios | nios2 | nios2eb | nios2el \ | ns16k | ns32k \ | open8 \ - | or32 \ + | or1k | or32 \ | pdp10 | pdp11 | pj | pjl \ | powerpc | powerpc64 | powerpc64le | powerpcle \ | pyramid \ @@ -328,7 +324,7 @@ case $basic_machine in c6x) basic_machine=tic6x-unknown ;; - m6811 | m68hc11 | m6812 | m68hc12 | m68hcs12x | picochip) + m6811 | m68hc11 | m6812 | m68hc12 | m68hcs12x | nvptx | picochip) basic_machine=$basic_machine-unknown os=-none ;; @@ -370,13 +366,13 @@ case $basic_machine in | aarch64-* | aarch64_be-* \ | alpha-* | alphaev[4-8]-* | alphaev56-* | alphaev6[78]-* \ | alpha64-* | alpha64ev[4-8]-* | alpha64ev56-* | alpha64ev6[78]-* \ - | alphapca5[67]-* | alpha64pca5[67]-* | arc-* \ + | alphapca5[67]-* | alpha64pca5[67]-* | arc-* | arceb-* \ | arm-* | armbe-* | armle-* | armeb-* | armv*-* \ | avr-* | avr32-* \ | be32-* | be64-* \ | bfin-* | bs2000-* \ | c[123]* | c30-* | [cjt]90-* | c4x-* \ - | clipper-* | craynv-* | cydra-* \ + | c8051-* | clipper-* | craynv-* | cydra-* \ | d10v-* | d30v-* | dlx-* \ | elxsi-* \ | f30[01]-* | f700-* | fido-* | fr30-* | frv-* | fx80-* \ @@ -389,7 +385,8 @@ case $basic_machine in | lm32-* \ | m32c-* | m32r-* | m32rle-* \ | m68000-* | m680[012346]0-* | m68360-* | m683?2-* | m68k-* \ - | m88110-* | m88k-* | maxq-* | mcore-* | metag-* | microblaze-* \ + | m88110-* | m88k-* | maxq-* | mcore-* | metag-* \ + | microblaze-* | microblazeel-* \ | mips-* | mipsbe-* | mipseb-* | mipsel-* | mipsle-* \ | mips16-* \ | mips64-* | mips64el-* \ @@ -407,12 +404,13 @@ case $basic_machine in | mipsisa64r2-* | mipsisa64r2el-* \ | mipsisa64sb1-* | mipsisa64sb1el-* \ | mipsisa64sr71k-* | mipsisa64sr71kel-* \ + | mipsr5900-* | mipsr5900el-* \ | mipstx39-* | mipstx39el-* \ | mmix-* \ | mt-* \ | msp430-* \ | nds32-* | nds32le-* | nds32be-* \ - | nios-* | nios2-* \ + | nios-* | nios2-* | nios2eb-* | nios2el-* \ | none-* | np1-* | ns16k-* | ns32k-* \ | open8-* \ | orion-* \ @@ -788,7 +786,7 @@ case $basic_machine in basic_machine=ns32k-utek os=-sysv ;; - microblaze) + microblaze*) basic_machine=microblaze-xilinx ;; mingw64) @@ -796,7 +794,7 @@ case $basic_machine in os=-mingw64 ;; mingw32) - basic_machine=i386-pc + basic_machine=i686-pc os=-mingw32 ;; mingw32ce) @@ -832,7 +830,7 @@ case $basic_machine in basic_machine=`echo $basic_machine | sed -e 's/ms1-/mt-/'` ;; msys) - basic_machine=i386-pc + basic_machine=i686-pc os=-msys ;; mvs) @@ -1023,7 +1021,11 @@ case $basic_machine in basic_machine=i586-unknown os=-pw32 ;; - rdos) + rdos | rdos64) + basic_machine=x86_64-pc + os=-rdos + ;; + rdos32) basic_machine=i386-pc os=-rdos ;; @@ -1350,7 +1352,7 @@ case $os in -gnu* | -bsd* | -mach* | -minix* | -genix* | -ultrix* | -irix* \ | -*vms* | -sco* | -esix* | -isc* | -aix* | -cnk* | -sunos | -sunos[34]*\ | -hpux* | -unos* | -osf* | -luna* | -dgux* | -auroraux* | -solaris* \ - | -sym* | -kopensolaris* \ + | -sym* | -kopensolaris* | -plan9* \ | -amigaos* | -amigados* | -msdos* | -newsos* | -unicos* | -aof* \ | -aos* | -aros* \ | -nindy* | -vxsim* | -vxworks* | -ebmon* | -hms* | -mvs* \ @@ -1496,9 +1498,6 @@ case $os in -aros*) os=-aros ;; - -kaos*) - os=-kaos - ;; -zvmoe) os=-zvmoe ;; @@ -1547,6 +1546,9 @@ case $basic_machine in c4x-* | tic4x-*) os=-coff ;; + c8051-*) + os=-elf + ;; hexagon-*) os=-elf ;; @@ -1590,6 +1592,9 @@ case $basic_machine in mips*-*) os=-elf ;; + or1k-*) + os=-elf + ;; or32-*) os=-coff ;; diff --git a/contrib/dialog/configure b/contrib/dialog/configure index c3900e3..282cc5d 100755 --- a/contrib/dialog/configure +++ b/contrib/dialog/configure @@ -689,6 +689,7 @@ Optional Packages: --disable-echo do not display "compiling" commands --disable-largefile omit support for large files --with-warnings test: turn on gcc warnings + --with-pkg-config{=path} enable/disable use of pkg-config --with-package=XXX rename dialog to XXX, library to libXXX.a, etc --enable-header-subdir install dlg_XXX headers to subdirectory --with-libiconv-prefix=DIR @@ -703,10 +704,15 @@ Optional Packages: --with-valgrind test: use valgrind --with-no-leaks test: free permanent memory, analyze leaks --disable-trace do not support --trace option + --with-rel-version=XXX override derived release version + --with-abi-version=XXX override derived ABI version --disable-libtool-version enable to use libtool's incompatible naming scheme --with-libtool generate libraries with libtool --with-libtool-opts=XXX specify additional libtool options + --with-shared generate shared-libraries + --with-shlib-version=X Specify rel or abi version for shared libs --with-curses-dir=DIR directory in which (n)curses is installed + --enable-rpath use rpath option when generating shared libraries --with-ncurses compile/link with ncurses library --with-ncursesw compile/link with wide-char ncurses library --disable-extras do not include extra dialogs @@ -914,7 +920,7 @@ if test -z "$CONFIG_SITE"; then fi for ac_site_file in $CONFIG_SITE; do if test -r "$ac_site_file"; then - { echo "$as_me:917: loading site script $ac_site_file" >&5 + { echo "$as_me:923: loading site script $ac_site_file" >&5 echo "$as_me: loading site script $ac_site_file" >&6;} cat "$ac_site_file" >&5 . "$ac_site_file" @@ -925,7 +931,7 @@ if test -r "$cache_file"; then # Some versions of bash will fail to source /dev/null (special # files actually), so we avoid doing that. if test -f "$cache_file"; then - { echo "$as_me:928: loading cache $cache_file" >&5 + { echo "$as_me:934: loading cache $cache_file" >&5 echo "$as_me: loading cache $cache_file" >&6;} case $cache_file in [\\/]* | ?:[\\/]* ) . $cache_file;; @@ -933,7 +939,7 @@ echo "$as_me: loading cache $cache_file" >&6;} esac fi else - { echo "$as_me:936: creating cache $cache_file" >&5 + { echo "$as_me:942: creating cache $cache_file" >&5 echo "$as_me: creating cache $cache_file" >&6;} >$cache_file fi @@ -949,21 +955,21 @@ for ac_var in `(set) 2>&1 | eval ac_new_val="\$ac_env_${ac_var}_value" case $ac_old_set,$ac_new_set in set,) - { echo "$as_me:952: error: \`$ac_var' was set to \`$ac_old_val' in the previous run" >&5 + { echo "$as_me:958: error: \`$ac_var' was set to \`$ac_old_val' in the previous run" >&5 echo "$as_me: error: \`$ac_var' was set to \`$ac_old_val' in the previous run" >&2;} ac_cache_corrupted=: ;; ,set) - { echo "$as_me:956: error: \`$ac_var' was not set in the previous run" >&5 + { echo "$as_me:962: error: \`$ac_var' was not set in the previous run" >&5 echo "$as_me: error: \`$ac_var' was not set in the previous run" >&2;} ac_cache_corrupted=: ;; ,);; *) if test "x$ac_old_val" != "x$ac_new_val"; then - { echo "$as_me:962: error: \`$ac_var' has changed since the previous run:" >&5 + { echo "$as_me:968: error: \`$ac_var' has changed since the previous run:" >&5 echo "$as_me: error: \`$ac_var' has changed since the previous run:" >&2;} - { echo "$as_me:964: former value: $ac_old_val" >&5 + { echo "$as_me:970: former value: $ac_old_val" >&5 echo "$as_me: former value: $ac_old_val" >&2;} - { echo "$as_me:966: current value: $ac_new_val" >&5 + { echo "$as_me:972: current value: $ac_new_val" >&5 echo "$as_me: current value: $ac_new_val" >&2;} ac_cache_corrupted=: fi;; @@ -982,9 +988,9 @@ echo "$as_me: current value: $ac_new_val" >&2;} fi done if $ac_cache_corrupted; then - { echo "$as_me:985: error: changes in the environment can compromise the build" >&5 + { echo "$as_me:991: error: changes in the environment can compromise the build" >&5 echo "$as_me: error: changes in the environment can compromise the build" >&2;} - { { echo "$as_me:987: error: run \`make distclean' and/or \`rm $cache_file' and start over" >&5 + { { echo "$as_me:993: error: run \`make distclean' and/or \`rm $cache_file' and start over" >&5 echo "$as_me: error: run \`make distclean' and/or \`rm $cache_file' and start over" >&2;} { (exit 1); exit 1; }; } fi @@ -1005,10 +1011,10 @@ esac echo "#! $SHELL" >conftest.sh echo "exit 0" >>conftest.sh chmod +x conftest.sh -if { (echo "$as_me:1008: PATH=\".;.\"; conftest.sh") >&5 +if { (echo "$as_me:1014: PATH=\".;.\"; conftest.sh") >&5 (PATH=".;."; conftest.sh) 2>&5 ac_status=$? - echo "$as_me:1011: \$? = $ac_status" >&5 + echo "$as_me:1017: \$? = $ac_status" >&5 (exit $ac_status); }; then ac_path_separator=';' else @@ -1043,7 +1049,7 @@ ac_main_return=return if test -n "$ac_tool_prefix"; then # Extract the first word of "${ac_tool_prefix}gcc", so it can be a program name with args. set dummy ${ac_tool_prefix}gcc; ac_word=$2 -echo "$as_me:1046: checking for $ac_word" >&5 +echo "$as_me:1052: checking for $ac_word" >&5 echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6 if test "${ac_cv_prog_CC+set}" = set; then echo $ECHO_N "(cached) $ECHO_C" >&6 @@ -1058,7 +1064,7 @@ for ac_dir in $ac_dummy; do test -z "$ac_dir" && ac_dir=. $as_executable_p "$ac_dir/$ac_word" || continue ac_cv_prog_CC="${ac_tool_prefix}gcc" -echo "$as_me:1061: found $ac_dir/$ac_word" >&5 +echo "$as_me:1067: found $ac_dir/$ac_word" >&5 break done @@ -1066,10 +1072,10 @@ fi fi CC=$ac_cv_prog_CC if test -n "$CC"; then - echo "$as_me:1069: result: $CC" >&5 + echo "$as_me:1075: result: $CC" >&5 echo "${ECHO_T}$CC" >&6 else - echo "$as_me:1072: result: no" >&5 + echo "$as_me:1078: result: no" >&5 echo "${ECHO_T}no" >&6 fi @@ -1078,7 +1084,7 @@ if test -z "$ac_cv_prog_CC"; then ac_ct_CC=$CC # Extract the first word of "gcc", so it can be a program name with args. set dummy gcc; ac_word=$2 -echo "$as_me:1081: checking for $ac_word" >&5 +echo "$as_me:1087: checking for $ac_word" >&5 echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6 if test "${ac_cv_prog_ac_ct_CC+set}" = set; then echo $ECHO_N "(cached) $ECHO_C" >&6 @@ -1093,7 +1099,7 @@ for ac_dir in $ac_dummy; do test -z "$ac_dir" && ac_dir=. $as_executable_p "$ac_dir/$ac_word" || continue ac_cv_prog_ac_ct_CC="gcc" -echo "$as_me:1096: found $ac_dir/$ac_word" >&5 +echo "$as_me:1102: found $ac_dir/$ac_word" >&5 break done @@ -1101,10 +1107,10 @@ fi fi ac_ct_CC=$ac_cv_prog_ac_ct_CC if test -n "$ac_ct_CC"; then - echo "$as_me:1104: result: $ac_ct_CC" >&5 + echo "$as_me:1110: result: $ac_ct_CC" >&5 echo "${ECHO_T}$ac_ct_CC" >&6 else - echo "$as_me:1107: result: no" >&5 + echo "$as_me:1113: result: no" >&5 echo "${ECHO_T}no" >&6 fi @@ -1117,7 +1123,7 @@ if test -z "$CC"; then if test -n "$ac_tool_prefix"; then # Extract the first word of "${ac_tool_prefix}cc", so it can be a program name with args. set dummy ${ac_tool_prefix}cc; ac_word=$2 -echo "$as_me:1120: checking for $ac_word" >&5 +echo "$as_me:1126: checking for $ac_word" >&5 echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6 if test "${ac_cv_prog_CC+set}" = set; then echo $ECHO_N "(cached) $ECHO_C" >&6 @@ -1132,7 +1138,7 @@ for ac_dir in $ac_dummy; do test -z "$ac_dir" && ac_dir=. $as_executable_p "$ac_dir/$ac_word" || continue ac_cv_prog_CC="${ac_tool_prefix}cc" -echo "$as_me:1135: found $ac_dir/$ac_word" >&5 +echo "$as_me:1141: found $ac_dir/$ac_word" >&5 break done @@ -1140,10 +1146,10 @@ fi fi CC=$ac_cv_prog_CC if test -n "$CC"; then - echo "$as_me:1143: result: $CC" >&5 + echo "$as_me:1149: result: $CC" >&5 echo "${ECHO_T}$CC" >&6 else - echo "$as_me:1146: result: no" >&5 + echo "$as_me:1152: result: no" >&5 echo "${ECHO_T}no" >&6 fi @@ -1152,7 +1158,7 @@ if test -z "$ac_cv_prog_CC"; then ac_ct_CC=$CC # Extract the first word of "cc", so it can be a program name with args. set dummy cc; ac_word=$2 -echo "$as_me:1155: checking for $ac_word" >&5 +echo "$as_me:1161: checking for $ac_word" >&5 echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6 if test "${ac_cv_prog_ac_ct_CC+set}" = set; then echo $ECHO_N "(cached) $ECHO_C" >&6 @@ -1167,7 +1173,7 @@ for ac_dir in $ac_dummy; do test -z "$ac_dir" && ac_dir=. $as_executable_p "$ac_dir/$ac_word" || continue ac_cv_prog_ac_ct_CC="cc" -echo "$as_me:1170: found $ac_dir/$ac_word" >&5 +echo "$as_me:1176: found $ac_dir/$ac_word" >&5 break done @@ -1175,10 +1181,10 @@ fi fi ac_ct_CC=$ac_cv_prog_ac_ct_CC if test -n "$ac_ct_CC"; then - echo "$as_me:1178: result: $ac_ct_CC" >&5 + echo "$as_me:1184: result: $ac_ct_CC" >&5 echo "${ECHO_T}$ac_ct_CC" >&6 else - echo "$as_me:1181: result: no" >&5 + echo "$as_me:1187: result: no" >&5 echo "${ECHO_T}no" >&6 fi @@ -1191,7 +1197,7 @@ fi if test -z "$CC"; then # Extract the first word of "cc", so it can be a program name with args. set dummy cc; ac_word=$2 -echo "$as_me:1194: checking for $ac_word" >&5 +echo "$as_me:1200: checking for $ac_word" >&5 echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6 if test "${ac_cv_prog_CC+set}" = set; then echo $ECHO_N "(cached) $ECHO_C" >&6 @@ -1211,7 +1217,7 @@ if test "$ac_dir/$ac_word" = "/usr/ucb/cc"; then continue fi ac_cv_prog_CC="cc" -echo "$as_me:1214: found $ac_dir/$ac_word" >&5 +echo "$as_me:1220: found $ac_dir/$ac_word" >&5 break done @@ -1233,10 +1239,10 @@ fi fi CC=$ac_cv_prog_CC if test -n "$CC"; then - echo "$as_me:1236: result: $CC" >&5 + echo "$as_me:1242: result: $CC" >&5 echo "${ECHO_T}$CC" >&6 else - echo "$as_me:1239: result: no" >&5 + echo "$as_me:1245: result: no" >&5 echo "${ECHO_T}no" >&6 fi @@ -1247,7 +1253,7 @@ if test -z "$CC"; then do # Extract the first word of "$ac_tool_prefix$ac_prog", so it can be a program name with args. set dummy $ac_tool_prefix$ac_prog; ac_word=$2 -echo "$as_me:1250: checking for $ac_word" >&5 +echo "$as_me:1256: checking for $ac_word" >&5 echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6 if test "${ac_cv_prog_CC+set}" = set; then echo $ECHO_N "(cached) $ECHO_C" >&6 @@ -1262,7 +1268,7 @@ for ac_dir in $ac_dummy; do test -z "$ac_dir" && ac_dir=. $as_executable_p "$ac_dir/$ac_word" || continue ac_cv_prog_CC="$ac_tool_prefix$ac_prog" -echo "$as_me:1265: found $ac_dir/$ac_word" >&5 +echo "$as_me:1271: found $ac_dir/$ac_word" >&5 break done @@ -1270,10 +1276,10 @@ fi fi CC=$ac_cv_prog_CC if test -n "$CC"; then - echo "$as_me:1273: result: $CC" >&5 + echo "$as_me:1279: result: $CC" >&5 echo "${ECHO_T}$CC" >&6 else - echo "$as_me:1276: result: no" >&5 + echo "$as_me:1282: result: no" >&5 echo "${ECHO_T}no" >&6 fi @@ -1286,7 +1292,7 @@ if test -z "$CC"; then do # Extract the first word of "$ac_prog", so it can be a program name with args. set dummy $ac_prog; ac_word=$2 -echo "$as_me:1289: checking for $ac_word" >&5 +echo "$as_me:1295: checking for $ac_word" >&5 echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6 if test "${ac_cv_prog_ac_ct_CC+set}" = set; then echo $ECHO_N "(cached) $ECHO_C" >&6 @@ -1301,7 +1307,7 @@ for ac_dir in $ac_dummy; do test -z "$ac_dir" && ac_dir=. $as_executable_p "$ac_dir/$ac_word" || continue ac_cv_prog_ac_ct_CC="$ac_prog" -echo "$as_me:1304: found $ac_dir/$ac_word" >&5 +echo "$as_me:1310: found $ac_dir/$ac_word" >&5 break done @@ -1309,10 +1315,10 @@ fi fi ac_ct_CC=$ac_cv_prog_ac_ct_CC if test -n "$ac_ct_CC"; then - echo "$as_me:1312: result: $ac_ct_CC" >&5 + echo "$as_me:1318: result: $ac_ct_CC" >&5 echo "${ECHO_T}$ac_ct_CC" >&6 else - echo "$as_me:1315: result: no" >&5 + echo "$as_me:1321: result: no" >&5 echo "${ECHO_T}no" >&6 fi @@ -1324,32 +1330,32 @@ fi fi -test -z "$CC" && { { echo "$as_me:1327: error: no acceptable cc found in \$PATH" >&5 +test -z "$CC" && { { echo "$as_me:1333: error: no acceptable cc found in \$PATH" >&5 echo "$as_me: error: no acceptable cc found in \$PATH" >&2;} { (exit 1); exit 1; }; } # Provide some information about the compiler. -echo "$as_me:1332:" \ +echo "$as_me:1338:" \ "checking for C compiler version" >&5 ac_compiler=`set X $ac_compile; echo $2` -{ (eval echo "$as_me:1335: \"$ac_compiler --version </dev/null >&5\"") >&5 +{ (eval echo "$as_me:1341: \"$ac_compiler --version </dev/null >&5\"") >&5 (eval $ac_compiler --version </dev/null >&5) 2>&5 ac_status=$? - echo "$as_me:1338: \$? = $ac_status" >&5 + echo "$as_me:1344: \$? = $ac_status" >&5 (exit $ac_status); } -{ (eval echo "$as_me:1340: \"$ac_compiler -v </dev/null >&5\"") >&5 +{ (eval echo "$as_me:1346: \"$ac_compiler -v </dev/null >&5\"") >&5 (eval $ac_compiler -v </dev/null >&5) 2>&5 ac_status=$? - echo "$as_me:1343: \$? = $ac_status" >&5 + echo "$as_me:1349: \$? = $ac_status" >&5 (exit $ac_status); } -{ (eval echo "$as_me:1345: \"$ac_compiler -V </dev/null >&5\"") >&5 +{ (eval echo "$as_me:1351: \"$ac_compiler -V </dev/null >&5\"") >&5 (eval $ac_compiler -V </dev/null >&5) 2>&5 ac_status=$? - echo "$as_me:1348: \$? = $ac_status" >&5 + echo "$as_me:1354: \$? = $ac_status" >&5 (exit $ac_status); } cat >conftest.$ac_ext <<_ACEOF -#line 1352 "configure" +#line 1358 "configure" #include "confdefs.h" int @@ -1365,13 +1371,13 @@ ac_clean_files="$ac_clean_files a.out a.exe" # Try to create an executable without -o first, disregard a.out. # It will help us diagnose broken compilers, and finding out an intuition # of exeext. -echo "$as_me:1368: checking for C compiler default output" >&5 +echo "$as_me:1374: checking for C compiler default output" >&5 echo $ECHO_N "checking for C compiler default output... $ECHO_C" >&6 ac_link_default=`echo "$ac_link" | sed 's/ -o *conftest[^ ]*//'` -if { (eval echo "$as_me:1371: \"$ac_link_default\"") >&5 +if { (eval echo "$as_me:1377: \"$ac_link_default\"") >&5 (eval $ac_link_default) 2>&5 ac_status=$? - echo "$as_me:1374: \$? = $ac_status" >&5 + echo "$as_me:1380: \$? = $ac_status" >&5 (exit $ac_status); }; then # Find the output, starting from the most likely. This scheme is # not robust to junk in `.', hence go to wildcards (a.*) only as a last @@ -1394,34 +1400,34 @@ done else echo "$as_me: failed program was:" >&5 cat conftest.$ac_ext >&5 -{ { echo "$as_me:1397: error: C compiler cannot create executables" >&5 +{ { echo "$as_me:1403: error: C compiler cannot create executables" >&5 echo "$as_me: error: C compiler cannot create executables" >&2;} { (exit 77); exit 77; }; } fi ac_exeext=$ac_cv_exeext -echo "$as_me:1403: result: $ac_file" >&5 +echo "$as_me:1409: result: $ac_file" >&5 echo "${ECHO_T}$ac_file" >&6 # Check the compiler produces executables we can run. If not, either # the compiler is broken, or we cross compile. -echo "$as_me:1408: checking whether the C compiler works" >&5 +echo "$as_me:1414: checking whether the C compiler works" >&5 echo $ECHO_N "checking whether the C compiler works... $ECHO_C" >&6 # FIXME: These cross compiler hacks should be removed for Autoconf 3.0 # If not cross compiling, check that we can run a simple program. if test "$cross_compiling" != yes; then if { ac_try='./$ac_file' - { (eval echo "$as_me:1414: \"$ac_try\"") >&5 + { (eval echo "$as_me:1420: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? - echo "$as_me:1417: \$? = $ac_status" >&5 + echo "$as_me:1423: \$? = $ac_status" >&5 (exit $ac_status); }; }; then cross_compiling=no else if test "$cross_compiling" = maybe; then cross_compiling=yes else - { { echo "$as_me:1424: error: cannot run C compiled programs. + { { echo "$as_me:1430: error: cannot run C compiled programs. If you meant to cross compile, use \`--host'." >&5 echo "$as_me: error: cannot run C compiled programs. If you meant to cross compile, use \`--host'." >&2;} @@ -1429,24 +1435,24 @@ If you meant to cross compile, use \`--host'." >&2;} fi fi fi -echo "$as_me:1432: result: yes" >&5 +echo "$as_me:1438: result: yes" >&5 echo "${ECHO_T}yes" >&6 rm -f a.out a.exe conftest$ac_cv_exeext ac_clean_files=$ac_clean_files_save # Check the compiler produces executables we can run. If not, either # the compiler is broken, or we cross compile. -echo "$as_me:1439: checking whether we are cross compiling" >&5 +echo "$as_me:1445: checking whether we are cross compiling" >&5 echo $ECHO_N "checking whether we are cross compiling... $ECHO_C" >&6 -echo "$as_me:1441: result: $cross_compiling" >&5 +echo "$as_me:1447: result: $cross_compiling" >&5 echo "${ECHO_T}$cross_compiling" >&6 -echo "$as_me:1444: checking for executable suffix" >&5 +echo "$as_me:1450: checking for executable suffix" >&5 echo $ECHO_N "checking for executable suffix... $ECHO_C" >&6 -if { (eval echo "$as_me:1446: \"$ac_link\"") >&5 +if { (eval echo "$as_me:1452: \"$ac_link\"") >&5 (eval $ac_link) 2>&5 ac_status=$? - echo "$as_me:1449: \$? = $ac_status" >&5 + echo "$as_me:1455: \$? = $ac_status" >&5 (exit $ac_status); }; then # If both `conftest.exe' and `conftest' are `present' (well, observable) # catch `conftest.exe'. For instance with Cygwin, `ls conftest' will @@ -1462,25 +1468,25 @@ for ac_file in `(ls conftest.exe; ls conftest; ls conftest.*) 2>/dev/null`; do esac done else - { { echo "$as_me:1465: error: cannot compute EXEEXT: cannot compile and link" >&5 + { { echo "$as_me:1471: error: cannot compute EXEEXT: cannot compile and link" >&5 echo "$as_me: error: cannot compute EXEEXT: cannot compile and link" >&2;} { (exit 1); exit 1; }; } fi rm -f conftest$ac_cv_exeext -echo "$as_me:1471: result: $ac_cv_exeext" >&5 +echo "$as_me:1477: result: $ac_cv_exeext" >&5 echo "${ECHO_T}$ac_cv_exeext" >&6 rm -f conftest.$ac_ext EXEEXT=$ac_cv_exeext ac_exeext=$EXEEXT -echo "$as_me:1477: checking for object suffix" >&5 +echo "$as_me:1483: checking for object suffix" >&5 echo $ECHO_N "checking for object suffix... $ECHO_C" >&6 if test "${ac_cv_objext+set}" = set; then echo $ECHO_N "(cached) $ECHO_C" >&6 else cat >conftest.$ac_ext <<_ACEOF -#line 1483 "configure" +#line 1489 "configure" #include "confdefs.h" int @@ -1492,10 +1498,10 @@ main () } _ACEOF rm -f conftest.o conftest.obj -if { (eval echo "$as_me:1495: \"$ac_compile\"") >&5 +if { (eval echo "$as_me:1501: \"$ac_compile\"") >&5 (eval $ac_compile) 2>&5 ac_status=$? - echo "$as_me:1498: \$? = $ac_status" >&5 + echo "$as_me:1504: \$? = $ac_status" >&5 (exit $ac_status); }; then for ac_file in `(ls conftest.o conftest.obj; ls conftest.*) 2>/dev/null`; do case $ac_file in @@ -1507,24 +1513,24 @@ done else echo "$as_me: failed program was:" >&5 cat conftest.$ac_ext >&5 -{ { echo "$as_me:1510: error: cannot compute OBJEXT: cannot compile" >&5 +{ { echo "$as_me:1516: error: cannot compute OBJEXT: cannot compile" >&5 echo "$as_me: error: cannot compute OBJEXT: cannot compile" >&2;} { (exit 1); exit 1; }; } fi rm -f conftest.$ac_cv_objext conftest.$ac_ext fi -echo "$as_me:1517: result: $ac_cv_objext" >&5 +echo "$as_me:1523: result: $ac_cv_objext" >&5 echo "${ECHO_T}$ac_cv_objext" >&6 OBJEXT=$ac_cv_objext ac_objext=$OBJEXT -echo "$as_me:1521: checking whether we are using the GNU C compiler" >&5 +echo "$as_me:1527: checking whether we are using the GNU C compiler" >&5 echo $ECHO_N "checking whether we are using the GNU C compiler... $ECHO_C" >&6 if test "${ac_cv_c_compiler_gnu+set}" = set; then echo $ECHO_N "(cached) $ECHO_C" >&6 else cat >conftest.$ac_ext <<_ACEOF -#line 1527 "configure" +#line 1533 "configure" #include "confdefs.h" int @@ -1539,16 +1545,16 @@ main () } _ACEOF rm -f conftest.$ac_objext -if { (eval echo "$as_me:1542: \"$ac_compile\"") >&5 +if { (eval echo "$as_me:1548: \"$ac_compile\"") >&5 (eval $ac_compile) 2>&5 ac_status=$? - echo "$as_me:1545: \$? = $ac_status" >&5 + echo "$as_me:1551: \$? = $ac_status" >&5 (exit $ac_status); } && { ac_try='test -s conftest.$ac_objext' - { (eval echo "$as_me:1548: \"$ac_try\"") >&5 + { (eval echo "$as_me:1554: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? - echo "$as_me:1551: \$? = $ac_status" >&5 + echo "$as_me:1557: \$? = $ac_status" >&5 (exit $ac_status); }; }; then ac_compiler_gnu=yes else @@ -1560,19 +1566,19 @@ rm -f conftest.$ac_objext conftest.$ac_ext ac_cv_c_compiler_gnu=$ac_compiler_gnu fi -echo "$as_me:1563: result: $ac_cv_c_compiler_gnu" >&5 +echo "$as_me:1569: result: $ac_cv_c_compiler_gnu" >&5 echo "${ECHO_T}$ac_cv_c_compiler_gnu" >&6 GCC=`test $ac_compiler_gnu = yes && echo yes` ac_test_CFLAGS=${CFLAGS+set} ac_save_CFLAGS=$CFLAGS CFLAGS="-g" -echo "$as_me:1569: checking whether $CC accepts -g" >&5 +echo "$as_me:1575: checking whether $CC accepts -g" >&5 echo $ECHO_N "checking whether $CC accepts -g... $ECHO_C" >&6 if test "${ac_cv_prog_cc_g+set}" = set; then echo $ECHO_N "(cached) $ECHO_C" >&6 else cat >conftest.$ac_ext <<_ACEOF -#line 1575 "configure" +#line 1581 "configure" #include "confdefs.h" int @@ -1584,16 +1590,16 @@ main () } _ACEOF rm -f conftest.$ac_objext -if { (eval echo "$as_me:1587: \"$ac_compile\"") >&5 +if { (eval echo "$as_me:1593: \"$ac_compile\"") >&5 (eval $ac_compile) 2>&5 ac_status=$? - echo "$as_me:1590: \$? = $ac_status" >&5 + echo "$as_me:1596: \$? = $ac_status" >&5 (exit $ac_status); } && { ac_try='test -s conftest.$ac_objext' - { (eval echo "$as_me:1593: \"$ac_try\"") >&5 + { (eval echo "$as_me:1599: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? - echo "$as_me:1596: \$? = $ac_status" >&5 + echo "$as_me:1602: \$? = $ac_status" >&5 (exit $ac_status); }; }; then ac_cv_prog_cc_g=yes else @@ -1603,7 +1609,7 @@ ac_cv_prog_cc_g=no fi rm -f conftest.$ac_objext conftest.$ac_ext fi -echo "$as_me:1606: result: $ac_cv_prog_cc_g" >&5 +echo "$as_me:1612: result: $ac_cv_prog_cc_g" >&5 echo "${ECHO_T}$ac_cv_prog_cc_g" >&6 if test "$ac_test_CFLAGS" = set; then CFLAGS=$ac_save_CFLAGS @@ -1630,16 +1636,16 @@ cat >conftest.$ac_ext <<_ACEOF #endif _ACEOF rm -f conftest.$ac_objext -if { (eval echo "$as_me:1633: \"$ac_compile\"") >&5 +if { (eval echo "$as_me:1639: \"$ac_compile\"") >&5 (eval $ac_compile) 2>&5 ac_status=$? - echo "$as_me:1636: \$? = $ac_status" >&5 + echo "$as_me:1642: \$? = $ac_status" >&5 (exit $ac_status); } && { ac_try='test -s conftest.$ac_objext' - { (eval echo "$as_me:1639: \"$ac_try\"") >&5 + { (eval echo "$as_me:1645: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? - echo "$as_me:1642: \$? = $ac_status" >&5 + echo "$as_me:1648: \$? = $ac_status" >&5 (exit $ac_status); }; }; then for ac_declaration in \ ''\ @@ -1651,7 +1657,7 @@ if { (eval echo "$as_me:1633: \"$ac_compile\"") >&5 'void exit (int);' do cat >conftest.$ac_ext <<_ACEOF -#line 1654 "configure" +#line 1660 "configure" #include "confdefs.h" #include <stdlib.h> $ac_declaration @@ -1664,16 +1670,16 @@ exit (42); } _ACEOF rm -f conftest.$ac_objext -if { (eval echo "$as_me:1667: \"$ac_compile\"") >&5 +if { (eval echo "$as_me:1673: \"$ac_compile\"") >&5 (eval $ac_compile) 2>&5 ac_status=$? - echo "$as_me:1670: \$? = $ac_status" >&5 + echo "$as_me:1676: \$? = $ac_status" >&5 (exit $ac_status); } && { ac_try='test -s conftest.$ac_objext' - { (eval echo "$as_me:1673: \"$ac_try\"") >&5 + { (eval echo "$as_me:1679: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? - echo "$as_me:1676: \$? = $ac_status" >&5 + echo "$as_me:1682: \$? = $ac_status" >&5 (exit $ac_status); }; }; then : else @@ -1683,7 +1689,7 @@ continue fi rm -f conftest.$ac_objext conftest.$ac_ext cat >conftest.$ac_ext <<_ACEOF -#line 1686 "configure" +#line 1692 "configure" #include "confdefs.h" $ac_declaration int @@ -1695,16 +1701,16 @@ exit (42); } _ACEOF rm -f conftest.$ac_objext -if { (eval echo "$as_me:1698: \"$ac_compile\"") >&5 +if { (eval echo "$as_me:1704: \"$ac_compile\"") >&5 (eval $ac_compile) 2>&5 ac_status=$? - echo "$as_me:1701: \$? = $ac_status" >&5 + echo "$as_me:1707: \$? = $ac_status" >&5 (exit $ac_status); } && { ac_try='test -s conftest.$ac_objext' - { (eval echo "$as_me:1704: \"$ac_try\"") >&5 + { (eval echo "$as_me:1710: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? - echo "$as_me:1707: \$? = $ac_status" >&5 + echo "$as_me:1713: \$? = $ac_status" >&5 (exit $ac_status); }; }; then break else @@ -1734,15 +1740,15 @@ ac_main_return=return GCC_VERSION=none if test "$GCC" = yes ; then - echo "$as_me:1737: checking version of $CC" >&5 + echo "$as_me:1743: checking version of $CC" >&5 echo $ECHO_N "checking version of $CC... $ECHO_C" >&6 GCC_VERSION="`${CC} --version 2>/dev/null | sed -e '2,$d' -e 's/^.*(GCC[^)]*) //' -e 's/^.*(Debian[^)]*) //' -e 's/^[^0-9.]*//' -e 's/[^0-9.].*//'`" test -z "$GCC_VERSION" && GCC_VERSION=unknown - echo "$as_me:1741: result: $GCC_VERSION" >&5 + echo "$as_me:1747: result: $GCC_VERSION" >&5 echo "${ECHO_T}$GCC_VERSION" >&6 fi -echo "$as_me:1745: checking for $CC option to accept ANSI C" >&5 +echo "$as_me:1751: checking for $CC option to accept ANSI C" >&5 echo $ECHO_N "checking for $CC option to accept ANSI C... $ECHO_C" >&6 if test "${ac_cv_prog_cc_stdc+set}" = set; then echo $ECHO_N "(cached) $ECHO_C" >&6 @@ -1750,7 +1756,7 @@ else ac_cv_prog_cc_stdc=no ac_save_CC=$CC cat >conftest.$ac_ext <<_ACEOF -#line 1753 "configure" +#line 1759 "configure" #include "confdefs.h" #include <stdarg.h> #include <stdio.h> @@ -1799,16 +1805,16 @@ for ac_arg in "" -qlanglvl=ansi -std1 -Ae "-Aa -D_HPUX_SOURCE" "-Xc -D__EXTENSIO do CC="$ac_save_CC $ac_arg" rm -f conftest.$ac_objext -if { (eval echo "$as_me:1802: \"$ac_compile\"") >&5 +if { (eval echo "$as_me:1808: \"$ac_compile\"") >&5 (eval $ac_compile) 2>&5 ac_status=$? - echo "$as_me:1805: \$? = $ac_status" >&5 + echo "$as_me:1811: \$? = $ac_status" >&5 (exit $ac_status); } && { ac_try='test -s conftest.$ac_objext' - { (eval echo "$as_me:1808: \"$ac_try\"") >&5 + { (eval echo "$as_me:1814: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? - echo "$as_me:1811: \$? = $ac_status" >&5 + echo "$as_me:1817: \$? = $ac_status" >&5 (exit $ac_status); }; }; then ac_cv_prog_cc_stdc=$ac_arg break @@ -1825,10 +1831,10 @@ fi case "x$ac_cv_prog_cc_stdc" in x|xno) - echo "$as_me:1828: result: none needed" >&5 + echo "$as_me:1834: result: none needed" >&5 echo "${ECHO_T}none needed" >&6 ;; *) - echo "$as_me:1831: result: $ac_cv_prog_cc_stdc" >&5 + echo "$as_me:1837: result: $ac_cv_prog_cc_stdc" >&5 echo "${ECHO_T}$ac_cv_prog_cc_stdc" >&6 CC="$CC $ac_cv_prog_cc_stdc" ;; esac @@ -1836,13 +1842,13 @@ esac # This should have been defined by AC_PROG_CC : ${CC:=cc} -echo "$as_me:1839: checking \$CC variable" >&5 +echo "$as_me:1845: checking \$CC variable" >&5 echo $ECHO_N "checking \$CC variable... $ECHO_C" >&6 case "$CC" in #(vi *[\ \ ]-[IUD]*) - echo "$as_me:1843: result: broken" >&5 + echo "$as_me:1849: result: broken" >&5 echo "${ECHO_T}broken" >&6 - { echo "$as_me:1845: WARNING: your environment misuses the CC variable to hold CFLAGS/CPPFLAGS options" >&5 + { echo "$as_me:1851: WARNING: your environment misuses the CC variable to hold CFLAGS/CPPFLAGS options" >&5 echo "$as_me: WARNING: your environment misuses the CC variable to hold CFLAGS/CPPFLAGS options" >&2;} # humor him... cf_flags=`echo "$CC" | sed -e 's/^[^ ]*[ ]//'` @@ -1928,7 +1934,7 @@ fi ;; *) - echo "$as_me:1931: result: ok" >&5 + echo "$as_me:1937: result: ok" >&5 echo "${ECHO_T}ok" >&6 ;; esac @@ -1939,7 +1945,7 @@ ac_compile='$CC -c $CFLAGS $CPPFLAGS conftest.$ac_ext >&5' ac_link='$CC -o conftest$ac_exeext $CFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5' ac_compiler_gnu=$ac_cv_c_compiler_gnu ac_main_return=return -echo "$as_me:1942: checking how to run the C preprocessor" >&5 +echo "$as_me:1948: checking how to run the C preprocessor" >&5 echo $ECHO_N "checking how to run the C preprocessor... $ECHO_C" >&6 # On Suns, sometimes $CPP names a directory. if test -n "$CPP" && test -d "$CPP"; then @@ -1960,18 +1966,18 @@ do # On the NeXT, cc -E runs the code through the compiler's parser, # not just through cpp. "Syntax error" is here to catch this case. cat >conftest.$ac_ext <<_ACEOF -#line 1963 "configure" +#line 1969 "configure" #include "confdefs.h" #include <assert.h> Syntax error _ACEOF -if { (eval echo "$as_me:1968: \"$ac_cpp conftest.$ac_ext\"") >&5 +if { (eval echo "$as_me:1974: \"$ac_cpp conftest.$ac_ext\"") >&5 (eval $ac_cpp conftest.$ac_ext) 2>conftest.er1 ac_status=$? egrep -v '^ *\+' conftest.er1 >conftest.err rm -f conftest.er1 cat conftest.err >&5 - echo "$as_me:1974: \$? = $ac_status" >&5 + echo "$as_me:1980: \$? = $ac_status" >&5 (exit $ac_status); } >/dev/null; then if test -s conftest.err; then ac_cpp_err=$ac_c_preproc_warn_flag @@ -1994,17 +2000,17 @@ rm -f conftest.err conftest.$ac_ext # OK, works on sane cases. Now check whether non-existent headers # can be detected and how. cat >conftest.$ac_ext <<_ACEOF -#line 1997 "configure" +#line 2003 "configure" #include "confdefs.h" #include <ac_nonexistent.h> _ACEOF -if { (eval echo "$as_me:2001: \"$ac_cpp conftest.$ac_ext\"") >&5 +if { (eval echo "$as_me:2007: \"$ac_cpp conftest.$ac_ext\"") >&5 (eval $ac_cpp conftest.$ac_ext) 2>conftest.er1 ac_status=$? egrep -v '^ *\+' conftest.er1 >conftest.err rm -f conftest.er1 cat conftest.err >&5 - echo "$as_me:2007: \$? = $ac_status" >&5 + echo "$as_me:2013: \$? = $ac_status" >&5 (exit $ac_status); } >/dev/null; then if test -s conftest.err; then ac_cpp_err=$ac_c_preproc_warn_flag @@ -2041,7 +2047,7 @@ fi else ac_cv_prog_CPP=$CPP fi -echo "$as_me:2044: result: $CPP" >&5 +echo "$as_me:2050: result: $CPP" >&5 echo "${ECHO_T}$CPP" >&6 ac_preproc_ok=false for ac_c_preproc_warn_flag in '' yes @@ -2051,18 +2057,18 @@ do # On the NeXT, cc -E runs the code through the compiler's parser, # not just through cpp. "Syntax error" is here to catch this case. cat >conftest.$ac_ext <<_ACEOF -#line 2054 "configure" +#line 2060 "configure" #include "confdefs.h" #include <assert.h> Syntax error _ACEOF -if { (eval echo "$as_me:2059: \"$ac_cpp conftest.$ac_ext\"") >&5 +if { (eval echo "$as_me:2065: \"$ac_cpp conftest.$ac_ext\"") >&5 (eval $ac_cpp conftest.$ac_ext) 2>conftest.er1 ac_status=$? egrep -v '^ *\+' conftest.er1 >conftest.err rm -f conftest.er1 cat conftest.err >&5 - echo "$as_me:2065: \$? = $ac_status" >&5 + echo "$as_me:2071: \$? = $ac_status" >&5 (exit $ac_status); } >/dev/null; then if test -s conftest.err; then ac_cpp_err=$ac_c_preproc_warn_flag @@ -2085,17 +2091,17 @@ rm -f conftest.err conftest.$ac_ext # OK, works on sane cases. Now check whether non-existent headers # can be detected and how. cat >conftest.$ac_ext <<_ACEOF -#line 2088 "configure" +#line 2094 "configure" #include "confdefs.h" #include <ac_nonexistent.h> _ACEOF -if { (eval echo "$as_me:2092: \"$ac_cpp conftest.$ac_ext\"") >&5 +if { (eval echo "$as_me:2098: \"$ac_cpp conftest.$ac_ext\"") >&5 (eval $ac_cpp conftest.$ac_ext) 2>conftest.er1 ac_status=$? egrep -v '^ *\+' conftest.er1 >conftest.err rm -f conftest.er1 cat conftest.err >&5 - echo "$as_me:2098: \$? = $ac_status" >&5 + echo "$as_me:2104: \$? = $ac_status" >&5 (exit $ac_status); } >/dev/null; then if test -s conftest.err; then ac_cpp_err=$ac_c_preproc_warn_flag @@ -2123,7 +2129,7 @@ rm -f conftest.err conftest.$ac_ext if $ac_preproc_ok; then : else - { { echo "$as_me:2126: error: C preprocessor \"$CPP\" fails sanity check" >&5 + { { echo "$as_me:2132: error: C preprocessor \"$CPP\" fails sanity check" >&5 echo "$as_me: error: C preprocessor \"$CPP\" fails sanity check" >&2;} { (exit 1); exit 1; }; } fi @@ -2135,7 +2141,7 @@ ac_link='$CC -o conftest$ac_exeext $CFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $ ac_compiler_gnu=$ac_cv_c_compiler_gnu ac_main_return=return -echo "$as_me:2138: checking whether ${MAKE-make} sets \${MAKE}" >&5 +echo "$as_me:2144: checking whether ${MAKE-make} sets \${MAKE}" >&5 echo $ECHO_N "checking whether ${MAKE-make} sets \${MAKE}... $ECHO_C" >&6 set dummy ${MAKE-make}; ac_make=`echo "$2" | sed 'y,./+-,__p_,'` if eval "test \"\${ac_cv_prog_make_${ac_make}_set+set}\" = set"; then @@ -2155,11 +2161,11 @@ fi rm -f conftest.make fi if eval "test \"`echo '$ac_cv_prog_make_'${ac_make}_set`\" = yes"; then - echo "$as_me:2158: result: yes" >&5 + echo "$as_me:2164: result: yes" >&5 echo "${ECHO_T}yes" >&6 SET_MAKE= else - echo "$as_me:2162: result: no" >&5 + echo "$as_me:2168: result: no" >&5 echo "${ECHO_T}no" >&6 SET_MAKE="MAKE=${MAKE-make}" fi @@ -2167,7 +2173,7 @@ fi if test -n "$ac_tool_prefix"; then # Extract the first word of "${ac_tool_prefix}ranlib", so it can be a program name with args. set dummy ${ac_tool_prefix}ranlib; ac_word=$2 -echo "$as_me:2170: checking for $ac_word" >&5 +echo "$as_me:2176: checking for $ac_word" >&5 echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6 if test "${ac_cv_prog_RANLIB+set}" = set; then echo $ECHO_N "(cached) $ECHO_C" >&6 @@ -2182,7 +2188,7 @@ for ac_dir in $ac_dummy; do test -z "$ac_dir" && ac_dir=. $as_executable_p "$ac_dir/$ac_word" || continue ac_cv_prog_RANLIB="${ac_tool_prefix}ranlib" -echo "$as_me:2185: found $ac_dir/$ac_word" >&5 +echo "$as_me:2191: found $ac_dir/$ac_word" >&5 break done @@ -2190,10 +2196,10 @@ fi fi RANLIB=$ac_cv_prog_RANLIB if test -n "$RANLIB"; then - echo "$as_me:2193: result: $RANLIB" >&5 + echo "$as_me:2199: result: $RANLIB" >&5 echo "${ECHO_T}$RANLIB" >&6 else - echo "$as_me:2196: result: no" >&5 + echo "$as_me:2202: result: no" >&5 echo "${ECHO_T}no" >&6 fi @@ -2202,7 +2208,7 @@ if test -z "$ac_cv_prog_RANLIB"; then ac_ct_RANLIB=$RANLIB # Extract the first word of "ranlib", so it can be a program name with args. set dummy ranlib; ac_word=$2 -echo "$as_me:2205: checking for $ac_word" >&5 +echo "$as_me:2211: checking for $ac_word" >&5 echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6 if test "${ac_cv_prog_ac_ct_RANLIB+set}" = set; then echo $ECHO_N "(cached) $ECHO_C" >&6 @@ -2217,7 +2223,7 @@ for ac_dir in $ac_dummy; do test -z "$ac_dir" && ac_dir=. $as_executable_p "$ac_dir/$ac_word" || continue ac_cv_prog_ac_ct_RANLIB="ranlib" -echo "$as_me:2220: found $ac_dir/$ac_word" >&5 +echo "$as_me:2226: found $ac_dir/$ac_word" >&5 break done @@ -2226,10 +2232,10 @@ fi fi ac_ct_RANLIB=$ac_cv_prog_ac_ct_RANLIB if test -n "$ac_ct_RANLIB"; then - echo "$as_me:2229: result: $ac_ct_RANLIB" >&5 + echo "$as_me:2235: result: $ac_ct_RANLIB" >&5 echo "${ECHO_T}$ac_ct_RANLIB" >&6 else - echo "$as_me:2232: result: no" >&5 + echo "$as_me:2238: result: no" >&5 echo "${ECHO_T}no" >&6 fi @@ -2255,7 +2261,7 @@ for ac_dir in $srcdir $srcdir/.. $srcdir/../..; do fi done if test -z "$ac_aux_dir"; then - { { echo "$as_me:2258: error: cannot find install-sh or install.sh in $srcdir $srcdir/.. $srcdir/../.." >&5 + { { echo "$as_me:2264: error: cannot find install-sh or install.sh in $srcdir $srcdir/.. $srcdir/../.." >&5 echo "$as_me: error: cannot find install-sh or install.sh in $srcdir $srcdir/.. $srcdir/../.." >&2;} { (exit 1); exit 1; }; } fi @@ -2275,7 +2281,7 @@ ac_configure="$SHELL $ac_aux_dir/configure" # This should be Cygnus configure. # AFS /usr/afsws/bin/install, which mishandles nonexistent args # SVR4 /usr/ucb/install, which tries to use the nonexistent group "staff" # ./install, which can be erroneously created by make from ./install.sh. -echo "$as_me:2278: checking for a BSD compatible install" >&5 +echo "$as_me:2284: checking for a BSD compatible install" >&5 echo $ECHO_N "checking for a BSD compatible install... $ECHO_C" >&6 if test -z "$INSTALL"; then if test "${ac_cv_path_install+set}" = set; then @@ -2324,7 +2330,7 @@ fi INSTALL=$ac_install_sh fi fi -echo "$as_me:2327: result: $INSTALL" >&5 +echo "$as_me:2333: result: $INSTALL" >&5 echo "${ECHO_T}$INSTALL" >&6 # Use test -z because SunOS4 sh mishandles braces in ${var-val}. @@ -2335,11 +2341,39 @@ test -z "$INSTALL_SCRIPT" && INSTALL_SCRIPT='${INSTALL}' test -z "$INSTALL_DATA" && INSTALL_DATA='${INSTALL} -m 644' +echo "$as_me:2344: checking whether ln -s works" >&5 +echo $ECHO_N "checking whether ln -s works... $ECHO_C" >&6 +LN_S=$as_ln_s +if test "$LN_S" = "ln -s"; then + echo "$as_me:2348: result: yes" >&5 +echo "${ECHO_T}yes" >&6 +else + echo "$as_me:2351: result: no, using $LN_S" >&5 +echo "${ECHO_T}no, using $LN_S" >&6 +fi + +echo "$as_me:2355: checking if $LN_S -f options work" >&5 +echo $ECHO_N "checking if $LN_S -f options work... $ECHO_C" >&6 + +rm -f conf$$.src conf$$dst +echo >conf$$.dst +echo first >conf$$.src +if $LN_S -f conf$$.src conf$$.dst 2>/dev/null; then + cf_prog_ln_sf=yes +else + cf_prog_ln_sf=no +fi +rm -f conf$$.dst conf$$src +echo "$as_me:2367: result: $cf_prog_ln_sf" >&5 +echo "${ECHO_T}$cf_prog_ln_sf" >&6 + +test "$cf_prog_ln_sf" = yes && LN_S="$LN_S -f" + for ac_prog in tdlint lint alint splint lclint do # Extract the first word of "$ac_prog", so it can be a program name with args. set dummy $ac_prog; ac_word=$2 -echo "$as_me:2342: checking for $ac_word" >&5 +echo "$as_me:2376: checking for $ac_word" >&5 echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6 if test "${ac_cv_prog_LINT+set}" = set; then echo $ECHO_N "(cached) $ECHO_C" >&6 @@ -2354,7 +2388,7 @@ for ac_dir in $ac_dummy; do test -z "$ac_dir" && ac_dir=. $as_executable_p "$ac_dir/$ac_word" || continue ac_cv_prog_LINT="$ac_prog" -echo "$as_me:2357: found $ac_dir/$ac_word" >&5 +echo "$as_me:2391: found $ac_dir/$ac_word" >&5 break done @@ -2362,10 +2396,10 @@ fi fi LINT=$ac_cv_prog_LINT if test -n "$LINT"; then - echo "$as_me:2365: result: $LINT" >&5 + echo "$as_me:2399: result: $LINT" >&5 echo "${ECHO_T}$LINT" >&6 else - echo "$as_me:2368: result: no" >&5 + echo "$as_me:2402: result: no" >&5 echo "${ECHO_T}no" >&6 fi @@ -2375,7 +2409,7 @@ done if test -n "$ac_tool_prefix"; then # Extract the first word of "${ac_tool_prefix}ar", so it can be a program name with args. set dummy ${ac_tool_prefix}ar; ac_word=$2 -echo "$as_me:2378: checking for $ac_word" >&5 +echo "$as_me:2412: checking for $ac_word" >&5 echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6 if test "${ac_cv_prog_AR+set}" = set; then echo $ECHO_N "(cached) $ECHO_C" >&6 @@ -2390,7 +2424,7 @@ for ac_dir in $ac_dummy; do test -z "$ac_dir" && ac_dir=. $as_executable_p "$ac_dir/$ac_word" || continue ac_cv_prog_AR="${ac_tool_prefix}ar" -echo "$as_me:2393: found $ac_dir/$ac_word" >&5 +echo "$as_me:2427: found $ac_dir/$ac_word" >&5 break done @@ -2398,10 +2432,10 @@ fi fi AR=$ac_cv_prog_AR if test -n "$AR"; then - echo "$as_me:2401: result: $AR" >&5 + echo "$as_me:2435: result: $AR" >&5 echo "${ECHO_T}$AR" >&6 else - echo "$as_me:2404: result: no" >&5 + echo "$as_me:2438: result: no" >&5 echo "${ECHO_T}no" >&6 fi @@ -2410,7 +2444,7 @@ if test -z "$ac_cv_prog_AR"; then ac_ct_AR=$AR # Extract the first word of "ar", so it can be a program name with args. set dummy ar; ac_word=$2 -echo "$as_me:2413: checking for $ac_word" >&5 +echo "$as_me:2447: checking for $ac_word" >&5 echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6 if test "${ac_cv_prog_ac_ct_AR+set}" = set; then echo $ECHO_N "(cached) $ECHO_C" >&6 @@ -2425,7 +2459,7 @@ for ac_dir in $ac_dummy; do test -z "$ac_dir" && ac_dir=. $as_executable_p "$ac_dir/$ac_word" || continue ac_cv_prog_ac_ct_AR="ar" -echo "$as_me:2428: found $ac_dir/$ac_word" >&5 +echo "$as_me:2462: found $ac_dir/$ac_word" >&5 break done @@ -2434,10 +2468,10 @@ fi fi ac_ct_AR=$ac_cv_prog_ac_ct_AR if test -n "$ac_ct_AR"; then - echo "$as_me:2437: result: $ac_ct_AR" >&5 + echo "$as_me:2471: result: $ac_ct_AR" >&5 echo "${ECHO_T}$ac_ct_AR" >&6 else - echo "$as_me:2440: result: no" >&5 + echo "$as_me:2474: result: no" >&5 echo "${ECHO_T}no" >&6 fi @@ -2446,7 +2480,7 @@ else AR="$ac_cv_prog_AR" fi -echo "$as_me:2449: checking for makeflags variable" >&5 +echo "$as_me:2483: checking for makeflags variable" >&5 echo $ECHO_N "checking for makeflags variable... $ECHO_C" >&6 if test "${cf_cv_makeflags+set}" = set; then echo $ECHO_N "(cached) $ECHO_C" >&6 @@ -2480,10 +2514,10 @@ CF_EOF rm -f cf_makeflags.tmp fi -echo "$as_me:2483: result: $cf_cv_makeflags" >&5 +echo "$as_me:2517: result: $cf_cv_makeflags" >&5 echo "${ECHO_T}$cf_cv_makeflags" >&6 -echo "$as_me:2486: checking if filesystem supports mixed-case filenames" >&5 +echo "$as_me:2520: checking if filesystem supports mixed-case filenames" >&5 echo $ECHO_N "checking if filesystem supports mixed-case filenames... $ECHO_C" >&6 if test "${cf_cv_mixedcase+set}" = set; then echo $ECHO_N "(cached) $ECHO_C" >&6 @@ -2491,7 +2525,7 @@ else if test "$cross_compiling" = yes ; then case $target_alias in #(vi - *-os2-emx*|*-msdosdjgpp*|*-cygwin*|*-mingw32*|*-uwin*) #(vi + *-os2-emx*|*-msdosdjgpp*|*-cygwin*|*-msys*|*-mingw32*|*-uwin*) #(vi cf_cv_mixedcase=no ;; *) @@ -2510,7 +2544,7 @@ else fi fi -echo "$as_me:2513: result: $cf_cv_mixedcase" >&5 +echo "$as_me:2547: result: $cf_cv_mixedcase" >&5 echo "${ECHO_T}$cf_cv_mixedcase" >&6 test "$cf_cv_mixedcase" = yes && cat >>confdefs.h <<\EOF @@ -2521,7 +2555,7 @@ for ac_prog in exctags ctags do # Extract the first word of "$ac_prog", so it can be a program name with args. set dummy $ac_prog; ac_word=$2 -echo "$as_me:2524: checking for $ac_word" >&5 +echo "$as_me:2558: checking for $ac_word" >&5 echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6 if test "${ac_cv_prog_CTAGS+set}" = set; then echo $ECHO_N "(cached) $ECHO_C" >&6 @@ -2536,7 +2570,7 @@ for ac_dir in $ac_dummy; do test -z "$ac_dir" && ac_dir=. $as_executable_p "$ac_dir/$ac_word" || continue ac_cv_prog_CTAGS="$ac_prog" -echo "$as_me:2539: found $ac_dir/$ac_word" >&5 +echo "$as_me:2573: found $ac_dir/$ac_word" >&5 break done @@ -2544,10 +2578,10 @@ fi fi CTAGS=$ac_cv_prog_CTAGS if test -n "$CTAGS"; then - echo "$as_me:2547: result: $CTAGS" >&5 + echo "$as_me:2581: result: $CTAGS" >&5 echo "${ECHO_T}$CTAGS" >&6 else - echo "$as_me:2550: result: no" >&5 + echo "$as_me:2584: result: no" >&5 echo "${ECHO_T}no" >&6 fi @@ -2558,7 +2592,7 @@ for ac_prog in exetags etags do # Extract the first word of "$ac_prog", so it can be a program name with args. set dummy $ac_prog; ac_word=$2 -echo "$as_me:2561: checking for $ac_word" >&5 +echo "$as_me:2595: checking for $ac_word" >&5 echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6 if test "${ac_cv_prog_ETAGS+set}" = set; then echo $ECHO_N "(cached) $ECHO_C" >&6 @@ -2573,7 +2607,7 @@ for ac_dir in $ac_dummy; do test -z "$ac_dir" && ac_dir=. $as_executable_p "$ac_dir/$ac_word" || continue ac_cv_prog_ETAGS="$ac_prog" -echo "$as_me:2576: found $ac_dir/$ac_word" >&5 +echo "$as_me:2610: found $ac_dir/$ac_word" >&5 break done @@ -2581,10 +2615,10 @@ fi fi ETAGS=$ac_cv_prog_ETAGS if test -n "$ETAGS"; then - echo "$as_me:2584: result: $ETAGS" >&5 + echo "$as_me:2618: result: $ETAGS" >&5 echo "${ECHO_T}$ETAGS" >&6 else - echo "$as_me:2587: result: no" >&5 + echo "$as_me:2621: result: no" >&5 echo "${ECHO_T}no" >&6 fi @@ -2593,7 +2627,7 @@ done # Extract the first word of "${CTAGS:-ctags}", so it can be a program name with args. set dummy ${CTAGS:-ctags}; ac_word=$2 -echo "$as_me:2596: checking for $ac_word" >&5 +echo "$as_me:2630: checking for $ac_word" >&5 echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6 if test "${ac_cv_prog_MAKE_LOWER_TAGS+set}" = set; then echo $ECHO_N "(cached) $ECHO_C" >&6 @@ -2608,7 +2642,7 @@ for ac_dir in $ac_dummy; do test -z "$ac_dir" && ac_dir=. $as_executable_p "$ac_dir/$ac_word" || continue ac_cv_prog_MAKE_LOWER_TAGS="yes" -echo "$as_me:2611: found $ac_dir/$ac_word" >&5 +echo "$as_me:2645: found $ac_dir/$ac_word" >&5 break done @@ -2617,17 +2651,17 @@ fi fi MAKE_LOWER_TAGS=$ac_cv_prog_MAKE_LOWER_TAGS if test -n "$MAKE_LOWER_TAGS"; then - echo "$as_me:2620: result: $MAKE_LOWER_TAGS" >&5 + echo "$as_me:2654: result: $MAKE_LOWER_TAGS" >&5 echo "${ECHO_T}$MAKE_LOWER_TAGS" >&6 else - echo "$as_me:2623: result: no" >&5 + echo "$as_me:2657: result: no" >&5 echo "${ECHO_T}no" >&6 fi if test "$cf_cv_mixedcase" = yes ; then # Extract the first word of "${ETAGS:-etags}", so it can be a program name with args. set dummy ${ETAGS:-etags}; ac_word=$2 -echo "$as_me:2630: checking for $ac_word" >&5 +echo "$as_me:2664: checking for $ac_word" >&5 echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6 if test "${ac_cv_prog_MAKE_UPPER_TAGS+set}" = set; then echo $ECHO_N "(cached) $ECHO_C" >&6 @@ -2642,7 +2676,7 @@ for ac_dir in $ac_dummy; do test -z "$ac_dir" && ac_dir=. $as_executable_p "$ac_dir/$ac_word" || continue ac_cv_prog_MAKE_UPPER_TAGS="yes" -echo "$as_me:2645: found $ac_dir/$ac_word" >&5 +echo "$as_me:2679: found $ac_dir/$ac_word" >&5 break done @@ -2651,10 +2685,10 @@ fi fi MAKE_UPPER_TAGS=$ac_cv_prog_MAKE_UPPER_TAGS if test -n "$MAKE_UPPER_TAGS"; then - echo "$as_me:2654: result: $MAKE_UPPER_TAGS" >&5 + echo "$as_me:2688: result: $MAKE_UPPER_TAGS" >&5 echo "${ECHO_T}$MAKE_UPPER_TAGS" >&6 else - echo "$as_me:2657: result: no" >&5 + echo "$as_me:2691: result: no" >&5 echo "${ECHO_T}no" >&6 fi @@ -2674,7 +2708,7 @@ else MAKE_LOWER_TAGS="#" fi -echo "$as_me:2677: checking if you want to see long compiling messages" >&5 +echo "$as_me:2711: checking if you want to see long compiling messages" >&5 echo $ECHO_N "checking if you want to see long compiling messages... $ECHO_C" >&6 # Check whether --enable-echo or --disable-echo was given. @@ -2708,16 +2742,16 @@ else ECHO_CC='' fi; -echo "$as_me:2711: result: $enableval" >&5 +echo "$as_me:2745: result: $enableval" >&5 echo "${ECHO_T}$enableval" >&6 # Make sure we can run config.sub. $ac_config_sub sun4 >/dev/null 2>&1 || - { { echo "$as_me:2716: error: cannot run $ac_config_sub" >&5 + { { echo "$as_me:2750: error: cannot run $ac_config_sub" >&5 echo "$as_me: error: cannot run $ac_config_sub" >&2;} { (exit 1); exit 1; }; } -echo "$as_me:2720: checking build system type" >&5 +echo "$as_me:2754: checking build system type" >&5 echo $ECHO_N "checking build system type... $ECHO_C" >&6 if test "${ac_cv_build+set}" = set; then echo $ECHO_N "(cached) $ECHO_C" >&6 @@ -2726,16 +2760,16 @@ else test -z "$ac_cv_build_alias" && ac_cv_build_alias=`$ac_config_guess` test -z "$ac_cv_build_alias" && - { { echo "$as_me:2729: error: cannot guess build type; you must specify one" >&5 + { { echo "$as_me:2763: error: cannot guess build type; you must specify one" >&5 echo "$as_me: error: cannot guess build type; you must specify one" >&2;} { (exit 1); exit 1; }; } ac_cv_build=`$ac_config_sub $ac_cv_build_alias` || - { { echo "$as_me:2733: error: $ac_config_sub $ac_cv_build_alias failed." >&5 + { { echo "$as_me:2767: error: $ac_config_sub $ac_cv_build_alias failed." >&5 echo "$as_me: error: $ac_config_sub $ac_cv_build_alias failed." >&2;} { (exit 1); exit 1; }; } fi -echo "$as_me:2738: result: $ac_cv_build" >&5 +echo "$as_me:2772: result: $ac_cv_build" >&5 echo "${ECHO_T}$ac_cv_build" >&6 build=$ac_cv_build build_cpu=`echo $ac_cv_build | sed 's/^\([^-]*\)-\([^-]*\)-\(.*\)$/\1/'` @@ -2743,7 +2777,7 @@ build_vendor=`echo $ac_cv_build | sed 's/^\([^-]*\)-\([^-]*\)-\(.*\)$/\2/'` build_os=`echo $ac_cv_build | sed 's/^\([^-]*\)-\([^-]*\)-\(.*\)$/\3/'` if test -f $srcdir/config.guess || test -f $ac_aux_dir/config.guess ; then - echo "$as_me:2746: checking host system type" >&5 + echo "$as_me:2780: checking host system type" >&5 echo $ECHO_N "checking host system type... $ECHO_C" >&6 if test "${ac_cv_host+set}" = set; then echo $ECHO_N "(cached) $ECHO_C" >&6 @@ -2752,12 +2786,12 @@ else test -z "$ac_cv_host_alias" && ac_cv_host_alias=$ac_cv_build_alias ac_cv_host=`$ac_config_sub $ac_cv_host_alias` || - { { echo "$as_me:2755: error: $ac_config_sub $ac_cv_host_alias failed" >&5 + { { echo "$as_me:2789: error: $ac_config_sub $ac_cv_host_alias failed" >&5 echo "$as_me: error: $ac_config_sub $ac_cv_host_alias failed" >&2;} { (exit 1); exit 1; }; } fi -echo "$as_me:2760: result: $ac_cv_host" >&5 +echo "$as_me:2794: result: $ac_cv_host" >&5 echo "${ECHO_T}$ac_cv_host" >&6 host=$ac_cv_host host_cpu=`echo $ac_cv_host | sed 's/^\([^-]*\)-\([^-]*\)-\(.*\)$/\1/'` @@ -2783,13 +2817,13 @@ else fi test -z "$system_name" && system_name="$cf_cv_system_name" -test -n "$cf_cv_system_name" && echo "$as_me:2786: result: Configuring for $cf_cv_system_name" >&5 +test -n "$cf_cv_system_name" && echo "$as_me:2820: result: Configuring for $cf_cv_system_name" >&5 echo "${ECHO_T}Configuring for $cf_cv_system_name" >&6 if test ".$system_name" != ".$cf_cv_system_name" ; then - echo "$as_me:2790: result: Cached system name ($system_name) does not agree with actual ($cf_cv_system_name)" >&5 + echo "$as_me:2824: result: Cached system name ($system_name) does not agree with actual ($cf_cv_system_name)" >&5 echo "${ECHO_T}Cached system name ($system_name) does not agree with actual ($cf_cv_system_name)" >&6 - { { echo "$as_me:2792: error: \"Please remove config.cache and try again.\"" >&5 + { { echo "$as_me:2826: error: \"Please remove config.cache and try again.\"" >&5 echo "$as_me: error: \"Please remove config.cache and try again.\"" >&2;} { (exit 1); exit 1; }; } fi @@ -2812,14 +2846,14 @@ cat >>confdefs.h <<EOF #define PROG_EXT "$PROG_EXT" EOF - echo "$as_me:2815: checking for PATH separator" >&5 + echo "$as_me:2849: checking for PATH separator" >&5 echo $ECHO_N "checking for PATH separator... $ECHO_C" >&6 case $cf_cv_system_name in os2*) PATH_SEPARATOR=';' ;; *) ${PATH_SEPARATOR:=':'} ;; esac - echo "$as_me:2822: result: $PATH_SEPARATOR" >&5 + echo "$as_me:2856: result: $PATH_SEPARATOR" >&5 echo "${ECHO_T}$PATH_SEPARATOR" >&6 case $cf_cv_system_name in #(vi @@ -2838,7 +2872,7 @@ case $host_os in #(vi aix[4-7]*) #(vi cf_xopen_source="-D_ALL_SOURCE" ;; -cygwin) #(vi +cygwin|msys) #(vi cf_XOPEN_SOURCE=600 ;; darwin[0-8].*) #(vi @@ -2868,14 +2902,14 @@ irix[56].*) #(vi ;; linux*|gnu*|mint*|k*bsd*-gnu) #(vi -echo "$as_me:2871: checking if we must define _GNU_SOURCE" >&5 +echo "$as_me:2905: checking if we must define _GNU_SOURCE" >&5 echo $ECHO_N "checking if we must define _GNU_SOURCE... $ECHO_C" >&6 if test "${cf_cv_gnu_source+set}" = set; then echo $ECHO_N "(cached) $ECHO_C" >&6 else cat >conftest.$ac_ext <<_ACEOF -#line 2878 "configure" +#line 2912 "configure" #include "confdefs.h" #include <sys/types.h> int @@ -2890,16 +2924,16 @@ make an error } _ACEOF rm -f conftest.$ac_objext -if { (eval echo "$as_me:2893: \"$ac_compile\"") >&5 +if { (eval echo "$as_me:2927: \"$ac_compile\"") >&5 (eval $ac_compile) 2>&5 ac_status=$? - echo "$as_me:2896: \$? = $ac_status" >&5 + echo "$as_me:2930: \$? = $ac_status" >&5 (exit $ac_status); } && { ac_try='test -s conftest.$ac_objext' - { (eval echo "$as_me:2899: \"$ac_try\"") >&5 + { (eval echo "$as_me:2933: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? - echo "$as_me:2902: \$? = $ac_status" >&5 + echo "$as_me:2936: \$? = $ac_status" >&5 (exit $ac_status); }; }; then cf_cv_gnu_source=no else @@ -2908,7 +2942,7 @@ cat conftest.$ac_ext >&5 cf_save="$CPPFLAGS" CPPFLAGS="$CPPFLAGS -D_GNU_SOURCE" cat >conftest.$ac_ext <<_ACEOF -#line 2911 "configure" +#line 2945 "configure" #include "confdefs.h" #include <sys/types.h> int @@ -2923,16 +2957,16 @@ make an error } _ACEOF rm -f conftest.$ac_objext -if { (eval echo "$as_me:2926: \"$ac_compile\"") >&5 +if { (eval echo "$as_me:2960: \"$ac_compile\"") >&5 (eval $ac_compile) 2>&5 ac_status=$? - echo "$as_me:2929: \$? = $ac_status" >&5 + echo "$as_me:2963: \$? = $ac_status" >&5 (exit $ac_status); } && { ac_try='test -s conftest.$ac_objext' - { (eval echo "$as_me:2932: \"$ac_try\"") >&5 + { (eval echo "$as_me:2966: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? - echo "$as_me:2935: \$? = $ac_status" >&5 + echo "$as_me:2969: \$? = $ac_status" >&5 (exit $ac_status); }; }; then cf_cv_gnu_source=no else @@ -2947,7 +2981,7 @@ fi rm -f conftest.$ac_objext conftest.$ac_ext fi -echo "$as_me:2950: result: $cf_cv_gnu_source" >&5 +echo "$as_me:2984: result: $cf_cv_gnu_source" >&5 echo "${ECHO_T}$cf_cv_gnu_source" >&6 test "$cf_cv_gnu_source" = yes && CPPFLAGS="$CPPFLAGS -D_GNU_SOURCE" @@ -2969,16 +3003,16 @@ cf_trim_CPPFLAGS=`echo "$cf_save_CPPFLAGS" | \ sed -e 's/-[UD]'"_POSIX_C_SOURCE"'\(=[^ ]*\)\?[ ]/ /g' \ -e 's/-[UD]'"_POSIX_C_SOURCE"'\(=[^ ]*\)\?$//g'` -echo "$as_me:2972: checking if we should define _POSIX_C_SOURCE" >&5 +echo "$as_me:3006: checking if we should define _POSIX_C_SOURCE" >&5 echo $ECHO_N "checking if we should define _POSIX_C_SOURCE... $ECHO_C" >&6 if test "${cf_cv_posix_c_source+set}" = set; then echo $ECHO_N "(cached) $ECHO_C" >&6 else -echo "${as_me:-configure}:2978: testing if the symbol is already defined go no further ..." 1>&5 +echo "${as_me:-configure}:3012: testing if the symbol is already defined go no further ..." 1>&5 cat >conftest.$ac_ext <<_ACEOF -#line 2981 "configure" +#line 3015 "configure" #include "confdefs.h" #include <sys/types.h> int @@ -2993,16 +3027,16 @@ make an error } _ACEOF rm -f conftest.$ac_objext -if { (eval echo "$as_me:2996: \"$ac_compile\"") >&5 +if { (eval echo "$as_me:3030: \"$ac_compile\"") >&5 (eval $ac_compile) 2>&5 ac_status=$? - echo "$as_me:2999: \$? = $ac_status" >&5 + echo "$as_me:3033: \$? = $ac_status" >&5 (exit $ac_status); } && { ac_try='test -s conftest.$ac_objext' - { (eval echo "$as_me:3002: \"$ac_try\"") >&5 + { (eval echo "$as_me:3036: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? - echo "$as_me:3005: \$? = $ac_status" >&5 + echo "$as_me:3039: \$? = $ac_status" >&5 (exit $ac_status); }; }; then cf_cv_posix_c_source=no else @@ -3023,7 +3057,7 @@ cf_want_posix_source=no esac if test "$cf_want_posix_source" = yes ; then cat >conftest.$ac_ext <<_ACEOF -#line 3026 "configure" +#line 3060 "configure" #include "confdefs.h" #include <sys/types.h> int @@ -3038,16 +3072,16 @@ make an error } _ACEOF rm -f conftest.$ac_objext -if { (eval echo "$as_me:3041: \"$ac_compile\"") >&5 +if { (eval echo "$as_me:3075: \"$ac_compile\"") >&5 (eval $ac_compile) 2>&5 ac_status=$? - echo "$as_me:3044: \$? = $ac_status" >&5 + echo "$as_me:3078: \$? = $ac_status" >&5 (exit $ac_status); } && { ac_try='test -s conftest.$ac_objext' - { (eval echo "$as_me:3047: \"$ac_try\"") >&5 + { (eval echo "$as_me:3081: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? - echo "$as_me:3050: \$? = $ac_status" >&5 + echo "$as_me:3084: \$? = $ac_status" >&5 (exit $ac_status); }; }; then : else @@ -3058,15 +3092,15 @@ fi rm -f conftest.$ac_objext conftest.$ac_ext fi -echo "${as_me:-configure}:3061: testing ifdef from value $cf_POSIX_C_SOURCE ..." 1>&5 +echo "${as_me:-configure}:3095: testing ifdef from value $cf_POSIX_C_SOURCE ..." 1>&5 CFLAGS="$cf_trim_CFLAGS" CPPFLAGS="$cf_trim_CPPFLAGS $cf_cv_posix_c_source" -echo "${as_me:-configure}:3066: testing if the second compile does not leave our definition intact error ..." 1>&5 +echo "${as_me:-configure}:3100: testing if the second compile does not leave our definition intact error ..." 1>&5 cat >conftest.$ac_ext <<_ACEOF -#line 3069 "configure" +#line 3103 "configure" #include "confdefs.h" #include <sys/types.h> int @@ -3081,16 +3115,16 @@ make an error } _ACEOF rm -f conftest.$ac_objext -if { (eval echo "$as_me:3084: \"$ac_compile\"") >&5 +if { (eval echo "$as_me:3118: \"$ac_compile\"") >&5 (eval $ac_compile) 2>&5 ac_status=$? - echo "$as_me:3087: \$? = $ac_status" >&5 + echo "$as_me:3121: \$? = $ac_status" >&5 (exit $ac_status); } && { ac_try='test -s conftest.$ac_objext' - { (eval echo "$as_me:3090: \"$ac_try\"") >&5 + { (eval echo "$as_me:3124: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? - echo "$as_me:3093: \$? = $ac_status" >&5 + echo "$as_me:3127: \$? = $ac_status" >&5 (exit $ac_status); }; }; then : else @@ -3106,7 +3140,7 @@ fi rm -f conftest.$ac_objext conftest.$ac_ext fi -echo "$as_me:3109: result: $cf_cv_posix_c_source" >&5 +echo "$as_me:3143: result: $cf_cv_posix_c_source" >&5 echo "${ECHO_T}$cf_cv_posix_c_source" >&6 if test "$cf_cv_posix_c_source" != no ; then @@ -3219,14 +3253,14 @@ solaris2.*) #(vi ;; *) -echo "$as_me:3222: checking if we should define _XOPEN_SOURCE" >&5 +echo "$as_me:3256: checking if we should define _XOPEN_SOURCE" >&5 echo $ECHO_N "checking if we should define _XOPEN_SOURCE... $ECHO_C" >&6 if test "${cf_cv_xopen_source+set}" = set; then echo $ECHO_N "(cached) $ECHO_C" >&6 else cat >conftest.$ac_ext <<_ACEOF -#line 3229 "configure" +#line 3263 "configure" #include "confdefs.h" #include <stdlib.h> @@ -3245,16 +3279,16 @@ make an error } _ACEOF rm -f conftest.$ac_objext -if { (eval echo "$as_me:3248: \"$ac_compile\"") >&5 +if { (eval echo "$as_me:3282: \"$ac_compile\"") >&5 (eval $ac_compile) 2>&5 ac_status=$? - echo "$as_me:3251: \$? = $ac_status" >&5 + echo "$as_me:3285: \$? = $ac_status" >&5 (exit $ac_status); } && { ac_try='test -s conftest.$ac_objext' - { (eval echo "$as_me:3254: \"$ac_try\"") >&5 + { (eval echo "$as_me:3288: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? - echo "$as_me:3257: \$? = $ac_status" >&5 + echo "$as_me:3291: \$? = $ac_status" >&5 (exit $ac_status); }; }; then cf_cv_xopen_source=no else @@ -3263,7 +3297,7 @@ cat conftest.$ac_ext >&5 cf_save="$CPPFLAGS" CPPFLAGS="$CPPFLAGS -D_XOPEN_SOURCE=$cf_XOPEN_SOURCE" cat >conftest.$ac_ext <<_ACEOF -#line 3266 "configure" +#line 3300 "configure" #include "confdefs.h" #include <stdlib.h> @@ -3282,16 +3316,16 @@ make an error } _ACEOF rm -f conftest.$ac_objext -if { (eval echo "$as_me:3285: \"$ac_compile\"") >&5 +if { (eval echo "$as_me:3319: \"$ac_compile\"") >&5 (eval $ac_compile) 2>&5 ac_status=$? - echo "$as_me:3288: \$? = $ac_status" >&5 + echo "$as_me:3322: \$? = $ac_status" >&5 (exit $ac_status); } && { ac_try='test -s conftest.$ac_objext' - { (eval echo "$as_me:3291: \"$ac_try\"") >&5 + { (eval echo "$as_me:3325: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? - echo "$as_me:3294: \$? = $ac_status" >&5 + echo "$as_me:3328: \$? = $ac_status" >&5 (exit $ac_status); }; }; then cf_cv_xopen_source=no else @@ -3306,7 +3340,7 @@ fi rm -f conftest.$ac_objext conftest.$ac_ext fi -echo "$as_me:3309: result: $cf_cv_xopen_source" >&5 +echo "$as_me:3343: result: $cf_cv_xopen_source" >&5 echo "${ECHO_T}$cf_cv_xopen_source" >&6 if test "$cf_cv_xopen_source" != no ; then @@ -3414,16 +3448,16 @@ cf_trim_CPPFLAGS=`echo "$cf_save_CPPFLAGS" | \ sed -e 's/-[UD]'"_POSIX_C_SOURCE"'\(=[^ ]*\)\?[ ]/ /g' \ -e 's/-[UD]'"_POSIX_C_SOURCE"'\(=[^ ]*\)\?$//g'` -echo "$as_me:3417: checking if we should define _POSIX_C_SOURCE" >&5 +echo "$as_me:3451: checking if we should define _POSIX_C_SOURCE" >&5 echo $ECHO_N "checking if we should define _POSIX_C_SOURCE... $ECHO_C" >&6 if test "${cf_cv_posix_c_source+set}" = set; then echo $ECHO_N "(cached) $ECHO_C" >&6 else -echo "${as_me:-configure}:3423: testing if the symbol is already defined go no further ..." 1>&5 +echo "${as_me:-configure}:3457: testing if the symbol is already defined go no further ..." 1>&5 cat >conftest.$ac_ext <<_ACEOF -#line 3426 "configure" +#line 3460 "configure" #include "confdefs.h" #include <sys/types.h> int @@ -3438,16 +3472,16 @@ make an error } _ACEOF rm -f conftest.$ac_objext -if { (eval echo "$as_me:3441: \"$ac_compile\"") >&5 +if { (eval echo "$as_me:3475: \"$ac_compile\"") >&5 (eval $ac_compile) 2>&5 ac_status=$? - echo "$as_me:3444: \$? = $ac_status" >&5 + echo "$as_me:3478: \$? = $ac_status" >&5 (exit $ac_status); } && { ac_try='test -s conftest.$ac_objext' - { (eval echo "$as_me:3447: \"$ac_try\"") >&5 + { (eval echo "$as_me:3481: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? - echo "$as_me:3450: \$? = $ac_status" >&5 + echo "$as_me:3484: \$? = $ac_status" >&5 (exit $ac_status); }; }; then cf_cv_posix_c_source=no else @@ -3468,7 +3502,7 @@ cf_want_posix_source=no esac if test "$cf_want_posix_source" = yes ; then cat >conftest.$ac_ext <<_ACEOF -#line 3471 "configure" +#line 3505 "configure" #include "confdefs.h" #include <sys/types.h> int @@ -3483,16 +3517,16 @@ make an error } _ACEOF rm -f conftest.$ac_objext -if { (eval echo "$as_me:3486: \"$ac_compile\"") >&5 +if { (eval echo "$as_me:3520: \"$ac_compile\"") >&5 (eval $ac_compile) 2>&5 ac_status=$? - echo "$as_me:3489: \$? = $ac_status" >&5 + echo "$as_me:3523: \$? = $ac_status" >&5 (exit $ac_status); } && { ac_try='test -s conftest.$ac_objext' - { (eval echo "$as_me:3492: \"$ac_try\"") >&5 + { (eval echo "$as_me:3526: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? - echo "$as_me:3495: \$? = $ac_status" >&5 + echo "$as_me:3529: \$? = $ac_status" >&5 (exit $ac_status); }; }; then : else @@ -3503,15 +3537,15 @@ fi rm -f conftest.$ac_objext conftest.$ac_ext fi -echo "${as_me:-configure}:3506: testing ifdef from value $cf_POSIX_C_SOURCE ..." 1>&5 +echo "${as_me:-configure}:3540: testing ifdef from value $cf_POSIX_C_SOURCE ..." 1>&5 CFLAGS="$cf_trim_CFLAGS" CPPFLAGS="$cf_trim_CPPFLAGS $cf_cv_posix_c_source" -echo "${as_me:-configure}:3511: testing if the second compile does not leave our definition intact error ..." 1>&5 +echo "${as_me:-configure}:3545: testing if the second compile does not leave our definition intact error ..." 1>&5 cat >conftest.$ac_ext <<_ACEOF -#line 3514 "configure" +#line 3548 "configure" #include "confdefs.h" #include <sys/types.h> int @@ -3526,16 +3560,16 @@ make an error } _ACEOF rm -f conftest.$ac_objext -if { (eval echo "$as_me:3529: \"$ac_compile\"") >&5 +if { (eval echo "$as_me:3563: \"$ac_compile\"") >&5 (eval $ac_compile) 2>&5 ac_status=$? - echo "$as_me:3532: \$? = $ac_status" >&5 + echo "$as_me:3566: \$? = $ac_status" >&5 (exit $ac_status); } && { ac_try='test -s conftest.$ac_objext' - { (eval echo "$as_me:3535: \"$ac_try\"") >&5 + { (eval echo "$as_me:3569: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? - echo "$as_me:3538: \$? = $ac_status" >&5 + echo "$as_me:3572: \$? = $ac_status" >&5 (exit $ac_status); }; }; then : else @@ -3551,7 +3585,7 @@ fi rm -f conftest.$ac_objext conftest.$ac_ext fi -echo "$as_me:3554: result: $cf_cv_posix_c_source" >&5 +echo "$as_me:3588: result: $cf_cv_posix_c_source" >&5 echo "${ECHO_T}$cf_cv_posix_c_source" >&6 if test "$cf_cv_posix_c_source" != no ; then @@ -3724,10 +3758,10 @@ fi fi if test -n "$cf_XOPEN_SOURCE" && test -z "$cf_cv_xopen_source" ; then - echo "$as_me:3727: checking if _XOPEN_SOURCE really is set" >&5 + echo "$as_me:3761: checking if _XOPEN_SOURCE really is set" >&5 echo $ECHO_N "checking if _XOPEN_SOURCE really is set... $ECHO_C" >&6 cat >conftest.$ac_ext <<_ACEOF -#line 3730 "configure" +#line 3764 "configure" #include "confdefs.h" #include <stdlib.h> int @@ -3742,16 +3776,16 @@ make an error } _ACEOF rm -f conftest.$ac_objext -if { (eval echo "$as_me:3745: \"$ac_compile\"") >&5 +if { (eval echo "$as_me:3779: \"$ac_compile\"") >&5 (eval $ac_compile) 2>&5 ac_status=$? - echo "$as_me:3748: \$? = $ac_status" >&5 + echo "$as_me:3782: \$? = $ac_status" >&5 (exit $ac_status); } && { ac_try='test -s conftest.$ac_objext' - { (eval echo "$as_me:3751: \"$ac_try\"") >&5 + { (eval echo "$as_me:3785: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? - echo "$as_me:3754: \$? = $ac_status" >&5 + echo "$as_me:3788: \$? = $ac_status" >&5 (exit $ac_status); }; }; then cf_XOPEN_SOURCE_set=yes else @@ -3760,12 +3794,12 @@ cat conftest.$ac_ext >&5 cf_XOPEN_SOURCE_set=no fi rm -f conftest.$ac_objext conftest.$ac_ext - echo "$as_me:3763: result: $cf_XOPEN_SOURCE_set" >&5 + echo "$as_me:3797: result: $cf_XOPEN_SOURCE_set" >&5 echo "${ECHO_T}$cf_XOPEN_SOURCE_set" >&6 if test $cf_XOPEN_SOURCE_set = yes then cat >conftest.$ac_ext <<_ACEOF -#line 3768 "configure" +#line 3802 "configure" #include "confdefs.h" #include <stdlib.h> int @@ -3780,16 +3814,16 @@ make an error } _ACEOF rm -f conftest.$ac_objext -if { (eval echo "$as_me:3783: \"$ac_compile\"") >&5 +if { (eval echo "$as_me:3817: \"$ac_compile\"") >&5 (eval $ac_compile) 2>&5 ac_status=$? - echo "$as_me:3786: \$? = $ac_status" >&5 + echo "$as_me:3820: \$? = $ac_status" >&5 (exit $ac_status); } && { ac_try='test -s conftest.$ac_objext' - { (eval echo "$as_me:3789: \"$ac_try\"") >&5 + { (eval echo "$as_me:3823: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? - echo "$as_me:3792: \$? = $ac_status" >&5 + echo "$as_me:3826: \$? = $ac_status" >&5 (exit $ac_status); }; }; then cf_XOPEN_SOURCE_set_ok=yes else @@ -3800,19 +3834,19 @@ fi rm -f conftest.$ac_objext conftest.$ac_ext if test $cf_XOPEN_SOURCE_set_ok = no then - { echo "$as_me:3803: WARNING: _XOPEN_SOURCE is lower than requested" >&5 + { echo "$as_me:3837: WARNING: _XOPEN_SOURCE is lower than requested" >&5 echo "$as_me: WARNING: _XOPEN_SOURCE is lower than requested" >&2;} fi else -echo "$as_me:3808: checking if we should define _XOPEN_SOURCE" >&5 +echo "$as_me:3842: checking if we should define _XOPEN_SOURCE" >&5 echo $ECHO_N "checking if we should define _XOPEN_SOURCE... $ECHO_C" >&6 if test "${cf_cv_xopen_source+set}" = set; then echo $ECHO_N "(cached) $ECHO_C" >&6 else cat >conftest.$ac_ext <<_ACEOF -#line 3815 "configure" +#line 3849 "configure" #include "confdefs.h" #include <stdlib.h> @@ -3831,16 +3865,16 @@ make an error } _ACEOF rm -f conftest.$ac_objext -if { (eval echo "$as_me:3834: \"$ac_compile\"") >&5 +if { (eval echo "$as_me:3868: \"$ac_compile\"") >&5 (eval $ac_compile) 2>&5 ac_status=$? - echo "$as_me:3837: \$? = $ac_status" >&5 + echo "$as_me:3871: \$? = $ac_status" >&5 (exit $ac_status); } && { ac_try='test -s conftest.$ac_objext' - { (eval echo "$as_me:3840: \"$ac_try\"") >&5 + { (eval echo "$as_me:3874: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? - echo "$as_me:3843: \$? = $ac_status" >&5 + echo "$as_me:3877: \$? = $ac_status" >&5 (exit $ac_status); }; }; then cf_cv_xopen_source=no else @@ -3849,7 +3883,7 @@ cat conftest.$ac_ext >&5 cf_save="$CPPFLAGS" CPPFLAGS="$CPPFLAGS -D_XOPEN_SOURCE=$cf_XOPEN_SOURCE" cat >conftest.$ac_ext <<_ACEOF -#line 3852 "configure" +#line 3886 "configure" #include "confdefs.h" #include <stdlib.h> @@ -3868,16 +3902,16 @@ make an error } _ACEOF rm -f conftest.$ac_objext -if { (eval echo "$as_me:3871: \"$ac_compile\"") >&5 +if { (eval echo "$as_me:3905: \"$ac_compile\"") >&5 (eval $ac_compile) 2>&5 ac_status=$? - echo "$as_me:3874: \$? = $ac_status" >&5 + echo "$as_me:3908: \$? = $ac_status" >&5 (exit $ac_status); } && { ac_try='test -s conftest.$ac_objext' - { (eval echo "$as_me:3877: \"$ac_try\"") >&5 + { (eval echo "$as_me:3911: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? - echo "$as_me:3880: \$? = $ac_status" >&5 + echo "$as_me:3914: \$? = $ac_status" >&5 (exit $ac_status); }; }; then cf_cv_xopen_source=no else @@ -3892,7 +3926,7 @@ fi rm -f conftest.$ac_objext conftest.$ac_ext fi -echo "$as_me:3895: result: $cf_cv_xopen_source" >&5 +echo "$as_me:3929: result: $cf_cv_xopen_source" >&5 echo "${ECHO_T}$cf_cv_xopen_source" >&6 if test "$cf_cv_xopen_source" != no ; then @@ -3997,7 +4031,7 @@ if test "${enable_largefile+set}" = set; then fi; if test "$enable_largefile" != no; then - echo "$as_me:4000: checking for special C compiler options needed for large files" >&5 + echo "$as_me:4034: checking for special C compiler options needed for large files" >&5 echo $ECHO_N "checking for special C compiler options needed for large files... $ECHO_C" >&6 if test "${ac_cv_sys_largefile_CC+set}" = set; then echo $ECHO_N "(cached) $ECHO_C" >&6 @@ -4009,7 +4043,7 @@ else # IRIX 6.2 and later do not support large files by default, # so use the C compiler's -n32 option if that helps. cat >conftest.$ac_ext <<_ACEOF -#line 4012 "configure" +#line 4046 "configure" #include "confdefs.h" #include <sys/types.h> /* Check that off_t can represent 2**63 - 1 correctly. @@ -4029,16 +4063,16 @@ main () } _ACEOF rm -f conftest.$ac_objext -if { (eval echo "$as_me:4032: \"$ac_compile\"") >&5 +if { (eval echo "$as_me:4066: \"$ac_compile\"") >&5 (eval $ac_compile) 2>&5 ac_status=$? - echo "$as_me:4035: \$? = $ac_status" >&5 + echo "$as_me:4069: \$? = $ac_status" >&5 (exit $ac_status); } && { ac_try='test -s conftest.$ac_objext' - { (eval echo "$as_me:4038: \"$ac_try\"") >&5 + { (eval echo "$as_me:4072: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? - echo "$as_me:4041: \$? = $ac_status" >&5 + echo "$as_me:4075: \$? = $ac_status" >&5 (exit $ac_status); }; }; then break else @@ -4048,16 +4082,16 @@ fi rm -f conftest.$ac_objext CC="$CC -n32" rm -f conftest.$ac_objext -if { (eval echo "$as_me:4051: \"$ac_compile\"") >&5 +if { (eval echo "$as_me:4085: \"$ac_compile\"") >&5 (eval $ac_compile) 2>&5 ac_status=$? - echo "$as_me:4054: \$? = $ac_status" >&5 + echo "$as_me:4088: \$? = $ac_status" >&5 (exit $ac_status); } && { ac_try='test -s conftest.$ac_objext' - { (eval echo "$as_me:4057: \"$ac_try\"") >&5 + { (eval echo "$as_me:4091: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? - echo "$as_me:4060: \$? = $ac_status" >&5 + echo "$as_me:4094: \$? = $ac_status" >&5 (exit $ac_status); }; }; then ac_cv_sys_largefile_CC=' -n32'; break else @@ -4071,13 +4105,13 @@ rm -f conftest.$ac_objext rm -f conftest.$ac_ext fi fi -echo "$as_me:4074: result: $ac_cv_sys_largefile_CC" >&5 +echo "$as_me:4108: result: $ac_cv_sys_largefile_CC" >&5 echo "${ECHO_T}$ac_cv_sys_largefile_CC" >&6 if test "$ac_cv_sys_largefile_CC" != no; then CC=$CC$ac_cv_sys_largefile_CC fi - echo "$as_me:4080: checking for _FILE_OFFSET_BITS value needed for large files" >&5 + echo "$as_me:4114: checking for _FILE_OFFSET_BITS value needed for large files" >&5 echo $ECHO_N "checking for _FILE_OFFSET_BITS value needed for large files... $ECHO_C" >&6 if test "${ac_cv_sys_file_offset_bits+set}" = set; then echo $ECHO_N "(cached) $ECHO_C" >&6 @@ -4085,7 +4119,7 @@ else while :; do ac_cv_sys_file_offset_bits=no cat >conftest.$ac_ext <<_ACEOF -#line 4088 "configure" +#line 4122 "configure" #include "confdefs.h" #include <sys/types.h> /* Check that off_t can represent 2**63 - 1 correctly. @@ -4105,16 +4139,16 @@ main () } _ACEOF rm -f conftest.$ac_objext -if { (eval echo "$as_me:4108: \"$ac_compile\"") >&5 +if { (eval echo "$as_me:4142: \"$ac_compile\"") >&5 (eval $ac_compile) 2>&5 ac_status=$? - echo "$as_me:4111: \$? = $ac_status" >&5 + echo "$as_me:4145: \$? = $ac_status" >&5 (exit $ac_status); } && { ac_try='test -s conftest.$ac_objext' - { (eval echo "$as_me:4114: \"$ac_try\"") >&5 + { (eval echo "$as_me:4148: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? - echo "$as_me:4117: \$? = $ac_status" >&5 + echo "$as_me:4151: \$? = $ac_status" >&5 (exit $ac_status); }; }; then break else @@ -4123,7 +4157,7 @@ cat conftest.$ac_ext >&5 fi rm -f conftest.$ac_objext conftest.$ac_ext cat >conftest.$ac_ext <<_ACEOF -#line 4126 "configure" +#line 4160 "configure" #include "confdefs.h" #define _FILE_OFFSET_BITS 64 #include <sys/types.h> @@ -4144,16 +4178,16 @@ main () } _ACEOF rm -f conftest.$ac_objext -if { (eval echo "$as_me:4147: \"$ac_compile\"") >&5 +if { (eval echo "$as_me:4181: \"$ac_compile\"") >&5 (eval $ac_compile) 2>&5 ac_status=$? - echo "$as_me:4150: \$? = $ac_status" >&5 + echo "$as_me:4184: \$? = $ac_status" >&5 (exit $ac_status); } && { ac_try='test -s conftest.$ac_objext' - { (eval echo "$as_me:4153: \"$ac_try\"") >&5 + { (eval echo "$as_me:4187: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? - echo "$as_me:4156: \$? = $ac_status" >&5 + echo "$as_me:4190: \$? = $ac_status" >&5 (exit $ac_status); }; }; then ac_cv_sys_file_offset_bits=64; break else @@ -4164,7 +4198,7 @@ rm -f conftest.$ac_objext conftest.$ac_ext break done fi -echo "$as_me:4167: result: $ac_cv_sys_file_offset_bits" >&5 +echo "$as_me:4201: result: $ac_cv_sys_file_offset_bits" >&5 echo "${ECHO_T}$ac_cv_sys_file_offset_bits" >&6 if test "$ac_cv_sys_file_offset_bits" != no; then @@ -4174,7 +4208,7 @@ EOF fi rm -rf conftest* - echo "$as_me:4177: checking for _LARGE_FILES value needed for large files" >&5 + echo "$as_me:4211: checking for _LARGE_FILES value needed for large files" >&5 echo $ECHO_N "checking for _LARGE_FILES value needed for large files... $ECHO_C" >&6 if test "${ac_cv_sys_large_files+set}" = set; then echo $ECHO_N "(cached) $ECHO_C" >&6 @@ -4182,7 +4216,7 @@ else while :; do ac_cv_sys_large_files=no cat >conftest.$ac_ext <<_ACEOF -#line 4185 "configure" +#line 4219 "configure" #include "confdefs.h" #include <sys/types.h> /* Check that off_t can represent 2**63 - 1 correctly. @@ -4202,16 +4236,16 @@ main () } _ACEOF rm -f conftest.$ac_objext -if { (eval echo "$as_me:4205: \"$ac_compile\"") >&5 +if { (eval echo "$as_me:4239: \"$ac_compile\"") >&5 (eval $ac_compile) 2>&5 ac_status=$? - echo "$as_me:4208: \$? = $ac_status" >&5 + echo "$as_me:4242: \$? = $ac_status" >&5 (exit $ac_status); } && { ac_try='test -s conftest.$ac_objext' - { (eval echo "$as_me:4211: \"$ac_try\"") >&5 + { (eval echo "$as_me:4245: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? - echo "$as_me:4214: \$? = $ac_status" >&5 + echo "$as_me:4248: \$? = $ac_status" >&5 (exit $ac_status); }; }; then break else @@ -4220,7 +4254,7 @@ cat conftest.$ac_ext >&5 fi rm -f conftest.$ac_objext conftest.$ac_ext cat >conftest.$ac_ext <<_ACEOF -#line 4223 "configure" +#line 4257 "configure" #include "confdefs.h" #define _LARGE_FILES 1 #include <sys/types.h> @@ -4241,16 +4275,16 @@ main () } _ACEOF rm -f conftest.$ac_objext -if { (eval echo "$as_me:4244: \"$ac_compile\"") >&5 +if { (eval echo "$as_me:4278: \"$ac_compile\"") >&5 (eval $ac_compile) 2>&5 ac_status=$? - echo "$as_me:4247: \$? = $ac_status" >&5 + echo "$as_me:4281: \$? = $ac_status" >&5 (exit $ac_status); } && { ac_try='test -s conftest.$ac_objext' - { (eval echo "$as_me:4250: \"$ac_try\"") >&5 + { (eval echo "$as_me:4284: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? - echo "$as_me:4253: \$? = $ac_status" >&5 + echo "$as_me:4287: \$? = $ac_status" >&5 (exit $ac_status); }; }; then ac_cv_sys_large_files=1; break else @@ -4261,7 +4295,7 @@ rm -f conftest.$ac_objext conftest.$ac_ext break done fi -echo "$as_me:4264: result: $ac_cv_sys_large_files" >&5 +echo "$as_me:4298: result: $ac_cv_sys_large_files" >&5 echo "${ECHO_T}$ac_cv_sys_large_files" >&6 if test "$ac_cv_sys_large_files" != no; then @@ -4274,7 +4308,7 @@ rm -rf conftest* fi if test "$enable_largefile" != no ; then - echo "$as_me:4277: checking for _LARGEFILE_SOURCE value needed for large files" >&5 + echo "$as_me:4311: checking for _LARGEFILE_SOURCE value needed for large files" >&5 echo $ECHO_N "checking for _LARGEFILE_SOURCE value needed for large files... $ECHO_C" >&6 if test "${ac_cv_sys_largefile_source+set}" = set; then echo $ECHO_N "(cached) $ECHO_C" >&6 @@ -4282,7 +4316,7 @@ else while :; do ac_cv_sys_largefile_source=no cat >conftest.$ac_ext <<_ACEOF -#line 4285 "configure" +#line 4319 "configure" #include "confdefs.h" #include <stdio.h> int @@ -4294,16 +4328,16 @@ return !fseeko; } _ACEOF rm -f conftest.$ac_objext -if { (eval echo "$as_me:4297: \"$ac_compile\"") >&5 +if { (eval echo "$as_me:4331: \"$ac_compile\"") >&5 (eval $ac_compile) 2>&5 ac_status=$? - echo "$as_me:4300: \$? = $ac_status" >&5 + echo "$as_me:4334: \$? = $ac_status" >&5 (exit $ac_status); } && { ac_try='test -s conftest.$ac_objext' - { (eval echo "$as_me:4303: \"$ac_try\"") >&5 + { (eval echo "$as_me:4337: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? - echo "$as_me:4306: \$? = $ac_status" >&5 + echo "$as_me:4340: \$? = $ac_status" >&5 (exit $ac_status); }; }; then break else @@ -4312,7 +4346,7 @@ cat conftest.$ac_ext >&5 fi rm -f conftest.$ac_objext conftest.$ac_ext cat >conftest.$ac_ext <<_ACEOF -#line 4315 "configure" +#line 4349 "configure" #include "confdefs.h" #define _LARGEFILE_SOURCE 1 #include <stdio.h> @@ -4325,16 +4359,16 @@ return !fseeko; } _ACEOF rm -f conftest.$ac_objext -if { (eval echo "$as_me:4328: \"$ac_compile\"") >&5 +if { (eval echo "$as_me:4362: \"$ac_compile\"") >&5 (eval $ac_compile) 2>&5 ac_status=$? - echo "$as_me:4331: \$? = $ac_status" >&5 + echo "$as_me:4365: \$? = $ac_status" >&5 (exit $ac_status); } && { ac_try='test -s conftest.$ac_objext' - { (eval echo "$as_me:4334: \"$ac_try\"") >&5 + { (eval echo "$as_me:4368: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? - echo "$as_me:4337: \$? = $ac_status" >&5 + echo "$as_me:4371: \$? = $ac_status" >&5 (exit $ac_status); }; }; then ac_cv_sys_largefile_source=1; break else @@ -4345,7 +4379,7 @@ rm -f conftest.$ac_objext conftest.$ac_ext break done fi -echo "$as_me:4348: result: $ac_cv_sys_largefile_source" >&5 +echo "$as_me:4382: result: $ac_cv_sys_largefile_source" >&5 echo "${ECHO_T}$ac_cv_sys_largefile_source" >&6 if test "$ac_cv_sys_largefile_source" != no; then @@ -4359,13 +4393,13 @@ rm -rf conftest* # We used to try defining _XOPEN_SOURCE=500 too, to work around a bug # in glibc 2.1.3, but that breaks too many other things. # If you want fseeko and ftello with glibc, upgrade to a fixed glibc. -echo "$as_me:4362: checking for fseeko" >&5 +echo "$as_me:4396: checking for fseeko" >&5 echo $ECHO_N "checking for fseeko... $ECHO_C" >&6 if test "${ac_cv_func_fseeko+set}" = set; then echo $ECHO_N "(cached) $ECHO_C" >&6 else cat >conftest.$ac_ext <<_ACEOF -#line 4368 "configure" +#line 4402 "configure" #include "confdefs.h" #include <stdio.h> int @@ -4377,16 +4411,16 @@ return fseeko && fseeko (stdin, 0, 0); } _ACEOF rm -f conftest.$ac_objext conftest$ac_exeext -if { (eval echo "$as_me:4380: \"$ac_link\"") >&5 +if { (eval echo "$as_me:4414: \"$ac_link\"") >&5 (eval $ac_link) 2>&5 ac_status=$? - echo "$as_me:4383: \$? = $ac_status" >&5 + echo "$as_me:4417: \$? = $ac_status" >&5 (exit $ac_status); } && { ac_try='test -s conftest$ac_exeext' - { (eval echo "$as_me:4386: \"$ac_try\"") >&5 + { (eval echo "$as_me:4420: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? - echo "$as_me:4389: \$? = $ac_status" >&5 + echo "$as_me:4423: \$? = $ac_status" >&5 (exit $ac_status); }; }; then ac_cv_func_fseeko=yes else @@ -4396,7 +4430,7 @@ ac_cv_func_fseeko=no fi rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext fi -echo "$as_me:4399: result: $ac_cv_func_fseeko" >&5 +echo "$as_me:4433: result: $ac_cv_func_fseeko" >&5 echo "${ECHO_T}$ac_cv_func_fseeko" >&6 if test $ac_cv_func_fseeko = yes; then @@ -4417,14 +4451,14 @@ fi test "$ac_cv_sys_largefile_source" != no && CPPFLAGS="$CPPFLAGS -D_LARGEFILE_SOURCE " test "$ac_cv_sys_file_offset_bits" != no && CPPFLAGS="$CPPFLAGS -D_FILE_OFFSET_BITS=$ac_cv_sys_file_offset_bits " - echo "$as_me:4420: checking whether to use struct dirent64" >&5 + echo "$as_me:4454: checking whether to use struct dirent64" >&5 echo $ECHO_N "checking whether to use struct dirent64... $ECHO_C" >&6 if test "${cf_cv_struct_dirent64+set}" = set; then echo $ECHO_N "(cached) $ECHO_C" >&6 else cat >conftest.$ac_ext <<_ACEOF -#line 4427 "configure" +#line 4461 "configure" #include "confdefs.h" #include <sys/types.h> @@ -4445,16 +4479,16 @@ main () } _ACEOF rm -f conftest.$ac_objext -if { (eval echo "$as_me:4448: \"$ac_compile\"") >&5 +if { (eval echo "$as_me:4482: \"$ac_compile\"") >&5 (eval $ac_compile) 2>&5 ac_status=$? - echo "$as_me:4451: \$? = $ac_status" >&5 + echo "$as_me:4485: \$? = $ac_status" >&5 (exit $ac_status); } && { ac_try='test -s conftest.$ac_objext' - { (eval echo "$as_me:4454: \"$ac_try\"") >&5 + { (eval echo "$as_me:4488: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? - echo "$as_me:4457: \$? = $ac_status" >&5 + echo "$as_me:4491: \$? = $ac_status" >&5 (exit $ac_status); }; }; then cf_cv_struct_dirent64=yes else @@ -4465,7 +4499,7 @@ fi rm -f conftest.$ac_objext conftest.$ac_ext fi -echo "$as_me:4468: result: $cf_cv_struct_dirent64" >&5 +echo "$as_me:4502: result: $cf_cv_struct_dirent64" >&5 echo "${ECHO_T}$cf_cv_struct_dirent64" >&6 test "$cf_cv_struct_dirent64" = yes && cat >>confdefs.h <<\EOF @@ -4476,7 +4510,7 @@ EOF if ( test "$GCC" = yes || test "$GXX" = yes ) then -echo "$as_me:4479: checking if you want to check for gcc warnings" >&5 +echo "$as_me:4513: checking if you want to check for gcc warnings" >&5 echo $ECHO_N "checking if you want to check for gcc warnings... $ECHO_C" >&6 # Check whether --with-warnings or --without-warnings was given. @@ -4486,7 +4520,7 @@ if test "${with_warnings+set}" = set; then else cf_opt_with_warnings=no fi; -echo "$as_me:4489: result: $cf_opt_with_warnings" >&5 +echo "$as_me:4523: result: $cf_opt_with_warnings" >&5 echo "${ECHO_T}$cf_opt_with_warnings" >&6 if test "$cf_opt_with_warnings" != no ; then @@ -4508,10 +4542,10 @@ cat > conftest.i <<EOF EOF if test "$GCC" = yes then - { echo "$as_me:4511: checking for $CC __attribute__ directives..." >&5 + { echo "$as_me:4545: checking for $CC __attribute__ directives..." >&5 echo "$as_me: checking for $CC __attribute__ directives..." >&6;} cat > conftest.$ac_ext <<EOF -#line 4514 "${as_me:-configure}" +#line 4548 "${as_me:-configure}" #include "confdefs.h" #include "conftest.h" #include "conftest.i" @@ -4560,12 +4594,12 @@ EOF ;; esac - if { (eval echo "$as_me:4563: \"$ac_compile\"") >&5 + if { (eval echo "$as_me:4597: \"$ac_compile\"") >&5 (eval $ac_compile) 2>&5 ac_status=$? - echo "$as_me:4566: \$? = $ac_status" >&5 + echo "$as_me:4600: \$? = $ac_status" >&5 (exit $ac_status); }; then - test -n "$verbose" && echo "$as_me:4568: result: ... $cf_attribute" >&5 + test -n "$verbose" && echo "$as_me:4602: result: ... $cf_attribute" >&5 echo "${ECHO_T}... $cf_attribute" >&6 cat conftest.h >>confdefs.h case $cf_attribute in #(vi @@ -4629,12 +4663,12 @@ INTEL_COMPILER=no if test "$GCC" = yes ; then case $host_os in linux*|gnu*) - echo "$as_me:4632: checking if this is really Intel C compiler" >&5 + echo "$as_me:4666: checking if this is really Intel C compiler" >&5 echo $ECHO_N "checking if this is really Intel C compiler... $ECHO_C" >&6 cf_save_CFLAGS="$CFLAGS" CFLAGS="$CFLAGS -no-gcc" cat >conftest.$ac_ext <<_ACEOF -#line 4637 "configure" +#line 4671 "configure" #include "confdefs.h" int @@ -4651,16 +4685,16 @@ make an error } _ACEOF rm -f conftest.$ac_objext -if { (eval echo "$as_me:4654: \"$ac_compile\"") >&5 +if { (eval echo "$as_me:4688: \"$ac_compile\"") >&5 (eval $ac_compile) 2>&5 ac_status=$? - echo "$as_me:4657: \$? = $ac_status" >&5 + echo "$as_me:4691: \$? = $ac_status" >&5 (exit $ac_status); } && { ac_try='test -s conftest.$ac_objext' - { (eval echo "$as_me:4660: \"$ac_try\"") >&5 + { (eval echo "$as_me:4694: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? - echo "$as_me:4663: \$? = $ac_status" >&5 + echo "$as_me:4697: \$? = $ac_status" >&5 (exit $ac_status); }; }; then INTEL_COMPILER=yes cf_save_CFLAGS="$cf_save_CFLAGS -we147 -no-gcc" @@ -4671,7 +4705,7 @@ cat conftest.$ac_ext >&5 fi rm -f conftest.$ac_objext conftest.$ac_ext CFLAGS="$cf_save_CFLAGS" - echo "$as_me:4674: result: $INTEL_COMPILER" >&5 + echo "$as_me:4708: result: $INTEL_COMPILER" >&5 echo "${ECHO_T}$INTEL_COMPILER" >&6 ;; esac @@ -4680,12 +4714,12 @@ fi CLANG_COMPILER=no if test "$GCC" = yes ; then - echo "$as_me:4683: checking if this is really Clang C compiler" >&5 + echo "$as_me:4717: checking if this is really Clang C compiler" >&5 echo $ECHO_N "checking if this is really Clang C compiler... $ECHO_C" >&6 cf_save_CFLAGS="$CFLAGS" CFLAGS="$CFLAGS -Qunused-arguments" cat >conftest.$ac_ext <<_ACEOF -#line 4688 "configure" +#line 4722 "configure" #include "confdefs.h" int @@ -4702,16 +4736,16 @@ make an error } _ACEOF rm -f conftest.$ac_objext -if { (eval echo "$as_me:4705: \"$ac_compile\"") >&5 +if { (eval echo "$as_me:4739: \"$ac_compile\"") >&5 (eval $ac_compile) 2>&5 ac_status=$? - echo "$as_me:4708: \$? = $ac_status" >&5 + echo "$as_me:4742: \$? = $ac_status" >&5 (exit $ac_status); } && { ac_try='test -s conftest.$ac_objext' - { (eval echo "$as_me:4711: \"$ac_try\"") >&5 + { (eval echo "$as_me:4745: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? - echo "$as_me:4714: \$? = $ac_status" >&5 + echo "$as_me:4748: \$? = $ac_status" >&5 (exit $ac_status); }; }; then CLANG_COMPILER=yes cf_save_CFLAGS="$cf_save_CFLAGS -Qunused-arguments" @@ -4722,12 +4756,12 @@ cat conftest.$ac_ext >&5 fi rm -f conftest.$ac_objext conftest.$ac_ext CFLAGS="$cf_save_CFLAGS" - echo "$as_me:4725: result: $CLANG_COMPILER" >&5 + echo "$as_me:4759: result: $CLANG_COMPILER" >&5 echo "${ECHO_T}$CLANG_COMPILER" >&6 fi cat > conftest.$ac_ext <<EOF -#line 4730 "${as_me:-configure}" +#line 4764 "${as_me:-configure}" int main(int argc, char *argv[]) { return (argv[argc-1] == 0) ; } EOF @@ -4744,7 +4778,7 @@ then # remark #981: operands are evaluated in unspecified order # warning #279: controlling expression is constant - { echo "$as_me:4747: checking for $CC warning options..." >&5 + { echo "$as_me:4781: checking for $CC warning options..." >&5 echo "$as_me: checking for $CC warning options..." >&6;} cf_save_CFLAGS="$CFLAGS" EXTRA_CFLAGS="-Wall" @@ -4760,12 +4794,12 @@ echo "$as_me: checking for $CC warning options..." >&6;} wd981 do CFLAGS="$cf_save_CFLAGS $EXTRA_CFLAGS -$cf_opt" - if { (eval echo "$as_me:4763: \"$ac_compile\"") >&5 + if { (eval echo "$as_me:4797: \"$ac_compile\"") >&5 (eval $ac_compile) 2>&5 ac_status=$? - echo "$as_me:4766: \$? = $ac_status" >&5 + echo "$as_me:4800: \$? = $ac_status" >&5 (exit $ac_status); }; then - test -n "$verbose" && echo "$as_me:4768: result: ... -$cf_opt" >&5 + test -n "$verbose" && echo "$as_me:4802: result: ... -$cf_opt" >&5 echo "${ECHO_T}... -$cf_opt" >&6 EXTRA_CFLAGS="$EXTRA_CFLAGS -$cf_opt" fi @@ -4774,7 +4808,7 @@ echo "${ECHO_T}... -$cf_opt" >&6 elif test "$GCC" = yes then - { echo "$as_me:4777: checking for $CC warning options..." >&5 + { echo "$as_me:4811: checking for $CC warning options..." >&5 echo "$as_me: checking for $CC warning options..." >&6;} cf_save_CFLAGS="$CFLAGS" EXTRA_CFLAGS= @@ -4794,12 +4828,12 @@ echo "$as_me: checking for $CC warning options..." >&6;} Wundef $cf_warn_CONST do CFLAGS="$cf_save_CFLAGS $EXTRA_CFLAGS -$cf_opt" - if { (eval echo "$as_me:4797: \"$ac_compile\"") >&5 + if { (eval echo "$as_me:4831: \"$ac_compile\"") >&5 (eval $ac_compile) 2>&5 ac_status=$? - echo "$as_me:4800: \$? = $ac_status" >&5 + echo "$as_me:4834: \$? = $ac_status" >&5 (exit $ac_status); }; then - test -n "$verbose" && echo "$as_me:4802: result: ... -$cf_opt" >&5 + test -n "$verbose" && echo "$as_me:4836: result: ... -$cf_opt" >&5 echo "${ECHO_T}... -$cf_opt" >&6 case $cf_opt in #(vi Wcast-qual) #(vi @@ -4810,7 +4844,7 @@ echo "${ECHO_T}... -$cf_opt" >&6 [34].*) test -n "$verbose" && echo " feature is broken in gcc $GCC_VERSION" 1>&6 -echo "${as_me:-configure}:4813: testing feature is broken in gcc $GCC_VERSION ..." 1>&5 +echo "${as_me:-configure}:4847: testing feature is broken in gcc $GCC_VERSION ..." 1>&5 continue;; esac @@ -4820,7 +4854,7 @@ echo "${as_me:-configure}:4813: testing feature is broken in gcc $GCC_VERSION .. [12].*) test -n "$verbose" && echo " feature is broken in gcc $GCC_VERSION" 1>&6 -echo "${as_me:-configure}:4823: testing feature is broken in gcc $GCC_VERSION ..." 1>&5 +echo "${as_me:-configure}:4857: testing feature is broken in gcc $GCC_VERSION ..." 1>&5 continue;; esac @@ -4836,6 +4870,154 @@ rm -rf conftest* fi fi +echo "$as_me:4873: checking if you want to use pkg-config" >&5 +echo $ECHO_N "checking if you want to use pkg-config... $ECHO_C" >&6 + +# Check whether --with-pkg-config or --without-pkg-config was given. +if test "${with_pkg_config+set}" = set; then + withval="$with_pkg_config" + cf_pkg_config=$withval +else + cf_pkg_config=yes +fi; +echo "$as_me:4883: result: $cf_pkg_config" >&5 +echo "${ECHO_T}$cf_pkg_config" >&6 + +case $cf_pkg_config in #(vi +no) #(vi + PKG_CONFIG=none + ;; +yes) #(vi + +if test -n "$ac_tool_prefix"; then + # Extract the first word of "${ac_tool_prefix}pkg-config", so it can be a program name with args. +set dummy ${ac_tool_prefix}pkg-config; ac_word=$2 +echo "$as_me:4895: checking for $ac_word" >&5 +echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6 +if test "${ac_cv_path_PKG_CONFIG+set}" = set; then + echo $ECHO_N "(cached) $ECHO_C" >&6 +else + case $PKG_CONFIG in + [\\/]* | ?:[\\/]*) + ac_cv_path_PKG_CONFIG="$PKG_CONFIG" # Let the user override the test with a path. + ;; + *) + ac_save_IFS=$IFS; IFS=$ac_path_separator +ac_dummy="$PATH" +for ac_dir in $ac_dummy; do + IFS=$ac_save_IFS + test -z "$ac_dir" && ac_dir=. + if $as_executable_p "$ac_dir/$ac_word"; then + ac_cv_path_PKG_CONFIG="$ac_dir/$ac_word" + echo "$as_me:4912: found $ac_dir/$ac_word" >&5 + break +fi +done + + ;; +esac +fi +PKG_CONFIG=$ac_cv_path_PKG_CONFIG + +if test -n "$PKG_CONFIG"; then + echo "$as_me:4923: result: $PKG_CONFIG" >&5 +echo "${ECHO_T}$PKG_CONFIG" >&6 +else + echo "$as_me:4926: result: no" >&5 +echo "${ECHO_T}no" >&6 +fi + +fi +if test -z "$ac_cv_path_PKG_CONFIG"; then + ac_pt_PKG_CONFIG=$PKG_CONFIG + # Extract the first word of "pkg-config", so it can be a program name with args. +set dummy pkg-config; ac_word=$2 +echo "$as_me:4935: checking for $ac_word" >&5 +echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6 +if test "${ac_cv_path_ac_pt_PKG_CONFIG+set}" = set; then + echo $ECHO_N "(cached) $ECHO_C" >&6 +else + case $ac_pt_PKG_CONFIG in + [\\/]* | ?:[\\/]*) + ac_cv_path_ac_pt_PKG_CONFIG="$ac_pt_PKG_CONFIG" # Let the user override the test with a path. + ;; + *) + ac_save_IFS=$IFS; IFS=$ac_path_separator +ac_dummy="$PATH" +for ac_dir in $ac_dummy; do + IFS=$ac_save_IFS + test -z "$ac_dir" && ac_dir=. + if $as_executable_p "$ac_dir/$ac_word"; then + ac_cv_path_ac_pt_PKG_CONFIG="$ac_dir/$ac_word" + echo "$as_me:4952: found $ac_dir/$ac_word" >&5 + break +fi +done + + test -z "$ac_cv_path_ac_pt_PKG_CONFIG" && ac_cv_path_ac_pt_PKG_CONFIG="none" + ;; +esac +fi +ac_pt_PKG_CONFIG=$ac_cv_path_ac_pt_PKG_CONFIG + +if test -n "$ac_pt_PKG_CONFIG"; then + echo "$as_me:4964: result: $ac_pt_PKG_CONFIG" >&5 +echo "${ECHO_T}$ac_pt_PKG_CONFIG" >&6 +else + echo "$as_me:4967: result: no" >&5 +echo "${ECHO_T}no" >&6 +fi + + PKG_CONFIG=$ac_pt_PKG_CONFIG +else + PKG_CONFIG="$ac_cv_path_PKG_CONFIG" +fi + + ;; +*) + PKG_CONFIG=$withval + ;; +esac + +test -z "$PKG_CONFIG" && PKG_CONFIG=none +if test "$PKG_CONFIG" != none ; then + +if test "x$prefix" != xNONE; then + cf_path_syntax="$prefix" +else + cf_path_syntax="$ac_default_prefix" +fi + +case ".$PKG_CONFIG" in #(vi +.\$\(*\)*|.\'*\'*) #(vi + ;; +..|./*|.\\*) #(vi + ;; +.[a-zA-Z]:[\\/]*) #(vi OS/2 EMX + ;; +.\${*prefix}*|.\${*dir}*) #(vi + eval PKG_CONFIG="$PKG_CONFIG" + case ".$PKG_CONFIG" in #(vi + .NONE/*) + PKG_CONFIG=`echo $PKG_CONFIG | sed -e s%NONE%$cf_path_syntax%` + ;; + esac + ;; #(vi +.no|.NONE/*) + PKG_CONFIG=`echo $PKG_CONFIG | sed -e s%NONE%$cf_path_syntax%` + ;; +*) + { { echo "$as_me:5010: error: expected a pathname, not \"$PKG_CONFIG\"" >&5 +echo "$as_me: error: expected a pathname, not \"$PKG_CONFIG\"" >&2;} + { (exit 1); exit 1; }; } + ;; +esac + +fi + +echo "$as_me:5018: checking for this package's name" >&5 +echo $ECHO_N "checking for this package's name... $ECHO_C" >&6 + # Check whether --with-package or --without-package was given. if test "${with_package+set}" = set; then withval="$with_package" @@ -4843,9 +5025,11 @@ if test "${with_package+set}" = set; then else PACKAGE=dialog fi; +echo "$as_me:5028: result: $PACKAGE" >&5 +echo "${ECHO_T}$PACKAGE" >&6 if test -f $srcdir/VERSION ; then - echo "$as_me:4848: checking for package version" >&5 + echo "$as_me:5032: checking for package version" >&5 echo $ECHO_N "checking for package version... $ECHO_C" >&6 # if there are not enough fields, cut returns the last one... @@ -4857,59 +5041,59 @@ echo $ECHO_N "checking for package version... $ECHO_C" >&6 VERSION="$cf_field1" VERSION_MAJOR=`echo "$cf_field2" | sed -e 's/\..*//'` - test -z "$VERSION_MAJOR" && { { echo "$as_me:4860: error: missing major-version" >&5 + test -z "$VERSION_MAJOR" && { { echo "$as_me:5044: error: missing major-version" >&5 echo "$as_me: error: missing major-version" >&2;} { (exit 1); exit 1; }; } VERSION_MINOR=`echo "$cf_field2" | sed -e 's/^[^.]*\.//' -e 's/-.*//'` - test -z "$VERSION_MINOR" && { { echo "$as_me:4865: error: missing minor-version" >&5 + test -z "$VERSION_MINOR" && { { echo "$as_me:5049: error: missing minor-version" >&5 echo "$as_me: error: missing minor-version" >&2;} { (exit 1); exit 1; }; } - echo "$as_me:4869: result: ${VERSION_MAJOR}.${VERSION_MINOR}" >&5 + echo "$as_me:5053: result: ${VERSION_MAJOR}.${VERSION_MINOR}" >&5 echo "${ECHO_T}${VERSION_MAJOR}.${VERSION_MINOR}" >&6 - echo "$as_me:4872: checking for package patch date" >&5 + echo "$as_me:5056: checking for package patch date" >&5 echo $ECHO_N "checking for package patch date... $ECHO_C" >&6 VERSION_PATCH=`echo "$cf_field3" | sed -e 's/^[^-]*-//'` case .$VERSION_PATCH in .) - { { echo "$as_me:4877: error: missing patch-date $VERSION_PATCH" >&5 + { { echo "$as_me:5061: error: missing patch-date $VERSION_PATCH" >&5 echo "$as_me: error: missing patch-date $VERSION_PATCH" >&2;} { (exit 1); exit 1; }; } ;; .[0-9][0-9][0-9][0-9][0-9][0-9][0-9][0-9]) ;; *) - { { echo "$as_me:4884: error: illegal patch-date $VERSION_PATCH" >&5 + { { echo "$as_me:5068: error: illegal patch-date $VERSION_PATCH" >&5 echo "$as_me: error: illegal patch-date $VERSION_PATCH" >&2;} { (exit 1); exit 1; }; } ;; esac - echo "$as_me:4889: result: $VERSION_PATCH" >&5 + echo "$as_me:5073: result: $VERSION_PATCH" >&5 echo "${ECHO_T}$VERSION_PATCH" >&6 else - { { echo "$as_me:4892: error: did not find $srcdir/VERSION" >&5 + { { echo "$as_me:5076: error: did not find $srcdir/VERSION" >&5 echo "$as_me: error: did not find $srcdir/VERSION" >&2;} { (exit 1); exit 1; }; } fi # show the actual data that we have for versions: -test -n "$verbose" && echo " VERSION $VERSION" 1>&6 +test -n "$verbose" && echo " ABI VERSION $VERSION" 1>&6 -echo "${as_me:-configure}:4900: testing VERSION $VERSION ..." 1>&5 +echo "${as_me:-configure}:5084: testing ABI VERSION $VERSION ..." 1>&5 test -n "$verbose" && echo " VERSION_MAJOR $VERSION_MAJOR" 1>&6 -echo "${as_me:-configure}:4904: testing VERSION_MAJOR $VERSION_MAJOR ..." 1>&5 +echo "${as_me:-configure}:5088: testing VERSION_MAJOR $VERSION_MAJOR ..." 1>&5 test -n "$verbose" && echo " VERSION_MINOR $VERSION_MINOR" 1>&6 -echo "${as_me:-configure}:4908: testing VERSION_MINOR $VERSION_MINOR ..." 1>&5 +echo "${as_me:-configure}:5092: testing VERSION_MINOR $VERSION_MINOR ..." 1>&5 test -n "$verbose" && echo " VERSION_PATCH $VERSION_PATCH" 1>&6 -echo "${as_me:-configure}:4912: testing VERSION_PATCH $VERSION_PATCH ..." 1>&5 +echo "${as_me:-configure}:5096: testing VERSION_PATCH $VERSION_PATCH ..." 1>&5 cf_PACKAGE=dialog PACKAGE=$PACKAGE @@ -4928,6 +5112,13 @@ EOF #define ${cf_PACKAGE}_PATCHDATE ${VERSION_PATCH} EOF +CFG_ROOTNAME=$PACKAGE +HDR_ROOTNAME=$PACKAGE +LIB_ROOTNAME=$PACKAGE + +echo "$as_me:5119: checking if we should install dlg_XXX headers to subdirectory" >&5 +echo $ECHO_N "checking if we should install dlg_XXX headers to subdirectory... $ECHO_C" >&6 + # Check whether --enable-header-subdir or --disable-header-subdir was given. if test "${enable_header_subdir+set}" = set; then enableval="$enable_header_subdir" @@ -4935,16 +5126,18 @@ if test "${enable_header_subdir+set}" = set; then else SUB_INC=no fi; +echo "$as_me:5129: result: $SUB_INC" >&5 +echo "${ECHO_T}$SUB_INC" >&6 EXTRAOBJS="" -echo "$as_me:4941: checking for ANSI C header files" >&5 +echo "$as_me:5134: checking for ANSI C header files" >&5 echo $ECHO_N "checking for ANSI C header files... $ECHO_C" >&6 if test "${ac_cv_header_stdc+set}" = set; then echo $ECHO_N "(cached) $ECHO_C" >&6 else cat >conftest.$ac_ext <<_ACEOF -#line 4947 "configure" +#line 5140 "configure" #include "confdefs.h" #include <stdlib.h> #include <stdarg.h> @@ -4952,13 +5145,13 @@ else #include <float.h> _ACEOF -if { (eval echo "$as_me:4955: \"$ac_cpp conftest.$ac_ext\"") >&5 +if { (eval echo "$as_me:5148: \"$ac_cpp conftest.$ac_ext\"") >&5 (eval $ac_cpp conftest.$ac_ext) 2>conftest.er1 ac_status=$? egrep -v '^ *\+' conftest.er1 >conftest.err rm -f conftest.er1 cat conftest.err >&5 - echo "$as_me:4961: \$? = $ac_status" >&5 + echo "$as_me:5154: \$? = $ac_status" >&5 (exit $ac_status); } >/dev/null; then if test -s conftest.err; then ac_cpp_err=$ac_c_preproc_warn_flag @@ -4980,7 +5173,7 @@ rm -f conftest.err conftest.$ac_ext if test $ac_cv_header_stdc = yes; then # SunOS 4.x string.h does not declare mem*, contrary to ANSI. cat >conftest.$ac_ext <<_ACEOF -#line 4983 "configure" +#line 5176 "configure" #include "confdefs.h" #include <string.h> @@ -4998,7 +5191,7 @@ fi if test $ac_cv_header_stdc = yes; then # ISC 2.0.2 stdlib.h does not declare free, contrary to ANSI. cat >conftest.$ac_ext <<_ACEOF -#line 5001 "configure" +#line 5194 "configure" #include "confdefs.h" #include <stdlib.h> @@ -5019,7 +5212,7 @@ if test $ac_cv_header_stdc = yes; then : else cat >conftest.$ac_ext <<_ACEOF -#line 5022 "configure" +#line 5215 "configure" #include "confdefs.h" #include <ctype.h> #if ((' ' & 0x0FF) == 0x020) @@ -5045,15 +5238,15 @@ main () } _ACEOF rm -f conftest$ac_exeext -if { (eval echo "$as_me:5048: \"$ac_link\"") >&5 +if { (eval echo "$as_me:5241: \"$ac_link\"") >&5 (eval $ac_link) 2>&5 ac_status=$? - echo "$as_me:5051: \$? = $ac_status" >&5 + echo "$as_me:5244: \$? = $ac_status" >&5 (exit $ac_status); } && { ac_try='./conftest$ac_exeext' - { (eval echo "$as_me:5053: \"$ac_try\"") >&5 + { (eval echo "$as_me:5246: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? - echo "$as_me:5056: \$? = $ac_status" >&5 + echo "$as_me:5249: \$? = $ac_status" >&5 (exit $ac_status); }; }; then : else @@ -5066,7 +5259,7 @@ rm -f core core.* *.core conftest$ac_exeext conftest.$ac_objext conftest.$ac_ext fi fi fi -echo "$as_me:5069: result: $ac_cv_header_stdc" >&5 +echo "$as_me:5262: result: $ac_cv_header_stdc" >&5 echo "${ECHO_T}$ac_cv_header_stdc" >&6 if test $ac_cv_header_stdc = yes; then @@ -5076,7 +5269,7 @@ EOF fi -echo "$as_me:5079: checking for inline" >&5 +echo "$as_me:5272: checking for inline" >&5 echo $ECHO_N "checking for inline... $ECHO_C" >&6 if test "${ac_cv_c_inline+set}" = set; then echo $ECHO_N "(cached) $ECHO_C" >&6 @@ -5084,7 +5277,7 @@ else ac_cv_c_inline=no for ac_kw in inline __inline__ __inline; do cat >conftest.$ac_ext <<_ACEOF -#line 5087 "configure" +#line 5280 "configure" #include "confdefs.h" #ifndef __cplusplus static $ac_kw int static_foo () {return 0; } @@ -5093,16 +5286,16 @@ $ac_kw int foo () {return 0; } _ACEOF rm -f conftest.$ac_objext -if { (eval echo "$as_me:5096: \"$ac_compile\"") >&5 +if { (eval echo "$as_me:5289: \"$ac_compile\"") >&5 (eval $ac_compile) 2>&5 ac_status=$? - echo "$as_me:5099: \$? = $ac_status" >&5 + echo "$as_me:5292: \$? = $ac_status" >&5 (exit $ac_status); } && { ac_try='test -s conftest.$ac_objext' - { (eval echo "$as_me:5102: \"$ac_try\"") >&5 + { (eval echo "$as_me:5295: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? - echo "$as_me:5105: \$? = $ac_status" >&5 + echo "$as_me:5298: \$? = $ac_status" >&5 (exit $ac_status); }; }; then ac_cv_c_inline=$ac_kw; break else @@ -5113,7 +5306,7 @@ rm -f conftest.$ac_objext conftest.$ac_ext done fi -echo "$as_me:5116: result: $ac_cv_c_inline" >&5 +echo "$as_me:5309: result: $ac_cv_c_inline" >&5 echo "${ECHO_T}$ac_cv_c_inline" >&6 case $ac_cv_c_inline in inline | yes) ;; @@ -5134,28 +5327,28 @@ for ac_header in sys/types.h sys/stat.h stdlib.h string.h memory.h strings.h \ inttypes.h stdint.h unistd.h do as_ac_Header=`echo "ac_cv_header_$ac_header" | $as_tr_sh` -echo "$as_me:5137: checking for $ac_header" >&5 +echo "$as_me:5330: checking for $ac_header" >&5 echo $ECHO_N "checking for $ac_header... $ECHO_C" >&6 if eval "test \"\${$as_ac_Header+set}\" = set"; then echo $ECHO_N "(cached) $ECHO_C" >&6 else cat >conftest.$ac_ext <<_ACEOF -#line 5143 "configure" +#line 5336 "configure" #include "confdefs.h" $ac_includes_default #include <$ac_header> _ACEOF rm -f conftest.$ac_objext -if { (eval echo "$as_me:5149: \"$ac_compile\"") >&5 +if { (eval echo "$as_me:5342: \"$ac_compile\"") >&5 (eval $ac_compile) 2>&5 ac_status=$? - echo "$as_me:5152: \$? = $ac_status" >&5 + echo "$as_me:5345: \$? = $ac_status" >&5 (exit $ac_status); } && { ac_try='test -s conftest.$ac_objext' - { (eval echo "$as_me:5155: \"$ac_try\"") >&5 + { (eval echo "$as_me:5348: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? - echo "$as_me:5158: \$? = $ac_status" >&5 + echo "$as_me:5351: \$? = $ac_status" >&5 (exit $ac_status); }; }; then eval "$as_ac_Header=yes" else @@ -5165,7 +5358,7 @@ eval "$as_ac_Header=no" fi rm -f conftest.$ac_objext conftest.$ac_ext fi -echo "$as_me:5168: result: `eval echo '${'$as_ac_Header'}'`" >&5 +echo "$as_me:5361: result: `eval echo '${'$as_ac_Header'}'`" >&5 echo "${ECHO_T}`eval echo '${'$as_ac_Header'}'`" >&6 if test `eval echo '${'$as_ac_Header'}'` = yes; then cat >>confdefs.h <<EOF @@ -5175,13 +5368,13 @@ EOF fi done -echo "$as_me:5178: checking for off_t" >&5 +echo "$as_me:5371: checking for off_t" >&5 echo $ECHO_N "checking for off_t... $ECHO_C" >&6 if test "${ac_cv_type_off_t+set}" = set; then echo $ECHO_N "(cached) $ECHO_C" >&6 else cat >conftest.$ac_ext <<_ACEOF -#line 5184 "configure" +#line 5377 "configure" #include "confdefs.h" $ac_includes_default int @@ -5196,16 +5389,16 @@ if (sizeof (off_t)) } _ACEOF rm -f conftest.$ac_objext -if { (eval echo "$as_me:5199: \"$ac_compile\"") >&5 +if { (eval echo "$as_me:5392: \"$ac_compile\"") >&5 (eval $ac_compile) 2>&5 ac_status=$? - echo "$as_me:5202: \$? = $ac_status" >&5 + echo "$as_me:5395: \$? = $ac_status" >&5 (exit $ac_status); } && { ac_try='test -s conftest.$ac_objext' - { (eval echo "$as_me:5205: \"$ac_try\"") >&5 + { (eval echo "$as_me:5398: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? - echo "$as_me:5208: \$? = $ac_status" >&5 + echo "$as_me:5401: \$? = $ac_status" >&5 (exit $ac_status); }; }; then ac_cv_type_off_t=yes else @@ -5215,7 +5408,7 @@ ac_cv_type_off_t=no fi rm -f conftest.$ac_objext conftest.$ac_ext fi -echo "$as_me:5218: result: $ac_cv_type_off_t" >&5 +echo "$as_me:5411: result: $ac_cv_type_off_t" >&5 echo "${ECHO_T}$ac_cv_type_off_t" >&6 if test $ac_cv_type_off_t = yes; then : @@ -5227,13 +5420,13 @@ EOF fi -echo "$as_me:5230: checking for size_t" >&5 +echo "$as_me:5423: checking for size_t" >&5 echo $ECHO_N "checking for size_t... $ECHO_C" >&6 if test "${ac_cv_type_size_t+set}" = set; then echo $ECHO_N "(cached) $ECHO_C" >&6 else cat >conftest.$ac_ext <<_ACEOF -#line 5236 "configure" +#line 5429 "configure" #include "confdefs.h" $ac_includes_default int @@ -5248,16 +5441,16 @@ if (sizeof (size_t)) } _ACEOF rm -f conftest.$ac_objext -if { (eval echo "$as_me:5251: \"$ac_compile\"") >&5 +if { (eval echo "$as_me:5444: \"$ac_compile\"") >&5 (eval $ac_compile) 2>&5 ac_status=$? - echo "$as_me:5254: \$? = $ac_status" >&5 + echo "$as_me:5447: \$? = $ac_status" >&5 (exit $ac_status); } && { ac_try='test -s conftest.$ac_objext' - { (eval echo "$as_me:5257: \"$ac_try\"") >&5 + { (eval echo "$as_me:5450: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? - echo "$as_me:5260: \$? = $ac_status" >&5 + echo "$as_me:5453: \$? = $ac_status" >&5 (exit $ac_status); }; }; then ac_cv_type_size_t=yes else @@ -5267,7 +5460,7 @@ ac_cv_type_size_t=no fi rm -f conftest.$ac_objext conftest.$ac_ext fi -echo "$as_me:5270: result: $ac_cv_type_size_t" >&5 +echo "$as_me:5463: result: $ac_cv_type_size_t" >&5 echo "${ECHO_T}$ac_cv_type_size_t" >&6 if test $ac_cv_type_size_t = yes; then : @@ -5281,13 +5474,13 @@ fi # The Ultrix 4.2 mips builtin alloca declared by alloca.h only works # for constant arguments. Useless! -echo "$as_me:5284: checking for working alloca.h" >&5 +echo "$as_me:5477: checking for working alloca.h" >&5 echo $ECHO_N "checking for working alloca.h... $ECHO_C" >&6 if test "${ac_cv_working_alloca_h+set}" = set; then echo $ECHO_N "(cached) $ECHO_C" >&6 else cat >conftest.$ac_ext <<_ACEOF -#line 5290 "configure" +#line 5483 "configure" #include "confdefs.h" #include <alloca.h> int @@ -5299,16 +5492,16 @@ char *p = (char *) alloca (2 * sizeof (int)); } _ACEOF rm -f conftest.$ac_objext conftest$ac_exeext -if { (eval echo "$as_me:5302: \"$ac_link\"") >&5 +if { (eval echo "$as_me:5495: \"$ac_link\"") >&5 (eval $ac_link) 2>&5 ac_status=$? - echo "$as_me:5305: \$? = $ac_status" >&5 + echo "$as_me:5498: \$? = $ac_status" >&5 (exit $ac_status); } && { ac_try='test -s conftest$ac_exeext' - { (eval echo "$as_me:5308: \"$ac_try\"") >&5 + { (eval echo "$as_me:5501: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? - echo "$as_me:5311: \$? = $ac_status" >&5 + echo "$as_me:5504: \$? = $ac_status" >&5 (exit $ac_status); }; }; then ac_cv_working_alloca_h=yes else @@ -5318,7 +5511,7 @@ ac_cv_working_alloca_h=no fi rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext fi -echo "$as_me:5321: result: $ac_cv_working_alloca_h" >&5 +echo "$as_me:5514: result: $ac_cv_working_alloca_h" >&5 echo "${ECHO_T}$ac_cv_working_alloca_h" >&6 if test $ac_cv_working_alloca_h = yes; then @@ -5328,13 +5521,13 @@ EOF fi -echo "$as_me:5331: checking for alloca" >&5 +echo "$as_me:5524: checking for alloca" >&5 echo $ECHO_N "checking for alloca... $ECHO_C" >&6 if test "${ac_cv_func_alloca_works+set}" = set; then echo $ECHO_N "(cached) $ECHO_C" >&6 else cat >conftest.$ac_ext <<_ACEOF -#line 5337 "configure" +#line 5530 "configure" #include "confdefs.h" #ifdef __GNUC__ # define alloca __builtin_alloca @@ -5366,16 +5559,16 @@ char *p = (char *) alloca (1); } _ACEOF rm -f conftest.$ac_objext conftest$ac_exeext -if { (eval echo "$as_me:5369: \"$ac_link\"") >&5 +if { (eval echo "$as_me:5562: \"$ac_link\"") >&5 (eval $ac_link) 2>&5 ac_status=$? - echo "$as_me:5372: \$? = $ac_status" >&5 + echo "$as_me:5565: \$? = $ac_status" >&5 (exit $ac_status); } && { ac_try='test -s conftest$ac_exeext' - { (eval echo "$as_me:5375: \"$ac_try\"") >&5 + { (eval echo "$as_me:5568: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? - echo "$as_me:5378: \$? = $ac_status" >&5 + echo "$as_me:5571: \$? = $ac_status" >&5 (exit $ac_status); }; }; then ac_cv_func_alloca_works=yes else @@ -5385,7 +5578,7 @@ ac_cv_func_alloca_works=no fi rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext fi -echo "$as_me:5388: result: $ac_cv_func_alloca_works" >&5 +echo "$as_me:5581: result: $ac_cv_func_alloca_works" >&5 echo "${ECHO_T}$ac_cv_func_alloca_works" >&6 if test $ac_cv_func_alloca_works = yes; then @@ -5406,13 +5599,13 @@ cat >>confdefs.h <<\EOF #define C_ALLOCA 1 EOF -echo "$as_me:5409: checking whether \`alloca.c' needs Cray hooks" >&5 +echo "$as_me:5602: checking whether \`alloca.c' needs Cray hooks" >&5 echo $ECHO_N "checking whether \`alloca.c' needs Cray hooks... $ECHO_C" >&6 if test "${ac_cv_os_cray+set}" = set; then echo $ECHO_N "(cached) $ECHO_C" >&6 else cat >conftest.$ac_ext <<_ACEOF -#line 5415 "configure" +#line 5608 "configure" #include "confdefs.h" #if defined(CRAY) && ! defined(CRAY2) webecray @@ -5430,18 +5623,18 @@ fi rm -rf conftest* fi -echo "$as_me:5433: result: $ac_cv_os_cray" >&5 +echo "$as_me:5626: result: $ac_cv_os_cray" >&5 echo "${ECHO_T}$ac_cv_os_cray" >&6 if test $ac_cv_os_cray = yes; then for ac_func in _getb67 GETB67 getb67; do as_ac_var=`echo "ac_cv_func_$ac_func" | $as_tr_sh` -echo "$as_me:5438: checking for $ac_func" >&5 +echo "$as_me:5631: checking for $ac_func" >&5 echo $ECHO_N "checking for $ac_func... $ECHO_C" >&6 if eval "test \"\${$as_ac_var+set}\" = set"; then echo $ECHO_N "(cached) $ECHO_C" >&6 else cat >conftest.$ac_ext <<_ACEOF -#line 5444 "configure" +#line 5637 "configure" #include "confdefs.h" /* System header to define __stub macros and hopefully few prototypes, which can conflict with char $ac_func (); below. */ @@ -5472,16 +5665,16 @@ f = $ac_func; /* workaround for ICC 12.0.3 */ if (f == 0) return 1; } _ACEOF rm -f conftest.$ac_objext conftest$ac_exeext -if { (eval echo "$as_me:5475: \"$ac_link\"") >&5 +if { (eval echo "$as_me:5668: \"$ac_link\"") >&5 (eval $ac_link) 2>&5 ac_status=$? - echo "$as_me:5478: \$? = $ac_status" >&5 + echo "$as_me:5671: \$? = $ac_status" >&5 (exit $ac_status); } && { ac_try='test -s conftest$ac_exeext' - { (eval echo "$as_me:5481: \"$ac_try\"") >&5 + { (eval echo "$as_me:5674: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? - echo "$as_me:5484: \$? = $ac_status" >&5 + echo "$as_me:5677: \$? = $ac_status" >&5 (exit $ac_status); }; }; then eval "$as_ac_var=yes" else @@ -5491,7 +5684,7 @@ eval "$as_ac_var=no" fi rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext fi -echo "$as_me:5494: result: `eval echo '${'$as_ac_var'}'`" >&5 +echo "$as_me:5687: result: `eval echo '${'$as_ac_var'}'`" >&5 echo "${ECHO_T}`eval echo '${'$as_ac_var'}'`" >&6 if test `eval echo '${'$as_ac_var'}'` = yes; then @@ -5505,7 +5698,7 @@ fi done fi -echo "$as_me:5508: checking stack direction for C alloca" >&5 +echo "$as_me:5701: checking stack direction for C alloca" >&5 echo $ECHO_N "checking stack direction for C alloca... $ECHO_C" >&6 if test "${ac_cv_c_stack_direction+set}" = set; then echo $ECHO_N "(cached) $ECHO_C" >&6 @@ -5514,7 +5707,7 @@ else ac_cv_c_stack_direction=0 else cat >conftest.$ac_ext <<_ACEOF -#line 5517 "configure" +#line 5710 "configure" #include "confdefs.h" int find_stack_direction () @@ -5537,15 +5730,15 @@ main () } _ACEOF rm -f conftest$ac_exeext -if { (eval echo "$as_me:5540: \"$ac_link\"") >&5 +if { (eval echo "$as_me:5733: \"$ac_link\"") >&5 (eval $ac_link) 2>&5 ac_status=$? - echo "$as_me:5543: \$? = $ac_status" >&5 + echo "$as_me:5736: \$? = $ac_status" >&5 (exit $ac_status); } && { ac_try='./conftest$ac_exeext' - { (eval echo "$as_me:5545: \"$ac_try\"") >&5 + { (eval echo "$as_me:5738: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? - echo "$as_me:5548: \$? = $ac_status" >&5 + echo "$as_me:5741: \$? = $ac_status" >&5 (exit $ac_status); }; }; then ac_cv_c_stack_direction=1 else @@ -5557,7 +5750,7 @@ fi rm -f core core.* *.core conftest$ac_exeext conftest.$ac_objext conftest.$ac_ext fi fi -echo "$as_me:5560: result: $ac_cv_c_stack_direction" >&5 +echo "$as_me:5753: result: $ac_cv_c_stack_direction" >&5 echo "${ECHO_T}$ac_cv_c_stack_direction" >&6 cat >>confdefs.h <<EOF @@ -5569,23 +5762,23 @@ fi for ac_header in stdlib.h unistd.h do as_ac_Header=`echo "ac_cv_header_$ac_header" | $as_tr_sh` -echo "$as_me:5572: checking for $ac_header" >&5 +echo "$as_me:5765: checking for $ac_header" >&5 echo $ECHO_N "checking for $ac_header... $ECHO_C" >&6 if eval "test \"\${$as_ac_Header+set}\" = set"; then echo $ECHO_N "(cached) $ECHO_C" >&6 else cat >conftest.$ac_ext <<_ACEOF -#line 5578 "configure" +#line 5771 "configure" #include "confdefs.h" #include <$ac_header> _ACEOF -if { (eval echo "$as_me:5582: \"$ac_cpp conftest.$ac_ext\"") >&5 +if { (eval echo "$as_me:5775: \"$ac_cpp conftest.$ac_ext\"") >&5 (eval $ac_cpp conftest.$ac_ext) 2>conftest.er1 ac_status=$? egrep -v '^ *\+' conftest.er1 >conftest.err rm -f conftest.er1 cat conftest.err >&5 - echo "$as_me:5588: \$? = $ac_status" >&5 + echo "$as_me:5781: \$? = $ac_status" >&5 (exit $ac_status); } >/dev/null; then if test -s conftest.err; then ac_cpp_err=$ac_c_preproc_warn_flag @@ -5604,7 +5797,7 @@ else fi rm -f conftest.err conftest.$ac_ext fi -echo "$as_me:5607: result: `eval echo '${'$as_ac_Header'}'`" >&5 +echo "$as_me:5800: result: `eval echo '${'$as_ac_Header'}'`" >&5 echo "${ECHO_T}`eval echo '${'$as_ac_Header'}'`" >&6 if test `eval echo '${'$as_ac_Header'}'` = yes; then cat >>confdefs.h <<EOF @@ -5617,13 +5810,13 @@ done for ac_func in getpagesize do as_ac_var=`echo "ac_cv_func_$ac_func" | $as_tr_sh` -echo "$as_me:5620: checking for $ac_func" >&5 +echo "$as_me:5813: checking for $ac_func" >&5 echo $ECHO_N "checking for $ac_func... $ECHO_C" >&6 if eval "test \"\${$as_ac_var+set}\" = set"; then echo $ECHO_N "(cached) $ECHO_C" >&6 else cat >conftest.$ac_ext <<_ACEOF -#line 5626 "configure" +#line 5819 "configure" #include "confdefs.h" /* System header to define __stub macros and hopefully few prototypes, which can conflict with char $ac_func (); below. */ @@ -5654,16 +5847,16 @@ f = $ac_func; /* workaround for ICC 12.0.3 */ if (f == 0) return 1; } _ACEOF rm -f conftest.$ac_objext conftest$ac_exeext -if { (eval echo "$as_me:5657: \"$ac_link\"") >&5 +if { (eval echo "$as_me:5850: \"$ac_link\"") >&5 (eval $ac_link) 2>&5 ac_status=$? - echo "$as_me:5660: \$? = $ac_status" >&5 + echo "$as_me:5853: \$? = $ac_status" >&5 (exit $ac_status); } && { ac_try='test -s conftest$ac_exeext' - { (eval echo "$as_me:5663: \"$ac_try\"") >&5 + { (eval echo "$as_me:5856: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? - echo "$as_me:5666: \$? = $ac_status" >&5 + echo "$as_me:5859: \$? = $ac_status" >&5 (exit $ac_status); }; }; then eval "$as_ac_var=yes" else @@ -5673,7 +5866,7 @@ eval "$as_ac_var=no" fi rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext fi -echo "$as_me:5676: result: `eval echo '${'$as_ac_var'}'`" >&5 +echo "$as_me:5869: result: `eval echo '${'$as_ac_var'}'`" >&5 echo "${ECHO_T}`eval echo '${'$as_ac_var'}'`" >&6 if test `eval echo '${'$as_ac_var'}'` = yes; then cat >>confdefs.h <<EOF @@ -5683,7 +5876,7 @@ EOF fi done -echo "$as_me:5686: checking for working mmap" >&5 +echo "$as_me:5879: checking for working mmap" >&5 echo $ECHO_N "checking for working mmap... $ECHO_C" >&6 if test "${ac_cv_func_mmap_fixed_mapped+set}" = set; then echo $ECHO_N "(cached) $ECHO_C" >&6 @@ -5692,7 +5885,7 @@ else ac_cv_func_mmap_fixed_mapped=no else cat >conftest.$ac_ext <<_ACEOF -#line 5695 "configure" +#line 5888 "configure" #include "confdefs.h" $ac_includes_default /* Thanks to Mike Haertel and Jim Avera for this test. @@ -5819,15 +6012,15 @@ main () } _ACEOF rm -f conftest$ac_exeext -if { (eval echo "$as_me:5822: \"$ac_link\"") >&5 +if { (eval echo "$as_me:6015: \"$ac_link\"") >&5 (eval $ac_link) 2>&5 ac_status=$? - echo "$as_me:5825: \$? = $ac_status" >&5 + echo "$as_me:6018: \$? = $ac_status" >&5 (exit $ac_status); } && { ac_try='./conftest$ac_exeext' - { (eval echo "$as_me:5827: \"$ac_try\"") >&5 + { (eval echo "$as_me:6020: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? - echo "$as_me:5830: \$? = $ac_status" >&5 + echo "$as_me:6023: \$? = $ac_status" >&5 (exit $ac_status); }; }; then ac_cv_func_mmap_fixed_mapped=yes else @@ -5839,7 +6032,7 @@ fi rm -f core core.* *.core conftest$ac_exeext conftest.$ac_objext conftest.$ac_ext fi fi -echo "$as_me:5842: result: $ac_cv_func_mmap_fixed_mapped" >&5 +echo "$as_me:6035: result: $ac_cv_func_mmap_fixed_mapped" >&5 echo "${ECHO_T}$ac_cv_func_mmap_fixed_mapped" >&6 if test $ac_cv_func_mmap_fixed_mapped = yes; then @@ -5850,13 +6043,13 @@ EOF fi rm -f conftest.mmap - echo "$as_me:5853: checking whether we are using the GNU C Library 2.1 or newer" >&5 + echo "$as_me:6046: checking whether we are using the GNU C Library 2.1 or newer" >&5 echo $ECHO_N "checking whether we are using the GNU C Library 2.1 or newer... $ECHO_C" >&6 if test "${ac_cv_gnu_library_2_1+set}" = set; then echo $ECHO_N "(cached) $ECHO_C" >&6 else cat >conftest.$ac_ext <<_ACEOF -#line 5859 "configure" +#line 6052 "configure" #include "confdefs.h" #include <features.h> @@ -5876,7 +6069,7 @@ fi rm -rf conftest* fi -echo "$as_me:5879: result: $ac_cv_gnu_library_2_1" >&5 +echo "$as_me:6072: result: $ac_cv_gnu_library_2_1" >&5 echo "${ECHO_T}$ac_cv_gnu_library_2_1" >&6 GLIBC21="$ac_cv_gnu_library_2_1" @@ -5889,7 +6082,7 @@ test -z "$ALL_LINGUAS" && ALL_LINGUAS=`test -d $srcdir/po && cd $srcdir/po && ec : ${CONFIG_H:=config.h} if test -z "$PACKAGE" ; then - { { echo "$as_me:5892: error: CF_BUNDLED_INTL used without setting PACKAGE variable" >&5 + { { echo "$as_me:6085: error: CF_BUNDLED_INTL used without setting PACKAGE variable" >&5 echo "$as_me: error: CF_BUNDLED_INTL used without setting PACKAGE variable" >&2;} { (exit 1); exit 1; }; } fi @@ -5906,23 +6099,23 @@ for ac_header in argz.h limits.h locale.h nl_types.h malloc.h stddef.h \ stdlib.h string.h unistd.h sys/param.h do as_ac_Header=`echo "ac_cv_header_$ac_header" | $as_tr_sh` -echo "$as_me:5909: checking for $ac_header" >&5 +echo "$as_me:6102: checking for $ac_header" >&5 echo $ECHO_N "checking for $ac_header... $ECHO_C" >&6 if eval "test \"\${$as_ac_Header+set}\" = set"; then echo $ECHO_N "(cached) $ECHO_C" >&6 else cat >conftest.$ac_ext <<_ACEOF -#line 5915 "configure" +#line 6108 "configure" #include "confdefs.h" #include <$ac_header> _ACEOF -if { (eval echo "$as_me:5919: \"$ac_cpp conftest.$ac_ext\"") >&5 +if { (eval echo "$as_me:6112: \"$ac_cpp conftest.$ac_ext\"") >&5 (eval $ac_cpp conftest.$ac_ext) 2>conftest.er1 ac_status=$? egrep -v '^ *\+' conftest.er1 >conftest.err rm -f conftest.er1 cat conftest.err >&5 - echo "$as_me:5925: \$? = $ac_status" >&5 + echo "$as_me:6118: \$? = $ac_status" >&5 (exit $ac_status); } >/dev/null; then if test -s conftest.err; then ac_cpp_err=$ac_c_preproc_warn_flag @@ -5941,7 +6134,7 @@ else fi rm -f conftest.err conftest.$ac_ext fi -echo "$as_me:5944: result: `eval echo '${'$as_ac_Header'}'`" >&5 +echo "$as_me:6137: result: `eval echo '${'$as_ac_Header'}'`" >&5 echo "${ECHO_T}`eval echo '${'$as_ac_Header'}'`" >&6 if test `eval echo '${'$as_ac_Header'}'` = yes; then cat >>confdefs.h <<EOF @@ -5956,13 +6149,13 @@ getgid getuid mempcpy munmap putenv setenv setlocale stpcpy strchr strcasecmp \ strdup strtoul tsearch __argz_count __argz_stringify __argz_next do as_ac_var=`echo "ac_cv_func_$ac_func" | $as_tr_sh` -echo "$as_me:5959: checking for $ac_func" >&5 +echo "$as_me:6152: checking for $ac_func" >&5 echo $ECHO_N "checking for $ac_func... $ECHO_C" >&6 if eval "test \"\${$as_ac_var+set}\" = set"; then echo $ECHO_N "(cached) $ECHO_C" >&6 else cat >conftest.$ac_ext <<_ACEOF -#line 5965 "configure" +#line 6158 "configure" #include "confdefs.h" /* System header to define __stub macros and hopefully few prototypes, which can conflict with char $ac_func (); below. */ @@ -5993,16 +6186,16 @@ f = $ac_func; /* workaround for ICC 12.0.3 */ if (f == 0) return 1; } _ACEOF rm -f conftest.$ac_objext conftest$ac_exeext -if { (eval echo "$as_me:5996: \"$ac_link\"") >&5 +if { (eval echo "$as_me:6189: \"$ac_link\"") >&5 (eval $ac_link) 2>&5 ac_status=$? - echo "$as_me:5999: \$? = $ac_status" >&5 + echo "$as_me:6192: \$? = $ac_status" >&5 (exit $ac_status); } && { ac_try='test -s conftest$ac_exeext' - { (eval echo "$as_me:6002: \"$ac_try\"") >&5 + { (eval echo "$as_me:6195: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? - echo "$as_me:6005: \$? = $ac_status" >&5 + echo "$as_me:6198: \$? = $ac_status" >&5 (exit $ac_status); }; }; then eval "$as_ac_var=yes" else @@ -6012,7 +6205,7 @@ eval "$as_ac_var=no" fi rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext fi -echo "$as_me:6015: result: `eval echo '${'$as_ac_var'}'`" >&5 +echo "$as_me:6208: result: `eval echo '${'$as_ac_var'}'`" >&5 echo "${ECHO_T}`eval echo '${'$as_ac_var'}'`" >&6 if test `eval echo '${'$as_ac_var'}'` = yes; then cat >>confdefs.h <<EOF @@ -6060,7 +6253,7 @@ if test -n "$cf_searchpath/include" ; then cf_save_CPPFLAGS=$CPPFLAGS CPPFLAGS="$CPPFLAGS -I$cf_add_incdir" cat >conftest.$ac_ext <<_ACEOF -#line 6063 "configure" +#line 6256 "configure" #include "confdefs.h" #include <stdio.h> int @@ -6072,16 +6265,16 @@ printf("Hello") } _ACEOF rm -f conftest.$ac_objext -if { (eval echo "$as_me:6075: \"$ac_compile\"") >&5 +if { (eval echo "$as_me:6268: \"$ac_compile\"") >&5 (eval $ac_compile) 2>&5 ac_status=$? - echo "$as_me:6078: \$? = $ac_status" >&5 + echo "$as_me:6271: \$? = $ac_status" >&5 (exit $ac_status); } && { ac_try='test -s conftest.$ac_objext' - { (eval echo "$as_me:6081: \"$ac_try\"") >&5 + { (eval echo "$as_me:6274: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? - echo "$as_me:6084: \$? = $ac_status" >&5 + echo "$as_me:6277: \$? = $ac_status" >&5 (exit $ac_status); }; }; then : else @@ -6098,7 +6291,7 @@ rm -f conftest.$ac_objext conftest.$ac_ext if test "$cf_have_incdir" = no ; then test -n "$verbose" && echo " adding $cf_add_incdir to include-path" 1>&6 -echo "${as_me:-configure}:6101: testing adding $cf_add_incdir to include-path ..." 1>&5 +echo "${as_me:-configure}:6294: testing adding $cf_add_incdir to include-path ..." 1>&5 CPPFLAGS="$CPPFLAGS -I$cf_add_incdir" @@ -6139,7 +6332,7 @@ if test -n "$cf_searchpath/../include" ; then cf_save_CPPFLAGS=$CPPFLAGS CPPFLAGS="$CPPFLAGS -I$cf_add_incdir" cat >conftest.$ac_ext <<_ACEOF -#line 6142 "configure" +#line 6335 "configure" #include "confdefs.h" #include <stdio.h> int @@ -6151,16 +6344,16 @@ printf("Hello") } _ACEOF rm -f conftest.$ac_objext -if { (eval echo "$as_me:6154: \"$ac_compile\"") >&5 +if { (eval echo "$as_me:6347: \"$ac_compile\"") >&5 (eval $ac_compile) 2>&5 ac_status=$? - echo "$as_me:6157: \$? = $ac_status" >&5 + echo "$as_me:6350: \$? = $ac_status" >&5 (exit $ac_status); } && { ac_try='test -s conftest.$ac_objext' - { (eval echo "$as_me:6160: \"$ac_try\"") >&5 + { (eval echo "$as_me:6353: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? - echo "$as_me:6163: \$? = $ac_status" >&5 + echo "$as_me:6356: \$? = $ac_status" >&5 (exit $ac_status); }; }; then : else @@ -6177,7 +6370,7 @@ rm -f conftest.$ac_objext conftest.$ac_ext if test "$cf_have_incdir" = no ; then test -n "$verbose" && echo " adding $cf_add_incdir to include-path" 1>&6 -echo "${as_me:-configure}:6180: testing adding $cf_add_incdir to include-path ..." 1>&5 +echo "${as_me:-configure}:6373: testing adding $cf_add_incdir to include-path ..." 1>&5 CPPFLAGS="$CPPFLAGS -I$cf_add_incdir" @@ -6193,7 +6386,7 @@ echo "${as_me:-configure}:6180: testing adding $cf_add_incdir to include-path .. fi else -{ { echo "$as_me:6196: error: cannot find libiconv under $withval" >&5 +{ { echo "$as_me:6389: error: cannot find libiconv under $withval" >&5 echo "$as_me: error: cannot find libiconv under $withval" >&2;} { (exit 1); exit 1; }; } fi @@ -6218,7 +6411,7 @@ if test -n "$cf_searchpath/lib" ; then if test "$cf_have_libdir" = no ; then test -n "$verbose" && echo " adding $cf_add_libdir to library-path" 1>&6 -echo "${as_me:-configure}:6221: testing adding $cf_add_libdir to library-path ..." 1>&5 +echo "${as_me:-configure}:6414: testing adding $cf_add_libdir to library-path ..." 1>&5 LDFLAGS="-L$cf_add_libdir $LDFLAGS" fi @@ -6247,7 +6440,7 @@ if test -n "$cf_searchpath" ; then if test "$cf_have_libdir" = no ; then test -n "$verbose" && echo " adding $cf_add_libdir to library-path" 1>&6 -echo "${as_me:-configure}:6250: testing adding $cf_add_libdir to library-path ..." 1>&5 +echo "${as_me:-configure}:6443: testing adding $cf_add_libdir to library-path ..." 1>&5 LDFLAGS="-L$cf_add_libdir $LDFLAGS" fi @@ -6256,7 +6449,7 @@ echo "${as_me:-configure}:6250: testing adding $cf_add_libdir to library-path .. fi else -{ { echo "$as_me:6259: error: cannot find libiconv under $withval" >&5 +{ { echo "$as_me:6452: error: cannot find libiconv under $withval" >&5 echo "$as_me: error: cannot find libiconv under $withval" >&2;} { (exit 1); exit 1; }; } fi @@ -6267,7 +6460,7 @@ done fi; - echo "$as_me:6270: checking for iconv" >&5 + echo "$as_me:6463: checking for iconv" >&5 echo $ECHO_N "checking for iconv... $ECHO_C" >&6 if test "${am_cv_func_iconv+set}" = set; then echo $ECHO_N "(cached) $ECHO_C" >&6 @@ -6278,12 +6471,12 @@ else cf_cv_header_path_iconv= cf_cv_library_path_iconv= -echo "${as_me:-configure}:6281: testing Starting FIND_LINKAGE(iconv,) ..." 1>&5 +echo "${as_me:-configure}:6474: testing Starting FIND_LINKAGE(iconv,) ..." 1>&5 cf_save_LIBS="$LIBS" cat >conftest.$ac_ext <<_ACEOF -#line 6286 "configure" +#line 6479 "configure" #include "confdefs.h" #include <stdlib.h> @@ -6302,16 +6495,16 @@ main () } _ACEOF rm -f conftest.$ac_objext conftest$ac_exeext -if { (eval echo "$as_me:6305: \"$ac_link\"") >&5 +if { (eval echo "$as_me:6498: \"$ac_link\"") >&5 (eval $ac_link) 2>&5 ac_status=$? - echo "$as_me:6308: \$? = $ac_status" >&5 + echo "$as_me:6501: \$? = $ac_status" >&5 (exit $ac_status); } && { ac_try='test -s conftest$ac_exeext' - { (eval echo "$as_me:6311: \"$ac_try\"") >&5 + { (eval echo "$as_me:6504: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? - echo "$as_me:6314: \$? = $ac_status" >&5 + echo "$as_me:6507: \$? = $ac_status" >&5 (exit $ac_status); }; }; then cf_cv_find_linkage_iconv=yes @@ -6325,7 +6518,7 @@ cat conftest.$ac_ext >&5 LIBS="-liconv $cf_save_LIBS" cat >conftest.$ac_ext <<_ACEOF -#line 6328 "configure" +#line 6521 "configure" #include "confdefs.h" #include <stdlib.h> @@ -6344,16 +6537,16 @@ main () } _ACEOF rm -f conftest.$ac_objext conftest$ac_exeext -if { (eval echo "$as_me:6347: \"$ac_link\"") >&5 +if { (eval echo "$as_me:6540: \"$ac_link\"") >&5 (eval $ac_link) 2>&5 ac_status=$? - echo "$as_me:6350: \$? = $ac_status" >&5 + echo "$as_me:6543: \$? = $ac_status" >&5 (exit $ac_status); } && { ac_try='test -s conftest$ac_exeext' - { (eval echo "$as_me:6353: \"$ac_try\"") >&5 + { (eval echo "$as_me:6546: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? - echo "$as_me:6356: \$? = $ac_status" >&5 + echo "$as_me:6549: \$? = $ac_status" >&5 (exit $ac_status); }; }; then cf_cv_find_linkage_iconv=yes @@ -6370,9 +6563,9 @@ cat conftest.$ac_ext >&5 test -n "$verbose" && echo " find linkage for iconv library" 1>&6 -echo "${as_me:-configure}:6373: testing find linkage for iconv library ..." 1>&5 +echo "${as_me:-configure}:6566: testing find linkage for iconv library ..." 1>&5 -echo "${as_me:-configure}:6375: testing Searching for headers in FIND_LINKAGE(iconv,) ..." 1>&5 +echo "${as_me:-configure}:6568: testing Searching for headers in FIND_LINKAGE(iconv,) ..." 1>&5 cf_save_CPPFLAGS="$CPPFLAGS" cf_test_CPPFLAGS="$CPPFLAGS" @@ -6485,11 +6678,11 @@ cf_search="$cf_search $cf_header_path_list" if test -d $cf_cv_header_path_iconv ; then test -n "$verbose" && echo " ... testing $cf_cv_header_path_iconv" 1>&6 -echo "${as_me:-configure}:6488: testing ... testing $cf_cv_header_path_iconv ..." 1>&5 +echo "${as_me:-configure}:6681: testing ... testing $cf_cv_header_path_iconv ..." 1>&5 CPPFLAGS="$cf_save_CPPFLAGS -I$cf_cv_header_path_iconv" cat >conftest.$ac_ext <<_ACEOF -#line 6492 "configure" +#line 6685 "configure" #include "confdefs.h" #include <stdlib.h> @@ -6508,21 +6701,21 @@ main () } _ACEOF rm -f conftest.$ac_objext -if { (eval echo "$as_me:6511: \"$ac_compile\"") >&5 +if { (eval echo "$as_me:6704: \"$ac_compile\"") >&5 (eval $ac_compile) 2>&5 ac_status=$? - echo "$as_me:6514: \$? = $ac_status" >&5 + echo "$as_me:6707: \$? = $ac_status" >&5 (exit $ac_status); } && { ac_try='test -s conftest.$ac_objext' - { (eval echo "$as_me:6517: \"$ac_try\"") >&5 + { (eval echo "$as_me:6710: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? - echo "$as_me:6520: \$? = $ac_status" >&5 + echo "$as_me:6713: \$? = $ac_status" >&5 (exit $ac_status); }; }; then test -n "$verbose" && echo " ... found iconv headers in $cf_cv_header_path_iconv" 1>&6 -echo "${as_me:-configure}:6525: testing ... found iconv headers in $cf_cv_header_path_iconv ..." 1>&5 +echo "${as_me:-configure}:6718: testing ... found iconv headers in $cf_cv_header_path_iconv ..." 1>&5 cf_cv_find_linkage_iconv=maybe cf_test_CPPFLAGS="$CPPFLAGS" @@ -6540,7 +6733,7 @@ rm -f conftest.$ac_objext conftest.$ac_ext if test "$cf_cv_find_linkage_iconv" = maybe ; then -echo "${as_me:-configure}:6543: testing Searching for iconv library in FIND_LINKAGE(iconv,) ..." 1>&5 +echo "${as_me:-configure}:6736: testing Searching for iconv library in FIND_LINKAGE(iconv,) ..." 1>&5 cf_save_LIBS="$LIBS" cf_save_LDFLAGS="$LDFLAGS" @@ -6637,13 +6830,13 @@ cf_search="$cf_library_path_list $cf_search" if test -d $cf_cv_library_path_iconv ; then test -n "$verbose" && echo " ... testing $cf_cv_library_path_iconv" 1>&6 -echo "${as_me:-configure}:6640: testing ... testing $cf_cv_library_path_iconv ..." 1>&5 +echo "${as_me:-configure}:6833: testing ... testing $cf_cv_library_path_iconv ..." 1>&5 CPPFLAGS="$cf_test_CPPFLAGS" LIBS="-liconv $cf_save_LIBS" LDFLAGS="$cf_save_LDFLAGS -L$cf_cv_library_path_iconv" cat >conftest.$ac_ext <<_ACEOF -#line 6646 "configure" +#line 6839 "configure" #include "confdefs.h" #include <stdlib.h> @@ -6662,21 +6855,21 @@ main () } _ACEOF rm -f conftest.$ac_objext conftest$ac_exeext -if { (eval echo "$as_me:6665: \"$ac_link\"") >&5 +if { (eval echo "$as_me:6858: \"$ac_link\"") >&5 (eval $ac_link) 2>&5 ac_status=$? - echo "$as_me:6668: \$? = $ac_status" >&5 + echo "$as_me:6861: \$? = $ac_status" >&5 (exit $ac_status); } && { ac_try='test -s conftest$ac_exeext' - { (eval echo "$as_me:6671: \"$ac_try\"") >&5 + { (eval echo "$as_me:6864: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? - echo "$as_me:6674: \$? = $ac_status" >&5 + echo "$as_me:6867: \$? = $ac_status" >&5 (exit $ac_status); }; }; then test -n "$verbose" && echo " ... found iconv library in $cf_cv_library_path_iconv" 1>&6 -echo "${as_me:-configure}:6679: testing ... found iconv library in $cf_cv_library_path_iconv ..." 1>&5 +echo "${as_me:-configure}:6872: testing ... found iconv library in $cf_cv_library_path_iconv ..." 1>&5 cf_cv_find_linkage_iconv=yes cf_cv_library_file_iconv="-liconv" @@ -6716,7 +6909,7 @@ am_cv_func_iconv="no, consider installing GNU libiconv" fi fi -echo "$as_me:6719: result: $am_cv_func_iconv" >&5 +echo "$as_me:6912: result: $am_cv_func_iconv" >&5 echo "${ECHO_T}$am_cv_func_iconv" >&6 if test "$am_cv_func_iconv" = yes; then @@ -6725,14 +6918,14 @@ cat >>confdefs.h <<\EOF #define HAVE_ICONV 1 EOF - echo "$as_me:6728: checking if the declaration of iconv() needs const." >&5 + echo "$as_me:6921: checking if the declaration of iconv() needs const." >&5 echo $ECHO_N "checking if the declaration of iconv() needs const.... $ECHO_C" >&6 if test "${am_cv_proto_iconv_const+set}" = set; then echo $ECHO_N "(cached) $ECHO_C" >&6 else cat >conftest.$ac_ext <<_ACEOF -#line 6735 "configure" +#line 6928 "configure" #include "confdefs.h" #include <stdlib.h> @@ -6757,16 +6950,16 @@ main () } _ACEOF rm -f conftest.$ac_objext -if { (eval echo "$as_me:6760: \"$ac_compile\"") >&5 +if { (eval echo "$as_me:6953: \"$ac_compile\"") >&5 (eval $ac_compile) 2>&5 ac_status=$? - echo "$as_me:6763: \$? = $ac_status" >&5 + echo "$as_me:6956: \$? = $ac_status" >&5 (exit $ac_status); } && { ac_try='test -s conftest.$ac_objext' - { (eval echo "$as_me:6766: \"$ac_try\"") >&5 + { (eval echo "$as_me:6959: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? - echo "$as_me:6769: \$? = $ac_status" >&5 + echo "$as_me:6962: \$? = $ac_status" >&5 (exit $ac_status); }; }; then am_cv_proto_iconv_const=no else @@ -6776,7 +6969,7 @@ am_cv_proto_iconv_const=yes fi rm -f conftest.$ac_objext conftest.$ac_ext fi -echo "$as_me:6779: result: $am_cv_proto_iconv_const" >&5 +echo "$as_me:6972: result: $am_cv_proto_iconv_const" >&5 echo "${ECHO_T}$am_cv_proto_iconv_const" >&6 if test "$am_cv_proto_iconv_const" = yes ; then @@ -6818,7 +7011,7 @@ if test -n "$cf_cv_header_path_iconv" ; then cf_save_CPPFLAGS=$CPPFLAGS CPPFLAGS="$CPPFLAGS -I$cf_add_incdir" cat >conftest.$ac_ext <<_ACEOF -#line 6821 "configure" +#line 7014 "configure" #include "confdefs.h" #include <stdio.h> int @@ -6830,16 +7023,16 @@ printf("Hello") } _ACEOF rm -f conftest.$ac_objext -if { (eval echo "$as_me:6833: \"$ac_compile\"") >&5 +if { (eval echo "$as_me:7026: \"$ac_compile\"") >&5 (eval $ac_compile) 2>&5 ac_status=$? - echo "$as_me:6836: \$? = $ac_status" >&5 + echo "$as_me:7029: \$? = $ac_status" >&5 (exit $ac_status); } && { ac_try='test -s conftest.$ac_objext' - { (eval echo "$as_me:6839: \"$ac_try\"") >&5 + { (eval echo "$as_me:7032: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? - echo "$as_me:6842: \$? = $ac_status" >&5 + echo "$as_me:7035: \$? = $ac_status" >&5 (exit $ac_status); }; }; then : else @@ -6856,7 +7049,7 @@ rm -f conftest.$ac_objext conftest.$ac_ext if test "$cf_have_incdir" = no ; then test -n "$verbose" && echo " adding $cf_add_incdir to include-path" 1>&6 -echo "${as_me:-configure}:6859: testing adding $cf_add_incdir to include-path ..." 1>&5 +echo "${as_me:-configure}:7052: testing adding $cf_add_incdir to include-path ..." 1>&5 CPPFLAGS="$CPPFLAGS -I$cf_add_incdir" @@ -6893,7 +7086,7 @@ if test -n "$cf_cv_library_path_iconv" ; then if test "$cf_have_libdir" = no ; then test -n "$verbose" && echo " adding $cf_add_libdir to library-path" 1>&6 -echo "${as_me:-configure}:6896: testing adding $cf_add_libdir to library-path ..." 1>&5 +echo "${as_me:-configure}:7089: testing adding $cf_add_libdir to library-path ..." 1>&5 LDFLAGS="-L$cf_add_libdir $LDFLAGS" fi @@ -6904,13 +7097,13 @@ fi fi fi - echo "$as_me:6907: checking for nl_langinfo and CODESET" >&5 + echo "$as_me:7100: checking for nl_langinfo and CODESET" >&5 echo $ECHO_N "checking for nl_langinfo and CODESET... $ECHO_C" >&6 if test "${am_cv_langinfo_codeset+set}" = set; then echo $ECHO_N "(cached) $ECHO_C" >&6 else cat >conftest.$ac_ext <<_ACEOF -#line 6913 "configure" +#line 7106 "configure" #include "confdefs.h" #include <langinfo.h> int @@ -6922,16 +7115,16 @@ char* cs = nl_langinfo(CODESET); } _ACEOF rm -f conftest.$ac_objext conftest$ac_exeext -if { (eval echo "$as_me:6925: \"$ac_link\"") >&5 +if { (eval echo "$as_me:7118: \"$ac_link\"") >&5 (eval $ac_link) 2>&5 ac_status=$? - echo "$as_me:6928: \$? = $ac_status" >&5 + echo "$as_me:7121: \$? = $ac_status" >&5 (exit $ac_status); } && { ac_try='test -s conftest$ac_exeext' - { (eval echo "$as_me:6931: \"$ac_try\"") >&5 + { (eval echo "$as_me:7124: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? - echo "$as_me:6934: \$? = $ac_status" >&5 + echo "$as_me:7127: \$? = $ac_status" >&5 (exit $ac_status); }; }; then am_cv_langinfo_codeset=yes else @@ -6942,7 +7135,7 @@ fi rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext fi -echo "$as_me:6945: result: $am_cv_langinfo_codeset" >&5 +echo "$as_me:7138: result: $am_cv_langinfo_codeset" >&5 echo "${ECHO_T}$am_cv_langinfo_codeset" >&6 if test $am_cv_langinfo_codeset = yes; then @@ -6953,13 +7146,13 @@ EOF fi if test $ac_cv_header_locale_h = yes; then - echo "$as_me:6956: checking for LC_MESSAGES" >&5 + echo "$as_me:7149: checking for LC_MESSAGES" >&5 echo $ECHO_N "checking for LC_MESSAGES... $ECHO_C" >&6 if test "${am_cv_val_LC_MESSAGES+set}" = set; then echo $ECHO_N "(cached) $ECHO_C" >&6 else cat >conftest.$ac_ext <<_ACEOF -#line 6962 "configure" +#line 7155 "configure" #include "confdefs.h" #include <locale.h> int @@ -6971,16 +7164,16 @@ return LC_MESSAGES } _ACEOF rm -f conftest.$ac_objext conftest$ac_exeext -if { (eval echo "$as_me:6974: \"$ac_link\"") >&5 +if { (eval echo "$as_me:7167: \"$ac_link\"") >&5 (eval $ac_link) 2>&5 ac_status=$? - echo "$as_me:6977: \$? = $ac_status" >&5 + echo "$as_me:7170: \$? = $ac_status" >&5 (exit $ac_status); } && { ac_try='test -s conftest$ac_exeext' - { (eval echo "$as_me:6980: \"$ac_try\"") >&5 + { (eval echo "$as_me:7173: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? - echo "$as_me:6983: \$? = $ac_status" >&5 + echo "$as_me:7176: \$? = $ac_status" >&5 (exit $ac_status); }; }; then am_cv_val_LC_MESSAGES=yes else @@ -6990,7 +7183,7 @@ am_cv_val_LC_MESSAGES=no fi rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext fi -echo "$as_me:6993: result: $am_cv_val_LC_MESSAGES" >&5 +echo "$as_me:7186: result: $am_cv_val_LC_MESSAGES" >&5 echo "${ECHO_T}$am_cv_val_LC_MESSAGES" >&6 if test $am_cv_val_LC_MESSAGES = yes; then @@ -7000,7 +7193,7 @@ EOF fi fi - echo "$as_me:7003: checking whether NLS is requested" >&5 + echo "$as_me:7196: checking whether NLS is requested" >&5 echo $ECHO_N "checking whether NLS is requested... $ECHO_C" >&6 # Check whether --enable-nls or --disable-nls was given. @@ -7010,7 +7203,7 @@ if test "${enable_nls+set}" = set; then else USE_NLS=no fi; - echo "$as_me:7013: result: $USE_NLS" >&5 + echo "$as_me:7206: result: $USE_NLS" >&5 echo "${ECHO_T}$USE_NLS" >&6 BUILD_INCLUDED_LIBINTL=no @@ -7023,7 +7216,7 @@ cat >>confdefs.h <<\EOF #define ENABLE_NLS 1 EOF - echo "$as_me:7026: checking whether included gettext is requested" >&5 + echo "$as_me:7219: checking whether included gettext is requested" >&5 echo $ECHO_N "checking whether included gettext is requested... $ECHO_C" >&6 # Check whether --with-included-gettext or --without-included-gettext was given. @@ -7033,7 +7226,7 @@ if test "${with_included_gettext+set}" = set; then else nls_cv_force_use_gnu_gettext=no fi; - echo "$as_me:7036: result: $nls_cv_force_use_gnu_gettext" >&5 + echo "$as_me:7229: result: $nls_cv_force_use_gnu_gettext" >&5 echo "${ECHO_T}$nls_cv_force_use_gnu_gettext" >&6 nls_cv_use_gnu_gettext="$nls_cv_force_use_gnu_gettext" @@ -7042,7 +7235,7 @@ echo "${ECHO_T}$nls_cv_force_use_gnu_gettext" >&6 cf_save_LIBS_1="$LIBS" LIBS="$LIBICONV $LIBS" - echo "$as_me:7045: checking for libintl.h and gettext()" >&5 + echo "$as_me:7238: checking for libintl.h and gettext()" >&5 echo $ECHO_N "checking for libintl.h and gettext()... $ECHO_C" >&6 if test "${cf_cv_func_gettext+set}" = set; then echo $ECHO_N "(cached) $ECHO_C" >&6 @@ -7053,12 +7246,12 @@ else cf_cv_header_path_intl= cf_cv_library_path_intl= -echo "${as_me:-configure}:7056: testing Starting FIND_LINKAGE(intl,) ..." 1>&5 +echo "${as_me:-configure}:7249: testing Starting FIND_LINKAGE(intl,) ..." 1>&5 cf_save_LIBS="$LIBS" cat >conftest.$ac_ext <<_ACEOF -#line 7061 "configure" +#line 7254 "configure" #include "confdefs.h" #include <libintl.h> @@ -7078,16 +7271,16 @@ main () } _ACEOF rm -f conftest.$ac_objext conftest$ac_exeext -if { (eval echo "$as_me:7081: \"$ac_link\"") >&5 +if { (eval echo "$as_me:7274: \"$ac_link\"") >&5 (eval $ac_link) 2>&5 ac_status=$? - echo "$as_me:7084: \$? = $ac_status" >&5 + echo "$as_me:7277: \$? = $ac_status" >&5 (exit $ac_status); } && { ac_try='test -s conftest$ac_exeext' - { (eval echo "$as_me:7087: \"$ac_try\"") >&5 + { (eval echo "$as_me:7280: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? - echo "$as_me:7090: \$? = $ac_status" >&5 + echo "$as_me:7283: \$? = $ac_status" >&5 (exit $ac_status); }; }; then cf_cv_find_linkage_intl=yes @@ -7101,7 +7294,7 @@ cat conftest.$ac_ext >&5 LIBS="-lintl $cf_save_LIBS" cat >conftest.$ac_ext <<_ACEOF -#line 7104 "configure" +#line 7297 "configure" #include "confdefs.h" #include <libintl.h> @@ -7121,16 +7314,16 @@ main () } _ACEOF rm -f conftest.$ac_objext conftest$ac_exeext -if { (eval echo "$as_me:7124: \"$ac_link\"") >&5 +if { (eval echo "$as_me:7317: \"$ac_link\"") >&5 (eval $ac_link) 2>&5 ac_status=$? - echo "$as_me:7127: \$? = $ac_status" >&5 + echo "$as_me:7320: \$? = $ac_status" >&5 (exit $ac_status); } && { ac_try='test -s conftest$ac_exeext' - { (eval echo "$as_me:7130: \"$ac_try\"") >&5 + { (eval echo "$as_me:7323: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? - echo "$as_me:7133: \$? = $ac_status" >&5 + echo "$as_me:7326: \$? = $ac_status" >&5 (exit $ac_status); }; }; then cf_cv_find_linkage_intl=yes @@ -7147,9 +7340,9 @@ cat conftest.$ac_ext >&5 test -n "$verbose" && echo " find linkage for intl library" 1>&6 -echo "${as_me:-configure}:7150: testing find linkage for intl library ..." 1>&5 +echo "${as_me:-configure}:7343: testing find linkage for intl library ..." 1>&5 -echo "${as_me:-configure}:7152: testing Searching for headers in FIND_LINKAGE(intl,) ..." 1>&5 +echo "${as_me:-configure}:7345: testing Searching for headers in FIND_LINKAGE(intl,) ..." 1>&5 cf_save_CPPFLAGS="$CPPFLAGS" cf_test_CPPFLAGS="$CPPFLAGS" @@ -7262,11 +7455,11 @@ cf_search="$cf_search $cf_header_path_list" if test -d $cf_cv_header_path_intl ; then test -n "$verbose" && echo " ... testing $cf_cv_header_path_intl" 1>&6 -echo "${as_me:-configure}:7265: testing ... testing $cf_cv_header_path_intl ..." 1>&5 +echo "${as_me:-configure}:7458: testing ... testing $cf_cv_header_path_intl ..." 1>&5 CPPFLAGS="$cf_save_CPPFLAGS -I$cf_cv_header_path_intl" cat >conftest.$ac_ext <<_ACEOF -#line 7269 "configure" +#line 7462 "configure" #include "confdefs.h" #include <libintl.h> @@ -7286,21 +7479,21 @@ main () } _ACEOF rm -f conftest.$ac_objext -if { (eval echo "$as_me:7289: \"$ac_compile\"") >&5 +if { (eval echo "$as_me:7482: \"$ac_compile\"") >&5 (eval $ac_compile) 2>&5 ac_status=$? - echo "$as_me:7292: \$? = $ac_status" >&5 + echo "$as_me:7485: \$? = $ac_status" >&5 (exit $ac_status); } && { ac_try='test -s conftest.$ac_objext' - { (eval echo "$as_me:7295: \"$ac_try\"") >&5 + { (eval echo "$as_me:7488: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? - echo "$as_me:7298: \$? = $ac_status" >&5 + echo "$as_me:7491: \$? = $ac_status" >&5 (exit $ac_status); }; }; then test -n "$verbose" && echo " ... found intl headers in $cf_cv_header_path_intl" 1>&6 -echo "${as_me:-configure}:7303: testing ... found intl headers in $cf_cv_header_path_intl ..." 1>&5 +echo "${as_me:-configure}:7496: testing ... found intl headers in $cf_cv_header_path_intl ..." 1>&5 cf_cv_find_linkage_intl=maybe cf_test_CPPFLAGS="$CPPFLAGS" @@ -7318,7 +7511,7 @@ rm -f conftest.$ac_objext conftest.$ac_ext if test "$cf_cv_find_linkage_intl" = maybe ; then -echo "${as_me:-configure}:7321: testing Searching for intl library in FIND_LINKAGE(intl,) ..." 1>&5 +echo "${as_me:-configure}:7514: testing Searching for intl library in FIND_LINKAGE(intl,) ..." 1>&5 cf_save_LIBS="$LIBS" cf_save_LDFLAGS="$LDFLAGS" @@ -7415,13 +7608,13 @@ cf_search="$cf_library_path_list $cf_search" if test -d $cf_cv_library_path_intl ; then test -n "$verbose" && echo " ... testing $cf_cv_library_path_intl" 1>&6 -echo "${as_me:-configure}:7418: testing ... testing $cf_cv_library_path_intl ..." 1>&5 +echo "${as_me:-configure}:7611: testing ... testing $cf_cv_library_path_intl ..." 1>&5 CPPFLAGS="$cf_test_CPPFLAGS" LIBS="-lintl $cf_save_LIBS" LDFLAGS="$cf_save_LDFLAGS -L$cf_cv_library_path_intl" cat >conftest.$ac_ext <<_ACEOF -#line 7424 "configure" +#line 7617 "configure" #include "confdefs.h" #include <libintl.h> @@ -7441,21 +7634,21 @@ main () } _ACEOF rm -f conftest.$ac_objext conftest$ac_exeext -if { (eval echo "$as_me:7444: \"$ac_link\"") >&5 +if { (eval echo "$as_me:7637: \"$ac_link\"") >&5 (eval $ac_link) 2>&5 ac_status=$? - echo "$as_me:7447: \$? = $ac_status" >&5 + echo "$as_me:7640: \$? = $ac_status" >&5 (exit $ac_status); } && { ac_try='test -s conftest$ac_exeext' - { (eval echo "$as_me:7450: \"$ac_try\"") >&5 + { (eval echo "$as_me:7643: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? - echo "$as_me:7453: \$? = $ac_status" >&5 + echo "$as_me:7646: \$? = $ac_status" >&5 (exit $ac_status); }; }; then test -n "$verbose" && echo " ... found intl library in $cf_cv_library_path_intl" 1>&6 -echo "${as_me:-configure}:7458: testing ... found intl library in $cf_cv_library_path_intl ..." 1>&5 +echo "${as_me:-configure}:7651: testing ... found intl library in $cf_cv_library_path_intl ..." 1>&5 cf_cv_find_linkage_intl=yes cf_cv_library_file_intl="-lintl" @@ -7495,7 +7688,7 @@ cf_cv_func_gettext=no fi fi -echo "$as_me:7498: result: $cf_cv_func_gettext" >&5 +echo "$as_me:7691: result: $cf_cv_func_gettext" >&5 echo "${ECHO_T}$cf_cv_func_gettext" >&6 LIBS="$cf_save_LIBS_1" @@ -7535,7 +7728,7 @@ if test -n "$cf_cv_header_path_intl" ; then cf_save_CPPFLAGS=$CPPFLAGS CPPFLAGS="$CPPFLAGS -I$cf_add_incdir" cat >conftest.$ac_ext <<_ACEOF -#line 7538 "configure" +#line 7731 "configure" #include "confdefs.h" #include <stdio.h> int @@ -7547,16 +7740,16 @@ printf("Hello") } _ACEOF rm -f conftest.$ac_objext -if { (eval echo "$as_me:7550: \"$ac_compile\"") >&5 +if { (eval echo "$as_me:7743: \"$ac_compile\"") >&5 (eval $ac_compile) 2>&5 ac_status=$? - echo "$as_me:7553: \$? = $ac_status" >&5 + echo "$as_me:7746: \$? = $ac_status" >&5 (exit $ac_status); } && { ac_try='test -s conftest.$ac_objext' - { (eval echo "$as_me:7556: \"$ac_try\"") >&5 + { (eval echo "$as_me:7749: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? - echo "$as_me:7559: \$? = $ac_status" >&5 + echo "$as_me:7752: \$? = $ac_status" >&5 (exit $ac_status); }; }; then : else @@ -7573,7 +7766,7 @@ rm -f conftest.$ac_objext conftest.$ac_ext if test "$cf_have_incdir" = no ; then test -n "$verbose" && echo " adding $cf_add_incdir to include-path" 1>&6 -echo "${as_me:-configure}:7576: testing adding $cf_add_incdir to include-path ..." 1>&5 +echo "${as_me:-configure}:7769: testing adding $cf_add_incdir to include-path ..." 1>&5 CPPFLAGS="$CPPFLAGS -I$cf_add_incdir" @@ -7610,7 +7803,7 @@ if test -n "$cf_cv_library_path_intl" ; then if test "$cf_have_libdir" = no ; then test -n "$verbose" && echo " adding $cf_add_libdir to library-path" 1>&6 -echo "${as_me:-configure}:7613: testing adding $cf_add_libdir to library-path ..." 1>&5 +echo "${as_me:-configure}:7806: testing adding $cf_add_libdir to library-path ..." 1>&5 INTLLIBS="-L$cf_add_libdir $INTLLIBS" fi @@ -7626,13 +7819,13 @@ fi for ac_func in dcgettext do as_ac_var=`echo "ac_cv_func_$ac_func" | $as_tr_sh` -echo "$as_me:7629: checking for $ac_func" >&5 +echo "$as_me:7822: checking for $ac_func" >&5 echo $ECHO_N "checking for $ac_func... $ECHO_C" >&6 if eval "test \"\${$as_ac_var+set}\" = set"; then echo $ECHO_N "(cached) $ECHO_C" >&6 else cat >conftest.$ac_ext <<_ACEOF -#line 7635 "configure" +#line 7828 "configure" #include "confdefs.h" /* System header to define __stub macros and hopefully few prototypes, which can conflict with char $ac_func (); below. */ @@ -7663,16 +7856,16 @@ f = $ac_func; /* workaround for ICC 12.0.3 */ if (f == 0) return 1; } _ACEOF rm -f conftest.$ac_objext conftest$ac_exeext -if { (eval echo "$as_me:7666: \"$ac_link\"") >&5 +if { (eval echo "$as_me:7859: \"$ac_link\"") >&5 (eval $ac_link) 2>&5 ac_status=$? - echo "$as_me:7669: \$? = $ac_status" >&5 + echo "$as_me:7862: \$? = $ac_status" >&5 (exit $ac_status); } && { ac_try='test -s conftest$ac_exeext' - { (eval echo "$as_me:7672: \"$ac_try\"") >&5 + { (eval echo "$as_me:7865: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? - echo "$as_me:7675: \$? = $ac_status" >&5 + echo "$as_me:7868: \$? = $ac_status" >&5 (exit $ac_status); }; }; then eval "$as_ac_var=yes" else @@ -7682,7 +7875,7 @@ eval "$as_ac_var=no" fi rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext fi -echo "$as_me:7685: result: `eval echo '${'$as_ac_var'}'`" >&5 +echo "$as_me:7878: result: `eval echo '${'$as_ac_var'}'`" >&5 echo "${ECHO_T}`eval echo '${'$as_ac_var'}'`" >&6 if test `eval echo '${'$as_ac_var'}'` = yes; then cat >>confdefs.h <<EOF @@ -7697,7 +7890,7 @@ done # Extract the first word of "msgfmt", so it can be a program name with args. set dummy msgfmt; ac_word=$2 -echo "$as_me:7700: checking for $ac_word" >&5 +echo "$as_me:7893: checking for $ac_word" >&5 echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6 if test "${ac_cv_path_MSGFMT+set}" = set; then echo $ECHO_N "(cached) $ECHO_C" >&6 @@ -7724,16 +7917,16 @@ esac fi MSGFMT="$ac_cv_path_MSGFMT" if test "$MSGFMT" != ":"; then - echo "$as_me:7727: result: $MSGFMT" >&5 + echo "$as_me:7920: result: $MSGFMT" >&5 echo "${ECHO_T}$MSGFMT" >&6 else - echo "$as_me:7730: result: no" >&5 + echo "$as_me:7923: result: no" >&5 echo "${ECHO_T}no" >&6 fi # Extract the first word of "gmsgfmt", so it can be a program name with args. set dummy gmsgfmt; ac_word=$2 -echo "$as_me:7736: checking for $ac_word" >&5 +echo "$as_me:7929: checking for $ac_word" >&5 echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6 if test "${ac_cv_path_GMSGFMT+set}" = set; then echo $ECHO_N "(cached) $ECHO_C" >&6 @@ -7750,7 +7943,7 @@ for ac_dir in $ac_dummy; do test -z "$ac_dir" && ac_dir=. if $as_executable_p "$ac_dir/$ac_word"; then ac_cv_path_GMSGFMT="$ac_dir/$ac_word" - echo "$as_me:7753: found $ac_dir/$ac_word" >&5 + echo "$as_me:7946: found $ac_dir/$ac_word" >&5 break fi done @@ -7762,17 +7955,17 @@ fi GMSGFMT=$ac_cv_path_GMSGFMT if test -n "$GMSGFMT"; then - echo "$as_me:7765: result: $GMSGFMT" >&5 + echo "$as_me:7958: result: $GMSGFMT" >&5 echo "${ECHO_T}$GMSGFMT" >&6 else - echo "$as_me:7768: result: no" >&5 + echo "$as_me:7961: result: no" >&5 echo "${ECHO_T}no" >&6 fi # Extract the first word of "xgettext", so it can be a program name with args. set dummy xgettext; ac_word=$2 -echo "$as_me:7775: checking for $ac_word" >&5 +echo "$as_me:7968: checking for $ac_word" >&5 echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6 if test "${ac_cv_path_XGETTEXT+set}" = set; then echo $ECHO_N "(cached) $ECHO_C" >&6 @@ -7799,10 +7992,10 @@ esac fi XGETTEXT="$ac_cv_path_XGETTEXT" if test "$XGETTEXT" != ":"; then - echo "$as_me:7802: result: $XGETTEXT" >&5 + echo "$as_me:7995: result: $XGETTEXT" >&5 echo "${ECHO_T}$XGETTEXT" >&6 else - echo "$as_me:7805: result: no" >&5 + echo "$as_me:7998: result: no" >&5 echo "${ECHO_T}no" >&6 fi @@ -7817,7 +8010,7 @@ fi if test "$nls_cv_use_gnu_gettext" = "yes"; then if test ! -d $srcdir/intl ; then - { { echo "$as_me:7820: error: no NLS library is packaged with this application" >&5 + { { echo "$as_me:8013: error: no NLS library is packaged with this application" >&5 echo "$as_me: error: no NLS library is packaged with this application" >&2;} { (exit 1); exit 1; }; } fi @@ -7825,7 +8018,7 @@ echo "$as_me: error: no NLS library is packaged with this application" >&2;} # Extract the first word of "msgfmt", so it can be a program name with args. set dummy msgfmt; ac_word=$2 -echo "$as_me:7828: checking for $ac_word" >&5 +echo "$as_me:8021: checking for $ac_word" >&5 echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6 if test "${ac_cv_path_MSGFMT+set}" = set; then echo $ECHO_N "(cached) $ECHO_C" >&6 @@ -7852,16 +8045,16 @@ esac fi MSGFMT="$ac_cv_path_MSGFMT" if test "$MSGFMT" != ":"; then - echo "$as_me:7855: result: $MSGFMT" >&5 + echo "$as_me:8048: result: $MSGFMT" >&5 echo "${ECHO_T}$MSGFMT" >&6 else - echo "$as_me:7858: result: no" >&5 + echo "$as_me:8051: result: no" >&5 echo "${ECHO_T}no" >&6 fi # Extract the first word of "gmsgfmt", so it can be a program name with args. set dummy gmsgfmt; ac_word=$2 -echo "$as_me:7864: checking for $ac_word" >&5 +echo "$as_me:8057: checking for $ac_word" >&5 echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6 if test "${ac_cv_path_GMSGFMT+set}" = set; then echo $ECHO_N "(cached) $ECHO_C" >&6 @@ -7878,7 +8071,7 @@ for ac_dir in $ac_dummy; do test -z "$ac_dir" && ac_dir=. if $as_executable_p "$ac_dir/$ac_word"; then ac_cv_path_GMSGFMT="$ac_dir/$ac_word" - echo "$as_me:7881: found $ac_dir/$ac_word" >&5 + echo "$as_me:8074: found $ac_dir/$ac_word" >&5 break fi done @@ -7890,17 +8083,17 @@ fi GMSGFMT=$ac_cv_path_GMSGFMT if test -n "$GMSGFMT"; then - echo "$as_me:7893: result: $GMSGFMT" >&5 + echo "$as_me:8086: result: $GMSGFMT" >&5 echo "${ECHO_T}$GMSGFMT" >&6 else - echo "$as_me:7896: result: no" >&5 + echo "$as_me:8089: result: no" >&5 echo "${ECHO_T}no" >&6 fi # Extract the first word of "xgettext", so it can be a program name with args. set dummy xgettext; ac_word=$2 -echo "$as_me:7903: checking for $ac_word" >&5 +echo "$as_me:8096: checking for $ac_word" >&5 echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6 if test "${ac_cv_path_XGETTEXT+set}" = set; then echo $ECHO_N "(cached) $ECHO_C" >&6 @@ -7927,10 +8120,10 @@ esac fi XGETTEXT="$ac_cv_path_XGETTEXT" if test "$XGETTEXT" != ":"; then - echo "$as_me:7930: result: $XGETTEXT" >&5 + echo "$as_me:8123: result: $XGETTEXT" >&5 echo "${ECHO_T}$XGETTEXT" >&6 else - echo "$as_me:7933: result: no" >&5 + echo "$as_me:8126: result: no" >&5 echo "${ECHO_T}no" >&6 fi @@ -7945,7 +8138,7 @@ fi if $GMSGFMT --statistics /dev/null >/dev/null 2>&1; then : ; else - echo "$as_me:7948: result: found msgfmt program is not GNU msgfmt; ignore it" >&5 + echo "$as_me:8141: result: found msgfmt program is not GNU msgfmt; ignore it" >&5 echo "${ECHO_T}found msgfmt program is not GNU msgfmt; ignore it" >&6 GMSGFMT=":" fi @@ -7955,7 +8148,7 @@ echo "${ECHO_T}found msgfmt program is not GNU msgfmt; ignore it" >&6 if $XGETTEXT --omit-header /dev/null >/dev/null 2>&1; then : ; else - echo "$as_me:7958: result: found xgettext program is not GNU xgettext; ignore it" >&5 + echo "$as_me:8151: result: found xgettext program is not GNU xgettext; ignore it" >&5 echo "${ECHO_T}found xgettext program is not GNU xgettext; ignore it" >&6 XGETTEXT=":" fi @@ -7975,7 +8168,7 @@ echo "${ECHO_T}found xgettext program is not GNU xgettext; ignore it" >&6 do # Extract the first word of "$ac_prog", so it can be a program name with args. set dummy $ac_prog; ac_word=$2 -echo "$as_me:7978: checking for $ac_word" >&5 +echo "$as_me:8171: checking for $ac_word" >&5 echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6 if test "${ac_cv_prog_INTLBISON+set}" = set; then echo $ECHO_N "(cached) $ECHO_C" >&6 @@ -7990,7 +8183,7 @@ for ac_dir in $ac_dummy; do test -z "$ac_dir" && ac_dir=. $as_executable_p "$ac_dir/$ac_word" || continue ac_cv_prog_INTLBISON="$ac_prog" -echo "$as_me:7993: found $ac_dir/$ac_word" >&5 +echo "$as_me:8186: found $ac_dir/$ac_word" >&5 break done @@ -7998,10 +8191,10 @@ fi fi INTLBISON=$ac_cv_prog_INTLBISON if test -n "$INTLBISON"; then - echo "$as_me:8001: result: $INTLBISON" >&5 + echo "$as_me:8194: result: $INTLBISON" >&5 echo "${ECHO_T}$INTLBISON" >&6 else - echo "$as_me:8004: result: no" >&5 + echo "$as_me:8197: result: no" >&5 echo "${ECHO_T}no" >&6 fi @@ -8011,7 +8204,7 @@ done if test -z "$INTLBISON"; then ac_verc_fail=yes else - echo "$as_me:8014: checking version of bison" >&5 + echo "$as_me:8207: checking version of bison" >&5 echo $ECHO_N "checking version of bison... $ECHO_C" >&6 ac_prog_version=`$INTLBISON --version 2>&1 | sed -n 's/^.*GNU Bison.* \([0-9]*\.[0-9.]*\).*$/\1/p'` case $ac_prog_version in @@ -8020,7 +8213,7 @@ echo $ECHO_N "checking version of bison... $ECHO_C" >&6 ac_prog_version="$ac_prog_version, ok"; ac_verc_fail=no;; *) ac_prog_version="$ac_prog_version, bad"; ac_verc_fail=yes;; esac - echo "$as_me:8023: result: $ac_prog_version" >&5 + echo "$as_me:8216: result: $ac_prog_version" >&5 echo "${ECHO_T}$ac_prog_version" >&6 fi if test $ac_verc_fail = yes; then @@ -8046,7 +8239,7 @@ echo "${ECHO_T}$ac_prog_version" >&6 if test "x$ALL_LINGUAS" = "x"; then LINGUAS= else - echo "$as_me:8049: checking for catalogs to be installed" >&5 + echo "$as_me:8242: checking for catalogs to be installed" >&5 echo $ECHO_N "checking for catalogs to be installed... $ECHO_C" >&6 NEW_LINGUAS= for presentlang in $ALL_LINGUAS; do @@ -8066,7 +8259,7 @@ echo $ECHO_N "checking for catalogs to be installed... $ECHO_C" >&6 fi done LINGUAS=$NEW_LINGUAS - echo "$as_me:8069: result: $LINGUAS" >&5 + echo "$as_me:8262: result: $LINGUAS" >&5 echo "${ECHO_T}$LINGUAS" >&6 fi @@ -8102,7 +8295,7 @@ cf_makefile=makefile use_our_messages=no if test "$USE_NLS" = yes ; then if test -d $srcdir/po ; then -echo "$as_me:8105: checking if we should use included message-library" >&5 +echo "$as_me:8298: checking if we should use included message-library" >&5 echo $ECHO_N "checking if we should use included message-library... $ECHO_C" >&6 # Check whether --enable-included-msgs or --disable-included-msgs was given. @@ -8113,7 +8306,7 @@ else use_our_messages=yes fi; fi -echo "$as_me:8116: result: $use_our_messages" >&5 +echo "$as_me:8309: result: $use_our_messages" >&5 echo "${ECHO_T}$use_our_messages" >&6 fi @@ -8155,23 +8348,23 @@ else for ac_header in libintl.h do as_ac_Header=`echo "ac_cv_header_$ac_header" | $as_tr_sh` -echo "$as_me:8158: checking for $ac_header" >&5 +echo "$as_me:8351: checking for $ac_header" >&5 echo $ECHO_N "checking for $ac_header... $ECHO_C" >&6 if eval "test \"\${$as_ac_Header+set}\" = set"; then echo $ECHO_N "(cached) $ECHO_C" >&6 else cat >conftest.$ac_ext <<_ACEOF -#line 8164 "configure" +#line 8357 "configure" #include "confdefs.h" #include <$ac_header> _ACEOF -if { (eval echo "$as_me:8168: \"$ac_cpp conftest.$ac_ext\"") >&5 +if { (eval echo "$as_me:8361: \"$ac_cpp conftest.$ac_ext\"") >&5 (eval $ac_cpp conftest.$ac_ext) 2>conftest.er1 ac_status=$? egrep -v '^ *\+' conftest.er1 >conftest.err rm -f conftest.er1 cat conftest.err >&5 - echo "$as_me:8174: \$? = $ac_status" >&5 + echo "$as_me:8367: \$? = $ac_status" >&5 (exit $ac_status); } >/dev/null; then if test -s conftest.err; then ac_cpp_err=$ac_c_preproc_warn_flag @@ -8190,7 +8383,7 @@ else fi rm -f conftest.err conftest.$ac_ext fi -echo "$as_me:8193: result: `eval echo '${'$as_ac_Header'}'`" >&5 +echo "$as_me:8386: result: `eval echo '${'$as_ac_Header'}'`" >&5 echo "${ECHO_T}`eval echo '${'$as_ac_Header'}'`" >&6 if test `eval echo '${'$as_ac_Header'}'` = yes; then cat >>confdefs.h <<EOF @@ -8238,14 +8431,14 @@ EOF fi fi -echo "$as_me:8241: checking if -lm needed for math functions" >&5 +echo "$as_me:8434: checking if -lm needed for math functions" >&5 echo $ECHO_N "checking if -lm needed for math functions... $ECHO_C" >&6 if test "${cf_cv_need_libm+set}" = set; then echo $ECHO_N "(cached) $ECHO_C" >&6 else cat >conftest.$ac_ext <<_ACEOF -#line 8248 "configure" +#line 8441 "configure" #include "confdefs.h" #include <stdio.h> @@ -8260,16 +8453,16 @@ double x = rand(); printf("result = %g\n", sqrt(x)) } _ACEOF rm -f conftest.$ac_objext conftest$ac_exeext -if { (eval echo "$as_me:8263: \"$ac_link\"") >&5 +if { (eval echo "$as_me:8456: \"$ac_link\"") >&5 (eval $ac_link) 2>&5 ac_status=$? - echo "$as_me:8266: \$? = $ac_status" >&5 + echo "$as_me:8459: \$? = $ac_status" >&5 (exit $ac_status); } && { ac_try='test -s conftest$ac_exeext' - { (eval echo "$as_me:8269: \"$ac_try\"") >&5 + { (eval echo "$as_me:8462: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? - echo "$as_me:8272: \$? = $ac_status" >&5 + echo "$as_me:8465: \$? = $ac_status" >&5 (exit $ac_status); }; }; then cf_cv_need_libm=no else @@ -8279,7 +8472,7 @@ cf_cv_need_libm=yes fi rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext fi -echo "$as_me:8282: result: $cf_cv_need_libm" >&5 +echo "$as_me:8475: result: $cf_cv_need_libm" >&5 echo "${ECHO_T}$cf_cv_need_libm" >&6 if test "$cf_cv_need_libm" = yes then @@ -8288,7 +8481,7 @@ then fi -echo "$as_me:8291: checking if you want to use dmalloc for testing" >&5 +echo "$as_me:8484: checking if you want to use dmalloc for testing" >&5 echo $ECHO_N "checking if you want to use dmalloc for testing... $ECHO_C" >&6 # Check whether --with-dmalloc or --without-dmalloc was given. @@ -8305,7 +8498,7 @@ EOF else with_dmalloc= fi; -echo "$as_me:8308: result: ${with_dmalloc:-no}" >&5 +echo "$as_me:8501: result: ${with_dmalloc:-no}" >&5 echo "${ECHO_T}${with_dmalloc:-no}" >&6 case .$with_cflags in #(vi @@ -8399,23 +8592,23 @@ fi esac if test "$with_dmalloc" = yes ; then - echo "$as_me:8402: checking for dmalloc.h" >&5 + echo "$as_me:8595: checking for dmalloc.h" >&5 echo $ECHO_N "checking for dmalloc.h... $ECHO_C" >&6 if test "${ac_cv_header_dmalloc_h+set}" = set; then echo $ECHO_N "(cached) $ECHO_C" >&6 else cat >conftest.$ac_ext <<_ACEOF -#line 8408 "configure" +#line 8601 "configure" #include "confdefs.h" #include <dmalloc.h> _ACEOF -if { (eval echo "$as_me:8412: \"$ac_cpp conftest.$ac_ext\"") >&5 +if { (eval echo "$as_me:8605: \"$ac_cpp conftest.$ac_ext\"") >&5 (eval $ac_cpp conftest.$ac_ext) 2>conftest.er1 ac_status=$? egrep -v '^ *\+' conftest.er1 >conftest.err rm -f conftest.er1 cat conftest.err >&5 - echo "$as_me:8418: \$? = $ac_status" >&5 + echo "$as_me:8611: \$? = $ac_status" >&5 (exit $ac_status); } >/dev/null; then if test -s conftest.err; then ac_cpp_err=$ac_c_preproc_warn_flag @@ -8434,11 +8627,11 @@ else fi rm -f conftest.err conftest.$ac_ext fi -echo "$as_me:8437: result: $ac_cv_header_dmalloc_h" >&5 +echo "$as_me:8630: result: $ac_cv_header_dmalloc_h" >&5 echo "${ECHO_T}$ac_cv_header_dmalloc_h" >&6 if test $ac_cv_header_dmalloc_h = yes; then -echo "$as_me:8441: checking for dmalloc_debug in -ldmalloc" >&5 +echo "$as_me:8634: checking for dmalloc_debug in -ldmalloc" >&5 echo $ECHO_N "checking for dmalloc_debug in -ldmalloc... $ECHO_C" >&6 if test "${ac_cv_lib_dmalloc_dmalloc_debug+set}" = set; then echo $ECHO_N "(cached) $ECHO_C" >&6 @@ -8446,7 +8639,7 @@ else ac_check_lib_save_LIBS=$LIBS LIBS="-ldmalloc $LIBS" cat >conftest.$ac_ext <<_ACEOF -#line 8449 "configure" +#line 8642 "configure" #include "confdefs.h" /* Override any gcc2 internal prototype to avoid an error. */ @@ -8465,16 +8658,16 @@ dmalloc_debug (); } _ACEOF rm -f conftest.$ac_objext conftest$ac_exeext -if { (eval echo "$as_me:8468: \"$ac_link\"") >&5 +if { (eval echo "$as_me:8661: \"$ac_link\"") >&5 (eval $ac_link) 2>&5 ac_status=$? - echo "$as_me:8471: \$? = $ac_status" >&5 + echo "$as_me:8664: \$? = $ac_status" >&5 (exit $ac_status); } && { ac_try='test -s conftest$ac_exeext' - { (eval echo "$as_me:8474: \"$ac_try\"") >&5 + { (eval echo "$as_me:8667: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? - echo "$as_me:8477: \$? = $ac_status" >&5 + echo "$as_me:8670: \$? = $ac_status" >&5 (exit $ac_status); }; }; then ac_cv_lib_dmalloc_dmalloc_debug=yes else @@ -8485,7 +8678,7 @@ fi rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext LIBS=$ac_check_lib_save_LIBS fi -echo "$as_me:8488: result: $ac_cv_lib_dmalloc_dmalloc_debug" >&5 +echo "$as_me:8681: result: $ac_cv_lib_dmalloc_dmalloc_debug" >&5 echo "${ECHO_T}$ac_cv_lib_dmalloc_dmalloc_debug" >&6 if test $ac_cv_lib_dmalloc_dmalloc_debug = yes; then cat >>confdefs.h <<EOF @@ -8500,7 +8693,7 @@ fi fi -echo "$as_me:8503: checking if you want to use dbmalloc for testing" >&5 +echo "$as_me:8696: checking if you want to use dbmalloc for testing" >&5 echo $ECHO_N "checking if you want to use dbmalloc for testing... $ECHO_C" >&6 # Check whether --with-dbmalloc or --without-dbmalloc was given. @@ -8517,7 +8710,7 @@ EOF else with_dbmalloc= fi; -echo "$as_me:8520: result: ${with_dbmalloc:-no}" >&5 +echo "$as_me:8713: result: ${with_dbmalloc:-no}" >&5 echo "${ECHO_T}${with_dbmalloc:-no}" >&6 case .$with_cflags in #(vi @@ -8611,23 +8804,23 @@ fi esac if test "$with_dbmalloc" = yes ; then - echo "$as_me:8614: checking for dbmalloc.h" >&5 + echo "$as_me:8807: checking for dbmalloc.h" >&5 echo $ECHO_N "checking for dbmalloc.h... $ECHO_C" >&6 if test "${ac_cv_header_dbmalloc_h+set}" = set; then echo $ECHO_N "(cached) $ECHO_C" >&6 else cat >conftest.$ac_ext <<_ACEOF -#line 8620 "configure" +#line 8813 "configure" #include "confdefs.h" #include <dbmalloc.h> _ACEOF -if { (eval echo "$as_me:8624: \"$ac_cpp conftest.$ac_ext\"") >&5 +if { (eval echo "$as_me:8817: \"$ac_cpp conftest.$ac_ext\"") >&5 (eval $ac_cpp conftest.$ac_ext) 2>conftest.er1 ac_status=$? egrep -v '^ *\+' conftest.er1 >conftest.err rm -f conftest.er1 cat conftest.err >&5 - echo "$as_me:8630: \$? = $ac_status" >&5 + echo "$as_me:8823: \$? = $ac_status" >&5 (exit $ac_status); } >/dev/null; then if test -s conftest.err; then ac_cpp_err=$ac_c_preproc_warn_flag @@ -8646,11 +8839,11 @@ else fi rm -f conftest.err conftest.$ac_ext fi -echo "$as_me:8649: result: $ac_cv_header_dbmalloc_h" >&5 +echo "$as_me:8842: result: $ac_cv_header_dbmalloc_h" >&5 echo "${ECHO_T}$ac_cv_header_dbmalloc_h" >&6 if test $ac_cv_header_dbmalloc_h = yes; then -echo "$as_me:8653: checking for debug_malloc in -ldbmalloc" >&5 +echo "$as_me:8846: checking for debug_malloc in -ldbmalloc" >&5 echo $ECHO_N "checking for debug_malloc in -ldbmalloc... $ECHO_C" >&6 if test "${ac_cv_lib_dbmalloc_debug_malloc+set}" = set; then echo $ECHO_N "(cached) $ECHO_C" >&6 @@ -8658,7 +8851,7 @@ else ac_check_lib_save_LIBS=$LIBS LIBS="-ldbmalloc $LIBS" cat >conftest.$ac_ext <<_ACEOF -#line 8661 "configure" +#line 8854 "configure" #include "confdefs.h" /* Override any gcc2 internal prototype to avoid an error. */ @@ -8677,16 +8870,16 @@ debug_malloc (); } _ACEOF rm -f conftest.$ac_objext conftest$ac_exeext -if { (eval echo "$as_me:8680: \"$ac_link\"") >&5 +if { (eval echo "$as_me:8873: \"$ac_link\"") >&5 (eval $ac_link) 2>&5 ac_status=$? - echo "$as_me:8683: \$? = $ac_status" >&5 + echo "$as_me:8876: \$? = $ac_status" >&5 (exit $ac_status); } && { ac_try='test -s conftest$ac_exeext' - { (eval echo "$as_me:8686: \"$ac_try\"") >&5 + { (eval echo "$as_me:8879: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? - echo "$as_me:8689: \$? = $ac_status" >&5 + echo "$as_me:8882: \$? = $ac_status" >&5 (exit $ac_status); }; }; then ac_cv_lib_dbmalloc_debug_malloc=yes else @@ -8697,7 +8890,7 @@ fi rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext LIBS=$ac_check_lib_save_LIBS fi -echo "$as_me:8700: result: $ac_cv_lib_dbmalloc_debug_malloc" >&5 +echo "$as_me:8893: result: $ac_cv_lib_dbmalloc_debug_malloc" >&5 echo "${ECHO_T}$ac_cv_lib_dbmalloc_debug_malloc" >&6 if test $ac_cv_lib_dbmalloc_debug_malloc = yes; then cat >>confdefs.h <<EOF @@ -8712,7 +8905,7 @@ fi fi -echo "$as_me:8715: checking if you want to use purify for testing" >&5 +echo "$as_me:8908: checking if you want to use purify for testing" >&5 echo $ECHO_N "checking if you want to use purify for testing... $ECHO_C" >&6 # Check whether --with-purify or --without-purify was given. @@ -8729,7 +8922,7 @@ EOF else with_purify= fi; -echo "$as_me:8732: result: ${with_purify:-no}" >&5 +echo "$as_me:8925: result: ${with_purify:-no}" >&5 echo "${ECHO_T}${with_purify:-no}" >&6 case .$with_cflags in #(vi @@ -8822,7 +9015,7 @@ fi ;; esac -echo "$as_me:8825: checking if you want to use valgrind for testing" >&5 +echo "$as_me:9018: checking if you want to use valgrind for testing" >&5 echo $ECHO_N "checking if you want to use valgrind for testing... $ECHO_C" >&6 # Check whether --with-valgrind or --without-valgrind was given. @@ -8839,7 +9032,7 @@ EOF else with_valgrind= fi; -echo "$as_me:8842: result: ${with_valgrind:-no}" >&5 +echo "$as_me:9035: result: ${with_valgrind:-no}" >&5 echo "${ECHO_T}${with_valgrind:-no}" >&6 case .$with_cflags in #(vi @@ -8932,7 +9125,7 @@ fi ;; esac -echo "$as_me:8935: checking if you want to perform memory-leak testing" >&5 +echo "$as_me:9128: checking if you want to perform memory-leak testing" >&5 echo $ECHO_N "checking if you want to perform memory-leak testing... $ECHO_C" >&6 # Check whether --with-no-leaks or --without-no-leaks was given. @@ -8956,10 +9149,10 @@ EOF else with_no_leaks= fi; -echo "$as_me:8959: result: $with_no_leaks" >&5 +echo "$as_me:9152: result: $with_no_leaks" >&5 echo "${ECHO_T}$with_no_leaks" >&6 -echo "$as_me:8962: checking if you want --trace option" >&5 +echo "$as_me:9155: checking if you want --trace option" >&5 echo $ECHO_N "checking if you want --trace option... $ECHO_C" >&6 # Check whether --enable-trace or --disable-trace was given. @@ -8969,7 +9162,7 @@ if test "${enable_trace+set}" = set; then else enableval=yes fi; -echo "$as_me:8972: result: $enableval" >&5 +echo "$as_me:9165: result: $enableval" >&5 echo "${ECHO_T}$enableval" >&6 if test "$enableval" != no ; then EXTRAOBJS="$EXTRAOBJS trace\$o" @@ -8982,9 +9175,170 @@ else : fi +LD_RPATH_OPT= +echo "$as_me:9179: checking for an rpath option" >&5 +echo $ECHO_N "checking for an rpath option... $ECHO_C" >&6 +case $cf_cv_system_name in #(vi +irix*) #(vi + if test "$GCC" = yes; then + LD_RPATH_OPT="-Wl,-rpath," + else + LD_RPATH_OPT="-rpath " + fi + ;; +linux*|gnu*|k*bsd*-gnu) #(vi + LD_RPATH_OPT="-Wl,-rpath," + ;; +openbsd[2-9].*|mirbsd*) #(vi + LD_RPATH_OPT="-Wl,-rpath," + ;; +dragonfly*|freebsd*) #(vi + LD_RPATH_OPT="-rpath " + ;; +netbsd*) #(vi + LD_RPATH_OPT="-Wl,-rpath," + ;; +osf*|mls+*) #(vi + LD_RPATH_OPT="-rpath " + ;; +solaris2*) #(vi + LD_RPATH_OPT="-R" + ;; +*) + ;; +esac +echo "$as_me:9210: result: $LD_RPATH_OPT" >&5 +echo "${ECHO_T}$LD_RPATH_OPT" >&6 + +case "x$LD_RPATH_OPT" in #(vi +x-R*) + echo "$as_me:9215: checking if we need a space after rpath option" >&5 +echo $ECHO_N "checking if we need a space after rpath option... $ECHO_C" >&6 + cf_save_LIBS="$LIBS" + LIBS="${LD_RPATH_OPT}$libdir $LIBS" + cat >conftest.$ac_ext <<_ACEOF +#line 9220 "configure" +#include "confdefs.h" + +int +main () +{ + + ; + return 0; +} +_ACEOF +rm -f conftest.$ac_objext conftest$ac_exeext +if { (eval echo "$as_me:9232: \"$ac_link\"") >&5 + (eval $ac_link) 2>&5 + ac_status=$? + echo "$as_me:9235: \$? = $ac_status" >&5 + (exit $ac_status); } && + { ac_try='test -s conftest$ac_exeext' + { (eval echo "$as_me:9238: \"$ac_try\"") >&5 + (eval $ac_try) 2>&5 + ac_status=$? + echo "$as_me:9241: \$? = $ac_status" >&5 + (exit $ac_status); }; }; then + cf_rpath_space=no +else + echo "$as_me: failed program was:" >&5 +cat conftest.$ac_ext >&5 +cf_rpath_space=yes +fi +rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext + LIBS="$cf_save_LIBS" + echo "$as_me:9251: result: $cf_rpath_space" >&5 +echo "${ECHO_T}$cf_rpath_space" >&6 + test "$cf_rpath_space" = yes && LD_RPATH_OPT="$LD_RPATH_OPT " + ;; +esac + +REL_VERSION=${VERSION_MAJOR}.${VERSION_MINOR} +ABI_VERSION=`echo "$VERSION" |sed -e 's/:/./g'` +cf_cv_rel_version=$REL_VERSION + +test -z "$cf_cv_rel_version" && cf_cv_rel_version=0.0 + +# Check whether --with-rel-version or --without-rel-version was given. +if test "${with_rel_version+set}" = set; then + withval="$with_rel_version" + { echo "$as_me:9266: WARNING: overriding release version $cf_cv_rel_version to $withval" >&5 +echo "$as_me: WARNING: overriding release version $cf_cv_rel_version to $withval" >&2;} + cf_cv_rel_version=$withval +fi; + + DIALOG_MAJOR=`echo "$cf_cv_rel_version" | sed -e 's/\..*//'` + DIALOG_MINOR=`echo "$cf_cv_rel_version" | sed -e 's/^[^.]*//' -e 's/^\.//' -e 's/\..*//'` + +if test -n "$DIALOG_MAJOR" ; then + case $DIALOG_MAJOR in #(vi + [0-9]*) #(vi + ;; + *) + { { echo "$as_me:9279: error: Release major-version is not a number: $DIALOG_MAJOR" >&5 +echo "$as_me: error: Release major-version is not a number: $DIALOG_MAJOR" >&2;} + { (exit 1); exit 1; }; } + ;; + esac +else + { { echo "$as_me:9285: error: Release major-version value is empty" >&5 +echo "$as_me: error: Release major-version value is empty" >&2;} + { (exit 1); exit 1; }; } +fi + +if test -n "$DIALOG_MINOR" ; then + case $DIALOG_MINOR in #(vi + [0-9]*) #(vi + ;; + *) + { { echo "$as_me:9295: error: Release minor-version is not a number: $DIALOG_MINOR" >&5 +echo "$as_me: error: Release minor-version is not a number: $DIALOG_MINOR" >&2;} + { (exit 1); exit 1; }; } + ;; + esac +else + { { echo "$as_me:9301: error: Release minor-version value is empty" >&5 +echo "$as_me: error: Release minor-version value is empty" >&2;} + { (exit 1); exit 1; }; } +fi + +test -z "$cf_cv_abi_version" && cf_cv_abi_version=0 + +# Check whether --with-abi-version or --without-abi-version was given. +if test "${with_abi_version+set}" = set; then + withval="$with_abi_version" + { echo "$as_me:9311: WARNING: overriding ABI version $cf_cv_abi_version to $withval" >&5 +echo "$as_me: WARNING: overriding ABI version $cf_cv_abi_version to $withval" >&2;} + cf_cv_abi_version=$withval +fi; + +if test -n "$cf_cv_abi_version" ; then + case $cf_cv_abi_version in #(vi + [0-9]*) #(vi + ;; + *) + { { echo "$as_me:9321: error: ABI version is not a number: $cf_cv_abi_version" >&5 +echo "$as_me: error: ABI version is not a number: $cf_cv_abi_version" >&2;} + { (exit 1); exit 1; }; } + ;; + esac +else + { { echo "$as_me:9327: error: ABI version value is empty" >&5 +echo "$as_me: error: ABI version value is empty" >&2;} + { (exit 1); exit 1; }; } +fi + +LIB_MODEL=static +DFT_LWR_MODEL=$LIB_MODEL LIBTOOL_MAKE="#" -echo "$as_me:8987: checking if libtool -version-number should be used" >&5 +# use to comment-out makefile lines +MAKE_NORMAL= +MAKE_STATIC= +MAKE_SHARED="#" + +echo "$as_me:9341: checking if libtool -version-number should be used" >&5 echo $ECHO_N "checking if libtool -version-number should be used... $ECHO_C" >&6 # Check whether --enable-libtool-version or --disable-libtool-version was given. @@ -9001,7 +9355,7 @@ else cf_libtool_version=yes fi; -echo "$as_me:9004: result: $cf_libtool_version" >&5 +echo "$as_me:9358: result: $cf_libtool_version" >&5 echo "${ECHO_T}$cf_libtool_version" >&6 if test "$cf_libtool_version" = yes ; then @@ -9026,7 +9380,7 @@ LIB_LINK='${CC}' LIB_INSTALL= LIB_UNINSTALL= -echo "$as_me:9029: checking if you want to build libraries with libtool" >&5 +echo "$as_me:9383: checking if you want to build libraries with libtool" >&5 echo $ECHO_N "checking if you want to build libraries with libtool... $ECHO_C" >&6 # Check whether --with-libtool or --without-libtool was given. @@ -9036,7 +9390,7 @@ if test "${with_libtool+set}" = set; then else with_libtool=no fi; -echo "$as_me:9039: result: $with_libtool" >&5 +echo "$as_me:9393: result: $with_libtool" >&5 echo "${ECHO_T}$with_libtool" >&6 if test "$with_libtool" != "no"; then @@ -9067,7 +9421,7 @@ case ".$with_libtool" in #(vi with_libtool=`echo $with_libtool | sed -e s%NONE%$cf_path_syntax%` ;; *) - { { echo "$as_me:9070: error: expected a pathname, not \"$with_libtool\"" >&5 + { { echo "$as_me:9424: error: expected a pathname, not \"$with_libtool\"" >&5 echo "$as_me: error: expected a pathname, not \"$with_libtool\"" >&2;} { (exit 1); exit 1; }; } ;; @@ -9075,46 +9429,195 @@ esac LIBTOOL=$with_libtool else - # Extract the first word of "libtool", so it can be a program name with args. -set dummy libtool; ac_word=$2 -echo "$as_me:9080: checking for $ac_word" >&5 + if test -n "$ac_tool_prefix"; then + for ac_prog in libtool glibtool + do + # Extract the first word of "$ac_tool_prefix$ac_prog", so it can be a program name with args. +set dummy $ac_tool_prefix$ac_prog; ac_word=$2 +echo "$as_me:9437: checking for $ac_word" >&5 echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6 -if test "${ac_cv_path_LIBTOOL+set}" = set; then +if test "${ac_cv_prog_LIBTOOL+set}" = set; then echo $ECHO_N "(cached) $ECHO_C" >&6 else - case $LIBTOOL in - [\\/]* | ?:[\\/]*) - ac_cv_path_LIBTOOL="$LIBTOOL" # Let the user override the test with a path. - ;; - *) + if test -n "$LIBTOOL"; then + ac_cv_prog_LIBTOOL="$LIBTOOL" # Let the user override the test. +else ac_save_IFS=$IFS; IFS=$ac_path_separator ac_dummy="$PATH" for ac_dir in $ac_dummy; do IFS=$ac_save_IFS test -z "$ac_dir" && ac_dir=. - if $as_executable_p "$ac_dir/$ac_word"; then - ac_cv_path_LIBTOOL="$ac_dir/$ac_word" - echo "$as_me:9097: found $ac_dir/$ac_word" >&5 - break + $as_executable_p "$ac_dir/$ac_word" || continue +ac_cv_prog_LIBTOOL="$ac_tool_prefix$ac_prog" +echo "$as_me:9452: found $ac_dir/$ac_word" >&5 +break +done + fi +fi +LIBTOOL=$ac_cv_prog_LIBTOOL +if test -n "$LIBTOOL"; then + echo "$as_me:9460: result: $LIBTOOL" >&5 +echo "${ECHO_T}$LIBTOOL" >&6 +else + echo "$as_me:9463: result: no" >&5 +echo "${ECHO_T}no" >&6 +fi + + test -n "$LIBTOOL" && break + done +fi +if test -z "$LIBTOOL"; then + ac_ct_LIBTOOL=$LIBTOOL + for ac_prog in libtool glibtool +do + # Extract the first word of "$ac_prog", so it can be a program name with args. +set dummy $ac_prog; ac_word=$2 +echo "$as_me:9476: checking for $ac_word" >&5 +echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6 +if test "${ac_cv_prog_ac_ct_LIBTOOL+set}" = set; then + echo $ECHO_N "(cached) $ECHO_C" >&6 +else + if test -n "$ac_ct_LIBTOOL"; then + ac_cv_prog_ac_ct_LIBTOOL="$ac_ct_LIBTOOL" # Let the user override the test. +else + ac_save_IFS=$IFS; IFS=$ac_path_separator +ac_dummy="$PATH" +for ac_dir in $ac_dummy; do + IFS=$ac_save_IFS + test -z "$ac_dir" && ac_dir=. + $as_executable_p "$ac_dir/$ac_word" || continue +ac_cv_prog_ac_ct_LIBTOOL="$ac_prog" +echo "$as_me:9491: found $ac_dir/$ac_word" >&5 +break done - ;; -esac fi -LIBTOOL=$ac_cv_path_LIBTOOL +fi +ac_ct_LIBTOOL=$ac_cv_prog_ac_ct_LIBTOOL +if test -n "$ac_ct_LIBTOOL"; then + echo "$as_me:9499: result: $ac_ct_LIBTOOL" >&5 +echo "${ECHO_T}$ac_ct_LIBTOOL" >&6 +else + echo "$as_me:9502: result: no" >&5 +echo "${ECHO_T}no" >&6 +fi + + test -n "$ac_ct_LIBTOOL" && break +done +test -n "$ac_ct_LIBTOOL" || ac_ct_LIBTOOL="none" + + LIBTOOL=$ac_ct_LIBTOOL +fi + +if test -n "$LIBTOOL" && test "$LIBTOOL" != none +then + cf_cv_libtool_version=`$LIBTOOL --version 2>&1 | sed -e '/^$/d' |sed -e '2,$d' -e 's/([^)]*)//g' -e 's/^[^1-9]*//' -e 's/[^0-9.].*//'` +else + cf_cv_libtool_version= +fi +test -z "$cf_cv_libtool_version" && unset cf_cv_libtool_version + + if test -z "$cf_cv_libtool_version" && test "$LIBTOOL" = libtool + then + +unset ac_cv_prog_ac_ct_LIBTOOL +unset ac_ct_LIBTOOL +unset LIBTOOL + + if test -n "$ac_tool_prefix"; then + for ac_prog in glibtool + do + # Extract the first word of "$ac_tool_prefix$ac_prog", so it can be a program name with args. +set dummy $ac_tool_prefix$ac_prog; ac_word=$2 +echo "$as_me:9533: checking for $ac_word" >&5 +echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6 +if test "${ac_cv_prog_LIBTOOL+set}" = set; then + echo $ECHO_N "(cached) $ECHO_C" >&6 +else + if test -n "$LIBTOOL"; then + ac_cv_prog_LIBTOOL="$LIBTOOL" # Let the user override the test. +else + ac_save_IFS=$IFS; IFS=$ac_path_separator +ac_dummy="$PATH" +for ac_dir in $ac_dummy; do + IFS=$ac_save_IFS + test -z "$ac_dir" && ac_dir=. + $as_executable_p "$ac_dir/$ac_word" || continue +ac_cv_prog_LIBTOOL="$ac_tool_prefix$ac_prog" +echo "$as_me:9548: found $ac_dir/$ac_word" >&5 +break +done +fi +fi +LIBTOOL=$ac_cv_prog_LIBTOOL if test -n "$LIBTOOL"; then - echo "$as_me:9108: result: $LIBTOOL" >&5 + echo "$as_me:9556: result: $LIBTOOL" >&5 echo "${ECHO_T}$LIBTOOL" >&6 else - echo "$as_me:9111: result: no" >&5 + echo "$as_me:9559: result: no" >&5 +echo "${ECHO_T}no" >&6 +fi + + test -n "$LIBTOOL" && break + done +fi +if test -z "$LIBTOOL"; then + ac_ct_LIBTOOL=$LIBTOOL + for ac_prog in glibtool +do + # Extract the first word of "$ac_prog", so it can be a program name with args. +set dummy $ac_prog; ac_word=$2 +echo "$as_me:9572: checking for $ac_word" >&5 +echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6 +if test "${ac_cv_prog_ac_ct_LIBTOOL+set}" = set; then + echo $ECHO_N "(cached) $ECHO_C" >&6 +else + if test -n "$ac_ct_LIBTOOL"; then + ac_cv_prog_ac_ct_LIBTOOL="$ac_ct_LIBTOOL" # Let the user override the test. +else + ac_save_IFS=$IFS; IFS=$ac_path_separator +ac_dummy="$PATH" +for ac_dir in $ac_dummy; do + IFS=$ac_save_IFS + test -z "$ac_dir" && ac_dir=. + $as_executable_p "$ac_dir/$ac_word" || continue +ac_cv_prog_ac_ct_LIBTOOL="$ac_prog" +echo "$as_me:9587: found $ac_dir/$ac_word" >&5 +break +done + +fi +fi +ac_ct_LIBTOOL=$ac_cv_prog_ac_ct_LIBTOOL +if test -n "$ac_ct_LIBTOOL"; then + echo "$as_me:9595: result: $ac_ct_LIBTOOL" >&5 +echo "${ECHO_T}$ac_ct_LIBTOOL" >&6 +else + echo "$as_me:9598: result: no" >&5 echo "${ECHO_T}no" >&6 fi + test -n "$ac_ct_LIBTOOL" && break +done +test -n "$ac_ct_LIBTOOL" || ac_ct_LIBTOOL="none" + + LIBTOOL=$ac_ct_LIBTOOL +fi + +if test -n "$LIBTOOL" && test "$LIBTOOL" != none +then + cf_cv_libtool_version=`$LIBTOOL --version 2>&1 | sed -e '/^$/d' |sed -e '2,$d' -e 's/([^)]*)//g' -e 's/^[^1-9]*//' -e 's/[^0-9.].*//'` +else + cf_cv_libtool_version= +fi +test -z "$cf_cv_libtool_version" && unset cf_cv_libtool_version + + fi fi if test -z "$LIBTOOL" ; then - { { echo "$as_me:9117: error: Cannot find libtool" >&5 + { { echo "$as_me:9620: error: Cannot find libtool" >&5 echo "$as_me: error: Cannot find libtool" >&2;} { (exit 1); exit 1; }; } fi @@ -9128,26 +9631,36 @@ echo "$as_me: error: Cannot find libtool" >&2;} LIB_UNINSTALL='${LIBTOOL} --mode=uninstall' LIB_PREP=: - # Show the version of libtool - echo "$as_me:9132: checking version of libtool" >&5 -echo $ECHO_N "checking version of libtool... $ECHO_C" >&6 +if test -n "$LIBTOOL" && test "$LIBTOOL" != none +then + echo "$as_me:9636: checking version of $LIBTOOL" >&5 +echo $ECHO_N "checking version of $LIBTOOL... $ECHO_C" >&6 - # Save the version in a cache variable - this is not entirely a good - # thing, but the version string from libtool is very ugly, and for - # bug reports it might be useful to have the original string. "(" +if test -n "$LIBTOOL" && test "$LIBTOOL" != none +then cf_cv_libtool_version=`$LIBTOOL --version 2>&1 | sed -e '/^$/d' |sed -e '2,$d' -e 's/([^)]*)//g' -e 's/^[^1-9]*//' -e 's/[^0-9.].*//'` - echo "$as_me:9139: result: $cf_cv_libtool_version" >&5 +else + cf_cv_libtool_version= +fi +test -z "$cf_cv_libtool_version" && unset cf_cv_libtool_version + + echo "$as_me:9647: result: $cf_cv_libtool_version" >&5 echo "${ECHO_T}$cf_cv_libtool_version" >&6 if test -z "$cf_cv_libtool_version" ; then - { { echo "$as_me:9142: error: This is not GNU libtool" >&5 + { { echo "$as_me:9650: error: This is not GNU libtool" >&5 echo "$as_me: error: This is not GNU libtool" >&2;} { (exit 1); exit 1; }; } fi +else + { { echo "$as_me:9655: error: GNU libtool has not been found" >&5 +echo "$as_me: error: GNU libtool has not been found" >&2;} + { (exit 1); exit 1; }; } +fi # special hack to add -no-undefined (which libtool should do for itself) LT_UNDEF= case "$cf_cv_system_name" in #(vi - cygwin*|mingw32*|uwin*|aix[4-7]) #(vi + cygwin*|msys*|mingw32*|uwin*|aix[4-7]) #(vi LT_UNDEF=-no-undefined ;; esac @@ -9169,11 +9682,15 @@ fi test -z "$LIBTOOL" && ECHO_LT= +LIB_CREATE="$LIB_CREATE \$@" + if test "$with_libtool" = "yes" ; then OBJEXT="lo" + LIB_MODEL=libtool + DFT_LWR_MODEL=$LIB_MODEL LIBTOOL_MAKE= -echo "$as_me:9176: checking for additional libtool options" >&5 +echo "$as_me:9693: checking for additional libtool options" >&5 echo $ECHO_N "checking for additional libtool options... $ECHO_C" >&6 # Check whether --with-libtool-opts or --without-libtool-opts was given. @@ -9183,7 +9700,7 @@ if test "${with_libtool_opts+set}" = set; then else with_libtool_opts=no fi; -echo "$as_me:9186: result: $with_libtool_opts" >&5 +echo "$as_me:9703: result: $with_libtool_opts" >&5 echo "${ECHO_T}$with_libtool_opts" >&6 case .$with_libtool_opts in @@ -9194,9 +9711,618 @@ case .$with_libtool_opts in ;; esac + MAKE_NORMAL="#" + MAKE_STATIC="#" + MAKE_SHARED= +else + echo "$as_me:9718: checking if you want to build shared libraries" >&5 +echo $ECHO_N "checking if you want to build shared libraries... $ECHO_C" >&6 + +# Check whether --with-shared or --without-shared was given. +if test "${with_shared+set}" = set; then + withval="$with_shared" + with_shared=$withval +else + with_shared=no +fi; + echo "$as_me:9728: result: $with_shared" >&5 +echo "${ECHO_T}$with_shared" >&6 + if test "$with_shared" = "yes" ; then + LIB_MODEL=shared + DFT_LWR_MODEL=$LIB_MODEL + + RM_SHARED_OPTS= + LOCAL_LDFLAGS= + LOCAL_LDFLAGS2= + LD_SHARED_OPTS= + INSTALL_LIB="-m 644" + : ${rel_builddir:=.} + + cf_cv_do_symlinks=no + cf_ld_rpath_opt= + test "$cf_cv_enable_rpath" = yes && cf_ld_rpath_opt="$LD_RPATH_OPT" + + echo "$as_me:9745: checking if release/abi version should be used for shared libs" >&5 +echo $ECHO_N "checking if release/abi version should be used for shared libs... $ECHO_C" >&6 + +# Check whether --with-shlib-version or --without-shlib-version was given. +if test "${with_shlib_version+set}" = set; then + withval="$with_shlib_version" + test -z "$withval" && withval=auto + case $withval in #(vi + yes) #(vi + cf_cv_shlib_version=auto + ;; + rel|abi|auto|no) #(vi + cf_cv_shlib_version=$withval + ;; + *) + { { echo "$as_me:9760: error: option value must be one of: rel, abi, auto or no" >&5 +echo "$as_me: error: option value must be one of: rel, abi, auto or no" >&2;} + { (exit 1); exit 1; }; } + ;; + esac + +else + cf_cv_shlib_version=auto +fi; + echo "$as_me:9769: result: $cf_cv_shlib_version" >&5 +echo "${ECHO_T}$cf_cv_shlib_version" >&6 + + cf_cv_rm_so_locs=no + cf_try_cflags= + + # Some less-capable ports of gcc support only -fpic + CC_SHARED_OPTS= + if test "$GCC" = yes + then + echo "$as_me:9779: checking which $CC option to use" >&5 +echo $ECHO_N "checking which $CC option to use... $ECHO_C" >&6 + cf_save_CFLAGS="$CFLAGS" + for CC_SHARED_OPTS in -fPIC -fpic '' + do + CFLAGS="$cf_save_CFLAGS $CC_SHARED_OPTS" + cat >conftest.$ac_ext <<_ACEOF +#line 9786 "configure" +#include "confdefs.h" +#include <stdio.h> +int +main () +{ +int x = 1 + ; + return 0; +} +_ACEOF +rm -f conftest.$ac_objext +if { (eval echo "$as_me:9798: \"$ac_compile\"") >&5 + (eval $ac_compile) 2>&5 + ac_status=$? + echo "$as_me:9801: \$? = $ac_status" >&5 + (exit $ac_status); } && + { ac_try='test -s conftest.$ac_objext' + { (eval echo "$as_me:9804: \"$ac_try\"") >&5 + (eval $ac_try) 2>&5 + ac_status=$? + echo "$as_me:9807: \$? = $ac_status" >&5 + (exit $ac_status); }; }; then + break +else + echo "$as_me: failed program was:" >&5 +cat conftest.$ac_ext >&5 fi +rm -f conftest.$ac_objext conftest.$ac_ext + done + echo "$as_me:9816: result: $CC_SHARED_OPTS" >&5 +echo "${ECHO_T}$CC_SHARED_OPTS" >&6 + CFLAGS="$cf_save_CFLAGS" + fi + + cf_cv_shlib_version_infix=no -echo "$as_me:9199: checking for specific curses-directory" >&5 + case $cf_cv_system_name in #(vi + aix4.3-9*|aix[5-7]*) #(vi + if test "$GCC" = yes; then + CC_SHARED_OPTS= + MK_SHARED_LIB='${CC} -shared -Wl,-brtl -Wl,-blibpath:${RPATH_LIST}:/usr/lib -o $@' + else + # CC_SHARED_OPTS='-qpic=large -G' + # perhaps "-bM:SRE -bnoentry -bexpall" + MK_SHARED_LIB='${CC} -G -Wl,-brtl -Wl,-blibpath:${RPATH_LIST}:/usr/lib -o $@' + fi + ;; + beos*) #(vi + MK_SHARED_LIB='${CC} ${CFLAGS} -o $@ -Xlinker -soname=`basename $@` -nostart -e 0' + ;; + cygwin*) #(vi + CC_SHARED_OPTS= + MK_SHARED_LIB='sh '$rel_builddir'/mk_shared_lib.sh $@ ${CC} ${CFLAGS}' + RM_SHARED_OPTS="$RM_SHARED_OPTS $rel_builddir/mk_shared_lib.sh *.dll.a" + cf_cv_shlib_version=cygdll + cf_cv_shlib_version_infix=cygdll + cat >mk_shared_lib.sh <<-CF_EOF + #!/bin/sh + SHARED_LIB=\$1 + IMPORT_LIB=\`echo "\$1" | sed -e 's/cyg/lib/' -e 's/[0-9]*\.dll$/.dll.a/'\` + shift + cat <<-EOF + Linking shared library + ** SHARED_LIB \$SHARED_LIB + ** IMPORT_LIB \$IMPORT_LIB +EOF + exec \$* -shared -Wl,--out-implib=\${IMPORT_LIB} -Wl,--export-all-symbols -o \${SHARED_LIB} +CF_EOF + chmod +x mk_shared_lib.sh + ;; + msys*) #(vi + CC_SHARED_OPTS= + MK_SHARED_LIB='sh '$rel_builddir'/mk_shared_lib.sh $@ ${CC} ${CFLAGS}' + RM_SHARED_OPTS="$RM_SHARED_OPTS $rel_builddir/mk_shared_lib.sh *.dll.a" + cf_cv_shlib_version=msysdll + cf_cv_shlib_version_infix=msysdll + cat >mk_shared_lib.sh <<-CF_EOF + #!/bin/sh + SHARED_LIB=\$1 + IMPORT_LIB=\`echo "\$1" | sed -e 's/msys-/lib/' -e 's/[0-9]*\.dll$/.dll.a/'\` + shift + cat <<-EOF + Linking shared library + ** SHARED_LIB \$SHARED_LIB + ** IMPORT_LIB \$IMPORT_LIB +EOF + exec \$* -shared -Wl,--out-implib=\${IMPORT_LIB} -Wl,--export-all-symbols -o \${SHARED_LIB} +CF_EOF + chmod +x mk_shared_lib.sh + ;; + darwin*) #(vi + cf_try_cflags="no-cpp-precomp" + CC_SHARED_OPTS="-dynamic" + MK_SHARED_LIB='${CC} ${CFLAGS} -dynamiclib -install_name ${libdir}/`basename $@` -compatibility_version ${ABI_VERSION} -current_version ${ABI_VERSION} -o $@' + test "$cf_cv_shlib_version" = auto && cf_cv_shlib_version=abi + cf_cv_shlib_version_infix=yes + echo "$as_me:9883: checking if ld -search_paths_first works" >&5 +echo $ECHO_N "checking if ld -search_paths_first works... $ECHO_C" >&6 +if test "${cf_cv_ldflags_search_paths_first+set}" = set; then + echo $ECHO_N "(cached) $ECHO_C" >&6 +else + + cf_save_LDFLAGS=$LDFLAGS + LDFLAGS="$LDFLAGS -Wl,-search_paths_first" + cat >conftest.$ac_ext <<_ACEOF +#line 9892 "configure" +#include "confdefs.h" + +int +main () +{ +int i; + ; + return 0; +} +_ACEOF +rm -f conftest.$ac_objext conftest$ac_exeext +if { (eval echo "$as_me:9904: \"$ac_link\"") >&5 + (eval $ac_link) 2>&5 + ac_status=$? + echo "$as_me:9907: \$? = $ac_status" >&5 + (exit $ac_status); } && + { ac_try='test -s conftest$ac_exeext' + { (eval echo "$as_me:9910: \"$ac_try\"") >&5 + (eval $ac_try) 2>&5 + ac_status=$? + echo "$as_me:9913: \$? = $ac_status" >&5 + (exit $ac_status); }; }; then + cf_cv_ldflags_search_paths_first=yes +else + echo "$as_me: failed program was:" >&5 +cat conftest.$ac_ext >&5 +cf_cv_ldflags_search_paths_first=no +fi +rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext + LDFLAGS=$cf_save_LDFLAGS +fi +echo "$as_me:9924: result: $cf_cv_ldflags_search_paths_first" >&5 +echo "${ECHO_T}$cf_cv_ldflags_search_paths_first" >&6 + if test $cf_cv_ldflags_search_paths_first = yes; then + LDFLAGS="$LDFLAGS -Wl,-search_paths_first" + fi + ;; + hpux[7-8]*) #(vi + # HP-UX 8.07 ld lacks "+b" option used for libdir search-list + if test "$GCC" != yes; then + CC_SHARED_OPTS='+Z' + fi + MK_SHARED_LIB='${LD} -b -o $@' + INSTALL_LIB="-m 555" + ;; + hpux*) #(vi + # (tested with gcc 2.7.2 -- I don't have c89) + if test "$GCC" = yes; then + LD_SHARED_OPTS='-Xlinker +b -Xlinker ${libdir}' + else + CC_SHARED_OPTS='+Z' + LD_SHARED_OPTS='-Wl,+b,${libdir}' + fi + MK_SHARED_LIB='${LD} +b ${libdir} -b -o $@' + # HP-UX shared libraries must be executable, and should be + # readonly to exploit a quirk in the memory manager. + INSTALL_LIB="-m 555" + ;; + interix*) + test "$cf_cv_shlib_version" = auto && cf_cv_shlib_version=rel + if test "$cf_cv_shlib_version" = rel; then + cf_shared_soname='`basename .${REL_VERSION}`.${ABI_VERSION}' + else + cf_shared_soname='`basename `' + fi + CC_SHARED_OPTS= + MK_SHARED_LIB='${CC} -shared -Wl,-rpath,${RPATH_LIST} -Wl,-h,'$cf_shared_soname' -o ' + ;; + irix*) #(vi + if test "$cf_cv_enable_rpath" = yes ; then + EXTRA_LDFLAGS="${cf_ld_rpath_opt}\${RPATH_LIST} $EXTRA_LDFLAGS" + fi + # tested with IRIX 5.2 and 'cc'. + if test "$GCC" != yes; then + CC_SHARED_OPTS='-KPIC' + MK_SHARED_LIB='${CC} -shared -rdata_shared -soname `basename $@` -o $@' + else + MK_SHARED_LIB='${CC} -shared -Wl,-soname,`basename $@` -o $@' + fi + cf_cv_rm_so_locs=yes + ;; + linux*|gnu*|k*bsd*-gnu) #(vi + if test "$DFT_LWR_MODEL" = "shared" ; then + LOCAL_LDFLAGS="${LD_RPATH_OPT}\$(LOCAL_LIBDIR)" + LOCAL_LDFLAGS2="$LOCAL_LDFLAGS" + fi + if test "$cf_cv_enable_rpath" = yes ; then + EXTRA_LDFLAGS="${cf_ld_rpath_opt}\${RPATH_LIST} $EXTRA_LDFLAGS" + fi + + test "$cf_cv_shlib_version" = auto && cf_cv_shlib_version=rel + if test "$cf_cv_shlib_version" = rel; then + cf_cv_shared_soname='`basename $@ .${REL_VERSION}`.${ABI_VERSION}' + else + cf_cv_shared_soname='`basename $@`' + fi + + MK_SHARED_LIB='${CC} ${CFLAGS} -shared -Wl,-soname,'$cf_cv_shared_soname',-stats,-lc -o $@' + ;; + mingw*) #(vi + cf_cv_shlib_version=mingw + cf_cv_shlib_version_infix=mingw + if test "$DFT_LWR_MODEL" = "shared" ; then + LOCAL_LDFLAGS="-Wl,--enable-auto-import" + LOCAL_LDFLAGS2="$LOCAL_LDFLAGS" + EXTRA_LDFLAGS="-Wl,--enable-auto-import $EXTRA_LDFLAGS" + fi + CC_SHARED_OPTS= + MK_SHARED_LIB='sh '$rel_builddir'/mk_shared_lib.sh $@ ${CC} ${CFLAGS}' + RM_SHARED_OPTS="$RM_SHARED_OPTS $rel_builddir/mk_shared_lib.sh *.dll.a" + cat >mk_shared_lib.sh <<-CF_EOF + #!/bin/sh + SHARED_LIB=\$1 + IMPORT_LIB=\`echo "\$1" | sed -e 's/[0-9]*\.dll$/.dll.a/'\` + shift + cat <<-EOF + Linking shared library + ** SHARED_LIB \$SHARED_LIB + ** IMPORT_LIB \$IMPORT_LIB +EOF + exec \$* -shared -Wl,--enable-auto-import,--out-implib=\${IMPORT_LIB} -Wl,--export-all-symbols -o \${SHARED_LIB} +CF_EOF + chmod +x mk_shared_lib.sh + ;; + openbsd[2-9].*|mirbsd*) #(vi + if test "$DFT_LWR_MODEL" = "shared" ; then + LOCAL_LDFLAGS="${LD_RPATH_OPT}\$(LOCAL_LIBDIR)" + LOCAL_LDFLAGS2="$LOCAL_LDFLAGS" + fi + if test "$cf_cv_enable_rpath" = yes ; then + EXTRA_LDFLAGS="${cf_ld_rpath_opt}\${RPATH_LIST} $EXTRA_LDFLAGS" + fi + CC_SHARED_OPTS="$CC_SHARED_OPTS -DPIC" + + test "$cf_cv_shlib_version" = auto && cf_cv_shlib_version=rel + if test "$cf_cv_shlib_version" = rel; then + cf_cv_shared_soname='`basename $@ .${REL_VERSION}`.${ABI_VERSION}' + else + cf_cv_shared_soname='`basename $@`' + fi + + MK_SHARED_LIB='${CC} ${CFLAGS} -shared -Wl,-Bshareable,-soname,'$cf_cv_shared_soname',-stats,-lc -o $@' + ;; + nto-qnx*|openbsd*|freebsd[12].*) #(vi + CC_SHARED_OPTS="$CC_SHARED_OPTS -DPIC" + MK_SHARED_LIB='${LD} -Bshareable -o $@' + test "$cf_cv_shlib_version" = auto && cf_cv_shlib_version=rel + ;; + dragonfly*|freebsd*) #(vi + CC_SHARED_OPTS="$CC_SHARED_OPTS -DPIC" + if test "$DFT_LWR_MODEL" = "shared" && test "$cf_cv_enable_rpath" = yes ; then + LOCAL_LDFLAGS="${cf_ld_rpath_opt}\$(LOCAL_LIBDIR)" + LOCAL_LDFLAGS2="${cf_ld_rpath_opt}\${RPATH_LIST} $LOCAL_LDFLAGS" + EXTRA_LDFLAGS="${cf_ld_rpath_opt}\${RPATH_LIST} $EXTRA_LDFLAGS" + fi + + test "$cf_cv_shlib_version" = auto && cf_cv_shlib_version=rel + if test "$cf_cv_shlib_version" = rel; then + cf_cv_shared_soname='`basename $@ .${REL_VERSION}`.${ABI_VERSION}' + else + cf_cv_shared_soname='`basename $@`' + fi + + MK_SHARED_LIB='${LD} -shared -Bshareable -soname=`basename $@` -o $@' + ;; + netbsd*) #(vi + CC_SHARED_OPTS="$CC_SHARED_OPTS -DPIC" + if test "$DFT_LWR_MODEL" = "shared" && test "$cf_cv_enable_rpath" = yes ; then + LOCAL_LDFLAGS="${cf_ld_rpath_opt}\$(LOCAL_LIBDIR)" + LOCAL_LDFLAGS2="$LOCAL_LDFLAGS" + EXTRA_LDFLAGS="${cf_ld_rpath_opt}\${RPATH_LIST} $EXTRA_LDFLAGS" + if test "$cf_cv_shlib_version" = auto; then + if test -f /usr/libexec/ld.elf_so; then + cf_cv_shlib_version=abi + else + cf_cv_shlib_version=rel + fi + fi + + test "$cf_cv_shlib_version" = auto && cf_cv_shlib_version=rel + if test "$cf_cv_shlib_version" = rel; then + cf_cv_shared_soname='`basename $@ .${REL_VERSION}`.${ABI_VERSION}' + else + cf_cv_shared_soname='`basename $@`' + fi + + MK_SHARED_LIB='${CC} ${CFLAGS} -shared -Wl,-soname,'$cf_cv_shared_soname' -o $@' + else + MK_SHARED_LIB='${CC} -Wl,-shared -Wl,-Bshareable -o $@' + fi + ;; + osf*|mls+*) #(vi + # tested with OSF/1 V3.2 and 'cc' + # tested with OSF/1 V3.2 and gcc 2.6.3 (but the c++ demo didn't + # link with shared libs). + MK_SHARED_LIB='${LD} -set_version ${REL_VERSION}:${ABI_VERSION} -expect_unresolved "*" -shared -soname `basename $@`' + case $host_os in #(vi + osf4*) + MK_SHARED_LIB="${MK_SHARED_LIB} -msym" + ;; + esac + MK_SHARED_LIB="${MK_SHARED_LIB}"' -o $@' + if test "$DFT_LWR_MODEL" = "shared" ; then + LOCAL_LDFLAGS="${LD_RPATH_OPT}\$(LOCAL_LIBDIR)" + LOCAL_LDFLAGS2="$LOCAL_LDFLAGS" + fi + cf_cv_rm_so_locs=yes + ;; + sco3.2v5*) # (also uw2* and UW7: hops 13-Apr-98 + # tested with osr5.0.5 + if test "$GCC" != yes; then + CC_SHARED_OPTS='-belf -KPIC' + fi + MK_SHARED_LIB='${LD} -dy -G -h `basename $@ .${REL_VERSION}`.${ABI_VERSION} -o $@' + if test "$cf_cv_enable_rpath" = yes ; then + # only way is to set LD_RUN_PATH but no switch for it + RUN_PATH=$libdir + fi + test "$cf_cv_shlib_version" = auto && cf_cv_shlib_version=rel + LINK_PROGS='LD_RUN_PATH=${libdir}' + LINK_TESTS='Pwd=`pwd`;LD_RUN_PATH=`dirname $${Pwd}`/lib' + ;; + sunos4*) #(vi + # tested with SunOS 4.1.1 and gcc 2.7.0 + if test "$GCC" != yes; then + CC_SHARED_OPTS='-KPIC' + fi + MK_SHARED_LIB='${LD} -assert pure-text -o $@' + test "$cf_cv_shlib_version" = auto && cf_cv_shlib_version=rel + ;; + solaris2*) #(vi + # tested with SunOS 5.5.1 (solaris 2.5.1) and gcc 2.7.2 + # tested with SunOS 5.10 (solaris 10) and gcc 3.4.3 + if test "$DFT_LWR_MODEL" = "shared" ; then + LOCAL_LDFLAGS="-R \$(LOCAL_LIBDIR):\${libdir}" + LOCAL_LDFLAGS2="$LOCAL_LDFLAGS" + fi + if test "$cf_cv_enable_rpath" = yes ; then + EXTRA_LDFLAGS="-R \${libdir} $EXTRA_LDFLAGS" + fi + + test "$cf_cv_shlib_version" = auto && cf_cv_shlib_version=rel + if test "$cf_cv_shlib_version" = rel; then + cf_cv_shared_soname='`basename $@ .${REL_VERSION}`.${ABI_VERSION}' + else + cf_cv_shared_soname='`basename $@`' + fi + + if test "$GCC" != yes; then + cf_save_CFLAGS="$CFLAGS" + for cf_shared_opts in -xcode=pic32 -xcode=pic13 -KPIC -Kpic -O + do + CFLAGS="$cf_shared_opts $cf_save_CFLAGS" + cat >conftest.$ac_ext <<_ACEOF +#line 10147 "configure" +#include "confdefs.h" +#include <stdio.h> +int +main () +{ +printf("Hello\n"); + ; + return 0; +} +_ACEOF +rm -f conftest.$ac_objext +if { (eval echo "$as_me:10159: \"$ac_compile\"") >&5 + (eval $ac_compile) 2>&5 + ac_status=$? + echo "$as_me:10162: \$? = $ac_status" >&5 + (exit $ac_status); } && + { ac_try='test -s conftest.$ac_objext' + { (eval echo "$as_me:10165: \"$ac_try\"") >&5 + (eval $ac_try) 2>&5 + ac_status=$? + echo "$as_me:10168: \$? = $ac_status" >&5 + (exit $ac_status); }; }; then + break +else + echo "$as_me: failed program was:" >&5 +cat conftest.$ac_ext >&5 +fi +rm -f conftest.$ac_objext conftest.$ac_ext + done + CFLAGS="$cf_save_CFLAGS" + CC_SHARED_OPTS=$cf_shared_opts + MK_SHARED_LIB='${CC} -dy -G -h '$cf_cv_shared_soname' -o $@' + else + MK_SHARED_LIB='${CC} -shared -dy -G -h '$cf_cv_shared_soname' -o $@' + fi + ;; + sysv5uw7*|unix_sv*) #(vi + # tested with UnixWare 7.1.0 (gcc 2.95.2 and cc) + if test "$GCC" != yes; then + CC_SHARED_OPTS='-KPIC' + fi + MK_SHARED_LIB='${LD} -d y -G -o $@' + ;; + *) + CC_SHARED_OPTS='unknown' + MK_SHARED_LIB='echo unknown' + ;; + esac + + # This works if the last tokens in $MK_SHARED_LIB are the -o target. + case "$cf_cv_shlib_version" in #(vi + rel|abi) + case "$MK_SHARED_LIB" in #(vi + *'-o $@') #(vi + test "$cf_cv_do_symlinks" = no && cf_cv_do_symlinks=yes + ;; + *) + { echo "$as_me:10205: WARNING: ignored --with-shlib-version" >&5 +echo "$as_me: WARNING: ignored --with-shlib-version" >&2;} + ;; + esac + ;; + esac + + if test -n "$cf_try_cflags" + then +cat > conftest.$ac_ext <<EOF +#line 10215 "${as_me:-configure}" +#include <stdio.h> +int main(int argc, char *argv[]) +{ + printf("hello\n"); + return (argv[argc-1] == 0) ; +} +EOF + cf_save_CFLAGS="$CFLAGS" + for cf_opt in $cf_try_cflags + do + CFLAGS="$cf_save_CFLAGS -$cf_opt" + echo "$as_me:10227: checking if CFLAGS option -$cf_opt works" >&5 +echo $ECHO_N "checking if CFLAGS option -$cf_opt works... $ECHO_C" >&6 + if { (eval echo "$as_me:10229: \"$ac_compile\"") >&5 + (eval $ac_compile) 2>&5 + ac_status=$? + echo "$as_me:10232: \$? = $ac_status" >&5 + (exit $ac_status); }; then + echo "$as_me:10234: result: yes" >&5 +echo "${ECHO_T}yes" >&6 + cf_save_CFLAGS="$CFLAGS" + else + echo "$as_me:10238: result: no" >&5 +echo "${ECHO_T}no" >&6 + fi + done + CFLAGS="$cf_save_CFLAGS" + fi + + # RPATH_LIST is a colon-separated list of directories + test -n "$cf_ld_rpath_opt" && MK_SHARED_LIB="$MK_SHARED_LIB $cf_ld_rpath_opt\${RPATH_LIST}" + test -z "$RPATH_LIST" && RPATH_LIST="\${libdir}" + + test $cf_cv_rm_so_locs = yes && RM_SHARED_OPTS="$RM_SHARED_OPTS so_locations" + + test -n "$verbose" && echo " CC_SHARED_OPTS: $CC_SHARED_OPTS" 1>&6 + +echo "${as_me:-configure}:10253: testing CC_SHARED_OPTS: $CC_SHARED_OPTS ..." 1>&5 + + test -n "$verbose" && echo " MK_SHARED_LIB: $MK_SHARED_LIB" 1>&6 + +echo "${as_me:-configure}:10257: testing MK_SHARED_LIB: $MK_SHARED_LIB ..." 1>&5 + + LIB_PREP=: + LIB_CREATE="$MK_SHARED_LIB" + CFLAGS="$CFLAGS $CC_SHARED_OPTS" + MAKE_NORMAL="#" + MAKE_STATIC="#" + MAKE_SHARED= + fi +fi + +LIB_SUFFIX= + + case X$LIB_MODEL in #(vi + Xlibtool) #(vi + DFT_LIB_SUFFIX='.la' + DFT_DEP_SUFFIX=$DFT_LIB_SUFFIX + ;; + Xdebug) #(vi + DFT_LIB_SUFFIX='_g.a' + DFT_DEP_SUFFIX=$DFT_LIB_SUFFIX + ;; + Xprofile) #(vi + DFT_LIB_SUFFIX='_p.a' + DFT_DEP_SUFFIX=$DFT_LIB_SUFFIX + ;; + Xshared) #(vi + case $cf_cv_system_name in + aix[5-7]*) #(vi + DFT_LIB_SUFFIX='.a' + DFT_DEP_SUFFIX=$DFT_LIB_SUFFIX + ;; + cygwin*|msys*|mingw*) #(vi + DFT_LIB_SUFFIX='.dll' + DFT_DEP_SUFFIX='.dll.a' + ;; + darwin*) #(vi + DFT_LIB_SUFFIX='.dylib' + DFT_DEP_SUFFIX=$DFT_LIB_SUFFIX + ;; + hpux*) #(vi + case $target in + ia64*) #(vi + DFT_LIB_SUFFIX='.so' + DFT_DEP_SUFFIX=$DFT_LIB_SUFFIX + ;; + *) #(vi + DFT_LIB_SUFFIX='.sl' + DFT_DEP_SUFFIX=$DFT_LIB_SUFFIX + ;; + esac + ;; + *) #(vi + DFT_LIB_SUFFIX='.so' + DFT_DEP_SUFFIX=$DFT_LIB_SUFFIX + ;; + esac + ;; + *) + DFT_LIB_SUFFIX='.a' + DFT_DEP_SUFFIX=$DFT_LIB_SUFFIX + ;; + esac + test -n "$LIB_SUFFIX" && DFT_LIB_SUFFIX="${LIB_SUFFIX}${DFT_LIB_SUFFIX}" + test -n "$LIB_SUFFIX" && DFT_DEP_SUFFIX="${LIB_SUFFIX}${DFT_DEP_SUFFIX}" + +LIB_SUFFIX=$DFT_LIB_SUFFIX + +echo "$as_me:10325: checking for specific curses-directory" >&5 echo $ECHO_N "checking for specific curses-directory... $ECHO_C" >&6 # Check whether --with-curses-dir or --without-curses-dir was given. @@ -9206,7 +10332,7 @@ if test "${with_curses_dir+set}" = set; then else cf_cv_curses_dir=no fi; -echo "$as_me:9209: result: $cf_cv_curses_dir" >&5 +echo "$as_me:10335: result: $cf_cv_curses_dir" >&5 echo "${ECHO_T}$cf_cv_curses_dir" >&6 if ( test -n "$cf_cv_curses_dir" && test "$cf_cv_curses_dir" != "no" ) @@ -9237,7 +10363,7 @@ case ".$withval" in #(vi withval=`echo $withval | sed -e s%NONE%$cf_path_syntax%` ;; *) - { { echo "$as_me:9240: error: expected a pathname, not \"$withval\"" >&5 + { { echo "$as_me:10366: error: expected a pathname, not \"$withval\"" >&5 echo "$as_me: error: expected a pathname, not \"$withval\"" >&2;} { (exit 1); exit 1; }; } ;; @@ -9270,7 +10396,7 @@ if test -n "$cf_cv_curses_dir/include" ; then cf_save_CPPFLAGS=$CPPFLAGS CPPFLAGS="$CPPFLAGS -I$cf_add_incdir" cat >conftest.$ac_ext <<_ACEOF -#line 9273 "configure" +#line 10399 "configure" #include "confdefs.h" #include <stdio.h> int @@ -9282,16 +10408,16 @@ printf("Hello") } _ACEOF rm -f conftest.$ac_objext -if { (eval echo "$as_me:9285: \"$ac_compile\"") >&5 +if { (eval echo "$as_me:10411: \"$ac_compile\"") >&5 (eval $ac_compile) 2>&5 ac_status=$? - echo "$as_me:9288: \$? = $ac_status" >&5 + echo "$as_me:10414: \$? = $ac_status" >&5 (exit $ac_status); } && { ac_try='test -s conftest.$ac_objext' - { (eval echo "$as_me:9291: \"$ac_try\"") >&5 + { (eval echo "$as_me:10417: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? - echo "$as_me:9294: \$? = $ac_status" >&5 + echo "$as_me:10420: \$? = $ac_status" >&5 (exit $ac_status); }; }; then : else @@ -9308,7 +10434,7 @@ rm -f conftest.$ac_objext conftest.$ac_ext if test "$cf_have_incdir" = no ; then test -n "$verbose" && echo " adding $cf_add_incdir to include-path" 1>&6 -echo "${as_me:-configure}:9311: testing adding $cf_add_incdir to include-path ..." 1>&5 +echo "${as_me:-configure}:10437: testing adding $cf_add_incdir to include-path ..." 1>&5 CPPFLAGS="$CPPFLAGS -I$cf_add_incdir" @@ -9342,7 +10468,7 @@ if test -n "$cf_cv_curses_dir/lib" ; then if test "$cf_have_libdir" = no ; then test -n "$verbose" && echo " adding $cf_add_libdir to library-path" 1>&6 -echo "${as_me:-configure}:9345: testing adding $cf_add_libdir to library-path ..." 1>&5 +echo "${as_me:-configure}:10471: testing adding $cf_add_libdir to library-path ..." 1>&5 LDFLAGS="-L$cf_add_libdir $LDFLAGS" fi @@ -9353,6 +10479,19 @@ fi fi fi +echo "$as_me:10482: checking if rpath option should be used" >&5 +echo $ECHO_N "checking if rpath option should be used... $ECHO_C" >&6 + +# Check whether --enable-rpath or --disable-rpath was given. +if test "${enable_rpath+set}" = set; then + enableval="$enable_rpath" + cf_cv_enable_rpath=$enableval +else + cf_cv_enable_rpath=no +fi; +echo "$as_me:10492: result: $cf_cv_enable_rpath" >&5 +echo "${ECHO_T}$cf_cv_enable_rpath" >&6 + use_ncurses=no # Check whether --with-ncurses or --without-ncurses was given. @@ -9370,7 +10509,7 @@ if test $use_ncurses != no ; then cf_wide_curses=yes if test $use_ncurses = ncursesw ; then -echo "$as_me:9373: checking for multibyte character support" >&5 +echo "$as_me:10512: checking for multibyte character support" >&5 echo $ECHO_N "checking for multibyte character support... $ECHO_C" >&6 if test "${cf_cv_utf8_lib+set}" = set; then echo $ECHO_N "(cached) $ECHO_C" >&6 @@ -9378,7 +10517,7 @@ else cf_save_LIBS="$LIBS" cat >conftest.$ac_ext <<_ACEOF -#line 9381 "configure" +#line 10520 "configure" #include "confdefs.h" #include <stdlib.h> @@ -9391,16 +10530,16 @@ putwc(0,0); } _ACEOF rm -f conftest.$ac_objext conftest$ac_exeext -if { (eval echo "$as_me:9394: \"$ac_link\"") >&5 +if { (eval echo "$as_me:10533: \"$ac_link\"") >&5 (eval $ac_link) 2>&5 ac_status=$? - echo "$as_me:9397: \$? = $ac_status" >&5 + echo "$as_me:10536: \$? = $ac_status" >&5 (exit $ac_status); } && { ac_try='test -s conftest$ac_exeext' - { (eval echo "$as_me:9400: \"$ac_try\"") >&5 + { (eval echo "$as_me:10539: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? - echo "$as_me:9403: \$? = $ac_status" >&5 + echo "$as_me:10542: \$? = $ac_status" >&5 (exit $ac_status); }; }; then cf_cv_utf8_lib=yes else @@ -9412,12 +10551,12 @@ cat conftest.$ac_ext >&5 cf_cv_header_path_utf8= cf_cv_library_path_utf8= -echo "${as_me:-configure}:9415: testing Starting FIND_LINKAGE(utf8,) ..." 1>&5 +echo "${as_me:-configure}:10554: testing Starting FIND_LINKAGE(utf8,) ..." 1>&5 cf_save_LIBS="$LIBS" cat >conftest.$ac_ext <<_ACEOF -#line 9420 "configure" +#line 10559 "configure" #include "confdefs.h" #include <libutf8.h> @@ -9430,16 +10569,16 @@ putwc(0,0); } _ACEOF rm -f conftest.$ac_objext conftest$ac_exeext -if { (eval echo "$as_me:9433: \"$ac_link\"") >&5 +if { (eval echo "$as_me:10572: \"$ac_link\"") >&5 (eval $ac_link) 2>&5 ac_status=$? - echo "$as_me:9436: \$? = $ac_status" >&5 + echo "$as_me:10575: \$? = $ac_status" >&5 (exit $ac_status); } && { ac_try='test -s conftest$ac_exeext' - { (eval echo "$as_me:9439: \"$ac_try\"") >&5 + { (eval echo "$as_me:10578: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? - echo "$as_me:9442: \$? = $ac_status" >&5 + echo "$as_me:10581: \$? = $ac_status" >&5 (exit $ac_status); }; }; then cf_cv_find_linkage_utf8=yes @@ -9453,7 +10592,7 @@ cat conftest.$ac_ext >&5 LIBS="-lutf8 $cf_save_LIBS" cat >conftest.$ac_ext <<_ACEOF -#line 9456 "configure" +#line 10595 "configure" #include "confdefs.h" #include <libutf8.h> @@ -9466,16 +10605,16 @@ putwc(0,0); } _ACEOF rm -f conftest.$ac_objext conftest$ac_exeext -if { (eval echo "$as_me:9469: \"$ac_link\"") >&5 +if { (eval echo "$as_me:10608: \"$ac_link\"") >&5 (eval $ac_link) 2>&5 ac_status=$? - echo "$as_me:9472: \$? = $ac_status" >&5 + echo "$as_me:10611: \$? = $ac_status" >&5 (exit $ac_status); } && { ac_try='test -s conftest$ac_exeext' - { (eval echo "$as_me:9475: \"$ac_try\"") >&5 + { (eval echo "$as_me:10614: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? - echo "$as_me:9478: \$? = $ac_status" >&5 + echo "$as_me:10617: \$? = $ac_status" >&5 (exit $ac_status); }; }; then cf_cv_find_linkage_utf8=yes @@ -9492,9 +10631,9 @@ cat conftest.$ac_ext >&5 test -n "$verbose" && echo " find linkage for utf8 library" 1>&6 -echo "${as_me:-configure}:9495: testing find linkage for utf8 library ..." 1>&5 +echo "${as_me:-configure}:10634: testing find linkage for utf8 library ..." 1>&5 -echo "${as_me:-configure}:9497: testing Searching for headers in FIND_LINKAGE(utf8,) ..." 1>&5 +echo "${as_me:-configure}:10636: testing Searching for headers in FIND_LINKAGE(utf8,) ..." 1>&5 cf_save_CPPFLAGS="$CPPFLAGS" cf_test_CPPFLAGS="$CPPFLAGS" @@ -9607,11 +10746,11 @@ cf_search="$cf_search $cf_header_path_list" if test -d $cf_cv_header_path_utf8 ; then test -n "$verbose" && echo " ... testing $cf_cv_header_path_utf8" 1>&6 -echo "${as_me:-configure}:9610: testing ... testing $cf_cv_header_path_utf8 ..." 1>&5 +echo "${as_me:-configure}:10749: testing ... testing $cf_cv_header_path_utf8 ..." 1>&5 CPPFLAGS="$cf_save_CPPFLAGS -I$cf_cv_header_path_utf8" cat >conftest.$ac_ext <<_ACEOF -#line 9614 "configure" +#line 10753 "configure" #include "confdefs.h" #include <libutf8.h> @@ -9624,21 +10763,21 @@ putwc(0,0); } _ACEOF rm -f conftest.$ac_objext -if { (eval echo "$as_me:9627: \"$ac_compile\"") >&5 +if { (eval echo "$as_me:10766: \"$ac_compile\"") >&5 (eval $ac_compile) 2>&5 ac_status=$? - echo "$as_me:9630: \$? = $ac_status" >&5 + echo "$as_me:10769: \$? = $ac_status" >&5 (exit $ac_status); } && { ac_try='test -s conftest.$ac_objext' - { (eval echo "$as_me:9633: \"$ac_try\"") >&5 + { (eval echo "$as_me:10772: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? - echo "$as_me:9636: \$? = $ac_status" >&5 + echo "$as_me:10775: \$? = $ac_status" >&5 (exit $ac_status); }; }; then test -n "$verbose" && echo " ... found utf8 headers in $cf_cv_header_path_utf8" 1>&6 -echo "${as_me:-configure}:9641: testing ... found utf8 headers in $cf_cv_header_path_utf8 ..." 1>&5 +echo "${as_me:-configure}:10780: testing ... found utf8 headers in $cf_cv_header_path_utf8 ..." 1>&5 cf_cv_find_linkage_utf8=maybe cf_test_CPPFLAGS="$CPPFLAGS" @@ -9656,7 +10795,7 @@ rm -f conftest.$ac_objext conftest.$ac_ext if test "$cf_cv_find_linkage_utf8" = maybe ; then -echo "${as_me:-configure}:9659: testing Searching for utf8 library in FIND_LINKAGE(utf8,) ..." 1>&5 +echo "${as_me:-configure}:10798: testing Searching for utf8 library in FIND_LINKAGE(utf8,) ..." 1>&5 cf_save_LIBS="$LIBS" cf_save_LDFLAGS="$LDFLAGS" @@ -9753,13 +10892,13 @@ cf_search="$cf_library_path_list $cf_search" if test -d $cf_cv_library_path_utf8 ; then test -n "$verbose" && echo " ... testing $cf_cv_library_path_utf8" 1>&6 -echo "${as_me:-configure}:9756: testing ... testing $cf_cv_library_path_utf8 ..." 1>&5 +echo "${as_me:-configure}:10895: testing ... testing $cf_cv_library_path_utf8 ..." 1>&5 CPPFLAGS="$cf_test_CPPFLAGS" LIBS="-lutf8 $cf_save_LIBS" LDFLAGS="$cf_save_LDFLAGS -L$cf_cv_library_path_utf8" cat >conftest.$ac_ext <<_ACEOF -#line 9762 "configure" +#line 10901 "configure" #include "confdefs.h" #include <libutf8.h> @@ -9772,21 +10911,21 @@ putwc(0,0); } _ACEOF rm -f conftest.$ac_objext conftest$ac_exeext -if { (eval echo "$as_me:9775: \"$ac_link\"") >&5 +if { (eval echo "$as_me:10914: \"$ac_link\"") >&5 (eval $ac_link) 2>&5 ac_status=$? - echo "$as_me:9778: \$? = $ac_status" >&5 + echo "$as_me:10917: \$? = $ac_status" >&5 (exit $ac_status); } && { ac_try='test -s conftest$ac_exeext' - { (eval echo "$as_me:9781: \"$ac_try\"") >&5 + { (eval echo "$as_me:10920: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? - echo "$as_me:9784: \$? = $ac_status" >&5 + echo "$as_me:10923: \$? = $ac_status" >&5 (exit $ac_status); }; }; then test -n "$verbose" && echo " ... found utf8 library in $cf_cv_library_path_utf8" 1>&6 -echo "${as_me:-configure}:9789: testing ... found utf8 library in $cf_cv_library_path_utf8 ..." 1>&5 +echo "${as_me:-configure}:10928: testing ... found utf8 library in $cf_cv_library_path_utf8 ..." 1>&5 cf_cv_find_linkage_utf8=yes cf_cv_library_file_utf8="-lutf8" @@ -9828,7 +10967,7 @@ fi fi rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext fi -echo "$as_me:9831: result: $cf_cv_utf8_lib" >&5 +echo "$as_me:10970: result: $cf_cv_utf8_lib" >&5 echo "${ECHO_T}$cf_cv_utf8_lib" >&6 # HAVE_LIBUTF8_H is used by ncurses if curses.h is shared between @@ -9863,7 +11002,7 @@ if test -n "$cf_cv_header_path_utf8" ; then cf_save_CPPFLAGS=$CPPFLAGS CPPFLAGS="$CPPFLAGS -I$cf_add_incdir" cat >conftest.$ac_ext <<_ACEOF -#line 9866 "configure" +#line 11005 "configure" #include "confdefs.h" #include <stdio.h> int @@ -9875,16 +11014,16 @@ printf("Hello") } _ACEOF rm -f conftest.$ac_objext -if { (eval echo "$as_me:9878: \"$ac_compile\"") >&5 +if { (eval echo "$as_me:11017: \"$ac_compile\"") >&5 (eval $ac_compile) 2>&5 ac_status=$? - echo "$as_me:9881: \$? = $ac_status" >&5 + echo "$as_me:11020: \$? = $ac_status" >&5 (exit $ac_status); } && { ac_try='test -s conftest.$ac_objext' - { (eval echo "$as_me:9884: \"$ac_try\"") >&5 + { (eval echo "$as_me:11023: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? - echo "$as_me:9887: \$? = $ac_status" >&5 + echo "$as_me:11026: \$? = $ac_status" >&5 (exit $ac_status); }; }; then : else @@ -9901,7 +11040,7 @@ rm -f conftest.$ac_objext conftest.$ac_ext if test "$cf_have_incdir" = no ; then test -n "$verbose" && echo " adding $cf_add_incdir to include-path" 1>&6 -echo "${as_me:-configure}:9904: testing adding $cf_add_incdir to include-path ..." 1>&5 +echo "${as_me:-configure}:11043: testing adding $cf_add_incdir to include-path ..." 1>&5 CPPFLAGS="$CPPFLAGS -I$cf_add_incdir" @@ -9935,7 +11074,7 @@ if test -n "$cf_cv_library_path_utf8" ; then if test "$cf_have_libdir" = no ; then test -n "$verbose" && echo " adding $cf_add_libdir to library-path" 1>&6 -echo "${as_me:-configure}:9938: testing adding $cf_add_libdir to library-path ..." 1>&5 +echo "${as_me:-configure}:11077: testing adding $cf_add_libdir to library-path ..." 1>&5 LDFLAGS="-L$cf_add_libdir $LDFLAGS" fi @@ -9957,7 +11096,7 @@ if test -n "$ac_tool_prefix"; then do # Extract the first word of "$ac_tool_prefix$ac_prog", so it can be a program name with args. set dummy $ac_tool_prefix$ac_prog; ac_word=$2 -echo "$as_me:9960: checking for $ac_word" >&5 +echo "$as_me:11099: checking for $ac_word" >&5 echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6 if test "${ac_cv_prog_NCURSES_CONFIG+set}" = set; then echo $ECHO_N "(cached) $ECHO_C" >&6 @@ -9972,7 +11111,7 @@ for ac_dir in $ac_dummy; do test -z "$ac_dir" && ac_dir=. $as_executable_p "$ac_dir/$ac_word" || continue ac_cv_prog_NCURSES_CONFIG="$ac_tool_prefix$ac_prog" -echo "$as_me:9975: found $ac_dir/$ac_word" >&5 +echo "$as_me:11114: found $ac_dir/$ac_word" >&5 break done @@ -9980,10 +11119,10 @@ fi fi NCURSES_CONFIG=$ac_cv_prog_NCURSES_CONFIG if test -n "$NCURSES_CONFIG"; then - echo "$as_me:9983: result: $NCURSES_CONFIG" >&5 + echo "$as_me:11122: result: $NCURSES_CONFIG" >&5 echo "${ECHO_T}$NCURSES_CONFIG" >&6 else - echo "$as_me:9986: result: no" >&5 + echo "$as_me:11125: result: no" >&5 echo "${ECHO_T}no" >&6 fi @@ -9996,7 +11135,7 @@ if test -z "$NCURSES_CONFIG"; then do # Extract the first word of "$ac_prog", so it can be a program name with args. set dummy $ac_prog; ac_word=$2 -echo "$as_me:9999: checking for $ac_word" >&5 +echo "$as_me:11138: checking for $ac_word" >&5 echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6 if test "${ac_cv_prog_ac_ct_NCURSES_CONFIG+set}" = set; then echo $ECHO_N "(cached) $ECHO_C" >&6 @@ -10011,7 +11150,7 @@ for ac_dir in $ac_dummy; do test -z "$ac_dir" && ac_dir=. $as_executable_p "$ac_dir/$ac_word" || continue ac_cv_prog_ac_ct_NCURSES_CONFIG="$ac_prog" -echo "$as_me:10014: found $ac_dir/$ac_word" >&5 +echo "$as_me:11153: found $ac_dir/$ac_word" >&5 break done @@ -10019,10 +11158,10 @@ fi fi ac_ct_NCURSES_CONFIG=$ac_cv_prog_ac_ct_NCURSES_CONFIG if test -n "$ac_ct_NCURSES_CONFIG"; then - echo "$as_me:10022: result: $ac_ct_NCURSES_CONFIG" >&5 + echo "$as_me:11161: result: $ac_ct_NCURSES_CONFIG" >&5 echo "${ECHO_T}$ac_ct_NCURSES_CONFIG" >&6 else - echo "$as_me:10025: result: no" >&5 + echo "$as_me:11164: result: no" >&5 echo "${ECHO_T}no" >&6 fi @@ -10040,7 +11179,7 @@ LIBS="`$NCURSES_CONFIG --libs` $LIBS" # even with config script, some packages use no-override for curses.h -echo "$as_me:10043: checking if we have identified curses headers" >&5 +echo "$as_me:11182: checking if we have identified curses headers" >&5 echo $ECHO_N "checking if we have identified curses headers... $ECHO_C" >&6 if test "${cf_cv_ncurses_header+set}" = set; then echo $ECHO_N "(cached) $ECHO_C" >&6 @@ -10054,7 +11193,7 @@ for cf_header in \ curses.h do cat >conftest.$ac_ext <<_ACEOF -#line 10057 "configure" +#line 11196 "configure" #include "confdefs.h" #include <${cf_header}> int @@ -10066,16 +11205,16 @@ initscr(); tgoto("?", 0,0) } _ACEOF rm -f conftest.$ac_objext -if { (eval echo "$as_me:10069: \"$ac_compile\"") >&5 +if { (eval echo "$as_me:11208: \"$ac_compile\"") >&5 (eval $ac_compile) 2>&5 ac_status=$? - echo "$as_me:10072: \$? = $ac_status" >&5 + echo "$as_me:11211: \$? = $ac_status" >&5 (exit $ac_status); } && { ac_try='test -s conftest.$ac_objext' - { (eval echo "$as_me:10075: \"$ac_try\"") >&5 + { (eval echo "$as_me:11214: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? - echo "$as_me:10078: \$? = $ac_status" >&5 + echo "$as_me:11217: \$? = $ac_status" >&5 (exit $ac_status); }; }; then cf_cv_ncurses_header=$cf_header; break else @@ -10086,11 +11225,11 @@ rm -f conftest.$ac_objext conftest.$ac_ext done fi -echo "$as_me:10089: result: $cf_cv_ncurses_header" >&5 +echo "$as_me:11228: result: $cf_cv_ncurses_header" >&5 echo "${ECHO_T}$cf_cv_ncurses_header" >&6 if test "$cf_cv_ncurses_header" = none ; then - { { echo "$as_me:10093: error: No curses header-files found" >&5 + { { echo "$as_me:11232: error: No curses header-files found" >&5 echo "$as_me: error: No curses header-files found" >&2;} { (exit 1); exit 1; }; } fi @@ -10100,23 +11239,23 @@ fi for ac_header in $cf_cv_ncurses_header do as_ac_Header=`echo "ac_cv_header_$ac_header" | $as_tr_sh` -echo "$as_me:10103: checking for $ac_header" >&5 +echo "$as_me:11242: checking for $ac_header" >&5 echo $ECHO_N "checking for $ac_header... $ECHO_C" >&6 if eval "test \"\${$as_ac_Header+set}\" = set"; then echo $ECHO_N "(cached) $ECHO_C" >&6 else cat >conftest.$ac_ext <<_ACEOF -#line 10109 "configure" +#line 11248 "configure" #include "confdefs.h" #include <$ac_header> _ACEOF -if { (eval echo "$as_me:10113: \"$ac_cpp conftest.$ac_ext\"") >&5 +if { (eval echo "$as_me:11252: \"$ac_cpp conftest.$ac_ext\"") >&5 (eval $ac_cpp conftest.$ac_ext) 2>conftest.er1 ac_status=$? egrep -v '^ *\+' conftest.er1 >conftest.err rm -f conftest.er1 cat conftest.err >&5 - echo "$as_me:10119: \$? = $ac_status" >&5 + echo "$as_me:11258: \$? = $ac_status" >&5 (exit $ac_status); } >/dev/null; then if test -s conftest.err; then ac_cpp_err=$ac_c_preproc_warn_flag @@ -10135,7 +11274,7 @@ else fi rm -f conftest.err conftest.$ac_ext fi -echo "$as_me:10138: result: `eval echo '${'$as_ac_Header'}'`" >&5 +echo "$as_me:11277: result: `eval echo '${'$as_ac_Header'}'`" >&5 echo "${ECHO_T}`eval echo '${'$as_ac_Header'}'`" >&6 if test `eval echo '${'$as_ac_Header'}'` = yes; then cat >>confdefs.h <<EOF @@ -10188,7 +11327,7 @@ if test -n "$cf_cv_curses_dir/include/$cf_ncuhdr_root" ; then cf_save_CPPFLAGS=$CPPFLAGS CPPFLAGS="$CPPFLAGS -I$cf_add_incdir" cat >conftest.$ac_ext <<_ACEOF -#line 10191 "configure" +#line 11330 "configure" #include "confdefs.h" #include <stdio.h> int @@ -10200,16 +11339,16 @@ printf("Hello") } _ACEOF rm -f conftest.$ac_objext -if { (eval echo "$as_me:10203: \"$ac_compile\"") >&5 +if { (eval echo "$as_me:11342: \"$ac_compile\"") >&5 (eval $ac_compile) 2>&5 ac_status=$? - echo "$as_me:10206: \$? = $ac_status" >&5 + echo "$as_me:11345: \$? = $ac_status" >&5 (exit $ac_status); } && { ac_try='test -s conftest.$ac_objext' - { (eval echo "$as_me:10209: \"$ac_try\"") >&5 + { (eval echo "$as_me:11348: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? - echo "$as_me:10212: \$? = $ac_status" >&5 + echo "$as_me:11351: \$? = $ac_status" >&5 (exit $ac_status); }; }; then : else @@ -10226,7 +11365,7 @@ rm -f conftest.$ac_objext conftest.$ac_ext if test "$cf_have_incdir" = no ; then test -n "$verbose" && echo " adding $cf_add_incdir to include-path" 1>&6 -echo "${as_me:-configure}:10229: testing adding $cf_add_incdir to include-path ..." 1>&5 +echo "${as_me:-configure}:11368: testing adding $cf_add_incdir to include-path ..." 1>&5 CPPFLAGS="$CPPFLAGS -I$cf_add_incdir" @@ -10243,7 +11382,7 @@ fi } -echo "$as_me:10246: checking for $cf_ncuhdr_root header in include-path" >&5 +echo "$as_me:11385: checking for $cf_ncuhdr_root header in include-path" >&5 echo $ECHO_N "checking for $cf_ncuhdr_root header in include-path... $ECHO_C" >&6 if test "${cf_cv_ncurses_h+set}" = set; then echo $ECHO_N "(cached) $ECHO_C" >&6 @@ -10255,7 +11394,7 @@ else do cat >conftest.$ac_ext <<_ACEOF -#line 10258 "configure" +#line 11397 "configure" #include "confdefs.h" #include <$cf_header> @@ -10279,16 +11418,16 @@ printf("old\n"); } _ACEOF rm -f conftest.$ac_objext -if { (eval echo "$as_me:10282: \"$ac_compile\"") >&5 +if { (eval echo "$as_me:11421: \"$ac_compile\"") >&5 (eval $ac_compile) 2>&5 ac_status=$? - echo "$as_me:10285: \$? = $ac_status" >&5 + echo "$as_me:11424: \$? = $ac_status" >&5 (exit $ac_status); } && { ac_try='test -s conftest.$ac_objext' - { (eval echo "$as_me:10288: \"$ac_try\"") >&5 + { (eval echo "$as_me:11427: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? - echo "$as_me:10291: \$? = $ac_status" >&5 + echo "$as_me:11430: \$? = $ac_status" >&5 (exit $ac_status); }; }; then cf_cv_ncurses_h=$cf_header @@ -10303,14 +11442,14 @@ rm -f conftest.$ac_objext conftest.$ac_ext done fi -echo "$as_me:10306: result: $cf_cv_ncurses_h" >&5 +echo "$as_me:11445: result: $cf_cv_ncurses_h" >&5 echo "${ECHO_T}$cf_cv_ncurses_h" >&6 if test "$cf_cv_ncurses_h" != no ; then cf_cv_ncurses_header=$cf_cv_ncurses_h else -echo "$as_me:10313: checking for $cf_ncuhdr_root include-path" >&5 +echo "$as_me:11452: checking for $cf_ncuhdr_root include-path" >&5 echo $ECHO_N "checking for $cf_ncuhdr_root include-path... $ECHO_C" >&6 if test "${cf_cv_ncurses_h2+set}" = set; then echo $ECHO_N "(cached) $ECHO_C" >&6 @@ -10450,7 +11589,7 @@ if test -n "$cf_incdir" ; then cf_save_CPPFLAGS=$CPPFLAGS CPPFLAGS="$CPPFLAGS -I$cf_add_incdir" cat >conftest.$ac_ext <<_ACEOF -#line 10453 "configure" +#line 11592 "configure" #include "confdefs.h" #include <stdio.h> int @@ -10462,16 +11601,16 @@ printf("Hello") } _ACEOF rm -f conftest.$ac_objext -if { (eval echo "$as_me:10465: \"$ac_compile\"") >&5 +if { (eval echo "$as_me:11604: \"$ac_compile\"") >&5 (eval $ac_compile) 2>&5 ac_status=$? - echo "$as_me:10468: \$? = $ac_status" >&5 + echo "$as_me:11607: \$? = $ac_status" >&5 (exit $ac_status); } && { ac_try='test -s conftest.$ac_objext' - { (eval echo "$as_me:10471: \"$ac_try\"") >&5 + { (eval echo "$as_me:11610: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? - echo "$as_me:10474: \$? = $ac_status" >&5 + echo "$as_me:11613: \$? = $ac_status" >&5 (exit $ac_status); }; }; then : else @@ -10488,7 +11627,7 @@ rm -f conftest.$ac_objext conftest.$ac_ext if test "$cf_have_incdir" = no ; then test -n "$verbose" && echo " adding $cf_add_incdir to include-path" 1>&6 -echo "${as_me:-configure}:10491: testing adding $cf_add_incdir to include-path ..." 1>&5 +echo "${as_me:-configure}:11630: testing adding $cf_add_incdir to include-path ..." 1>&5 CPPFLAGS="$CPPFLAGS -I$cf_add_incdir" @@ -10509,7 +11648,7 @@ fi do cat >conftest.$ac_ext <<_ACEOF -#line 10512 "configure" +#line 11651 "configure" #include "confdefs.h" #include <$cf_header> @@ -10533,16 +11672,16 @@ printf("old\n"); } _ACEOF rm -f conftest.$ac_objext -if { (eval echo "$as_me:10536: \"$ac_compile\"") >&5 +if { (eval echo "$as_me:11675: \"$ac_compile\"") >&5 (eval $ac_compile) 2>&5 ac_status=$? - echo "$as_me:10539: \$? = $ac_status" >&5 + echo "$as_me:11678: \$? = $ac_status" >&5 (exit $ac_status); } && { ac_try='test -s conftest.$ac_objext' - { (eval echo "$as_me:10542: \"$ac_try\"") >&5 + { (eval echo "$as_me:11681: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? - echo "$as_me:10545: \$? = $ac_status" >&5 + echo "$as_me:11684: \$? = $ac_status" >&5 (exit $ac_status); }; }; then cf_cv_ncurses_h2=$cf_header @@ -10563,12 +11702,12 @@ rm -f conftest.$ac_objext conftest.$ac_ext CPPFLAGS="$cf_save2_CPPFLAGS" test "$cf_cv_ncurses_h2" != no && break done - test "$cf_cv_ncurses_h2" = no && { { echo "$as_me:10566: error: not found" >&5 + test "$cf_cv_ncurses_h2" = no && { { echo "$as_me:11705: error: not found" >&5 echo "$as_me: error: not found" >&2;} { (exit 1); exit 1; }; } fi -echo "$as_me:10571: result: $cf_cv_ncurses_h2" >&5 +echo "$as_me:11710: result: $cf_cv_ncurses_h2" >&5 echo "${ECHO_T}$cf_cv_ncurses_h2" >&6 cf_1st_incdir=`echo $cf_cv_ncurses_h2 | sed -e 's%/[^/]*$%%'` @@ -10601,7 +11740,7 @@ if test -n "$cf_1st_incdir" ; then cf_save_CPPFLAGS=$CPPFLAGS CPPFLAGS="$CPPFLAGS -I$cf_add_incdir" cat >conftest.$ac_ext <<_ACEOF -#line 10604 "configure" +#line 11743 "configure" #include "confdefs.h" #include <stdio.h> int @@ -10613,16 +11752,16 @@ printf("Hello") } _ACEOF rm -f conftest.$ac_objext -if { (eval echo "$as_me:10616: \"$ac_compile\"") >&5 +if { (eval echo "$as_me:11755: \"$ac_compile\"") >&5 (eval $ac_compile) 2>&5 ac_status=$? - echo "$as_me:10619: \$? = $ac_status" >&5 + echo "$as_me:11758: \$? = $ac_status" >&5 (exit $ac_status); } && { ac_try='test -s conftest.$ac_objext' - { (eval echo "$as_me:10622: \"$ac_try\"") >&5 + { (eval echo "$as_me:11761: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? - echo "$as_me:10625: \$? = $ac_status" >&5 + echo "$as_me:11764: \$? = $ac_status" >&5 (exit $ac_status); }; }; then : else @@ -10639,7 +11778,7 @@ rm -f conftest.$ac_objext conftest.$ac_ext if test "$cf_have_incdir" = no ; then test -n "$verbose" && echo " adding $cf_add_incdir to include-path" 1>&6 -echo "${as_me:-configure}:10642: testing adding $cf_add_incdir to include-path ..." 1>&5 +echo "${as_me:-configure}:11781: testing adding $cf_add_incdir to include-path ..." 1>&5 CPPFLAGS="$CPPFLAGS -I$cf_add_incdir" @@ -10685,7 +11824,7 @@ EOF ;; esac -echo "$as_me:10688: checking for terminfo header" >&5 +echo "$as_me:11827: checking for terminfo header" >&5 echo $ECHO_N "checking for terminfo header... $ECHO_C" >&6 if test "${cf_cv_term_header+set}" = set; then echo $ECHO_N "(cached) $ECHO_C" >&6 @@ -10703,7 +11842,7 @@ esac for cf_test in $cf_term_header "ncurses/term.h" "ncursesw/term.h" do cat >conftest.$ac_ext <<_ACEOF -#line 10706 "configure" +#line 11845 "configure" #include "confdefs.h" #include <stdio.h> #include <${cf_cv_ncurses_header:-curses.h}> @@ -10718,16 +11857,16 @@ int x = auto_left_margin } _ACEOF rm -f conftest.$ac_objext -if { (eval echo "$as_me:10721: \"$ac_compile\"") >&5 +if { (eval echo "$as_me:11860: \"$ac_compile\"") >&5 (eval $ac_compile) 2>&5 ac_status=$? - echo "$as_me:10724: \$? = $ac_status" >&5 + echo "$as_me:11863: \$? = $ac_status" >&5 (exit $ac_status); } && { ac_try='test -s conftest.$ac_objext' - { (eval echo "$as_me:10727: \"$ac_try\"") >&5 + { (eval echo "$as_me:11866: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? - echo "$as_me:10730: \$? = $ac_status" >&5 + echo "$as_me:11869: \$? = $ac_status" >&5 (exit $ac_status); }; }; then cf_cv_term_header="$cf_test" @@ -10743,7 +11882,7 @@ rm -f conftest.$ac_objext conftest.$ac_ext done fi -echo "$as_me:10746: result: $cf_cv_term_header" >&5 +echo "$as_me:11885: result: $cf_cv_term_header" >&5 echo "${ECHO_T}$cf_cv_term_header" >&6 # Set definitions to allow ifdef'ing to accommodate subdirectories @@ -10781,7 +11920,7 @@ cat >>confdefs.h <<\EOF #define NCURSES 1 EOF -echo "$as_me:10784: checking for ncurses version" >&5 +echo "$as_me:11923: checking for ncurses version" >&5 echo $ECHO_N "checking for ncurses version... $ECHO_C" >&6 if test "${cf_cv_ncurses_version+set}" = set; then echo $ECHO_N "(cached) $ECHO_C" >&6 @@ -10807,10 +11946,10 @@ Autoconf "old" #endif EOF cf_try="$ac_cpp conftest.$ac_ext 2>&5 | grep '^Autoconf ' >conftest.out" - { (eval echo "$as_me:10810: \"$cf_try\"") >&5 + { (eval echo "$as_me:11949: \"$cf_try\"") >&5 (eval $cf_try) 2>&5 ac_status=$? - echo "$as_me:10813: \$? = $ac_status" >&5 + echo "$as_me:11952: \$? = $ac_status" >&5 (exit $ac_status); } if test -f conftest.out ; then cf_out=`cat conftest.out | sed -e 's%^Autoconf %%' -e 's%^[^"]*"%%' -e 's%".*%%'` @@ -10820,7 +11959,7 @@ EOF else cat >conftest.$ac_ext <<_ACEOF -#line 10823 "configure" +#line 11962 "configure" #include "confdefs.h" #include <${cf_cv_ncurses_header:-curses.h}> @@ -10845,15 +11984,15 @@ int main() } _ACEOF rm -f conftest$ac_exeext -if { (eval echo "$as_me:10848: \"$ac_link\"") >&5 +if { (eval echo "$as_me:11987: \"$ac_link\"") >&5 (eval $ac_link) 2>&5 ac_status=$? - echo "$as_me:10851: \$? = $ac_status" >&5 + echo "$as_me:11990: \$? = $ac_status" >&5 (exit $ac_status); } && { ac_try='./conftest$ac_exeext' - { (eval echo "$as_me:10853: \"$ac_try\"") >&5 + { (eval echo "$as_me:11992: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? - echo "$as_me:10856: \$? = $ac_status" >&5 + echo "$as_me:11995: \$? = $ac_status" >&5 (exit $ac_status); }; }; then cf_cv_ncurses_version=`cat $cf_tempfile` @@ -10867,7 +12006,7 @@ fi rm -f $cf_tempfile fi -echo "$as_me:10870: result: $cf_cv_ncurses_version" >&5 +echo "$as_me:12009: result: $cf_cv_ncurses_version" >&5 echo "${ECHO_T}$cf_cv_ncurses_version" >&6 test "$cf_cv_ncurses_version" = no || cat >>confdefs.h <<\EOF @@ -10880,7 +12019,7 @@ cf_nculib_root=$use_ncurses # to link gpm. cf_ncurses_LIBS="" cf_ncurses_SAVE="$LIBS" -echo "$as_me:10883: checking for Gpm_Open in -lgpm" >&5 +echo "$as_me:12022: checking for Gpm_Open in -lgpm" >&5 echo $ECHO_N "checking for Gpm_Open in -lgpm... $ECHO_C" >&6 if test "${ac_cv_lib_gpm_Gpm_Open+set}" = set; then echo $ECHO_N "(cached) $ECHO_C" >&6 @@ -10888,7 +12027,7 @@ else ac_check_lib_save_LIBS=$LIBS LIBS="-lgpm $LIBS" cat >conftest.$ac_ext <<_ACEOF -#line 10891 "configure" +#line 12030 "configure" #include "confdefs.h" /* Override any gcc2 internal prototype to avoid an error. */ @@ -10907,16 +12046,16 @@ Gpm_Open (); } _ACEOF rm -f conftest.$ac_objext conftest$ac_exeext -if { (eval echo "$as_me:10910: \"$ac_link\"") >&5 +if { (eval echo "$as_me:12049: \"$ac_link\"") >&5 (eval $ac_link) 2>&5 ac_status=$? - echo "$as_me:10913: \$? = $ac_status" >&5 + echo "$as_me:12052: \$? = $ac_status" >&5 (exit $ac_status); } && { ac_try='test -s conftest$ac_exeext' - { (eval echo "$as_me:10916: \"$ac_try\"") >&5 + { (eval echo "$as_me:12055: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? - echo "$as_me:10919: \$? = $ac_status" >&5 + echo "$as_me:12058: \$? = $ac_status" >&5 (exit $ac_status); }; }; then ac_cv_lib_gpm_Gpm_Open=yes else @@ -10927,10 +12066,10 @@ fi rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext LIBS=$ac_check_lib_save_LIBS fi -echo "$as_me:10930: result: $ac_cv_lib_gpm_Gpm_Open" >&5 +echo "$as_me:12069: result: $ac_cv_lib_gpm_Gpm_Open" >&5 echo "${ECHO_T}$ac_cv_lib_gpm_Gpm_Open" >&6 if test $ac_cv_lib_gpm_Gpm_Open = yes; then - echo "$as_me:10933: checking for initscr in -lgpm" >&5 + echo "$as_me:12072: checking for initscr in -lgpm" >&5 echo $ECHO_N "checking for initscr in -lgpm... $ECHO_C" >&6 if test "${ac_cv_lib_gpm_initscr+set}" = set; then echo $ECHO_N "(cached) $ECHO_C" >&6 @@ -10938,7 +12077,7 @@ else ac_check_lib_save_LIBS=$LIBS LIBS="-lgpm $LIBS" cat >conftest.$ac_ext <<_ACEOF -#line 10941 "configure" +#line 12080 "configure" #include "confdefs.h" /* Override any gcc2 internal prototype to avoid an error. */ @@ -10957,16 +12096,16 @@ initscr (); } _ACEOF rm -f conftest.$ac_objext conftest$ac_exeext -if { (eval echo "$as_me:10960: \"$ac_link\"") >&5 +if { (eval echo "$as_me:12099: \"$ac_link\"") >&5 (eval $ac_link) 2>&5 ac_status=$? - echo "$as_me:10963: \$? = $ac_status" >&5 + echo "$as_me:12102: \$? = $ac_status" >&5 (exit $ac_status); } && { ac_try='test -s conftest$ac_exeext' - { (eval echo "$as_me:10966: \"$ac_try\"") >&5 + { (eval echo "$as_me:12105: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? - echo "$as_me:10969: \$? = $ac_status" >&5 + echo "$as_me:12108: \$? = $ac_status" >&5 (exit $ac_status); }; }; then ac_cv_lib_gpm_initscr=yes else @@ -10977,7 +12116,7 @@ fi rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext LIBS=$ac_check_lib_save_LIBS fi -echo "$as_me:10980: result: $ac_cv_lib_gpm_initscr" >&5 +echo "$as_me:12119: result: $ac_cv_lib_gpm_initscr" >&5 echo "${ECHO_T}$ac_cv_lib_gpm_initscr" >&6 if test $ac_cv_lib_gpm_initscr = yes; then LIBS="$cf_ncurses_SAVE" @@ -10992,7 +12131,7 @@ freebsd*) # This is only necessary if you are linking against an obsolete # version of ncurses (but it should do no harm, since it's static). if test "$cf_nculib_root" = ncurses ; then - echo "$as_me:10995: checking for tgoto in -lmytinfo" >&5 + echo "$as_me:12134: checking for tgoto in -lmytinfo" >&5 echo $ECHO_N "checking for tgoto in -lmytinfo... $ECHO_C" >&6 if test "${ac_cv_lib_mytinfo_tgoto+set}" = set; then echo $ECHO_N "(cached) $ECHO_C" >&6 @@ -11000,7 +12139,7 @@ else ac_check_lib_save_LIBS=$LIBS LIBS="-lmytinfo $LIBS" cat >conftest.$ac_ext <<_ACEOF -#line 11003 "configure" +#line 12142 "configure" #include "confdefs.h" /* Override any gcc2 internal prototype to avoid an error. */ @@ -11019,16 +12158,16 @@ tgoto (); } _ACEOF rm -f conftest.$ac_objext conftest$ac_exeext -if { (eval echo "$as_me:11022: \"$ac_link\"") >&5 +if { (eval echo "$as_me:12161: \"$ac_link\"") >&5 (eval $ac_link) 2>&5 ac_status=$? - echo "$as_me:11025: \$? = $ac_status" >&5 + echo "$as_me:12164: \$? = $ac_status" >&5 (exit $ac_status); } && { ac_try='test -s conftest$ac_exeext' - { (eval echo "$as_me:11028: \"$ac_try\"") >&5 + { (eval echo "$as_me:12167: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? - echo "$as_me:11031: \$? = $ac_status" >&5 + echo "$as_me:12170: \$? = $ac_status" >&5 (exit $ac_status); }; }; then ac_cv_lib_mytinfo_tgoto=yes else @@ -11039,7 +12178,7 @@ fi rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext LIBS=$ac_check_lib_save_LIBS fi -echo "$as_me:11042: result: $ac_cv_lib_mytinfo_tgoto" >&5 +echo "$as_me:12181: result: $ac_cv_lib_mytinfo_tgoto" >&5 echo "${ECHO_T}$ac_cv_lib_mytinfo_tgoto" >&6 if test $ac_cv_lib_mytinfo_tgoto = yes; then cf_ncurses_LIBS="-lmytinfo $cf_ncurses_LIBS" @@ -11058,13 +12197,13 @@ else eval 'cf_cv_have_lib_'$cf_nculib_root'=no' cf_libdir="" - echo "$as_me:11061: checking for initscr" >&5 + echo "$as_me:12200: checking for initscr" >&5 echo $ECHO_N "checking for initscr... $ECHO_C" >&6 if test "${ac_cv_func_initscr+set}" = set; then echo $ECHO_N "(cached) $ECHO_C" >&6 else cat >conftest.$ac_ext <<_ACEOF -#line 11067 "configure" +#line 12206 "configure" #include "confdefs.h" /* System header to define __stub macros and hopefully few prototypes, which can conflict with char initscr (); below. */ @@ -11095,16 +12234,16 @@ f = initscr; /* workaround for ICC 12.0.3 */ if (f == 0) return 1; } _ACEOF rm -f conftest.$ac_objext conftest$ac_exeext -if { (eval echo "$as_me:11098: \"$ac_link\"") >&5 +if { (eval echo "$as_me:12237: \"$ac_link\"") >&5 (eval $ac_link) 2>&5 ac_status=$? - echo "$as_me:11101: \$? = $ac_status" >&5 + echo "$as_me:12240: \$? = $ac_status" >&5 (exit $ac_status); } && { ac_try='test -s conftest$ac_exeext' - { (eval echo "$as_me:11104: \"$ac_try\"") >&5 + { (eval echo "$as_me:12243: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? - echo "$as_me:11107: \$? = $ac_status" >&5 + echo "$as_me:12246: \$? = $ac_status" >&5 (exit $ac_status); }; }; then ac_cv_func_initscr=yes else @@ -11114,18 +12253,18 @@ ac_cv_func_initscr=no fi rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext fi -echo "$as_me:11117: result: $ac_cv_func_initscr" >&5 +echo "$as_me:12256: result: $ac_cv_func_initscr" >&5 echo "${ECHO_T}$ac_cv_func_initscr" >&6 if test $ac_cv_func_initscr = yes; then eval 'cf_cv_have_lib_'$cf_nculib_root'=yes' else cf_save_LIBS="$LIBS" - echo "$as_me:11124: checking for initscr in -l$cf_nculib_root" >&5 + echo "$as_me:12263: checking for initscr in -l$cf_nculib_root" >&5 echo $ECHO_N "checking for initscr in -l$cf_nculib_root... $ECHO_C" >&6 LIBS="-l$cf_nculib_root $LIBS" cat >conftest.$ac_ext <<_ACEOF -#line 11128 "configure" +#line 12267 "configure" #include "confdefs.h" #include <${cf_cv_ncurses_header:-curses.h}> int @@ -11137,25 +12276,25 @@ initscr() } _ACEOF rm -f conftest.$ac_objext conftest$ac_exeext -if { (eval echo "$as_me:11140: \"$ac_link\"") >&5 +if { (eval echo "$as_me:12279: \"$ac_link\"") >&5 (eval $ac_link) 2>&5 ac_status=$? - echo "$as_me:11143: \$? = $ac_status" >&5 + echo "$as_me:12282: \$? = $ac_status" >&5 (exit $ac_status); } && { ac_try='test -s conftest$ac_exeext' - { (eval echo "$as_me:11146: \"$ac_try\"") >&5 + { (eval echo "$as_me:12285: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? - echo "$as_me:11149: \$? = $ac_status" >&5 + echo "$as_me:12288: \$? = $ac_status" >&5 (exit $ac_status); }; }; then - echo "$as_me:11151: result: yes" >&5 + echo "$as_me:12290: result: yes" >&5 echo "${ECHO_T}yes" >&6 eval 'cf_cv_have_lib_'$cf_nculib_root'=yes' else echo "$as_me: failed program was:" >&5 cat conftest.$ac_ext >&5 -echo "$as_me:11158: result: no" >&5 +echo "$as_me:12297: result: no" >&5 echo "${ECHO_T}no" >&6 cf_search= @@ -11245,11 +12384,11 @@ cf_search="$cf_library_path_list $cf_search" for cf_libdir in $cf_search do - echo "$as_me:11248: checking for -l$cf_nculib_root in $cf_libdir" >&5 + echo "$as_me:12387: checking for -l$cf_nculib_root in $cf_libdir" >&5 echo $ECHO_N "checking for -l$cf_nculib_root in $cf_libdir... $ECHO_C" >&6 LIBS="-L$cf_libdir -l$cf_nculib_root $cf_save_LIBS" cat >conftest.$ac_ext <<_ACEOF -#line 11252 "configure" +#line 12391 "configure" #include "confdefs.h" #include <${cf_cv_ncurses_header:-curses.h}> int @@ -11261,25 +12400,25 @@ initscr() } _ACEOF rm -f conftest.$ac_objext conftest$ac_exeext -if { (eval echo "$as_me:11264: \"$ac_link\"") >&5 +if { (eval echo "$as_me:12403: \"$ac_link\"") >&5 (eval $ac_link) 2>&5 ac_status=$? - echo "$as_me:11267: \$? = $ac_status" >&5 + echo "$as_me:12406: \$? = $ac_status" >&5 (exit $ac_status); } && { ac_try='test -s conftest$ac_exeext' - { (eval echo "$as_me:11270: \"$ac_try\"") >&5 + { (eval echo "$as_me:12409: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? - echo "$as_me:11273: \$? = $ac_status" >&5 + echo "$as_me:12412: \$? = $ac_status" >&5 (exit $ac_status); }; }; then - echo "$as_me:11275: result: yes" >&5 + echo "$as_me:12414: result: yes" >&5 echo "${ECHO_T}yes" >&6 eval 'cf_cv_have_lib_'$cf_nculib_root'=yes' break else echo "$as_me: failed program was:" >&5 cat conftest.$ac_ext >&5 -echo "$as_me:11282: result: no" >&5 +echo "$as_me:12421: result: no" >&5 echo "${ECHO_T}no" >&6 LIBS="$cf_save_LIBS" fi @@ -11294,7 +12433,7 @@ fi eval 'cf_found_library=$cf_cv_have_lib_'$cf_nculib_root if test $cf_found_library = no ; then - { { echo "$as_me:11297: error: Cannot link $cf_nculib_root library" >&5 + { { echo "$as_me:12436: error: Cannot link $cf_nculib_root library" >&5 echo "$as_me: error: Cannot link $cf_nculib_root library" >&2;} { (exit 1); exit 1; }; } fi @@ -11302,7 +12441,7 @@ fi fi if test -n "$cf_ncurses_LIBS" ; then - echo "$as_me:11305: checking if we can link $cf_nculib_root without $cf_ncurses_LIBS" >&5 + echo "$as_me:12444: checking if we can link $cf_nculib_root without $cf_ncurses_LIBS" >&5 echo $ECHO_N "checking if we can link $cf_nculib_root without $cf_ncurses_LIBS... $ECHO_C" >&6 cf_ncurses_SAVE="$LIBS" for p in $cf_ncurses_LIBS ; do @@ -11312,7 +12451,7 @@ echo $ECHO_N "checking if we can link $cf_nculib_root without $cf_ncurses_LIBS.. fi done cat >conftest.$ac_ext <<_ACEOF -#line 11315 "configure" +#line 12454 "configure" #include "confdefs.h" #include <${cf_cv_ncurses_header:-curses.h}> int @@ -11324,23 +12463,23 @@ initscr(); mousemask(0,0); tgoto((char *)0, 0, 0); } _ACEOF rm -f conftest.$ac_objext conftest$ac_exeext -if { (eval echo "$as_me:11327: \"$ac_link\"") >&5 +if { (eval echo "$as_me:12466: \"$ac_link\"") >&5 (eval $ac_link) 2>&5 ac_status=$? - echo "$as_me:11330: \$? = $ac_status" >&5 + echo "$as_me:12469: \$? = $ac_status" >&5 (exit $ac_status); } && { ac_try='test -s conftest$ac_exeext' - { (eval echo "$as_me:11333: \"$ac_try\"") >&5 + { (eval echo "$as_me:12472: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? - echo "$as_me:11336: \$? = $ac_status" >&5 + echo "$as_me:12475: \$? = $ac_status" >&5 (exit $ac_status); }; }; then - echo "$as_me:11338: result: yes" >&5 + echo "$as_me:12477: result: yes" >&5 echo "${ECHO_T}yes" >&6 else echo "$as_me: failed program was:" >&5 cat conftest.$ac_ext >&5 -echo "$as_me:11343: result: no" >&5 +echo "$as_me:12482: result: no" >&5 echo "${ECHO_T}no" >&6 LIBS="$cf_ncurses_SAVE" fi @@ -11358,7 +12497,7 @@ fi else cf_wide_curses=no -echo "$as_me:11361: checking for extra include directories" >&5 +echo "$as_me:12500: checking for extra include directories" >&5 echo $ECHO_N "checking for extra include directories... $ECHO_C" >&6 if test "${cf_cv_curses_incdir+set}" = set; then echo $ECHO_N "(cached) $ECHO_C" >&6 @@ -11384,11 +12523,11 @@ sunos3*|sunos4*) esac fi -echo "$as_me:11387: result: $cf_cv_curses_incdir" >&5 +echo "$as_me:12526: result: $cf_cv_curses_incdir" >&5 echo "${ECHO_T}$cf_cv_curses_incdir" >&6 test "$cf_cv_curses_incdir" != no && CPPFLAGS="$CPPFLAGS $cf_cv_curses_incdir" -echo "$as_me:11391: checking if we have identified curses headers" >&5 +echo "$as_me:12530: checking if we have identified curses headers" >&5 echo $ECHO_N "checking if we have identified curses headers... $ECHO_C" >&6 if test "${cf_cv_ncurses_header+set}" = set; then echo $ECHO_N "(cached) $ECHO_C" >&6 @@ -11400,7 +12539,7 @@ for cf_header in \ curses.h ncurses/ncurses.h ncurses/curses.h do cat >conftest.$ac_ext <<_ACEOF -#line 11403 "configure" +#line 12542 "configure" #include "confdefs.h" #include <${cf_header}> int @@ -11412,16 +12551,16 @@ initscr(); tgoto("?", 0,0) } _ACEOF rm -f conftest.$ac_objext -if { (eval echo "$as_me:11415: \"$ac_compile\"") >&5 +if { (eval echo "$as_me:12554: \"$ac_compile\"") >&5 (eval $ac_compile) 2>&5 ac_status=$? - echo "$as_me:11418: \$? = $ac_status" >&5 + echo "$as_me:12557: \$? = $ac_status" >&5 (exit $ac_status); } && { ac_try='test -s conftest.$ac_objext' - { (eval echo "$as_me:11421: \"$ac_try\"") >&5 + { (eval echo "$as_me:12560: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? - echo "$as_me:11424: \$? = $ac_status" >&5 + echo "$as_me:12563: \$? = $ac_status" >&5 (exit $ac_status); }; }; then cf_cv_ncurses_header=$cf_header; break else @@ -11432,11 +12571,11 @@ rm -f conftest.$ac_objext conftest.$ac_ext done fi -echo "$as_me:11435: result: $cf_cv_ncurses_header" >&5 +echo "$as_me:12574: result: $cf_cv_ncurses_header" >&5 echo "${ECHO_T}$cf_cv_ncurses_header" >&6 if test "$cf_cv_ncurses_header" = none ; then - { { echo "$as_me:11439: error: No curses header-files found" >&5 + { { echo "$as_me:12578: error: No curses header-files found" >&5 echo "$as_me: error: No curses header-files found" >&2;} { (exit 1); exit 1; }; } fi @@ -11446,23 +12585,23 @@ fi for ac_header in $cf_cv_ncurses_header do as_ac_Header=`echo "ac_cv_header_$ac_header" | $as_tr_sh` -echo "$as_me:11449: checking for $ac_header" >&5 +echo "$as_me:12588: checking for $ac_header" >&5 echo $ECHO_N "checking for $ac_header... $ECHO_C" >&6 if eval "test \"\${$as_ac_Header+set}\" = set"; then echo $ECHO_N "(cached) $ECHO_C" >&6 else cat >conftest.$ac_ext <<_ACEOF -#line 11455 "configure" +#line 12594 "configure" #include "confdefs.h" #include <$ac_header> _ACEOF -if { (eval echo "$as_me:11459: \"$ac_cpp conftest.$ac_ext\"") >&5 +if { (eval echo "$as_me:12598: \"$ac_cpp conftest.$ac_ext\"") >&5 (eval $ac_cpp conftest.$ac_ext) 2>conftest.er1 ac_status=$? egrep -v '^ *\+' conftest.er1 >conftest.err rm -f conftest.er1 cat conftest.err >&5 - echo "$as_me:11465: \$? = $ac_status" >&5 + echo "$as_me:12604: \$? = $ac_status" >&5 (exit $ac_status); } >/dev/null; then if test -s conftest.err; then ac_cpp_err=$ac_c_preproc_warn_flag @@ -11481,7 +12620,7 @@ else fi rm -f conftest.err conftest.$ac_ext fi -echo "$as_me:11484: result: `eval echo '${'$as_ac_Header'}'`" >&5 +echo "$as_me:12623: result: `eval echo '${'$as_ac_Header'}'`" >&5 echo "${ECHO_T}`eval echo '${'$as_ac_Header'}'`" >&6 if test `eval echo '${'$as_ac_Header'}'` = yes; then cat >>confdefs.h <<EOF @@ -11491,7 +12630,7 @@ EOF fi done -echo "$as_me:11494: checking for terminfo header" >&5 +echo "$as_me:12633: checking for terminfo header" >&5 echo $ECHO_N "checking for terminfo header... $ECHO_C" >&6 if test "${cf_cv_term_header+set}" = set; then echo $ECHO_N "(cached) $ECHO_C" >&6 @@ -11509,7 +12648,7 @@ esac for cf_test in $cf_term_header "ncurses/term.h" "ncursesw/term.h" do cat >conftest.$ac_ext <<_ACEOF -#line 11512 "configure" +#line 12651 "configure" #include "confdefs.h" #include <stdio.h> #include <${cf_cv_ncurses_header:-curses.h}> @@ -11524,16 +12663,16 @@ int x = auto_left_margin } _ACEOF rm -f conftest.$ac_objext -if { (eval echo "$as_me:11527: \"$ac_compile\"") >&5 +if { (eval echo "$as_me:12666: \"$ac_compile\"") >&5 (eval $ac_compile) 2>&5 ac_status=$? - echo "$as_me:11530: \$? = $ac_status" >&5 + echo "$as_me:12669: \$? = $ac_status" >&5 (exit $ac_status); } && { ac_try='test -s conftest.$ac_objext' - { (eval echo "$as_me:11533: \"$ac_try\"") >&5 + { (eval echo "$as_me:12672: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? - echo "$as_me:11536: \$? = $ac_status" >&5 + echo "$as_me:12675: \$? = $ac_status" >&5 (exit $ac_status); }; }; then cf_cv_term_header="$cf_test" @@ -11549,7 +12688,7 @@ rm -f conftest.$ac_objext conftest.$ac_ext done fi -echo "$as_me:11552: result: $cf_cv_term_header" >&5 +echo "$as_me:12691: result: $cf_cv_term_header" >&5 echo "${ECHO_T}$cf_cv_term_header" >&6 # Set definitions to allow ifdef'ing to accommodate subdirectories @@ -11581,7 +12720,7 @@ EOF ;; esac -echo "$as_me:11584: checking for ncurses version" >&5 +echo "$as_me:12723: checking for ncurses version" >&5 echo $ECHO_N "checking for ncurses version... $ECHO_C" >&6 if test "${cf_cv_ncurses_version+set}" = set; then echo $ECHO_N "(cached) $ECHO_C" >&6 @@ -11607,10 +12746,10 @@ Autoconf "old" #endif EOF cf_try="$ac_cpp conftest.$ac_ext 2>&5 | grep '^Autoconf ' >conftest.out" - { (eval echo "$as_me:11610: \"$cf_try\"") >&5 + { (eval echo "$as_me:12749: \"$cf_try\"") >&5 (eval $cf_try) 2>&5 ac_status=$? - echo "$as_me:11613: \$? = $ac_status" >&5 + echo "$as_me:12752: \$? = $ac_status" >&5 (exit $ac_status); } if test -f conftest.out ; then cf_out=`cat conftest.out | sed -e 's%^Autoconf %%' -e 's%^[^"]*"%%' -e 's%".*%%'` @@ -11620,7 +12759,7 @@ EOF else cat >conftest.$ac_ext <<_ACEOF -#line 11623 "configure" +#line 12762 "configure" #include "confdefs.h" #include <${cf_cv_ncurses_header:-curses.h}> @@ -11645,15 +12784,15 @@ int main() } _ACEOF rm -f conftest$ac_exeext -if { (eval echo "$as_me:11648: \"$ac_link\"") >&5 +if { (eval echo "$as_me:12787: \"$ac_link\"") >&5 (eval $ac_link) 2>&5 ac_status=$? - echo "$as_me:11651: \$? = $ac_status" >&5 + echo "$as_me:12790: \$? = $ac_status" >&5 (exit $ac_status); } && { ac_try='./conftest$ac_exeext' - { (eval echo "$as_me:11653: \"$ac_try\"") >&5 + { (eval echo "$as_me:12792: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? - echo "$as_me:11656: \$? = $ac_status" >&5 + echo "$as_me:12795: \$? = $ac_status" >&5 (exit $ac_status); }; }; then cf_cv_ncurses_version=`cat $cf_tempfile` @@ -11667,17 +12806,17 @@ fi rm -f $cf_tempfile fi -echo "$as_me:11670: result: $cf_cv_ncurses_version" >&5 +echo "$as_me:12809: result: $cf_cv_ncurses_version" >&5 echo "${ECHO_T}$cf_cv_ncurses_version" >&6 test "$cf_cv_ncurses_version" = no || cat >>confdefs.h <<\EOF #define NCURSES 1 EOF -echo "$as_me:11677: checking if we have identified curses libraries" >&5 +echo "$as_me:12816: checking if we have identified curses libraries" >&5 echo $ECHO_N "checking if we have identified curses libraries... $ECHO_C" >&6 cat >conftest.$ac_ext <<_ACEOF -#line 11680 "configure" +#line 12819 "configure" #include "confdefs.h" #include <${cf_cv_ncurses_header:-curses.h}> int @@ -11689,16 +12828,16 @@ initscr(); tgoto("?", 0,0) } _ACEOF rm -f conftest.$ac_objext conftest$ac_exeext -if { (eval echo "$as_me:11692: \"$ac_link\"") >&5 +if { (eval echo "$as_me:12831: \"$ac_link\"") >&5 (eval $ac_link) 2>&5 ac_status=$? - echo "$as_me:11695: \$? = $ac_status" >&5 + echo "$as_me:12834: \$? = $ac_status" >&5 (exit $ac_status); } && { ac_try='test -s conftest$ac_exeext' - { (eval echo "$as_me:11698: \"$ac_try\"") >&5 + { (eval echo "$as_me:12837: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? - echo "$as_me:11701: \$? = $ac_status" >&5 + echo "$as_me:12840: \$? = $ac_status" >&5 (exit $ac_status); }; }; then cf_result=yes else @@ -11707,13 +12846,13 @@ cat conftest.$ac_ext >&5 cf_result=no fi rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext -echo "$as_me:11710: result: $cf_result" >&5 +echo "$as_me:12849: result: $cf_result" >&5 echo "${ECHO_T}$cf_result" >&6 if test "$cf_result" = no ; then case $host_os in #(vi freebsd*) #(vi - echo "$as_me:11716: checking for tgoto in -lmytinfo" >&5 + echo "$as_me:12855: checking for tgoto in -lmytinfo" >&5 echo $ECHO_N "checking for tgoto in -lmytinfo... $ECHO_C" >&6 if test "${ac_cv_lib_mytinfo_tgoto+set}" = set; then echo $ECHO_N "(cached) $ECHO_C" >&6 @@ -11721,7 +12860,7 @@ else ac_check_lib_save_LIBS=$LIBS LIBS="-lmytinfo $LIBS" cat >conftest.$ac_ext <<_ACEOF -#line 11724 "configure" +#line 12863 "configure" #include "confdefs.h" /* Override any gcc2 internal prototype to avoid an error. */ @@ -11740,16 +12879,16 @@ tgoto (); } _ACEOF rm -f conftest.$ac_objext conftest$ac_exeext -if { (eval echo "$as_me:11743: \"$ac_link\"") >&5 +if { (eval echo "$as_me:12882: \"$ac_link\"") >&5 (eval $ac_link) 2>&5 ac_status=$? - echo "$as_me:11746: \$? = $ac_status" >&5 + echo "$as_me:12885: \$? = $ac_status" >&5 (exit $ac_status); } && { ac_try='test -s conftest$ac_exeext' - { (eval echo "$as_me:11749: \"$ac_try\"") >&5 + { (eval echo "$as_me:12888: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? - echo "$as_me:11752: \$? = $ac_status" >&5 + echo "$as_me:12891: \$? = $ac_status" >&5 (exit $ac_status); }; }; then ac_cv_lib_mytinfo_tgoto=yes else @@ -11760,7 +12899,7 @@ fi rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext LIBS=$ac_check_lib_save_LIBS fi -echo "$as_me:11763: result: $ac_cv_lib_mytinfo_tgoto" >&5 +echo "$as_me:12902: result: $ac_cv_lib_mytinfo_tgoto" >&5 echo "${ECHO_T}$ac_cv_lib_mytinfo_tgoto" >&6 if test $ac_cv_lib_mytinfo_tgoto = yes; then LIBS="-lmytinfo $LIBS" @@ -11774,7 +12913,7 @@ hpux10.*) #(vi # term.h) for cur_colr if test "x$cf_cv_screen" = "xcurses_colr" then - echo "$as_me:11777: checking for initscr in -lcur_colr" >&5 + echo "$as_me:12916: checking for initscr in -lcur_colr" >&5 echo $ECHO_N "checking for initscr in -lcur_colr... $ECHO_C" >&6 if test "${ac_cv_lib_cur_colr_initscr+set}" = set; then echo $ECHO_N "(cached) $ECHO_C" >&6 @@ -11782,7 +12921,7 @@ else ac_check_lib_save_LIBS=$LIBS LIBS="-lcur_colr $LIBS" cat >conftest.$ac_ext <<_ACEOF -#line 11785 "configure" +#line 12924 "configure" #include "confdefs.h" /* Override any gcc2 internal prototype to avoid an error. */ @@ -11801,16 +12940,16 @@ initscr (); } _ACEOF rm -f conftest.$ac_objext conftest$ac_exeext -if { (eval echo "$as_me:11804: \"$ac_link\"") >&5 +if { (eval echo "$as_me:12943: \"$ac_link\"") >&5 (eval $ac_link) 2>&5 ac_status=$? - echo "$as_me:11807: \$? = $ac_status" >&5 + echo "$as_me:12946: \$? = $ac_status" >&5 (exit $ac_status); } && { ac_try='test -s conftest$ac_exeext' - { (eval echo "$as_me:11810: \"$ac_try\"") >&5 + { (eval echo "$as_me:12949: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? - echo "$as_me:11813: \$? = $ac_status" >&5 + echo "$as_me:12952: \$? = $ac_status" >&5 (exit $ac_status); }; }; then ac_cv_lib_cur_colr_initscr=yes else @@ -11821,7 +12960,7 @@ fi rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext LIBS=$ac_check_lib_save_LIBS fi -echo "$as_me:11824: result: $ac_cv_lib_cur_colr_initscr" >&5 +echo "$as_me:12963: result: $ac_cv_lib_cur_colr_initscr" >&5 echo "${ECHO_T}$ac_cv_lib_cur_colr_initscr" >&6 if test $ac_cv_lib_cur_colr_initscr = yes; then @@ -11830,7 +12969,7 @@ if test $ac_cv_lib_cur_colr_initscr = yes; then else - echo "$as_me:11833: checking for initscr in -lHcurses" >&5 + echo "$as_me:12972: checking for initscr in -lHcurses" >&5 echo $ECHO_N "checking for initscr in -lHcurses... $ECHO_C" >&6 if test "${ac_cv_lib_Hcurses_initscr+set}" = set; then echo $ECHO_N "(cached) $ECHO_C" >&6 @@ -11838,7 +12977,7 @@ else ac_check_lib_save_LIBS=$LIBS LIBS="-lHcurses $LIBS" cat >conftest.$ac_ext <<_ACEOF -#line 11841 "configure" +#line 12980 "configure" #include "confdefs.h" /* Override any gcc2 internal prototype to avoid an error. */ @@ -11857,16 +12996,16 @@ initscr (); } _ACEOF rm -f conftest.$ac_objext conftest$ac_exeext -if { (eval echo "$as_me:11860: \"$ac_link\"") >&5 +if { (eval echo "$as_me:12999: \"$ac_link\"") >&5 (eval $ac_link) 2>&5 ac_status=$? - echo "$as_me:11863: \$? = $ac_status" >&5 + echo "$as_me:13002: \$? = $ac_status" >&5 (exit $ac_status); } && { ac_try='test -s conftest$ac_exeext' - { (eval echo "$as_me:11866: \"$ac_try\"") >&5 + { (eval echo "$as_me:13005: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? - echo "$as_me:11869: \$? = $ac_status" >&5 + echo "$as_me:13008: \$? = $ac_status" >&5 (exit $ac_status); }; }; then ac_cv_lib_Hcurses_initscr=yes else @@ -11877,7 +13016,7 @@ fi rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext LIBS=$ac_check_lib_save_LIBS fi -echo "$as_me:11880: result: $ac_cv_lib_Hcurses_initscr" >&5 +echo "$as_me:13019: result: $ac_cv_lib_Hcurses_initscr" >&5 echo "${ECHO_T}$ac_cv_lib_Hcurses_initscr" >&6 if test $ac_cv_lib_Hcurses_initscr = yes; then @@ -11891,7 +13030,7 @@ fi fi fi - ;; + ;; linux*) case `arch 2>/dev/null` in x86_64) @@ -11917,7 +13056,7 @@ if test -n "/lib64" ; then if test "$cf_have_libdir" = no ; then test -n "$verbose" && echo " adding $cf_add_libdir to library-path" 1>&6 -echo "${as_me:-configure}:11920: testing adding $cf_add_libdir to library-path ..." 1>&5 +echo "${as_me:-configure}:13059: testing adding $cf_add_libdir to library-path ..." 1>&5 LDFLAGS="-L$cf_add_libdir $LDFLAGS" fi @@ -11946,7 +13085,7 @@ if test -n "/lib" ; then if test "$cf_have_libdir" = no ; then test -n "$verbose" && echo " adding $cf_add_libdir to library-path" 1>&6 -echo "${as_me:-configure}:11949: testing adding $cf_add_libdir to library-path ..." 1>&5 +echo "${as_me:-configure}:13088: testing adding $cf_add_libdir to library-path ..." 1>&5 LDFLAGS="-L$cf_add_libdir $LDFLAGS" fi @@ -11977,7 +13116,7 @@ if test -n "/lib" ; then if test "$cf_have_libdir" = no ; then test -n "$verbose" && echo " adding $cf_add_libdir to library-path" 1>&6 -echo "${as_me:-configure}:11980: testing adding $cf_add_libdir to library-path ..." 1>&5 +echo "${as_me:-configure}:13119: testing adding $cf_add_libdir to library-path ..." 1>&5 LDFLAGS="-L$cf_add_libdir $LDFLAGS" fi @@ -11987,7 +13126,7 @@ fi ;; esac - ;; + ;; sunos3*|sunos4*) if test "x$cf_cv_screen" = "xcurses_5lib" then @@ -12012,7 +13151,7 @@ if test -n "/usr/5lib" ; then if test "$cf_have_libdir" = no ; then test -n "$verbose" && echo " adding $cf_add_libdir to library-path" 1>&6 -echo "${as_me:-configure}:12015: testing adding $cf_add_libdir to library-path ..." 1>&5 +echo "${as_me:-configure}:13154: testing adding $cf_add_libdir to library-path ..." 1>&5 LDFLAGS="-L$cf_add_libdir $LDFLAGS" fi @@ -12028,26 +13167,26 @@ fi esac if test ".$ac_cv_func_initscr" != .yes ; then - cf_save_LIBS="$LIBS" - cf_term_lib="" - cf_curs_lib="" + cf_save_LIBS="$LIBS" - if test ".${cf_cv_ncurses_version:-no}" != .no - then - cf_check_list="ncurses curses cursesX" - else - cf_check_list="cursesX curses ncurses" - fi + if test ".${cf_cv_ncurses_version:-no}" != .no + then + cf_check_list="ncurses curses cursesX" + else + cf_check_list="cursesX curses ncurses" + fi - # Check for library containing tgoto. Do this before curses library - # because it may be needed to link the test-case for initscr. - echo "$as_me:12044: checking for tgoto" >&5 + # Check for library containing tgoto. Do this before curses library + # because it may be needed to link the test-case for initscr. + if test "x$cf_term_lib" = x + then + echo "$as_me:13183: checking for tgoto" >&5 echo $ECHO_N "checking for tgoto... $ECHO_C" >&6 if test "${ac_cv_func_tgoto+set}" = set; then echo $ECHO_N "(cached) $ECHO_C" >&6 else cat >conftest.$ac_ext <<_ACEOF -#line 12050 "configure" +#line 13189 "configure" #include "confdefs.h" /* System header to define __stub macros and hopefully few prototypes, which can conflict with char tgoto (); below. */ @@ -12078,16 +13217,16 @@ f = tgoto; /* workaround for ICC 12.0.3 */ if (f == 0) return 1; } _ACEOF rm -f conftest.$ac_objext conftest$ac_exeext -if { (eval echo "$as_me:12081: \"$ac_link\"") >&5 +if { (eval echo "$as_me:13220: \"$ac_link\"") >&5 (eval $ac_link) 2>&5 ac_status=$? - echo "$as_me:12084: \$? = $ac_status" >&5 + echo "$as_me:13223: \$? = $ac_status" >&5 (exit $ac_status); } && { ac_try='test -s conftest$ac_exeext' - { (eval echo "$as_me:12087: \"$ac_try\"") >&5 + { (eval echo "$as_me:13226: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? - echo "$as_me:12090: \$? = $ac_status" >&5 + echo "$as_me:13229: \$? = $ac_status" >&5 (exit $ac_status); }; }; then ac_cv_func_tgoto=yes else @@ -12097,16 +13236,16 @@ ac_cv_func_tgoto=no fi rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext fi -echo "$as_me:12100: result: $ac_cv_func_tgoto" >&5 +echo "$as_me:13239: result: $ac_cv_func_tgoto" >&5 echo "${ECHO_T}$ac_cv_func_tgoto" >&6 if test $ac_cv_func_tgoto = yes; then cf_term_lib=predefined else - for cf_term_lib in $cf_check_list otermcap termcap tinfo termlib unknown - do - as_ac_Lib=`echo "ac_cv_lib_$cf_term_lib''_tgoto" | $as_tr_sh` -echo "$as_me:12109: checking for tgoto in -l$cf_term_lib" >&5 + for cf_term_lib in $cf_check_list otermcap termcap tinfo termlib unknown + do + as_ac_Lib=`echo "ac_cv_lib_$cf_term_lib''_tgoto" | $as_tr_sh` +echo "$as_me:13248: checking for tgoto in -l$cf_term_lib" >&5 echo $ECHO_N "checking for tgoto in -l$cf_term_lib... $ECHO_C" >&6 if eval "test \"\${$as_ac_Lib+set}\" = set"; then echo $ECHO_N "(cached) $ECHO_C" >&6 @@ -12114,7 +13253,7 @@ else ac_check_lib_save_LIBS=$LIBS LIBS="-l$cf_term_lib $LIBS" cat >conftest.$ac_ext <<_ACEOF -#line 12117 "configure" +#line 13256 "configure" #include "confdefs.h" /* Override any gcc2 internal prototype to avoid an error. */ @@ -12133,16 +13272,16 @@ tgoto (); } _ACEOF rm -f conftest.$ac_objext conftest$ac_exeext -if { (eval echo "$as_me:12136: \"$ac_link\"") >&5 +if { (eval echo "$as_me:13275: \"$ac_link\"") >&5 (eval $ac_link) 2>&5 ac_status=$? - echo "$as_me:12139: \$? = $ac_status" >&5 + echo "$as_me:13278: \$? = $ac_status" >&5 (exit $ac_status); } && { ac_try='test -s conftest$ac_exeext' - { (eval echo "$as_me:12142: \"$ac_try\"") >&5 + { (eval echo "$as_me:13281: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? - echo "$as_me:12145: \$? = $ac_status" >&5 + echo "$as_me:13284: \$? = $ac_status" >&5 (exit $ac_status); }; }; then eval "$as_ac_Lib=yes" else @@ -12153,22 +13292,26 @@ fi rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext LIBS=$ac_check_lib_save_LIBS fi -echo "$as_me:12156: result: `eval echo '${'$as_ac_Lib'}'`" >&5 +echo "$as_me:13295: result: `eval echo '${'$as_ac_Lib'}'`" >&5 echo "${ECHO_T}`eval echo '${'$as_ac_Lib'}'`" >&6 if test `eval echo '${'$as_ac_Lib'}'` = yes; then break fi - done + done fi - # Check for library containing initscr - test "$cf_term_lib" != predefined && test "$cf_term_lib" != unknown && LIBS="-l$cf_term_lib $cf_save_LIBS" - for cf_curs_lib in $cf_check_list xcurses jcurses pdcurses unknown - do - as_ac_Lib=`echo "ac_cv_lib_$cf_curs_lib''_initscr" | $as_tr_sh` -echo "$as_me:12171: checking for initscr in -l$cf_curs_lib" >&5 + fi + + # Check for library containing initscr + test "$cf_term_lib" != predefined && test "$cf_term_lib" != unknown && LIBS="-l$cf_term_lib $cf_save_LIBS" + if test "x$cf_curs_lib" = x + then + for cf_curs_lib in $cf_check_list xcurses jcurses pdcurses unknown + do + as_ac_Lib=`echo "ac_cv_lib_$cf_curs_lib''_initscr" | $as_tr_sh` +echo "$as_me:13314: checking for initscr in -l$cf_curs_lib" >&5 echo $ECHO_N "checking for initscr in -l$cf_curs_lib... $ECHO_C" >&6 if eval "test \"\${$as_ac_Lib+set}\" = set"; then echo $ECHO_N "(cached) $ECHO_C" >&6 @@ -12176,7 +13319,7 @@ else ac_check_lib_save_LIBS=$LIBS LIBS="-l$cf_curs_lib $LIBS" cat >conftest.$ac_ext <<_ACEOF -#line 12179 "configure" +#line 13322 "configure" #include "confdefs.h" /* Override any gcc2 internal prototype to avoid an error. */ @@ -12195,16 +13338,16 @@ initscr (); } _ACEOF rm -f conftest.$ac_objext conftest$ac_exeext -if { (eval echo "$as_me:12198: \"$ac_link\"") >&5 +if { (eval echo "$as_me:13341: \"$ac_link\"") >&5 (eval $ac_link) 2>&5 ac_status=$? - echo "$as_me:12201: \$? = $ac_status" >&5 + echo "$as_me:13344: \$? = $ac_status" >&5 (exit $ac_status); } && { ac_try='test -s conftest$ac_exeext' - { (eval echo "$as_me:12204: \"$ac_try\"") >&5 + { (eval echo "$as_me:13347: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? - echo "$as_me:12207: \$? = $ac_status" >&5 + echo "$as_me:13350: \$? = $ac_status" >&5 (exit $ac_status); }; }; then eval "$as_ac_Lib=yes" else @@ -12215,23 +13358,24 @@ fi rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext LIBS=$ac_check_lib_save_LIBS fi -echo "$as_me:12218: result: `eval echo '${'$as_ac_Lib'}'`" >&5 +echo "$as_me:13361: result: `eval echo '${'$as_ac_Lib'}'`" >&5 echo "${ECHO_T}`eval echo '${'$as_ac_Lib'}'`" >&6 if test `eval echo '${'$as_ac_Lib'}'` = yes; then break fi - done - test $cf_curs_lib = unknown && { { echo "$as_me:12225: error: no curses library found" >&5 + done + fi + test $cf_curs_lib = unknown && { { echo "$as_me:13369: error: no curses library found" >&5 echo "$as_me: error: no curses library found" >&2;} { (exit 1); exit 1; }; } - LIBS="-l$cf_curs_lib $cf_save_LIBS" - if test "$cf_term_lib" = unknown ; then - echo "$as_me:12231: checking if we can link with $cf_curs_lib library" >&5 + LIBS="-l$cf_curs_lib $cf_save_LIBS" + if test "$cf_term_lib" = unknown ; then + echo "$as_me:13375: checking if we can link with $cf_curs_lib library" >&5 echo $ECHO_N "checking if we can link with $cf_curs_lib library... $ECHO_C" >&6 - cat >conftest.$ac_ext <<_ACEOF -#line 12234 "configure" + cat >conftest.$ac_ext <<_ACEOF +#line 13378 "configure" #include "confdefs.h" #include <${cf_cv_ncurses_header:-curses.h}> int @@ -12243,16 +13387,16 @@ initscr() } _ACEOF rm -f conftest.$ac_objext conftest$ac_exeext -if { (eval echo "$as_me:12246: \"$ac_link\"") >&5 +if { (eval echo "$as_me:13390: \"$ac_link\"") >&5 (eval $ac_link) 2>&5 ac_status=$? - echo "$as_me:12249: \$? = $ac_status" >&5 + echo "$as_me:13393: \$? = $ac_status" >&5 (exit $ac_status); } && { ac_try='test -s conftest$ac_exeext' - { (eval echo "$as_me:12252: \"$ac_try\"") >&5 + { (eval echo "$as_me:13396: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? - echo "$as_me:12255: \$? = $ac_status" >&5 + echo "$as_me:13399: \$? = $ac_status" >&5 (exit $ac_status); }; }; then cf_result=yes else @@ -12261,18 +13405,18 @@ cat conftest.$ac_ext >&5 cf_result=no fi rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext - echo "$as_me:12264: result: $cf_result" >&5 + echo "$as_me:13408: result: $cf_result" >&5 echo "${ECHO_T}$cf_result" >&6 - test $cf_result = no && { { echo "$as_me:12266: error: Cannot link curses library" >&5 + test $cf_result = no && { { echo "$as_me:13410: error: Cannot link curses library" >&5 echo "$as_me: error: Cannot link curses library" >&2;} { (exit 1); exit 1; }; } - elif test "$cf_curs_lib" = "$cf_term_lib" ; then - : - elif test "$cf_term_lib" != predefined ; then - echo "$as_me:12272: checking if we need both $cf_curs_lib and $cf_term_lib libraries" >&5 + elif test "$cf_curs_lib" = "$cf_term_lib" ; then + : + elif test "$cf_term_lib" != predefined ; then + echo "$as_me:13416: checking if we need both $cf_curs_lib and $cf_term_lib libraries" >&5 echo $ECHO_N "checking if we need both $cf_curs_lib and $cf_term_lib libraries... $ECHO_C" >&6 - cat >conftest.$ac_ext <<_ACEOF -#line 12275 "configure" + cat >conftest.$ac_ext <<_ACEOF +#line 13419 "configure" #include "confdefs.h" #include <${cf_cv_ncurses_header:-curses.h}> int @@ -12284,25 +13428,25 @@ initscr(); tgoto((char *)0, 0, 0); } _ACEOF rm -f conftest.$ac_objext conftest$ac_exeext -if { (eval echo "$as_me:12287: \"$ac_link\"") >&5 +if { (eval echo "$as_me:13431: \"$ac_link\"") >&5 (eval $ac_link) 2>&5 ac_status=$? - echo "$as_me:12290: \$? = $ac_status" >&5 + echo "$as_me:13434: \$? = $ac_status" >&5 (exit $ac_status); } && { ac_try='test -s conftest$ac_exeext' - { (eval echo "$as_me:12293: \"$ac_try\"") >&5 + { (eval echo "$as_me:13437: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? - echo "$as_me:12296: \$? = $ac_status" >&5 + echo "$as_me:13440: \$? = $ac_status" >&5 (exit $ac_status); }; }; then cf_result=no else echo "$as_me: failed program was:" >&5 cat conftest.$ac_ext >&5 - LIBS="-l$cf_curs_lib -l$cf_term_lib $cf_save_LIBS" - cat >conftest.$ac_ext <<_ACEOF -#line 12305 "configure" + LIBS="-l$cf_curs_lib -l$cf_term_lib $cf_save_LIBS" + cat >conftest.$ac_ext <<_ACEOF +#line 13449 "configure" #include "confdefs.h" #include <${cf_cv_ncurses_header:-curses.h}> int @@ -12314,16 +13458,16 @@ initscr() } _ACEOF rm -f conftest.$ac_objext conftest$ac_exeext -if { (eval echo "$as_me:12317: \"$ac_link\"") >&5 +if { (eval echo "$as_me:13461: \"$ac_link\"") >&5 (eval $ac_link) 2>&5 ac_status=$? - echo "$as_me:12320: \$? = $ac_status" >&5 + echo "$as_me:13464: \$? = $ac_status" >&5 (exit $ac_status); } && { ac_try='test -s conftest$ac_exeext' - { (eval echo "$as_me:12323: \"$ac_try\"") >&5 + { (eval echo "$as_me:13467: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? - echo "$as_me:12326: \$? = $ac_status" >&5 + echo "$as_me:13470: \$? = $ac_status" >&5 (exit $ac_status); }; }; then cf_result=yes else @@ -12335,9 +13479,9 @@ rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext fi rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext - echo "$as_me:12338: result: $cf_result" >&5 + echo "$as_me:13482: result: $cf_result" >&5 echo "${ECHO_T}$cf_result" >&6 - fi + fi fi fi @@ -12345,7 +13489,7 @@ fi cf_all_widgets=yes -echo "$as_me:12348: checking if you want extra dialogs" >&5 +echo "$as_me:13492: checking if you want extra dialogs" >&5 echo $ECHO_N "checking if you want extra dialogs... $ECHO_C" >&6 # Check whether --enable-extras or --disable-extras was given. @@ -12355,7 +13499,7 @@ if test "${enable_extras+set}" = set; then else enableval=yes fi; -echo "$as_me:12358: result: $enableval" >&5 +echo "$as_me:13502: result: $enableval" >&5 echo "${ECHO_T}$enableval" >&6 if test "$enableval" != no ; then cf_all_widgets=yes @@ -12363,7 +13507,7 @@ else cf_all_widgets=no fi -echo "$as_me:12366: checking if you want config-file support" >&5 +echo "$as_me:13510: checking if you want config-file support" >&5 echo $ECHO_N "checking if you want config-file support... $ECHO_C" >&6 # Check whether --enable-rc-file or --disable-rc-file was given. @@ -12373,7 +13517,7 @@ if test "${enable_rc_file+set}" = set; then else enableval=$cf_all_widgets fi; -echo "$as_me:12376: result: $enableval" >&5 +echo "$as_me:13520: result: $enableval" >&5 echo "${ECHO_T}$enableval" >&6 if test "$enableval" != no ; then EXTRAOBJS="$EXTRAOBJS rc\$o" @@ -12386,7 +13530,7 @@ else : fi -echo "$as_me:12389: checking if you want Xdialog-style dialogs" >&5 +echo "$as_me:13533: checking if you want Xdialog-style dialogs" >&5 echo $ECHO_N "checking if you want Xdialog-style dialogs... $ECHO_C" >&6 # Check whether --enable-Xdialog or --disable-Xdialog was given. @@ -12396,7 +13540,7 @@ if test "${enable_Xdialog+set}" = set; then else enableval=$cf_all_widgets fi; -echo "$as_me:12399: result: $enableval" >&5 +echo "$as_me:13543: result: $enableval" >&5 echo "${ECHO_T}$enableval" >&6 if test "$enableval" != no ; then EXTRAOBJS="$EXTRAOBJS calendar\$o fselect\$o timebox\$o" @@ -12409,7 +13553,7 @@ else : fi -echo "$as_me:12412: checking if you want extra Xdialog-style dialogs (1.2)" >&5 +echo "$as_me:13556: checking if you want extra Xdialog-style dialogs (1.2)" >&5 echo $ECHO_N "checking if you want extra Xdialog-style dialogs (1.2)... $ECHO_C" >&6 # Check whether --enable-Xdialog2 or --disable-Xdialog2 was given. @@ -12419,7 +13563,7 @@ if test "${enable_Xdialog2+set}" = set; then else enableval=$cf_all_widgets fi; -echo "$as_me:12422: result: $enableval" >&5 +echo "$as_me:13566: result: $enableval" >&5 echo "${ECHO_T}$enableval" >&6 if test "$enableval" != no ; then EXTRAOBJS="$EXTRAOBJS buildlist\$o rangebox\$o treeview\$o" @@ -12432,7 +13576,7 @@ else : fi -echo "$as_me:12435: checking if you want compatibility with whiptail options" >&5 +echo "$as_me:13579: checking if you want compatibility with whiptail options" >&5 echo $ECHO_N "checking if you want compatibility with whiptail options... $ECHO_C" >&6 # Check whether --enable-whiptail or --disable-whiptail was given. @@ -12442,7 +13586,7 @@ if test "${enable_whiptail+set}" = set; then else enableval=$cf_all_widgets fi; -echo "$as_me:12445: result: $enableval" >&5 +echo "$as_me:13589: result: $enableval" >&5 echo "${ECHO_T}$enableval" >&6 if test "$enableval" != no ; then @@ -12454,7 +13598,7 @@ else : fi -echo "$as_me:12457: checking if you want the form dialog" >&5 +echo "$as_me:13601: checking if you want the form dialog" >&5 echo $ECHO_N "checking if you want the form dialog... $ECHO_C" >&6 # Check whether --enable-form or --disable-form was given. @@ -12464,7 +13608,7 @@ if test "${enable_form+set}" = set; then else enableval=$cf_all_widgets fi; -echo "$as_me:12467: result: $enableval" >&5 +echo "$as_me:13611: result: $enableval" >&5 echo "${ECHO_T}$enableval" >&6 if test "$enableval" != no ; then EXTRAOBJS="$EXTRAOBJS formbox\$o" @@ -12477,7 +13621,7 @@ else : fi -echo "$as_me:12480: checking if you want the gauge dialog" >&5 +echo "$as_me:13624: checking if you want the gauge dialog" >&5 echo $ECHO_N "checking if you want the gauge dialog... $ECHO_C" >&6 # Check whether --enable-gauge or --disable-gauge was given. @@ -12487,7 +13631,7 @@ if test "${enable_gauge+set}" = set; then else enableval=$cf_all_widgets fi; -echo "$as_me:12490: result: $enableval" >&5 +echo "$as_me:13634: result: $enableval" >&5 echo "${ECHO_T}$enableval" >&6 if test "$enableval" != no ; then EXTRAOBJS="$EXTRAOBJS guage\$o pause\$o prgbox\$o progressbox\$o" @@ -12500,7 +13644,7 @@ else : fi -echo "$as_me:12503: checking if you want the tailbox dialog" >&5 +echo "$as_me:13647: checking if you want the tailbox dialog" >&5 echo $ECHO_N "checking if you want the tailbox dialog... $ECHO_C" >&6 # Check whether --enable-tailbox or --disable-tailbox was given. @@ -12510,7 +13654,7 @@ if test "${enable_tailbox+set}" = set; then else enableval=$cf_all_widgets fi; -echo "$as_me:12513: result: $enableval" >&5 +echo "$as_me:13657: result: $enableval" >&5 echo "${ECHO_T}$enableval" >&6 if test "$enableval" != no ; then EXTRAOBJS="$EXTRAOBJS tailbox\$o" @@ -12523,7 +13667,7 @@ else : fi -echo "$as_me:12526: checking if you want the mixedform dialog" >&5 +echo "$as_me:13670: checking if you want the mixedform dialog" >&5 echo $ECHO_N "checking if you want the mixedform dialog... $ECHO_C" >&6 # Check whether --enable-mixedform or --disable-mixedform was given. @@ -12533,7 +13677,7 @@ if test "${enable_mixedform+set}" = set; then else enableval=$cf_all_widgets fi; -echo "$as_me:12536: result: $enableval" >&5 +echo "$as_me:13680: result: $enableval" >&5 echo "${ECHO_T}$enableval" >&6 if test "$enableval" != no ; then EXTRAOBJS="$EXTRAOBJS mixedform\$o" @@ -12546,7 +13690,7 @@ else : fi -echo "$as_me:12549: checking if you want the mixedgauge dialog" >&5 +echo "$as_me:13693: checking if you want the mixedgauge dialog" >&5 echo $ECHO_N "checking if you want the mixedgauge dialog... $ECHO_C" >&6 # Check whether --enable-mixedgauge or --disable-mixedgauge was given. @@ -12556,7 +13700,7 @@ if test "${enable_mixedgauge+set}" = set; then else enableval=$cf_all_widgets fi; -echo "$as_me:12559: result: $enableval" >&5 +echo "$as_me:13703: result: $enableval" >&5 echo "${ECHO_T}$enableval" >&6 if test "$enableval" != no ; then EXTRAOBJS="$EXTRAOBJS mixedgauge\$o" @@ -12569,7 +13713,7 @@ else : fi -echo "$as_me:12572: checking if you want the wide-curses features" >&5 +echo "$as_me:13716: checking if you want the wide-curses features" >&5 echo $ECHO_N "checking if you want the wide-curses features... $ECHO_C" >&6 # Check whether --enable-widec or --disable-widec was given. @@ -12579,7 +13723,7 @@ if test "${enable_widec+set}" = set; then else enableval=$cf_wide_curses fi; -echo "$as_me:12582: result: $enableval" >&5 +echo "$as_me:13726: result: $enableval" >&5 echo "${ECHO_T}$enableval" >&6 if test "$enableval" != no ; then @@ -12591,13 +13735,13 @@ else : fi -echo "$as_me:12594: checking for ANSI C header files" >&5 +echo "$as_me:13738: checking for ANSI C header files" >&5 echo $ECHO_N "checking for ANSI C header files... $ECHO_C" >&6 if test "${ac_cv_header_stdc+set}" = set; then echo $ECHO_N "(cached) $ECHO_C" >&6 else cat >conftest.$ac_ext <<_ACEOF -#line 12600 "configure" +#line 13744 "configure" #include "confdefs.h" #include <stdlib.h> #include <stdarg.h> @@ -12605,13 +13749,13 @@ else #include <float.h> _ACEOF -if { (eval echo "$as_me:12608: \"$ac_cpp conftest.$ac_ext\"") >&5 +if { (eval echo "$as_me:13752: \"$ac_cpp conftest.$ac_ext\"") >&5 (eval $ac_cpp conftest.$ac_ext) 2>conftest.er1 ac_status=$? egrep -v '^ *\+' conftest.er1 >conftest.err rm -f conftest.er1 cat conftest.err >&5 - echo "$as_me:12614: \$? = $ac_status" >&5 + echo "$as_me:13758: \$? = $ac_status" >&5 (exit $ac_status); } >/dev/null; then if test -s conftest.err; then ac_cpp_err=$ac_c_preproc_warn_flag @@ -12633,7 +13777,7 @@ rm -f conftest.err conftest.$ac_ext if test $ac_cv_header_stdc = yes; then # SunOS 4.x string.h does not declare mem*, contrary to ANSI. cat >conftest.$ac_ext <<_ACEOF -#line 12636 "configure" +#line 13780 "configure" #include "confdefs.h" #include <string.h> @@ -12651,7 +13795,7 @@ fi if test $ac_cv_header_stdc = yes; then # ISC 2.0.2 stdlib.h does not declare free, contrary to ANSI. cat >conftest.$ac_ext <<_ACEOF -#line 12654 "configure" +#line 13798 "configure" #include "confdefs.h" #include <stdlib.h> @@ -12672,7 +13816,7 @@ if test $ac_cv_header_stdc = yes; then : else cat >conftest.$ac_ext <<_ACEOF -#line 12675 "configure" +#line 13819 "configure" #include "confdefs.h" #include <ctype.h> #if ((' ' & 0x0FF) == 0x020) @@ -12698,15 +13842,15 @@ main () } _ACEOF rm -f conftest$ac_exeext -if { (eval echo "$as_me:12701: \"$ac_link\"") >&5 +if { (eval echo "$as_me:13845: \"$ac_link\"") >&5 (eval $ac_link) 2>&5 ac_status=$? - echo "$as_me:12704: \$? = $ac_status" >&5 + echo "$as_me:13848: \$? = $ac_status" >&5 (exit $ac_status); } && { ac_try='./conftest$ac_exeext' - { (eval echo "$as_me:12706: \"$ac_try\"") >&5 + { (eval echo "$as_me:13850: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? - echo "$as_me:12709: \$? = $ac_status" >&5 + echo "$as_me:13853: \$? = $ac_status" >&5 (exit $ac_status); }; }; then : else @@ -12719,7 +13863,7 @@ rm -f core core.* *.core conftest$ac_exeext conftest.$ac_objext conftest.$ac_ext fi fi fi -echo "$as_me:12722: result: $ac_cv_header_stdc" >&5 +echo "$as_me:13866: result: $ac_cv_header_stdc" >&5 echo "${ECHO_T}$ac_cv_header_stdc" >&6 if test $ac_cv_header_stdc = yes; then @@ -12729,13 +13873,13 @@ EOF fi -echo "$as_me:12732: checking whether time.h and sys/time.h may both be included" >&5 +echo "$as_me:13876: checking whether time.h and sys/time.h may both be included" >&5 echo $ECHO_N "checking whether time.h and sys/time.h may both be included... $ECHO_C" >&6 if test "${ac_cv_header_time+set}" = set; then echo $ECHO_N "(cached) $ECHO_C" >&6 else cat >conftest.$ac_ext <<_ACEOF -#line 12738 "configure" +#line 13882 "configure" #include "confdefs.h" #include <sys/types.h> #include <sys/time.h> @@ -12751,16 +13895,16 @@ return 0; } _ACEOF rm -f conftest.$ac_objext -if { (eval echo "$as_me:12754: \"$ac_compile\"") >&5 +if { (eval echo "$as_me:13898: \"$ac_compile\"") >&5 (eval $ac_compile) 2>&5 ac_status=$? - echo "$as_me:12757: \$? = $ac_status" >&5 + echo "$as_me:13901: \$? = $ac_status" >&5 (exit $ac_status); } && { ac_try='test -s conftest.$ac_objext' - { (eval echo "$as_me:12760: \"$ac_try\"") >&5 + { (eval echo "$as_me:13904: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? - echo "$as_me:12763: \$? = $ac_status" >&5 + echo "$as_me:13907: \$? = $ac_status" >&5 (exit $ac_status); }; }; then ac_cv_header_time=yes else @@ -12770,7 +13914,7 @@ ac_cv_header_time=no fi rm -f conftest.$ac_objext conftest.$ac_ext fi -echo "$as_me:12773: result: $ac_cv_header_time" >&5 +echo "$as_me:13917: result: $ac_cv_header_time" >&5 echo "${ECHO_T}$ac_cv_header_time" >&6 if test $ac_cv_header_time = yes; then @@ -12783,13 +13927,13 @@ fi ac_header_dirent=no for ac_hdr in dirent.h sys/ndir.h sys/dir.h ndir.h; do as_ac_Header=`echo "ac_cv_header_dirent_$ac_hdr" | $as_tr_sh` -echo "$as_me:12786: checking for $ac_hdr that defines DIR" >&5 +echo "$as_me:13930: checking for $ac_hdr that defines DIR" >&5 echo $ECHO_N "checking for $ac_hdr that defines DIR... $ECHO_C" >&6 if eval "test \"\${$as_ac_Header+set}\" = set"; then echo $ECHO_N "(cached) $ECHO_C" >&6 else cat >conftest.$ac_ext <<_ACEOF -#line 12792 "configure" +#line 13936 "configure" #include "confdefs.h" #include <sys/types.h> #include <$ac_hdr> @@ -12804,16 +13948,16 @@ return 0; } _ACEOF rm -f conftest.$ac_objext -if { (eval echo "$as_me:12807: \"$ac_compile\"") >&5 +if { (eval echo "$as_me:13951: \"$ac_compile\"") >&5 (eval $ac_compile) 2>&5 ac_status=$? - echo "$as_me:12810: \$? = $ac_status" >&5 + echo "$as_me:13954: \$? = $ac_status" >&5 (exit $ac_status); } && { ac_try='test -s conftest.$ac_objext' - { (eval echo "$as_me:12813: \"$ac_try\"") >&5 + { (eval echo "$as_me:13957: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? - echo "$as_me:12816: \$? = $ac_status" >&5 + echo "$as_me:13960: \$? = $ac_status" >&5 (exit $ac_status); }; }; then eval "$as_ac_Header=yes" else @@ -12823,7 +13967,7 @@ eval "$as_ac_Header=no" fi rm -f conftest.$ac_objext conftest.$ac_ext fi -echo "$as_me:12826: result: `eval echo '${'$as_ac_Header'}'`" >&5 +echo "$as_me:13970: result: `eval echo '${'$as_ac_Header'}'`" >&5 echo "${ECHO_T}`eval echo '${'$as_ac_Header'}'`" >&6 if test `eval echo '${'$as_ac_Header'}'` = yes; then cat >>confdefs.h <<EOF @@ -12836,7 +13980,7 @@ fi done # Two versions of opendir et al. are in -ldir and -lx on SCO Xenix. if test $ac_header_dirent = dirent.h; then - echo "$as_me:12839: checking for opendir in -ldir" >&5 + echo "$as_me:13983: checking for opendir in -ldir" >&5 echo $ECHO_N "checking for opendir in -ldir... $ECHO_C" >&6 if test "${ac_cv_lib_dir_opendir+set}" = set; then echo $ECHO_N "(cached) $ECHO_C" >&6 @@ -12844,7 +13988,7 @@ else ac_check_lib_save_LIBS=$LIBS LIBS="-ldir $LIBS" cat >conftest.$ac_ext <<_ACEOF -#line 12847 "configure" +#line 13991 "configure" #include "confdefs.h" /* Override any gcc2 internal prototype to avoid an error. */ @@ -12863,16 +14007,16 @@ opendir (); } _ACEOF rm -f conftest.$ac_objext conftest$ac_exeext -if { (eval echo "$as_me:12866: \"$ac_link\"") >&5 +if { (eval echo "$as_me:14010: \"$ac_link\"") >&5 (eval $ac_link) 2>&5 ac_status=$? - echo "$as_me:12869: \$? = $ac_status" >&5 + echo "$as_me:14013: \$? = $ac_status" >&5 (exit $ac_status); } && { ac_try='test -s conftest$ac_exeext' - { (eval echo "$as_me:12872: \"$ac_try\"") >&5 + { (eval echo "$as_me:14016: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? - echo "$as_me:12875: \$? = $ac_status" >&5 + echo "$as_me:14019: \$? = $ac_status" >&5 (exit $ac_status); }; }; then ac_cv_lib_dir_opendir=yes else @@ -12883,14 +14027,14 @@ fi rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext LIBS=$ac_check_lib_save_LIBS fi -echo "$as_me:12886: result: $ac_cv_lib_dir_opendir" >&5 +echo "$as_me:14030: result: $ac_cv_lib_dir_opendir" >&5 echo "${ECHO_T}$ac_cv_lib_dir_opendir" >&6 if test $ac_cv_lib_dir_opendir = yes; then LIBS="$LIBS -ldir" fi else - echo "$as_me:12893: checking for opendir in -lx" >&5 + echo "$as_me:14037: checking for opendir in -lx" >&5 echo $ECHO_N "checking for opendir in -lx... $ECHO_C" >&6 if test "${ac_cv_lib_x_opendir+set}" = set; then echo $ECHO_N "(cached) $ECHO_C" >&6 @@ -12898,7 +14042,7 @@ else ac_check_lib_save_LIBS=$LIBS LIBS="-lx $LIBS" cat >conftest.$ac_ext <<_ACEOF -#line 12901 "configure" +#line 14045 "configure" #include "confdefs.h" /* Override any gcc2 internal prototype to avoid an error. */ @@ -12917,16 +14061,16 @@ opendir (); } _ACEOF rm -f conftest.$ac_objext conftest$ac_exeext -if { (eval echo "$as_me:12920: \"$ac_link\"") >&5 +if { (eval echo "$as_me:14064: \"$ac_link\"") >&5 (eval $ac_link) 2>&5 ac_status=$? - echo "$as_me:12923: \$? = $ac_status" >&5 + echo "$as_me:14067: \$? = $ac_status" >&5 (exit $ac_status); } && { ac_try='test -s conftest$ac_exeext' - { (eval echo "$as_me:12926: \"$ac_try\"") >&5 + { (eval echo "$as_me:14070: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? - echo "$as_me:12929: \$? = $ac_status" >&5 + echo "$as_me:14073: \$? = $ac_status" >&5 (exit $ac_status); }; }; then ac_cv_lib_x_opendir=yes else @@ -12937,7 +14081,7 @@ fi rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext LIBS=$ac_check_lib_save_LIBS fi -echo "$as_me:12940: result: $ac_cv_lib_x_opendir" >&5 +echo "$as_me:14084: result: $ac_cv_lib_x_opendir" >&5 echo "${ECHO_T}$ac_cv_lib_x_opendir" >&6 if test $ac_cv_lib_x_opendir = yes; then LIBS="$LIBS -lx" @@ -12948,23 +14092,23 @@ fi for ac_header in search.h unctrl.h unistd.h do as_ac_Header=`echo "ac_cv_header_$ac_header" | $as_tr_sh` -echo "$as_me:12951: checking for $ac_header" >&5 +echo "$as_me:14095: checking for $ac_header" >&5 echo $ECHO_N "checking for $ac_header... $ECHO_C" >&6 if eval "test \"\${$as_ac_Header+set}\" = set"; then echo $ECHO_N "(cached) $ECHO_C" >&6 else cat >conftest.$ac_ext <<_ACEOF -#line 12957 "configure" +#line 14101 "configure" #include "confdefs.h" #include <$ac_header> _ACEOF -if { (eval echo "$as_me:12961: \"$ac_cpp conftest.$ac_ext\"") >&5 +if { (eval echo "$as_me:14105: \"$ac_cpp conftest.$ac_ext\"") >&5 (eval $ac_cpp conftest.$ac_ext) 2>conftest.er1 ac_status=$? egrep -v '^ *\+' conftest.er1 >conftest.err rm -f conftest.er1 cat conftest.err >&5 - echo "$as_me:12967: \$? = $ac_status" >&5 + echo "$as_me:14111: \$? = $ac_status" >&5 (exit $ac_status); } >/dev/null; then if test -s conftest.err; then ac_cpp_err=$ac_c_preproc_warn_flag @@ -12983,7 +14127,7 @@ else fi rm -f conftest.err conftest.$ac_ext fi -echo "$as_me:12986: result: `eval echo '${'$as_ac_Header'}'`" >&5 +echo "$as_me:14130: result: `eval echo '${'$as_ac_Header'}'`" >&5 echo "${ECHO_T}`eval echo '${'$as_ac_Header'}'`" >&6 if test `eval echo '${'$as_ac_Header'}'` = yes; then cat >>confdefs.h <<EOF @@ -12993,7 +14137,7 @@ EOF fi done -echo "$as_me:12996: checking for term.h" >&5 +echo "$as_me:14140: checking for term.h" >&5 echo $ECHO_N "checking for term.h... $ECHO_C" >&6 if test "${cf_cv_term_header+set}" = set; then echo $ECHO_N "(cached) $ECHO_C" >&6 @@ -13014,7 +14158,7 @@ esac for cf_header in $cf_header_list do cat >conftest.$ac_ext <<_ACEOF -#line 13017 "configure" +#line 14161 "configure" #include "confdefs.h" #include <${cf_cv_ncurses_header:-curses.h}> @@ -13028,16 +14172,16 @@ WINDOW *x } _ACEOF rm -f conftest.$ac_objext -if { (eval echo "$as_me:13031: \"$ac_compile\"") >&5 +if { (eval echo "$as_me:14175: \"$ac_compile\"") >&5 (eval $ac_compile) 2>&5 ac_status=$? - echo "$as_me:13034: \$? = $ac_status" >&5 + echo "$as_me:14178: \$? = $ac_status" >&5 (exit $ac_status); } && { ac_try='test -s conftest.$ac_objext' - { (eval echo "$as_me:13037: \"$ac_try\"") >&5 + { (eval echo "$as_me:14181: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? - echo "$as_me:13040: \$? = $ac_status" >&5 + echo "$as_me:14184: \$? = $ac_status" >&5 (exit $ac_status); }; }; then cf_cv_term_header=$cf_header break @@ -13056,7 +14200,7 @@ no) for cf_header in ncurses/term.h ncursesw/term.h do cat >conftest.$ac_ext <<_ACEOF -#line 13059 "configure" +#line 14203 "configure" #include "confdefs.h" #include <${cf_cv_ncurses_header:-curses.h}> @@ -13074,16 +14218,16 @@ WINDOW *x } _ACEOF rm -f conftest.$ac_objext -if { (eval echo "$as_me:13077: \"$ac_compile\"") >&5 +if { (eval echo "$as_me:14221: \"$ac_compile\"") >&5 (eval $ac_compile) 2>&5 ac_status=$? - echo "$as_me:13080: \$? = $ac_status" >&5 + echo "$as_me:14224: \$? = $ac_status" >&5 (exit $ac_status); } && { ac_try='test -s conftest.$ac_objext' - { (eval echo "$as_me:13083: \"$ac_try\"") >&5 + { (eval echo "$as_me:14227: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? - echo "$as_me:13086: \$? = $ac_status" >&5 + echo "$as_me:14230: \$? = $ac_status" >&5 (exit $ac_status); }; }; then cf_cv_term_header=$cf_header break @@ -13098,7 +14242,7 @@ rm -f conftest.$ac_objext conftest.$ac_ext esac fi -echo "$as_me:13101: result: $cf_cv_term_header" >&5 +echo "$as_me:14245: result: $cf_cv_term_header" >&5 echo "${ECHO_T}$cf_cv_term_header" >&6 case $cf_cv_term_header in #(vi @@ -13125,13 +14269,13 @@ EOF ;; esac -echo "$as_me:13128: checking return type of signal handlers" >&5 +echo "$as_me:14272: checking return type of signal handlers" >&5 echo $ECHO_N "checking return type of signal handlers... $ECHO_C" >&6 if test "${ac_cv_type_signal+set}" = set; then echo $ECHO_N "(cached) $ECHO_C" >&6 else cat >conftest.$ac_ext <<_ACEOF -#line 13134 "configure" +#line 14278 "configure" #include "confdefs.h" #include <sys/types.h> #include <signal.h> @@ -13153,16 +14297,16 @@ int i; } _ACEOF rm -f conftest.$ac_objext -if { (eval echo "$as_me:13156: \"$ac_compile\"") >&5 +if { (eval echo "$as_me:14300: \"$ac_compile\"") >&5 (eval $ac_compile) 2>&5 ac_status=$? - echo "$as_me:13159: \$? = $ac_status" >&5 + echo "$as_me:14303: \$? = $ac_status" >&5 (exit $ac_status); } && { ac_try='test -s conftest.$ac_objext' - { (eval echo "$as_me:13162: \"$ac_try\"") >&5 + { (eval echo "$as_me:14306: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? - echo "$as_me:13165: \$? = $ac_status" >&5 + echo "$as_me:14309: \$? = $ac_status" >&5 (exit $ac_status); }; }; then ac_cv_type_signal=void else @@ -13172,7 +14316,7 @@ ac_cv_type_signal=int fi rm -f conftest.$ac_objext conftest.$ac_ext fi -echo "$as_me:13175: result: $ac_cv_type_signal" >&5 +echo "$as_me:14319: result: $ac_cv_type_signal" >&5 echo "${ECHO_T}$ac_cv_type_signal" >&6 cat >>confdefs.h <<EOF @@ -13197,13 +14341,13 @@ wctomb \ do as_ac_var=`echo "ac_cv_func_$ac_func" | $as_tr_sh` -echo "$as_me:13200: checking for $ac_func" >&5 +echo "$as_me:14344: checking for $ac_func" >&5 echo $ECHO_N "checking for $ac_func... $ECHO_C" >&6 if eval "test \"\${$as_ac_var+set}\" = set"; then echo $ECHO_N "(cached) $ECHO_C" >&6 else cat >conftest.$ac_ext <<_ACEOF -#line 13206 "configure" +#line 14350 "configure" #include "confdefs.h" /* System header to define __stub macros and hopefully few prototypes, which can conflict with char $ac_func (); below. */ @@ -13234,16 +14378,16 @@ f = $ac_func; /* workaround for ICC 12.0.3 */ if (f == 0) return 1; } _ACEOF rm -f conftest.$ac_objext conftest$ac_exeext -if { (eval echo "$as_me:13237: \"$ac_link\"") >&5 +if { (eval echo "$as_me:14381: \"$ac_link\"") >&5 (eval $ac_link) 2>&5 ac_status=$? - echo "$as_me:13240: \$? = $ac_status" >&5 + echo "$as_me:14384: \$? = $ac_status" >&5 (exit $ac_status); } && { ac_try='test -s conftest$ac_exeext' - { (eval echo "$as_me:13243: \"$ac_try\"") >&5 + { (eval echo "$as_me:14387: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? - echo "$as_me:13246: \$? = $ac_status" >&5 + echo "$as_me:14390: \$? = $ac_status" >&5 (exit $ac_status); }; }; then eval "$as_ac_var=yes" else @@ -13253,7 +14397,7 @@ eval "$as_ac_var=no" fi rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext fi -echo "$as_me:13256: result: `eval echo '${'$as_ac_var'}'`" >&5 +echo "$as_me:14400: result: `eval echo '${'$as_ac_var'}'`" >&5 echo "${ECHO_T}`eval echo '${'$as_ac_var'}'`" >&6 if test `eval echo '${'$as_ac_var'}'` = yes; then cat >>confdefs.h <<EOF @@ -13263,14 +14407,14 @@ EOF fi done -echo "$as_me:13266: checking if we must define _XOPEN_SOURCE_EXTENDED" >&5 +echo "$as_me:14410: checking if we must define _XOPEN_SOURCE_EXTENDED" >&5 echo $ECHO_N "checking if we must define _XOPEN_SOURCE_EXTENDED... $ECHO_C" >&6 if test "${cf_cv_need_xopen_extension+set}" = set; then echo $ECHO_N "(cached) $ECHO_C" >&6 else cat >conftest.$ac_ext <<_ACEOF -#line 13273 "configure" +#line 14417 "configure" #include "confdefs.h" #include <stdlib.h> @@ -13292,23 +14436,23 @@ main () } _ACEOF rm -f conftest.$ac_objext conftest$ac_exeext -if { (eval echo "$as_me:13295: \"$ac_link\"") >&5 +if { (eval echo "$as_me:14439: \"$ac_link\"") >&5 (eval $ac_link) 2>&5 ac_status=$? - echo "$as_me:13298: \$? = $ac_status" >&5 + echo "$as_me:14442: \$? = $ac_status" >&5 (exit $ac_status); } && { ac_try='test -s conftest$ac_exeext' - { (eval echo "$as_me:13301: \"$ac_try\"") >&5 + { (eval echo "$as_me:14445: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? - echo "$as_me:13304: \$? = $ac_status" >&5 + echo "$as_me:14448: \$? = $ac_status" >&5 (exit $ac_status); }; }; then cf_cv_need_xopen_extension=no else echo "$as_me: failed program was:" >&5 cat conftest.$ac_ext >&5 cat >conftest.$ac_ext <<_ACEOF -#line 13311 "configure" +#line 14455 "configure" #include "confdefs.h" #define _XOPEN_SOURCE_EXTENDED @@ -13330,16 +14474,16 @@ main () } _ACEOF rm -f conftest.$ac_objext conftest$ac_exeext -if { (eval echo "$as_me:13333: \"$ac_link\"") >&5 +if { (eval echo "$as_me:14477: \"$ac_link\"") >&5 (eval $ac_link) 2>&5 ac_status=$? - echo "$as_me:13336: \$? = $ac_status" >&5 + echo "$as_me:14480: \$? = $ac_status" >&5 (exit $ac_status); } && { ac_try='test -s conftest$ac_exeext' - { (eval echo "$as_me:13339: \"$ac_try\"") >&5 + { (eval echo "$as_me:14483: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? - echo "$as_me:13342: \$? = $ac_status" >&5 + echo "$as_me:14486: \$? = $ac_status" >&5 (exit $ac_status); }; }; then cf_cv_need_xopen_extension=yes else @@ -13351,11 +14495,11 @@ rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext fi rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext fi -echo "$as_me:13354: result: $cf_cv_need_xopen_extension" >&5 +echo "$as_me:14498: result: $cf_cv_need_xopen_extension" >&5 echo "${ECHO_T}$cf_cv_need_xopen_extension" >&6 test $cf_cv_need_xopen_extension = yes && CPPFLAGS="$CPPFLAGS -D_XOPEN_SOURCE_EXTENDED" -echo "$as_me:13358: checking for unctrl.h" >&5 +echo "$as_me:14502: checking for unctrl.h" >&5 echo $ECHO_N "checking for unctrl.h... $ECHO_C" >&6 if test "${cf_cv_unctrl_header+set}" = set; then echo $ECHO_N "(cached) $ECHO_C" >&6 @@ -13376,7 +14520,7 @@ esac for cf_header in $cf_header_list do cat >conftest.$ac_ext <<_ACEOF -#line 13379 "configure" +#line 14523 "configure" #include "confdefs.h" #include <${cf_cv_ncurses_header:-curses.h}> @@ -13390,16 +14534,16 @@ WINDOW *x } _ACEOF rm -f conftest.$ac_objext -if { (eval echo "$as_me:13393: \"$ac_compile\"") >&5 +if { (eval echo "$as_me:14537: \"$ac_compile\"") >&5 (eval $ac_compile) 2>&5 ac_status=$? - echo "$as_me:13396: \$? = $ac_status" >&5 + echo "$as_me:14540: \$? = $ac_status" >&5 (exit $ac_status); } && { ac_try='test -s conftest.$ac_objext' - { (eval echo "$as_me:13399: \"$ac_try\"") >&5 + { (eval echo "$as_me:14543: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? - echo "$as_me:13402: \$? = $ac_status" >&5 + echo "$as_me:14546: \$? = $ac_status" >&5 (exit $ac_status); }; }; then cf_cv_unctrl_header=$cf_header break @@ -13413,13 +14557,13 @@ done case $cf_cv_unctrl_header in #(vi no) - { echo "$as_me:13416: WARNING: unctrl.h header not found" >&5 + { echo "$as_me:14560: WARNING: unctrl.h header not found" >&5 echo "$as_me: WARNING: unctrl.h header not found" >&2;} ;; esac fi -echo "$as_me:13422: result: $cf_cv_unctrl_header" >&5 +echo "$as_me:14566: result: $cf_cv_unctrl_header" >&5 echo "${ECHO_T}$cf_cv_unctrl_header" >&6 case $cf_cv_unctrl_header in #(vi @@ -13470,10 +14614,10 @@ do cf_tr_func=`echo "$cf_func" | sed y%abcdefghijklmnopqrstuvwxyz./-%ABCDEFGHIJKLMNOPQRSTUVWXYZ___%` - echo "$as_me:13473: checking for ${cf_func}" >&5 + echo "$as_me:14617: checking for ${cf_func}" >&5 echo $ECHO_N "checking for ${cf_func}... $ECHO_C" >&6 -echo "${as_me:-configure}:13476: testing ${cf_func} ..." 1>&5 +echo "${as_me:-configure}:14620: testing ${cf_func} ..." 1>&5 if eval "test \"\${cf_cv_func_$cf_func+set}\" = set"; then echo $ECHO_N "(cached) $ECHO_C" >&6 @@ -13482,7 +14626,7 @@ else eval cf_result='$ac_cv_func_'$cf_func if test ".$cf_result" != ".no"; then cat >conftest.$ac_ext <<_ACEOF -#line 13485 "configure" +#line 14629 "configure" #include "confdefs.h" #ifdef HAVE_XCURSES @@ -13514,16 +14658,16 @@ if (foo + 1234 > 5678) } _ACEOF rm -f conftest.$ac_objext conftest$ac_exeext -if { (eval echo "$as_me:13517: \"$ac_link\"") >&5 +if { (eval echo "$as_me:14661: \"$ac_link\"") >&5 (eval $ac_link) 2>&5 ac_status=$? - echo "$as_me:13520: \$? = $ac_status" >&5 + echo "$as_me:14664: \$? = $ac_status" >&5 (exit $ac_status); } && { ac_try='test -s conftest$ac_exeext' - { (eval echo "$as_me:13523: \"$ac_try\"") >&5 + { (eval echo "$as_me:14667: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? - echo "$as_me:13526: \$? = $ac_status" >&5 + echo "$as_me:14670: \$? = $ac_status" >&5 (exit $ac_status); }; }; then cf_result=yes else @@ -13539,7 +14683,7 @@ fi # use the computed/retrieved cache-value: eval 'cf_result=$cf_cv_func_'$cf_func - echo "$as_me:13542: result: $cf_result" >&5 + echo "$as_me:14686: result: $cf_result" >&5 echo "${ECHO_T}$cf_result" >&6 if test $cf_result != no; then cat >>confdefs.h <<EOF @@ -13549,13 +14693,13 @@ EOF fi done -echo "$as_me:13552: checking for start_color" >&5 +echo "$as_me:14696: checking for start_color" >&5 echo $ECHO_N "checking for start_color... $ECHO_C" >&6 if test "${ac_cv_func_start_color+set}" = set; then echo $ECHO_N "(cached) $ECHO_C" >&6 else cat >conftest.$ac_ext <<_ACEOF -#line 13558 "configure" +#line 14702 "configure" #include "confdefs.h" /* System header to define __stub macros and hopefully few prototypes, which can conflict with char start_color (); below. */ @@ -13586,16 +14730,16 @@ f = start_color; /* workaround for ICC 12.0.3 */ if (f == 0) return 1; } _ACEOF rm -f conftest.$ac_objext conftest$ac_exeext -if { (eval echo "$as_me:13589: \"$ac_link\"") >&5 +if { (eval echo "$as_me:14733: \"$ac_link\"") >&5 (eval $ac_link) 2>&5 ac_status=$? - echo "$as_me:13592: \$? = $ac_status" >&5 + echo "$as_me:14736: \$? = $ac_status" >&5 (exit $ac_status); } && { ac_try='test -s conftest$ac_exeext' - { (eval echo "$as_me:13595: \"$ac_try\"") >&5 + { (eval echo "$as_me:14739: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? - echo "$as_me:13598: \$? = $ac_status" >&5 + echo "$as_me:14742: \$? = $ac_status" >&5 (exit $ac_status); }; }; then ac_cv_func_start_color=yes else @@ -13605,7 +14749,7 @@ ac_cv_func_start_color=no fi rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext fi -echo "$as_me:13608: result: $ac_cv_func_start_color" >&5 +echo "$as_me:14752: result: $ac_cv_func_start_color" >&5 echo "${ECHO_T}$ac_cv_func_start_color" >&6 if test $ac_cv_func_start_color = yes; then @@ -13615,14 +14759,14 @@ EOF fi -echo "$as_me:13618: checking for chtype typedef" >&5 +echo "$as_me:14762: checking for chtype typedef" >&5 echo $ECHO_N "checking for chtype typedef... $ECHO_C" >&6 if test "${cf_cv_chtype_decl+set}" = set; then echo $ECHO_N "(cached) $ECHO_C" >&6 else cat >conftest.$ac_ext <<_ACEOF -#line 13625 "configure" +#line 14769 "configure" #include "confdefs.h" #include <${cf_cv_ncurses_header:-curses.h}> int @@ -13634,16 +14778,16 @@ chtype foo } _ACEOF rm -f conftest.$ac_objext -if { (eval echo "$as_me:13637: \"$ac_compile\"") >&5 +if { (eval echo "$as_me:14781: \"$ac_compile\"") >&5 (eval $ac_compile) 2>&5 ac_status=$? - echo "$as_me:13640: \$? = $ac_status" >&5 + echo "$as_me:14784: \$? = $ac_status" >&5 (exit $ac_status); } && { ac_try='test -s conftest.$ac_objext' - { (eval echo "$as_me:13643: \"$ac_try\"") >&5 + { (eval echo "$as_me:14787: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? - echo "$as_me:13646: \$? = $ac_status" >&5 + echo "$as_me:14790: \$? = $ac_status" >&5 (exit $ac_status); }; }; then cf_cv_chtype_decl=yes else @@ -13653,7 +14797,7 @@ cf_cv_chtype_decl=no fi rm -f conftest.$ac_objext conftest.$ac_ext fi -echo "$as_me:13656: result: $cf_cv_chtype_decl" >&5 +echo "$as_me:14800: result: $cf_cv_chtype_decl" >&5 echo "${ECHO_T}$cf_cv_chtype_decl" >&6 if test $cf_cv_chtype_decl = yes ; then @@ -13661,14 +14805,14 @@ cat >>confdefs.h <<\EOF #define HAVE_TYPE_CHTYPE 1 EOF - echo "$as_me:13664: checking if chtype is scalar or struct" >&5 + echo "$as_me:14808: checking if chtype is scalar or struct" >&5 echo $ECHO_N "checking if chtype is scalar or struct... $ECHO_C" >&6 if test "${cf_cv_chtype_type+set}" = set; then echo $ECHO_N "(cached) $ECHO_C" >&6 else cat >conftest.$ac_ext <<_ACEOF -#line 13671 "configure" +#line 14815 "configure" #include "confdefs.h" #include <${cf_cv_ncurses_header:-curses.h}> int @@ -13680,16 +14824,16 @@ chtype foo; long x = foo } _ACEOF rm -f conftest.$ac_objext -if { (eval echo "$as_me:13683: \"$ac_compile\"") >&5 +if { (eval echo "$as_me:14827: \"$ac_compile\"") >&5 (eval $ac_compile) 2>&5 ac_status=$? - echo "$as_me:13686: \$? = $ac_status" >&5 + echo "$as_me:14830: \$? = $ac_status" >&5 (exit $ac_status); } && { ac_try='test -s conftest.$ac_objext' - { (eval echo "$as_me:13689: \"$ac_try\"") >&5 + { (eval echo "$as_me:14833: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? - echo "$as_me:13692: \$? = $ac_status" >&5 + echo "$as_me:14836: \$? = $ac_status" >&5 (exit $ac_status); }; }; then cf_cv_chtype_type=scalar else @@ -13699,7 +14843,7 @@ cf_cv_chtype_type=struct fi rm -f conftest.$ac_objext conftest.$ac_ext fi -echo "$as_me:13702: result: $cf_cv_chtype_type" >&5 +echo "$as_me:14846: result: $cf_cv_chtype_type" >&5 echo "${ECHO_T}$cf_cv_chtype_type" >&6 if test $cf_cv_chtype_type = scalar ; then @@ -13710,7 +14854,7 @@ EOF fi fi -echo "$as_me:13713: checking for wide alternate character set array" >&5 +echo "$as_me:14857: checking for wide alternate character set array" >&5 echo $ECHO_N "checking for wide alternate character set array... $ECHO_C" >&6 if test "${cf_cv_curses_wacs_map+set}" = set; then echo $ECHO_N "(cached) $ECHO_C" >&6 @@ -13720,7 +14864,7 @@ else for name in wacs_map _wacs_map __wacs_map _nc_wacs _wacs_char do cat >conftest.$ac_ext <<_ACEOF -#line 13723 "configure" +#line 14867 "configure" #include "confdefs.h" #ifndef _XOPEN_SOURCE_EXTENDED @@ -13736,16 +14880,16 @@ void *foo = &($name['k']) } _ACEOF rm -f conftest.$ac_objext conftest$ac_exeext -if { (eval echo "$as_me:13739: \"$ac_link\"") >&5 +if { (eval echo "$as_me:14883: \"$ac_link\"") >&5 (eval $ac_link) 2>&5 ac_status=$? - echo "$as_me:13742: \$? = $ac_status" >&5 + echo "$as_me:14886: \$? = $ac_status" >&5 (exit $ac_status); } && { ac_try='test -s conftest$ac_exeext' - { (eval echo "$as_me:13745: \"$ac_try\"") >&5 + { (eval echo "$as_me:14889: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? - echo "$as_me:13748: \$? = $ac_status" >&5 + echo "$as_me:14892: \$? = $ac_status" >&5 (exit $ac_status); }; }; then cf_cv_curses_wacs_map=$name break @@ -13756,7 +14900,7 @@ fi rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext done fi -echo "$as_me:13759: result: $cf_cv_curses_wacs_map" >&5 +echo "$as_me:14903: result: $cf_cv_curses_wacs_map" >&5 echo "${ECHO_T}$cf_cv_curses_wacs_map" >&6 test "$cf_cv_curses_wacs_map" != unknown && @@ -13764,7 +14908,7 @@ cat >>confdefs.h <<EOF #define CURSES_WACS_ARRAY $cf_cv_curses_wacs_map EOF -echo "$as_me:13767: checking for wide alternate character constants" >&5 +echo "$as_me:14911: checking for wide alternate character constants" >&5 echo $ECHO_N "checking for wide alternate character constants... $ECHO_C" >&6 if test "${cf_cv_curses_wacs_symbols+set}" = set; then echo $ECHO_N "(cached) $ECHO_C" >&6 @@ -13774,7 +14918,7 @@ cf_cv_curses_wacs_symbols=no if test "$cf_cv_curses_wacs_map" != unknown then cat >conftest.$ac_ext <<_ACEOF -#line 13777 "configure" +#line 14921 "configure" #include "confdefs.h" #ifndef _XOPEN_SOURCE_EXTENDED @@ -13791,16 +14935,16 @@ cchar_t *foo = WACS_PLUS; } _ACEOF rm -f conftest.$ac_objext conftest$ac_exeext -if { (eval echo "$as_me:13794: \"$ac_link\"") >&5 +if { (eval echo "$as_me:14938: \"$ac_link\"") >&5 (eval $ac_link) 2>&5 ac_status=$? - echo "$as_me:13797: \$? = $ac_status" >&5 + echo "$as_me:14941: \$? = $ac_status" >&5 (exit $ac_status); } && { ac_try='test -s conftest$ac_exeext' - { (eval echo "$as_me:13800: \"$ac_try\"") >&5 + { (eval echo "$as_me:14944: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? - echo "$as_me:13803: \$? = $ac_status" >&5 + echo "$as_me:14947: \$? = $ac_status" >&5 (exit $ac_status); }; }; then cf_cv_curses_wacs_symbols=yes else @@ -13810,7 +14954,7 @@ fi rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext else cat >conftest.$ac_ext <<_ACEOF -#line 13813 "configure" +#line 14957 "configure" #include "confdefs.h" #ifndef _XOPEN_SOURCE_EXTENDED @@ -13826,16 +14970,16 @@ cchar_t *foo = WACS_PLUS } _ACEOF rm -f conftest.$ac_objext conftest$ac_exeext -if { (eval echo "$as_me:13829: \"$ac_link\"") >&5 +if { (eval echo "$as_me:14973: \"$ac_link\"") >&5 (eval $ac_link) 2>&5 ac_status=$? - echo "$as_me:13832: \$? = $ac_status" >&5 + echo "$as_me:14976: \$? = $ac_status" >&5 (exit $ac_status); } && { ac_try='test -s conftest$ac_exeext' - { (eval echo "$as_me:13835: \"$ac_try\"") >&5 + { (eval echo "$as_me:14979: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? - echo "$as_me:13838: \$? = $ac_status" >&5 + echo "$as_me:14982: \$? = $ac_status" >&5 (exit $ac_status); }; }; then cf_cv_curses_wacs_symbols=yes else @@ -13846,7 +14990,7 @@ rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext fi fi -echo "$as_me:13849: result: $cf_cv_curses_wacs_symbols" >&5 +echo "$as_me:14993: result: $cf_cv_curses_wacs_symbols" >&5 echo "${ECHO_T}$cf_cv_curses_wacs_symbols" >&6 test "$cf_cv_curses_wacs_symbols" != no && @@ -13859,10 +15003,10 @@ do cf_tr_func=`echo "$cf_func" | sed y%abcdefghijklmnopqrstuvwxyz./-%ABCDEFGHIJKLMNOPQRSTUVWXYZ___%` - echo "$as_me:13862: checking for ${cf_func}" >&5 + echo "$as_me:15006: checking for ${cf_func}" >&5 echo $ECHO_N "checking for ${cf_func}... $ECHO_C" >&6 -echo "${as_me:-configure}:13865: testing ${cf_func} ..." 1>&5 +echo "${as_me:-configure}:15009: testing ${cf_func} ..." 1>&5 if eval "test \"\${cf_cv_func_$cf_func+set}\" = set"; then echo $ECHO_N "(cached) $ECHO_C" >&6 @@ -13871,7 +15015,7 @@ else eval cf_result='$ac_cv_func_'$cf_func if test ".$cf_result" != ".no"; then cat >conftest.$ac_ext <<_ACEOF -#line 13874 "configure" +#line 15018 "configure" #include "confdefs.h" #ifdef HAVE_XCURSES @@ -13903,16 +15047,16 @@ if (foo + 1234 > 5678) } _ACEOF rm -f conftest.$ac_objext conftest$ac_exeext -if { (eval echo "$as_me:13906: \"$ac_link\"") >&5 +if { (eval echo "$as_me:15050: \"$ac_link\"") >&5 (eval $ac_link) 2>&5 ac_status=$? - echo "$as_me:13909: \$? = $ac_status" >&5 + echo "$as_me:15053: \$? = $ac_status" >&5 (exit $ac_status); } && { ac_try='test -s conftest$ac_exeext' - { (eval echo "$as_me:13912: \"$ac_try\"") >&5 + { (eval echo "$as_me:15056: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? - echo "$as_me:13915: \$? = $ac_status" >&5 + echo "$as_me:15059: \$? = $ac_status" >&5 (exit $ac_status); }; }; then cf_result=yes else @@ -13928,7 +15072,7 @@ fi # use the computed/retrieved cache-value: eval 'cf_result=$cf_cv_func_'$cf_func - echo "$as_me:13931: result: $cf_result" >&5 + echo "$as_me:15075: result: $cf_result" >&5 echo "${ECHO_T}$cf_result" >&6 if test $cf_result != no; then cat >>confdefs.h <<EOF @@ -13940,10 +15084,10 @@ done if test "x$cf_cv_func_wgetparent" != xyes then - echo "$as_me:13943: checking if WINDOW has _parent member" >&5 + echo "$as_me:15087: checking if WINDOW has _parent member" >&5 echo $ECHO_N "checking if WINDOW has _parent member... $ECHO_C" >&6 cat >conftest.$ac_ext <<_ACEOF -#line 13946 "configure" +#line 15090 "configure" #include "confdefs.h" #include <${cf_cv_ncurses_header:-curses.h}> int @@ -13955,16 +15099,16 @@ WINDOW *p = stdscr->_parent } _ACEOF rm -f conftest.$ac_objext -if { (eval echo "$as_me:13958: \"$ac_compile\"") >&5 +if { (eval echo "$as_me:15102: \"$ac_compile\"") >&5 (eval $ac_compile) 2>&5 ac_status=$? - echo "$as_me:13961: \$? = $ac_status" >&5 + echo "$as_me:15105: \$? = $ac_status" >&5 (exit $ac_status); } && { ac_try='test -s conftest.$ac_objext' - { (eval echo "$as_me:13964: \"$ac_try\"") >&5 + { (eval echo "$as_me:15108: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? - echo "$as_me:13967: \$? = $ac_status" >&5 + echo "$as_me:15111: \$? = $ac_status" >&5 (exit $ac_status); }; }; then cf_window__parent=yes else @@ -13973,7 +15117,7 @@ cat conftest.$ac_ext >&5 cf_window__parent=no fi rm -f conftest.$ac_objext conftest.$ac_ext - echo "$as_me:13976: result: $cf_window__parent" >&5 + echo "$as_me:15120: result: $cf_window__parent" >&5 echo "${ECHO_T}$cf_window__parent" >&6 if test "$cf_window__parent" = yes then @@ -13988,23 +15132,23 @@ fi for ac_header in sys/wait.h do as_ac_Header=`echo "ac_cv_header_$ac_header" | $as_tr_sh` -echo "$as_me:13991: checking for $ac_header" >&5 +echo "$as_me:15135: checking for $ac_header" >&5 echo $ECHO_N "checking for $ac_header... $ECHO_C" >&6 if eval "test \"\${$as_ac_Header+set}\" = set"; then echo $ECHO_N "(cached) $ECHO_C" >&6 else cat >conftest.$ac_ext <<_ACEOF -#line 13997 "configure" +#line 15141 "configure" #include "confdefs.h" #include <$ac_header> _ACEOF -if { (eval echo "$as_me:14001: \"$ac_cpp conftest.$ac_ext\"") >&5 +if { (eval echo "$as_me:15145: \"$ac_cpp conftest.$ac_ext\"") >&5 (eval $ac_cpp conftest.$ac_ext) 2>conftest.er1 ac_status=$? egrep -v '^ *\+' conftest.er1 >conftest.err rm -f conftest.er1 cat conftest.err >&5 - echo "$as_me:14007: \$? = $ac_status" >&5 + echo "$as_me:15151: \$? = $ac_status" >&5 (exit $ac_status); } >/dev/null; then if test -s conftest.err; then ac_cpp_err=$ac_c_preproc_warn_flag @@ -14023,7 +15167,7 @@ else fi rm -f conftest.err conftest.$ac_ext fi -echo "$as_me:14026: result: `eval echo '${'$as_ac_Header'}'`" >&5 +echo "$as_me:15170: result: `eval echo '${'$as_ac_Header'}'`" >&5 echo "${ECHO_T}`eval echo '${'$as_ac_Header'}'`" >&6 if test `eval echo '${'$as_ac_Header'}'` = yes; then cat >>confdefs.h <<EOF @@ -14044,23 +15188,23 @@ else for ac_header in wait.h do as_ac_Header=`echo "ac_cv_header_$ac_header" | $as_tr_sh` -echo "$as_me:14047: checking for $ac_header" >&5 +echo "$as_me:15191: checking for $ac_header" >&5 echo $ECHO_N "checking for $ac_header... $ECHO_C" >&6 if eval "test \"\${$as_ac_Header+set}\" = set"; then echo $ECHO_N "(cached) $ECHO_C" >&6 else cat >conftest.$ac_ext <<_ACEOF -#line 14053 "configure" +#line 15197 "configure" #include "confdefs.h" #include <$ac_header> _ACEOF -if { (eval echo "$as_me:14057: \"$ac_cpp conftest.$ac_ext\"") >&5 +if { (eval echo "$as_me:15201: \"$ac_cpp conftest.$ac_ext\"") >&5 (eval $ac_cpp conftest.$ac_ext) 2>conftest.er1 ac_status=$? egrep -v '^ *\+' conftest.er1 >conftest.err rm -f conftest.er1 cat conftest.err >&5 - echo "$as_me:14063: \$? = $ac_status" >&5 + echo "$as_me:15207: \$? = $ac_status" >&5 (exit $ac_status); } >/dev/null; then if test -s conftest.err; then ac_cpp_err=$ac_c_preproc_warn_flag @@ -14079,7 +15223,7 @@ else fi rm -f conftest.err conftest.$ac_ext fi -echo "$as_me:14082: result: `eval echo '${'$as_ac_Header'}'`" >&5 +echo "$as_me:15226: result: `eval echo '${'$as_ac_Header'}'`" >&5 echo "${ECHO_T}`eval echo '${'$as_ac_Header'}'`" >&6 if test `eval echo '${'$as_ac_Header'}'` = yes; then cat >>confdefs.h <<EOF @@ -14092,23 +15236,23 @@ done for ac_header in waitstatus.h do as_ac_Header=`echo "ac_cv_header_$ac_header" | $as_tr_sh` -echo "$as_me:14095: checking for $ac_header" >&5 +echo "$as_me:15239: checking for $ac_header" >&5 echo $ECHO_N "checking for $ac_header... $ECHO_C" >&6 if eval "test \"\${$as_ac_Header+set}\" = set"; then echo $ECHO_N "(cached) $ECHO_C" >&6 else cat >conftest.$ac_ext <<_ACEOF -#line 14101 "configure" +#line 15245 "configure" #include "confdefs.h" #include <$ac_header> _ACEOF -if { (eval echo "$as_me:14105: \"$ac_cpp conftest.$ac_ext\"") >&5 +if { (eval echo "$as_me:15249: \"$ac_cpp conftest.$ac_ext\"") >&5 (eval $ac_cpp conftest.$ac_ext) 2>conftest.er1 ac_status=$? egrep -v '^ *\+' conftest.er1 >conftest.err rm -f conftest.er1 cat conftest.err >&5 - echo "$as_me:14111: \$? = $ac_status" >&5 + echo "$as_me:15255: \$? = $ac_status" >&5 (exit $ac_status); } >/dev/null; then if test -s conftest.err; then ac_cpp_err=$ac_c_preproc_warn_flag @@ -14127,7 +15271,7 @@ else fi rm -f conftest.err conftest.$ac_ext fi -echo "$as_me:14130: result: `eval echo '${'$as_ac_Header'}'`" >&5 +echo "$as_me:15274: result: `eval echo '${'$as_ac_Header'}'`" >&5 echo "${ECHO_T}`eval echo '${'$as_ac_Header'}'`" >&6 if test `eval echo '${'$as_ac_Header'}'` = yes; then cat >>confdefs.h <<EOF @@ -14149,14 +15293,14 @@ cf_wait_headers="$cf_wait_headers fi fi -echo "$as_me:14152: checking for union wait" >&5 +echo "$as_me:15296: checking for union wait" >&5 echo $ECHO_N "checking for union wait... $ECHO_C" >&6 if test "${cf_cv_type_unionwait+set}" = set; then echo $ECHO_N "(cached) $ECHO_C" >&6 else cat >conftest.$ac_ext <<_ACEOF -#line 14159 "configure" +#line 15303 "configure" #include "confdefs.h" $cf_wait_headers int @@ -14172,16 +15316,16 @@ int x; } _ACEOF rm -f conftest.$ac_objext conftest$ac_exeext -if { (eval echo "$as_me:14175: \"$ac_link\"") >&5 +if { (eval echo "$as_me:15319: \"$ac_link\"") >&5 (eval $ac_link) 2>&5 ac_status=$? - echo "$as_me:14178: \$? = $ac_status" >&5 + echo "$as_me:15322: \$? = $ac_status" >&5 (exit $ac_status); } && { ac_try='test -s conftest$ac_exeext' - { (eval echo "$as_me:14181: \"$ac_try\"") >&5 + { (eval echo "$as_me:15325: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? - echo "$as_me:14184: \$? = $ac_status" >&5 + echo "$as_me:15328: \$? = $ac_status" >&5 (exit $ac_status); }; }; then cf_cv_type_unionwait=no echo compiles ok w/o union wait 1>&5 @@ -14191,7 +15335,7 @@ else cat conftest.$ac_ext >&5 cat >conftest.$ac_ext <<_ACEOF -#line 14194 "configure" +#line 15338 "configure" #include "confdefs.h" $cf_wait_headers int @@ -14211,16 +15355,16 @@ union wait x; } _ACEOF rm -f conftest.$ac_objext conftest$ac_exeext -if { (eval echo "$as_me:14214: \"$ac_link\"") >&5 +if { (eval echo "$as_me:15358: \"$ac_link\"") >&5 (eval $ac_link) 2>&5 ac_status=$? - echo "$as_me:14217: \$? = $ac_status" >&5 + echo "$as_me:15361: \$? = $ac_status" >&5 (exit $ac_status); } && { ac_try='test -s conftest$ac_exeext' - { (eval echo "$as_me:14220: \"$ac_try\"") >&5 + { (eval echo "$as_me:15364: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? - echo "$as_me:14223: \$? = $ac_status" >&5 + echo "$as_me:15367: \$? = $ac_status" >&5 (exit $ac_status); }; }; then cf_cv_type_unionwait=yes echo compiles ok with union wait and possibly macros too 1>&5 @@ -14235,7 +15379,7 @@ fi rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext fi -echo "$as_me:14238: result: $cf_cv_type_unionwait" >&5 +echo "$as_me:15382: result: $cf_cv_type_unionwait" >&5 echo "${ECHO_T}$cf_cv_type_unionwait" >&6 test $cf_cv_type_unionwait = yes && cat >>confdefs.h <<\EOF @@ -14244,14 +15388,14 @@ EOF if test $cf_cv_type_unionwait = yes; then - echo "$as_me:14247: checking if union wait can be used as wait-arg" >&5 + echo "$as_me:15391: checking if union wait can be used as wait-arg" >&5 echo $ECHO_N "checking if union wait can be used as wait-arg... $ECHO_C" >&6 if test "${cf_cv_arg_union_wait+set}" = set; then echo $ECHO_N "(cached) $ECHO_C" >&6 else cat >conftest.$ac_ext <<_ACEOF -#line 14254 "configure" +#line 15398 "configure" #include "confdefs.h" $cf_wait_headers int @@ -14263,16 +15407,16 @@ union wait x; wait(&x) } _ACEOF rm -f conftest.$ac_objext -if { (eval echo "$as_me:14266: \"$ac_compile\"") >&5 +if { (eval echo "$as_me:15410: \"$ac_compile\"") >&5 (eval $ac_compile) 2>&5 ac_status=$? - echo "$as_me:14269: \$? = $ac_status" >&5 + echo "$as_me:15413: \$? = $ac_status" >&5 (exit $ac_status); } && { ac_try='test -s conftest.$ac_objext' - { (eval echo "$as_me:14272: \"$ac_try\"") >&5 + { (eval echo "$as_me:15416: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? - echo "$as_me:14275: \$? = $ac_status" >&5 + echo "$as_me:15419: \$? = $ac_status" >&5 (exit $ac_status); }; }; then cf_cv_arg_union_wait=yes else @@ -14284,21 +15428,21 @@ rm -f conftest.$ac_objext conftest.$ac_ext fi - echo "$as_me:14287: result: $cf_cv_arg_union_wait" >&5 + echo "$as_me:15431: result: $cf_cv_arg_union_wait" >&5 echo "${ECHO_T}$cf_cv_arg_union_wait" >&6 test $cf_cv_arg_union_wait = yes && cat >>confdefs.h <<\EOF #define WAIT_USES_UNION 1 EOF - echo "$as_me:14294: checking if union wait can be used as waitpid-arg" >&5 + echo "$as_me:15438: checking if union wait can be used as waitpid-arg" >&5 echo $ECHO_N "checking if union wait can be used as waitpid-arg... $ECHO_C" >&6 if test "${cf_cv_arg_union_waitpid+set}" = set; then echo $ECHO_N "(cached) $ECHO_C" >&6 else cat >conftest.$ac_ext <<_ACEOF -#line 14301 "configure" +#line 15445 "configure" #include "confdefs.h" $cf_wait_headers int @@ -14310,16 +15454,16 @@ union wait x; waitpid(0, &x, 0) } _ACEOF rm -f conftest.$ac_objext -if { (eval echo "$as_me:14313: \"$ac_compile\"") >&5 +if { (eval echo "$as_me:15457: \"$ac_compile\"") >&5 (eval $ac_compile) 2>&5 ac_status=$? - echo "$as_me:14316: \$? = $ac_status" >&5 + echo "$as_me:15460: \$? = $ac_status" >&5 (exit $ac_status); } && { ac_try='test -s conftest.$ac_objext' - { (eval echo "$as_me:14319: \"$ac_try\"") >&5 + { (eval echo "$as_me:15463: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? - echo "$as_me:14322: \$? = $ac_status" >&5 + echo "$as_me:15466: \$? = $ac_status" >&5 (exit $ac_status); }; }; then cf_cv_arg_union_waitpid=yes else @@ -14331,7 +15475,7 @@ rm -f conftest.$ac_objext conftest.$ac_ext fi - echo "$as_me:14334: result: $cf_cv_arg_union_waitpid" >&5 + echo "$as_me:15478: result: $cf_cv_arg_union_waitpid" >&5 echo "${ECHO_T}$cf_cv_arg_union_waitpid" >&6 test $cf_cv_arg_union_waitpid = yes && cat >>confdefs.h <<\EOF @@ -14340,14 +15484,14 @@ EOF fi -echo "$as_me:14343: checking if we must include wchar.h to declare mbstate_t" >&5 +echo "$as_me:15487: checking if we must include wchar.h to declare mbstate_t" >&5 echo $ECHO_N "checking if we must include wchar.h to declare mbstate_t... $ECHO_C" >&6 if test "${cf_cv_mbstate_t+set}" = set; then echo $ECHO_N "(cached) $ECHO_C" >&6 else cat >conftest.$ac_ext <<_ACEOF -#line 14350 "configure" +#line 15494 "configure" #include "confdefs.h" #include <stdlib.h> @@ -14364,23 +15508,23 @@ mbstate_t state } _ACEOF rm -f conftest.$ac_objext -if { (eval echo "$as_me:14367: \"$ac_compile\"") >&5 +if { (eval echo "$as_me:15511: \"$ac_compile\"") >&5 (eval $ac_compile) 2>&5 ac_status=$? - echo "$as_me:14370: \$? = $ac_status" >&5 + echo "$as_me:15514: \$? = $ac_status" >&5 (exit $ac_status); } && { ac_try='test -s conftest.$ac_objext' - { (eval echo "$as_me:14373: \"$ac_try\"") >&5 + { (eval echo "$as_me:15517: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? - echo "$as_me:14376: \$? = $ac_status" >&5 + echo "$as_me:15520: \$? = $ac_status" >&5 (exit $ac_status); }; }; then cf_cv_mbstate_t=no else echo "$as_me: failed program was:" >&5 cat conftest.$ac_ext >&5 cat >conftest.$ac_ext <<_ACEOF -#line 14383 "configure" +#line 15527 "configure" #include "confdefs.h" #include <stdlib.h> @@ -14398,16 +15542,16 @@ mbstate_t value } _ACEOF rm -f conftest.$ac_objext -if { (eval echo "$as_me:14401: \"$ac_compile\"") >&5 +if { (eval echo "$as_me:15545: \"$ac_compile\"") >&5 (eval $ac_compile) 2>&5 ac_status=$? - echo "$as_me:14404: \$? = $ac_status" >&5 + echo "$as_me:15548: \$? = $ac_status" >&5 (exit $ac_status); } && { ac_try='test -s conftest.$ac_objext' - { (eval echo "$as_me:14407: \"$ac_try\"") >&5 + { (eval echo "$as_me:15551: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? - echo "$as_me:14410: \$? = $ac_status" >&5 + echo "$as_me:15554: \$? = $ac_status" >&5 (exit $ac_status); }; }; then cf_cv_mbstate_t=yes else @@ -14419,7 +15563,7 @@ rm -f conftest.$ac_objext conftest.$ac_ext fi rm -f conftest.$ac_objext conftest.$ac_ext fi -echo "$as_me:14422: result: $cf_cv_mbstate_t" >&5 +echo "$as_me:15566: result: $cf_cv_mbstate_t" >&5 echo "${ECHO_T}$cf_cv_mbstate_t" >&6 if test "$cf_cv_mbstate_t" = yes ; then @@ -14444,7 +15588,7 @@ PACKAGE_CONFIG=dlg_config.h EXTRA_OUTPUT="$EXTRA_OUTPUT headers-sh:$srcdir/headers-sh.in" cat >conftest.$ac_ext <<_ACEOF -#line 14447 "configure" +#line 15591 "configure" #include "confdefs.h" #include <locale.h> int @@ -14456,16 +15600,16 @@ setlocale(LC_ALL, "") } _ACEOF rm -f conftest.$ac_objext conftest$ac_exeext -if { (eval echo "$as_me:14459: \"$ac_link\"") >&5 +if { (eval echo "$as_me:15603: \"$ac_link\"") >&5 (eval $ac_link) 2>&5 ac_status=$? - echo "$as_me:14462: \$? = $ac_status" >&5 + echo "$as_me:15606: \$? = $ac_status" >&5 (exit $ac_status); } && { ac_try='test -s conftest$ac_exeext' - { (eval echo "$as_me:14465: \"$ac_try\"") >&5 + { (eval echo "$as_me:15609: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? - echo "$as_me:14468: \$? = $ac_status" >&5 + echo "$as_me:15612: \$? = $ac_status" >&5 (exit $ac_status); }; }; then cat >>confdefs.h <<\EOF @@ -14478,86 +15622,7 @@ cat conftest.$ac_ext >&5 fi rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext -LD_RPATH_OPT= -echo "$as_me:14482: checking for an rpath option" >&5 -echo $ECHO_N "checking for an rpath option... $ECHO_C" >&6 -case $cf_cv_system_name in #(vi -irix*) #(vi - if test "$GCC" = yes; then - LD_RPATH_OPT="-Wl,-rpath," - else - LD_RPATH_OPT="-rpath " - fi - ;; -linux*|gnu*|k*bsd*-gnu) #(vi - LD_RPATH_OPT="-Wl,-rpath," - ;; -openbsd[2-9].*|mirbsd*) #(vi - LD_RPATH_OPT="-Wl,-rpath," - ;; -dragonfly*|freebsd*) #(vi - LD_RPATH_OPT="-rpath " - ;; -netbsd*) #(vi - LD_RPATH_OPT="-Wl,-rpath," - ;; -osf*|mls+*) #(vi - LD_RPATH_OPT="-rpath " - ;; -solaris2*) #(vi - LD_RPATH_OPT="-R" - ;; -*) - ;; -esac -echo "$as_me:14513: result: $LD_RPATH_OPT" >&5 -echo "${ECHO_T}$LD_RPATH_OPT" >&6 - -case "x$LD_RPATH_OPT" in #(vi -x-R*) - echo "$as_me:14518: checking if we need a space after rpath option" >&5 -echo $ECHO_N "checking if we need a space after rpath option... $ECHO_C" >&6 - cf_save_LIBS="$LIBS" - LIBS="${LD_RPATH_OPT}$libdir $LIBS" - cat >conftest.$ac_ext <<_ACEOF -#line 14523 "configure" -#include "confdefs.h" - -int -main () -{ - - ; - return 0; -} -_ACEOF -rm -f conftest.$ac_objext conftest$ac_exeext -if { (eval echo "$as_me:14535: \"$ac_link\"") >&5 - (eval $ac_link) 2>&5 - ac_status=$? - echo "$as_me:14538: \$? = $ac_status" >&5 - (exit $ac_status); } && - { ac_try='test -s conftest$ac_exeext' - { (eval echo "$as_me:14541: \"$ac_try\"") >&5 - (eval $ac_try) 2>&5 - ac_status=$? - echo "$as_me:14544: \$? = $ac_status" >&5 - (exit $ac_status); }; }; then - cf_rpath_space=no -else - echo "$as_me: failed program was:" >&5 -cat conftest.$ac_ext >&5 -cf_rpath_space=yes -fi -rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext - LIBS="$cf_save_LIBS" - echo "$as_me:14554: result: $cf_rpath_space" >&5 -echo "${ECHO_T}$cf_rpath_space" >&6 - test "$cf_rpath_space" = yes && LD_RPATH_OPT="$LD_RPATH_OPT " - ;; -esac - -echo "$as_me:14560: checking if rpath-hack should be disabled" >&5 +echo "$as_me:15625: checking if rpath-hack should be disabled" >&5 echo $ECHO_N "checking if rpath-hack should be disabled... $ECHO_C" >&6 # Check whether --enable-rpath-hack or --disable-rpath-hack was given. @@ -14574,21 +15639,21 @@ else cf_disable_rpath_hack=no fi; -echo "$as_me:14577: result: $cf_disable_rpath_hack" >&5 +echo "$as_me:15642: result: $cf_disable_rpath_hack" >&5 echo "${ECHO_T}$cf_disable_rpath_hack" >&6 if test "$cf_disable_rpath_hack" = no ; then -echo "$as_me:14581: checking for updated LDFLAGS" >&5 +echo "$as_me:15646: checking for updated LDFLAGS" >&5 echo $ECHO_N "checking for updated LDFLAGS... $ECHO_C" >&6 if test -n "$LD_RPATH_OPT" ; then - echo "$as_me:14584: result: maybe" >&5 + echo "$as_me:15649: result: maybe" >&5 echo "${ECHO_T}maybe" >&6 for ac_prog in ldd do # Extract the first word of "$ac_prog", so it can be a program name with args. set dummy $ac_prog; ac_word=$2 -echo "$as_me:14591: checking for $ac_word" >&5 +echo "$as_me:15656: checking for $ac_word" >&5 echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6 if test "${ac_cv_prog_cf_ldd_prog+set}" = set; then echo $ECHO_N "(cached) $ECHO_C" >&6 @@ -14603,7 +15668,7 @@ for ac_dir in $ac_dummy; do test -z "$ac_dir" && ac_dir=. $as_executable_p "$ac_dir/$ac_word" || continue ac_cv_prog_cf_ldd_prog="$ac_prog" -echo "$as_me:14606: found $ac_dir/$ac_word" >&5 +echo "$as_me:15671: found $ac_dir/$ac_word" >&5 break done @@ -14611,10 +15676,10 @@ fi fi cf_ldd_prog=$ac_cv_prog_cf_ldd_prog if test -n "$cf_ldd_prog"; then - echo "$as_me:14614: result: $cf_ldd_prog" >&5 + echo "$as_me:15679: result: $cf_ldd_prog" >&5 echo "${ECHO_T}$cf_ldd_prog" >&6 else - echo "$as_me:14617: result: no" >&5 + echo "$as_me:15682: result: no" >&5 echo "${ECHO_T}no" >&6 fi @@ -14628,7 +15693,7 @@ test -n "$cf_ldd_prog" || cf_ldd_prog="no" cf_rpath_oops= cat >conftest.$ac_ext <<_ACEOF -#line 14631 "configure" +#line 15696 "configure" #include "confdefs.h" #include <stdio.h> int @@ -14640,19 +15705,19 @@ printf("Hello"); } _ACEOF rm -f conftest.$ac_objext conftest$ac_exeext -if { (eval echo "$as_me:14643: \"$ac_link\"") >&5 +if { (eval echo "$as_me:15708: \"$ac_link\"") >&5 (eval $ac_link) 2>&5 ac_status=$? - echo "$as_me:14646: \$? = $ac_status" >&5 + echo "$as_me:15711: \$? = $ac_status" >&5 (exit $ac_status); } && { ac_try='test -s conftest$ac_exeext' - { (eval echo "$as_me:14649: \"$ac_try\"") >&5 + { (eval echo "$as_me:15714: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? - echo "$as_me:14652: \$? = $ac_status" >&5 + echo "$as_me:15717: \$? = $ac_status" >&5 (exit $ac_status); }; }; then - cf_rpath_oops=`$cf_ldd_prog conftest$ac_exeext | fgrep ' not found' | sed -e 's% =>.*$%%' |sort -u` - cf_rpath_list=`$cf_ldd_prog conftest$ac_exeext | fgrep / | sed -e 's%^.*[ ]/%/%' -e 's%/[^/][^/]*$%%' |sort -u` + cf_rpath_oops=`$cf_ldd_prog conftest$ac_exeext | fgrep ' not found' | sed -e 's% =>.*$%%' |sort | uniq` + cf_rpath_list=`$cf_ldd_prog conftest$ac_exeext | fgrep / | sed -e 's%^.*[ ]/%/%' -e 's%/[^/][^/]*$%%' |sort | uniq` else echo "$as_me: failed program was:" >&5 cat conftest.$ac_ext >&5 @@ -14677,7 +15742,7 @@ rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext then test -n "$verbose" && echo " ...adding -L$cf_rpath_dir/lib to LDFLAGS for $cf_rpath_src" 1>&6 -echo "${as_me:-configure}:14680: testing ...adding -L$cf_rpath_dir/lib to LDFLAGS for $cf_rpath_src ..." 1>&5 +echo "${as_me:-configure}:15745: testing ...adding -L$cf_rpath_dir/lib to LDFLAGS for $cf_rpath_src ..." 1>&5 LDFLAGS="$LDFLAGS -L$cf_rpath_dir/lib" break @@ -14689,11 +15754,11 @@ echo "${as_me:-configure}:14680: testing ...adding -L$cf_rpath_dir/lib to LDFLAG test -n "$verbose" && echo " ...checking EXTRA_LDFLAGS $EXTRA_LDFLAGS" 1>&6 -echo "${as_me:-configure}:14692: testing ...checking EXTRA_LDFLAGS $EXTRA_LDFLAGS ..." 1>&5 +echo "${as_me:-configure}:15757: testing ...checking EXTRA_LDFLAGS $EXTRA_LDFLAGS ..." 1>&5 test -n "$verbose" && echo " ...checking LDFLAGS $LDFLAGS" 1>&6 -echo "${as_me:-configure}:14696: testing ...checking LDFLAGS $LDFLAGS ..." 1>&5 +echo "${as_me:-configure}:15761: testing ...checking LDFLAGS $LDFLAGS ..." 1>&5 cf_rpath_dst= for cf_rpath_src in $LDFLAGS @@ -14730,7 +15795,7 @@ do then test -n "$verbose" && echo " ...Filter $cf_rpath_src ->$cf_rpath_tmp" 1>&6 -echo "${as_me:-configure}:14733: testing ...Filter $cf_rpath_src ->$cf_rpath_tmp ..." 1>&5 +echo "${as_me:-configure}:15798: testing ...Filter $cf_rpath_src ->$cf_rpath_tmp ..." 1>&5 EXTRA_LDFLAGS="$cf_rpath_tmp $EXTRA_LDFLAGS" fi @@ -14743,11 +15808,11 @@ LDFLAGS=$cf_rpath_dst test -n "$verbose" && echo " ...checked LDFLAGS $LDFLAGS" 1>&6 -echo "${as_me:-configure}:14746: testing ...checked LDFLAGS $LDFLAGS ..." 1>&5 +echo "${as_me:-configure}:15811: testing ...checked LDFLAGS $LDFLAGS ..." 1>&5 test -n "$verbose" && echo " ...checking LIBS $LIBS" 1>&6 -echo "${as_me:-configure}:14750: testing ...checking LIBS $LIBS ..." 1>&5 +echo "${as_me:-configure}:15815: testing ...checking LIBS $LIBS ..." 1>&5 cf_rpath_dst= for cf_rpath_src in $LIBS @@ -14784,7 +15849,7 @@ do then test -n "$verbose" && echo " ...Filter $cf_rpath_src ->$cf_rpath_tmp" 1>&6 -echo "${as_me:-configure}:14787: testing ...Filter $cf_rpath_src ->$cf_rpath_tmp ..." 1>&5 +echo "${as_me:-configure}:15852: testing ...Filter $cf_rpath_src ->$cf_rpath_tmp ..." 1>&5 EXTRA_LDFLAGS="$cf_rpath_tmp $EXTRA_LDFLAGS" fi @@ -14797,15 +15862,45 @@ LIBS=$cf_rpath_dst test -n "$verbose" && echo " ...checked LIBS $LIBS" 1>&6 -echo "${as_me:-configure}:14800: testing ...checked LIBS $LIBS ..." 1>&5 +echo "${as_me:-configure}:15865: testing ...checked LIBS $LIBS ..." 1>&5 test -n "$verbose" && echo " ...checked EXTRA_LDFLAGS $EXTRA_LDFLAGS" 1>&6 -echo "${as_me:-configure}:14804: testing ...checked EXTRA_LDFLAGS $EXTRA_LDFLAGS ..." 1>&5 +echo "${as_me:-configure}:15869: testing ...checked EXTRA_LDFLAGS $EXTRA_LDFLAGS ..." 1>&5 + +else + echo "$as_me:15872: result: no" >&5 +echo "${ECHO_T}no" >&6 +fi fi +cf_libname=\${LIB_BASENAME} +cf_liblink=$cf_libname +cf_libroot=$cf_libname + +if test "x$cf_cv_do_symlinks" = xyes +then + case "x$cf_cv_shlib_version" in #(vi + xrel) #(vi + cf_liblink="\${LIB_ABI_NAME}" + cf_libname="\${LIB_REL_NAME}" + ;; + xabi) + cf_liblink="\${LIB_REL_NAME}" + cf_libname="\${LIB_ABI_NAME}" + ;; + esac fi +LIB_TARGET=$cf_libname + +SET_SHLIB_VARS="# begin CF__DEFINE_SHLIB_VARS\\ +LIB_BASENAME = ${LIB_PREFIX}\${LIB_ROOTNAME}\${LIB_SUFFIX}\\ +LIB_REL_NAME = \${LIB_BASENAME}.\${REL_VERSION}\\ +LIB_ABI_NAME = \${LIB_BASENAME}.\${ABI_VERSION}\\ +LIB_TARGET = $LIB_TARGET\\ +RM_SHARED_OPTS = $RM_SHARED_OPTS\\ +# end CF__DEFINE_SHLIB_VARS" ac_config_files="$ac_config_files dialog-config makefile $EXTRA_OUTPUT $SUB_MAKEFILE" ac_config_commands="$ac_config_commands default" @@ -14888,7 +15983,7 @@ DEFS=-DHAVE_CONFIG_H : ${CONFIG_STATUS=./config.status} ac_clean_files_save=$ac_clean_files ac_clean_files="$ac_clean_files $CONFIG_STATUS" -{ echo "$as_me:14891: creating $CONFIG_STATUS" >&5 +{ echo "$as_me:15986: creating $CONFIG_STATUS" >&5 echo "$as_me: creating $CONFIG_STATUS" >&6;} cat >$CONFIG_STATUS <<_ACEOF #! $SHELL @@ -15064,7 +16159,7 @@ cat >>$CONFIG_STATUS <<\EOF echo "$ac_cs_version"; exit 0 ;; --he | --h) # Conflict between --help and --header - { { echo "$as_me:15067: error: ambiguous option: $1 + { { echo "$as_me:16162: error: ambiguous option: $1 Try \`$0 --help' for more information." >&5 echo "$as_me: error: ambiguous option: $1 Try \`$0 --help' for more information." >&2;} @@ -15083,7 +16178,7 @@ Try \`$0 --help' for more information." >&2;} ac_need_defaults=false;; # This is an error. - -*) { { echo "$as_me:15086: error: unrecognized option: $1 + -*) { { echo "$as_me:16181: error: unrecognized option: $1 Try \`$0 --help' for more information." >&5 echo "$as_me: error: unrecognized option: $1 Try \`$0 --help' for more information." >&2;} @@ -15118,6 +16213,16 @@ cat >>$CONFIG_STATUS <<EOF # INIT-COMMANDS section. # +ABI_VERSION="$ABI_VERSION" +REL_VERSION="$REL_VERSION" +LIB_MODEL="$LIB_MODEL" +LIB_PREFIX="$LIB_PREFIX" +LIB_ROOTNAME="$LIB_ROOTNAME" +DFT_DEP_SUFFIX="$DFT_DEP_SUFFIX" +RM_SHARED_OPTS="$RM_SHARED_OPTS" +cf_cv_do_symlinks="$cf_cv_do_symlinks" +cf_cv_shlib_version="$cf_cv_shlib_version" + EOF cat >>$CONFIG_STATUS <<\EOF @@ -15132,7 +16237,7 @@ do "default-1" ) CONFIG_COMMANDS="$CONFIG_COMMANDS default-1" ;; "default" ) CONFIG_COMMANDS="$CONFIG_COMMANDS default" ;; "dlg_config.h" ) CONFIG_HEADERS="$CONFIG_HEADERS dlg_config.h:config.hin" ;; - *) { { echo "$as_me:15135: error: invalid argument: $ac_config_target" >&5 + *) { { echo "$as_me:16240: error: invalid argument: $ac_config_target" >&5 echo "$as_me: error: invalid argument: $ac_config_target" >&2;} { (exit 1); exit 1; }; };; esac @@ -15231,6 +16336,7 @@ s,@ac_ct_RANLIB@,$ac_ct_RANLIB,;t t s,@INSTALL_PROGRAM@,$INSTALL_PROGRAM,;t t s,@INSTALL_SCRIPT@,$INSTALL_SCRIPT,;t t s,@INSTALL_DATA@,$INSTALL_DATA,;t t +s,@LN_S@,$LN_S,;t t s,@LINT@,$LINT,;t t s,@LINT_OPTS@,$LINT_OPTS,;t t s,@AR@,$AR,;t t @@ -15256,11 +16362,16 @@ s,@host_os@,$host_os,;t t s,@PROG_EXT@,$PROG_EXT,;t t s,@LIB_PREFIX@,$LIB_PREFIX,;t t s,@EXTRA_CFLAGS@,$EXTRA_CFLAGS,;t t +s,@PKG_CONFIG@,$PKG_CONFIG,;t t +s,@ac_pt_PKG_CONFIG@,$ac_pt_PKG_CONFIG,;t t s,@VERSION@,$VERSION,;t t s,@VERSION_MAJOR@,$VERSION_MAJOR,;t t s,@VERSION_MINOR@,$VERSION_MINOR,;t t s,@VERSION_PATCH@,$VERSION_PATCH,;t t s,@PACKAGE@,$PACKAGE,;t t +s,@CFG_ROOTNAME@,$CFG_ROOTNAME,;t t +s,@HDR_ROOTNAME@,$HDR_ROOTNAME,;t t +s,@LIB_ROOTNAME@,$LIB_ROOTNAME,;t t s,@SUB_INC@,$SUB_INC,;t t s,@CONFIG_H@,$CONFIG_H,;t t s,@ALLOCA@,$ALLOCA,;t t @@ -15291,8 +16402,11 @@ s,@INTLDIR_MAKE@,$INTLDIR_MAKE,;t t s,@GT_YES@,$GT_YES,;t t s,@GT_NO@,$GT_NO,;t t s,@LINK_PREFIX@,$LINK_PREFIX,;t t +s,@ABI_VERSION@,$ABI_VERSION,;t t +s,@REL_VERSION@,$REL_VERSION,;t t s,@LIBTOOL_VERSION@,$LIBTOOL_VERSION,;t t s,@LIBTOOL@,$LIBTOOL,;t t +s,@ac_ct_LIBTOOL@,$ac_ct_LIBTOOL,;t t s,@LT_UNDEF@,$LT_UNDEF,;t t s,@LIBTOOL_CXX@,$LIBTOOL_CXX,;t t s,@LIBTOOL_OPTS@,$LIBTOOL_OPTS,;t t @@ -15305,14 +16419,34 @@ s,@LIB_COMPILE@,$LIB_COMPILE,;t t s,@LIB_LINK@,$LIB_LINK,;t t s,@LIB_INSTALL@,$LIB_INSTALL,;t t s,@LIB_UNINSTALL@,$LIB_UNINSTALL,;t t +s,@CC_SHARED_OPTS@,$CC_SHARED_OPTS,;t t +s,@LD_RPATH_OPT@,$LD_RPATH_OPT,;t t +s,@LD_SHARED_OPTS@,$LD_SHARED_OPTS,;t t +s,@MK_SHARED_LIB@,$MK_SHARED_LIB,;t t +s,@RM_SHARED_OPTS@,$RM_SHARED_OPTS,;t t +s,@LINK_PROGS@,$LINK_PROGS,;t t +s,@LINK_TESTS@,$LINK_TESTS,;t t +s,@EXTRA_LDFLAGS@,$EXTRA_LDFLAGS,;t t +s,@LOCAL_LDFLAGS@,$LOCAL_LDFLAGS,;t t +s,@LOCAL_LDFLAGS2@,$LOCAL_LDFLAGS2,;t t +s,@INSTALL_LIB@,$INSTALL_LIB,;t t +s,@RPATH_LIST@,$RPATH_LIST,;t t +s,@DFT_LWR_MODEL@,$DFT_LWR_MODEL,;t t +s,@DFT_LIB_SUFFIX@,$DFT_LIB_SUFFIX,;t t +s,@DFT_DEP_SUFFIX@,$DFT_DEP_SUFFIX,;t t +s,@LIB_MODEL@,$LIB_MODEL,;t t s,@LIBTOOL_MAKE@,$LIBTOOL_MAKE,;t t +s,@MAKE_NORMAL@,$MAKE_NORMAL,;t t +s,@MAKE_SHARED@,$MAKE_SHARED,;t t +s,@MAKE_STATIC@,$MAKE_STATIC,;t t s,@NCURSES_CONFIG@,$NCURSES_CONFIG,;t t s,@ac_ct_NCURSES_CONFIG@,$ac_ct_NCURSES_CONFIG,;t t s,@EXTRAOBJS@,$EXTRAOBJS,;t t s,@PACKAGE_PREFIX@,$PACKAGE_PREFIX,;t t s,@PACKAGE_CONFIG@,$PACKAGE_CONFIG,;t t s,@cf_ldd_prog@,$cf_ldd_prog,;t t -s,@EXTRA_LDFLAGS@,$EXTRA_LDFLAGS,;t t +s,@SET_SHLIB_VARS@,$SET_SHLIB_VARS,;t t +s,@LIB_TARGET@,$LIB_TARGET,;t t CEOF EOF @@ -15427,7 +16561,7 @@ done; } esac if test x"$ac_file" != x-; then - { echo "$as_me:15430: creating $ac_file" >&5 + { echo "$as_me:16564: creating $ac_file" >&5 echo "$as_me: creating $ac_file" >&6;} rm -f "$ac_file" fi @@ -15445,7 +16579,7 @@ echo "$as_me: creating $ac_file" >&6;} -) echo $tmp/stdin ;; [\\/$]*) # Absolute (can't be DOS-style, as IFS=:) - test -f "$f" || { { echo "$as_me:15448: error: cannot find input file: $f" >&5 + test -f "$f" || { { echo "$as_me:16582: error: cannot find input file: $f" >&5 echo "$as_me: error: cannot find input file: $f" >&2;} { (exit 1); exit 1; }; } echo $f;; @@ -15458,7 +16592,7 @@ echo "$as_me: error: cannot find input file: $f" >&2;} echo $srcdir/$f else # /dev/null tree - { { echo "$as_me:15461: error: cannot find input file: $f" >&5 + { { echo "$as_me:16595: error: cannot find input file: $f" >&5 echo "$as_me: error: cannot find input file: $f" >&2;} { (exit 1); exit 1; }; } fi;; @@ -15474,7 +16608,7 @@ cat >>$CONFIG_STATUS <<\EOF if test -n "$ac_seen"; then ac_used=`grep '@datarootdir@' $ac_item` if test -z "$ac_used"; then - { echo "$as_me:15477: WARNING: datarootdir was used implicitly but not set: + { echo "$as_me:16611: WARNING: datarootdir was used implicitly but not set: $ac_seen" >&5 echo "$as_me: WARNING: datarootdir was used implicitly but not set: $ac_seen" >&2;} @@ -15483,7 +16617,7 @@ $ac_seen" >&2;} fi ac_seen=`grep '${datarootdir}' $ac_item` if test -n "$ac_seen"; then - { echo "$as_me:15486: WARNING: datarootdir was used explicitly but not set: + { echo "$as_me:16620: WARNING: datarootdir was used explicitly but not set: $ac_seen" >&5 echo "$as_me: WARNING: datarootdir was used explicitly but not set: $ac_seen" >&2;} @@ -15520,7 +16654,7 @@ s,@INSTALL@,$ac_INSTALL,;t t ac_init=`egrep '[ ]*'$ac_name'[ ]*=' $ac_file` if test -z "$ac_init"; then ac_seen=`echo "$ac_seen" |sed -e 's,^,'$ac_file':,'` - { echo "$as_me:15523: WARNING: Variable $ac_name is used but was not set: + { echo "$as_me:16657: WARNING: Variable $ac_name is used but was not set: $ac_seen" >&5 echo "$as_me: WARNING: Variable $ac_name is used but was not set: $ac_seen" >&2;} @@ -15531,7 +16665,7 @@ $ac_seen" >&2;} egrep -n '@[A-Z_][A-Z_0-9]+@' $ac_file >>$tmp/out if test -s $tmp/out; then ac_seen=`sed -e 's,^,'$ac_file':,' < $tmp/out` - { echo "$as_me:15534: WARNING: Some variables may not be substituted: + { echo "$as_me:16668: WARNING: Some variables may not be substituted: $ac_seen" >&5 echo "$as_me: WARNING: Some variables may not be substituted: $ac_seen" >&2;} @@ -15580,7 +16714,7 @@ for ac_file in : $CONFIG_HEADERS; do test "x$ac_file" = x: && continue * ) ac_file_in=$ac_file.in ;; esac - test x"$ac_file" != x- && { echo "$as_me:15583: creating $ac_file" >&5 + test x"$ac_file" != x- && { echo "$as_me:16717: creating $ac_file" >&5 echo "$as_me: creating $ac_file" >&6;} # First look for the input files in the build tree, otherwise in the @@ -15591,7 +16725,7 @@ echo "$as_me: creating $ac_file" >&6;} -) echo $tmp/stdin ;; [\\/$]*) # Absolute (can't be DOS-style, as IFS=:) - test -f "$f" || { { echo "$as_me:15594: error: cannot find input file: $f" >&5 + test -f "$f" || { { echo "$as_me:16728: error: cannot find input file: $f" >&5 echo "$as_me: error: cannot find input file: $f" >&2;} { (exit 1); exit 1; }; } echo $f;; @@ -15604,7 +16738,7 @@ echo "$as_me: error: cannot find input file: $f" >&2;} echo $srcdir/$f else # /dev/null tree - { { echo "$as_me:15607: error: cannot find input file: $f" >&5 + { { echo "$as_me:16741: error: cannot find input file: $f" >&5 echo "$as_me: error: cannot find input file: $f" >&2;} { (exit 1); exit 1; }; } fi;; @@ -15662,7 +16796,7 @@ cat >>$CONFIG_STATUS <<\EOF rm -f $tmp/in if test x"$ac_file" != x-; then if cmp -s $ac_file $tmp/config.h 2>/dev/null; then - { echo "$as_me:15665: $ac_file is unchanged" >&5 + { echo "$as_me:16799: $ac_file is unchanged" >&5 echo "$as_me: $ac_file is unchanged" >&6;} else ac_dir=`$as_expr X"$ac_file" : 'X\(.*[^/]\)//*[^/][^/]*/*$' \| \ @@ -15746,6 +16880,128 @@ for ac_file in : $CONFIG_COMMANDS; do test "x$ac_file" = x: && continue ;; esac done ;; + default ) + +cf_libname=\${LIB_BASENAME} +cf_liblink=$cf_libname +cf_libroot=$cf_libname + +if test "x$cf_cv_do_symlinks" = xyes +then + case "x$cf_cv_shlib_version" in #(vi + xrel) #(vi + cf_liblink="\${LIB_ABI_NAME}" + cf_libname="\${LIB_REL_NAME}" + ;; + xabi) + cf_liblink="\${LIB_REL_NAME}" + cf_libname="\${LIB_ABI_NAME}" + ;; + esac +fi +LIB_TARGET=$cf_libname + +case x$LIB_MODEL in +xlibtool|xshared) #(vi + cf_libdeps="\${LIBS} \${LDFLAGS}" + ;; +x*) + cf_libdeps= + ;; +esac + +cat >>makefile <<CF_EOF + +# generated by CF__ADD_SHLIB_RULES +# libmodel: $LIB_MODEL +# symlinks: $cf_cv_do_symlinks +# shlibver: $cf_cv_shlib_version + +CF_EOF + +cat >>makefile <<CF_EOF +$cf_libname :: \\ +CF_EOF + +cat >>makefile <<CF_EOF + \${LIB_OBJECT} + @echo linking \$@ + \$(LIBTOOL_CREATE) \${LIB_OBJECT} $cf_libdeps +CF_EOF + +if test "x$cf_cv_do_symlinks" = xyes +then +cat >>makefile <<CF_EOF + \$(LN_S) $cf_libname $cf_liblink + \$(LN_S) $cf_liblink $cf_libroot +CF_EOF +fi + +cat >>makefile <<CF_EOF + +install \\ +install.libs :: \$(DESTDIR)\$(libdir)/$cf_libname + +\$(DESTDIR)\$(libdir)/$cf_libname :: \\ + \$(DESTDIR)\$(libdir) \\ + \${LIB_OBJECT} + @echo linking \$@ + \$(LIBTOOL_CREATE) \${LIB_OBJECT} $cf_libdeps +CF_EOF + +if test "x$cf_cv_do_symlinks" = xyes +then +cat >>makefile <<CF_EOF + cd \$(DESTDIR)\$(libdir) && (\$(LN_S) $cf_libname $cf_liblink; \$(LN_S) $cf_liblink $cf_libroot; ) +CF_EOF +fi + +if test x$LIB_MODEL = xshared +then +cat >>makefile <<CF_EOF + - test -z "\$(DESTDIR)" && /sbin/ldconfig +CF_EOF +fi + +cat >>makefile <<CF_EOF + +uninstall \\ +uninstall.libs :: + @echo uninstalling \$(DESTDIR)\$(libdir)/$cf_libname +CF_EOF + +if test "x$cf_cv_do_symlinks" = xyes +then +cat >>makefile <<CF_EOF + -rm -f \$(DESTDIR)\$(libdir)/$cf_libroot + -rm -f \$(DESTDIR)\$(libdir)/$cf_liblink +CF_EOF +fi + +cat >>makefile <<CF_EOF + -rm -f \$(DESTDIR)\$(libdir)/$cf_libname + +clean \\ +clean.libs :: +CF_EOF + +if test "x$cf_cv_do_symlinks" = xyes +then +cat >>makefile <<CF_EOF + -rm -f $cf_libroot + -rm -f $cf_liblink +CF_EOF +fi + +cat >>makefile <<CF_EOF + -rm -f $cf_libname + +mostlyclean:: + -rm -f \${LIB_OBJECT} +# end generated by CF__ADD_SHLIB_RULES +CF_EOF + + ;; esac done EOF diff --git a/contrib/dialog/configure.in b/contrib/dialog/configure.in index 2e8630c..75ce244 100644 --- a/contrib/dialog/configure.in +++ b/contrib/dialog/configure.in @@ -1,4 +1,4 @@ -dnl $Id: configure.in,v 1.75 2012/12/30 22:38:00 tom Exp $ +dnl $Id: configure.in,v 1.79 2013/09/02 14:02:57 tom Exp $ dnl Process this file with autoconf to produce a configure script. dnl --------------------------------------------------------------------------- dnl Copyright 1999-2011,2012 -- Thomas E. Dickey @@ -44,6 +44,7 @@ AC_PROG_CPP AC_PROG_MAKE_SET AC_PROG_RANLIB AC_PROG_INSTALL +CF_PROG_LN_S CF_PROG_LINT dnl needed for CF_WITH_LIBTOOL @@ -59,23 +60,36 @@ CF_XOPEN_SOURCE CF_LARGEFILE CF_WITH_WARNINGS +CF_PKG_CONFIG dnl dnl Allow dialog program and library to be renamed. +AC_MSG_CHECKING(for this package's name) AC_ARG_WITH(package, [ --with-package=XXX rename dialog to XXX, library to libXXX.a, etc], [PACKAGE=$withval], [PACKAGE=dialog]) +AC_MSG_RESULT($PACKAGE) CF_VERSION_INFO(dialog,$PACKAGE) +CFG_ROOTNAME=$PACKAGE +HDR_ROOTNAME=$PACKAGE +LIB_ROOTNAME=$PACKAGE + +AC_SUBST(CFG_ROOTNAME) +AC_SUBST(HDR_ROOTNAME) +AC_SUBST(LIB_ROOTNAME) + dnl dnl If package is renamed, it is useful to have the dlg_XXX headers in a dnl subdirectory (using the package name) so that multiple versions of the dnl headers can coexist. +AC_MSG_CHECKING(if we should install dlg_XXX headers to subdirectory) AC_ARG_ENABLE(header-subdir, [ --enable-header-subdir install dlg_XXX headers to subdirectory], [SUB_INC=$enableval], [SUB_INC=no]) +AC_MSG_RESULT($SUB_INC) AC_SUBST(SUB_INC) dnl @@ -93,17 +107,13 @@ CF_ARG_MSG_ENABLE([if you want --trace option], [EXTRAOBJS="$EXTRAOBJS trace\$o" AC_DEFINE(HAVE_DLG_TRACE,1,[Define to 1 to support --trace option])],,yes) -LIBTOOL_MAKE="#" -CF_WITH_LIBTOOL -if test "$with_libtool" = "yes" ; then - OBJEXT="lo" - LIBTOOL_MAKE= - CF_WITH_LIBTOOL_OPTS -fi -AC_SUBST(LIBTOOL_MAKE) +CF_LD_RPATH_OPT +CF_WITH_SHARED_OR_LIBTOOL(DIALOG,${VERSION_MAJOR}.${VERSION_MINOR},`echo "$VERSION" |sed -e 's/:/./g'`) CF_WITH_CURSES_DIR +CF_ENABLE_RPATH + use_ncurses=no AC_ARG_WITH(ncurses, [ --with-ncurses compile/link with ncurses library], @@ -252,4 +262,18 @@ AC_TRY_LINK([#include <locale.h>],[setlocale(LC_ALL, "")],[AC_DEFINE(HAVE_SETLOC CF_DISABLE_RPATH_HACK -AC_OUTPUT(dialog-config makefile $EXTRA_OUTPUT $SUB_MAKEFILE,,,sort -u) +CF__DEFINE_SHLIB_VARS + +AC_OUTPUT( + dialog-config + makefile + $EXTRA_OUTPUT + $SUB_MAKEFILE,[ +CF__ADD_SHLIB_RULES( + makefile, + $LIB_MODEL, + [\${LIB_OBJECT}], + [\${LIBS} \${LDFLAGS}]) +],[ +CF__INIT_SHLIB_RULES +],[sort -u]) diff --git a/contrib/dialog/dialog.1 b/contrib/dialog/dialog.1 index 923408b..50bb02b 100644 --- a/contrib/dialog/dialog.1 +++ b/contrib/dialog/dialog.1 @@ -1,5 +1,5 @@ '\" t -.\" $Id: dialog.1,v 1.165 2013/03/15 09:07:30 tom Exp $ +.\" $Id: dialog.1,v 1.167 2013/09/02 17:38:36 tom Exp $ .\" Copyright 2005-2012,2013 Thomas E. Dickey .\" .\" This program is free software; you can redistribute it and/or modify @@ -41,7 +41,7 @@ .IP \(bu 4 .. . -.TH \*D 1 "" "$Date: 2013/03/15 09:07:30 $" +.TH \*D 1 "" "$Date: 2013/09/02 17:38:36 $" .SH NAME dialog \- display dialog boxes from shell scripts .SH SYNOPSIS @@ -318,11 +318,19 @@ or if an unrecognized option is given. .IP "\fB--help-button" Show a help-button after "OK" and "Cancel" buttons, i.e., in checklist, radiolist and menu boxes. -If "\fB--item-help\fR" is also given, on exit -the return status will be the same as for the "OK" button, -and the item-help text will be written to \fB\*p\fP's output after the token "HELP". -Otherwise, the return status will indicate that the Help button was pressed, -and no message printed. +.IP +On exit, the return status will indicate that the Help button was pressed. +\fB\*L\fP will also write a message to its output after the token "HELP": +.RS +.bP +If "\fB--item-help\fR" is also given, the item-help text will be written. +.bP +Otherwise, the item's tag (the first field) will be written. +.RE +.IP +.IP +You can use the \fB--help-tags\fP option and/or set the DIALOG_ITEM_HELP +environment variable to modify these messages and exit-status. . .IP "\fB--help-label \fIstring" Override the label used for "Help" buttons. @@ -334,6 +342,11 @@ after the item-help "HELP" information. This can be used to reconstruct the state of a checklist after processing the help request. . +.IP "\fB--help-tags" +Modify the messages written on exit for \fB--help-button\fP +by making them always just the item's tag. +This does not affect the exit status code. +. .IP "\fB--hfile \fIfilename" Display the given file using a textbox when the user presses F1. . @@ -1411,9 +1424,7 @@ The default values and corresponding environment variables that can override them are: .TP 5 0 -if -.BR \*p " is exited by pressing the " Yes " or " OK -button (DIALOG_OK). +if the \fBYES\fP or \fBOK\fP button is pressed (DIALOG_OK). .TP 5 1 if the @@ -1423,7 +1434,9 @@ button is pressed (DIALOG_CANCEL). 2 if the .BR Help -button is pressed (DIALOG_HELP). +button is pressed (DIALOG_HELP), +.br +except as noted below about DIALOG_ITEM_HELP. .TP 5 3 if the @@ -1433,13 +1446,21 @@ button is pressed (DIALOG_EXTRA). 4 if the .BR Help -button is pressed (DIALOG_HELP), -or the \fB--item-help\fP option is set -when the \fBHelp\fP button is pressed (DIALOG_ITEM_HELP), +button is pressed, +.br +and the \fB--item-help\fP option is set +.br +and the DIALOG_ITEM_HELP environment variable is set to 4. +.IP +While any of the exit-codes can be overridden using environment variables, +this special case was introduced in 2004 to simplify compatibility. +\fB\*L\fP uses DIALOG_ITEM_HELP(4) internally, +but unless the environment variable is also set, +it changes that to DIALOG_HELP(2) on exit. .TP 5 -1 if errors occur inside \fB\*p\fP (DIALOG_ERROR) -or \fB\*p\fP is exited by pressing the \fIESC\fP key (DIALOG_ESC). +or \fB\*p\fP exits because the \fIESC\fP key (DIALOG_ESC) was pressed. . .\" ************************************************************************ .SH PORTABILITY diff --git a/contrib/dialog/dialog.3 b/contrib/dialog/dialog.3 index c3a6aac..de91fbd 100644 --- a/contrib/dialog/dialog.3 +++ b/contrib/dialog/dialog.3 @@ -1,5 +1,5 @@ '\" t -.\" $Id: dialog.3,v 1.91 2013/03/15 09:07:30 tom Exp $ +.\" $Id: dialog.3,v 1.93 2013/09/22 23:58:11 tom Exp $ .\" Copyright 2005-2012,2013 Thomas E. Dickey .\" .\" This program is free software; you can redistribute it and/or modify @@ -39,7 +39,7 @@ .de bP .IP \(bu 4 .. -.TH \*D 3 "" "$Date: 2013/03/15 09:07:30 $" +.TH \*D 3 "" "$Date: 2013/09/22 23:58:11 $" .SH NAME dialog \- widgets and utilities for the \*p program .SH SYNOPSIS @@ -127,6 +127,11 @@ sizing (specifying 0 for height and width). It represents width / height. The default is 9, which means 9 characters wide to every 1 line high. .\" --------------------------------------------------------------------------- +.IP \fIDIALOG_STATE.finish_string +When set to true, this allows calls to \fBdlg_finish_string\fP to discard the +corresponding data which is created to speed up layout computations for the +given string parameter. The \fBgauge\fP widget uses this feature. +.\" --------------------------------------------------------------------------- .IP \fIDIALOG_STATE.getc_callbacks This is setup in \fIui_getc.c\fP to record windows which must be polled for input, e.g,. to handle the background tailbox widget. @@ -396,6 +401,14 @@ after the item-help "HELP" information. This can be used to reconstruct the state of a checklist after processing the help request. .\" --------------------------------------------------------------------------- +.IP \fIDIALOG_VARS.help_tags +This corresponds to the command-line option "\fB--help-tags\fP". +If true, +\fBdlg_add_help_formitem\fP and +\fBdlg_add_help_listitem\fP use the item's tag value consistently +rather than using the tag's help-text value +when \fIDIALOG_VARS.item_help\fP is set. +.\" --------------------------------------------------------------------------- .IP \fIDIALOG_VARS.input_length This is nonzero if \fIDIALOG_VARS.input_result\fP is allocated, versus being a pointer to the user's local variables. @@ -879,6 +892,7 @@ implements the "\fB--gauge\fP" option. Alternatively, a simpler or customized gauge widget can be setup using \fBdlg_allocate_gauge\fP, +\fBdlg_reallocate_gauge\fP, \fBdlg_update_gauge\fP and \fBdlg_free_gauge\fP. .RS @@ -1386,6 +1400,38 @@ function to call when input ends, e.g., to free caller's additional data. .RE .\" --------------------------------------------------------------------------- .TP 5 +.B dlg_add_help_formitem +This is a utility function used enforce consistent behavior for +the \fIDIALOG_VARS.help_tags\fP and \fIDIALOG_VARS.item_help\fP variables. +.RS +.TP 5 +.B int *\fIresult\fP +this is updated to DLG_EXIT_ITEM_HELP if \fIDIALOG_VARS.item_help\fP is set. +.TP 5 +.B char **\fItag\fP +the tag- or help-text is stored here. +.TP 5 +.B DIALOG_FORMITEM *\fIitem\fP +contains the list item to use for tag- or help-text. +.RE +.\" --------------------------------------------------------------------------- +.TP 5 +.B dlg_add_help_listitem +This is a utility function used enforce consistent behavior for +the \fIDIALOG_VARS.help_tags\fP and \fIDIALOG_VARS.item_help\fP variables. +.RS +.TP 5 +.B int *\fIresult\fP +this is updated to DLG_EXIT_ITEM_HELP if \fIDIALOG_VARS.item_help\fP is set. +.TP 5 +.B char **\fItag\fP +the tag- or help-text is stored here. +.TP 5 +.B DIALOG_LISTITEM *\fIitem\fP +contains the list item to use for tag- or help-text. +.RE +.\" --------------------------------------------------------------------------- +.TP 5 .B dlg_add_last_key Report the last key entered by the user. This implements the \fB\-\-last\-key\fP command-line option, @@ -2518,6 +2564,18 @@ is the character-offset to find. .RE .\" --------------------------------------------------------------------------- .TP 5 +.B dlg_finish_string +If \fIDIALOG_STATE.finish_string\fP is true, +this function discards data used to speed up layout computations. +.RS +.TP 5 +.B const char * \fIstring +is the address of the string whose data should be discarded. +The address rather than contents is used as the unique identifier because +some of the caching is used for editable input-fields. +.RE +.\" --------------------------------------------------------------------------- +.TP 5 .B dlg_flush_getc Cancel the local data saved by \fBdlg_last_getc\fP. .\" --------------------------------------------------------------------------- @@ -3302,6 +3360,38 @@ Display the background title if \fBdialog_vars.backtitle\fP is non-null. The background title is shown at the top of the screen. .\" --------------------------------------------------------------------------- .TP 5 +.B dlg_reallocate_gauge +Allocates or reallocates a gauge widget (see \fBdlg_allocate_gauge\fP). +Use \fBdlg_update_gauge\fP to display the result. +.RS +.TP 5 +.B void ** \fIobjptr +If the pointer referenced by this parameter is null, the function creates +a new gauge widget using \fBdlg_allocate_gauge\fP. +Otherwise, it updates the title and cprompt values, reusing the window +from the previous call on this function. +As a side-effect, the function stores the updated object-pointer via +the \fIobjptr\fP parameter. +.TP 5 +.B const char * \fItitle +is the title string to display at the top of the widget. +.TP 5 +.B const char * \fIcprompt +is the prompt text shown within the widget. +.TP 5 +.B int \fIheight +is the desired height of the box. +If zero, the height is adjusted to use the available screen size. +.TP 5 +.B int \fIwidth +is the desired width of the box. +If zero, the height is adjusted to use the available screen size. +.TP 5 +.B int \fIpercent +is the percentage to show in the progress bar. +.RE +.\" --------------------------------------------------------------------------- +.TP 5 .B dlg_register_buttons The widget developer should call this function after \fBdlg_register_window\fP, for the list of button labels associated with the widget. diff --git a/contrib/dialog/dialog.c b/contrib/dialog/dialog.c index ff803f9..1238785 100644 --- a/contrib/dialog/dialog.c +++ b/contrib/dialog/dialog.c @@ -1,5 +1,5 @@ /* - * $Id: dialog.c,v 1.230 2013/03/15 09:07:30 tom Exp $ + * $Id: dialog.c,v 1.231 2013/09/02 17:20:09 tom Exp $ * * cdialog - Display simple dialog boxes from shell scripts * @@ -71,6 +71,7 @@ typedef enum { ,o_help_label ,o_help_line ,o_help_status + ,o_help_tags ,o_icon ,o_ignore ,o_infobox @@ -229,6 +230,7 @@ static const Options options[] = { { "help-button", o_help_button, 1, "" }, { "help-label", o_help_label, 1, "<str>" }, { "help-status", o_help_status, 1, "" }, + { "help-tags", o_help_tags, 1, "" }, { "hfile", o_help_file, 1, "<str>" }, { "hline", o_help_line, 1, "<str>" }, { "icon", o_icon, 1, NULL }, @@ -1462,6 +1464,9 @@ process_common_options(int argc, char **argv, int offset, bool output) case o_help_status: dialog_vars.help_status = TRUE; break; + case o_help_tags: + dialog_vars.help_tags = TRUE; + break; case o_extra_button: dialog_vars.extra_button = TRUE; break; diff --git a/contrib/dialog/dialog.h b/contrib/dialog/dialog.h index a255f03..1a6b0f7 100644 --- a/contrib/dialog/dialog.h +++ b/contrib/dialog/dialog.h @@ -1,5 +1,5 @@ /* - * $Id: dialog.h,v 1.260 2013/03/17 15:03:41 tom Exp $ + * $Id: dialog.h,v 1.267 2013/09/22 19:06:36 tom Exp $ * * dialog.h -- common declarations for all dialog modules * @@ -445,6 +445,8 @@ typedef struct { /* 1.1-20110106 */ bool no_mouse; /* option "--no-mouse" */ int visit_cols; /* option "--visit-items" */ + /* 1.2-20130922 */ + bool finish_string; /* caching optimization for gauge */ } DIALOG_STATE; extern DIALOG_STATE dialog_state; @@ -522,6 +524,8 @@ typedef struct { bool no_items; /* option "--no-items" */ /* 1.2-20130315 */ bool last_key; /* option "--last-key" */ + /* 1.2-20130902 */ + bool help_tags; /* option "--help-tags" */ } DIALOG_VARS; #define USE_ITEM_HELP(s) (dialog_vars.item_help && (s) != 0) @@ -687,6 +691,7 @@ extern void dlg_free_formitems(DIALOG_FORMITEM * /*items*/); /* guage.c */ extern void * dlg_allocate_gauge(const char * /* title */, const char * /* cprompt */, int /* height */, int /* width */, int /* percent */); +extern void * dlg_reallocate_gauge(void * /* objptr */, const char * /* title */, const char * /* cprompt */, int /* height */, int /* width */, int /* percent */); extern void dlg_free_gauge(void * /* objptr */); extern void dlg_update_gauge(void * /* objptr */, int /* percent */); @@ -699,6 +704,7 @@ extern int dlg_count_wchars(const char * /*string*/); extern int dlg_edit_offset(char * /*string*/, int /*offset*/, int /*x_last*/); extern int dlg_find_index(const int * /*list*/, int /*limit*/, int /*to_find*/); extern int dlg_limit_columns(const char * /*string*/, int /*limit*/, int /*offset*/); +extern void dlg_finish_string(const char * /* string */); extern void dlg_show_string(WINDOW * /*win*/, const char * /*string*/, int /*offset*/, chtype /*attr*/, int /*y_base*/, int /*x_base*/, int /*x_last*/, bool /*hidden*/, bool /*force*/); /* menubox.c */ @@ -749,6 +755,8 @@ extern int dlg_defaultno_button(void); extern int dlg_default_button(void); extern int dlg_max_input(int /*max_len*/); extern int dlg_print_scrolled(WINDOW * /* win */, const char * /* prompt */, int /* offset */, int /* height */, int /* width */, int /* pauseopt */); +extern void dlg_add_help_formitem(int * /* result */, char ** /* tag */, DIALOG_FORMITEM * /* item */); +extern void dlg_add_help_listitem(int * /* result */, char ** /* tag */, DIALOG_LISTITEM * /* item */); extern void dlg_add_quoted(char * /*string*/); extern void dlg_add_result(const char * /*string*/); extern void dlg_add_separator(void); diff --git a/contrib/dialog/formbox.c b/contrib/dialog/formbox.c index 6688c54..b0b207f 100644 --- a/contrib/dialog/formbox.c +++ b/contrib/dialog/formbox.c @@ -1,5 +1,5 @@ /* - * $Id: formbox.c,v 1.85 2013/03/17 15:03:41 tom Exp $ + * $Id: formbox.c,v 1.87 2013/09/02 17:02:05 tom Exp $ * * formbox.c -- implements the form (i.e, some pairs label/editbox) * @@ -915,6 +915,7 @@ dialog_form(const char *title, DIALOG_FORMITEM *listitems; DIALOG_VARS save_vars; bool show_status = FALSE; + char *help_result; dlg_save_vars(&save_vars); dialog_vars.separate_output = TRUE; @@ -954,14 +955,9 @@ dialog_form(const char *title, show_status = TRUE; break; case DLG_EXIT_HELP: - dlg_add_result("HELP "); + dlg_add_help_formitem(&result, &help_result, &listitems[choice]); show_status = dialog_vars.help_status; - if (USE_ITEM_HELP(listitems[choice].help)) { - dlg_add_string(listitems[choice].help); - result = DLG_EXIT_ITEM_HELP; - } else { - dlg_add_string(listitems[choice].name); - } + dlg_add_string(help_result); if (show_status) dlg_add_separator(); break; diff --git a/contrib/dialog/guage.c b/contrib/dialog/guage.c index 4c5c8c0..7982188 100644 --- a/contrib/dialog/guage.c +++ b/contrib/dialog/guage.c @@ -1,9 +1,9 @@ /* - * $Id: guage.c,v 1.65 2012/11/30 10:43:31 tom Exp $ + * $Id: guage.c,v 1.68 2013/09/22 19:10:22 tom Exp $ * * guage.c -- implements the gauge dialog * - * Copyright 2000-2011,2012 Thomas E. Dickey + * Copyright 2000-2012,2013 Thomas E. Dickey * * This program is free software; you can redistribute it and/or modify * it under the terms of the GNU Lesser General Public License, version 2.1 @@ -39,7 +39,7 @@ typedef struct _my_obj { DIALOG_CALLBACK obj; /* has to be first in struct */ struct _my_obj *next; WINDOW *text; - const char *title; + char *title; char *prompt; char prompt_buf[MY_LEN]; int percent; @@ -273,61 +273,97 @@ void dlg_update_gauge(void *objptr, int percent) { MY_OBJ *obj = (MY_OBJ *) objptr; + bool save_finish_string = dialog_state.finish_string; + dialog_state.finish_string = TRUE; curs_set(0); obj->percent = percent; repaint_text(obj); + dialog_state.finish_string = save_finish_string; } /* - * Allocates a new object and fills it as per the arguments + * (Re)Allocates an object and fills it as per the arguments */ void * -dlg_allocate_gauge(const char *title, - const char *cprompt, - int height, - int width, - int percent) +dlg_reallocate_gauge(void *objptr, + const char *title, + const char *cprompt, + int height, + int width, + int percent) { - int x, y; char *prompt = dlg_strclone(cprompt); - WINDOW *dialog; - MY_OBJ *obj = 0; + MY_OBJ *obj = objptr; + bool save_finish_string = dialog_state.finish_string; + dialog_state.finish_string = TRUE; dlg_tab_correct_str(prompt); - dlg_auto_size(title, prompt, &height, &width, MIN_HIGH, MIN_WIDE); - dlg_print_size(height, width); - dlg_ctl_size(height, width); + if (objptr == 0) { + /* create a new object */ + obj = dlg_calloc(MY_OBJ, 1); + assert_ptr(obj, "dialog_gauge"); - /* center dialog box on screen */ - x = dlg_box_x_ordinate(width); - y = dlg_box_y_ordinate(height); + dlg_auto_size(title, prompt, &height, &width, MIN_HIGH, MIN_WIDE); + dlg_print_size(height, width); + dlg_ctl_size(height, width); - dialog = dlg_new_window(height, width, y, x); + } else { + /* reuse an existing object */ + obj = objptr; + height = obj->height; + width = obj->width; + } - obj = dlg_calloc(MY_OBJ, 1); - assert_ptr(obj, "dialog_gauge"); + if (obj->obj.win == 0) { + /* center dialog box on screen */ + int x = dlg_box_x_ordinate(width); + int y = dlg_box_y_ordinate(height); + WINDOW *dialog = dlg_new_window(height, width, y, x); + obj->obj.win = dialog; + } obj->obj.input = dialog_state.pipe_input; - obj->obj.win = dialog; obj->obj.keep_win = TRUE; obj->obj.bg_task = TRUE; obj->obj.handle_getc = handle_my_getc; obj->obj.handle_input = handle_input; - obj->title = title; + if (obj->title == 0 || strcmp(obj->title, title)) { + dlg_finish_string(obj->title); + free(obj->title); + obj->title = dlg_strclone(title); + } + + dlg_finish_string(obj->prompt); + free(obj->prompt); + obj->prompt = prompt; obj->percent = percent; obj->height = height; obj->width = width; - obj->next = all_objects; - all_objects = obj; + /* if this was a new object, link it into the list */ + if (objptr == 0) { + obj->next = all_objects; + all_objects = obj; + } + dialog_state.finish_string = save_finish_string; return (void *) obj; } +void * +dlg_allocate_gauge(const char *title, + const char *cprompt, + int height, + int width, + int percent) +{ + return dlg_reallocate_gauge(NULL, title, cprompt, height, width, percent); +} + void dlg_free_gauge(void *objptr) { diff --git a/contrib/dialog/inputstr.c b/contrib/dialog/inputstr.c index a9e90c5..5dd043e 100644 --- a/contrib/dialog/inputstr.c +++ b/contrib/dialog/inputstr.c @@ -1,9 +1,9 @@ /* - * $Id: inputstr.c,v 1.72 2012/12/30 22:11:37 tom Exp $ + * $Id: inputstr.c,v 1.83 2013/09/23 23:19:26 tom Exp $ * * inputstr.c -- functions for input/display of a string * - * Copyright 2000-2011,2012 Thomas E. Dickey + * Copyright 2000-2012,2013 Thomas E. Dickey * * This program is free software; you can redistribute it and/or modify * it under the terms of the GNU Lesser General Public License, version 2.1 @@ -51,7 +51,7 @@ typedef struct _cache { struct _cache *next; #if USE_CACHING - struct _cache *cache_at; /* unique: associate caches by CACHE */ + int cache_num; /* tells what type of data is in list[] */ const char *string_at; /* unique: associate caches by char* */ #endif size_t s_len; /* strlen(string) - we add 1 for EOS */ @@ -65,6 +65,14 @@ typedef struct _cache { static CACHE *cache_list; +typedef enum { + cInxCols + ,cCntWideBytes + ,cCntWideChars + ,cInxWideChars + ,cMAX +} CACHE_USED; + #ifdef HAVE_TSEARCH static void *sorted_cache; #endif @@ -89,13 +97,35 @@ have_locale(void) #endif #ifdef HAVE_TSEARCH + +#if 0 +static void +show_tsearch(const void *nodep, const VISIT which, const int depth) +{ + const CACHE *p = *(CACHE * const *) nodep; + (void) depth; + if (which == postorder || which == leaf) { + dlg_trace_msg("\tcache %p %p:%s\n", p, p->string, p->string); + } +} + +static void +trace_cache(const char *fn, int ln) +{ + dlg_trace_msg("trace_cache %s@%d\n", fn, ln); + twalk(sorted_cache, show_tsearch); +} + +#else +#define trace_cache(fn, ln) /* nothing */ +#endif + static int compare_cache(const void *a, const void *b) { const CACHE *p = (const CACHE *) a; const CACHE *q = (const CACHE *) b; - int result = 0; - result = (int) (p->cache_at - q->cache_at); + int result = (p->cache_num - q->cache_num); if (result == 0) result = (int) (p->string_at - q->string_at); return result; @@ -103,7 +133,7 @@ compare_cache(const void *a, const void *b) #endif static CACHE * -find_cache(CACHE * cache, const char *string) +find_cache(int cache_num, const char *string) { CACHE *p; @@ -112,7 +142,7 @@ find_cache(CACHE * cache, const char *string) CACHE find; memset(&find, 0, sizeof(find)); - find.cache_at = cache; + find.cache_num = cache_num; find.string_at = string; if ((pp = tfind(&find, &sorted_cache, compare_cache)) != 0) { @@ -122,8 +152,7 @@ find_cache(CACHE * cache, const char *string) } #else for (p = cache_list; p != 0; p = p->next) { - if (p->cache_at == cache - && p->string_at == string) { + if (p->string_at == string) { break; } } @@ -131,8 +160,8 @@ find_cache(CACHE * cache, const char *string) return p; } -static void -make_cache(CACHE * cache, const char *string) +static CACHE * +make_cache(int cache_num, const char *string) { CACHE *p; @@ -141,43 +170,30 @@ make_cache(CACHE * cache, const char *string) p->next = cache_list; cache_list = p; - p->cache_at = cache; + p->cache_num = cache_num; p->string_at = string; - *cache = *p; #ifdef HAVE_TSEARCH (void) tsearch(p, &sorted_cache, compare_cache); #endif + return p; } -static void -load_cache(CACHE * cache, const char *string) -{ - CACHE *p; - - if ((p = find_cache(cache, string)) != 0) { - *cache = *p; - } else { - make_cache(cache, string); - } -} - -static void -save_cache(CACHE * cache, const char *string) +static CACHE * +load_cache(int cache_num, const char *string) { CACHE *p; - if ((p = find_cache(cache, string)) != 0) { - CACHE *q = p->next; - *p = *cache; - p->next = q; + if ((p = find_cache(cache_num, string)) == 0) { + p = make_cache(cache_num, string); } + return p; } #else +static CACHE my_cache; #define SAME_CACHE(c,s,l) (c->string != 0) -#define load_cache(cache, string) /* nothing */ -#define save_cache(cache, string) /* nothing */ -#endif /* USE_WIDE_CURSES */ +#define load_cache(cache, string) &my_cache +#endif /* USE_CACHING */ /* * If the given string has not changed, we do not need to update the index. @@ -188,32 +204,34 @@ same_cache2(CACHE * cache, const char *string, unsigned i_len) { unsigned need; size_t s_len = strlen(string); + bool result = TRUE; + + if (cache->s_len == 0 + || cache->s_len < s_len + || cache->list == 0 + || !SAME_CACHE(cache, string, (size_t) s_len)) { + + need = (i_len + 1); + if (cache->list == 0) { + cache->list = dlg_malloc(int, need); + } else if (cache->i_len < i_len) { + cache->list = dlg_realloc(int, need, cache->list); + } + assert_ptr(cache->list, "load_cache"); + cache->i_len = i_len; - if (cache->s_len != 0 - && cache->s_len >= s_len - && cache->list != 0 - && SAME_CACHE(cache, string, (size_t) s_len)) { - return TRUE; - } - - need = (i_len + 1); - if (cache->list == 0) { - cache->list = dlg_malloc(int, need); - } else if (cache->i_len < i_len) { - cache->list = dlg_realloc(int, need, cache->list); - } - cache->i_len = i_len; + if (cache->s_len >= s_len && cache->string != 0) { + strcpy(cache->string, string); + } else { + if (cache->string != 0) + free(cache->string); + cache->string = dlg_strclone(string); + } + cache->s_len = s_len; - if (cache->s_len >= s_len && cache->string != 0) { - strcpy(cache->string, string); - } else { - if (cache->string != 0) - free(cache->string); - cache->string = dlg_strclone(string); + result = FALSE; } - cache->s_len = s_len; - - return FALSE; + return result; } #ifdef USE_WIDE_CURSES @@ -225,23 +243,24 @@ static bool same_cache1(CACHE * cache, const char *string, size_t i_len) { size_t s_len = strlen(string); + bool result = TRUE; - if (cache->s_len == s_len - && SAME_CACHE(cache, string, (size_t) s_len)) { - return TRUE; - } + if (cache->s_len != s_len + || !SAME_CACHE(cache, string, (size_t) s_len)) { - if (cache->s_len >= s_len && cache->string != 0) { - strcpy(cache->string, string); - } else { - if (cache->string != 0) - free(cache->string); - cache->string = dlg_strclone(string); - } - cache->s_len = s_len; - cache->i_len = i_len; + if (cache->s_len >= s_len && cache->string != 0) { + strcpy(cache->string, string); + } else { + if (cache->string != 0) + free(cache->string); + cache->string = dlg_strclone(string); + } + cache->s_len = s_len; + cache->i_len = i_len; - return FALSE; + result = FALSE; + } + return result; } #endif /* USE_CACHING */ @@ -256,29 +275,26 @@ dlg_count_wcbytes(const char *string, size_t len) int result; if (have_locale()) { - static CACHE cache; - - load_cache(&cache, string); - if (!same_cache1(&cache, string, len)) { + CACHE *cache = load_cache(cCntWideBytes, string); + if (!same_cache1(cache, string, len)) { while (len != 0) { size_t code = 0; - const char *src = cache.string; + const char *src = cache->string; mbstate_t state; - char save = cache.string[len]; + char save = cache->string[len]; - cache.string[len] = '\0'; + cache->string[len] = '\0'; memset(&state, 0, sizeof(state)); code = mbsrtowcs((wchar_t *) 0, &src, len, &state); - cache.string[len] = save; + cache->string[len] = save; if ((int) code >= 0) { break; } --len; } - cache.i_len = len; - save_cache(&cache, string); + cache->i_len = len; } - result = (int) cache.i_len; + result = (int) cache->i_len; } else { result = (int) len; } @@ -293,34 +309,32 @@ int dlg_count_wchars(const char *string) { int result; - #ifdef USE_WIDE_CURSES + if (have_locale()) { - static CACHE cache; size_t len = strlen(string); + CACHE *cache = load_cache(cCntWideChars, string); - load_cache(&cache, string); - if (!same_cache1(&cache, string, len)) { - const char *src = cache.string; + if (!same_cache1(cache, string, len)) { + const char *src = cache->string; mbstate_t state; - int part = dlg_count_wcbytes(cache.string, len); - char save = cache.string[part]; + int part = dlg_count_wcbytes(cache->string, len); + char save = cache->string[part]; size_t code; wchar_t *temp = dlg_calloc(wchar_t, len + 1); if (temp != 0) { - cache.string[part] = '\0'; + cache->string[part] = '\0'; memset(&state, 0, sizeof(state)); code = mbsrtowcs(temp, &src, (size_t) part, &state); - cache.i_len = ((int) code >= 0) ? wcslen(temp) : 0; - cache.string[part] = save; + cache->i_len = ((int) code >= 0) ? wcslen(temp) : 0; + cache->string[part] = save; free(temp); - save_cache(&cache, string); } else { - cache.i_len = 0; + cache->i_len = 0; } } - result = (int) cache.i_len; + result = (int) cache->i_len; } else #endif /* USE_WIDE_CURSES */ { @@ -336,15 +350,14 @@ dlg_count_wchars(const char *string) const int * dlg_index_wchars(const char *string) { - static CACHE cache; unsigned len = (unsigned) dlg_count_wchars(string); unsigned inx; + CACHE *cache = load_cache(cInxWideChars, string); - load_cache(&cache, string); - if (!same_cache2(&cache, string, len)) { + if (!same_cache2(cache, string, len)) { const char *current = string; - cache.list[0] = 0; + cache->list[0] = 0; for (inx = 1; inx <= len; ++inx) { #ifdef USE_WIDE_CURSES if (have_locale()) { @@ -355,17 +368,16 @@ dlg_index_wchars(const char *string) if (width <= 0) width = 1; /* FIXME: what if we have a control-char? */ current += width; - cache.list[inx] = cache.list[inx - 1] + width; + cache->list[inx] = cache->list[inx - 1] + width; } else #endif /* USE_WIDE_CURSES */ { (void) current; - cache.list[inx] = (int) inx; + cache->list[inx] = (int) inx; } } - save_cache(&cache, string); } - return cache.list; + return cache->list; } /* @@ -392,13 +404,12 @@ dlg_find_index(const int *list, int limit, int to_find) const int * dlg_index_columns(const char *string) { - static CACHE cache; unsigned len = (unsigned) dlg_count_wchars(string); unsigned inx; + CACHE *cache = load_cache(cInxCols, string); - load_cache(&cache, string); - if (!same_cache2(&cache, string, len)) { - cache.list[0] = 0; + if (!same_cache2(cache, string, len)) { + cache->list[0] = 0; #ifdef USE_WIDE_CURSES if (have_locale()) { size_t num_bytes = strlen(string); @@ -411,7 +422,7 @@ dlg_index_columns(const char *string) int result; if (string[inx_wchars[inx]] == TAB) { - result = ((cache.list[inx] | 7) + 1) - cache.list[inx]; + result = ((cache->list[inx] | 7) + 1) - cache->list[inx]; } else { memset(&state, 0, sizeof(state)); memset(temp, 0, sizeof(temp)); @@ -432,9 +443,9 @@ dlg_index_columns(const char *string) result = printable ? (int) wcslen(printable) : 1; } } - cache.list[inx + 1] = result; + cache->list[inx + 1] = result; if (inx != 0) - cache.list[inx + 1] += cache.list[inx]; + cache->list[inx + 1] += cache->list[inx]; } } else #endif /* USE_WIDE_CURSES */ @@ -443,24 +454,23 @@ dlg_index_columns(const char *string) chtype ch = UCH(string[inx]); if (ch == TAB) - cache.list[inx + 1] = - ((cache.list[inx] | 7) + 1) - cache.list[inx]; + cache->list[inx + 1] = + ((cache->list[inx] | 7) + 1) - cache->list[inx]; else if (isprint(ch)) - cache.list[inx + 1] = 1; + cache->list[inx + 1] = 1; else { const char *printable; printable = unctrl(ch); - cache.list[inx + 1] = (printable - ? (int) strlen(printable) - : 1); + cache->list[inx + 1] = (printable + ? (int) strlen(printable) + : 1); } if (inx != 0) - cache.list[inx + 1] += cache.list[inx]; + cache->list[inx + 1] += cache->list[inx]; } } - save_cache(&cache, string); } - return cache.list; + return cache->list; } /* @@ -478,6 +488,7 @@ dlg_count_columns(const char *string) } else { result = (int) strlen(string); } + dlg_finish_string(string); return result; } @@ -732,22 +743,59 @@ dlg_show_string(WINDOW *win, } } +/* + * Discard cached data for the given string. + */ +void +dlg_finish_string(const char *string) +{ +#if USE_CACHING + if ((string != 0) && dialog_state.finish_string) { + CACHE *p = cache_list; + CACHE *q = 0; + CACHE *r; + + while (p != 0) { + if (p->string_at == string) { +#ifdef HAVE_TSEARCH + if (tdelete(p, &sorted_cache, compare_cache) == 0) { + continue; + } + trace_cache(__FILE__, __LINE__); +#endif + if (p->string != 0) + free(p->string); + if (p->list != 0) + free(p->list); + if (p == cache_list) { + cache_list = p->next; + r = cache_list; + } else { + q->next = p->next; + r = q; + } + free(p); + p = r; + } else { + q = p; + p = p->next; + } + } + } +#else + (void) string; +#endif +} + #ifdef NO_LEAKS void _dlg_inputstr_leaks(void) { #if USE_CACHING + dialog_state.finish_string = TRUE; + trace_cache(__FILE__, __LINE__); while (cache_list != 0) { - CACHE *next = cache_list->next; -#ifdef HAVE_TSEARCH - tdelete(cache_list, &sorted_cache, compare_cache); -#endif - if (cache_list->string != 0) - free(cache_list->string); - if (cache_list->list != 0) - free(cache_list->list); - free(cache_list); - cache_list = next; + dlg_finish_string(cache_list->string_at); } #endif /* USE_CACHING */ } diff --git a/contrib/dialog/makefile.in b/contrib/dialog/makefile.in index 65664dd..3357d91 100644 --- a/contrib/dialog/makefile.in +++ b/contrib/dialog/makefile.in @@ -1,7 +1,7 @@ -# $Id: makefile.in,v 1.83 2012/10/06 14:05:14 tom Exp $ +# $Id: makefile.in,v 1.87 2013/09/02 19:51:58 tom Exp $ # template makefile for DIALOG ############################################################################## -# Copyright (c) 1999-2011,2012 Thomas E. Dickey # +# Copyright (c) 1999-2012,2013 Thomas E. Dickey # # # # Permission is hereby granted, free of charge, to any person obtaining a # # copy of this software and associated documentation files (the "Software"), # @@ -41,10 +41,24 @@ top_builddir = . x = @EXEEXT@ o = .@OBJEXT@ -a = @LIB_SUFFIX@ DESTDIR = +THIS = dialog + +CFG_ROOTNAME = @CFG_ROOTNAME@ +HDR_ROOTNAME = @HDR_ROOTNAME@ +LIB_ROOTNAME = @LIB_ROOTNAME@ +LIB_SUFFIX = @LIB_SUFFIX@ + +VERSION_MAJOR = @VERSION_MAJOR@ +VERSION_MINOR = @VERSION_MINOR@ +VERSION = $(VERSION_MAJOR).$(VERSION_MINOR) +REL_VERSION = @REL_VERSION@ +ABI_VERSION = @ABI_VERSION@ +LIB_ROOTNAME = @LIB_ROOTNAME@ +@SET_SHLIB_VARS@ + bindir = @bindir@ includedir = @includedir@ libdir = @libdir@ @@ -72,6 +86,7 @@ LIBS = @LIBS@ @INTLLIBS@ RANLIB = @LIB_PREP@ RM = rm -f +LN_S = @LN_S@ LINT = @LINT@ LINT_OPTS = @LINT_OPTS@ @@ -99,11 +114,11 @@ LINK = $(LIBTOOL_LINK) # renamed at install time, starting with the package name. PACKAGE = @PACKAGE@ ACTUAL_PROG = `echo $(PACKAGE) |sed @program_transform_name@` -LIB_CONFIG = @PACKAGE@-config +LIB_CONFIG = $(CFG_ROOTNAME)-config # The library name $(LIB) is set at configure/make time, since it is used as a # makefile target. Ditto for $(PROG). -LIB = @LIB_PREFIX@@PACKAGE@$a +LIB = @LIB_TARGET@ PROG = @PACKAGE@$x # # Standard .c to .o compile line. @@ -117,7 +132,7 @@ PROG = @PACKAGE@$x @ECHO_CC@$(LIBTOOL_COMPILE) $(CC) $(CFLAGS) $(EXTRA_CFLAGS) $(CPPFLAGS) -c $< .1.html : - GROFF_NO_SGR=stupid $(SHELL) -c "tbl $< | groff -Thtml -man" >$@ + GROFF_NO_SGR=stupid $(SHELL) -c "tbl $< | groff -P -o0 -I$*_ -Thtml -man" >$@ .1.ps : $(SHELL) -c "tbl $< | groff -man" >$@ @@ -178,10 +193,6 @@ all :: $(ALL) dialog$o \ $(OBJECTS) : $(srcdir)/dialog.h $(srcdir)/dlg_keys.h dlg_config.h VERSION -$(LIB) : $(LIB_OBJECT) - $(LIBTOOL_CREATE) $(LIB) $(LIB_OBJECT) - $(RANLIB) $@ - $(PROG)$x : $(LIB) dialog$o @INTLDIR_MAKE@ @INTLLIBS@ $(LINK) -o $@ dialog$o -L. -l@PACKAGE@ $(LDFLAGS) $(LIBS) diff --git a/contrib/dialog/menubox.c b/contrib/dialog/menubox.c index 3117443..518393e 100644 --- a/contrib/dialog/menubox.c +++ b/contrib/dialog/menubox.c @@ -1,9 +1,9 @@ /* - * $Id: menubox.c,v 1.145 2012/12/30 21:11:02 tom Exp $ + * $Id: menubox.c,v 1.148 2013/09/02 17:15:13 tom Exp $ * * menubox.c -- implements the menu box * - * Copyright 2000-2011,2012 Thomas E. Dickey + * Copyright 2000-2012,2013 Thomas E. Dickey * * This program is free software; you can redistribute it and/or modify * it under the terms of the GNU Lesser General Public Licens, version 2.1e @@ -191,19 +191,16 @@ input_menu_edit(ALL_DATA * data, static int handle_button(int code, DIALOG_LISTITEM * items, int choice) { + char *help_result; + switch (code) { case DLG_EXIT_OK: /* FALLTHRU */ case DLG_EXIT_EXTRA: dlg_add_string(items[choice].name); break; case DLG_EXIT_HELP: - dlg_add_result("HELP "); - if (USE_ITEM_HELP(items[choice].help)) { - dlg_add_string(items[choice].help); - code = DLG_EXIT_ITEM_HELP; - } else { - dlg_add_string(items[choice].name); - } + dlg_add_help_listitem(&code, &help_result, &items[choice]); + dlg_add_string(help_result); break; } return code; diff --git a/contrib/dialog/mixedform.c b/contrib/dialog/mixedform.c index 1f18b2f..3da422f 100644 --- a/contrib/dialog/mixedform.c +++ b/contrib/dialog/mixedform.c @@ -1,5 +1,5 @@ /* - * $Id: mixedform.c,v 1.10 2013/03/17 15:03:41 tom Exp $ + * $Id: mixedform.c,v 1.12 2013/09/02 17:02:05 tom Exp $ * * mixedform.c -- implements the mixed form (i.e, typed pairs label/editbox) * @@ -54,6 +54,7 @@ dialog_mixedform(const char *title, DIALOG_FORMITEM *listitems; DIALOG_VARS save_vars; bool show_status = FALSE; + char *help_result; dlg_save_vars(&save_vars); dialog_vars.separate_output = TRUE; @@ -93,14 +94,9 @@ dialog_mixedform(const char *title, show_status = TRUE; break; case DLG_EXIT_HELP: - dlg_add_result("HELP "); + dlg_add_help_formitem(&result, &help_result, &listitems[choice]); show_status = dialog_vars.help_status; - if (USE_ITEM_HELP(listitems[choice].help)) { - dlg_add_string(listitems[choice].help); - result = DLG_EXIT_ITEM_HELP; - } else { - dlg_add_string(listitems[choice].name); - } + dlg_add_string(help_result); if (show_status) dlg_add_separator(); break; diff --git a/contrib/dialog/package/debian/changelog b/contrib/dialog/package/debian/changelog index 7c0de2a..ed1303c 100644 --- a/contrib/dialog/package/debian/changelog +++ b/contrib/dialog/package/debian/changelog @@ -1,3 +1,15 @@ +cdialog (20130923) unstable; urgency=low + + * improved memory-caching for gauge widget + + -- Thomas E. Dickey <dickey@invisible-island.net> Sat, 21 Sep 2013 09:18:26 -0400 + +cdialog (20130902) unstable; urgency=low + + * maintenance updates + + -- Thomas E. Dickey <dickey@invisible-island.net> Sun, 01 Sep 2013 19:08:31 -0400 + cdialog (20130523) unstable; urgency=low * minor fixes diff --git a/contrib/dialog/package/debian/copyright b/contrib/dialog/package/debian/copyright index 64da700..d76cf1a 100644 --- a/contrib/dialog/package/debian/copyright +++ b/contrib/dialog/package/debian/copyright @@ -4,7 +4,7 @@ Current dialog upstream maintainer: Thomas Dickey <dickey@invisible-island.net> ------------------------------------------------------------------------------- Files: *.c *.h - Copyright 2000-2008,2010 Thomas E. Dickey + Copyright 2000-2012,2013 Thomas E. Dickey This program is free software; you can redistribute it and/or modify it under the terms of the GNU Lesser General Public License, version 2.1 @@ -27,7 +27,7 @@ Files: *.c *.h Files: aclocal.m4 Licence: other-BSD -Copyright: 1999-2009,2010 by Thomas E. Dickey +Copyright: 1999-2010,2013 by Thomas E. Dickey Permission is hereby granted, free of charge, to any person obtaining a copy of this software and associated documentation files (the "Software"), to deal in the Software without restriction, including @@ -88,7 +88,7 @@ Licence: other-BSD shared with many OS's install programs. Files: debian/* -Copyright: 2010 Thomas E. Dickey +Copyright: 2010-2012,2013 Thomas E. Dickey Licence: other-BSD Permission to use, copy, modify, and distribute this software and its documentation for any purpose and without fee is hereby granted, diff --git a/contrib/dialog/package/dialog.spec b/contrib/dialog/package/dialog.spec index 07ec131..8743a6a 100644 --- a/contrib/dialog/package/dialog.spec +++ b/contrib/dialog/package/dialog.spec @@ -1,9 +1,9 @@ Summary: dialog - display dialog boxes from shell scripts %define AppProgram dialog %define AppVersion 1.2 -%define AppRelease 20130523 +%define AppRelease 20130923 %define ActualProg c%{AppProgram} -# $XTermId: dialog.spec,v 1.50 2013/05/24 00:13:31 tom Exp $ +# $XTermId: dialog.spec,v 1.54 2013/09/23 23:08:24 tom Exp $ Name: %{ActualProg} Version: %{AppVersion} Release: %{AppRelease} diff --git a/contrib/dialog/package/freebsd/Makefile b/contrib/dialog/package/freebsd/Makefile new file mode 100644 index 0000000..c9a9dcc --- /dev/null +++ b/contrib/dialog/package/freebsd/Makefile @@ -0,0 +1,48 @@ +# New ports collection makefile for: ncdialog +# Date created: 2003-01-11 +# Whom: AlanE <alane@freebsd.org> +# +# $Carpetsmoker: ports/cdialog/Makefile,v 1.4 2007/04/22 11:30:53 carpetsmoker Exp $ +# $FreeBSD$ +# + +PORTNAME= cdialog +PORTVERSION= 1.2.20130923 +PORTEPOCH= 1 +CATEGORIES= devel +MASTER_SITES= ftp://invisible-island.net/${PORTNAME:S|^c||}/ +DISTNAME= ${PORTNAME:S|^c||}-${PORTVERSION:R}-${PORTVERSION:E} +EXTRACT_SUFX= .tgz + +MAINTAINER= sylvio@FreeBSD.org +COMMENT= An enhanced version of 'dialog' to work with ncurses + +LICENSE= LGPL21 + +USE_AUTOTOOLS= libtool +GNU_CONFIGURE= yes +USE_LDCONFIG= yes +CONFIGURE_ARGS= --enable-widec \ + --includedir=${PREFIX}/include/${PORTNAME} \ + --with-libtool \ + --with-ncursesw \ + --with-package=${PORTNAME} +MAKEFILE= makefile + +MAN1= cdialog.1 +MAN3= cdialog.3 +MANCOMPRESSED= no + +INSTALL_TARGET= install-strip install-man install-lib + +.if !defined(NOPORTEXAMPLES) +post-patch: + @${FIND} ${WRKSRC}/samples/ -type f -exec ${REINPLACE_CMD} -i "" "s|dialog|cdialog|g" {} \; + +post-install: + @${MKDIR} ${EXAMPLESDIR} + cd ${WRKSRC}/samples && ${FIND} . | \ + ${CPIO} -pdm -L -R ${SHAREOWN}:${SHAREGRP} ${EXAMPLESDIR} +.endif + +.include <bsd.port.mk> diff --git a/contrib/dialog/package/freebsd/distinfo b/contrib/dialog/package/freebsd/distinfo new file mode 100644 index 0000000..b9531ea --- /dev/null +++ b/contrib/dialog/package/freebsd/distinfo @@ -0,0 +1,2 @@ +SHA256 (dialog-1.1-20120215.tgz) = 883c58498663d939b18f3aea56976b64268b736d1579ac850512e5d5a4a2eafc +SIZE (dialog-1.1-20120215.tgz) = 441234 diff --git a/contrib/dialog/package/freebsd/pkg-descr b/contrib/dialog/package/freebsd/pkg-descr new file mode 100644 index 0000000..a23bfba --- /dev/null +++ b/contrib/dialog/package/freebsd/pkg-descr @@ -0,0 +1,9 @@ +This is an enhanced version of the 'dialog' command. Quoting Thomas Dickey, +the ncurses developer, "DIALOG was written by Savio Lam <lam836@cs.cuhk.hk> +and modified by several people. + +"Initially, I made fixes and reviewed the code to ensure that problems +reported were not related to ncurses. After that, I resumed development, +adding new widget types. See the changelog for details." + +WWW: http://invisible-island.net/dialog/ diff --git a/contrib/dialog/package/freebsd/pkg-plist b/contrib/dialog/package/freebsd/pkg-plist new file mode 100644 index 0000000..097d58b --- /dev/null +++ b/contrib/dialog/package/freebsd/pkg-plist @@ -0,0 +1,203 @@ +bin/cdialog +bin/cdialog-config +include/cdialog/dialog.h +include/cdialog/dlg_colors.h +include/cdialog/dlg_config.h +include/cdialog/dlg_keys.h +lib/libcdialog.a +lib/libcdialog.la +lib/libcdialog.so +lib/libcdialog.so.10 +%%PORTEXAMPLES%%%%EXAMPLESDIR%%/README +%%PORTEXAMPLES%%%%EXAMPLESDIR%%/calendar +%%PORTEXAMPLES%%%%EXAMPLESDIR%%/calendar-stdout +%%PORTEXAMPLES%%%%EXAMPLESDIR%%/calendar2 +%%PORTEXAMPLES%%%%EXAMPLESDIR%%/calendar2-stdout +%%PORTEXAMPLES%%%%EXAMPLESDIR%%/calendar3 +%%PORTEXAMPLES%%%%EXAMPLESDIR%%/calendar3-stdout +%%PORTEXAMPLES%%%%EXAMPLESDIR%%/checklist +%%PORTEXAMPLES%%%%EXAMPLESDIR%%/checklist-8bit +%%PORTEXAMPLES%%%%EXAMPLESDIR%%/checklist-utf8 +%%PORTEXAMPLES%%%%EXAMPLESDIR%%/checklist1 +%%PORTEXAMPLES%%%%EXAMPLESDIR%%/checklist10 +%%PORTEXAMPLES%%%%EXAMPLESDIR%%/checklist11 +%%PORTEXAMPLES%%%%EXAMPLESDIR%%/checklist2 +%%PORTEXAMPLES%%%%EXAMPLESDIR%%/checklist3 +%%PORTEXAMPLES%%%%EXAMPLESDIR%%/checklist4 +%%PORTEXAMPLES%%%%EXAMPLESDIR%%/checklist5 +%%PORTEXAMPLES%%%%EXAMPLESDIR%%/checklist6 +%%PORTEXAMPLES%%%%EXAMPLESDIR%%/checklist7 +%%PORTEXAMPLES%%%%EXAMPLESDIR%%/checklist8 +%%PORTEXAMPLES%%%%EXAMPLESDIR%%/checklist9 +%%PORTEXAMPLES%%%%EXAMPLESDIR%%/checklist9.txt +%%PORTEXAMPLES%%%%EXAMPLESDIR%%/copifuncs/admin.funcs +%%PORTEXAMPLES%%%%EXAMPLESDIR%%/copifuncs/common.funcs +%%PORTEXAMPLES%%%%EXAMPLESDIR%%/copifuncs/copi.funcs +%%PORTEXAMPLES%%%%EXAMPLESDIR%%/copifuncs/copi.ifman1 +%%PORTEXAMPLES%%%%EXAMPLESDIR%%/copifuncs/copi.ifman2 +%%PORTEXAMPLES%%%%EXAMPLESDIR%%/copifuncs/copi.ifmcfg2 +%%PORTEXAMPLES%%%%EXAMPLESDIR%%/copifuncs/copi.ifmcfg4 +%%PORTEXAMPLES%%%%EXAMPLESDIR%%/copifuncs/copi.ifmcfg5 +%%PORTEXAMPLES%%%%EXAMPLESDIR%%/copifuncs/copi.ifpoll1 +%%PORTEXAMPLES%%%%EXAMPLESDIR%%/copifuncs/copi.ifpoll2 +%%PORTEXAMPLES%%%%EXAMPLESDIR%%/copifuncs/copi.ifreq1 +%%PORTEXAMPLES%%%%EXAMPLESDIR%%/copifuncs/copi.ifreq2 +%%PORTEXAMPLES%%%%EXAMPLESDIR%%/copifuncs/copi.rcnews +%%PORTEXAMPLES%%%%EXAMPLESDIR%%/copifuncs/copi.sendifm1 +%%PORTEXAMPLES%%%%EXAMPLESDIR%%/copifuncs/copi.sendifm2 +%%PORTEXAMPLES%%%%EXAMPLESDIR%%/copifuncs/copi.trnrc +%%PORTEXAMPLES%%%%EXAMPLESDIR%%/copifuncs/copi.wheel +%%PORTEXAMPLES%%%%EXAMPLESDIR%%/copifuncs/ifpatch +%%PORTEXAMPLES%%%%EXAMPLESDIR%%/copismall +%%PORTEXAMPLES%%%%EXAMPLESDIR%%/debian.rc +%%PORTEXAMPLES%%%%EXAMPLESDIR%%/dialog.py +%%PORTEXAMPLES%%%%EXAMPLESDIR%%/editbox +%%PORTEXAMPLES%%%%EXAMPLESDIR%%/editbox-utf8 +%%PORTEXAMPLES%%%%EXAMPLESDIR%%/editbox2 +%%PORTEXAMPLES%%%%EXAMPLESDIR%%/editbox3 +%%PORTEXAMPLES%%%%EXAMPLESDIR%%/editbox4 +%%PORTEXAMPLES%%%%EXAMPLESDIR%%/form1 +%%PORTEXAMPLES%%%%EXAMPLESDIR%%/form1-both +%%PORTEXAMPLES%%%%EXAMPLESDIR%%/form1-extra +%%PORTEXAMPLES%%%%EXAMPLESDIR%%/form1-help +%%PORTEXAMPLES%%%%EXAMPLESDIR%%/form1-utf8 +%%PORTEXAMPLES%%%%EXAMPLESDIR%%/form2 +%%PORTEXAMPLES%%%%EXAMPLESDIR%%/form3 +%%PORTEXAMPLES%%%%EXAMPLESDIR%%/form4 +%%PORTEXAMPLES%%%%EXAMPLESDIR%%/form5 +%%PORTEXAMPLES%%%%EXAMPLESDIR%%/form6 +%%PORTEXAMPLES%%%%EXAMPLESDIR%%/fselect +%%PORTEXAMPLES%%%%EXAMPLESDIR%%/fselect-stdout +%%PORTEXAMPLES%%%%EXAMPLESDIR%%/fselect0 +%%PORTEXAMPLES%%%%EXAMPLESDIR%%/fselect1 +%%PORTEXAMPLES%%%%EXAMPLESDIR%%/fselect1-stdout +%%PORTEXAMPLES%%%%EXAMPLESDIR%%/fselect2 +%%PORTEXAMPLES%%%%EXAMPLESDIR%%/fselect2-stdout +%%PORTEXAMPLES%%%%EXAMPLESDIR%%/gauge +%%PORTEXAMPLES%%%%EXAMPLESDIR%%/gauge0 +%%PORTEXAMPLES%%%%EXAMPLESDIR%%/gauge0-input-fd +%%PORTEXAMPLES%%%%EXAMPLESDIR%%/gauge2 +%%PORTEXAMPLES%%%%EXAMPLESDIR%%/infobox +%%PORTEXAMPLES%%%%EXAMPLESDIR%%/infobox1 +%%PORTEXAMPLES%%%%EXAMPLESDIR%%/infobox2 +%%PORTEXAMPLES%%%%EXAMPLESDIR%%/infobox3 +%%PORTEXAMPLES%%%%EXAMPLESDIR%%/infobox4 +%%PORTEXAMPLES%%%%EXAMPLESDIR%%/infobox5 +%%PORTEXAMPLES%%%%EXAMPLESDIR%%/infobox6 +%%PORTEXAMPLES%%%%EXAMPLESDIR%%/inputbox +%%PORTEXAMPLES%%%%EXAMPLESDIR%%/inputbox-both +%%PORTEXAMPLES%%%%EXAMPLESDIR%%/inputbox-extra +%%PORTEXAMPLES%%%%EXAMPLESDIR%%/inputbox-help +%%PORTEXAMPLES%%%%EXAMPLESDIR%%/inputbox1 +%%PORTEXAMPLES%%%%EXAMPLESDIR%%/inputbox2 +%%PORTEXAMPLES%%%%EXAMPLESDIR%%/inputbox3 +%%PORTEXAMPLES%%%%EXAMPLESDIR%%/inputbox4 +%%PORTEXAMPLES%%%%EXAMPLESDIR%%/inputbox5 +%%PORTEXAMPLES%%%%EXAMPLESDIR%%/inputbox6-8bit +%%PORTEXAMPLES%%%%EXAMPLESDIR%%/inputbox6-utf8 +%%PORTEXAMPLES%%%%EXAMPLESDIR%%/inputbox7 +%%PORTEXAMPLES%%%%EXAMPLESDIR%%/inputmenu +%%PORTEXAMPLES%%%%EXAMPLESDIR%%/inputmenu-stdout +%%PORTEXAMPLES%%%%EXAMPLESDIR%%/inputmenu1 +%%PORTEXAMPLES%%%%EXAMPLESDIR%%/inputmenu2 +%%PORTEXAMPLES%%%%EXAMPLESDIR%%/inputmenu3 +%%PORTEXAMPLES%%%%EXAMPLESDIR%%/inputmenu4 +%%PORTEXAMPLES%%%%EXAMPLESDIR%%/install/FDISK.TEST +%%PORTEXAMPLES%%%%EXAMPLESDIR%%/install/makefile +%%PORTEXAMPLES%%%%EXAMPLESDIR%%/install/makefile.in +%%PORTEXAMPLES%%%%EXAMPLESDIR%%/install/setup.c +%%PORTEXAMPLES%%%%EXAMPLESDIR%%/install/setup.help +%%PORTEXAMPLES%%%%EXAMPLESDIR%%/killall +%%PORTEXAMPLES%%%%EXAMPLESDIR%%/listing +%%PORTEXAMPLES%%%%EXAMPLESDIR%%/menubox +%%PORTEXAMPLES%%%%EXAMPLESDIR%%/menubox-8bit +%%PORTEXAMPLES%%%%EXAMPLESDIR%%/menubox-utf8 +%%PORTEXAMPLES%%%%EXAMPLESDIR%%/menubox1 +%%PORTEXAMPLES%%%%EXAMPLESDIR%%/menubox10 +%%PORTEXAMPLES%%%%EXAMPLESDIR%%/menubox2 +%%PORTEXAMPLES%%%%EXAMPLESDIR%%/menubox3 +%%PORTEXAMPLES%%%%EXAMPLESDIR%%/menubox4 +%%PORTEXAMPLES%%%%EXAMPLESDIR%%/menubox5 +%%PORTEXAMPLES%%%%EXAMPLESDIR%%/menubox6 +%%PORTEXAMPLES%%%%EXAMPLESDIR%%/menubox7 +%%PORTEXAMPLES%%%%EXAMPLESDIR%%/menubox8 +%%PORTEXAMPLES%%%%EXAMPLESDIR%%/menubox9 +%%PORTEXAMPLES%%%%EXAMPLESDIR%%/mixedform +%%PORTEXAMPLES%%%%EXAMPLESDIR%%/mixedform2 +%%PORTEXAMPLES%%%%EXAMPLESDIR%%/mixedgauge +%%PORTEXAMPLES%%%%EXAMPLESDIR%%/msgbox +%%PORTEXAMPLES%%%%EXAMPLESDIR%%/msgbox-help +%%PORTEXAMPLES%%%%EXAMPLESDIR%%/msgbox-utf8 +%%PORTEXAMPLES%%%%EXAMPLESDIR%%/msgbox1 +%%PORTEXAMPLES%%%%EXAMPLESDIR%%/msgbox2 +%%PORTEXAMPLES%%%%EXAMPLESDIR%%/msgbox3 +%%PORTEXAMPLES%%%%EXAMPLESDIR%%/msgbox4-8bit +%%PORTEXAMPLES%%%%EXAMPLESDIR%%/msgbox4-eucjp +%%PORTEXAMPLES%%%%EXAMPLESDIR%%/msgbox4-utf8 +%%PORTEXAMPLES%%%%EXAMPLESDIR%%/msgbox5 +%%PORTEXAMPLES%%%%EXAMPLESDIR%%/msgbox6 +%%PORTEXAMPLES%%%%EXAMPLESDIR%%/msgbox6a +%%PORTEXAMPLES%%%%EXAMPLESDIR%%/password +%%PORTEXAMPLES%%%%EXAMPLESDIR%%/password1 +%%PORTEXAMPLES%%%%EXAMPLESDIR%%/password2 +%%PORTEXAMPLES%%%%EXAMPLESDIR%%/passwordform1 +%%PORTEXAMPLES%%%%EXAMPLESDIR%%/passwordform1-utf8 +%%PORTEXAMPLES%%%%EXAMPLESDIR%%/pause +%%PORTEXAMPLES%%%%EXAMPLESDIR%%/pause-both +%%PORTEXAMPLES%%%%EXAMPLESDIR%%/pause-extra +%%PORTEXAMPLES%%%%EXAMPLESDIR%%/pause-help +%%PORTEXAMPLES%%%%EXAMPLESDIR%%/prgbox +%%PORTEXAMPLES%%%%EXAMPLESDIR%%/prgbox2 +%%PORTEXAMPLES%%%%EXAMPLESDIR%%/programbox +%%PORTEXAMPLES%%%%EXAMPLESDIR%%/programbox2 +%%PORTEXAMPLES%%%%EXAMPLESDIR%%/progress +%%PORTEXAMPLES%%%%EXAMPLESDIR%%/progress2 +%%PORTEXAMPLES%%%%EXAMPLESDIR%%/radiolist +%%PORTEXAMPLES%%%%EXAMPLESDIR%%/radiolist1 +%%PORTEXAMPLES%%%%EXAMPLESDIR%%/radiolist10 +%%PORTEXAMPLES%%%%EXAMPLESDIR%%/radiolist2 +%%PORTEXAMPLES%%%%EXAMPLESDIR%%/radiolist3 +%%PORTEXAMPLES%%%%EXAMPLESDIR%%/radiolist4 +%%PORTEXAMPLES%%%%EXAMPLESDIR%%/report-button +%%PORTEXAMPLES%%%%EXAMPLESDIR%%/report-edit +%%PORTEXAMPLES%%%%EXAMPLESDIR%%/report-string +%%PORTEXAMPLES%%%%EXAMPLESDIR%%/report-tempfile +%%PORTEXAMPLES%%%%EXAMPLESDIR%%/report-yesno +%%PORTEXAMPLES%%%%EXAMPLESDIR%%/rotated-data +%%PORTEXAMPLES%%%%EXAMPLESDIR%%/setup-edit +%%PORTEXAMPLES%%%%EXAMPLESDIR%%/setup-tempfile +%%PORTEXAMPLES%%%%EXAMPLESDIR%%/setup-utf8 +%%PORTEXAMPLES%%%%EXAMPLESDIR%%/setup-vars +%%PORTEXAMPLES%%%%EXAMPLESDIR%%/shortlist +%%PORTEXAMPLES%%%%EXAMPLESDIR%%/slackware.rc +%%PORTEXAMPLES%%%%EXAMPLESDIR%%/sourcemage.rc +%%PORTEXAMPLES%%%%EXAMPLESDIR%%/suse.rc +%%PORTEXAMPLES%%%%EXAMPLESDIR%%/tailbox +%%PORTEXAMPLES%%%%EXAMPLESDIR%%/tailboxbg +%%PORTEXAMPLES%%%%EXAMPLESDIR%%/tailboxbg1 +%%PORTEXAMPLES%%%%EXAMPLESDIR%%/tailboxbg2 +%%PORTEXAMPLES%%%%EXAMPLESDIR%%/testdata-8bit +%%PORTEXAMPLES%%%%EXAMPLESDIR%%/textbox +%%PORTEXAMPLES%%%%EXAMPLESDIR%%/textbox-both +%%PORTEXAMPLES%%%%EXAMPLESDIR%%/textbox-help +%%PORTEXAMPLES%%%%EXAMPLESDIR%%/textbox.txt +%%PORTEXAMPLES%%%%EXAMPLESDIR%%/textbox2 +%%PORTEXAMPLES%%%%EXAMPLESDIR%%/textbox3 +%%PORTEXAMPLES%%%%EXAMPLESDIR%%/timebox +%%PORTEXAMPLES%%%%EXAMPLESDIR%%/timebox-stdout +%%PORTEXAMPLES%%%%EXAMPLESDIR%%/timebox2 +%%PORTEXAMPLES%%%%EXAMPLESDIR%%/timebox2-stdout +%%PORTEXAMPLES%%%%EXAMPLESDIR%%/wheel +%%PORTEXAMPLES%%%%EXAMPLESDIR%%/whiptail.rc +%%PORTEXAMPLES%%%%EXAMPLESDIR%%/yesno +%%PORTEXAMPLES%%%%EXAMPLESDIR%%/yesno-both +%%PORTEXAMPLES%%%%EXAMPLESDIR%%/yesno-extra +%%PORTEXAMPLES%%%%EXAMPLESDIR%%/yesno-help +%%PORTEXAMPLES%%%%EXAMPLESDIR%%/yesno-utf8 +%%PORTEXAMPLES%%%%EXAMPLESDIR%%/yesno2 +%%PORTEXAMPLES%%%%EXAMPLESDIR%%/yesno3 +%%PORTEXAMPLES%%%%EXAMPLESDIR%%/yesno4 +%%PORTEXAMPLES%%@dirrm %%EXAMPLESDIR%%/install +%%PORTEXAMPLES%%@dirrm %%EXAMPLESDIR%%/copifuncs +%%PORTEXAMPLES%%@dirrm %%EXAMPLESDIR%% +@dirrm include/cdialog diff --git a/contrib/dialog/po/fa.po b/contrib/dialog/po/fa.po new file mode 100644 index 0000000..9be8d8b --- /dev/null +++ b/contrib/dialog/po/fa.po @@ -0,0 +1,113 @@ +# Dialog +# Copyright 2003-2007,2008 # Thomas Dickey +# This file is distributed under the same license as the dialog package. +# +# Seyed Ali Akbar Najafian <s.ali.najafian@chmail.ir>, 2012. +msgid "" +msgstr "" +"Project-Id-Version: dialog 1.1.20080819\n" +"Report-Msgid-Bugs-To: \n" +"POT-Creation-Date: 2008-06-18 18:26-0400\n" +"PO-Revision-Date: 2013-08-03 17:04+0330\n" +"Last-Translator: سیدعلیاکبر نجفیان <s.ali.najafian@chmail.ir>\n" +"Language-Team: Persian <translation-team-fa@lists.sourceforge.net>\n" +"Language: persian\n" +"MIME-Version: 1.0\n" +"Content-Type: text/plain; charset=UTF-8\n" +"Content-Transfer-Encoding: 8bit\n" +"X-Generator: Poedit 1.5.4\n" + +#: buttons.c:385 +#, fuzzy +msgid "Yes" +msgstr "بله" + +#: buttons.c:393 +msgid "No" +msgstr "خیر" + +#: buttons.c:401 +msgid "OK" +msgstr "باشه" + +#: buttons.c:409 +msgid "Cancel" +msgstr "لغو" + +#: buttons.c:417 +msgid "EXIT" +msgstr "خروج" + +#: buttons.c:425 +msgid "Extra" +msgstr "اضافس" + +#: buttons.c:433 +msgid "Help" +msgstr "راهنما" + +#. Headline "Month" +#: calendar.c:273 +msgid "Month" +msgstr "ماه" + +#. Headline "Year" +#: calendar.c:293 +msgid "Year" +msgstr "سال" + +#: dialog.c:741 +msgid "Rename" +msgstr "تغییر نام" + +#: fselect.c:550 +msgid "Directories" +msgstr "مسیرها" + +#: fselect.c:551 +msgid "Files" +msgstr "پروندهها" + +#: mixedgauge.c:58 +msgid "Succeeded" +msgstr "موفقیت آمیز" + +#: mixedgauge.c:61 +msgid "Failed" +msgstr "شکست خورد" + +#: mixedgauge.c:64 +msgid "Passed" +msgstr "متوقف شد" + +#: mixedgauge.c:67 +msgid "Completed" +msgstr "کامل شد" + +#: mixedgauge.c:70 +msgid "Checked" +msgstr "بررسی شد" + +#: mixedgauge.c:73 +msgid "Done" +msgstr "انجام شد" + +#: mixedgauge.c:76 +msgid "Skipped" +msgstr "رها شد" + +#: mixedgauge.c:79 +msgid "In Progress" +msgstr "در حال پیشرفت" + +#: mixedgauge.c:85 +msgid "N/A" +msgstr "N/A" + +#: mixedgauge.c:193 +msgid "Overall Progress" +msgstr "پیشرفت جاری" + +#: textbox.c:489 +msgid "Search" +msgstr "جستجو" diff --git a/contrib/dialog/po/lt.po b/contrib/dialog/po/lt.po index c4e8168..c98299a 100644 --- a/contrib/dialog/po/lt.po +++ b/contrib/dialog/po/lt.po @@ -1,79 +1,79 @@ -# translation of dialog-1.1.20070704 to Lithuanian +# translation of dialog to Lithuanian # This file is distributed under the same license as the dialog package. -# # Gintautas Miliauskas <gintas@akl.lt>, 2008. +# Rimas Kudelis <rq@akl.lt>, 2013. msgid "" msgstr "" -"Project-Id-Version: dialog-1.1.20070704\n" +"Project-Id-Version: dialog-1.1.20080819\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2011-01-16 17:57-0500\n" -"PO-Revision-Date: 2008-05-14 02:51+0300\n" -"Last-Translator: Gintautas Miliauskas <gintas@akl.lt>\n" +"POT-Creation-Date: 2008-06-18 18:26-0400\n" +"PO-Revision-Date: 2013-06-28 18:38+0300\n" +"Last-Translator: Rimas Kudelis <rq@akl.lt>\n" "Language-Team: Lithuanian <komp_lt@konferencijos.lt>\n" "Language: lt\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" -"X-Generator: KBabel 1.11.4\n" -"Plural-Forms: nplurals=3; plural=(n%10==1 && n%100!=11 ? 0 : n%10>=2 && (n%100<10 || n%100>=20) ? 1 : 2);\n" +"Plural-Forms: nplurals=3; plural=(n%10==1 && n%100!=11 ? 0 : n%10>=2 && (n%100<10 || n%100>=20) ? 1 : 2);\n" +"X-Generator: Virtaal 0.7.1\n" -#: buttons.c:387 +#: buttons.c:385 msgid "Yes" msgstr "Taip" -#: buttons.c:395 +#: buttons.c:393 msgid "No" msgstr "Ne" -#: buttons.c:403 +#: buttons.c:401 msgid "OK" -msgstr "OK" +msgstr "Gerai" -#: buttons.c:411 +#: buttons.c:409 msgid "Cancel" -msgstr "Atmesti" +msgstr "Atsisakyti" -#: buttons.c:419 +#: buttons.c:417 msgid "EXIT" msgstr "IŠEITI" -#: buttons.c:427 +#: buttons.c:425 msgid "Extra" -msgstr "Papildoma" +msgstr "Kita" -#: buttons.c:435 +#: buttons.c:433 msgid "Help" msgstr "Žinynas" #. Headline "Month" -#: calendar.c:298 +#: calendar.c:273 msgid "Month" msgstr "Mėnuo" #. Headline "Year" -#: calendar.c:318 +#: calendar.c:293 msgid "Year" msgstr "Metai" -#: dialog.c:756 +#: dialog.c:741 msgid "Rename" msgstr "Pervadinti" -#: fselect.c:571 +#: fselect.c:550 msgid "Directories" msgstr "Aplankai" -#: fselect.c:572 +#: fselect.c:551 msgid "Files" msgstr "Failai" #: mixedgauge.c:58 msgid "Succeeded" -msgstr "Sėkminga" +msgstr "Pavyko" #: mixedgauge.c:61 msgid "Failed" -msgstr "Nesėkminga" +msgstr "Nepavyko" #: mixedgauge.c:64 msgid "Passed" @@ -81,7 +81,7 @@ msgstr "Praėjo" #: mixedgauge.c:67 msgid "Completed" -msgstr "Baigta" +msgstr "Užbaigta" #: mixedgauge.c:70 msgid "Checked" @@ -89,11 +89,11 @@ msgstr "Patikrinta" #: mixedgauge.c:73 msgid "Done" -msgstr "Baigta" +msgstr "Atlikta" #: mixedgauge.c:76 msgid "Skipped" -msgstr "Peršokta" +msgstr "Praleista" #: mixedgauge.c:79 msgid "In Progress" @@ -101,12 +101,12 @@ msgstr "Vykdoma" #: mixedgauge.c:85 msgid "N/A" -msgstr "N/d" +msgstr "Nepasiekiama" #: mixedgauge.c:193 msgid "Overall Progress" msgstr "Bendras progresas" -#: textbox.c:468 +#: textbox.c:489 msgid "Search" msgstr "Ieškoti" diff --git a/contrib/dialog/samples/inputbox6-utf8 b/contrib/dialog/samples/inputbox6-utf8 index 605382f2..056757e 100755 --- a/contrib/dialog/samples/inputbox6-utf8 +++ b/contrib/dialog/samples/inputbox6-utf8 @@ -1,5 +1,5 @@ #!/bin/sh -# $Id: inputbox6-utf8,v 1.8 2010/01/13 10:20:03 tom Exp $ +# $Id: inputbox6-utf8,v 1.9 2013/09/24 00:06:02 tom Exp $ . ./setup-vars @@ -7,10 +7,11 @@ . ./setup-utf8 +TITLE="あいうえお" + $DIALOG \ ---title `printf "\xe3\x81\x82\xe3\x81\x84\xe3\x81\x86\xe3\x81\x88\xe3\x81\x8a"` "$@" \ ---inputbox `printf "\xe3\x81\x82\xe3\x81\x84\xe3\x81\x86\xe3\x81\x88\xe3\x81\x8a"` \ -10 20 "Ｄ.Ｏ.Ｇ" 2>$tempfile +--title "$TITLE" "$@" \ +--inputbox "$TITLE" 10 20 "Ｄ.Ｏ.Ｇ" 2>$tempfile retval=$? diff --git a/contrib/dialog/samples/report-tempfile b/contrib/dialog/samples/report-tempfile index 32c04e0..4c5f099 100644 --- a/contrib/dialog/samples/report-tempfile +++ b/contrib/dialog/samples/report-tempfile @@ -1,5 +1,5 @@ #!/bin/sh -# $Id: report-tempfile,v 1.4 2012/06/29 09:29:47 tom Exp $ +# $Id: report-tempfile,v 1.5 2013/09/02 18:03:13 tom Exp $ # Report results in a temporary-file. # vile:shmode @@ -9,11 +9,11 @@ case $retval in $DIALOG_CANCEL) echo "Cancel pressed.";; $DIALOG_HELP) - echo "Help pressed.";; + echo "Help pressed: `cat $tempfile`";; $DIALOG_EXTRA) echo "Extra button pressed.";; $DIALOG_ITEM_HELP) - echo "Item-help button pressed.";; + echo "Item-help button pressed: `cat $tempfile`";; $DIALOG_ESC) if test -s $tempfile ; then cat $tempfile diff --git a/contrib/dialog/treeview.c b/contrib/dialog/treeview.c index a373519..3e57d18 100644 --- a/contrib/dialog/treeview.c +++ b/contrib/dialog/treeview.c @@ -1,5 +1,5 @@ /* - * $Id: treeview.c,v 1.22 2013/05/23 23:35:46 tom Exp $ + * $Id: treeview.c,v 1.24 2013/09/02 17:13:33 tom Exp $ * * treeview.c -- implements the treeview dialog * @@ -579,6 +579,7 @@ dialog_treeview(const char *title, int *depths; bool show_status = FALSE; int current = 0; + char *help_result; listitems = dlg_calloc(DIALOG_LISTITEM, (size_t) item_no + 1); assert_ptr(listitems, "dialog_treeview"); @@ -617,31 +618,16 @@ dialog_treeview(const char *title, show_status = TRUE; break; case DLG_EXIT_HELP: - dlg_add_result("HELP "); - show_status = dialog_vars.help_status; - if (USE_ITEM_HELP(listitems[current].help)) { - if (show_status) { - if (dialog_vars.separate_output) { - dlg_add_string(listitems[current].help); - dlg_add_separator(); - } else { - dlg_add_quoted(listitems[current].help); - } + dlg_add_help_listitem(&result, &help_result, &listitems[current]); + if ((show_status = dialog_vars.help_status)) { + if (dialog_vars.separate_output) { + dlg_add_string(help_result); + dlg_add_separator(); } else { - dlg_add_string(listitems[current].help); + dlg_add_quoted(help_result); } - result = DLG_EXIT_ITEM_HELP; } else { - if (show_status) { - if (dialog_vars.separate_output) { - dlg_add_string(listitems[current].name); - dlg_add_separator(); - } else { - dlg_add_quoted(listitems[current].name); - } - } else { - dlg_add_string(listitems[current].name); - } + dlg_add_string(help_result); } break; } diff --git a/contrib/dialog/util.c b/contrib/dialog/util.c index ddd3246..73a05a9 100644 --- a/contrib/dialog/util.c +++ b/contrib/dialog/util.c @@ -1,5 +1,5 @@ /* - * $Id: util.c,v 1.255 2013/05/23 22:58:28 tom Exp $ + * $Id: util.c,v 1.258 2013/09/22 00:41:40 tom Exp $ * * util.c -- miscellaneous utilities for dialog * @@ -589,18 +589,21 @@ end_dialog(void) int dlg_count_real_columns(const char *text) { - int result = dlg_count_columns(text); - if (result && dialog_vars.colors) { - int hidden = 0; - while (*text) { - if (dialog_vars.colors && isOurEscape(text)) { - hidden += ESCAPE_LEN; - text += ESCAPE_LEN; - } else { - ++text; + int result = 0; + if (*text) { + result = dlg_count_columns(text); + if (result && dialog_vars.colors) { + int hidden = 0; + while (*text) { + if (dialog_vars.colors && isOurEscape(text)) { + hidden += ESCAPE_LEN; + text += ESCAPE_LEN; + } else { + ++text; + } } + result -= hidden; } - result -= hidden; } return result; } @@ -924,6 +927,7 @@ dlg_print_line(WINDOW *win, test_ptr++; if (*test_ptr == '\n') test_ptr++; + dlg_finish_string(prompt); return (test_ptr); } @@ -1989,6 +1993,7 @@ dlg_draw_title(WINDOW *win, const char *title) wmove(win, 0, x); dlg_print_text(win, title, getmaxx(win) - x, &attr); (void) wattrset(win, save); + dlg_finish_string(title); } } @@ -2552,6 +2557,32 @@ dlg_add_separator(void) dlg_add_result(separator); } +#define HELP_PREFIX "HELP " + +void +dlg_add_help_listitem(int *result, char **tag, DIALOG_LISTITEM * item) +{ + dlg_add_result(HELP_PREFIX); + if (USE_ITEM_HELP(item->help)) { + *tag = dialog_vars.help_tags ? item->name : item->help; + *result = DLG_EXIT_ITEM_HELP; + } else { + *tag = item->name; + } +} + +void +dlg_add_help_formitem(int *result, char **tag, DIALOG_FORMITEM * item) +{ + dlg_add_result(HELP_PREFIX); + if (USE_ITEM_HELP(item->help)) { + *tag = dialog_vars.help_tags ? item->name : item->help; + *result = DLG_EXIT_ITEM_HELP; + } else { + *tag = item->name; + } +} + /* * Some widgets support only one value of a given variable - save/restore the * global dialog_vars so we can override it consistently. diff --git a/gnu/lib/libdialog/dlg_config.h b/gnu/lib/libdialog/dlg_config.h index ccb4c30..715b7fb 100644 --- a/gnu/lib/libdialog/dlg_config.h +++ b/gnu/lib/libdialog/dlg_config.h @@ -7,7 +7,7 @@ #define CURSES_WACS_ARRAY _nc_wacs #define CURSES_WACS_SYMBOLS 1 -#define DIALOG_PATCHDATE 20130523 +#define DIALOG_PATCHDATE 20130923 #define DIALOG_VERSION "1.2" #define HAVE_ALLOCA 1 #define HAVE_BTOWC 1 |
