diff options
Diffstat (limited to 'Ada95')
32 files changed, 3852 insertions, 2316 deletions
diff --git a/Ada95/Makefile.in b/Ada95/Makefile.in index 8d78bbf4f19c..22b922e96ff1 100644 --- a/Ada95/Makefile.in +++ b/Ada95/Makefile.in @@ -1,6 +1,6 @@ -# $Id: Makefile.in,v 1.26 2021/01/23 20:34:50 tom Exp $ +# $Id: Makefile.in,v 1.30 2022/12/17 23:33:33 tom Exp $ ############################################################################## -# Copyright 2020,2021 Thomas E. Dickey # +# Copyright 2020-2021,2022 Thomas E. Dickey # # Copyright 1998-2010,2015 Free Software Foundation, Inc. # # # # Permission is hereby granted, free of charge, to any person obtaining a # @@ -31,17 +31,50 @@ # Author: Juergen Pfeifer, 1996 # # Version Control -# $Revision: 1.26 $ +# $Revision: 1.30 $ # SHELL = @SHELL@ VPATH = @srcdir@ THIS = Makefile +srcdir = @srcdir@ +prefix = @prefix@ +exec_prefix = @exec_prefix@ +bindir = @bindir@ +datarootdir = @datarootdir@ +datadir = @datadir@ +libdir = @libdir@ +libexecdir = @libexecdir@ +includedir = @includedir@ + +BINDIR = $(DESTDIR)$(bindir) +DATADIR = $(DESTDIR)$(datadir) +LIBDIR = $(DESTDIR)$(libdir) +LIBEXECDIR = $(DESTDIR)$(libexecdir) + SUBDIRS = @ADA_SUBDIRS@ +INSTALL = @INSTALL@ @INSTALL_OPT_O@ +INSTALL_SCRIPT = @INSTALL@ + TOP_MFLAGS = @cf_cv_makeflags@ DESTDIR="$(DESTDIR)" RPATH_LIST="$(RPATH_LIST)" @SET_MAKE@ +################################################################################ + +@MAKE_PHONY@.PHONY : all +@MAKE_PHONY@.PHONY : clean +@MAKE_PHONY@.PHONY : depend +@MAKE_PHONY@.PHONY : distclean +@MAKE_PHONY@.PHONY : install +@MAKE_PHONY@.PHONY : install.libs +@MAKE_PHONY@.PHONY : libs +@MAKE_PHONY@.PHONY : mostlyclean +@MAKE_PHONY@.PHONY : realclean +@MAKE_PHONY@.PHONY : sources +@MAKE_PHONY@.PHONY : uninstall +@MAKE_PHONY@.PHONY : uninstall.libs + all \ libs \ sources \ @@ -72,6 +105,12 @@ realclean :: -rm -f config.cache config.log config.status include/ncurses_cfg.h -rm -f Makefile +depend : + @ + +check : + @echo "The test-programs are interactive" + tags : @ diff --git a/Ada95/README b/Ada95/README index d014f3278f98..2e66625f9dc4 100644 --- a/Ada95/README +++ b/Ada95/README @@ -1,5 +1,5 @@ ------------------------------------------------------------------------------- --- Copyright 2020 Thomas E. Dickey -- +-- Copyright 2020,2021 Thomas E. Dickey -- -- Copyright 1998-2002,2003 Free Software Foundation, Inc. -- -- -- -- Permission is hereby granted, free of charge, to any person obtaining a -- @@ -29,6 +29,6 @@ -- Author: Juergen Pfeifer, 1996 -The documentation is provided in HTML format in the ./html +The documentation is provided in HTML format in the ./html subdirectory. The main document is named index.html diff --git a/Ada95/TODO b/Ada95/TODO index 122275f91189..10354952c41a 100644 --- a/Ada95/TODO +++ b/Ada95/TODO @@ -1,5 +1,5 @@ ------------------------------------------------------------------------------- --- Copyright 2020 Thomas E. Dickey -- +-- Copyright 2020,2021 Thomas E. Dickey -- -- Copyright 1998-1999,2006 Free Software Foundation, Inc. -- -- -- -- Permission is hereby granted, free of charge, to any person obtaining a -- @@ -26,7 +26,7 @@ -- sale, use or other dealings in this Software without prior written -- -- authorization. -- ------------------------------------------------------------------------------- --- $Id: TODO,v 1.6 2020/02/02 23:34:34 tom Exp $ +-- $Id: TODO,v 1.8 2021/09/01 23:22:33 tom Exp $ ------------------------------------------------------------------------------- -- Intensive testing @@ -36,12 +36,12 @@ Like most WEB pages: under continuous construction -- Style cleanup - + -- Alternate functions for procedures with out params Comfort purpose -- Sample program - Under continuous construction (and it's not a WEB page!!!) + Under continuous construction (and it is not a WEB page!!!) -- Make the binding objects a shared library They are rather large, so it would make sense, otherwise Ada95 diff --git a/Ada95/aclocal.m4 b/Ada95/aclocal.m4 index 703300c8a247..6fe1f946e7e6 100644 --- a/Ada95/aclocal.m4 +++ b/Ada95/aclocal.m4 @@ -1,5 +1,5 @@ dnl*************************************************************************** -dnl Copyright 2018-2020,2021 Thomas E. Dickey * +dnl Copyright 2018-2023,2024 Thomas E. Dickey * dnl Copyright 2010-2017,2018 Free Software Foundation, Inc. * dnl * dnl Permission is hereby granted, free of charge, to any person obtaining a * @@ -29,7 +29,7 @@ dnl*************************************************************************** dnl dnl Author: Thomas E. Dickey dnl -dnl $Id: aclocal.m4,v 1.171 2021/01/06 01:29:44 tom Exp $ +dnl $Id: aclocal.m4,v 1.210 2024/03/30 22:17:13 tom Exp $ dnl Macros used in NCURSES Ada95 auto-configuration script. dnl dnl These macros are maintained separately from NCURSES. The copyright on @@ -189,9 +189,9 @@ AC_SUBST(EXTRA_CPPFLAGS) ])dnl dnl --------------------------------------------------------------------------- -dnl CF_ADD_INCDIR version: 16 updated: 2020/12/31 20:19:42 +dnl CF_ADD_INCDIR version: 17 updated: 2021/09/04 06:35:04 dnl ------------- -dnl Add an include-directory to $CPPFLAGS. Don't add /usr/include, since it's +dnl Add an include-directory to $CPPFLAGS. Don't add /usr/include, since it is dnl redundant. We don't normally need to add -I/usr/local/include for gcc, dnl but old versions (and some misinstalled ones) need that. To make things dnl worse, gcc 3.x may give error messages if -I/usr/local/include is added to @@ -340,6 +340,25 @@ ifelse([$5],NONE,,[{ test -z "$5" || test "x$5" = xNONE || test "x$4" != "x$5"; } ])dnl dnl --------------------------------------------------------------------------- +dnl CF_APPEND_CFLAGS version: 3 updated: 2021/09/05 17:25:40 +dnl ---------------- +dnl Use CF_ADD_CFLAGS after first checking for potential redefinitions. +dnl $1 = flags to add +dnl $2 = if given makes this macro verbose. +define([CF_APPEND_CFLAGS], +[ +for cf_add_cflags in $1 +do + case "x$cf_add_cflags" in + (x-[[DU]]*) + CF_REMOVE_CFLAGS($cf_add_cflags,CFLAGS,[$2]) + CF_REMOVE_CFLAGS($cf_add_cflags,CPPFLAGS,[$2]) + ;; + esac + CF_ADD_CFLAGS([$cf_add_cflags],[$2]) +done +])dnl +dnl --------------------------------------------------------------------------- dnl CF_APPEND_TEXT version: 1 updated: 2017/02/25 18:58:55 dnl -------------- dnl use this macro for appending text without introducing an extra blank at @@ -458,7 +477,7 @@ fi AC_SUBST(ARFLAGS) ]) dnl --------------------------------------------------------------------------- -dnl CF_BUILD_CC version: 9 updated: 2021/01/02 09:31:20 +dnl CF_BUILD_CC version: 11 updated: 2022/12/04 15:40:08 dnl ----------- dnl If we're cross-compiling, allow the user to override the tools and their dnl options. The configure script is oriented toward identifying the host @@ -524,7 +543,32 @@ if test "$cross_compiling" = yes ; then : ${BUILD_CC:='${CC}'} - if { test "$BUILD_CC" = "$CC" || test "$BUILD_CC" = '${CC}'; } ; then + AC_MSG_CHECKING(if the build-compiler "$BUILD_CC" works) + + cf_save_crossed=$cross_compiling + cf_save_ac_link=$ac_link + cross_compiling=no + cf_build_cppflags=$BUILD_CPPFLAGS + test "$cf_build_cppflags" = "#" && cf_build_cppflags= + ac_link='$BUILD_CC -o "conftest$ac_exeext" $BUILD_CFLAGS $cf_build_cppflags $BUILD_LDFLAGS "conftest.$ac_ext" $BUILD_LIBS >&AS_MESSAGE_LOG_FD' + + AC_TRY_RUN([#include <stdio.h> + int main(int argc, char *argv[]) + { + ${cf_cv_main_return:-return}(argc < 0 || argv == 0 || argv[0] == 0); + } + ], + cf_ok_build_cc=yes, + cf_ok_build_cc=no, + cf_ok_build_cc=unknown) + + cross_compiling=$cf_save_crossed + ac_link=$cf_save_ac_link + + AC_MSG_RESULT($cf_ok_build_cc) + + if test "$cf_ok_build_cc" != yes + then AC_MSG_ERROR([Cross-build requires two compilers. Use --with-build-cc to specify the native compiler.]) fi @@ -550,7 +594,45 @@ AC_SUBST(BUILD_EXEEXT) AC_SUBST(BUILD_OBJEXT) ])dnl dnl --------------------------------------------------------------------------- -dnl CF_CC_ENV_FLAGS version: 10 updated: 2020/12/31 18:40:20 +dnl CF_C11_NORETURN version: 4 updated: 2023/02/18 17:41:25 +dnl --------------- +AC_DEFUN([CF_C11_NORETURN], +[ +AC_MSG_CHECKING(if you want to use C11 _Noreturn feature) +CF_ARG_ENABLE(stdnoreturn, + [ --enable-stdnoreturn enable C11 _Noreturn feature for diagnostics], + [enable_stdnoreturn=yes], + [enable_stdnoreturn=no]) +AC_MSG_RESULT($enable_stdnoreturn) + +if test $enable_stdnoreturn = yes; then +AC_CACHE_CHECK([for C11 _Noreturn feature], cf_cv_c11_noreturn, + [AC_TRY_COMPILE([ +$ac_includes_default +#include <stdnoreturn.h> +static _Noreturn void giveup(void) { exit(0); } + ], + [if (feof(stdin)) giveup()], + cf_cv_c11_noreturn=yes, + cf_cv_c11_noreturn=no) + ]) +else + cf_cv_c11_noreturn=no, +fi + +if test "$cf_cv_c11_noreturn" = yes; then + AC_DEFINE(HAVE_STDNORETURN_H, 1,[Define if <stdnoreturn.h> header is available and working]) + AC_DEFINE_UNQUOTED(STDC_NORETURN,_Noreturn,[Define if C11 _Noreturn keyword is supported]) + HAVE_STDNORETURN_H=1 +else + HAVE_STDNORETURN_H=0 +fi + +AC_SUBST(HAVE_STDNORETURN_H) +AC_SUBST(STDC_NORETURN) +])dnl +dnl --------------------------------------------------------------------------- +dnl CF_CC_ENV_FLAGS version: 11 updated: 2023/02/20 11:15:46 dnl --------------- dnl Check for user's environment-breakage by stuffing CFLAGS/CPPFLAGS content dnl into CC. This will not help with broken scripts that wrap the compiler @@ -591,7 +673,7 @@ case "$CC" in AC_MSG_WARN(your environment uses the CC variable to hold CFLAGS/CPPFLAGS options) # humor him... cf_prog=`echo "$CC" | sed -e 's/ / /g' -e 's/[[ ]]* / /g' -e 's/[[ ]]*[[ ]]-[[^ ]].*//'` - cf_flags=`echo "$CC" | ${AWK:-awk} -v prog="$cf_prog" '{ printf("%s", [substr]([$]0,1+length(prog))); }'` + cf_flags=`echo "$CC" | sed -e "s%^$cf_prog%%"` CC="$cf_prog" for cf_arg in $cf_flags do @@ -720,7 +802,38 @@ case "$cf_cv_gnat_version" in esac ]) dnl --------------------------------------------------------------------------- -dnl CF_CLANG_COMPILER version: 8 updated: 2021/01/01 13:31:04 +dnl CF_CHECK_LIBSSP version: 1 updated: 2021/10/30 10:40:19 +dnl --------------- +dnl Check if libssp is needed, e.g., to work around misconfigured libraries +dnl used in cross-compiling to MinGW. +AC_DEFUN([CF_CHECK_LIBSSP],[ +AC_CACHE_CHECK(if ssp library is needed,cf_cv_need_libssp,[ +AC_TRY_LINK([ +#include <sys/types.h> +#include <dirent.h> +],[ + DIR *dp = opendir("."); +],cf_cv_need_libssp=no,[ + cf_save_LIBS="$LIBS" + LIBS="$LIBS -lssp" + AC_TRY_LINK([ +#include <sys/types.h> +#include <dirent.h> + ],[ + DIR *dp = opendir("."); + ],cf_cv_need_libssp=yes, + cf_cv_need_libssp=maybe) + LIBS="$cf_save_LIBS" +])dnl +]) + +if test "x$cf_cv_need_libssp" = xyes +then + CF_ADD_LIB(ssp) +fi +])dnl +dnl --------------------------------------------------------------------------- +dnl CF_CLANG_COMPILER version: 9 updated: 2023/02/18 17:41:25 dnl ----------------- dnl Check if the given compiler is really clang. clang's C driver defines dnl __GNUC__ (fooling the configure script into setting $GCC to yes) but does @@ -742,7 +855,7 @@ if test "$ifelse([$1],,[$1],GCC)" = yes ; then AC_TRY_COMPILE([],[ #ifdef __clang__ #else -make an error +#error __clang__ is not defined #endif ],[ifelse([$2],,CLANG_COMPILER,[$2])=yes ],[]) @@ -788,7 +901,7 @@ if test "x$ifelse([$2],,CLANG_COMPILER,[$2])" = "xyes" ; then fi ]) dnl --------------------------------------------------------------------------- -dnl CF_CONST_X_STRING version: 6 updated: 2021/01/01 13:31:04 +dnl CF_CONST_X_STRING version: 8 updated: 2023/12/01 17:22:50 dnl ----------------- dnl The X11R4-X11R6 Xt specification uses an ambiguous String type for most dnl character-strings. @@ -818,11 +931,12 @@ AC_TRY_COMPILE( #include <stdlib.h> #include <X11/Intrinsic.h> ], -[String foo = malloc(1); (void)foo],[ +[String foo = malloc(1); free((void*)foo)],[ AC_CACHE_CHECK(for X11/Xt const-feature,cf_cv_const_x_string,[ AC_TRY_COMPILE( [ +#undef _CONST_X_STRING #define _CONST_X_STRING /* X11R7.8 (perhaps) */ #undef XTSTRINGDEFINES /* X11R5 and later */ #include <stdlib.h> @@ -848,7 +962,7 @@ esac ]) ])dnl dnl --------------------------------------------------------------------------- -dnl CF_CONST_X_STRING version: 6 updated: 2021/01/01 13:31:04 +dnl CF_CONST_X_STRING version: 8 updated: 2023/12/01 17:22:50 dnl ----------------- dnl The X11R4-X11R6 Xt specification uses an ambiguous String type for most dnl character-strings. @@ -878,11 +992,12 @@ AC_TRY_COMPILE( #include <stdlib.h> #include <X11/Intrinsic.h> ], -[String foo = malloc(1); (void)foo],[ +[String foo = malloc(1); free((void*)foo)],[ AC_CACHE_CHECK(for X11/Xt const-feature,cf_cv_const_x_string,[ AC_TRY_COMPILE( [ +#undef _CONST_X_STRING #define _CONST_X_STRING /* X11R7.8 (perhaps) */ #undef XTSTRINGDEFINES /* X11R5 and later */ #include <stdlib.h> @@ -908,7 +1023,7 @@ esac ]) ])dnl dnl --------------------------------------------------------------------------- -dnl CF_CURSES_HEADER version: 5 updated: 2015/04/23 20:35:30 +dnl CF_CURSES_HEADER version: 6 updated: 2022/12/02 20:06:52 dnl ---------------- dnl Find a "curses" header file, e.g,. "curses.h", or one of the more common dnl variations of ncurses' installs. @@ -922,7 +1037,7 @@ for cf_header in \ curses.h ifelse($1,,,[$1/curses.h]) ifelse($1,,[ncurses/ncurses.h ncurses/curses.h]) do AC_TRY_COMPILE([#include <${cf_header}>], - [initscr(); tgoto("?", 0,0)], + [initscr(); endwin()], [cf_cv_ncurses_header=$cf_header; break],[]) done ]) @@ -940,9 +1055,9 @@ dnl ---------- dnl "dirname" is not portable, so we fake it with a shell script. AC_DEFUN([CF_DIRNAME],[$1=`echo "$2" | sed -e 's%/[[^/]]*$%%'`])dnl dnl --------------------------------------------------------------------------- -dnl CF_DISABLE_ECHO version: 13 updated: 2015/04/18 08:56:57 +dnl CF_DISABLE_ECHO version: 14 updated: 2021/09/04 06:35:04 dnl --------------- -dnl You can always use "make -n" to see the actual options, but it's hard to +dnl You can always use "make -n" to see the actual options, but it is hard to dnl pick out/analyze warning messages when the compile-line is long. dnl dnl Sets: @@ -1240,7 +1355,7 @@ AC_DEFUN([CF_FIXUP_ADAFLAGS],[ AC_MSG_RESULT($ADAFLAGS) ])dnl dnl --------------------------------------------------------------------------- -dnl CF_FIX_WARNINGS version: 3 updated: 2020/12/31 18:40:20 +dnl CF_FIX_WARNINGS version: 4 updated: 2021/12/16 18:22:31 dnl --------------- dnl Warning flags do not belong in CFLAGS, CPPFLAGS, etc. Any of gcc's dnl "-Werror" flags can interfere with configure-checks. Those go into @@ -1252,11 +1367,13 @@ if test "$GCC" = yes || test "$GXX" = yes then case [$]$1 in (*-Werror=*) - CF_VERBOSE(repairing $1: [$]$1) cf_temp_flags= for cf_temp_scan in [$]$1 do case "x$cf_temp_scan" in + (x-Werror=format*) + CF_APPEND_TEXT(cf_temp_flags,$cf_temp_scan) + ;; (x-Werror=*) CF_APPEND_TEXT(EXTRA_CFLAGS,$cf_temp_scan) ;; @@ -1265,22 +1382,54 @@ then ;; esac done - $1="$cf_temp_flags" - CF_VERBOSE(... fixed [$]$1) - CF_VERBOSE(... extra $EXTRA_CFLAGS) + if test "x[$]$1" != "x$cf_temp_flags" + then + CF_VERBOSE(repairing $1: [$]$1) + $1="$cf_temp_flags" + CF_VERBOSE(... fixed [$]$1) + CF_VERBOSE(... extra $EXTRA_CFLAGS) + fi ;; esac fi AC_SUBST(EXTRA_CFLAGS) ])dnl dnl --------------------------------------------------------------------------- -dnl CF_GCC_ATTRIBUTES version: 23 updated: 2021/01/03 18:30:50 +dnl CF_FUNC_GETTIME version: 2 updated: 2023/02/25 08:45:56 +dnl --------------- +dnl Check for gettimeofday or clock_gettime. In 2023, the former is still more +dnl widely supported, but "deprecated" (2008), so we will use the latter if it +dnl is available, to reduce compiler warnings. +AC_DEFUN([CF_FUNC_GETTIME],[ +AC_CACHE_CHECK(for clock_gettime,cf_cv_func_clock_gettime,[ + AC_TRY_LINK([#include <time.h>], + [struct timespec ts; + int rc = clock_gettime(CLOCK_REALTIME, &ts); (void) rc; (void)ts], + [cf_cv_func_clock_gettime=yes], + [cf_cv_func_clock_gettime=no]) +]) + +if test "$cf_cv_func_clock_gettime" = yes +then + AC_DEFINE(HAVE_CLOCK_GETTIME,1,[Define to 1 if we have clock_gettime function]) +else +AC_CHECK_FUNC(gettimeofday, + AC_DEFINE(HAVE_GETTIMEOFDAY,1,[Define to 1 if we have gettimeofday function]),[ + +AC_CHECK_LIB(bsd, gettimeofday, + AC_DEFINE(HAVE_GETTIMEOFDAY,1,[Define to 1 if we have gettimeofday function]) + CF_ADD_LIB(bsd))])dnl CLIX: bzero, select, gettimeofday +fi +])dnl +dnl --------------------------------------------------------------------------- +dnl CF_GCC_ATTRIBUTES version: 24 updated: 2021/03/20 12:00:25 dnl ----------------- dnl Test for availability of useful gcc __attribute__ directives to quiet dnl compiler warnings. Though useful, not all are supported -- and contrary dnl to documentation, unrecognized directives cause older compilers to barf. AC_DEFUN([CF_GCC_ATTRIBUTES], [AC_REQUIRE([AC_PROG_FGREP])dnl +AC_REQUIRE([CF_C11_NORETURN])dnl if test "$GCC" = yes || test "$GXX" = yes then @@ -1303,6 +1452,7 @@ then AC_CHECKING([for $CC __attribute__ directives]) cat > "conftest.$ac_ext" <<EOF #line __oline__ "${as_me:-configure}" +#include <stdio.h> #include "confdefs.h" #include "conftest.h" #include "conftest.i" @@ -1317,8 +1467,8 @@ cat > "conftest.$ac_ext" <<EOF #define GCC_SCANFLIKE(fmt,var) /*nothing*/ #endif extern void wow(char *,...) GCC_SCANFLIKE(1,2); -extern void oops(char *,...) GCC_PRINTFLIKE(1,2) GCC_NORETURN; -extern void foo(void) GCC_NORETURN; +extern GCC_NORETURN void oops(char *,...) GCC_PRINTFLIKE(1,2); +extern GCC_NORETURN void foo(void); int main(int argc GCC_UNUSED, char *argv[[]] GCC_UNUSED) { (void)argc; (void)argv; return 0; } EOF cf_printf_attribute=no @@ -1385,7 +1535,7 @@ rm -rf ./conftest* fi ])dnl dnl --------------------------------------------------------------------------- -dnl CF_GCC_VERSION version: 8 updated: 2019/09/07 13:38:36 +dnl CF_GCC_VERSION version: 9 updated: 2023/03/05 14:30:13 dnl -------------- dnl Find version of gcc, and (because icc/clang pretend to be gcc without being dnl compatible), attempt to determine if icc/clang is actually used. @@ -1394,7 +1544,7 @@ AC_REQUIRE([AC_PROG_CC]) GCC_VERSION=none if test "$GCC" = yes ; then AC_MSG_CHECKING(version of $CC) - 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.]].*//'`" + GCC_VERSION="`${CC} --version 2>/dev/null | sed -e '2,$d' -e 's/^[[^(]]*([[^)]][[^)]]*) //' -e 's/^[[^0-9.]]*//' -e 's/[[^0-9.]].*//'`" test -z "$GCC_VERSION" && GCC_VERSION=unknown AC_MSG_RESULT($GCC_VERSION) fi @@ -1978,7 +2128,7 @@ CPPFLAGS="-I. $CPPFLAGS" AC_SUBST(CPPFLAGS) ])dnl dnl --------------------------------------------------------------------------- -dnl CF_INSTALL_OPTS version: 2 updated: 2018/08/18 12:19:21 +dnl CF_INSTALL_OPTS version: 3 updated: 2023/06/03 15:17:30 dnl --------------- dnl prompt for/fill-in useful install-program options AC_DEFUN([CF_INSTALL_OPTS], @@ -1986,6 +2136,7 @@ AC_DEFUN([CF_INSTALL_OPTS], CF_INSTALL_OPT_S CF_INSTALL_OPT_P CF_INSTALL_OPT_O +CF_INSTALL_OPT_STRIP_PROG ])dnl dnl --------------------------------------------------------------------------- dnl CF_INSTALL_OPT_O version: 3 updated: 2020/12/31 20:19:42 @@ -2072,7 +2223,73 @@ fi AC_SUBST(INSTALL_OPT_S) ])dnl dnl --------------------------------------------------------------------------- -dnl CF_INTEL_COMPILER version: 8 updated: 2021/01/01 16:53:59 +dnl CF_INSTALL_OPT_STRIP_PROG version: 1 updated: 2023/06/03 15:17:30 +dnl ------------------------- +dnl Provide an option for overriding the strip program used in install "-s" +dnl +dnl coreutils install provides a --strip-program option +dnl FreeBSD uses STRIPBIN environment variable, while NetBSD and OpenBSD use +dnl STRIP environment variable. Other versions of install do not support this. +AC_DEFUN([CF_INSTALL_OPT_STRIP_PROG], +[ +AC_REQUIRE([CF_INSTALL_OPT_S]) +if test -n "$INSTALL_OPT_S" +then + AC_MSG_CHECKING(if you want to specify strip-program) + AC_ARG_WITH(strip-program, + [ --with-strip-program=XX specify program to use when stripping in install], + [with_strip_program=$withval], + [with_strip_program=no]) + AC_MSG_RESULT($with_strip_program) + if test "$with_strip_program" != no + then + AC_MSG_CHECKING(if strip-program is supported with this installer) + cf_install_program=`echo "$INSTALL" | sed -e 's%[[ ]]*[[ ]]-.%%'` + check_install_strip=no + if test -f "$cf_install_program" + then + check_install_version=`"$cf_install_program" --version 2>/dev/null | head -n 1 | grep coreutils` + if test -n "$check_install_version" + then + check_install_strip="option" + else + for check_strip_variable in STRIPBIN STRIP + do + if strings "$cf_install_program" | grep "^$check_strip_variable[$]" >/dev/null + then + check_install_strip="environ" + break + fi + done + fi + fi + AC_MSG_RESULT($check_install_strip) + case "$check_install_strip" in + (no) + AC_MSG_WARN($cf_install_program does not support strip program option) + with_strip_program=no + ;; + (environ) + cat >install.tmp <<-CF_EOF + #! $SHELL + STRIPBIN="$with_strip_program" \\ + STRIP="$with_strip_program" \\ + $INSTALL "[$]@" + CF_EOF + INSTALL="`pwd`/install.tmp" + chmod +x "$INSTALL" + CF_VERBOSE(created $INSTALL) + ;; + (option) + INSTALL_OPT_S="$INSTALL_OPT_S --strip-program=\"$with_strip_program\"" + ;; + esac + fi +fi +AC_SUBST(INSTALL_OPT_S) +])dnl +dnl --------------------------------------------------------------------------- +dnl CF_INTEL_COMPILER version: 9 updated: 2023/02/18 17:41:25 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 @@ -2098,7 +2315,7 @@ if test "$ifelse([$1],,[$1],GCC)" = yes ; then AC_TRY_COMPILE([],[ #ifdef __INTEL_COMPILER #else -make an error +#error __INTEL_COMPILER is not defined #endif ],[ifelse([$2],,INTEL_COMPILER,[$2])=yes cf_save_CFLAGS="$cf_save_CFLAGS -we147" @@ -2110,7 +2327,7 @@ cf_save_CFLAGS="$cf_save_CFLAGS -we147" fi ])dnl dnl --------------------------------------------------------------------------- -dnl CF_LARGEFILE version: 12 updated: 2020/03/19 20:23:48 +dnl CF_LARGEFILE version: 13 updated: 2023/12/03 19:09:59 dnl ------------ dnl Add checks for large file support. AC_DEFUN([CF_LARGEFILE],[ @@ -2144,11 +2361,15 @@ ifdef([AC_FUNC_FSEEKO],[ #pragma GCC diagnostic error "-Wincompatible-pointer-types" #include <sys/types.h> #include <dirent.h> + +#ifndef __REDIRECT +/* if transitional largefile support is setup, this is true */ +extern struct dirent64 * readdir(DIR *); +#endif ],[ - /* if transitional largefile support is setup, this is true */ - extern struct dirent64 * readdir(DIR *); - struct dirent64 *x = readdir((DIR *)0); - struct dirent *y = readdir((DIR *)0); + DIR *dp = opendir("."); + struct dirent64 *x = readdir(dp); + struct dirent *y = readdir(dp); int z = x - y; (void)z; ], @@ -2379,7 +2600,7 @@ AC_DEFUN([CF_LIB_TYPE], test -n "$LIB_SUFFIX" && $2="${LIB_SUFFIX}[$]{$2}" ])dnl dnl --------------------------------------------------------------------------- -dnl CF_LINK_DATAONLY version: 13 updated: 2020/02/08 15:59:30 +dnl CF_LINK_DATAONLY version: 15 updated: 2023/12/03 10:03:10 dnl ---------------- dnl Some systems have a non-ANSI linker that doesn't pull in modules that have dnl only data (i.e., no functions), for example NeXT. On those systems we'll @@ -2401,17 +2622,21 @@ EOF rm -f conftest.$ac_ext data.o cat >conftest.$ac_ext <<EOF #line __oline__ "configure" +extern int testfunc(void); +#if defined(NeXT) int testfunc(void) { -#if defined(NeXT) ${cf_cv_main_return:-return}(1); /* I'm told this linker is broken */ +} #else - extern int testdata[[3]]; +extern int testdata[[3]]; +int testfunc(void) +{ return testdata[[0]] == 123 && testdata[[1]] == 456 && testdata[[2]] == 789; -#endif } +#endif EOF if AC_TRY_EVAL(ac_compile); then mv conftest.o func.o && \ @@ -2422,9 +2647,9 @@ EOF cf_saveLIBS="$LIBS" LIBS="conftest.a $LIBS" AC_TRY_RUN([ + extern int testfunc(void); int main(void) { - extern int testfunc(); ${cf_cv_main_return:-return} (!testfunc()); } ], @@ -2443,10 +2668,10 @@ AC_SUBST(BROKEN_LINKER) ])dnl dnl --------------------------------------------------------------------------- -dnl CF_MAKEFLAGS version: 20 updated: 2021/01/03 19:29:49 +dnl CF_MAKEFLAGS version: 21 updated: 2021/09/04 06:47:34 dnl ------------ dnl Some 'make' programs support ${MAKEFLAGS}, some ${MFLAGS}, to pass 'make' -dnl options to lower-levels. It's very useful for "make -n" -- if we have it. +dnl options to lower-levels. It is very useful for "make -n" -- if we have it. dnl (GNU 'make' does both, something POSIX 'make', which happens to make the dnl ${MAKEFLAGS} variable incompatible because it adds the assignments :-) AC_DEFUN([CF_MAKEFLAGS], @@ -2486,6 +2711,89 @@ CF_EOF AC_SUBST(cf_cv_makeflags) ])dnl dnl --------------------------------------------------------------------------- +dnl CF_MAKE_PHONY version: 3 updated: 2021/01/08 16:08:21 +dnl ------------- +dnl Check if the make-program handles a ".PHONY" target, e.g,. a target which +dnl acts as a placeholder. +dnl +dnl The ".PHONY" feature was proposed in 2011 here +dnl https://www.austingroupbugs.net/view.php?id=523 +dnl and is scheduled for release in P1003.1 Issue 8 (late 2022). +dnl +dnl This is not supported by SVr4 make (or SunOS 4, 4.3SD, etc), but works with +dnl a few others (i.e., GNU make and the non-POSIX "BSD" make): +dnl +dnl + This is a GNU make feature (since April 1988, but in turn from binutils, +dnl date unspecified). +dnl +dnl + It was adopted in NetBSD make in June 1995. +dnl +dnl + The other BSD make programs are derived from the NetBSD make (and for +dnl that reason are not actually different "implementations"). +dnl +dnl + Some features of NetBSD make were actually adapted from pmake, which +dnl began as a modified GNU make starting in 1993. +dnl +dnl + Version 3.8 of the dmake program in January 1992 also implemented this +dnl GNU make extension, but is less well known than the BSD make. +AC_DEFUN([CF_MAKE_PHONY],[ +AC_CACHE_CHECK(for \".PHONY\" make-support, cf_cv_make_PHONY,[ + rm -rf conftest* + ( + mkdir conftest || exit 1 + cd conftest + cat >makefile <<'CF_EOF' +.PHONY: always +DATA=0 +always: always.out + @echo "** making [$]@ [$](DATA)" +once: once.out + @echo "** making [$]@ [$](DATA)" +always.out: + @echo "** making [$]@ [$](DATA)" + echo [$](DATA) > [$]@ +once.out: + @echo "** making [$]@ [$](DATA)" + echo [$](DATA) > [$]@ +CF_EOF + for cf_data in 1 2 3 + do + ${MAKE:-make} always DATA=$cf_data + ${MAKE:-make} once DATA=$cf_data + ${MAKE:-make} -t always once + if test -f always ; then + echo "no (case 1)" > ../conftest.tmp + elif test ! -f always.out ; then + echo "no (case 2)" > ../conftest.tmp + elif test ! -f once.out ; then + echo "no (case 3)" > ../conftest.tmp + elif ! cmp -s always.out once.out ; then + echo "no (case 4)" > ../conftest.tmp + diff always.out once.out + else + cf_check="`cat always.out`" + if test "x$cf_check" != "x$cf_data" ; then + echo "no (case 5)" > ../conftest.tmp + else + echo yes > ../conftest.tmp + rm -f ./*.out + continue + fi + fi + break + done + ) >&AC_FD_CC 2>&1 + cf_cv_make_PHONY="`cat conftest.tmp`" + rm -rf conftest* +]) +MAKE_NO_PHONY="#" +MAKE_PHONY="#" +test "x$cf_cv_make_PHONY" = xyes && MAKE_PHONY= +test "x$cf_cv_make_PHONY" != xyes && MAKE_NO_PHONY= +AC_SUBST(MAKE_NO_PHONY) +AC_SUBST(MAKE_PHONY) +])dnl +dnl --------------------------------------------------------------------------- dnl CF_MAKE_TAGS version: 6 updated: 2010/10/23 15:52:32 dnl ------------ dnl Generate tags/TAGS targets for makefiles. Do not generate TAGS if we have @@ -2553,7 +2861,7 @@ fi test "$cf_cv_mixedcase" = yes && AC_DEFINE(MIXEDCASE_FILENAMES,1,[Define to 1 if filesystem supports mixed-case filenames.]) ])dnl dnl --------------------------------------------------------------------------- -dnl CF_MKSTEMP version: 11 updated: 2021/01/01 13:31:04 +dnl CF_MKSTEMP version: 13 updated: 2023/12/01 17:22:50 dnl ---------- dnl Check for a working mkstemp. This creates two files, checks that they are dnl successfully created and distinct (AmigaOS apparently fails on the last). @@ -2564,17 +2872,11 @@ unistd.h \ AC_CACHE_CHECK(for working mkstemp, cf_cv_func_mkstemp,[ rm -rf ./conftest* AC_TRY_RUN([ -#include <sys/types.h> -#ifdef HAVE_UNISTD_H -#include <unistd.h> -#endif -#include <stdlib.h> -#include <stdio.h> -#include <string.h> -#include <sys/stat.h> +$ac_includes_default + int main(void) { - char *tmpl = "conftestXXXXXX"; + static char tmpl[] = "conftestXXXXXX"; char name[2][80]; int n; int result = 0; @@ -2709,7 +3011,7 @@ AC_SUBST(cf_cv_type_of_bool)dnl ]) dnl --------------------------------------------------------------------------- -dnl CF_NCURSES_CC_CHECK version: 5 updated: 2020/12/31 20:19:42 +dnl CF_NCURSES_CC_CHECK version: 6 updated: 2023/02/18 17:47:58 dnl ------------------- dnl Check if we can compile with ncurses' header file dnl $1 is the cache variable to set @@ -2726,7 +3028,7 @@ AC_DEFUN([CF_NCURSES_CC_CHECK],[ #ifdef NCURSES_VERSION ]ifelse($3,ncursesw,[ #ifndef WACS_BSSB - make an error + #error WACS_BSSB is not defined #endif ])[ printf("%s\\n", NCURSES_VERSION); @@ -2734,7 +3036,7 @@ printf("%s\\n", NCURSES_VERSION); #ifdef __NCURSES_H printf("old\\n"); #else - make an error + #error __NCURSES_H is not defined #endif #endif ] @@ -2742,7 +3044,7 @@ printf("old\\n"); ,[$1=no]) ])dnl dnl --------------------------------------------------------------------------- -dnl CF_NCURSES_CONFIG version: 26 updated: 2021/01/03 08:05:37 +dnl CF_NCURSES_CONFIG version: 28 updated: 2021/08/28 15:20:37 dnl ----------------- dnl Tie together the configure-script macros for ncurses, preferring these in dnl order: @@ -2784,7 +3086,7 @@ if test "x${PKG_CONFIG:=none}" != xnone; then [initscr(); mousemask(0,0); tigetstr((char *)0);], [AC_TRY_RUN([#include <${cf_cv_ncurses_header:-curses.h}> int main(void) - { char *xx = curses_version(); return (xx == 0); }], + { const char *xx = curses_version(); return (xx == 0); }], [cf_test_ncuconfig=yes], [cf_test_ncuconfig=no], [cf_test_ncuconfig=maybe])], @@ -2803,14 +3105,14 @@ if test "x${PKG_CONFIG:=none}" != xnone; then ;; esac - CF_ADD_CFLAGS($cf_pkg_cflags) + CF_APPEND_CFLAGS($cf_pkg_cflags) CF_ADD_LIBS($cf_pkg_libs) AC_TRY_LINK([#include <${cf_cv_ncurses_header:-curses.h}>], [initscr(); mousemask(0,0); tigetstr((char *)0);], [AC_TRY_RUN([#include <${cf_cv_ncurses_header:-curses.h}> int main(void) - { char *xx = curses_version(); return (xx == 0); }], + { const char *xx = curses_version(); return (xx == 0); }], [cf_have_ncuconfig=yes], [cf_have_ncuconfig=no], [cf_have_ncuconfig=maybe])], @@ -2845,7 +3147,7 @@ if test "x$cf_have_ncuconfig" = "xno"; then if test "$NCURSES_CONFIG" != none ; then - CF_ADD_CFLAGS(`$NCURSES_CONFIG --cflags`) + CF_APPEND_CFLAGS(`$NCURSES_CONFIG --cflags`) CF_ADD_LIBS(`$NCURSES_CONFIG --libs`) # even with config script, some packages use no-override for curses.h @@ -2989,7 +3291,7 @@ esac ])dnl dnl --------------------------------------------------------------------------- -dnl CF_NCURSES_LIBS version: 20 updated: 2021/01/03 08:05:37 +dnl CF_NCURSES_LIBS version: 21 updated: 2021/09/04 06:37:12 dnl --------------- dnl Look for the ncurses library. This is a little complicated on Linux, dnl because it may be linked with the gpm (general purpose mouse) library. @@ -3018,7 +3320,7 @@ AC_CHECK_LIB(gpm,Gpm_Open, case "$host_os" in (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). + # version of ncurses (but it should do no harm, since it is static). if test "$cf_nculib_root" = ncurses ; then AC_CHECK_LIB(mytinfo,tgoto,[cf_ncurses_LIBS="-lmytinfo $cf_ncurses_LIBS"]) fi @@ -3057,7 +3359,7 @@ CF_UPPER(cf_nculib_ROOT,HAVE_LIB$cf_nculib_root) AC_DEFINE_UNQUOTED($cf_nculib_ROOT) ])dnl dnl --------------------------------------------------------------------------- -dnl CF_NCURSES_VERSION version: 16 updated: 2020/12/31 20:19:42 +dnl CF_NCURSES_VERSION version: 18 updated: 2024/01/07 06:34:16 dnl ------------------ dnl Check for the version of ncurses, to aid in reporting bugs, etc. dnl Call CF_CURSES_CPPFLAGS first, or CF_NCURSES_CPPFLAGS. We don't use @@ -3070,8 +3372,10 @@ AC_CACHE_CHECK(for ncurses version, cf_cv_ncurses_version,[ cf_tempfile=out$$ rm -f "$cf_tempfile" AC_TRY_RUN([ +$ac_includes_default + #include <${cf_cv_ncurses_header:-curses.h}> -#include <stdio.h> + int main(void) { FILE *fp = fopen("$cf_tempfile", "w"); @@ -3085,7 +3389,7 @@ int main(void) # ifdef __NCURSES_H fprintf(fp, "old\\n"); # else - make an error + #error expected ncurses header to define __NCURSES_H # endif #endif ${cf_cv_main_return:-return}(0); @@ -3192,14 +3496,16 @@ case ".[$]$1" in esac ])dnl dnl --------------------------------------------------------------------------- -dnl CF_PKG_CONFIG version: 11 updated: 2021/01/01 13:31:04 +dnl CF_PKG_CONFIG version: 13 updated: 2023/10/28 11:59:01 dnl ------------- dnl Check for the package-config program, unless disabled by command-line. +dnl +dnl Sets $PKG_CONFIG to the pathname of the pkg-config program. 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], + [[ --with-pkg-config[=CMD] enable/disable use of pkg-config and its name CMD]], [cf_pkg_config=$withval], [cf_pkg_config=yes]) AC_MSG_RESULT($cf_pkg_config) @@ -3228,7 +3534,7 @@ fi AC_SUBST(PKG_CONFIG) ])dnl dnl --------------------------------------------------------------------------- -dnl CF_POSIX_C_SOURCE version: 11 updated: 2018/12/31 20:46:17 +dnl CF_POSIX_C_SOURCE version: 12 updated: 2023/02/18 17:41:25 dnl ----------------- dnl Define _POSIX_C_SOURCE to the given level, and _POSIX_SOURCE if needed. dnl @@ -3259,7 +3565,7 @@ AC_CACHE_CHECK(if we should define _POSIX_C_SOURCE,cf_cv_posix_c_source,[ CF_MSG_LOG(if the symbol is already defined go no further) AC_TRY_COMPILE([#include <sys/types.h>],[ #ifndef _POSIX_C_SOURCE -make an error +#error _POSIX_C_SOURCE is not defined #endif], [cf_cv_posix_c_source=no], [cf_want_posix_source=no @@ -3278,7 +3584,7 @@ make an error if test "$cf_want_posix_source" = yes ; then AC_TRY_COMPILE([#include <sys/types.h>],[ #ifdef _POSIX_SOURCE -make an error +#error _POSIX_SOURCE is defined #endif],[], cf_cv_posix_c_source="$cf_cv_posix_c_source -D_POSIX_SOURCE") fi @@ -3289,7 +3595,7 @@ make an error CF_MSG_LOG(if the second compile does not leave our definition intact error) AC_TRY_COMPILE([#include <sys/types.h>],[ #ifndef _POSIX_C_SOURCE -make an error +#error _POSIX_C_SOURCE is not defined #endif],, [cf_cv_posix_c_source=no]) CFLAGS="$cf_save_CFLAGS" @@ -3593,6 +3899,24 @@ AC_MSG_RESULT($cf_prog_ln_sf) test "$cf_prog_ln_sf" = yes && LN_S="$LN_S -f" ])dnl dnl --------------------------------------------------------------------------- +dnl CF_REMOVE_CFLAGS version: 3 updated: 2021/09/05 17:25:40 +dnl ---------------- +dnl Remove a given option from CFLAGS/CPPFLAGS +dnl $1 = option to remove +dnl $2 = variable to update +dnl $3 = nonempty to allow verbose message +define([CF_REMOVE_CFLAGS], +[ +cf_tmp_cflag=`echo "x$1" | sed -e 's/^.//' -e 's/=.*//'` +while true +do + cf_old_cflag=`echo "x[$]$2" | sed -e 's/^.//' -e 's/[[ ]][[ ]]*-/ -/g' -e "s%$cf_tmp_cflag\\(=[[^ ]][[^ ]]*\\)\?%%" -e 's/^[[ ]]*//' -e 's%[[ ]][[ ]]*-D% -D%g' -e 's%[[ ]][[ ]]*-I% -I%g'` + test "[$]$2" != "$cf_old_cflag" || break + ifelse([$3],,,[CF_VERBOSE(removing old option $1 from $2)]) + $2="$cf_old_cflag" +done +])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 @@ -3659,7 +3983,7 @@ do done ])dnl dnl --------------------------------------------------------------------------- -dnl CF_SHARED_OPTS version: 105 updated: 2021/01/02 17:09:14 +dnl CF_SHARED_OPTS version: 111 updated: 2024/03/29 20:08:49 dnl -------------- dnl -------------- dnl Attempt to determine the appropriate CC/LD options for creating a shared @@ -3683,7 +4007,7 @@ 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. +dnl Some loaders leave 'so_locations' lying around. It is nice to clean up. AC_DEFUN([CF_SHARED_OPTS], [ AC_REQUIRE([CF_LD_RPATH_OPT]) @@ -3705,9 +4029,9 @@ AC_DEFUN([CF_SHARED_OPTS], 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_MSG_CHECKING(whether to use release or ABI version in shared library file names) AC_ARG_WITH(shlib-version, - [ --with-shlib-version=X Specify rel or abi version for shared libs], + [[ --with-shlib-version[={rel|abi}] use release or ABI version in shared library file names]], [test -z "$withval" && withval=auto case "$withval" in (yes) @@ -3749,7 +4073,7 @@ AC_DEFUN([CF_SHARED_OPTS], 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],[]) + AC_TRY_COMPILE([#include <stdio.h>],[int x = 1; (void)x],[break],[]) done AC_MSG_RESULT($CC_SHARED_OPTS) CFLAGS="$cf_save_CFLAGS" @@ -3830,6 +4154,10 @@ CF_EOF LDFLAGS="$LDFLAGS -Wl,-search_paths_first" fi ;; + (haiku*) + CF_SHARED_SONAME + MK_SHARED_LIB='${CC} ${LDFLAGS} ${CFLAGS} -shared -Wl,-soname,'$cf_cv_shared_soname',-stats,-lc -o $[@]' + ;; (hpux[[7-8]]*) # HP-UX 8.07 ld lacks "+b" option used for libdir search-list if test "$GCC" != yes; then @@ -4115,11 +4443,11 @@ CF_EOF # 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_LDFLAGS="-R\$(LOCAL_LIBDIR):\${libdir}" LOCAL_LDFLAGS2="$LOCAL_LDFLAGS" fi if test "$cf_cv_enable_rpath" = yes ; then - EXTRA_LDFLAGS="-R \${libdir} $EXTRA_LDFLAGS" + EXTRA_LDFLAGS="-R\${libdir} $EXTRA_LDFLAGS" fi CF_SHARED_SONAME if test "$GCC" != yes; then @@ -4131,9 +4459,9 @@ CF_EOF done CFLAGS="$cf_save_CFLAGS" CC_SHARED_OPTS=$cf_shared_opts - MK_SHARED_LIB='${CC} ${LDFLAGS} ${CFLAGS} -dy -G -h '$cf_cv_shared_soname' -o $[@]' + MK_SHARED_LIB='${CC} ${LDFLAGS} ${CFLAGS} -dy -G -Wl,-h,'$cf_cv_shared_soname' -o $[@]' else - MK_SHARED_LIB='${CC} ${LDFLAGS} ${CFLAGS} -shared -dy -G -h '$cf_cv_shared_soname' -o $[@]' + MK_SHARED_LIB='${CC} ${LDFLAGS} ${CFLAGS} -shared -dy -G -Wl,-h,'$cf_cv_shared_soname' -o $[@]' fi ;; (sysv5uw7*|unix_sv*) @@ -4320,34 +4648,20 @@ top_builddir=ifelse($1,,`pwd`,$1) AC_SUBST(top_builddir) ])dnl dnl --------------------------------------------------------------------------- -dnl CF_TRY_XOPEN_SOURCE version: 2 updated: 2018/06/20 20:23:13 +dnl CF_TRY_XOPEN_SOURCE version: 4 updated: 2022/09/10 15:16:16 dnl ------------------- dnl If _XOPEN_SOURCE is not defined in the compile environment, check if we dnl can define it successfully. AC_DEFUN([CF_TRY_XOPEN_SOURCE],[ AC_CACHE_CHECK(if we should define _XOPEN_SOURCE,cf_cv_xopen_source,[ - AC_TRY_COMPILE([ -#include <stdlib.h> -#include <string.h> -#include <sys/types.h> -],[ -#ifndef _XOPEN_SOURCE -make an error -#endif], + AC_TRY_COMPILE(CF__XOPEN_SOURCE_HEAD,CF__XOPEN_SOURCE_BODY, [cf_cv_xopen_source=no], [cf_save="$CPPFLAGS" CF_APPEND_TEXT(CPPFLAGS,-D_XOPEN_SOURCE=$cf_XOPEN_SOURCE) - AC_TRY_COMPILE([ -#include <stdlib.h> -#include <string.h> -#include <sys/types.h> -],[ -#ifdef _XOPEN_SOURCE -make an error -#endif], - [cf_cv_xopen_source=no], - [cf_cv_xopen_source=$cf_XOPEN_SOURCE]) - CPPFLAGS="$cf_save" + AC_TRY_COMPILE(CF__XOPEN_SOURCE_HEAD,CF__XOPEN_SOURCE_BODY, + [cf_cv_xopen_source=no], + [cf_cv_xopen_source=$cf_XOPEN_SOURCE]) + CPPFLAGS="$cf_save" ]) ]) @@ -4355,7 +4669,7 @@ if test "$cf_cv_xopen_source" != no ; then CF_REMOVE_DEFINE(CFLAGS,$CFLAGS,_XOPEN_SOURCE) CF_REMOVE_DEFINE(CPPFLAGS,$CPPFLAGS,_XOPEN_SOURCE) cf_temp_xopen_source="-D_XOPEN_SOURCE=$cf_cv_xopen_source" - CF_ADD_CFLAGS($cf_temp_xopen_source) + CF_APPEND_CFLAGS($cf_temp_xopen_source) fi ]) dnl --------------------------------------------------------------------------- @@ -4368,15 +4682,20 @@ AC_DEFUN([CF_UPPER], $1=`echo "$2" | sed y%abcdefghijklmnopqrstuvwxyz./-%ABCDEFGHIJKLMNOPQRSTUVWXYZ___%` ])dnl dnl --------------------------------------------------------------------------- -dnl CF_UTF8_LIB version: 8 updated: 2012/10/06 08:57:51 +dnl CF_UTF8_LIB version: 10 updated: 2023/01/11 04:05:23 dnl ----------- dnl Check for multibyte support, and if not found, utf8 compatibility library AC_DEFUN([CF_UTF8_LIB], [ +AC_HAVE_HEADERS(wchar.h) AC_CACHE_CHECK(for multibyte character support,cf_cv_utf8_lib,[ cf_save_LIBS="$LIBS" AC_TRY_LINK([ -#include <stdlib.h>],[putwc(0,0);], +$ac_includes_default +#ifdef HAVE_WCHAR_H +#include <wchar.h> +#endif +],[putwc(0,0);], [cf_cv_utf8_lib=yes], [CF_FIND_LINKAGE([ #include <libutf8.h>],[putwc(0,0);],utf8, @@ -4428,26 +4747,26 @@ weak_symbol(fopen); ]) ])dnl dnl --------------------------------------------------------------------------- -dnl CF_WITH_ADA_COMPILER version: 2 updated: 2010/06/26 17:35:58 +dnl CF_WITH_ADA_COMPILER version: 3 updated: 2023/10/28 11:59:01 dnl -------------------- dnl Command-line option to specify the Ada95 compiler. AC_DEFUN([CF_WITH_ADA_COMPILER],[ -AC_MSG_CHECKING(for ada-compiler) +AC_MSG_CHECKING(for Ada95 compiler) AC_ARG_WITH(ada-compiler, - [ --with-ada-compiler=CMD specify Ada95 compiler command (default gnatmake)], + [[ --with-ada-compiler[=CMD] use CMD as Ada95 compiler (default: gnatmake)]], [cf_ada_compiler=$withval], [cf_ada_compiler=gnatmake]) AC_SUBST(cf_ada_compiler) AC_MSG_RESULT($cf_ada_compiler) ])dnl dnl --------------------------------------------------------------------------- -dnl CF_WITH_ADA_INCLUDE version: 2 updated: 2010/06/26 17:35:58 +dnl CF_WITH_ADA_INCLUDE version: 3 updated: 2023/10/28 11:59:01 dnl ------------------- dnl Command-line option to specify where Ada includes will install. AC_DEFUN([CF_WITH_ADA_INCLUDE],[ -AC_MSG_CHECKING(for ada-include) +AC_MSG_CHECKING(for Ada95 include directory) CF_WITH_PATH(ada-include, - [ --with-ada-include=DIR Ada includes are in DIR], + [ --with-ada-include=DIR find Ada95 includes in DIR], ADA_INCLUDE, PREFIX/share/ada/adainclude, [$]prefix/share/ada/adainclude) @@ -4455,16 +4774,16 @@ AC_SUBST(ADA_INCLUDE) AC_MSG_RESULT($ADA_INCLUDE) ])dnl dnl --------------------------------------------------------------------------- -dnl CF_WITH_ADA_LIBNAME version: 1 updated: 2019/09/07 18:59:41 +dnl CF_WITH_ADA_LIBNAME version: 3 updated: 2023/11/22 20:48:30 dnl ------------------- dnl CF_WITH_ADA_LIBNAME dnl ------------------- dnl Command-line option to specify how to name the resulting Ada library. dnl $1 = default value AC_DEFUN([CF_WITH_ADA_LIBNAME],[ -AC_MSG_CHECKING(for ada-libname) +AC_MSG_CHECKING(for Ada95 curses library name) AC_ARG_WITH(ada-libname, - [ --with-ada-libname=XXX override default Ada library-name], + [[ --with-ada-libname[=XXX] use XXX as Ada95 library name]], ADA_LIBNAME=[$]withval, ADA_LIBNAME=$1) case "x$ADA_LIBNAME" in @@ -4476,13 +4795,13 @@ AC_SUBST(ADA_LIBNAME) AC_MSG_RESULT($ADA_LIBNAME) ])dnl dnl --------------------------------------------------------------------------- -dnl CF_WITH_ADA_OBJECTS version: 2 updated: 2010/06/26 17:35:58 +dnl CF_WITH_ADA_OBJECTS version: 3 updated: 2023/10/28 11:59:01 dnl ------------------- dnl Command-line option to specify where Ada objects will install. AC_DEFUN([CF_WITH_ADA_OBJECTS],[ -AC_MSG_CHECKING(for ada-objects) +AC_MSG_CHECKING(for Ada95 object directory) CF_WITH_PATH(ada-objects, - [ --with-ada-objects=DIR Ada objects are in DIR], + [ --with-ada-objects=DIR find Ada95 objects in DIR], ADA_OBJECTS, PREFIX/lib/ada/adalib, [$]prefix/lib/ada/adalib) @@ -4490,28 +4809,34 @@ AC_SUBST(ADA_OBJECTS) AC_MSG_RESULT($ADA_OBJECTS) ])dnl dnl --------------------------------------------------------------------------- -dnl CF_WITH_ADA_SHAREDLIB version: 5 updated: 2018/07/21 19:10:35 +dnl CF_WITH_ADA_SHAREDLIB version: 6 updated: 2023/10/28 11:59:01 dnl --------------------- -dnl Command-line option to specify if an Ada95 shared-library should be built, +dnl Command-line option to specify if an Ada95 shared library should be built, dnl and optionally what its soname should be. AC_DEFUN([CF_WITH_ADA_SHAREDLIB],[ AC_REQUIRE([CF_GNAT_PROJECTS]) -AC_MSG_CHECKING(if an Ada95 shared-library should be built) +AC_MSG_CHECKING(whether to build an Ada95 shared library) AC_ARG_WITH(ada-sharedlib, - [ --with-ada-sharedlib=soname build shared-library (requires GNAT projects)], + [ --with-ada-sharedlib build Ada95 shared library; requires GNAT project support], [with_ada_sharedlib=$withval], [with_ada_sharedlib=no]) -AC_MSG_RESULT($with_ada_sharedlib) +cf_ada_sharedlib_warn=no if test "x$with_ada_sharedlib" != xno then if test "x$cf_gnat_projects" != xyes then - AC_MSG_WARN(disabling shared-library since GNAT projects are not supported) with_ada_sharedlib=no + cf_ada_sharedlib_warn=yes fi fi +AC_MSG_RESULT($with_ada_sharedlib) +if test "x$cf_ada_sharedlib_warn" != xno +then + AC_MSG_WARN(disabling Ada95 shared library since GNAT projects are not supported) +fi + ADA_SHAREDLIB='lib$(LIB_NAME).so.1' MAKE_ADA_SHAREDLIB="#" @@ -4578,7 +4903,7 @@ else fi ])dnl dnl --------------------------------------------------------------------------- -dnl CF_WITH_PATH version: 11 updated: 2012/09/29 15:04:19 +dnl CF_WITH_PATH version: 12 updated: 2021/09/04 06:35:04 dnl ------------ dnl Wrapper for AC_ARG_WITH to ensure that user supplies a pathname, not just dnl defaulting to yes/no. @@ -4587,7 +4912,7 @@ dnl $1 = option name dnl $2 = help-text dnl $3 = environment variable to set dnl $4 = default value, shown in the help-message, must be a constant -dnl $5 = default value, if it's an expression & cannot be in the help-message +dnl $5 = default value, if it is an expression & cannot be in the help-message dnl AC_DEFUN([CF_WITH_PATH], [AC_ARG_WITH($1,[$2 ](default: ifelse([$4],,empty,[$4])),, @@ -4599,9 +4924,19 @@ eval $3="$withval" AC_SUBST($3)dnl ])dnl dnl --------------------------------------------------------------------------- -dnl CF_WITH_PKG_CONFIG_LIBDIR version: 11 updated: 2021/01/01 16:16:30 +dnl CF_WITH_PKG_CONFIG_LIBDIR version: 23 updated: 2023/11/22 20:48:30 dnl ------------------------- dnl Allow the choice of the pkg-config library directory to be overridden. +dnl +dnl pkg-config uses a search-list built from these colon-separated lists of +dnl directories: +dnl a) $PKG_CONFIG_PATH (tested first, added if set) +dnl b) $PKG_CONFIG_LIBDIR (tested second, added if set) +dnl c) builtin-list (added if $PKG_CONFIG_LIBDIR is not set) +dnl +dnl pkgconf (used with some systems such as FreeBSD in place of pkg-config) +dnl optionally ignores $PKG_CONFIG_LIBDIR. Very old versions of pkg-config, +dnl e.g., Solaris 10 also do not recognize $PKG_CONFIG_LIBDIR. AC_DEFUN([CF_WITH_PKG_CONFIG_LIBDIR],[ case "$PKG_CONFIG" in @@ -4613,68 +4948,119 @@ case "$PKG_CONFIG" in ;; esac -PKG_CONFIG_LIBDIR=no +# if $PKG_CONFIG_LIBDIR is set, try to use that +if test -n "$PKG_CONFIG_PATH"; then + cf_search_path=`echo "$PKG_CONFIG_PATH" | sed -e 's/:/ /g' -e 's,^[[ ]]*,,' -e 's,[[ ]]*$,,'` +elif test -n "$PKG_CONFIG_LIBDIR"; then + cf_search_path=`echo "$PKG_CONFIG_LIBDIR" | sed -e 's/:/ /g' -e 's,^[[ ]]*,,' -e 's,[[ ]]*$,,'` +else + cf_search_path=auto +fi + +# if the option is used, let that override. otherwise default to "libdir" AC_ARG_WITH(pkg-config-libdir, - [ --with-pkg-config-libdir=XXX use given directory for installing pc-files], - [PKG_CONFIG_LIBDIR=$withval], - [test "x$PKG_CONFIG" != xnone && PKG_CONFIG_LIBDIR=yes]) + [[ --with-pkg-config-libdir[=XXX] use given directory for installing pc-files]], + [cf_search_path=$withval], + [test "x$PKG_CONFIG" != xnone && test -z "$cf_search_path" && cf_search_path=libdir]) -case x$PKG_CONFIG_LIBDIR in +case "x$cf_search_path" in +(xlibdir) + PKG_CONFIG_LIBDIR='${libdir}/pkgconfig' + AC_MSG_RESULT($PKG_CONFIG_LIBDIR) + cf_search_path= + ;; +(x) + ;; +(x/*\ *) + PKG_CONFIG_LIBDIR= + ;; (x/*) + PKG_CONFIG_LIBDIR="$cf_search_path" + AC_MSG_RESULT($PKG_CONFIG_LIBDIR) + cf_search_path= ;; -(xyes) +(xyes|xauto) + AC_MSG_RESULT(auto) + cf_search_path= # Look for the library directory using the same prefix as the executable - if test "x$PKG_CONFIG" = xnone + AC_MSG_CHECKING(for search-list) + if test "x$PKG_CONFIG" != xnone then - cf_path=$prefix - else - cf_path=`echo "$PKG_CONFIG" | sed -e 's,/[[^/]]*/[[^/]]*$,,'` + # works for pkg-config since version 0.24 (2009) + # works for pkgconf since version 0.8.3 (2012) + for cf_pkg_program in \ + `echo "$PKG_CONFIG" | sed -e 's,^.*/,,'` \ + pkg-config \ + pkgconf + do + cf_search_path=`"$PKG_CONFIG" --variable=pc_path "$cf_pkg_program" 2>/dev/null | tr : ' '` + test -n "$cf_search_path" && break + done + + # works for pkg-config since import in 2005 of original 2001 HP code. + test -z "$cf_search_path" && \ + cf_search_path=` + "$PKG_CONFIG" --debug --exists no-such-package 2>&1 | $AWK "\ +/^Scanning directory (#[1-9][0-9]* )?'.*'$/{ \ + sub(\"^[[^']]*'\",\"\"); \ + sub(\"'.*\",\"\"); \ + printf \" %s\", \\[$]0; } \ +{ next; } \ +"` fi - # If you don't like using the default architecture, you have to specify the - # intended library directory and corresponding compiler/linker options. - # - # This case allows for Debian's 2014-flavor of multiarch, along with the - # most common variations before that point. Some other variants spell the - # directory differently, e.g., "pkg-config", and put it in unusual places. - # pkg-config has always been poorly standardized, which is ironic... - case x`(arch) 2>/dev/null` in - (*64) - cf_search_path="\ - $cf_path/lib/*64-linux-gnu \ - $cf_path/share \ - $cf_path/lib64 \ - $cf_path/lib32 \ - $cf_path/lib" - ;; - (*) - cf_search_path="\ - $cf_path/lib/*-linux-gnu \ - $cf_path/share \ - $cf_path/lib32 \ - $cf_path/lib \ - $cf_path/libdata" - ;; - esac + AC_MSG_RESULT($cf_search_path) + ;; +(*) + AC_MSG_ERROR(Unexpected option value: $cf_search_path) + ;; +esac - CF_VERBOSE(list...) +if test -n "$cf_search_path" +then + AC_MSG_CHECKING(for first directory) + cf_pkg_config_path=none for cf_config in $cf_search_path do - CF_VERBOSE(checking $cf_config/pkgconfig) - if test -d "$cf_config/pkgconfig" + if test -d "$cf_config" then - PKG_CONFIG_LIBDIR=$cf_config/pkgconfig - AC_MSG_CHECKING(done) + cf_pkg_config_path=$cf_config break fi done - ;; -(*) - ;; -esac + AC_MSG_RESULT($cf_pkg_config_path) -if test "x$PKG_CONFIG_LIBDIR" != xno ; then - AC_MSG_RESULT($PKG_CONFIG_LIBDIR) + if test "x$cf_pkg_config_path" != xnone ; then + # limit this to the first directory found + PKG_CONFIG_LIBDIR="$cf_pkg_config_path" + fi + + if test -z "$PKG_CONFIG_LIBDIR" && test -n "$cf_search_path" + then + AC_MSG_CHECKING(for workaround) + if test "$prefix" = "NONE" ; then + cf_prefix="$ac_default_prefix" + else + cf_prefix="$prefix" + fi + eval cf_libdir=$libdir + cf_libdir=`echo "$cf_libdir" | sed -e "s,^NONE,$cf_prefix,"` + cf_backup= + for cf_config in $cf_search_path + do + case $cf_config in + $cf_libdir/pkgconfig) + PKG_CONFIG_LIBDIR=$cf_libdir/pkgconfig + break + ;; + *) + test -z "$cf_backup" && cf_backup=$cf_config + ;; + esac + done + test -z "$PKG_CONFIG_LIBDIR" && PKG_CONFIG_LIBDIR=$cf_backup + AC_MSG_RESULT($PKG_CONFIG_LIBDIR) + fi fi AC_SUBST(PKG_CONFIG_LIBDIR) @@ -4742,7 +5128,7 @@ AC_ARG_WITH(system-type, ]) ])dnl dnl --------------------------------------------------------------------------- -dnl CF_XOPEN_SOURCE version: 57 updated: 2021/01/01 16:53:59 +dnl CF_XOPEN_SOURCE version: 67 updated: 2023/09/06 18:55:27 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, @@ -4751,6 +5137,18 @@ dnl dnl Parameters: dnl $1 is the nominal value for _XOPEN_SOURCE dnl $2 is the nominal value for _POSIX_C_SOURCE +dnl +dnl The default case prefers _XOPEN_SOURCE over _POSIX_C_SOURCE if the +dnl implementation predefines it, because X/Open and most implementations agree +dnl that the latter is a legacy or "aligned" value. +dnl +dnl Because _XOPEN_SOURCE is preferred, if defining _POSIX_C_SOURCE turns +dnl that off, then refrain from setting _POSIX_C_SOURCE explicitly. +dnl +dnl References: +dnl https://pubs.opengroup.org/onlinepubs/007904975/functions/xsh_chap02_02.html +dnl https://docs.oracle.com/cd/E19253-01/816-5175/standards-5/index.html +dnl https://www.gnu.org/software/libc/manual/html_node/Feature-Test-Macros.html AC_DEFUN([CF_XOPEN_SOURCE],[ AC_REQUIRE([AC_CANONICAL_HOST]) AC_REQUIRE([CF_POSIX_VISIBLE]) @@ -4765,9 +5163,6 @@ case "$host_os" in (aix[[4-7]]*) cf_xopen_source="-D_ALL_SOURCE" ;; -(msys) - cf_XOPEN_SOURCE=600 - ;; (darwin[[0-8]].*) cf_xopen_source="-D_APPLE_C_SOURCE" ;; @@ -4793,7 +5188,7 @@ case "$host_os" in cf_xopen_source="-D_SGI_SOURCE" cf_XOPEN_SOURCE= ;; -(linux*|uclinux*|gnu*|mint*|k*bsd*-gnu|cygwin) +(linux*gnu|linux*gnuabi64|linux*gnuabin32|linux*gnueabi|linux*gnueabihf|linux*gnux32|uclinux*|gnu*|mint*|k*bsd*-gnu|cygwin|msys|mingw*|linux*uclibc) CF_GNU_SOURCE($cf_XOPEN_SOURCE) ;; (minix*) @@ -4807,7 +5202,15 @@ case "$host_os" in (netbsd*) cf_xopen_source="-D_NETBSD_SOURCE" # setting _XOPEN_SOURCE breaks IPv6 for lynx on NetBSD 1.6, breaks xterm, is not needed for ncursesw ;; -(openbsd[[4-9]]*) +(openbsd[[6-9]]*) + # OpenBSD 6.x has broken locale support, both compile-time and runtime. + # see https://www.mail-archive.com/bugs@openbsd.org/msg13200.html + # Abusing the conformance level is a workaround. + AC_MSG_WARN(this system does not provide usable locale support) + cf_xopen_source="-D_BSD_SOURCE" + cf_XOPEN_SOURCE=700 + ;; +(openbsd[[4-5]]*) # setting _XOPEN_SOURCE lower than 500 breaks g++ compile with wchar.h, needed for ncursesw cf_xopen_source="-D_BSD_SOURCE" cf_XOPEN_SOURCE=600 @@ -4834,12 +5237,20 @@ case "$host_os" in ;; (*) CF_TRY_XOPEN_SOURCE + cf_save_xopen_cppflags="$CPPFLAGS" CF_POSIX_C_SOURCE($cf_POSIX_C_SOURCE) + # Some of these niche implementations use copy/paste, double-check... + if test "$cf_cv_xopen_source" = no ; then + CF_VERBOSE(checking if _POSIX_C_SOURCE interferes with _XOPEN_SOURCE) + AC_TRY_COMPILE(CF__XOPEN_SOURCE_HEAD,CF__XOPEN_SOURCE_BODY,,[ + AC_MSG_WARN(_POSIX_C_SOURCE definition is not usable) + CPPFLAGS="$cf_save_xopen_cppflags"]) + fi ;; esac if test -n "$cf_xopen_source" ; then - CF_ADD_CFLAGS($cf_xopen_source,true) + CF_APPEND_CFLAGS($cf_xopen_source,true) fi dnl In anything but the default case, we may have system-specific setting @@ -4849,7 +5260,7 @@ if test -n "$cf_XOPEN_SOURCE" && test -z "$cf_cv_xopen_source" ; then AC_MSG_CHECKING(if _XOPEN_SOURCE really is set) AC_TRY_COMPILE([#include <stdlib.h>],[ #ifndef _XOPEN_SOURCE -make an error +#error _XOPEN_SOURCE is not defined #endif], [cf_XOPEN_SOURCE_set=yes], [cf_XOPEN_SOURCE_set=no]) @@ -4858,7 +5269,7 @@ make an error then AC_TRY_COMPILE([#include <stdlib.h>],[ #if (_XOPEN_SOURCE - 0) < $cf_XOPEN_SOURCE -make an error +#error (_XOPEN_SOURCE - 0) < $cf_XOPEN_SOURCE #endif], [cf_XOPEN_SOURCE_set_ok=yes], [cf_XOPEN_SOURCE_set_ok=no]) @@ -4878,3 +5289,21 @@ dnl ------------------ dnl Trim something using sed, then trim extra whitespace dnl $1 = extra parameters, e.g., in CF_STRIP_G_OPT define([CF__SED_TRIMBLANKS],[sed ifelse($1,,,[$1] )-e 's%[[ ]]% %g' -e 's% [[ ]]*% %g' -e 's%^ %%' -e 's% [$]%%'])dnl +dnl --------------------------------------------------------------------------- +dnl CF__XOPEN_SOURCE_BODY version: 2 updated: 2023/02/18 17:41:25 +dnl --------------------- +dnl body of test when test-compiling for _XOPEN_SOURCE check +define([CF__XOPEN_SOURCE_BODY], +[ +#ifndef _XOPEN_SOURCE +#error _XOPEN_SOURCE is not defined +#endif +]) +dnl --------------------------------------------------------------------------- +dnl CF__XOPEN_SOURCE_HEAD version: 2 updated: 2023/02/18 17:41:25 +dnl --------------------- +dnl headers to include when test-compiling for _XOPEN_SOURCE check +define([CF__XOPEN_SOURCE_HEAD], +[ +$ac_includes_default +]) diff --git a/Ada95/configure b/Ada95/configure index ac324fe9f3ee..8c01a2936cdc 100755 --- a/Ada95/configure +++ b/Ada95/configure @@ -1,9 +1,9 @@ #! /bin/sh -# From configure.in Revision: 1.82 . +# From configure.in Revision: 1.91 . # Guess values for system-dependent variables and create Makefiles. -# Generated by Autoconf 2.52.20210105. +# Generated by Autoconf 2.52.20231210. # -# Copyright 2003-2020,2021 Thomas E. Dickey +# Copyright 2003-2022,2023 Thomas E. Dickey # Copyright 1992, 1993, 1994, 1995, 1996, 1998, 1999, 2000, 2001 # Free Software Foundation, Inc. # This configure script is free software; the Free Software Foundation @@ -34,9 +34,9 @@ fi as_me=`echo "$0" |sed 's,.*[\\/],,'` if expr a : '\(a\)' >/dev/null 2>&1; then - as_expr=expr + as_expr="expr" else - as_expr=false + as_expr="false" fi rm -f conf$$ conf$$.exe conf$$.file @@ -51,7 +51,7 @@ if ln -s conf$$.file conf$$ 2>/dev/null; then as_ln_s='ln -s' fi elif ln conf$$.file conf$$ 2>/dev/null; then - as_ln_s=ln + as_ln_s='ln' else as_ln_s='cp -p' fi @@ -704,8 +704,9 @@ Optional Features: General Options: --with-system-type=XXX test: override derived host system-type --disable-stripping do not strip (debug info) installed executables - --with-pkg-config{=path} enable/disable use of pkg-config - --with-pkg-config-libdir=XXX use given directory for installing pc-files + --with-strip-program=XX specify program to use when stripping in install + --with-pkg-config[=CMD] enable/disable use of pkg-config and its name CMD + --with-pkg-config-libdir[=XXX] use given directory for installing pc-files --without-tests suppress build with test-programs --enable-mixed-case tic should assume mixed-case filenames --with-install-prefix prefixes actual install-location ($DESTDIR) @@ -721,7 +722,7 @@ Options to Specify the Libraries Built/Used: --with-curses-dir=DIR directory in which (n)curses is installed --enable-widec compile with wide-char/UTF-8 code --with-lib-prefix override library-prefix - --with-shlib-version=X Specify rel or abi version for shared libs + --with-shlib-version[={rel|abi}] use release or ABI version in shared library file names --enable-rpath-link link sample programs with rpath option Fine-Tuning Your Configuration: --enable-broken_linker compile with broken-linker support code @@ -740,17 +741,18 @@ Experimental Code: Testing/development Options: --disable-echo do not display "compiling" commands --enable-warnings test: turn on gcc compiler warnings + --enable-stdnoreturn enable C11 _Noreturn feature for diagnostics --enable-assertions test: turn on generation of assertion code --enable-expanded test: generate functions for certain macros --disable-macros test: use functions rather than macros --with-trace test: add trace() function to all models of ncurses --disable-gnat-projects test: disable GNAT projects even if usable Ada95 Binding Options: - --with-ada-compiler=CMD specify Ada95 compiler command (default gnatmake) - --with-ada-include=DIR Ada includes are in DIR (default: PREFIX/share/ada/adainclude) - --with-ada-objects=DIR Ada objects are in DIR (default: PREFIX/lib/ada/adalib) - --with-ada-sharedlib=soname build shared-library (requires GNAT projects) - --with-ada-libname=XXX override default Ada library-name + --with-ada-compiler[=CMD] use CMD as Ada95 compiler (default: gnatmake) + --with-ada-include=DIR find Ada95 includes in DIR (default: PREFIX/share/ada/adainclude) + --with-ada-objects=DIR find Ada95 objects in DIR (default: PREFIX/lib/ada/adalib) + --with-ada-sharedlib build Ada95 shared library; requires GNAT project support + --with-ada-libname[=XXX] use XXX as Ada95 library name Some influential environment variables: CC C compiler command @@ -807,7 +809,7 @@ test -n "$ac_init_help" && exit 0 if "$ac_init_version"; then cat <<\EOF -Copyright 2003-2020,2021 Thomas E. Dickey +Copyright 2003-2022,2023 Thomas E. Dickey Copyright 1992, 1993, 1994, 1995, 1996, 1998, 1999, 2000, 2001 Free Software Foundation, Inc. This configure script is free software; the Free Software Foundation @@ -821,7 +823,7 @@ This file contains any messages produced by compilers while running configure, to aid debugging if configure makes a mistake. It was created by $as_me, which was -generated by GNU Autoconf 2.52.20210105. Invocation command line was +generated by GNU Autoconf 2.52.20231210. Invocation command line was $ $0 $@ @@ -945,7 +947,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:948: loading site script $ac_site_file" >&5 + { echo "$as_me:950: 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" @@ -956,7 +958,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:959: loading cache $cache_file" >&5 + { echo "$as_me:961: loading cache $cache_file" >&5 echo "$as_me: loading cache $cache_file" >&6;} case $cache_file in [\\/]* | ?:[\\/]* ) . $cache_file;; @@ -964,7 +966,7 @@ echo "$as_me: loading cache $cache_file" >&6;} esac fi else - { echo "$as_me:967: creating cache $cache_file" >&5 + { echo "$as_me:969: creating cache $cache_file" >&5 echo "$as_me: creating cache $cache_file" >&6;} >$cache_file fi @@ -980,21 +982,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:983: error: \`$ac_var' was set to \`$ac_old_val' in the previous run" >&5 + { echo "$as_me:985: 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:987: error: \`$ac_var' was not set in the previous run" >&5 + { echo "$as_me:989: 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:993: error: \`$ac_var' has changed since the previous run:" >&5 + { echo "$as_me:995: 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:995: former value: $ac_old_val" >&5 + { echo "$as_me:997: former value: $ac_old_val" >&5 echo "$as_me: former value: $ac_old_val" >&2;} - { echo "$as_me:997: current value: $ac_new_val" >&5 + { echo "$as_me:999: current value: $ac_new_val" >&5 echo "$as_me: current value: $ac_new_val" >&2;} ac_cache_corrupted=: fi;; @@ -1013,9 +1015,9 @@ echo "$as_me: current value: $ac_new_val" >&2;} fi done if "$ac_cache_corrupted"; then - { echo "$as_me:1016: error: changes in the environment can compromise the build" >&5 + { echo "$as_me:1018: 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:1018: error: run \`make distclean' and/or \`rm $cache_file' and start over" >&5 + { { echo "$as_me:1020: 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 @@ -1044,10 +1046,10 @@ esac echo "#! $SHELL" >conftest.sh echo "exit 0" >>conftest.sh chmod +x conftest.sh -if { (echo "$as_me:1047: PATH=\".;.\"; conftest.sh") >&5 +if { (echo "$as_me:1049: PATH=\".;.\"; conftest.sh") >&5 (PATH=".;."; conftest.sh) 2>&5 ac_status=$? - echo "$as_me:1050: \$? = $ac_status" >&5 + echo "$as_me:1052: \$? = $ac_status" >&5 (exit "$ac_status"); }; then ac_path_separator=';' else @@ -1058,6 +1060,8 @@ rm -f conftest.sh ac_config_headers="$ac_config_headers include/ncurses_cfg.h:include/ncurses_cfg.hin" +PACKAGE="AdaCurses" + top_builddir=`pwd` ac_aux_dir= @@ -1077,7 +1081,7 @@ for ac_dir in $srcdir $srcdir/.. $srcdir/../..; do fi done if test -z "$ac_aux_dir"; then - { { echo "$as_me:1080: error: cannot find install-sh or install.sh in $srcdir $srcdir/.. $srcdir/../.." >&5 + { { echo "$as_me:1084: 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 @@ -1087,11 +1091,11 @@ ac_configure="$SHELL $ac_aux_dir/configure" # This should be Cygnus configure. # Make sure we can run config.sub. $ac_config_sub sun4 >/dev/null 2>&1 || - { { echo "$as_me:1090: error: cannot run $ac_config_sub" >&5 + { { echo "$as_me:1094: error: cannot run $ac_config_sub" >&5 echo "$as_me: error: cannot run $ac_config_sub" >&2;} { (exit 1); exit 1; }; } -echo "$as_me:1094: checking build system type" >&5 +echo "$as_me:1098: 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 @@ -1100,23 +1104,23 @@ else test -z "$ac_cv_build_alias" && ac_cv_build_alias=`$ac_config_guess` test -z "$ac_cv_build_alias" && - { { echo "$as_me:1103: error: cannot guess build type; you must specify one" >&5 + { { echo "$as_me:1107: 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:1107: error: $ac_config_sub $ac_cv_build_alias failed." >&5 + { { echo "$as_me:1111: 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:1112: result: $ac_cv_build" >&5 +echo "$as_me:1116: 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/'` build_vendor=`echo "$ac_cv_build" | sed 's/^\([^-]*\)-\([^-]*\)-\(.*\)$/\2/'` build_os=`echo "$ac_cv_build" | sed 's/^\([^-]*\)-\([^-]*\)-\(.*\)$/\3/'` -echo "$as_me:1119: checking host system type" >&5 +echo "$as_me:1123: 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 @@ -1125,12 +1129,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:1128: error: $ac_config_sub $ac_cv_host_alias failed" >&5 + { { echo "$as_me:1132: 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:1133: result: $ac_cv_host" >&5 +echo "$as_me:1137: 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/'` @@ -1138,7 +1142,7 @@ host_vendor=`echo "$ac_cv_host" | sed 's/^\([^-]*\)-\([^-]*\)-\(.*\)$/\2/'` host_os=`echo "$ac_cv_host" | sed 's/^\([^-]*\)-\([^-]*\)-\(.*\)$/\3/'` if test -f "$srcdir/config.guess" || test -f "$ac_aux_dir/config.guess" ; then - echo "$as_me:1141: checking target system type" >&5 + echo "$as_me:1145: checking target system type" >&5 echo $ECHO_N "checking target system type... $ECHO_C" >&6 if test "${ac_cv_target+set}" = set; then echo $ECHO_N "(cached) $ECHO_C" >&6 @@ -1147,12 +1151,12 @@ else test "x$ac_cv_target_alias" = "x" && ac_cv_target_alias=$ac_cv_host_alias ac_cv_target=`$ac_config_sub "$ac_cv_target_alias"` || - { { echo "$as_me:1150: error: $ac_config_sub $ac_cv_target_alias failed" >&5 + { { echo "$as_me:1154: error: $ac_config_sub $ac_cv_target_alias failed" >&5 echo "$as_me: error: $ac_config_sub $ac_cv_target_alias failed" >&2;} { (exit 1); exit 1; }; } fi -echo "$as_me:1155: result: $ac_cv_target" >&5 +echo "$as_me:1159: result: $ac_cv_target" >&5 echo "${ECHO_T}$ac_cv_target" >&6 target=$ac_cv_target target_cpu=`echo "$ac_cv_target" | sed 's/^\([^-]*\)-\([^-]*\)-\(.*\)$/\1/'` @@ -1184,13 +1188,13 @@ else fi test -z "$system_name" && system_name="$cf_cv_system_name" -test -n "$cf_cv_system_name" && echo "$as_me:1187: result: Configuring for $cf_cv_system_name" >&5 +test -n "$cf_cv_system_name" && echo "$as_me:1191: 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:1191: result: Cached system name ($system_name) does not agree with actual ($cf_cv_system_name)" >&5 + echo "$as_me:1195: 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:1193: error: \"Please remove config.cache and try again.\"" >&5 + { { echo "$as_me:1197: 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 @@ -1198,7 +1202,7 @@ fi # Check whether --with-system-type or --without-system-type was given. if test "${with_system_type+set}" = set; then withval="$with_system_type" - { echo "$as_me:1201: WARNING: overriding system type to $withval" >&5 + { echo "$as_me:1205: WARNING: overriding system type to $withval" >&5 echo "$as_me: WARNING: overriding system type to $withval" >&2;} cf_cv_system_name=$withval host_os=$withval @@ -1213,7 +1217,7 @@ for ac_prog in ggrep grep 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:1216: checking for $ac_word" >&5 +echo "$as_me:1220: checking for $ac_word" >&5 echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6 if test "${ac_cv_prog_GREP+set}" = set; then echo $ECHO_N "(cached) $ECHO_C" >&6 @@ -1228,7 +1232,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_GREP="$ac_prog" -echo "$as_me:1231: found $ac_dir/$ac_word" >&5 +echo "$as_me:1235: found $ac_dir/$ac_word" >&5 break done @@ -1236,10 +1240,10 @@ fi fi GREP=$ac_cv_prog_GREP if test -n "$GREP"; then - echo "$as_me:1239: result: $GREP" >&5 + echo "$as_me:1243: result: $GREP" >&5 echo "${ECHO_T}$GREP" >&6 else - echo "$as_me:1242: result: no" >&5 + echo "$as_me:1246: result: no" >&5 echo "${ECHO_T}no" >&6 fi @@ -1247,7 +1251,7 @@ fi done test -n "$GREP" || GREP=": " -echo "$as_me:1250: checking for fgrep" >&5 +echo "$as_me:1254: checking for fgrep" >&5 echo $ECHO_N "checking for fgrep... $ECHO_C" >&6 if test "${ac_cv_path_FGREP+set}" = set; then echo $ECHO_N "(cached) $ECHO_C" >&6 @@ -1259,7 +1263,7 @@ else 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:1262: checking for $ac_word" >&5 +echo "$as_me:1266: checking for $ac_word" >&5 echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6 if test "${ac_cv_path_FGREP+set}" = set; then echo $ECHO_N "(cached) $ECHO_C" >&6 @@ -1276,7 +1280,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_FGREP="$ac_dir/$ac_word" - echo "$as_me:1279: found $ac_dir/$ac_word" >&5 + echo "$as_me:1283: found $ac_dir/$ac_word" >&5 break fi done @@ -1287,10 +1291,10 @@ fi FGREP=$ac_cv_path_FGREP if test -n "$FGREP"; then - echo "$as_me:1290: result: $FGREP" >&5 + echo "$as_me:1294: result: $FGREP" >&5 echo "${ECHO_T}$FGREP" >&6 else - echo "$as_me:1293: result: no" >&5 + echo "$as_me:1297: result: no" >&5 echo "${ECHO_T}no" >&6 fi @@ -1298,16 +1302,16 @@ fi done test -n "$FGREP" || FGREP=": " - test "x$ac_cv_path_FGREP" = "x:" && { { echo "$as_me:1301: error: cannot find workable fgrep" >&5 + test "x$ac_cv_path_FGREP" = "x:" && { { echo "$as_me:1305: error: cannot find workable fgrep" >&5 echo "$as_me: error: cannot find workable fgrep" >&2;} { (exit 1); exit 1; }; } fi fi -echo "$as_me:1306: result: $ac_cv_path_FGREP" >&5 +echo "$as_me:1310: result: $ac_cv_path_FGREP" >&5 echo "${ECHO_T}$ac_cv_path_FGREP" >&6 FGREP="$ac_cv_path_FGREP" -echo "$as_me:1310: checking for prefix" >&5 +echo "$as_me:1314: checking for prefix" >&5 echo $ECHO_N "checking for prefix... $ECHO_C" >&6 if test "x$prefix" = "xNONE" ; then case "$cf_cv_system_name" in @@ -1319,11 +1323,11 @@ if test "x$prefix" = "xNONE" ; then ;; esac fi -echo "$as_me:1322: result: $prefix" >&5 +echo "$as_me:1326: result: $prefix" >&5 echo "${ECHO_T}$prefix" >&6 if test "x$prefix" = "xNONE" ; then -echo "$as_me:1326: checking for default include-directory" >&5 +echo "$as_me:1330: checking for default include-directory" >&5 echo $ECHO_N "checking for default include-directory... $ECHO_C" >&6 test -n "$verbose" && echo 1>&6 for cf_symbol in \ @@ -1346,7 +1350,7 @@ do fi test -n "$verbose" && echo " tested $cf_dir" 1>&6 done -echo "$as_me:1349: result: $includedir" >&5 +echo "$as_me:1353: result: $includedir" >&5 echo "${ECHO_T}$includedir" >&6 fi @@ -1363,7 +1367,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:1366: checking for $ac_word" >&5 +echo "$as_me:1370: 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 @@ -1378,7 +1382,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:1381: found $ac_dir/$ac_word" >&5 +echo "$as_me:1385: found $ac_dir/$ac_word" >&5 break done @@ -1386,10 +1390,10 @@ fi fi CC=$ac_cv_prog_CC if test -n "$CC"; then - echo "$as_me:1389: result: $CC" >&5 + echo "$as_me:1393: result: $CC" >&5 echo "${ECHO_T}$CC" >&6 else - echo "$as_me:1392: result: no" >&5 + echo "$as_me:1396: result: no" >&5 echo "${ECHO_T}no" >&6 fi @@ -1402,7 +1406,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:1405: checking for $ac_word" >&5 +echo "$as_me:1409: 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 @@ -1417,7 +1421,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:1420: found $ac_dir/$ac_word" >&5 +echo "$as_me:1424: found $ac_dir/$ac_word" >&5 break done @@ -1425,10 +1429,10 @@ fi fi ac_ct_CC=$ac_cv_prog_ac_ct_CC if test -n "$ac_ct_CC"; then - echo "$as_me:1428: result: $ac_ct_CC" >&5 + echo "$as_me:1432: result: $ac_ct_CC" >&5 echo "${ECHO_T}$ac_ct_CC" >&6 else - echo "$as_me:1431: result: no" >&5 + echo "$as_me:1435: result: no" >&5 echo "${ECHO_T}no" >&6 fi @@ -1438,32 +1442,32 @@ done CC=$ac_ct_CC fi -test -z "$CC" && { { echo "$as_me:1441: error: no acceptable cc found in \$PATH" >&5 +test -z "$CC" && { { echo "$as_me:1445: 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:1446:" \ +echo "$as_me:1450:" \ "checking for C compiler version" >&5 ac_compiler=`set X $ac_compile; echo "$2"` -{ (eval echo "$as_me:1449: \"$ac_compiler --version </dev/null >&5\"") >&5 +{ (eval echo "$as_me:1453: \"$ac_compiler --version </dev/null >&5\"") >&5 (eval $ac_compiler --version </dev/null >&5) 2>&5 ac_status=$? - echo "$as_me:1452: \$? = $ac_status" >&5 + echo "$as_me:1456: \$? = $ac_status" >&5 (exit "$ac_status"); } -{ (eval echo "$as_me:1454: \"$ac_compiler -v </dev/null >&5\"") >&5 +{ (eval echo "$as_me:1458: \"$ac_compiler -v </dev/null >&5\"") >&5 (eval $ac_compiler -v </dev/null >&5) 2>&5 ac_status=$? - echo "$as_me:1457: \$? = $ac_status" >&5 + echo "$as_me:1461: \$? = $ac_status" >&5 (exit "$ac_status"); } -{ (eval echo "$as_me:1459: \"$ac_compiler -V </dev/null >&5\"") >&5 +{ (eval echo "$as_me:1463: \"$ac_compiler -V </dev/null >&5\"") >&5 (eval $ac_compiler -V </dev/null >&5) 2>&5 ac_status=$? - echo "$as_me:1462: \$? = $ac_status" >&5 + echo "$as_me:1466: \$? = $ac_status" >&5 (exit "$ac_status"); } cat >"conftest.$ac_ext" <<_ACEOF -#line 1466 "configure" +#line 1470 "configure" #include "confdefs.h" int @@ -1479,13 +1483,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:1482: checking for C compiler default output" >&5 +echo "$as_me:1486: 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:1485: \"$ac_link_default\"") >&5 +if { (eval echo "$as_me:1489: \"$ac_link_default\"") >&5 (eval $ac_link_default) 2>&5 ac_status=$? - echo "$as_me:1488: \$? = $ac_status" >&5 + echo "$as_me:1492: \$? = $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 @@ -1508,34 +1512,34 @@ done else echo "$as_me: failed program was:" >&5 cat "conftest.$ac_ext" >&5 -{ { echo "$as_me:1511: error: C compiler cannot create executables" >&5 +{ { echo "$as_me:1515: 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:1517: result: $ac_file" >&5 +echo "$as_me:1521: 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:1522: checking whether the C compiler works" >&5 +echo "$as_me:1526: 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:1528: \"$ac_try\"") >&5 + { (eval echo "$as_me:1532: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? - echo "$as_me:1531: \$? = $ac_status" >&5 + echo "$as_me:1535: \$? = $ac_status" >&5 (exit "$ac_status"); }; }; then cross_compiling=no else if test "$cross_compiling" = maybe; then cross_compiling=yes else - { { echo "$as_me:1538: error: cannot run C compiled programs. + { { echo "$as_me:1542: 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;} @@ -1543,24 +1547,24 @@ If you meant to cross compile, use \`--host'." >&2;} fi fi fi -echo "$as_me:1546: result: yes" >&5 +echo "$as_me:1550: 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:1553: checking whether we are cross compiling" >&5 +echo "$as_me:1557: checking whether we are cross compiling" >&5 echo $ECHO_N "checking whether we are cross compiling... $ECHO_C" >&6 -echo "$as_me:1555: result: $cross_compiling" >&5 +echo "$as_me:1559: result: $cross_compiling" >&5 echo "${ECHO_T}$cross_compiling" >&6 -echo "$as_me:1558: checking for executable suffix" >&5 +echo "$as_me:1562: checking for executable suffix" >&5 echo $ECHO_N "checking for executable suffix... $ECHO_C" >&6 -if { (eval echo "$as_me:1560: \"$ac_link\"") >&5 +if { (eval echo "$as_me:1564: \"$ac_link\"") >&5 (eval $ac_link) 2>&5 ac_status=$? - echo "$as_me:1563: \$? = $ac_status" >&5 + echo "$as_me:1567: \$? = $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 @@ -1576,25 +1580,25 @@ for ac_file in `(ls conftest.exe; ls conftest; ls conftest.*) 2>/dev/null`; do esac done else - { { echo "$as_me:1579: error: cannot compute EXEEXT: cannot compile and link" >&5 + { { echo "$as_me:1583: 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:1585: result: $ac_cv_exeext" >&5 +echo "$as_me:1589: 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:1591: checking for object suffix" >&5 +echo "$as_me:1595: 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 1597 "configure" +#line 1601 "configure" #include "confdefs.h" int @@ -1606,10 +1610,10 @@ main (void) } _ACEOF rm -f conftest.o conftest.obj -if { (eval echo "$as_me:1609: \"$ac_compile\"") >&5 +if { (eval echo "$as_me:1613: \"$ac_compile\"") >&5 (eval $ac_compile) 2>&5 ac_status=$? - echo "$as_me:1612: \$? = $ac_status" >&5 + echo "$as_me:1616: \$? = $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 @@ -1621,24 +1625,24 @@ done else echo "$as_me: failed program was:" >&5 cat "conftest.$ac_ext" >&5 -{ { echo "$as_me:1624: error: cannot compute OBJEXT: cannot compile" >&5 +{ { echo "$as_me:1628: 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:1631: result: $ac_cv_objext" >&5 +echo "$as_me:1635: result: $ac_cv_objext" >&5 echo "${ECHO_T}$ac_cv_objext" >&6 OBJEXT=$ac_cv_objext ac_objext=$OBJEXT -echo "$as_me:1635: checking whether we are using the GNU C compiler" >&5 +echo "$as_me:1639: 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 1641 "configure" +#line 1645 "configure" #include "confdefs.h" int @@ -1653,16 +1657,16 @@ main (void) } _ACEOF rm -f "conftest.$ac_objext" -if { (eval echo "$as_me:1656: \"$ac_compile\"") >&5 +if { (eval echo "$as_me:1660: \"$ac_compile\"") >&5 (eval $ac_compile) 2>&5 ac_status=$? - echo "$as_me:1659: \$? = $ac_status" >&5 + echo "$as_me:1663: \$? = $ac_status" >&5 (exit "$ac_status"); } && { ac_try='test -s "conftest.$ac_objext"' - { (eval echo "$as_me:1662: \"$ac_try\"") >&5 + { (eval echo "$as_me:1666: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? - echo "$as_me:1665: \$? = $ac_status" >&5 + echo "$as_me:1669: \$? = $ac_status" >&5 (exit "$ac_status"); }; }; then ac_compiler_gnu=yes else @@ -1674,19 +1678,19 @@ rm -f "conftest.$ac_objext" "conftest.$ac_ext" ac_cv_c_compiler_gnu=$ac_compiler_gnu fi -echo "$as_me:1677: result: $ac_cv_c_compiler_gnu" >&5 +echo "$as_me:1681: 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:1683: checking whether $CC accepts -g" >&5 +echo "$as_me:1687: 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 1689 "configure" +#line 1693 "configure" #include "confdefs.h" int @@ -1698,16 +1702,16 @@ main (void) } _ACEOF rm -f "conftest.$ac_objext" -if { (eval echo "$as_me:1701: \"$ac_compile\"") >&5 +if { (eval echo "$as_me:1705: \"$ac_compile\"") >&5 (eval $ac_compile) 2>&5 ac_status=$? - echo "$as_me:1704: \$? = $ac_status" >&5 + echo "$as_me:1708: \$? = $ac_status" >&5 (exit "$ac_status"); } && { ac_try='test -s "conftest.$ac_objext"' - { (eval echo "$as_me:1707: \"$ac_try\"") >&5 + { (eval echo "$as_me:1711: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? - echo "$as_me:1710: \$? = $ac_status" >&5 + echo "$as_me:1714: \$? = $ac_status" >&5 (exit "$ac_status"); }; }; then ac_cv_prog_cc_g=yes else @@ -1717,7 +1721,7 @@ ac_cv_prog_cc_g=no fi rm -f "conftest.$ac_objext" "conftest.$ac_ext" fi -echo "$as_me:1720: result: $ac_cv_prog_cc_g" >&5 +echo "$as_me:1724: 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 @@ -1744,16 +1748,16 @@ cat >"conftest.$ac_ext" <<_ACEOF #endif _ACEOF rm -f "conftest.$ac_objext" -if { (eval echo "$as_me:1747: \"$ac_compile\"") >&5 +if { (eval echo "$as_me:1751: \"$ac_compile\"") >&5 (eval $ac_compile) 2>&5 ac_status=$? - echo "$as_me:1750: \$? = $ac_status" >&5 + echo "$as_me:1754: \$? = $ac_status" >&5 (exit "$ac_status"); } && { ac_try='test -s "conftest.$ac_objext"' - { (eval echo "$as_me:1753: \"$ac_try\"") >&5 + { (eval echo "$as_me:1757: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? - echo "$as_me:1756: \$? = $ac_status" >&5 + echo "$as_me:1760: \$? = $ac_status" >&5 (exit "$ac_status"); }; }; then for ac_declaration in \ ''\ @@ -1765,7 +1769,7 @@ if { (eval echo "$as_me:1747: \"$ac_compile\"") >&5 'void exit (int);' do cat >"conftest.$ac_ext" <<_ACEOF -#line 1768 "configure" +#line 1772 "configure" #include "confdefs.h" #include <stdlib.h> $ac_declaration @@ -1778,16 +1782,16 @@ exit (42); } _ACEOF rm -f "conftest.$ac_objext" -if { (eval echo "$as_me:1781: \"$ac_compile\"") >&5 +if { (eval echo "$as_me:1785: \"$ac_compile\"") >&5 (eval $ac_compile) 2>&5 ac_status=$? - echo "$as_me:1784: \$? = $ac_status" >&5 + echo "$as_me:1788: \$? = $ac_status" >&5 (exit "$ac_status"); } && { ac_try='test -s "conftest.$ac_objext"' - { (eval echo "$as_me:1787: \"$ac_try\"") >&5 + { (eval echo "$as_me:1791: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? - echo "$as_me:1790: \$? = $ac_status" >&5 + echo "$as_me:1794: \$? = $ac_status" >&5 (exit "$ac_status"); }; }; then : else @@ -1797,7 +1801,7 @@ continue fi rm -f "conftest.$ac_objext" "conftest.$ac_ext" cat >"conftest.$ac_ext" <<_ACEOF -#line 1800 "configure" +#line 1804 "configure" #include "confdefs.h" $ac_declaration int @@ -1809,16 +1813,16 @@ exit (42); } _ACEOF rm -f "conftest.$ac_objext" -if { (eval echo "$as_me:1812: \"$ac_compile\"") >&5 +if { (eval echo "$as_me:1816: \"$ac_compile\"") >&5 (eval $ac_compile) 2>&5 ac_status=$? - echo "$as_me:1815: \$? = $ac_status" >&5 + echo "$as_me:1819: \$? = $ac_status" >&5 (exit "$ac_status"); } && { ac_try='test -s "conftest.$ac_objext"' - { (eval echo "$as_me:1818: \"$ac_try\"") >&5 + { (eval echo "$as_me:1822: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? - echo "$as_me:1821: \$? = $ac_status" >&5 + echo "$as_me:1825: \$? = $ac_status" >&5 (exit "$ac_status"); }; }; then break else @@ -1848,11 +1852,11 @@ ac_main_return="return" GCC_VERSION=none if test "$GCC" = yes ; then - echo "$as_me:1851: checking version of $CC" >&5 + echo "$as_me:1855: 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.].*//'`" + GCC_VERSION="`${CC} --version 2>/dev/null | sed -e '2,$d' -e 's/^[^(]*([^)][^)]*) //' -e 's/^[^0-9.]*//' -e 's/[^0-9.].*//'`" test -z "$GCC_VERSION" && GCC_VERSION=unknown - echo "$as_me:1855: result: $GCC_VERSION" >&5 + echo "$as_me:1859: result: $GCC_VERSION" >&5 echo "${ECHO_T}$GCC_VERSION" >&6 fi @@ -1861,12 +1865,12 @@ INTEL_COMPILER=no if test "$GCC" = yes ; then case "$host_os" in (linux*|gnu*) - echo "$as_me:1864: checking if this is really Intel C compiler" >&5 + echo "$as_me:1868: 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 1869 "configure" +#line 1873 "configure" #include "confdefs.h" int @@ -1875,7 +1879,7 @@ main (void) #ifdef __INTEL_COMPILER #else -make an error +#error __INTEL_COMPILER is not defined #endif ; @@ -1883,16 +1887,16 @@ make an error } _ACEOF rm -f "conftest.$ac_objext" -if { (eval echo "$as_me:1886: \"$ac_compile\"") >&5 +if { (eval echo "$as_me:1890: \"$ac_compile\"") >&5 (eval $ac_compile) 2>&5 ac_status=$? - echo "$as_me:1889: \$? = $ac_status" >&5 + echo "$as_me:1893: \$? = $ac_status" >&5 (exit "$ac_status"); } && { ac_try='test -s "conftest.$ac_objext"' - { (eval echo "$as_me:1892: \"$ac_try\"") >&5 + { (eval echo "$as_me:1896: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? - echo "$as_me:1895: \$? = $ac_status" >&5 + echo "$as_me:1899: \$? = $ac_status" >&5 (exit "$ac_status"); }; }; then INTEL_COMPILER=yes cf_save_CFLAGS="$cf_save_CFLAGS -we147" @@ -1903,7 +1907,7 @@ cat "conftest.$ac_ext" >&5 fi rm -f "conftest.$ac_objext" "conftest.$ac_ext" CFLAGS="$cf_save_CFLAGS" - echo "$as_me:1906: result: $INTEL_COMPILER" >&5 + echo "$as_me:1910: result: $INTEL_COMPILER" >&5 echo "${ECHO_T}$INTEL_COMPILER" >&6 ;; esac @@ -1912,11 +1916,11 @@ fi CLANG_COMPILER=no if test "$GCC" = yes ; then - echo "$as_me:1915: checking if this is really Clang C compiler" >&5 + echo "$as_me:1919: 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" cat >"conftest.$ac_ext" <<_ACEOF -#line 1919 "configure" +#line 1923 "configure" #include "confdefs.h" int @@ -1925,7 +1929,7 @@ main (void) #ifdef __clang__ #else -make an error +#error __clang__ is not defined #endif ; @@ -1933,16 +1937,16 @@ make an error } _ACEOF rm -f "conftest.$ac_objext" -if { (eval echo "$as_me:1936: \"$ac_compile\"") >&5 +if { (eval echo "$as_me:1940: \"$ac_compile\"") >&5 (eval $ac_compile) 2>&5 ac_status=$? - echo "$as_me:1939: \$? = $ac_status" >&5 + echo "$as_me:1943: \$? = $ac_status" >&5 (exit "$ac_status"); } && { ac_try='test -s "conftest.$ac_objext"' - { (eval echo "$as_me:1942: \"$ac_try\"") >&5 + { (eval echo "$as_me:1946: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? - echo "$as_me:1945: \$? = $ac_status" >&5 + echo "$as_me:1949: \$? = $ac_status" >&5 (exit "$ac_status"); }; }; then CLANG_COMPILER=yes @@ -1952,7 +1956,7 @@ cat "conftest.$ac_ext" >&5 fi rm -f "conftest.$ac_objext" "conftest.$ac_ext" CFLAGS="$cf_save_CFLAGS" - echo "$as_me:1955: result: $CLANG_COMPILER" >&5 + echo "$as_me:1959: result: $CLANG_COMPILER" >&5 echo "${ECHO_T}$CLANG_COMPILER" >&6 fi @@ -1961,30 +1965,30 @@ CLANG_VERSION=none if test "x$CLANG_COMPILER" = "xyes" ; then case "$CC" in (c[1-9][0-9]|*/c[1-9][0-9]) - { echo "$as_me:1964: WARNING: replacing broken compiler alias $CC" >&5 + { echo "$as_me:1968: WARNING: replacing broken compiler alias $CC" >&5 echo "$as_me: WARNING: replacing broken compiler alias $CC" >&2;} CFLAGS="$CFLAGS -std=`echo "$CC" | sed -e 's%.*/%%'`" CC=clang ;; esac - echo "$as_me:1971: checking version of $CC" >&5 + echo "$as_me:1975: checking version of $CC" >&5 echo $ECHO_N "checking version of $CC... $ECHO_C" >&6 CLANG_VERSION="`$CC --version 2>/dev/null | sed -e '2,$d' -e 's/^.*(CLANG[^)]*) //' -e 's/^.*(Debian[^)]*) //' -e 's/^[^0-9.]*//' -e 's/[^0-9.].*//'`" test -z "$CLANG_VERSION" && CLANG_VERSION=unknown - echo "$as_me:1975: result: $CLANG_VERSION" >&5 + echo "$as_me:1979: result: $CLANG_VERSION" >&5 echo "${ECHO_T}$CLANG_VERSION" >&6 for cf_clang_opt in \ -Qunused-arguments \ -Wno-error=implicit-function-declaration do - echo "$as_me:1982: checking if option $cf_clang_opt works" >&5 + echo "$as_me:1986: checking if option $cf_clang_opt works" >&5 echo $ECHO_N "checking if option $cf_clang_opt works... $ECHO_C" >&6 cf_save_CFLAGS="$CFLAGS" CFLAGS="$CFLAGS $cf_clang_opt" cat >"conftest.$ac_ext" <<_ACEOF -#line 1987 "configure" +#line 1991 "configure" #include "confdefs.h" #include <stdio.h> @@ -1998,16 +2002,16 @@ main (void) } _ACEOF rm -f "conftest.$ac_objext" "conftest$ac_exeext" -if { (eval echo "$as_me:2001: \"$ac_link\"") >&5 +if { (eval echo "$as_me:2005: \"$ac_link\"") >&5 (eval $ac_link) 2>&5 ac_status=$? - echo "$as_me:2004: \$? = $ac_status" >&5 + echo "$as_me:2008: \$? = $ac_status" >&5 (exit "$ac_status"); } && { ac_try='test -s "conftest$ac_exeext"' - { (eval echo "$as_me:2007: \"$ac_try\"") >&5 + { (eval echo "$as_me:2011: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? - echo "$as_me:2010: \$? = $ac_status" >&5 + echo "$as_me:2014: \$? = $ac_status" >&5 (exit "$ac_status"); }; }; then cf_clang_optok=yes @@ -2018,13 +2022,13 @@ cat "conftest.$ac_ext" >&5 cf_clang_optok=no fi rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext" - echo "$as_me:2021: result: $cf_clang_optok" >&5 + echo "$as_me:2025: result: $cf_clang_optok" >&5 echo "${ECHO_T}$cf_clang_optok" >&6 CFLAGS="$cf_save_CFLAGS" if test "$cf_clang_optok" = yes; then test -n "$verbose" && echo " adding option $cf_clang_opt" 1>&6 -echo "${as_me:-configure}:2027: testing adding option $cf_clang_opt ..." 1>&5 +echo "${as_me:-configure}:2031: testing adding option $cf_clang_opt ..." 1>&5 test -n "$CFLAGS" && CFLAGS="$CFLAGS " CFLAGS="${CFLAGS}$cf_clang_opt" @@ -2033,7 +2037,7 @@ echo "${as_me:-configure}:2027: testing adding option $cf_clang_opt ..." 1>&5 done fi -echo "$as_me:2036: checking for $CC option to accept ANSI C" >&5 +echo "$as_me:2040: 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 @@ -2041,7 +2045,7 @@ else ac_cv_prog_cc_stdc=no ac_save_CC=$CC cat >"conftest.$ac_ext" <<_ACEOF -#line 2044 "configure" +#line 2048 "configure" #include "confdefs.h" #include <stdarg.h> #include <stdio.h> @@ -2050,9 +2054,7 @@ cat >"conftest.$ac_ext" <<_ACEOF /* Most of the following tests are stolen from RCS 5.7's src/conf.sh. */ struct buf { int x; }; FILE * (*rcsopen) (struct buf *, struct stat *, int); -static char *e (p, i) - char **p; - int i; +static char *e (char **p, int i) { return p[i]; } @@ -2090,16 +2092,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:2093: \"$ac_compile\"") >&5 +if { (eval echo "$as_me:2095: \"$ac_compile\"") >&5 (eval $ac_compile) 2>&5 ac_status=$? - echo "$as_me:2096: \$? = $ac_status" >&5 + echo "$as_me:2098: \$? = $ac_status" >&5 (exit "$ac_status"); } && { ac_try='test -s "conftest.$ac_objext"' - { (eval echo "$as_me:2099: \"$ac_try\"") >&5 + { (eval echo "$as_me:2101: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? - echo "$as_me:2102: \$? = $ac_status" >&5 + echo "$as_me:2104: \$? = $ac_status" >&5 (exit "$ac_status"); }; }; then ac_cv_prog_cc_stdc=$ac_arg break @@ -2116,10 +2118,10 @@ fi case "x$ac_cv_prog_cc_stdc" in x|xno) - echo "$as_me:2119: result: none needed" >&5 + echo "$as_me:2121: result: none needed" >&5 echo "${ECHO_T}none needed" >&6 ;; *) - echo "$as_me:2122: result: $ac_cv_prog_cc_stdc" >&5 + echo "$as_me:2124: result: $ac_cv_prog_cc_stdc" >&5 echo "${ECHO_T}$ac_cv_prog_cc_stdc" >&6 CC="$CC $ac_cv_prog_cc_stdc" ;; esac @@ -2127,13 +2129,13 @@ esac # This should have been defined by AC_PROG_CC : "${CC:=cc}" -echo "$as_me:2130: checking \$CFLAGS variable" >&5 +echo "$as_me:2132: checking \$CFLAGS variable" >&5 echo $ECHO_N "checking \$CFLAGS variable... $ECHO_C" >&6 case "x$CFLAGS" in (*-[IUD]*) - echo "$as_me:2134: result: broken" >&5 + echo "$as_me:2136: result: broken" >&5 echo "${ECHO_T}broken" >&6 - { echo "$as_me:2136: WARNING: your environment uses the CFLAGS variable to hold CPPFLAGS options" >&5 + { echo "$as_me:2138: WARNING: your environment uses the CFLAGS variable to hold CPPFLAGS options" >&5 echo "$as_me: WARNING: your environment uses the CFLAGS variable to hold CPPFLAGS options" >&2;} cf_flags="$CFLAGS" CFLAGS= @@ -2241,22 +2243,22 @@ fi done ;; (*) - echo "$as_me:2244: result: ok" >&5 + echo "$as_me:2246: result: ok" >&5 echo "${ECHO_T}ok" >&6 ;; esac -echo "$as_me:2249: checking \$CC variable" >&5 +echo "$as_me:2251: checking \$CC variable" >&5 echo $ECHO_N "checking \$CC variable... $ECHO_C" >&6 case "$CC" in (*[\ \ ]-*) - echo "$as_me:2253: result: broken" >&5 + echo "$as_me:2255: result: broken" >&5 echo "${ECHO_T}broken" >&6 - { echo "$as_me:2255: WARNING: your environment uses the CC variable to hold CFLAGS/CPPFLAGS options" >&5 + { echo "$as_me:2257: WARNING: your environment uses the CC variable to hold CFLAGS/CPPFLAGS options" >&5 echo "$as_me: WARNING: your environment uses the CC variable to hold CFLAGS/CPPFLAGS options" >&2;} # humor him... cf_prog=`echo "$CC" | sed -e 's/ / /g' -e 's/[ ]* / /g' -e 's/[ ]*[ ]-[^ ].*//'` - cf_flags=`echo "$CC" | ${AWK:-awk} -v prog="$cf_prog" '{ printf("%s", substr($0,1+length(prog))); }'` + cf_flags=`echo "$CC" | sed -e "s%^$cf_prog%%"` CC="$cf_prog" for cf_arg in $cf_flags do @@ -2369,24 +2371,24 @@ fi done test -n "$verbose" && echo " resulting CC: '$CC'" 1>&6 -echo "${as_me:-configure}:2372: testing resulting CC: '$CC' ..." 1>&5 +echo "${as_me:-configure}:2374: testing resulting CC: '$CC' ..." 1>&5 test -n "$verbose" && echo " resulting CFLAGS: '$CFLAGS'" 1>&6 -echo "${as_me:-configure}:2376: testing resulting CFLAGS: '$CFLAGS' ..." 1>&5 +echo "${as_me:-configure}:2378: testing resulting CFLAGS: '$CFLAGS' ..." 1>&5 test -n "$verbose" && echo " resulting CPPFLAGS: '$CPPFLAGS'" 1>&6 -echo "${as_me:-configure}:2380: testing resulting CPPFLAGS: '$CPPFLAGS' ..." 1>&5 +echo "${as_me:-configure}:2382: testing resulting CPPFLAGS: '$CPPFLAGS' ..." 1>&5 ;; (*) - echo "$as_me:2384: result: ok" >&5 + echo "$as_me:2386: result: ok" >&5 echo "${ECHO_T}ok" >&6 ;; esac -echo "$as_me:2389: checking for egrep" >&5 +echo "$as_me:2391: checking for egrep" >&5 echo $ECHO_N "checking for egrep... $ECHO_C" >&6 if test "${ac_cv_path_EGREP+set}" = set; then echo $ECHO_N "(cached) $ECHO_C" >&6 @@ -2398,7 +2400,7 @@ else 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:2401: checking for $ac_word" >&5 +echo "$as_me:2403: checking for $ac_word" >&5 echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6 if test "${ac_cv_path_EGREP+set}" = set; then echo $ECHO_N "(cached) $ECHO_C" >&6 @@ -2415,7 +2417,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_EGREP="$ac_dir/$ac_word" - echo "$as_me:2418: found $ac_dir/$ac_word" >&5 + echo "$as_me:2420: found $ac_dir/$ac_word" >&5 break fi done @@ -2426,10 +2428,10 @@ fi EGREP=$ac_cv_path_EGREP if test -n "$EGREP"; then - echo "$as_me:2429: result: $EGREP" >&5 + echo "$as_me:2431: result: $EGREP" >&5 echo "${ECHO_T}$EGREP" >&6 else - echo "$as_me:2432: result: no" >&5 + echo "$as_me:2434: result: no" >&5 echo "${ECHO_T}no" >&6 fi @@ -2437,12 +2439,12 @@ fi done test -n "$EGREP" || EGREP=": " - test "x$ac_cv_path_EGREP" = "x:" && { { echo "$as_me:2440: error: cannot find workable egrep" >&5 + test "x$ac_cv_path_EGREP" = "x:" && { { echo "$as_me:2442: error: cannot find workable egrep" >&5 echo "$as_me: error: cannot find workable egrep" >&2;} { (exit 1); exit 1; }; } fi fi -echo "$as_me:2445: result: $ac_cv_path_EGREP" >&5 +echo "$as_me:2447: result: $ac_cv_path_EGREP" >&5 echo "${ECHO_T}$ac_cv_path_EGREP" >&6 EGREP="$ac_cv_path_EGREP" @@ -2452,7 +2454,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:2455: checking how to run the C preprocessor" >&5 +echo "$as_me:2457: 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 @@ -2473,18 +2475,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 2476 "configure" +#line 2478 "configure" #include "confdefs.h" #include <assert.h> Syntax error _ACEOF -if { (eval echo "$as_me:2481: \"$ac_cpp "conftest.$ac_ext"\"") >&5 +if { (eval echo "$as_me:2483: \"$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:2487: \$? = $ac_status" >&5 + echo "$as_me:2489: \$? = $ac_status" >&5 (exit "$ac_status"); } >/dev/null; then if test -s conftest.err; then ac_cpp_err=$ac_c_preproc_warn_flag @@ -2507,17 +2509,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 2510 "configure" +#line 2512 "configure" #include "confdefs.h" #include <ac_nonexistent.h> _ACEOF -if { (eval echo "$as_me:2514: \"$ac_cpp "conftest.$ac_ext"\"") >&5 +if { (eval echo "$as_me:2516: \"$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:2520: \$? = $ac_status" >&5 + echo "$as_me:2522: \$? = $ac_status" >&5 (exit "$ac_status"); } >/dev/null; then if test -s conftest.err; then ac_cpp_err=$ac_c_preproc_warn_flag @@ -2554,7 +2556,7 @@ fi else ac_cv_prog_CPP=$CPP fi -echo "$as_me:2557: result: $CPP" >&5 +echo "$as_me:2559: result: $CPP" >&5 echo "${ECHO_T}$CPP" >&6 ac_preproc_ok=false for ac_c_preproc_warn_flag in '' yes @@ -2564,18 +2566,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 2567 "configure" +#line 2569 "configure" #include "confdefs.h" #include <assert.h> Syntax error _ACEOF -if { (eval echo "$as_me:2572: \"$ac_cpp "conftest.$ac_ext"\"") >&5 +if { (eval echo "$as_me:2574: \"$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:2578: \$? = $ac_status" >&5 + echo "$as_me:2580: \$? = $ac_status" >&5 (exit "$ac_status"); } >/dev/null; then if test -s conftest.err; then ac_cpp_err=$ac_c_preproc_warn_flag @@ -2598,17 +2600,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 2601 "configure" +#line 2603 "configure" #include "confdefs.h" #include <ac_nonexistent.h> _ACEOF -if { (eval echo "$as_me:2605: \"$ac_cpp "conftest.$ac_ext"\"") >&5 +if { (eval echo "$as_me:2607: \"$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:2611: \$? = $ac_status" >&5 + echo "$as_me:2613: \$? = $ac_status" >&5 (exit "$ac_status"); } >/dev/null; then if test -s conftest.err; then ac_cpp_err=$ac_c_preproc_warn_flag @@ -2636,7 +2638,7 @@ rm -f conftest.err "conftest.$ac_ext" if $ac_preproc_ok; then : else - { { echo "$as_me:2639: error: C preprocessor \"$CPP\" fails sanity check" >&5 + { { echo "$as_me:2641: error: C preprocessor \"$CPP\" fails sanity check" >&5 echo "$as_me: error: C preprocessor \"$CPP\" fails sanity check" >&2;} { (exit 1); exit 1; }; } fi @@ -2649,14 +2651,14 @@ ac_compiler_gnu=$ac_cv_c_compiler_gnu ac_main_return="return" if test $ac_cv_c_compiler_gnu = yes; then - echo "$as_me:2652: checking whether $CC needs -traditional" >&5 + echo "$as_me:2654: checking whether $CC needs -traditional" >&5 echo $ECHO_N "checking whether $CC needs -traditional... $ECHO_C" >&6 if test "${ac_cv_prog_gcc_traditional+set}" = set; then echo $ECHO_N "(cached) $ECHO_C" >&6 else ac_pattern="Autoconf.*'x'" cat >"conftest.$ac_ext" <<_ACEOF -#line 2659 "configure" +#line 2661 "configure" #include "confdefs.h" #include <sgtty.h> int Autoconf = TIOCGETP; @@ -2671,7 +2673,7 @@ rm -rf conftest* if test $ac_cv_prog_gcc_traditional = no; then cat >"conftest.$ac_ext" <<_ACEOF -#line 2674 "configure" +#line 2676 "configure" #include "confdefs.h" #include <termio.h> int Autoconf = TCGETA; @@ -2684,14 +2686,14 @@ rm -rf conftest* fi fi -echo "$as_me:2687: result: $ac_cv_prog_gcc_traditional" >&5 +echo "$as_me:2689: result: $ac_cv_prog_gcc_traditional" >&5 echo "${ECHO_T}$ac_cv_prog_gcc_traditional" >&6 if test $ac_cv_prog_gcc_traditional = yes; then CC="$CC -traditional" fi fi -echo "$as_me:2694: checking whether $CC understands -c and -o together" >&5 +echo "$as_me:2696: checking whether $CC understands -c and -o together" >&5 echo $ECHO_N "checking whether $CC understands -c and -o together... $ECHO_C" >&6 if test "${cf_cv_prog_CC_c_o+set}" = set; then echo $ECHO_N "(cached) $ECHO_C" >&6 @@ -2706,15 +2708,15 @@ CF_EOF # We do the test twice because some compilers refuse to overwrite an # existing .o file with -o, though they will create one. ac_try='$CC $CFLAGS $CPPFLAGS -c conftest.$ac_ext -o conftest2.$ac_objext >&5' -if { (eval echo "$as_me:2709: \"$ac_try\"") >&5 +if { (eval echo "$as_me:2711: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? - echo "$as_me:2712: \$? = $ac_status" >&5 + echo "$as_me:2714: \$? = $ac_status" >&5 (exit "$ac_status"); } && - test -f conftest2.$ac_objext && { (eval echo "$as_me:2714: \"$ac_try\"") >&5 + test -f conftest2.$ac_objext && { (eval echo "$as_me:2716: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? - echo "$as_me:2717: \$? = $ac_status" >&5 + echo "$as_me:2719: \$? = $ac_status" >&5 (exit "$ac_status"); }; then eval cf_cv_prog_CC_c_o=yes @@ -2725,10 +2727,10 @@ rm -rf ./conftest* fi if test "$cf_cv_prog_CC_c_o" = yes; then - echo "$as_me:2728: result: yes" >&5 + echo "$as_me:2730: result: yes" >&5 echo "${ECHO_T}yes" >&6 else - echo "$as_me:2731: result: no" >&5 + echo "$as_me:2733: result: no" >&5 echo "${ECHO_T}no" >&6 fi @@ -2749,7 +2751,7 @@ for ac_prog in mawk gawk nawk awk 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:2752: checking for $ac_word" >&5 +echo "$as_me:2754: checking for $ac_word" >&5 echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6 if test "${ac_cv_prog_AWK+set}" = set; then echo $ECHO_N "(cached) $ECHO_C" >&6 @@ -2764,7 +2766,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_AWK="$ac_prog" -echo "$as_me:2767: found $ac_dir/$ac_word" >&5 +echo "$as_me:2769: found $ac_dir/$ac_word" >&5 break done @@ -2772,21 +2774,21 @@ fi fi AWK=$ac_cv_prog_AWK if test -n "$AWK"; then - echo "$as_me:2775: result: $AWK" >&5 + echo "$as_me:2777: result: $AWK" >&5 echo "${ECHO_T}$AWK" >&6 else - echo "$as_me:2778: result: no" >&5 + echo "$as_me:2780: result: no" >&5 echo "${ECHO_T}no" >&6 fi test -n "$AWK" && break done -test -z "$AWK" && { { echo "$as_me:2785: error: No awk program found" >&5 +test -z "$AWK" && { { echo "$as_me:2787: error: No awk program found" >&5 echo "$as_me: error: No awk program found" >&2;} { (exit 1); exit 1; }; } -echo "$as_me:2789: checking for egrep" >&5 +echo "$as_me:2791: checking for egrep" >&5 echo $ECHO_N "checking for egrep... $ECHO_C" >&6 if test "${ac_cv_prog_egrep+set}" = set; then echo $ECHO_N "(cached) $ECHO_C" >&6 @@ -2796,11 +2798,11 @@ else else ac_cv_prog_egrep='egrep' fi fi -echo "$as_me:2799: result: $ac_cv_prog_egrep" >&5 +echo "$as_me:2801: result: $ac_cv_prog_egrep" >&5 echo "${ECHO_T}$ac_cv_prog_egrep" >&6 EGREP=$ac_cv_prog_egrep - test -z "$EGREP" && { { echo "$as_me:2803: error: No egrep program found" >&5 + test -z "$EGREP" && { { echo "$as_me:2805: error: No egrep program found" >&5 echo "$as_me: error: No egrep program found" >&2;} { (exit 1); exit 1; }; } @@ -2816,7 +2818,7 @@ echo "$as_me: error: No egrep program found" >&2;} # 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:2819: checking for a BSD compatible install" >&5 +echo "$as_me:2821: 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 @@ -2865,7 +2867,7 @@ fi INSTALL=$ac_install_sh fi fi -echo "$as_me:2868: result: $INSTALL" >&5 +echo "$as_me:2870: result: $INSTALL" >&5 echo "${ECHO_T}$INSTALL" >&6 # Use test -z because SunOS4 sh mishandles braces in ${var-val}. @@ -2876,18 +2878,18 @@ test -z "$INSTALL_SCRIPT" && INSTALL_SCRIPT='${INSTALL}' test -z "$INSTALL_DATA" && INSTALL_DATA='${INSTALL} -m 644' -echo "$as_me:2879: checking whether ln -s works" >&5 +echo "$as_me:2881: 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:2883: result: yes" >&5 + echo "$as_me:2885: result: yes" >&5 echo "${ECHO_T}yes" >&6 else - echo "$as_me:2886: result: no, using $LN_S" >&5 + echo "$as_me:2888: result: no, using $LN_S" >&5 echo "${ECHO_T}no, using $LN_S" >&6 fi -echo "$as_me:2890: checking if $LN_S -f options work" >&5 +echo "$as_me:2892: 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 @@ -2899,7 +2901,7 @@ else cf_prog_ln_sf=no fi rm -f conf$$.dst conf$$src -echo "$as_me:2902: result: $cf_prog_ln_sf" >&5 +echo "$as_me:2904: 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" @@ -2916,7 +2918,7 @@ test "$cf_prog_ln_sf" = yes && LN_S="$LN_S -f" # 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:2919: checking for a BSD compatible install" >&5 +echo "$as_me:2921: 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 @@ -2965,7 +2967,7 @@ fi INSTALL=$ac_install_sh fi fi -echo "$as_me:2968: result: $INSTALL" >&5 +echo "$as_me:2970: result: $INSTALL" >&5 echo "${ECHO_T}$INSTALL" >&6 # Use test -z because SunOS4 sh mishandles braces in ${var-val}. @@ -2986,7 +2988,7 @@ case $INSTALL in ;; esac -echo "$as_me:2989: checking if you want to install stripped executables" >&5 +echo "$as_me:2991: checking if you want to install stripped executables" >&5 echo $ECHO_N "checking if you want to install stripped executables... $ECHO_C" >&6 # Check whether --enable-stripping or --disable-stripping was given. @@ -3003,7 +3005,7 @@ else enable_stripping=yes fi; -echo "$as_me:3006: result: $enable_stripping" >&5 +echo "$as_me:3008: result: $enable_stripping" >&5 echo "${ECHO_T}$enable_stripping" >&6 if test "$enable_stripping" = yes @@ -3014,7 +3016,7 @@ else fi : "${INSTALL:=install}" -echo "$as_me:3017: checking if install accepts -p option" >&5 +echo "$as_me:3019: checking if install accepts -p option" >&5 echo $ECHO_N "checking if install accepts -p option... $ECHO_C" >&6 if test "${cf_cv_install_p+set}" = set; then echo $ECHO_N "(cached) $ECHO_C" >&6 @@ -3045,10 +3047,10 @@ else rm -rf ./conftest* fi -echo "$as_me:3048: result: $cf_cv_install_p" >&5 +echo "$as_me:3050: result: $cf_cv_install_p" >&5 echo "${ECHO_T}$cf_cv_install_p" >&6 -echo "$as_me:3051: checking if install needs to be told about ownership" >&5 +echo "$as_me:3053: checking if install needs to be told about ownership" >&5 echo $ECHO_N "checking if install needs to be told about ownership... $ECHO_C" >&6 case `$ac_config_guess` in (*minix) @@ -3059,7 +3061,7 @@ case `$ac_config_guess` in ;; esac -echo "$as_me:3062: result: $with_install_o" >&5 +echo "$as_me:3064: result: $with_install_o" >&5 echo "${ECHO_T}$with_install_o" >&6 if test "x$with_install_o" = xyes then @@ -3068,7 +3070,73 @@ else INSTALL_OPT_O= fi -echo "$as_me:3071: checking for long file names" >&5 +if test -n "$INSTALL_OPT_S" +then + echo "$as_me:3075: checking if you want to specify strip-program" >&5 +echo $ECHO_N "checking if you want to specify strip-program... $ECHO_C" >&6 + +# Check whether --with-strip-program or --without-strip-program was given. +if test "${with_strip_program+set}" = set; then + withval="$with_strip_program" + with_strip_program=$withval +else + with_strip_program=no +fi; + echo "$as_me:3085: result: $with_strip_program" >&5 +echo "${ECHO_T}$with_strip_program" >&6 + if test "$with_strip_program" != no + then + echo "$as_me:3089: checking if strip-program is supported with this installer" >&5 +echo $ECHO_N "checking if strip-program is supported with this installer... $ECHO_C" >&6 + cf_install_program=`echo "$INSTALL" | sed -e 's%[ ]*[ ]-.%%'` + check_install_strip=no + if test -f "$cf_install_program" + then + check_install_version=`"$cf_install_program" --version 2>/dev/null | head -n 1 | grep coreutils` + if test -n "$check_install_version" + then + check_install_strip="option" + else + for check_strip_variable in STRIPBIN STRIP + do + if strings "$cf_install_program" | grep "^$check_strip_variable$" >/dev/null + then + check_install_strip="environ" + break + fi + done + fi + fi + echo "$as_me:3110: result: $check_install_strip" >&5 +echo "${ECHO_T}$check_install_strip" >&6 + case "$check_install_strip" in + (no) + { echo "$as_me:3114: WARNING: $cf_install_program does not support strip program option" >&5 +echo "$as_me: WARNING: $cf_install_program does not support strip program option" >&2;} + with_strip_program=no + ;; + (environ) + cat >install.tmp <<-CF_EOF + #! $SHELL + STRIPBIN="$with_strip_program" \\ + STRIP="$with_strip_program" \\ + $INSTALL "$@" + CF_EOF + INSTALL="`pwd`/install.tmp" + chmod +x "$INSTALL" + test -n "$verbose" && echo " created $INSTALL" 1>&6 + +echo "${as_me:-configure}:3129: testing created $INSTALL ..." 1>&5 + + ;; + (option) + INSTALL_OPT_S="$INSTALL_OPT_S --strip-program=\"$with_strip_program\"" + ;; + esac + fi +fi + +echo "$as_me:3139: checking for long file names" >&5 echo $ECHO_N "checking for long file names... $ECHO_C" >&6 if test "${ac_cv_sys_long_file_names+set}" = set; then echo $ECHO_N "(cached) $ECHO_C" >&6 @@ -3107,7 +3175,7 @@ for ac_dir in . $ac_tmpdirs `eval echo "$prefix/lib" "$exec_prefix/lib"` ; do rm -rf "$ac_xdir" 2>/dev/null done fi -echo "$as_me:3110: result: $ac_cv_sys_long_file_names" >&5 +echo "$as_me:3178: result: $ac_cv_sys_long_file_names" >&5 echo "${ECHO_T}$ac_cv_sys_long_file_names" >&6 if test "$ac_cv_sys_long_file_names" = yes; then @@ -3119,7 +3187,7 @@ fi # if we find pkg-config, check if we should install the ".pc" files. -echo "$as_me:3122: checking if you want to use pkg-config" >&5 +echo "$as_me:3190: 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. @@ -3129,7 +3197,7 @@ if test "${with_pkg_config+set}" = set; then else cf_pkg_config=yes fi; -echo "$as_me:3132: result: $cf_pkg_config" >&5 +echo "$as_me:3200: result: $cf_pkg_config" >&5 echo "${ECHO_T}$cf_pkg_config" >&6 case "$cf_pkg_config" in @@ -3141,7 +3209,7 @@ case "$cf_pkg_config" in 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:3144: checking for $ac_word" >&5 +echo "$as_me:3212: 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 @@ -3158,7 +3226,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_PKG_CONFIG="$ac_dir/$ac_word" - echo "$as_me:3161: found $ac_dir/$ac_word" >&5 + echo "$as_me:3229: found $ac_dir/$ac_word" >&5 break fi done @@ -3169,10 +3237,10 @@ fi PKG_CONFIG=$ac_cv_path_PKG_CONFIG if test -n "$PKG_CONFIG"; then - echo "$as_me:3172: result: $PKG_CONFIG" >&5 + echo "$as_me:3240: result: $PKG_CONFIG" >&5 echo "${ECHO_T}$PKG_CONFIG" >&6 else - echo "$as_me:3175: result: no" >&5 + echo "$as_me:3243: result: no" >&5 echo "${ECHO_T}no" >&6 fi @@ -3181,7 +3249,7 @@ 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:3184: checking for $ac_word" >&5 +echo "$as_me:3252: 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 @@ -3198,7 +3266,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_ac_pt_PKG_CONFIG="$ac_dir/$ac_word" - echo "$as_me:3201: found $ac_dir/$ac_word" >&5 + echo "$as_me:3269: found $ac_dir/$ac_word" >&5 break fi done @@ -3210,10 +3278,10 @@ fi ac_pt_PKG_CONFIG=$ac_cv_path_ac_pt_PKG_CONFIG if test -n "$ac_pt_PKG_CONFIG"; then - echo "$as_me:3213: result: $ac_pt_PKG_CONFIG" >&5 + echo "$as_me:3281: result: $ac_pt_PKG_CONFIG" >&5 echo "${ECHO_T}$ac_pt_PKG_CONFIG" >&6 else - echo "$as_me:3216: result: no" >&5 + echo "$as_me:3284: result: no" >&5 echo "${ECHO_T}no" >&6 fi @@ -3256,105 +3324,159 @@ case ".$PKG_CONFIG" in PKG_CONFIG=`echo "$PKG_CONFIG" | sed -e s%NONE%$cf_path_syntax%` ;; (*) - { { echo "$as_me:3259: error: expected a pathname, not \"$PKG_CONFIG\"" >&5 + { { echo "$as_me:3327: error: expected a pathname, not \"$PKG_CONFIG\"" >&5 echo "$as_me: error: expected a pathname, not \"$PKG_CONFIG\"" >&2;} { (exit 1); exit 1; }; } ;; esac elif test "x$cf_pkg_config" != xno ; then - { echo "$as_me:3266: WARNING: pkg-config is not installed" >&5 + { echo "$as_me:3334: WARNING: pkg-config is not installed" >&5 echo "$as_me: WARNING: pkg-config is not installed" >&2;} fi case "$PKG_CONFIG" in (no|none|yes) - echo "$as_me:3272: checking for pkg-config library directory" >&5 + echo "$as_me:3340: checking for pkg-config library directory" >&5 echo $ECHO_N "checking for pkg-config library directory... $ECHO_C" >&6 ;; (*) - echo "$as_me:3276: checking for $PKG_CONFIG library directory" >&5 + echo "$as_me:3344: checking for $PKG_CONFIG library directory" >&5 echo $ECHO_N "checking for $PKG_CONFIG library directory... $ECHO_C" >&6 ;; esac -PKG_CONFIG_LIBDIR=no +# if $PKG_CONFIG_LIBDIR is set, try to use that +if test -n "$PKG_CONFIG_PATH"; then + cf_search_path=`echo "$PKG_CONFIG_PATH" | sed -e 's/:/ /g' -e 's,^[ ]*,,' -e 's,[ ]*$,,'` +elif test -n "$PKG_CONFIG_LIBDIR"; then + cf_search_path=`echo "$PKG_CONFIG_LIBDIR" | sed -e 's/:/ /g' -e 's,^[ ]*,,' -e 's,[ ]*$,,'` +else + cf_search_path=auto +fi + +# if the option is used, let that override. otherwise default to "libdir" # Check whether --with-pkg-config-libdir or --without-pkg-config-libdir was given. if test "${with_pkg_config_libdir+set}" = set; then withval="$with_pkg_config_libdir" - PKG_CONFIG_LIBDIR=$withval + cf_search_path=$withval else - test "x$PKG_CONFIG" != xnone && PKG_CONFIG_LIBDIR=yes + test "x$PKG_CONFIG" != xnone && test -z "$cf_search_path" && cf_search_path=libdir fi; -case x$PKG_CONFIG_LIBDIR in +case "x$cf_search_path" in +(xlibdir) + PKG_CONFIG_LIBDIR='${libdir}/pkgconfig' + echo "$as_me:3371: result: $PKG_CONFIG_LIBDIR" >&5 +echo "${ECHO_T}$PKG_CONFIG_LIBDIR" >&6 + cf_search_path= + ;; +(x) + ;; +(x/*\ *) + PKG_CONFIG_LIBDIR= + ;; (x/*) + PKG_CONFIG_LIBDIR="$cf_search_path" + echo "$as_me:3382: result: $PKG_CONFIG_LIBDIR" >&5 +echo "${ECHO_T}$PKG_CONFIG_LIBDIR" >&6 + cf_search_path= ;; -(xyes) +(xyes|xauto) + echo "$as_me:3387: result: auto" >&5 +echo "${ECHO_T}auto" >&6 + cf_search_path= # Look for the library directory using the same prefix as the executable - if test "x$PKG_CONFIG" = xnone + echo "$as_me:3391: checking for search-list" >&5 +echo $ECHO_N "checking for search-list... $ECHO_C" >&6 + if test "x$PKG_CONFIG" != xnone then - cf_path=$prefix - else - cf_path=`echo "$PKG_CONFIG" | sed -e 's,/[^/]*/[^/]*$,,'` - fi - - # If you don't like using the default architecture, you have to specify the - # intended library directory and corresponding compiler/linker options. - # - # This case allows for Debian's 2014-flavor of multiarch, along with the - # most common variations before that point. Some other variants spell the - # directory differently, e.g., "pkg-config", and put it in unusual places. - # pkg-config has always been poorly standardized, which is ironic... - case x`(arch) 2>/dev/null` in - (*64) - cf_search_path="\ - $cf_path/lib/*64-linux-gnu \ - $cf_path/share \ - $cf_path/lib64 \ - $cf_path/lib32 \ - $cf_path/lib" - ;; - (*) - cf_search_path="\ - $cf_path/lib/*-linux-gnu \ - $cf_path/share \ - $cf_path/lib32 \ - $cf_path/lib \ - $cf_path/libdata" - ;; - esac + # works for pkg-config since version 0.24 (2009) + # works for pkgconf since version 0.8.3 (2012) + for cf_pkg_program in \ + `echo "$PKG_CONFIG" | sed -e 's,^.*/,,'` \ + pkg-config \ + pkgconf + do + cf_search_path=`"$PKG_CONFIG" --variable=pc_path "$cf_pkg_program" 2>/dev/null | tr : ' '` + test -n "$cf_search_path" && break + done - test -n "$verbose" && echo " list..." 1>&6 + # works for pkg-config since import in 2005 of original 2001 HP code. + test -z "$cf_search_path" && \ + cf_search_path=` + "$PKG_CONFIG" --debug --exists no-such-package 2>&1 | $AWK "\ +/^Scanning directory (#[1-9][0-9]* )?'.*'$/{ \ + sub(\"^[^']*'\",\"\"); \ + sub(\"'.*\",\"\"); \ + printf \" %s\", \\$0; } \ +{ next; } \ +"` + fi -echo "${as_me:-configure}:3331: testing list... ..." 1>&5 + echo "$as_me:3418: result: $cf_search_path" >&5 +echo "${ECHO_T}$cf_search_path" >&6 + ;; +(*) + { { echo "$as_me:3422: error: Unexpected option value: $cf_search_path" >&5 +echo "$as_me: error: Unexpected option value: $cf_search_path" >&2;} + { (exit 1); exit 1; }; } + ;; +esac +if test -n "$cf_search_path" +then + echo "$as_me:3430: checking for first directory" >&5 +echo $ECHO_N "checking for first directory... $ECHO_C" >&6 + cf_pkg_config_path=none for cf_config in $cf_search_path do - test -n "$verbose" && echo " checking $cf_config/pkgconfig" 1>&6 - -echo "${as_me:-configure}:3337: testing checking $cf_config/pkgconfig ..." 1>&5 - - if test -d "$cf_config/pkgconfig" + if test -d "$cf_config" then - PKG_CONFIG_LIBDIR=$cf_config/pkgconfig - echo "$as_me:3342: checking done" >&5 -echo $ECHO_N "checking done... $ECHO_C" >&6 + cf_pkg_config_path=$cf_config break fi done - ;; -(*) - ;; -esac + echo "$as_me:3441: result: $cf_pkg_config_path" >&5 +echo "${ECHO_T}$cf_pkg_config_path" >&6 -if test "x$PKG_CONFIG_LIBDIR" != xno ; then - echo "$as_me:3353: result: $PKG_CONFIG_LIBDIR" >&5 + if test "x$cf_pkg_config_path" != xnone ; then + # limit this to the first directory found + PKG_CONFIG_LIBDIR="$cf_pkg_config_path" + fi + + if test -z "$PKG_CONFIG_LIBDIR" && test -n "$cf_search_path" + then + echo "$as_me:3451: checking for workaround" >&5 +echo $ECHO_N "checking for workaround... $ECHO_C" >&6 + if test "$prefix" = "NONE" ; then + cf_prefix="$ac_default_prefix" + else + cf_prefix="$prefix" + fi + eval cf_libdir=$libdir + cf_libdir=`echo "$cf_libdir" | sed -e "s,^NONE,$cf_prefix,"` + cf_backup= + for cf_config in $cf_search_path + do + case $cf_config in + $cf_libdir/pkgconfig) + PKG_CONFIG_LIBDIR=$cf_libdir/pkgconfig + break + ;; + *) + test -z "$cf_backup" && cf_backup=$cf_config + ;; + esac + done + test -z "$PKG_CONFIG_LIBDIR" && PKG_CONFIG_LIBDIR=$cf_backup + echo "$as_me:3474: result: $PKG_CONFIG_LIBDIR" >&5 echo "${ECHO_T}$PKG_CONFIG_LIBDIR" >&6 + fi fi -echo "$as_me:3357: checking if you want to build test-programs" >&5 +echo "$as_me:3479: checking if you want to build test-programs" >&5 echo $ECHO_N "checking if you want to build test-programs... $ECHO_C" >&6 # Check whether --with-tests or --without-tests was given. @@ -3364,10 +3486,10 @@ if test "${with_tests+set}" = set; then else cf_with_tests=yes fi; -echo "$as_me:3367: result: $cf_with_tests" >&5 +echo "$as_me:3489: result: $cf_with_tests" >&5 echo "${ECHO_T}$cf_with_tests" >&6 -echo "$as_me:3370: checking if we should assume mixed-case filenames" >&5 +echo "$as_me:3492: checking if we should assume mixed-case filenames" >&5 echo $ECHO_N "checking if we should assume mixed-case filenames... $ECHO_C" >&6 # Check whether --enable-mixed-case or --disable-mixed-case was given. @@ -3377,11 +3499,11 @@ if test "${enable_mixed_case+set}" = set; then else enable_mixedcase=auto fi; -echo "$as_me:3380: result: $enable_mixedcase" >&5 +echo "$as_me:3502: result: $enable_mixedcase" >&5 echo "${ECHO_T}$enable_mixedcase" >&6 if test "$enable_mixedcase" = "auto" ; then -echo "$as_me:3384: checking if filesystem supports mixed-case filenames" >&5 +echo "$as_me:3506: 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 @@ -3408,7 +3530,7 @@ else fi fi -echo "$as_me:3411: result: $cf_cv_mixedcase" >&5 +echo "$as_me:3533: result: $cf_cv_mixedcase" >&5 echo "${ECHO_T}$cf_cv_mixedcase" >&6 test "$cf_cv_mixedcase" = yes && cat >>confdefs.h <<\EOF @@ -3426,7 +3548,7 @@ EOF fi # do this after mixed-case option (tags/TAGS is not as important as tic). -echo "$as_me:3429: checking whether ${MAKE-make} sets \${MAKE}" >&5 +echo "$as_me:3551: 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 @@ -3446,20 +3568,82 @@ fi rm -f conftest.make fi if eval "test \"`echo '$ac_cv_prog_make_'${ac_make}_set`\" = yes"; then - echo "$as_me:3449: result: yes" >&5 + echo "$as_me:3571: result: yes" >&5 echo "${ECHO_T}yes" >&6 SET_MAKE= else - echo "$as_me:3453: result: no" >&5 + echo "$as_me:3575: result: no" >&5 echo "${ECHO_T}no" >&6 SET_MAKE="MAKE=${MAKE-make}" fi +echo "$as_me:3580: checking for \".PHONY\" make-support" >&5 +echo $ECHO_N "checking for \".PHONY\" make-support... $ECHO_C" >&6 +if test "${cf_cv_make_PHONY+set}" = set; then + echo $ECHO_N "(cached) $ECHO_C" >&6 +else + + rm -rf conftest* + ( + mkdir conftest || exit 1 + cd conftest + cat >makefile <<'CF_EOF' +.PHONY: always +DATA=0 +always: always.out + @echo "** making $@ $(DATA)" +once: once.out + @echo "** making $@ $(DATA)" +always.out: + @echo "** making $@ $(DATA)" + echo $(DATA) > $@ +once.out: + @echo "** making $@ $(DATA)" + echo $(DATA) > $@ +CF_EOF + for cf_data in 1 2 3 + do + ${MAKE:-make} always DATA=$cf_data + ${MAKE:-make} once DATA=$cf_data + ${MAKE:-make} -t always once + if test -f always ; then + echo "no (case 1)" > ../conftest.tmp + elif test ! -f always.out ; then + echo "no (case 2)" > ../conftest.tmp + elif test ! -f once.out ; then + echo "no (case 3)" > ../conftest.tmp + elif ! cmp -s always.out once.out ; then + echo "no (case 4)" > ../conftest.tmp + diff always.out once.out + else + cf_check="`cat always.out`" + if test "x$cf_check" != "x$cf_data" ; then + echo "no (case 5)" > ../conftest.tmp + else + echo yes > ../conftest.tmp + rm -f ./*.out + continue + fi + fi + break + done + ) >&5 2>&1 + cf_cv_make_PHONY="`cat conftest.tmp`" + rm -rf conftest* + +fi +echo "$as_me:3635: result: $cf_cv_make_PHONY" >&5 +echo "${ECHO_T}$cf_cv_make_PHONY" >&6 +MAKE_NO_PHONY="#" +MAKE_PHONY="#" +test "x$cf_cv_make_PHONY" = xyes && MAKE_PHONY= +test "x$cf_cv_make_PHONY" != xyes && MAKE_NO_PHONY= + 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:3462: checking for $ac_word" >&5 +echo "$as_me:3646: 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 @@ -3474,7 +3658,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:3477: found $ac_dir/$ac_word" >&5 +echo "$as_me:3661: found $ac_dir/$ac_word" >&5 break done @@ -3482,10 +3666,10 @@ fi fi CTAGS=$ac_cv_prog_CTAGS if test -n "$CTAGS"; then - echo "$as_me:3485: result: $CTAGS" >&5 + echo "$as_me:3669: result: $CTAGS" >&5 echo "${ECHO_T}$CTAGS" >&6 else - echo "$as_me:3488: result: no" >&5 + echo "$as_me:3672: result: no" >&5 echo "${ECHO_T}no" >&6 fi @@ -3496,7 +3680,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:3499: checking for $ac_word" >&5 +echo "$as_me:3683: 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 @@ -3511,7 +3695,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:3514: found $ac_dir/$ac_word" >&5 +echo "$as_me:3698: found $ac_dir/$ac_word" >&5 break done @@ -3519,10 +3703,10 @@ fi fi ETAGS=$ac_cv_prog_ETAGS if test -n "$ETAGS"; then - echo "$as_me:3522: result: $ETAGS" >&5 + echo "$as_me:3706: result: $ETAGS" >&5 echo "${ECHO_T}$ETAGS" >&6 else - echo "$as_me:3525: result: no" >&5 + echo "$as_me:3709: result: no" >&5 echo "${ECHO_T}no" >&6 fi @@ -3531,7 +3715,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:3534: checking for $ac_word" >&5 +echo "$as_me:3718: 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 @@ -3546,7 +3730,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:3549: found $ac_dir/$ac_word" >&5 +echo "$as_me:3733: found $ac_dir/$ac_word" >&5 break done @@ -3555,17 +3739,17 @@ fi fi MAKE_LOWER_TAGS=$ac_cv_prog_MAKE_LOWER_TAGS if test -n "$MAKE_LOWER_TAGS"; then - echo "$as_me:3558: result: $MAKE_LOWER_TAGS" >&5 + echo "$as_me:3742: result: $MAKE_LOWER_TAGS" >&5 echo "${ECHO_T}$MAKE_LOWER_TAGS" >&6 else - echo "$as_me:3561: result: no" >&5 + echo "$as_me:3745: 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:3568: checking for $ac_word" >&5 +echo "$as_me:3752: 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 @@ -3580,7 +3764,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:3583: found $ac_dir/$ac_word" >&5 +echo "$as_me:3767: found $ac_dir/$ac_word" >&5 break done @@ -3589,10 +3773,10 @@ fi fi MAKE_UPPER_TAGS=$ac_cv_prog_MAKE_UPPER_TAGS if test -n "$MAKE_UPPER_TAGS"; then - echo "$as_me:3592: result: $MAKE_UPPER_TAGS" >&5 + echo "$as_me:3776: result: $MAKE_UPPER_TAGS" >&5 echo "${ECHO_T}$MAKE_UPPER_TAGS" >&6 else - echo "$as_me:3595: result: no" >&5 + echo "$as_me:3779: result: no" >&5 echo "${ECHO_T}no" >&6 fi @@ -3612,7 +3796,7 @@ else MAKE_LOWER_TAGS="#" fi -echo "$as_me:3615: checking for makeflags variable" >&5 +echo "$as_me:3799: 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 @@ -3642,7 +3826,7 @@ CF_EOF ;; (*) -echo "${as_me:-configure}:3645: testing given option \"$cf_option\",no match \"$cf_result\" ..." 1>&5 +echo "${as_me:-configure}:3829: testing given option \"$cf_option\",no match \"$cf_result\" ..." 1>&5 ;; esac @@ -3650,13 +3834,13 @@ echo "${as_me:-configure}:3645: testing given option \"$cf_option\",no match \"$ rm -f cf_makeflags.tmp fi -echo "$as_me:3653: result: $cf_cv_makeflags" >&5 +echo "$as_me:3837: result: $cf_cv_makeflags" >&5 echo "${ECHO_T}$cf_cv_makeflags" >&6 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:3659: checking for $ac_word" >&5 +echo "$as_me:3843: 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 @@ -3671,7 +3855,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:3674: found $ac_dir/$ac_word" >&5 +echo "$as_me:3858: found $ac_dir/$ac_word" >&5 break done @@ -3679,10 +3863,10 @@ fi fi RANLIB=$ac_cv_prog_RANLIB if test -n "$RANLIB"; then - echo "$as_me:3682: result: $RANLIB" >&5 + echo "$as_me:3866: result: $RANLIB" >&5 echo "${ECHO_T}$RANLIB" >&6 else - echo "$as_me:3685: result: no" >&5 + echo "$as_me:3869: result: no" >&5 echo "${ECHO_T}no" >&6 fi @@ -3691,7 +3875,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:3694: checking for $ac_word" >&5 +echo "$as_me:3878: 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 @@ -3706,7 +3890,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:3709: found $ac_dir/$ac_word" >&5 +echo "$as_me:3893: found $ac_dir/$ac_word" >&5 break done @@ -3715,10 +3899,10 @@ fi fi ac_ct_RANLIB=$ac_cv_prog_ac_ct_RANLIB if test -n "$ac_ct_RANLIB"; then - echo "$as_me:3718: result: $ac_ct_RANLIB" >&5 + echo "$as_me:3902: result: $ac_ct_RANLIB" >&5 echo "${ECHO_T}$ac_ct_RANLIB" >&6 else - echo "$as_me:3721: result: no" >&5 + echo "$as_me:3905: result: no" >&5 echo "${ECHO_T}no" >&6 fi @@ -3730,7 +3914,7 @@ fi if test -n "$ac_tool_prefix"; then # Extract the first word of "${ac_tool_prefix}ld", so it can be a program name with args. set dummy ${ac_tool_prefix}ld; ac_word=$2 -echo "$as_me:3733: checking for $ac_word" >&5 +echo "$as_me:3917: checking for $ac_word" >&5 echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6 if test "${ac_cv_prog_LD+set}" = set; then echo $ECHO_N "(cached) $ECHO_C" >&6 @@ -3745,7 +3929,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_LD="${ac_tool_prefix}ld" -echo "$as_me:3748: found $ac_dir/$ac_word" >&5 +echo "$as_me:3932: found $ac_dir/$ac_word" >&5 break done @@ -3753,10 +3937,10 @@ fi fi LD=$ac_cv_prog_LD if test -n "$LD"; then - echo "$as_me:3756: result: $LD" >&5 + echo "$as_me:3940: result: $LD" >&5 echo "${ECHO_T}$LD" >&6 else - echo "$as_me:3759: result: no" >&5 + echo "$as_me:3943: result: no" >&5 echo "${ECHO_T}no" >&6 fi @@ -3765,7 +3949,7 @@ if test -z "$ac_cv_prog_LD"; then ac_ct_LD=$LD # Extract the first word of "ld", so it can be a program name with args. set dummy ld; ac_word=$2 -echo "$as_me:3768: checking for $ac_word" >&5 +echo "$as_me:3952: checking for $ac_word" >&5 echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6 if test "${ac_cv_prog_ac_ct_LD+set}" = set; then echo $ECHO_N "(cached) $ECHO_C" >&6 @@ -3780,7 +3964,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_LD="ld" -echo "$as_me:3783: found $ac_dir/$ac_word" >&5 +echo "$as_me:3967: found $ac_dir/$ac_word" >&5 break done @@ -3789,10 +3973,10 @@ fi fi ac_ct_LD=$ac_cv_prog_ac_ct_LD if test -n "$ac_ct_LD"; then - echo "$as_me:3792: result: $ac_ct_LD" >&5 + echo "$as_me:3976: result: $ac_ct_LD" >&5 echo "${ECHO_T}$ac_ct_LD" >&6 else - echo "$as_me:3795: result: no" >&5 + echo "$as_me:3979: result: no" >&5 echo "${ECHO_T}no" >&6 fi @@ -3804,7 +3988,7 @@ fi 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:3807: checking for $ac_word" >&5 +echo "$as_me:3991: 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 @@ -3819,7 +4003,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:3822: found $ac_dir/$ac_word" >&5 +echo "$as_me:4006: found $ac_dir/$ac_word" >&5 break done @@ -3827,10 +4011,10 @@ fi fi AR=$ac_cv_prog_AR if test -n "$AR"; then - echo "$as_me:3830: result: $AR" >&5 + echo "$as_me:4014: result: $AR" >&5 echo "${ECHO_T}$AR" >&6 else - echo "$as_me:3833: result: no" >&5 + echo "$as_me:4017: result: no" >&5 echo "${ECHO_T}no" >&6 fi @@ -3839,7 +4023,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:3842: checking for $ac_word" >&5 +echo "$as_me:4026: 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 @@ -3854,7 +4038,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:3857: found $ac_dir/$ac_word" >&5 +echo "$as_me:4041: found $ac_dir/$ac_word" >&5 break done @@ -3863,10 +4047,10 @@ fi fi ac_ct_AR=$ac_cv_prog_ac_ct_AR if test -n "$ac_ct_AR"; then - echo "$as_me:3866: result: $ac_ct_AR" >&5 + echo "$as_me:4050: result: $ac_ct_AR" >&5 echo "${ECHO_T}$ac_ct_AR" >&6 else - echo "$as_me:3869: result: no" >&5 + echo "$as_me:4053: result: no" >&5 echo "${ECHO_T}no" >&6 fi @@ -3878,7 +4062,7 @@ fi 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:3881: checking for $ac_word" >&5 +echo "$as_me:4065: 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 @@ -3893,7 +4077,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:3896: found $ac_dir/$ac_word" >&5 +echo "$as_me:4080: found $ac_dir/$ac_word" >&5 break done @@ -3901,10 +4085,10 @@ fi fi AR=$ac_cv_prog_AR if test -n "$AR"; then - echo "$as_me:3904: result: $AR" >&5 + echo "$as_me:4088: result: $AR" >&5 echo "${ECHO_T}$AR" >&6 else - echo "$as_me:3907: result: no" >&5 + echo "$as_me:4091: result: no" >&5 echo "${ECHO_T}no" >&6 fi @@ -3913,7 +4097,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:3916: checking for $ac_word" >&5 +echo "$as_me:4100: 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 @@ -3928,7 +4112,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:3931: found $ac_dir/$ac_word" >&5 +echo "$as_me:4115: found $ac_dir/$ac_word" >&5 break done @@ -3937,10 +4121,10 @@ fi fi ac_ct_AR=$ac_cv_prog_ac_ct_AR if test -n "$ac_ct_AR"; then - echo "$as_me:3940: result: $ac_ct_AR" >&5 + echo "$as_me:4124: result: $ac_ct_AR" >&5 echo "${ECHO_T}$ac_ct_AR" >&6 else - echo "$as_me:3943: result: no" >&5 + echo "$as_me:4127: result: no" >&5 echo "${ECHO_T}no" >&6 fi @@ -3949,7 +4133,7 @@ else AR="$ac_cv_prog_AR" fi -echo "$as_me:3952: checking for options to update archives" >&5 +echo "$as_me:4136: checking for options to update archives" >&5 echo $ECHO_N "checking for options to update archives... $ECHO_C" >&6 if test "${cf_cv_ar_flags+set}" = set; then echo $ECHO_N "(cached) $ECHO_C" >&6 @@ -3986,13 +4170,13 @@ else rm -f conftest.a cat >"conftest.$ac_ext" <<EOF -#line 3989 "configure" +#line 4173 "configure" int testdata[3] = { 123, 456, 789 }; EOF - if { (eval echo "$as_me:3992: \"$ac_compile\"") >&5 + if { (eval echo "$as_me:4176: \"$ac_compile\"") >&5 (eval $ac_compile) 2>&5 ac_status=$? - echo "$as_me:3995: \$? = $ac_status" >&5 + echo "$as_me:4179: \$? = $ac_status" >&5 (exit "$ac_status"); } ; then echo "$AR $ARFLAGS $cf_ar_flags conftest.a conftest.$ac_cv_objext" >&5 $AR $ARFLAGS "$cf_ar_flags" conftest.a "conftest.$ac_cv_objext" 2>&5 1>/dev/null @@ -4003,7 +4187,7 @@ EOF else test -n "$verbose" && echo " cannot compile test-program" 1>&6 -echo "${as_me:-configure}:4006: testing cannot compile test-program ..." 1>&5 +echo "${as_me:-configure}:4190: testing cannot compile test-program ..." 1>&5 break fi @@ -4013,7 +4197,7 @@ echo "${as_me:-configure}:4006: testing cannot compile test-program ..." 1>&5 esac fi -echo "$as_me:4016: result: $cf_cv_ar_flags" >&5 +echo "$as_me:4200: result: $cf_cv_ar_flags" >&5 echo "${ECHO_T}$cf_cv_ar_flags" >&6 if test -n "$ARFLAGS" ; then @@ -4024,17 +4208,17 @@ else ARFLAGS=$cf_cv_ar_flags fi - echo "$as_me:4027: checking for PATH separator" >&5 + echo "$as_me:4211: 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:4034: result: $PATH_SEPARATOR" >&5 + echo "$as_me:4218: result: $PATH_SEPARATOR" >&5 echo "${ECHO_T}$PATH_SEPARATOR" >&6 -echo "$as_me:4037: checking if you have specified an install-prefix" >&5 +echo "$as_me:4221: checking if you have specified an install-prefix" >&5 echo $ECHO_N "checking if you have specified an install-prefix... $ECHO_C" >&6 # Check whether --with-install-prefix or --without-install-prefix was given. @@ -4047,7 +4231,7 @@ if test "${with_install_prefix+set}" = set; then ;; esac fi; -echo "$as_me:4050: result: $DESTDIR" >&5 +echo "$as_me:4234: result: $DESTDIR" >&5 echo "${ECHO_T}$DESTDIR" >&6 ############################################################################### @@ -4075,7 +4259,7 @@ else 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:4078: checking for $ac_word" >&5 +echo "$as_me:4262: checking for $ac_word" >&5 echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6 if test "${ac_cv_prog_BUILD_CC+set}" = set; then echo $ECHO_N "(cached) $ECHO_C" >&6 @@ -4090,7 +4274,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_BUILD_CC="$ac_prog" -echo "$as_me:4093: found $ac_dir/$ac_word" >&5 +echo "$as_me:4277: found $ac_dir/$ac_word" >&5 break done @@ -4098,10 +4282,10 @@ fi fi BUILD_CC=$ac_cv_prog_BUILD_CC if test -n "$BUILD_CC"; then - echo "$as_me:4101: result: $BUILD_CC" >&5 + echo "$as_me:4285: result: $BUILD_CC" >&5 echo "${ECHO_T}$BUILD_CC" >&6 else - echo "$as_me:4104: result: no" >&5 + echo "$as_me:4288: result: no" >&5 echo "${ECHO_T}no" >&6 fi @@ -4110,12 +4294,12 @@ done test -n "$BUILD_CC" || BUILD_CC="none" fi; - echo "$as_me:4113: checking for native build C compiler" >&5 + echo "$as_me:4297: checking for native build C compiler" >&5 echo $ECHO_N "checking for native build C compiler... $ECHO_C" >&6 - echo "$as_me:4115: result: $BUILD_CC" >&5 + echo "$as_me:4299: result: $BUILD_CC" >&5 echo "${ECHO_T}$BUILD_CC" >&6 - echo "$as_me:4118: checking for native build C preprocessor" >&5 + echo "$as_me:4302: checking for native build C preprocessor" >&5 echo $ECHO_N "checking for native build C preprocessor... $ECHO_C" >&6 # Check whether --with-build-cpp or --without-build-cpp was given. @@ -4125,10 +4309,10 @@ if test "${with_build_cpp+set}" = set; then else BUILD_CPP='${BUILD_CC} -E' fi; - echo "$as_me:4128: result: $BUILD_CPP" >&5 + echo "$as_me:4312: result: $BUILD_CPP" >&5 echo "${ECHO_T}$BUILD_CPP" >&6 - echo "$as_me:4131: checking for native build C flags" >&5 + echo "$as_me:4315: checking for native build C flags" >&5 echo $ECHO_N "checking for native build C flags... $ECHO_C" >&6 # Check whether --with-build-cflags or --without-build-cflags was given. @@ -4136,10 +4320,10 @@ if test "${with_build_cflags+set}" = set; then withval="$with_build_cflags" BUILD_CFLAGS="$withval" fi; - echo "$as_me:4139: result: $BUILD_CFLAGS" >&5 + echo "$as_me:4323: result: $BUILD_CFLAGS" >&5 echo "${ECHO_T}$BUILD_CFLAGS" >&6 - echo "$as_me:4142: checking for native build C preprocessor-flags" >&5 + echo "$as_me:4326: checking for native build C preprocessor-flags" >&5 echo $ECHO_N "checking for native build C preprocessor-flags... $ECHO_C" >&6 # Check whether --with-build-cppflags or --without-build-cppflags was given. @@ -4147,10 +4331,10 @@ if test "${with_build_cppflags+set}" = set; then withval="$with_build_cppflags" BUILD_CPPFLAGS="$withval" fi; - echo "$as_me:4150: result: $BUILD_CPPFLAGS" >&5 + echo "$as_me:4334: result: $BUILD_CPPFLAGS" >&5 echo "${ECHO_T}$BUILD_CPPFLAGS" >&6 - echo "$as_me:4153: checking for native build linker-flags" >&5 + echo "$as_me:4337: checking for native build linker-flags" >&5 echo $ECHO_N "checking for native build linker-flags... $ECHO_C" >&6 # Check whether --with-build-ldflags or --without-build-ldflags was given. @@ -4158,10 +4342,10 @@ if test "${with_build_ldflags+set}" = set; then withval="$with_build_ldflags" BUILD_LDFLAGS="$withval" fi; - echo "$as_me:4161: result: $BUILD_LDFLAGS" >&5 + echo "$as_me:4345: result: $BUILD_LDFLAGS" >&5 echo "${ECHO_T}$BUILD_LDFLAGS" >&6 - echo "$as_me:4164: checking for native build linker-libraries" >&5 + echo "$as_me:4348: checking for native build linker-libraries" >&5 echo $ECHO_N "checking for native build linker-libraries... $ECHO_C" >&6 # Check whether --with-build-libs or --without-build-libs was given. @@ -4169,7 +4353,7 @@ if test "${with_build_libs+set}" = set; then withval="$with_build_libs" BUILD_LIBS="$withval" fi; - echo "$as_me:4172: result: $BUILD_LIBS" >&5 + echo "$as_me:4356: result: $BUILD_LIBS" >&5 echo "${ECHO_T}$BUILD_LIBS" >&6 # this assumes we're on Unix. @@ -4178,8 +4362,59 @@ echo "${ECHO_T}$BUILD_LIBS" >&6 : ${BUILD_CC:='${CC}'} - if { test "$BUILD_CC" = "$CC" || test "$BUILD_CC" = '${CC}'; } ; then - { { echo "$as_me:4182: error: Cross-build requires two compilers. + echo "$as_me:4365: checking if the build-compiler \"$BUILD_CC\" works" >&5 +echo $ECHO_N "checking if the build-compiler \"$BUILD_CC\" works... $ECHO_C" >&6 + + cf_save_crossed=$cross_compiling + cf_save_ac_link=$ac_link + cross_compiling=no + cf_build_cppflags=$BUILD_CPPFLAGS + test "$cf_build_cppflags" = "#" && cf_build_cppflags= + ac_link='$BUILD_CC -o "conftest$ac_exeext" $BUILD_CFLAGS $cf_build_cppflags $BUILD_LDFLAGS "conftest.$ac_ext" $BUILD_LIBS >&5' + + if test "$cross_compiling" = yes; then + cf_ok_build_cc=unknown +else + cat >"conftest.$ac_ext" <<_ACEOF +#line 4379 "configure" +#include "confdefs.h" +#include <stdio.h> + int main(int argc, char *argv[]) + { + ${cf_cv_main_return:-return}(argc < 0 || argv == 0 || argv[0] == 0); + } + +_ACEOF +rm -f "conftest$ac_exeext" +if { (eval echo "$as_me:4389: \"$ac_link\"") >&5 + (eval $ac_link) 2>&5 + ac_status=$? + echo "$as_me:4392: \$? = $ac_status" >&5 + (exit "$ac_status"); } && { ac_try='"./conftest$ac_exeext"' + { (eval echo "$as_me:4394: \"$ac_try\"") >&5 + (eval $ac_try) 2>&5 + ac_status=$? + echo "$as_me:4397: \$? = $ac_status" >&5 + (exit "$ac_status"); }; }; then + cf_ok_build_cc=yes +else + echo "$as_me: program exited with status $ac_status" >&5 +echo "$as_me: failed program was:" >&5 +cat "conftest.$ac_ext" >&5 +cf_ok_build_cc=no +fi +rm -f core ./core.* ./*.core "conftest$ac_exeext" "conftest.$ac_objext" "conftest.$ac_ext" +fi + + cross_compiling=$cf_save_crossed + ac_link=$cf_save_ac_link + + echo "$as_me:4412: result: $cf_ok_build_cc" >&5 +echo "${ECHO_T}$cf_ok_build_cc" >&6 + + if test "$cf_ok_build_cc" != yes + then + { { echo "$as_me:4417: error: Cross-build requires two compilers. Use --with-build-cc to specify the native compiler." >&5 echo "$as_me: error: Cross-build requires two compilers. Use --with-build-cc to specify the native compiler." >&2;} @@ -4204,7 +4439,7 @@ fi ### shared, for example. cf_list_models="" -echo "$as_me:4207: checking if you want to build shared C-objects" >&5 +echo "$as_me:4442: checking if you want to build shared C-objects" >&5 echo $ECHO_N "checking if you want to build shared C-objects... $ECHO_C" >&6 # Check whether --with-shared or --without-shared was given. @@ -4214,27 +4449,27 @@ if test "${with_shared+set}" = set; then else with_shared=no fi; -echo "$as_me:4217: result: $with_shared" >&5 +echo "$as_me:4452: result: $with_shared" >&5 echo "${ECHO_T}$with_shared" >&6 test "$with_shared" = "yes" && cf_list_models="$cf_list_models shared" -echo "$as_me:4221: checking for specified models" >&5 +echo "$as_me:4456: checking for specified models" >&5 echo $ECHO_N "checking for specified models... $ECHO_C" >&6 test -z "$cf_list_models" && cf_list_models=normal -echo "$as_me:4224: result: $cf_list_models" >&5 +echo "$as_me:4459: result: $cf_list_models" >&5 echo "${ECHO_T}$cf_list_models" >&6 ### Use the first model as the default, and save its suffix for use in building ### up test-applications. -echo "$as_me:4229: checking for default model" >&5 +echo "$as_me:4464: checking for default model" >&5 echo $ECHO_N "checking for default model... $ECHO_C" >&6 DFT_LWR_MODEL=`echo "$cf_list_models" | $AWK '{print $1}'` -echo "$as_me:4232: result: $DFT_LWR_MODEL" >&5 +echo "$as_me:4467: result: $DFT_LWR_MODEL" >&5 echo "${ECHO_T}$DFT_LWR_MODEL" >&6 DFT_UPR_MODEL=`echo "$DFT_LWR_MODEL" | sed y%abcdefghijklmnopqrstuvwxyz./-%ABCDEFGHIJKLMNOPQRSTUVWXYZ___%` -echo "$as_me:4237: checking for specific curses-directory" >&5 +echo "$as_me:4472: 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. @@ -4244,7 +4479,7 @@ if test "${with_curses_dir+set}" = set; then else cf_cv_curses_dir=no fi; -echo "$as_me:4247: result: $cf_cv_curses_dir" >&5 +echo "$as_me:4482: 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" @@ -4275,7 +4510,7 @@ case ".$withval" in withval=`echo "$withval" | sed -e s%NONE%$cf_path_syntax%` ;; (*) - { { echo "$as_me:4278: error: expected a pathname, not \"$withval\"" >&5 + { { echo "$as_me:4513: error: expected a pathname, not \"$withval\"" >&5 echo "$as_me: error: expected a pathname, not \"$withval\"" >&2;} { (exit 1); exit 1; }; } ;; @@ -4311,7 +4546,7 @@ if test -n "$cf_cv_curses_dir/include" ; then CPPFLAGS="${CPPFLAGS}-I$cf_add_incdir" cat >"conftest.$ac_ext" <<_ACEOF -#line 4314 "configure" +#line 4549 "configure" #include "confdefs.h" #include <stdio.h> int @@ -4323,16 +4558,16 @@ printf("Hello") } _ACEOF rm -f "conftest.$ac_objext" -if { (eval echo "$as_me:4326: \"$ac_compile\"") >&5 +if { (eval echo "$as_me:4561: \"$ac_compile\"") >&5 (eval $ac_compile) 2>&5 ac_status=$? - echo "$as_me:4329: \$? = $ac_status" >&5 + echo "$as_me:4564: \$? = $ac_status" >&5 (exit "$ac_status"); } && { ac_try='test -s "conftest.$ac_objext"' - { (eval echo "$as_me:4332: \"$ac_try\"") >&5 + { (eval echo "$as_me:4567: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? - echo "$as_me:4335: \$? = $ac_status" >&5 + echo "$as_me:4570: \$? = $ac_status" >&5 (exit "$ac_status"); }; }; then : else @@ -4349,7 +4584,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}:4352: testing adding $cf_add_incdir to include-path ..." 1>&5 +echo "${as_me:-configure}:4587: testing adding $cf_add_incdir to include-path ..." 1>&5 CPPFLAGS="$CPPFLAGS -I$cf_add_incdir" @@ -4385,7 +4620,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}:4388: testing adding $cf_add_libdir to library-path ..." 1>&5 +echo "${as_me:-configure}:4623: testing adding $cf_add_libdir to library-path ..." 1>&5 LDFLAGS="-L$cf_add_libdir $LDFLAGS" fi @@ -4400,13 +4635,13 @@ cf_ncuconfig_root=ncurses cf_have_ncuconfig=no if test "x${PKG_CONFIG:=none}" != xnone; then - echo "$as_me:4403: checking pkg-config for $cf_ncuconfig_root" >&5 + echo "$as_me:4638: checking pkg-config for $cf_ncuconfig_root" >&5 echo $ECHO_N "checking pkg-config for $cf_ncuconfig_root... $ECHO_C" >&6 if "$PKG_CONFIG" --exists $cf_ncuconfig_root ; then - echo "$as_me:4406: result: yes" >&5 + echo "$as_me:4641: result: yes" >&5 echo "${ECHO_T}yes" >&6 - echo "$as_me:4409: checking if the $cf_ncuconfig_root package files work" >&5 + echo "$as_me:4644: checking if the $cf_ncuconfig_root package files work" >&5 echo $ECHO_N "checking if the $cf_ncuconfig_root package files work... $ECHO_C" >&6 cf_have_ncuconfig=unknown @@ -4539,7 +4774,7 @@ done LIBS="$cf_add_libs" cat >"conftest.$ac_ext" <<_ACEOF -#line 4542 "configure" +#line 4777 "configure" #include "confdefs.h" #include <${cf_cv_ncurses_header:-curses.h}> int @@ -4551,37 +4786,37 @@ initscr(); mousemask(0,0); tigetstr((char *)0); } _ACEOF rm -f "conftest.$ac_objext" "conftest$ac_exeext" -if { (eval echo "$as_me:4554: \"$ac_link\"") >&5 +if { (eval echo "$as_me:4789: \"$ac_link\"") >&5 (eval $ac_link) 2>&5 ac_status=$? - echo "$as_me:4557: \$? = $ac_status" >&5 + echo "$as_me:4792: \$? = $ac_status" >&5 (exit "$ac_status"); } && { ac_try='test -s "conftest$ac_exeext"' - { (eval echo "$as_me:4560: \"$ac_try\"") >&5 + { (eval echo "$as_me:4795: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? - echo "$as_me:4563: \$? = $ac_status" >&5 + echo "$as_me:4798: \$? = $ac_status" >&5 (exit "$ac_status"); }; }; then if test "$cross_compiling" = yes; then cf_test_ncuconfig=maybe else cat >"conftest.$ac_ext" <<_ACEOF -#line 4569 "configure" +#line 4804 "configure" #include "confdefs.h" #include <${cf_cv_ncurses_header:-curses.h}> int main(void) - { char *xx = curses_version(); return (xx == 0); } + { const char *xx = curses_version(); return (xx == 0); } _ACEOF rm -f "conftest$ac_exeext" -if { (eval echo "$as_me:4576: \"$ac_link\"") >&5 +if { (eval echo "$as_me:4811: \"$ac_link\"") >&5 (eval $ac_link) 2>&5 ac_status=$? - echo "$as_me:4579: \$? = $ac_status" >&5 + echo "$as_me:4814: \$? = $ac_status" >&5 (exit "$ac_status"); } && { ac_try='"./conftest$ac_exeext"' - { (eval echo "$as_me:4581: \"$ac_try\"") >&5 + { (eval echo "$as_me:4816: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? - echo "$as_me:4584: \$? = $ac_status" >&5 + echo "$as_me:4819: \$? = $ac_status" >&5 (exit "$ac_status"); }; }; then cf_test_ncuconfig=yes else @@ -4612,12 +4847,38 @@ rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext" ;; esac +for cf_add_cflags in $cf_pkg_cflags +do + case "x$cf_add_cflags" in + (x-[DU]*) + +cf_tmp_cflag=`echo "x$cf_add_cflags" | sed -e 's/^.//' -e 's/=.*//'` +while true +do + cf_old_cflag=`echo "x$CFLAGS" | sed -e 's/^.//' -e 's/[ ][ ]*-/ -/g' -e "s%$cf_tmp_cflag\\(=[^ ][^ ]*\\)\?%%" -e 's/^[ ]*//' -e 's%[ ][ ]*-D% -D%g' -e 's%[ ][ ]*-I% -I%g'` + test "$CFLAGS" != "$cf_old_cflag" || break + + CFLAGS="$cf_old_cflag" +done + +cf_tmp_cflag=`echo "x$cf_add_cflags" | sed -e 's/^.//' -e 's/=.*//'` +while true +do + cf_old_cflag=`echo "x$CPPFLAGS" | sed -e 's/^.//' -e 's/[ ][ ]*-/ -/g' -e "s%$cf_tmp_cflag\\(=[^ ][^ ]*\\)\?%%" -e 's/^[ ]*//' -e 's%[ ][ ]*-D% -D%g' -e 's%[ ][ ]*-I% -I%g'` + test "$CPPFLAGS" != "$cf_old_cflag" || break + + CPPFLAGS="$cf_old_cflag" +done + + ;; + esac + cf_fix_cppflags=no cf_new_cflags= cf_new_cppflags= cf_new_extra_cppflags= -for cf_add_cflags in $cf_pkg_cflags +for cf_add_cflags in $cf_add_cflags do case "$cf_fix_cppflags" in (no) @@ -4710,6 +4971,8 @@ if test -n "$cf_new_extra_cppflags" ; then fi +done + cf_add_libs="$LIBS" # reverse order cf_add_0lib= @@ -4727,7 +4990,7 @@ done LIBS="$cf_add_libs" cat >"conftest.$ac_ext" <<_ACEOF -#line 4730 "configure" +#line 4993 "configure" #include "confdefs.h" #include <${cf_cv_ncurses_header:-curses.h}> int @@ -4739,37 +5002,37 @@ initscr(); mousemask(0,0); tigetstr((char *)0); } _ACEOF rm -f "conftest.$ac_objext" "conftest$ac_exeext" -if { (eval echo "$as_me:4742: \"$ac_link\"") >&5 +if { (eval echo "$as_me:5005: \"$ac_link\"") >&5 (eval $ac_link) 2>&5 ac_status=$? - echo "$as_me:4745: \$? = $ac_status" >&5 + echo "$as_me:5008: \$? = $ac_status" >&5 (exit "$ac_status"); } && { ac_try='test -s "conftest$ac_exeext"' - { (eval echo "$as_me:4748: \"$ac_try\"") >&5 + { (eval echo "$as_me:5011: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? - echo "$as_me:4751: \$? = $ac_status" >&5 + echo "$as_me:5014: \$? = $ac_status" >&5 (exit "$ac_status"); }; }; then if test "$cross_compiling" = yes; then cf_have_ncuconfig=maybe else cat >"conftest.$ac_ext" <<_ACEOF -#line 4757 "configure" +#line 5020 "configure" #include "confdefs.h" #include <${cf_cv_ncurses_header:-curses.h}> int main(void) - { char *xx = curses_version(); return (xx == 0); } + { const char *xx = curses_version(); return (xx == 0); } _ACEOF rm -f "conftest$ac_exeext" -if { (eval echo "$as_me:4764: \"$ac_link\"") >&5 +if { (eval echo "$as_me:5027: \"$ac_link\"") >&5 (eval $ac_link) 2>&5 ac_status=$? - echo "$as_me:4767: \$? = $ac_status" >&5 + echo "$as_me:5030: \$? = $ac_status" >&5 (exit "$ac_status"); } && { ac_try='"./conftest$ac_exeext"' - { (eval echo "$as_me:4769: \"$ac_try\"") >&5 + { (eval echo "$as_me:5032: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? - echo "$as_me:4772: \$? = $ac_status" >&5 + echo "$as_me:5035: \$? = $ac_status" >&5 (exit "$ac_status"); }; }; then cf_have_ncuconfig=yes else @@ -4786,7 +5049,7 @@ cat "conftest.$ac_ext" >&5 cf_have_ncuconfig=no fi rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext" - echo "$as_me:4789: result: $cf_have_ncuconfig" >&5 + echo "$as_me:5052: result: $cf_have_ncuconfig" >&5 echo "${ECHO_T}$cf_have_ncuconfig" >&6 test "$cf_have_ncuconfig" = maybe && cf_have_ncuconfig=yes if test "$cf_have_ncuconfig" != "yes" @@ -4802,7 +5065,7 @@ EOF NCURSES_CONFIG_PKG=$cf_ncuconfig_root -echo "$as_me:4805: checking for terminfo header" >&5 +echo "$as_me:5068: 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 @@ -4820,7 +5083,7 @@ esac for cf_test in $cf_term_header "ncurses/term.h" "ncursesw/term.h" do cat >"conftest.$ac_ext" <<_ACEOF -#line 4823 "configure" +#line 5086 "configure" #include "confdefs.h" #include <stdio.h> #include <${cf_cv_ncurses_header:-curses.h}> @@ -4835,16 +5098,16 @@ int x = auto_left_margin; (void)x } _ACEOF rm -f "conftest.$ac_objext" -if { (eval echo "$as_me:4838: \"$ac_compile\"") >&5 +if { (eval echo "$as_me:5101: \"$ac_compile\"") >&5 (eval $ac_compile) 2>&5 ac_status=$? - echo "$as_me:4841: \$? = $ac_status" >&5 + echo "$as_me:5104: \$? = $ac_status" >&5 (exit "$ac_status"); } && { ac_try='test -s "conftest.$ac_objext"' - { (eval echo "$as_me:4844: \"$ac_try\"") >&5 + { (eval echo "$as_me:5107: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? - echo "$as_me:4847: \$? = $ac_status" >&5 + echo "$as_me:5110: \$? = $ac_status" >&5 (exit "$ac_status"); }; }; then cf_cv_term_header="$cf_test" @@ -4860,7 +5123,7 @@ rm -f "conftest.$ac_objext" "conftest.$ac_ext" done fi -echo "$as_me:4863: result: $cf_cv_term_header" >&5 +echo "$as_me:5126: result: $cf_cv_term_header" >&5 echo "${ECHO_T}$cf_cv_term_header" >&6 # Set definitions to allow ifdef'ing to accommodate subdirectories @@ -4895,7 +5158,7 @@ esac fi else - echo "$as_me:4898: result: no" >&5 + echo "$as_me:5161: result: no" >&5 echo "${ECHO_T}no" >&6 NCURSES_CONFIG_PKG=none fi @@ -4911,7 +5174,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:4914: checking for $ac_word" >&5 +echo "$as_me:5177: 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 @@ -4926,7 +5189,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:4929: found $ac_dir/$ac_word" >&5 +echo "$as_me:5192: found $ac_dir/$ac_word" >&5 break done @@ -4934,10 +5197,10 @@ fi fi NCURSES_CONFIG=$ac_cv_prog_NCURSES_CONFIG if test -n "$NCURSES_CONFIG"; then - echo "$as_me:4937: result: $NCURSES_CONFIG" >&5 + echo "$as_me:5200: result: $NCURSES_CONFIG" >&5 echo "${ECHO_T}$NCURSES_CONFIG" >&6 else - echo "$as_me:4940: result: no" >&5 + echo "$as_me:5203: result: no" >&5 echo "${ECHO_T}no" >&6 fi @@ -4950,7 +5213,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:4953: checking for $ac_word" >&5 +echo "$as_me:5216: 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 @@ -4965,7 +5228,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:4968: found $ac_dir/$ac_word" >&5 +echo "$as_me:5231: found $ac_dir/$ac_word" >&5 break done @@ -4973,10 +5236,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:4976: result: $ac_ct_NCURSES_CONFIG" >&5 + echo "$as_me:5239: result: $ac_ct_NCURSES_CONFIG" >&5 echo "${ECHO_T}$ac_ct_NCURSES_CONFIG" >&6 else - echo "$as_me:4979: result: no" >&5 + echo "$as_me:5242: result: no" >&5 echo "${ECHO_T}no" >&6 fi @@ -4989,12 +5252,38 @@ fi if test "$NCURSES_CONFIG" != none ; then +for cf_add_cflags in `$NCURSES_CONFIG --cflags` +do + case "x$cf_add_cflags" in + (x-[DU]*) + +cf_tmp_cflag=`echo "x$cf_add_cflags" | sed -e 's/^.//' -e 's/=.*//'` +while true +do + cf_old_cflag=`echo "x$CFLAGS" | sed -e 's/^.//' -e 's/[ ][ ]*-/ -/g' -e "s%$cf_tmp_cflag\\(=[^ ][^ ]*\\)\?%%" -e 's/^[ ]*//' -e 's%[ ][ ]*-D% -D%g' -e 's%[ ][ ]*-I% -I%g'` + test "$CFLAGS" != "$cf_old_cflag" || break + + CFLAGS="$cf_old_cflag" +done + +cf_tmp_cflag=`echo "x$cf_add_cflags" | sed -e 's/^.//' -e 's/=.*//'` +while true +do + cf_old_cflag=`echo "x$CPPFLAGS" | sed -e 's/^.//' -e 's/[ ][ ]*-/ -/g' -e "s%$cf_tmp_cflag\\(=[^ ][^ ]*\\)\?%%" -e 's/^[ ]*//' -e 's%[ ][ ]*-D% -D%g' -e 's%[ ][ ]*-I% -I%g'` + test "$CPPFLAGS" != "$cf_old_cflag" || break + + CPPFLAGS="$cf_old_cflag" +done + + ;; + esac + cf_fix_cppflags=no cf_new_cflags= cf_new_cppflags= cf_new_extra_cppflags= -for cf_add_cflags in `$NCURSES_CONFIG --cflags` +for cf_add_cflags in $cf_add_cflags do case "$cf_fix_cppflags" in (no) @@ -5087,6 +5376,8 @@ if test -n "$cf_new_extra_cppflags" ; then fi +done + cf_add_libs="$LIBS" # reverse order cf_add_0lib= @@ -5105,7 +5396,7 @@ LIBS="$cf_add_libs" # even with config script, some packages use no-override for curses.h -echo "$as_me:5108: checking if we have identified curses headers" >&5 +echo "$as_me:5399: 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 @@ -5117,28 +5408,28 @@ for cf_header in \ curses.h ncurses/curses.h do cat >"conftest.$ac_ext" <<_ACEOF -#line 5120 "configure" +#line 5411 "configure" #include "confdefs.h" #include <${cf_header}> int main (void) { -initscr(); tgoto("?", 0,0) +initscr(); endwin() ; return 0; } _ACEOF rm -f "conftest.$ac_objext" -if { (eval echo "$as_me:5132: \"$ac_compile\"") >&5 +if { (eval echo "$as_me:5423: \"$ac_compile\"") >&5 (eval $ac_compile) 2>&5 ac_status=$? - echo "$as_me:5135: \$? = $ac_status" >&5 + echo "$as_me:5426: \$? = $ac_status" >&5 (exit "$ac_status"); } && { ac_try='test -s "conftest.$ac_objext"' - { (eval echo "$as_me:5138: \"$ac_try\"") >&5 + { (eval echo "$as_me:5429: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? - echo "$as_me:5141: \$? = $ac_status" >&5 + echo "$as_me:5432: \$? = $ac_status" >&5 (exit "$ac_status"); }; }; then cf_cv_ncurses_header=$cf_header; break else @@ -5149,11 +5440,11 @@ rm -f "conftest.$ac_objext" "conftest.$ac_ext" done fi -echo "$as_me:5152: result: $cf_cv_ncurses_header" >&5 +echo "$as_me:5443: 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:5156: error: No curses header-files found" >&5 + { { echo "$as_me:5447: error: No curses header-files found" >&5 echo "$as_me: error: No curses header-files found" >&2;} { (exit 1); exit 1; }; } fi @@ -5163,23 +5454,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:5166: checking for $ac_header" >&5 +echo "$as_me:5457: 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 5172 "configure" +#line 5463 "configure" #include "confdefs.h" #include <$ac_header> _ACEOF -if { (eval echo "$as_me:5176: \"$ac_cpp "conftest.$ac_ext"\"") >&5 +if { (eval echo "$as_me:5467: \"$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:5182: \$? = $ac_status" >&5 + echo "$as_me:5473: \$? = $ac_status" >&5 (exit "$ac_status"); } >/dev/null; then if test -s conftest.err; then ac_cpp_err=$ac_c_preproc_warn_flag @@ -5198,7 +5489,7 @@ else fi rm -f conftest.err "conftest.$ac_ext" fi -echo "$as_me:5201: result: `eval echo '${'"$as_ac_Header"'}'`" >&5 +echo "$as_me:5492: 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 @@ -5254,7 +5545,7 @@ if test -n "$cf_cv_curses_dir/include/$cf_ncuhdr_root" ; then CPPFLAGS="${CPPFLAGS}-I$cf_add_incdir" cat >"conftest.$ac_ext" <<_ACEOF -#line 5257 "configure" +#line 5548 "configure" #include "confdefs.h" #include <stdio.h> int @@ -5266,16 +5557,16 @@ printf("Hello") } _ACEOF rm -f "conftest.$ac_objext" -if { (eval echo "$as_me:5269: \"$ac_compile\"") >&5 +if { (eval echo "$as_me:5560: \"$ac_compile\"") >&5 (eval $ac_compile) 2>&5 ac_status=$? - echo "$as_me:5272: \$? = $ac_status" >&5 + echo "$as_me:5563: \$? = $ac_status" >&5 (exit "$ac_status"); } && { ac_try='test -s "conftest.$ac_objext"' - { (eval echo "$as_me:5275: \"$ac_try\"") >&5 + { (eval echo "$as_me:5566: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? - echo "$as_me:5278: \$? = $ac_status" >&5 + echo "$as_me:5569: \$? = $ac_status" >&5 (exit "$ac_status"); }; }; then : else @@ -5292,7 +5583,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}:5295: testing adding $cf_add_incdir to include-path ..." 1>&5 +echo "${as_me:-configure}:5586: testing adding $cf_add_incdir to include-path ..." 1>&5 CPPFLAGS="$CPPFLAGS -I$cf_add_incdir" @@ -5311,7 +5602,7 @@ fi } -echo "$as_me:5314: checking for $cf_ncuhdr_root header in include-path" >&5 +echo "$as_me:5605: 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 @@ -5323,7 +5614,7 @@ else do cat >"conftest.$ac_ext" <<_ACEOF -#line 5326 "configure" +#line 5617 "configure" #include "confdefs.h" #include <$cf_header> @@ -5338,7 +5629,7 @@ printf("%s\\n", NCURSES_VERSION); #ifdef __NCURSES_H printf("old\\n"); #else - make an error + #error __NCURSES_H is not defined #endif #endif @@ -5347,16 +5638,16 @@ printf("old\\n"); } _ACEOF rm -f "conftest.$ac_objext" -if { (eval echo "$as_me:5350: \"$ac_compile\"") >&5 +if { (eval echo "$as_me:5641: \"$ac_compile\"") >&5 (eval $ac_compile) 2>&5 ac_status=$? - echo "$as_me:5353: \$? = $ac_status" >&5 + echo "$as_me:5644: \$? = $ac_status" >&5 (exit "$ac_status"); } && { ac_try='test -s "conftest.$ac_objext"' - { (eval echo "$as_me:5356: \"$ac_try\"") >&5 + { (eval echo "$as_me:5647: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? - echo "$as_me:5359: \$? = $ac_status" >&5 + echo "$as_me:5650: \$? = $ac_status" >&5 (exit "$ac_status"); }; }; then cf_cv_ncurses_h=$cf_header @@ -5371,14 +5662,14 @@ rm -f "conftest.$ac_objext" "conftest.$ac_ext" done fi -echo "$as_me:5374: result: $cf_cv_ncurses_h" >&5 +echo "$as_me:5665: 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:5381: checking for $cf_ncuhdr_root include-path" >&5 +echo "$as_me:5672: 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 @@ -5499,7 +5790,7 @@ if test -n "$cf_incdir" ; then CPPFLAGS="${CPPFLAGS}-I$cf_add_incdir" cat >"conftest.$ac_ext" <<_ACEOF -#line 5502 "configure" +#line 5793 "configure" #include "confdefs.h" #include <stdio.h> int @@ -5511,16 +5802,16 @@ printf("Hello") } _ACEOF rm -f "conftest.$ac_objext" -if { (eval echo "$as_me:5514: \"$ac_compile\"") >&5 +if { (eval echo "$as_me:5805: \"$ac_compile\"") >&5 (eval $ac_compile) 2>&5 ac_status=$? - echo "$as_me:5517: \$? = $ac_status" >&5 + echo "$as_me:5808: \$? = $ac_status" >&5 (exit "$ac_status"); } && { ac_try='test -s "conftest.$ac_objext"' - { (eval echo "$as_me:5520: \"$ac_try\"") >&5 + { (eval echo "$as_me:5811: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? - echo "$as_me:5523: \$? = $ac_status" >&5 + echo "$as_me:5814: \$? = $ac_status" >&5 (exit "$ac_status"); }; }; then : else @@ -5537,7 +5828,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}:5540: testing adding $cf_add_incdir to include-path ..." 1>&5 +echo "${as_me:-configure}:5831: testing adding $cf_add_incdir to include-path ..." 1>&5 CPPFLAGS="$CPPFLAGS -I$cf_add_incdir" @@ -5560,7 +5851,7 @@ fi do cat >"conftest.$ac_ext" <<_ACEOF -#line 5563 "configure" +#line 5854 "configure" #include "confdefs.h" #include <$cf_header> @@ -5575,7 +5866,7 @@ printf("%s\\n", NCURSES_VERSION); #ifdef __NCURSES_H printf("old\\n"); #else - make an error + #error __NCURSES_H is not defined #endif #endif @@ -5584,16 +5875,16 @@ printf("old\\n"); } _ACEOF rm -f "conftest.$ac_objext" -if { (eval echo "$as_me:5587: \"$ac_compile\"") >&5 +if { (eval echo "$as_me:5878: \"$ac_compile\"") >&5 (eval $ac_compile) 2>&5 ac_status=$? - echo "$as_me:5590: \$? = $ac_status" >&5 + echo "$as_me:5881: \$? = $ac_status" >&5 (exit "$ac_status"); } && { ac_try='test -s "conftest.$ac_objext"' - { (eval echo "$as_me:5593: \"$ac_try\"") >&5 + { (eval echo "$as_me:5884: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? - echo "$as_me:5596: \$? = $ac_status" >&5 + echo "$as_me:5887: \$? = $ac_status" >&5 (exit "$ac_status"); }; }; then cf_cv_ncurses_h2=$cf_header @@ -5614,12 +5905,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:5617: error: not found" >&5 + test "$cf_cv_ncurses_h2" = no && { { echo "$as_me:5908: error: not found" >&5 echo "$as_me: error: not found" >&2;} { (exit 1); exit 1; }; } fi -echo "$as_me:5622: result: $cf_cv_ncurses_h2" >&5 +echo "$as_me:5913: 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%/[^/]*$%%'` @@ -5655,7 +5946,7 @@ if test -n "$cf_1st_incdir" ; then CPPFLAGS="${CPPFLAGS}-I$cf_add_incdir" cat >"conftest.$ac_ext" <<_ACEOF -#line 5658 "configure" +#line 5949 "configure" #include "confdefs.h" #include <stdio.h> int @@ -5667,16 +5958,16 @@ printf("Hello") } _ACEOF rm -f "conftest.$ac_objext" -if { (eval echo "$as_me:5670: \"$ac_compile\"") >&5 +if { (eval echo "$as_me:5961: \"$ac_compile\"") >&5 (eval $ac_compile) 2>&5 ac_status=$? - echo "$as_me:5673: \$? = $ac_status" >&5 + echo "$as_me:5964: \$? = $ac_status" >&5 (exit "$ac_status"); } && { ac_try='test -s "conftest.$ac_objext"' - { (eval echo "$as_me:5676: \"$ac_try\"") >&5 + { (eval echo "$as_me:5967: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? - echo "$as_me:5679: \$? = $ac_status" >&5 + echo "$as_me:5970: \$? = $ac_status" >&5 (exit "$ac_status"); }; }; then : else @@ -5693,7 +5984,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}:5696: testing adding $cf_add_incdir to include-path ..." 1>&5 +echo "${as_me:-configure}:5987: testing adding $cf_add_incdir to include-path ..." 1>&5 CPPFLAGS="$CPPFLAGS -I$cf_add_incdir" @@ -5741,7 +6032,7 @@ EOF ;; esac -echo "$as_me:5744: checking for terminfo header" >&5 +echo "$as_me:6035: 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 @@ -5759,7 +6050,7 @@ esac for cf_test in $cf_term_header "ncurses/term.h" "ncursesw/term.h" do cat >"conftest.$ac_ext" <<_ACEOF -#line 5762 "configure" +#line 6053 "configure" #include "confdefs.h" #include <stdio.h> #include <${cf_cv_ncurses_header:-curses.h}> @@ -5774,16 +6065,16 @@ int x = auto_left_margin; (void)x } _ACEOF rm -f "conftest.$ac_objext" -if { (eval echo "$as_me:5777: \"$ac_compile\"") >&5 +if { (eval echo "$as_me:6068: \"$ac_compile\"") >&5 (eval $ac_compile) 2>&5 ac_status=$? - echo "$as_me:5780: \$? = $ac_status" >&5 + echo "$as_me:6071: \$? = $ac_status" >&5 (exit "$ac_status"); } && { ac_try='test -s "conftest.$ac_objext"' - { (eval echo "$as_me:5783: \"$ac_try\"") >&5 + { (eval echo "$as_me:6074: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? - echo "$as_me:5786: \$? = $ac_status" >&5 + echo "$as_me:6077: \$? = $ac_status" >&5 (exit "$ac_status"); }; }; then cf_cv_term_header="$cf_test" @@ -5799,7 +6090,7 @@ rm -f "conftest.$ac_objext" "conftest.$ac_ext" done fi -echo "$as_me:5802: result: $cf_cv_term_header" >&5 +echo "$as_me:6093: result: $cf_cv_term_header" >&5 echo "${ECHO_T}$cf_cv_term_header" >&6 # Set definitions to allow ifdef'ing to accommodate subdirectories @@ -5837,7 +6128,7 @@ cat >>confdefs.h <<\EOF #define NCURSES 1 EOF -echo "$as_me:5840: checking for ncurses version" >&5 +echo "$as_me:6131: 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 @@ -5863,10 +6154,10 @@ Autoconf "old" #endif EOF cf_try="$ac_cpp conftest.$ac_ext 2>&5 | grep '^Autoconf ' >conftest.out" - { (eval echo "$as_me:5866: \"$cf_try\"") >&5 + { (eval echo "$as_me:6157: \"$cf_try\"") >&5 (eval $cf_try) 2>&5 ac_status=$? - echo "$as_me:5869: \$? = $ac_status" >&5 + echo "$as_me:6160: \$? = $ac_status" >&5 (exit "$ac_status"); } if test -f conftest.out ; then cf_out=`sed -e 's%^Autoconf %%' -e 's%^[^"]*"%%' -e 's%".*%%' conftest.out` @@ -5876,11 +6167,13 @@ EOF else cat >"conftest.$ac_ext" <<_ACEOF -#line 5879 "configure" +#line 6170 "configure" #include "confdefs.h" +$ac_includes_default + #include <${cf_cv_ncurses_header:-curses.h}> -#include <stdio.h> + int main(void) { FILE *fp = fopen("$cf_tempfile", "w"); @@ -5894,22 +6187,22 @@ int main(void) # ifdef __NCURSES_H fprintf(fp, "old\\n"); # else - make an error + #error expected ncurses header to define __NCURSES_H # endif #endif ${cf_cv_main_return:-return}(0); } _ACEOF rm -f "conftest$ac_exeext" -if { (eval echo "$as_me:5904: \"$ac_link\"") >&5 +if { (eval echo "$as_me:6197: \"$ac_link\"") >&5 (eval $ac_link) 2>&5 ac_status=$? - echo "$as_me:5907: \$? = $ac_status" >&5 + echo "$as_me:6200: \$? = $ac_status" >&5 (exit "$ac_status"); } && { ac_try='"./conftest$ac_exeext"' - { (eval echo "$as_me:5909: \"$ac_try\"") >&5 + { (eval echo "$as_me:6202: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? - echo "$as_me:5912: \$? = $ac_status" >&5 + echo "$as_me:6205: \$? = $ac_status" >&5 (exit "$ac_status"); }; }; then cf_cv_ncurses_version=`cat $cf_tempfile` @@ -5923,7 +6216,7 @@ fi rm -f "$cf_tempfile" fi -echo "$as_me:5926: result: $cf_cv_ncurses_version" >&5 +echo "$as_me:6219: result: $cf_cv_ncurses_version" >&5 echo "${ECHO_T}$cf_cv_ncurses_version" >&6 test "$cf_cv_ncurses_version" = no || cat >>confdefs.h <<\EOF @@ -5936,7 +6229,7 @@ cf_nculib_root=ncurses # to link gpm. cf_ncurses_LIBS="" cf_ncurses_SAVE="$LIBS" -echo "$as_me:5939: checking for Gpm_Open in -lgpm" >&5 +echo "$as_me:6232: 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 @@ -5944,7 +6237,7 @@ else ac_check_lib_save_LIBS=$LIBS LIBS="-lgpm $LIBS" cat >"conftest.$ac_ext" <<_ACEOF -#line 5947 "configure" +#line 6240 "configure" #include "confdefs.h" /* Override any gcc2 internal prototype to avoid an error. */ @@ -5953,7 +6246,7 @@ extern "C" #endif /* We use char because int might match the return type of a gcc2 builtin and then its argument prototype would still apply. */ -char Gpm_Open (); +char Gpm_Open (void); int main (void) { @@ -5963,16 +6256,16 @@ Gpm_Open (); } _ACEOF rm -f "conftest.$ac_objext" "conftest$ac_exeext" -if { (eval echo "$as_me:5966: \"$ac_link\"") >&5 +if { (eval echo "$as_me:6259: \"$ac_link\"") >&5 (eval $ac_link) 2>&5 ac_status=$? - echo "$as_me:5969: \$? = $ac_status" >&5 + echo "$as_me:6262: \$? = $ac_status" >&5 (exit "$ac_status"); } && { ac_try='test -s "conftest$ac_exeext"' - { (eval echo "$as_me:5972: \"$ac_try\"") >&5 + { (eval echo "$as_me:6265: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? - echo "$as_me:5975: \$? = $ac_status" >&5 + echo "$as_me:6268: \$? = $ac_status" >&5 (exit "$ac_status"); }; }; then ac_cv_lib_gpm_Gpm_Open=yes else @@ -5983,10 +6276,10 @@ fi rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext" LIBS=$ac_check_lib_save_LIBS fi -echo "$as_me:5986: result: $ac_cv_lib_gpm_Gpm_Open" >&5 +echo "$as_me:6279: 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:5989: checking for initscr in -lgpm" >&5 + echo "$as_me:6282: 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 @@ -5994,7 +6287,7 @@ else ac_check_lib_save_LIBS=$LIBS LIBS="-lgpm $LIBS" cat >"conftest.$ac_ext" <<_ACEOF -#line 5997 "configure" +#line 6290 "configure" #include "confdefs.h" /* Override any gcc2 internal prototype to avoid an error. */ @@ -6003,7 +6296,7 @@ extern "C" #endif /* We use char because int might match the return type of a gcc2 builtin and then its argument prototype would still apply. */ -char initscr (); +char initscr (void); int main (void) { @@ -6013,16 +6306,16 @@ initscr (); } _ACEOF rm -f "conftest.$ac_objext" "conftest$ac_exeext" -if { (eval echo "$as_me:6016: \"$ac_link\"") >&5 +if { (eval echo "$as_me:6309: \"$ac_link\"") >&5 (eval $ac_link) 2>&5 ac_status=$? - echo "$as_me:6019: \$? = $ac_status" >&5 + echo "$as_me:6312: \$? = $ac_status" >&5 (exit "$ac_status"); } && { ac_try='test -s "conftest$ac_exeext"' - { (eval echo "$as_me:6022: \"$ac_try\"") >&5 + { (eval echo "$as_me:6315: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? - echo "$as_me:6025: \$? = $ac_status" >&5 + echo "$as_me:6318: \$? = $ac_status" >&5 (exit "$ac_status"); }; }; then ac_cv_lib_gpm_initscr=yes else @@ -6033,7 +6326,7 @@ fi rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext" LIBS=$ac_check_lib_save_LIBS fi -echo "$as_me:6036: result: $ac_cv_lib_gpm_initscr" >&5 +echo "$as_me:6329: 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" @@ -6046,9 +6339,9 @@ fi case "$host_os" in (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). + # version of ncurses (but it should do no harm, since it is static). if test "$cf_nculib_root" = ncurses ; then - echo "$as_me:6051: checking for tgoto in -lmytinfo" >&5 + echo "$as_me:6344: 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 @@ -6056,7 +6349,7 @@ else ac_check_lib_save_LIBS=$LIBS LIBS="-lmytinfo $LIBS" cat >"conftest.$ac_ext" <<_ACEOF -#line 6059 "configure" +#line 6352 "configure" #include "confdefs.h" /* Override any gcc2 internal prototype to avoid an error. */ @@ -6065,7 +6358,7 @@ extern "C" #endif /* We use char because int might match the return type of a gcc2 builtin and then its argument prototype would still apply. */ -char tgoto (); +char tgoto (void); int main (void) { @@ -6075,16 +6368,16 @@ tgoto (); } _ACEOF rm -f "conftest.$ac_objext" "conftest$ac_exeext" -if { (eval echo "$as_me:6078: \"$ac_link\"") >&5 +if { (eval echo "$as_me:6371: \"$ac_link\"") >&5 (eval $ac_link) 2>&5 ac_status=$? - echo "$as_me:6081: \$? = $ac_status" >&5 + echo "$as_me:6374: \$? = $ac_status" >&5 (exit "$ac_status"); } && { ac_try='test -s "conftest$ac_exeext"' - { (eval echo "$as_me:6084: \"$ac_try\"") >&5 + { (eval echo "$as_me:6377: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? - echo "$as_me:6087: \$? = $ac_status" >&5 + echo "$as_me:6380: \$? = $ac_status" >&5 (exit "$ac_status"); }; }; then ac_cv_lib_mytinfo_tgoto=yes else @@ -6095,7 +6388,7 @@ fi rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext" LIBS=$ac_check_lib_save_LIBS fi -echo "$as_me:6098: result: $ac_cv_lib_mytinfo_tgoto" >&5 +echo "$as_me:6391: 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" @@ -6144,13 +6437,13 @@ else eval 'cf_cv_have_lib_'"$cf_nculib_root"'=no' cf_libdir="" - echo "$as_me:6147: checking for initscr" >&5 + echo "$as_me:6440: 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 6153 "configure" +#line 6446 "configure" #include "confdefs.h" #define initscr autoconf_temporary #include <limits.h> /* least-intrusive standard header which defines gcc2 __stub macros */ @@ -6181,16 +6474,16 @@ main (void) } _ACEOF rm -f "conftest.$ac_objext" "conftest$ac_exeext" -if { (eval echo "$as_me:6184: \"$ac_link\"") >&5 +if { (eval echo "$as_me:6477: \"$ac_link\"") >&5 (eval $ac_link) 2>&5 ac_status=$? - echo "$as_me:6187: \$? = $ac_status" >&5 + echo "$as_me:6480: \$? = $ac_status" >&5 (exit "$ac_status"); } && { ac_try='test -s "conftest$ac_exeext"' - { (eval echo "$as_me:6190: \"$ac_try\"") >&5 + { (eval echo "$as_me:6483: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? - echo "$as_me:6193: \$? = $ac_status" >&5 + echo "$as_me:6486: \$? = $ac_status" >&5 (exit "$ac_status"); }; }; then ac_cv_func_initscr=yes else @@ -6200,18 +6493,18 @@ ac_cv_func_initscr=no fi rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext" fi -echo "$as_me:6203: result: $ac_cv_func_initscr" >&5 +echo "$as_me:6496: 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:6210: checking for initscr in -l$cf_nculib_root" >&5 + echo "$as_me:6503: 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 6214 "configure" +#line 6507 "configure" #include "confdefs.h" #include <${cf_cv_ncurses_header:-curses.h}> int @@ -6223,25 +6516,25 @@ initscr() } _ACEOF rm -f "conftest.$ac_objext" "conftest$ac_exeext" -if { (eval echo "$as_me:6226: \"$ac_link\"") >&5 +if { (eval echo "$as_me:6519: \"$ac_link\"") >&5 (eval $ac_link) 2>&5 ac_status=$? - echo "$as_me:6229: \$? = $ac_status" >&5 + echo "$as_me:6522: \$? = $ac_status" >&5 (exit "$ac_status"); } && { ac_try='test -s "conftest$ac_exeext"' - { (eval echo "$as_me:6232: \"$ac_try\"") >&5 + { (eval echo "$as_me:6525: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? - echo "$as_me:6235: \$? = $ac_status" >&5 + echo "$as_me:6528: \$? = $ac_status" >&5 (exit "$ac_status"); }; }; then - echo "$as_me:6237: result: yes" >&5 + echo "$as_me:6530: 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:6244: result: no" >&5 +echo "$as_me:6537: result: no" >&5 echo "${ECHO_T}no" >&6 cf_search= @@ -6309,11 +6602,11 @@ cf_search="$cf_library_path_list $cf_search" for cf_libdir in $cf_search do - echo "$as_me:6312: checking for -l$cf_nculib_root in $cf_libdir" >&5 + echo "$as_me:6605: 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 6316 "configure" +#line 6609 "configure" #include "confdefs.h" #include <${cf_cv_ncurses_header:-curses.h}> int @@ -6325,25 +6618,25 @@ initscr() } _ACEOF rm -f "conftest.$ac_objext" "conftest$ac_exeext" -if { (eval echo "$as_me:6328: \"$ac_link\"") >&5 +if { (eval echo "$as_me:6621: \"$ac_link\"") >&5 (eval $ac_link) 2>&5 ac_status=$? - echo "$as_me:6331: \$? = $ac_status" >&5 + echo "$as_me:6624: \$? = $ac_status" >&5 (exit "$ac_status"); } && { ac_try='test -s "conftest$ac_exeext"' - { (eval echo "$as_me:6334: \"$ac_try\"") >&5 + { (eval echo "$as_me:6627: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? - echo "$as_me:6337: \$? = $ac_status" >&5 + echo "$as_me:6630: \$? = $ac_status" >&5 (exit "$ac_status"); }; }; then - echo "$as_me:6339: result: yes" >&5 + echo "$as_me:6632: 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:6346: result: no" >&5 +echo "$as_me:6639: result: no" >&5 echo "${ECHO_T}no" >&6 LIBS="$cf_save_LIBS" fi @@ -6358,7 +6651,7 @@ fi eval 'cf_found_library="$cf_cv_have_lib_'"$cf_nculib_root"\" if test "$cf_found_library" = no ; then - { { echo "$as_me:6361: error: Cannot link $cf_nculib_root library" >&5 + { { echo "$as_me:6654: error: Cannot link $cf_nculib_root library" >&5 echo "$as_me: error: Cannot link $cf_nculib_root library" >&2;} { (exit 1); exit 1; }; } fi @@ -6366,7 +6659,7 @@ fi fi if test -n "$cf_ncurses_LIBS" ; then - echo "$as_me:6369: checking if we can link $cf_nculib_root without $cf_ncurses_LIBS" >&5 + echo "$as_me:6662: 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 @@ -6376,7 +6669,7 @@ echo $ECHO_N "checking if we can link $cf_nculib_root without $cf_ncurses_LIBS.. fi done cat >"conftest.$ac_ext" <<_ACEOF -#line 6379 "configure" +#line 6672 "configure" #include "confdefs.h" #include <${cf_cv_ncurses_header:-curses.h}> int @@ -6388,23 +6681,23 @@ initscr(); mousemask(0,0); tigetstr((char *)0); } _ACEOF rm -f "conftest.$ac_objext" "conftest$ac_exeext" -if { (eval echo "$as_me:6391: \"$ac_link\"") >&5 +if { (eval echo "$as_me:6684: \"$ac_link\"") >&5 (eval $ac_link) 2>&5 ac_status=$? - echo "$as_me:6394: \$? = $ac_status" >&5 + echo "$as_me:6687: \$? = $ac_status" >&5 (exit "$ac_status"); } && { ac_try='test -s "conftest$ac_exeext"' - { (eval echo "$as_me:6397: \"$ac_try\"") >&5 + { (eval echo "$as_me:6690: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? - echo "$as_me:6400: \$? = $ac_status" >&5 + echo "$as_me:6693: \$? = $ac_status" >&5 (exit "$ac_status"); }; }; then - echo "$as_me:6402: result: yes" >&5 + echo "$as_me:6695: result: yes" >&5 echo "${ECHO_T}yes" >&6 else echo "$as_me: failed program was:" >&5 cat "conftest.$ac_ext" >&5 -echo "$as_me:6407: result: no" >&5 +echo "$as_me:6700: result: no" >&5 echo "${ECHO_T}no" >&6 LIBS="$cf_ncurses_SAVE" fi @@ -6422,7 +6715,7 @@ else NCURSES_CONFIG=none fi -echo "$as_me:6425: checking if you want wide-character code" >&5 +echo "$as_me:6718: checking if you want wide-character code" >&5 echo $ECHO_N "checking if you want wide-character code... $ECHO_C" >&6 # Check whether --enable-widec or --disable-widec was given. @@ -6432,11 +6725,59 @@ if test "${enable_widec+set}" = set; then else with_widec=no fi; -echo "$as_me:6435: result: $with_widec" >&5 +echo "$as_me:6728: result: $with_widec" >&5 echo "${ECHO_T}$with_widec" >&6 if test "$with_widec" = yes ; then -echo "$as_me:6439: checking for multibyte character support" >&5 +for ac_header in wchar.h +do +as_ac_Header=`echo "ac_cv_header_$ac_header" | $as_tr_sh` +echo "$as_me:6735: 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 6741 "configure" +#include "confdefs.h" +#include <$ac_header> +_ACEOF +if { (eval echo "$as_me:6745: \"$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:6751: \$? = $ac_status" >&5 + (exit "$ac_status"); } >/dev/null; then + if test -s conftest.err; then + ac_cpp_err=$ac_c_preproc_warn_flag + else + ac_cpp_err= + fi +else + ac_cpp_err=yes +fi +if test -z "$ac_cpp_err"; then + eval "$as_ac_Header=yes" +else + echo "$as_me: failed program was:" >&5 + cat "conftest.$ac_ext" >&5 + eval "$as_ac_Header=no" +fi +rm -f conftest.err "conftest.$ac_ext" +fi +echo "$as_me:6770: 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 +#define `echo "HAVE_$ac_header" | $as_tr_cpp` 1 +EOF + +fi +done + +echo "$as_me:6780: 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 @@ -6444,10 +6785,14 @@ else cf_save_LIBS="$LIBS" cat >"conftest.$ac_ext" <<_ACEOF -#line 6447 "configure" +#line 6788 "configure" #include "confdefs.h" -#include <stdlib.h> +$ac_includes_default +#ifdef HAVE_WCHAR_H +#include <wchar.h> +#endif + int main (void) { @@ -6457,16 +6802,16 @@ putwc(0,0); } _ACEOF rm -f "conftest.$ac_objext" "conftest$ac_exeext" -if { (eval echo "$as_me:6460: \"$ac_link\"") >&5 +if { (eval echo "$as_me:6805: \"$ac_link\"") >&5 (eval $ac_link) 2>&5 ac_status=$? - echo "$as_me:6463: \$? = $ac_status" >&5 + echo "$as_me:6808: \$? = $ac_status" >&5 (exit "$ac_status"); } && { ac_try='test -s "conftest$ac_exeext"' - { (eval echo "$as_me:6466: \"$ac_try\"") >&5 + { (eval echo "$as_me:6811: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? - echo "$as_me:6469: \$? = $ac_status" >&5 + echo "$as_me:6814: \$? = $ac_status" >&5 (exit "$ac_status"); }; }; then cf_cv_utf8_lib=yes else @@ -6478,12 +6823,12 @@ cat "conftest.$ac_ext" >&5 cf_cv_header_path_utf8= cf_cv_library_path_utf8= -echo "${as_me:-configure}:6481: testing Starting FIND_LINKAGE(utf8,) ..." 1>&5 +echo "${as_me:-configure}:6826: testing Starting FIND_LINKAGE(utf8,) ..." 1>&5 cf_save_LIBS="$LIBS" cat >"conftest.$ac_ext" <<_ACEOF -#line 6486 "configure" +#line 6831 "configure" #include "confdefs.h" #include <libutf8.h> @@ -6496,16 +6841,16 @@ putwc(0,0); } _ACEOF rm -f "conftest.$ac_objext" "conftest$ac_exeext" -if { (eval echo "$as_me:6499: \"$ac_link\"") >&5 +if { (eval echo "$as_me:6844: \"$ac_link\"") >&5 (eval $ac_link) 2>&5 ac_status=$? - echo "$as_me:6502: \$? = $ac_status" >&5 + echo "$as_me:6847: \$? = $ac_status" >&5 (exit "$ac_status"); } && { ac_try='test -s "conftest$ac_exeext"' - { (eval echo "$as_me:6505: \"$ac_try\"") >&5 + { (eval echo "$as_me:6850: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? - echo "$as_me:6508: \$? = $ac_status" >&5 + echo "$as_me:6853: \$? = $ac_status" >&5 (exit "$ac_status"); }; }; then cf_cv_find_linkage_utf8=yes @@ -6519,7 +6864,7 @@ cat "conftest.$ac_ext" >&5 LIBS="-lutf8 $cf_save_LIBS" cat >"conftest.$ac_ext" <<_ACEOF -#line 6522 "configure" +#line 6867 "configure" #include "confdefs.h" #include <libutf8.h> @@ -6532,16 +6877,16 @@ putwc(0,0); } _ACEOF rm -f "conftest.$ac_objext" "conftest$ac_exeext" -if { (eval echo "$as_me:6535: \"$ac_link\"") >&5 +if { (eval echo "$as_me:6880: \"$ac_link\"") >&5 (eval $ac_link) 2>&5 ac_status=$? - echo "$as_me:6538: \$? = $ac_status" >&5 + echo "$as_me:6883: \$? = $ac_status" >&5 (exit "$ac_status"); } && { ac_try='test -s "conftest$ac_exeext"' - { (eval echo "$as_me:6541: \"$ac_try\"") >&5 + { (eval echo "$as_me:6886: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? - echo "$as_me:6544: \$? = $ac_status" >&5 + echo "$as_me:6889: \$? = $ac_status" >&5 (exit "$ac_status"); }; }; then cf_cv_find_linkage_utf8=yes @@ -6558,9 +6903,9 @@ cat "conftest.$ac_ext" >&5 test -n "$verbose" && echo " find linkage for utf8 library" 1>&6 -echo "${as_me:-configure}:6561: testing find linkage for utf8 library ..." 1>&5 +echo "${as_me:-configure}:6906: testing find linkage for utf8 library ..." 1>&5 -echo "${as_me:-configure}:6563: testing Searching for headers in FIND_LINKAGE(utf8,) ..." 1>&5 +echo "${as_me:-configure}:6908: testing Searching for headers in FIND_LINKAGE(utf8,) ..." 1>&5 cf_save_CPPFLAGS="$CPPFLAGS" cf_test_CPPFLAGS="$CPPFLAGS" @@ -6651,7 +6996,7 @@ 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}:6654: testing ... testing $cf_cv_header_path_utf8 ..." 1>&5 +echo "${as_me:-configure}:6999: testing ... testing $cf_cv_header_path_utf8 ..." 1>&5 CPPFLAGS="$cf_save_CPPFLAGS" @@ -6659,7 +7004,7 @@ echo "${as_me:-configure}:6654: testing ... testing $cf_cv_header_path_utf8 ..." CPPFLAGS="${CPPFLAGS}-I$cf_cv_header_path_utf8" cat >"conftest.$ac_ext" <<_ACEOF -#line 6662 "configure" +#line 7007 "configure" #include "confdefs.h" #include <libutf8.h> @@ -6672,21 +7017,21 @@ putwc(0,0); } _ACEOF rm -f "conftest.$ac_objext" -if { (eval echo "$as_me:6675: \"$ac_compile\"") >&5 +if { (eval echo "$as_me:7020: \"$ac_compile\"") >&5 (eval $ac_compile) 2>&5 ac_status=$? - echo "$as_me:6678: \$? = $ac_status" >&5 + echo "$as_me:7023: \$? = $ac_status" >&5 (exit "$ac_status"); } && { ac_try='test -s "conftest.$ac_objext"' - { (eval echo "$as_me:6681: \"$ac_try\"") >&5 + { (eval echo "$as_me:7026: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? - echo "$as_me:6684: \$? = $ac_status" >&5 + echo "$as_me:7029: \$? = $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}:6689: testing ... found utf8 headers in $cf_cv_header_path_utf8 ..." 1>&5 +echo "${as_me:-configure}:7034: testing ... found utf8 headers in $cf_cv_header_path_utf8 ..." 1>&5 cf_cv_find_linkage_utf8=maybe cf_test_CPPFLAGS="$CPPFLAGS" @@ -6704,7 +7049,7 @@ rm -f "conftest.$ac_objext" "conftest.$ac_ext" if test "$cf_cv_find_linkage_utf8" = maybe ; then -echo "${as_me:-configure}:6707: testing Searching for utf8 library in FIND_LINKAGE(utf8,) ..." 1>&5 +echo "${as_me:-configure}:7052: testing Searching for utf8 library in FIND_LINKAGE(utf8,) ..." 1>&5 cf_save_LIBS="$LIBS" cf_save_LDFLAGS="$LDFLAGS" @@ -6779,13 +7124,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}:6782: testing ... testing $cf_cv_library_path_utf8 ..." 1>&5 +echo "${as_me:-configure}:7127: 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 6788 "configure" +#line 7133 "configure" #include "confdefs.h" #include <libutf8.h> @@ -6798,21 +7143,21 @@ putwc(0,0); } _ACEOF rm -f "conftest.$ac_objext" "conftest$ac_exeext" -if { (eval echo "$as_me:6801: \"$ac_link\"") >&5 +if { (eval echo "$as_me:7146: \"$ac_link\"") >&5 (eval $ac_link) 2>&5 ac_status=$? - echo "$as_me:6804: \$? = $ac_status" >&5 + echo "$as_me:7149: \$? = $ac_status" >&5 (exit "$ac_status"); } && { ac_try='test -s "conftest$ac_exeext"' - { (eval echo "$as_me:6807: \"$ac_try\"") >&5 + { (eval echo "$as_me:7152: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? - echo "$as_me:6810: \$? = $ac_status" >&5 + echo "$as_me:7155: \$? = $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}:6815: testing ... found utf8 library in $cf_cv_library_path_utf8 ..." 1>&5 +echo "${as_me:-configure}:7160: testing ... found utf8 library in $cf_cv_library_path_utf8 ..." 1>&5 cf_cv_find_linkage_utf8=yes cf_cv_library_file_utf8="-lutf8" @@ -6854,7 +7199,7 @@ fi fi rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext" fi -echo "$as_me:6857: result: $cf_cv_utf8_lib" >&5 +echo "$as_me:7202: 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 @@ -6892,7 +7237,7 @@ if test -n "$cf_cv_header_path_utf8" ; then CPPFLAGS="${CPPFLAGS}-I$cf_add_incdir" cat >"conftest.$ac_ext" <<_ACEOF -#line 6895 "configure" +#line 7240 "configure" #include "confdefs.h" #include <stdio.h> int @@ -6904,16 +7249,16 @@ printf("Hello") } _ACEOF rm -f "conftest.$ac_objext" -if { (eval echo "$as_me:6907: \"$ac_compile\"") >&5 +if { (eval echo "$as_me:7252: \"$ac_compile\"") >&5 (eval $ac_compile) 2>&5 ac_status=$? - echo "$as_me:6910: \$? = $ac_status" >&5 + echo "$as_me:7255: \$? = $ac_status" >&5 (exit "$ac_status"); } && { ac_try='test -s "conftest.$ac_objext"' - { (eval echo "$as_me:6913: \"$ac_try\"") >&5 + { (eval echo "$as_me:7258: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? - echo "$as_me:6916: \$? = $ac_status" >&5 + echo "$as_me:7261: \$? = $ac_status" >&5 (exit "$ac_status"); }; }; then : else @@ -6930,7 +7275,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}:6933: testing adding $cf_add_incdir to include-path ..." 1>&5 +echo "${as_me:-configure}:7278: testing adding $cf_add_incdir to include-path ..." 1>&5 CPPFLAGS="$CPPFLAGS -I$cf_add_incdir" @@ -6966,7 +7311,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}:6969: testing adding $cf_add_libdir to library-path ..." 1>&5 +echo "${as_me:-configure}:7314: testing adding $cf_add_libdir to library-path ..." 1>&5 LDFLAGS="-L$cf_add_libdir $LDFLAGS" fi @@ -6996,13 +7341,13 @@ cf_ncuconfig_root=ncursesw cf_have_ncuconfig=no if test "x${PKG_CONFIG:=none}" != xnone; then - echo "$as_me:6999: checking pkg-config for $cf_ncuconfig_root" >&5 + echo "$as_me:7344: checking pkg-config for $cf_ncuconfig_root" >&5 echo $ECHO_N "checking pkg-config for $cf_ncuconfig_root... $ECHO_C" >&6 if "$PKG_CONFIG" --exists $cf_ncuconfig_root ; then - echo "$as_me:7002: result: yes" >&5 + echo "$as_me:7347: result: yes" >&5 echo "${ECHO_T}yes" >&6 - echo "$as_me:7005: checking if the $cf_ncuconfig_root package files work" >&5 + echo "$as_me:7350: checking if the $cf_ncuconfig_root package files work" >&5 echo $ECHO_N "checking if the $cf_ncuconfig_root package files work... $ECHO_C" >&6 cf_have_ncuconfig=unknown @@ -7135,7 +7480,7 @@ done LIBS="$cf_add_libs" cat >"conftest.$ac_ext" <<_ACEOF -#line 7138 "configure" +#line 7483 "configure" #include "confdefs.h" #include <${cf_cv_ncurses_header:-curses.h}> int @@ -7147,37 +7492,37 @@ initscr(); mousemask(0,0); tigetstr((char *)0); } _ACEOF rm -f "conftest.$ac_objext" "conftest$ac_exeext" -if { (eval echo "$as_me:7150: \"$ac_link\"") >&5 +if { (eval echo "$as_me:7495: \"$ac_link\"") >&5 (eval $ac_link) 2>&5 ac_status=$? - echo "$as_me:7153: \$? = $ac_status" >&5 + echo "$as_me:7498: \$? = $ac_status" >&5 (exit "$ac_status"); } && { ac_try='test -s "conftest$ac_exeext"' - { (eval echo "$as_me:7156: \"$ac_try\"") >&5 + { (eval echo "$as_me:7501: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? - echo "$as_me:7159: \$? = $ac_status" >&5 + echo "$as_me:7504: \$? = $ac_status" >&5 (exit "$ac_status"); }; }; then if test "$cross_compiling" = yes; then cf_test_ncuconfig=maybe else cat >"conftest.$ac_ext" <<_ACEOF -#line 7165 "configure" +#line 7510 "configure" #include "confdefs.h" #include <${cf_cv_ncurses_header:-curses.h}> int main(void) - { char *xx = curses_version(); return (xx == 0); } + { const char *xx = curses_version(); return (xx == 0); } _ACEOF rm -f "conftest$ac_exeext" -if { (eval echo "$as_me:7172: \"$ac_link\"") >&5 +if { (eval echo "$as_me:7517: \"$ac_link\"") >&5 (eval $ac_link) 2>&5 ac_status=$? - echo "$as_me:7175: \$? = $ac_status" >&5 + echo "$as_me:7520: \$? = $ac_status" >&5 (exit "$ac_status"); } && { ac_try='"./conftest$ac_exeext"' - { (eval echo "$as_me:7177: \"$ac_try\"") >&5 + { (eval echo "$as_me:7522: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? - echo "$as_me:7180: \$? = $ac_status" >&5 + echo "$as_me:7525: \$? = $ac_status" >&5 (exit "$ac_status"); }; }; then cf_test_ncuconfig=yes else @@ -7208,12 +7553,38 @@ rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext" ;; esac +for cf_add_cflags in $cf_pkg_cflags +do + case "x$cf_add_cflags" in + (x-[DU]*) + +cf_tmp_cflag=`echo "x$cf_add_cflags" | sed -e 's/^.//' -e 's/=.*//'` +while true +do + cf_old_cflag=`echo "x$CFLAGS" | sed -e 's/^.//' -e 's/[ ][ ]*-/ -/g' -e "s%$cf_tmp_cflag\\(=[^ ][^ ]*\\)\?%%" -e 's/^[ ]*//' -e 's%[ ][ ]*-D% -D%g' -e 's%[ ][ ]*-I% -I%g'` + test "$CFLAGS" != "$cf_old_cflag" || break + + CFLAGS="$cf_old_cflag" +done + +cf_tmp_cflag=`echo "x$cf_add_cflags" | sed -e 's/^.//' -e 's/=.*//'` +while true +do + cf_old_cflag=`echo "x$CPPFLAGS" | sed -e 's/^.//' -e 's/[ ][ ]*-/ -/g' -e "s%$cf_tmp_cflag\\(=[^ ][^ ]*\\)\?%%" -e 's/^[ ]*//' -e 's%[ ][ ]*-D% -D%g' -e 's%[ ][ ]*-I% -I%g'` + test "$CPPFLAGS" != "$cf_old_cflag" || break + + CPPFLAGS="$cf_old_cflag" +done + + ;; + esac + cf_fix_cppflags=no cf_new_cflags= cf_new_cppflags= cf_new_extra_cppflags= -for cf_add_cflags in $cf_pkg_cflags +for cf_add_cflags in $cf_add_cflags do case "$cf_fix_cppflags" in (no) @@ -7306,6 +7677,8 @@ if test -n "$cf_new_extra_cppflags" ; then fi +done + cf_add_libs="$LIBS" # reverse order cf_add_0lib= @@ -7323,7 +7696,7 @@ done LIBS="$cf_add_libs" cat >"conftest.$ac_ext" <<_ACEOF -#line 7326 "configure" +#line 7699 "configure" #include "confdefs.h" #include <${cf_cv_ncurses_header:-curses.h}> int @@ -7335,37 +7708,37 @@ initscr(); mousemask(0,0); tigetstr((char *)0); } _ACEOF rm -f "conftest.$ac_objext" "conftest$ac_exeext" -if { (eval echo "$as_me:7338: \"$ac_link\"") >&5 +if { (eval echo "$as_me:7711: \"$ac_link\"") >&5 (eval $ac_link) 2>&5 ac_status=$? - echo "$as_me:7341: \$? = $ac_status" >&5 + echo "$as_me:7714: \$? = $ac_status" >&5 (exit "$ac_status"); } && { ac_try='test -s "conftest$ac_exeext"' - { (eval echo "$as_me:7344: \"$ac_try\"") >&5 + { (eval echo "$as_me:7717: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? - echo "$as_me:7347: \$? = $ac_status" >&5 + echo "$as_me:7720: \$? = $ac_status" >&5 (exit "$ac_status"); }; }; then if test "$cross_compiling" = yes; then cf_have_ncuconfig=maybe else cat >"conftest.$ac_ext" <<_ACEOF -#line 7353 "configure" +#line 7726 "configure" #include "confdefs.h" #include <${cf_cv_ncurses_header:-curses.h}> int main(void) - { char *xx = curses_version(); return (xx == 0); } + { const char *xx = curses_version(); return (xx == 0); } _ACEOF rm -f "conftest$ac_exeext" -if { (eval echo "$as_me:7360: \"$ac_link\"") >&5 +if { (eval echo "$as_me:7733: \"$ac_link\"") >&5 (eval $ac_link) 2>&5 ac_status=$? - echo "$as_me:7363: \$? = $ac_status" >&5 + echo "$as_me:7736: \$? = $ac_status" >&5 (exit "$ac_status"); } && { ac_try='"./conftest$ac_exeext"' - { (eval echo "$as_me:7365: \"$ac_try\"") >&5 + { (eval echo "$as_me:7738: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? - echo "$as_me:7368: \$? = $ac_status" >&5 + echo "$as_me:7741: \$? = $ac_status" >&5 (exit "$ac_status"); }; }; then cf_have_ncuconfig=yes else @@ -7382,7 +7755,7 @@ cat "conftest.$ac_ext" >&5 cf_have_ncuconfig=no fi rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext" - echo "$as_me:7385: result: $cf_have_ncuconfig" >&5 + echo "$as_me:7758: result: $cf_have_ncuconfig" >&5 echo "${ECHO_T}$cf_have_ncuconfig" >&6 test "$cf_have_ncuconfig" = maybe && cf_have_ncuconfig=yes if test "$cf_have_ncuconfig" != "yes" @@ -7398,7 +7771,7 @@ EOF NCURSES_CONFIG_PKG=$cf_ncuconfig_root -echo "$as_me:7401: checking for terminfo header" >&5 +echo "$as_me:7774: 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 @@ -7416,7 +7789,7 @@ esac for cf_test in $cf_term_header "ncurses/term.h" "ncursesw/term.h" do cat >"conftest.$ac_ext" <<_ACEOF -#line 7419 "configure" +#line 7792 "configure" #include "confdefs.h" #include <stdio.h> #include <${cf_cv_ncurses_header:-curses.h}> @@ -7431,16 +7804,16 @@ int x = auto_left_margin; (void)x } _ACEOF rm -f "conftest.$ac_objext" -if { (eval echo "$as_me:7434: \"$ac_compile\"") >&5 +if { (eval echo "$as_me:7807: \"$ac_compile\"") >&5 (eval $ac_compile) 2>&5 ac_status=$? - echo "$as_me:7437: \$? = $ac_status" >&5 + echo "$as_me:7810: \$? = $ac_status" >&5 (exit "$ac_status"); } && { ac_try='test -s "conftest.$ac_objext"' - { (eval echo "$as_me:7440: \"$ac_try\"") >&5 + { (eval echo "$as_me:7813: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? - echo "$as_me:7443: \$? = $ac_status" >&5 + echo "$as_me:7816: \$? = $ac_status" >&5 (exit "$ac_status"); }; }; then cf_cv_term_header="$cf_test" @@ -7456,7 +7829,7 @@ rm -f "conftest.$ac_objext" "conftest.$ac_ext" done fi -echo "$as_me:7459: result: $cf_cv_term_header" >&5 +echo "$as_me:7832: result: $cf_cv_term_header" >&5 echo "${ECHO_T}$cf_cv_term_header" >&6 # Set definitions to allow ifdef'ing to accommodate subdirectories @@ -7491,7 +7864,7 @@ esac fi else - echo "$as_me:7494: result: no" >&5 + echo "$as_me:7867: result: no" >&5 echo "${ECHO_T}no" >&6 NCURSES_CONFIG_PKG=none fi @@ -7507,7 +7880,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:7510: checking for $ac_word" >&5 +echo "$as_me:7883: 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 @@ -7522,7 +7895,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:7525: found $ac_dir/$ac_word" >&5 +echo "$as_me:7898: found $ac_dir/$ac_word" >&5 break done @@ -7530,10 +7903,10 @@ fi fi NCURSES_CONFIG=$ac_cv_prog_NCURSES_CONFIG if test -n "$NCURSES_CONFIG"; then - echo "$as_me:7533: result: $NCURSES_CONFIG" >&5 + echo "$as_me:7906: result: $NCURSES_CONFIG" >&5 echo "${ECHO_T}$NCURSES_CONFIG" >&6 else - echo "$as_me:7536: result: no" >&5 + echo "$as_me:7909: result: no" >&5 echo "${ECHO_T}no" >&6 fi @@ -7546,7 +7919,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:7549: checking for $ac_word" >&5 +echo "$as_me:7922: 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 @@ -7561,7 +7934,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:7564: found $ac_dir/$ac_word" >&5 +echo "$as_me:7937: found $ac_dir/$ac_word" >&5 break done @@ -7569,10 +7942,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:7572: result: $ac_ct_NCURSES_CONFIG" >&5 + echo "$as_me:7945: result: $ac_ct_NCURSES_CONFIG" >&5 echo "${ECHO_T}$ac_ct_NCURSES_CONFIG" >&6 else - echo "$as_me:7575: result: no" >&5 + echo "$as_me:7948: result: no" >&5 echo "${ECHO_T}no" >&6 fi @@ -7585,12 +7958,38 @@ fi if test "$NCURSES_CONFIG" != none ; then +for cf_add_cflags in `$NCURSES_CONFIG --cflags` +do + case "x$cf_add_cflags" in + (x-[DU]*) + +cf_tmp_cflag=`echo "x$cf_add_cflags" | sed -e 's/^.//' -e 's/=.*//'` +while true +do + cf_old_cflag=`echo "x$CFLAGS" | sed -e 's/^.//' -e 's/[ ][ ]*-/ -/g' -e "s%$cf_tmp_cflag\\(=[^ ][^ ]*\\)\?%%" -e 's/^[ ]*//' -e 's%[ ][ ]*-D% -D%g' -e 's%[ ][ ]*-I% -I%g'` + test "$CFLAGS" != "$cf_old_cflag" || break + + CFLAGS="$cf_old_cflag" +done + +cf_tmp_cflag=`echo "x$cf_add_cflags" | sed -e 's/^.//' -e 's/=.*//'` +while true +do + cf_old_cflag=`echo "x$CPPFLAGS" | sed -e 's/^.//' -e 's/[ ][ ]*-/ -/g' -e "s%$cf_tmp_cflag\\(=[^ ][^ ]*\\)\?%%" -e 's/^[ ]*//' -e 's%[ ][ ]*-D% -D%g' -e 's%[ ][ ]*-I% -I%g'` + test "$CPPFLAGS" != "$cf_old_cflag" || break + + CPPFLAGS="$cf_old_cflag" +done + + ;; + esac + cf_fix_cppflags=no cf_new_cflags= cf_new_cppflags= cf_new_extra_cppflags= -for cf_add_cflags in `$NCURSES_CONFIG --cflags` +for cf_add_cflags in $cf_add_cflags do case "$cf_fix_cppflags" in (no) @@ -7683,6 +8082,8 @@ if test -n "$cf_new_extra_cppflags" ; then fi +done + cf_add_libs="$LIBS" # reverse order cf_add_0lib= @@ -7701,7 +8102,7 @@ LIBS="$cf_add_libs" # even with config script, some packages use no-override for curses.h -echo "$as_me:7704: checking if we have identified curses headers" >&5 +echo "$as_me:8105: 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 @@ -7713,28 +8114,28 @@ for cf_header in \ curses.h ncursesw/curses.h do cat >"conftest.$ac_ext" <<_ACEOF -#line 7716 "configure" +#line 8117 "configure" #include "confdefs.h" #include <${cf_header}> int main (void) { -initscr(); tgoto("?", 0,0) +initscr(); endwin() ; return 0; } _ACEOF rm -f "conftest.$ac_objext" -if { (eval echo "$as_me:7728: \"$ac_compile\"") >&5 +if { (eval echo "$as_me:8129: \"$ac_compile\"") >&5 (eval $ac_compile) 2>&5 ac_status=$? - echo "$as_me:7731: \$? = $ac_status" >&5 + echo "$as_me:8132: \$? = $ac_status" >&5 (exit "$ac_status"); } && { ac_try='test -s "conftest.$ac_objext"' - { (eval echo "$as_me:7734: \"$ac_try\"") >&5 + { (eval echo "$as_me:8135: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? - echo "$as_me:7737: \$? = $ac_status" >&5 + echo "$as_me:8138: \$? = $ac_status" >&5 (exit "$ac_status"); }; }; then cf_cv_ncurses_header=$cf_header; break else @@ -7745,11 +8146,11 @@ rm -f "conftest.$ac_objext" "conftest.$ac_ext" done fi -echo "$as_me:7748: result: $cf_cv_ncurses_header" >&5 +echo "$as_me:8149: 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:7752: error: No curses header-files found" >&5 + { { echo "$as_me:8153: error: No curses header-files found" >&5 echo "$as_me: error: No curses header-files found" >&2;} { (exit 1); exit 1; }; } fi @@ -7759,23 +8160,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:7762: checking for $ac_header" >&5 +echo "$as_me:8163: 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 7768 "configure" +#line 8169 "configure" #include "confdefs.h" #include <$ac_header> _ACEOF -if { (eval echo "$as_me:7772: \"$ac_cpp "conftest.$ac_ext"\"") >&5 +if { (eval echo "$as_me:8173: \"$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:7778: \$? = $ac_status" >&5 + echo "$as_me:8179: \$? = $ac_status" >&5 (exit "$ac_status"); } >/dev/null; then if test -s conftest.err; then ac_cpp_err=$ac_c_preproc_warn_flag @@ -7794,7 +8195,7 @@ else fi rm -f conftest.err "conftest.$ac_ext" fi -echo "$as_me:7797: result: `eval echo '${'"$as_ac_Header"'}'`" >&5 +echo "$as_me:8198: 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 @@ -7850,7 +8251,7 @@ if test -n "$cf_cv_curses_dir/include/$cf_ncuhdr_root" ; then CPPFLAGS="${CPPFLAGS}-I$cf_add_incdir" cat >"conftest.$ac_ext" <<_ACEOF -#line 7853 "configure" +#line 8254 "configure" #include "confdefs.h" #include <stdio.h> int @@ -7862,16 +8263,16 @@ printf("Hello") } _ACEOF rm -f "conftest.$ac_objext" -if { (eval echo "$as_me:7865: \"$ac_compile\"") >&5 +if { (eval echo "$as_me:8266: \"$ac_compile\"") >&5 (eval $ac_compile) 2>&5 ac_status=$? - echo "$as_me:7868: \$? = $ac_status" >&5 + echo "$as_me:8269: \$? = $ac_status" >&5 (exit "$ac_status"); } && { ac_try='test -s "conftest.$ac_objext"' - { (eval echo "$as_me:7871: \"$ac_try\"") >&5 + { (eval echo "$as_me:8272: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? - echo "$as_me:7874: \$? = $ac_status" >&5 + echo "$as_me:8275: \$? = $ac_status" >&5 (exit "$ac_status"); }; }; then : else @@ -7888,7 +8289,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}:7891: testing adding $cf_add_incdir to include-path ..." 1>&5 +echo "${as_me:-configure}:8292: testing adding $cf_add_incdir to include-path ..." 1>&5 CPPFLAGS="$CPPFLAGS -I$cf_add_incdir" @@ -7907,7 +8308,7 @@ fi } -echo "$as_me:7910: checking for $cf_ncuhdr_root header in include-path" >&5 +echo "$as_me:8311: 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 @@ -7919,7 +8320,7 @@ else do cat >"conftest.$ac_ext" <<_ACEOF -#line 7922 "configure" +#line 8323 "configure" #include "confdefs.h" #define _XOPEN_SOURCE_EXTENDED @@ -7934,7 +8335,7 @@ main (void) #ifdef NCURSES_VERSION #ifndef WACS_BSSB - make an error + #error WACS_BSSB is not defined #endif printf("%s\\n", NCURSES_VERSION); @@ -7942,7 +8343,7 @@ printf("%s\\n", NCURSES_VERSION); #ifdef __NCURSES_H printf("old\\n"); #else - make an error + #error __NCURSES_H is not defined #endif #endif @@ -7951,16 +8352,16 @@ printf("old\\n"); } _ACEOF rm -f "conftest.$ac_objext" -if { (eval echo "$as_me:7954: \"$ac_compile\"") >&5 +if { (eval echo "$as_me:8355: \"$ac_compile\"") >&5 (eval $ac_compile) 2>&5 ac_status=$? - echo "$as_me:7957: \$? = $ac_status" >&5 + echo "$as_me:8358: \$? = $ac_status" >&5 (exit "$ac_status"); } && { ac_try='test -s "conftest.$ac_objext"' - { (eval echo "$as_me:7960: \"$ac_try\"") >&5 + { (eval echo "$as_me:8361: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? - echo "$as_me:7963: \$? = $ac_status" >&5 + echo "$as_me:8364: \$? = $ac_status" >&5 (exit "$ac_status"); }; }; then cf_cv_ncurses_h=$cf_header @@ -7975,14 +8376,14 @@ rm -f "conftest.$ac_objext" "conftest.$ac_ext" done fi -echo "$as_me:7978: result: $cf_cv_ncurses_h" >&5 +echo "$as_me:8379: 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:7985: checking for $cf_ncuhdr_root include-path" >&5 +echo "$as_me:8386: 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 @@ -8103,7 +8504,7 @@ if test -n "$cf_incdir" ; then CPPFLAGS="${CPPFLAGS}-I$cf_add_incdir" cat >"conftest.$ac_ext" <<_ACEOF -#line 8106 "configure" +#line 8507 "configure" #include "confdefs.h" #include <stdio.h> int @@ -8115,16 +8516,16 @@ printf("Hello") } _ACEOF rm -f "conftest.$ac_objext" -if { (eval echo "$as_me:8118: \"$ac_compile\"") >&5 +if { (eval echo "$as_me:8519: \"$ac_compile\"") >&5 (eval $ac_compile) 2>&5 ac_status=$? - echo "$as_me:8121: \$? = $ac_status" >&5 + echo "$as_me:8522: \$? = $ac_status" >&5 (exit "$ac_status"); } && { ac_try='test -s "conftest.$ac_objext"' - { (eval echo "$as_me:8124: \"$ac_try\"") >&5 + { (eval echo "$as_me:8525: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? - echo "$as_me:8127: \$? = $ac_status" >&5 + echo "$as_me:8528: \$? = $ac_status" >&5 (exit "$ac_status"); }; }; then : else @@ -8141,7 +8542,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}:8144: testing adding $cf_add_incdir to include-path ..." 1>&5 +echo "${as_me:-configure}:8545: testing adding $cf_add_incdir to include-path ..." 1>&5 CPPFLAGS="$CPPFLAGS -I$cf_add_incdir" @@ -8164,7 +8565,7 @@ fi do cat >"conftest.$ac_ext" <<_ACEOF -#line 8167 "configure" +#line 8568 "configure" #include "confdefs.h" #include <$cf_header> @@ -8179,7 +8580,7 @@ printf("%s\\n", NCURSES_VERSION); #ifdef __NCURSES_H printf("old\\n"); #else - make an error + #error __NCURSES_H is not defined #endif #endif @@ -8188,16 +8589,16 @@ printf("old\\n"); } _ACEOF rm -f "conftest.$ac_objext" -if { (eval echo "$as_me:8191: \"$ac_compile\"") >&5 +if { (eval echo "$as_me:8592: \"$ac_compile\"") >&5 (eval $ac_compile) 2>&5 ac_status=$? - echo "$as_me:8194: \$? = $ac_status" >&5 + echo "$as_me:8595: \$? = $ac_status" >&5 (exit "$ac_status"); } && { ac_try='test -s "conftest.$ac_objext"' - { (eval echo "$as_me:8197: \"$ac_try\"") >&5 + { (eval echo "$as_me:8598: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? - echo "$as_me:8200: \$? = $ac_status" >&5 + echo "$as_me:8601: \$? = $ac_status" >&5 (exit "$ac_status"); }; }; then cf_cv_ncurses_h2=$cf_header @@ -8218,12 +8619,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:8221: error: not found" >&5 + test "$cf_cv_ncurses_h2" = no && { { echo "$as_me:8622: error: not found" >&5 echo "$as_me: error: not found" >&2;} { (exit 1); exit 1; }; } fi -echo "$as_me:8226: result: $cf_cv_ncurses_h2" >&5 +echo "$as_me:8627: 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%/[^/]*$%%'` @@ -8259,7 +8660,7 @@ if test -n "$cf_1st_incdir" ; then CPPFLAGS="${CPPFLAGS}-I$cf_add_incdir" cat >"conftest.$ac_ext" <<_ACEOF -#line 8262 "configure" +#line 8663 "configure" #include "confdefs.h" #include <stdio.h> int @@ -8271,16 +8672,16 @@ printf("Hello") } _ACEOF rm -f "conftest.$ac_objext" -if { (eval echo "$as_me:8274: \"$ac_compile\"") >&5 +if { (eval echo "$as_me:8675: \"$ac_compile\"") >&5 (eval $ac_compile) 2>&5 ac_status=$? - echo "$as_me:8277: \$? = $ac_status" >&5 + echo "$as_me:8678: \$? = $ac_status" >&5 (exit "$ac_status"); } && { ac_try='test -s "conftest.$ac_objext"' - { (eval echo "$as_me:8280: \"$ac_try\"") >&5 + { (eval echo "$as_me:8681: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? - echo "$as_me:8283: \$? = $ac_status" >&5 + echo "$as_me:8684: \$? = $ac_status" >&5 (exit "$ac_status"); }; }; then : else @@ -8297,7 +8698,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}:8300: testing adding $cf_add_incdir to include-path ..." 1>&5 +echo "${as_me:-configure}:8701: testing adding $cf_add_incdir to include-path ..." 1>&5 CPPFLAGS="$CPPFLAGS -I$cf_add_incdir" @@ -8345,7 +8746,7 @@ EOF ;; esac -echo "$as_me:8348: checking for terminfo header" >&5 +echo "$as_me:8749: 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 @@ -8363,7 +8764,7 @@ esac for cf_test in $cf_term_header "ncurses/term.h" "ncursesw/term.h" do cat >"conftest.$ac_ext" <<_ACEOF -#line 8366 "configure" +#line 8767 "configure" #include "confdefs.h" #include <stdio.h> #include <${cf_cv_ncurses_header:-curses.h}> @@ -8378,16 +8779,16 @@ int x = auto_left_margin; (void)x } _ACEOF rm -f "conftest.$ac_objext" -if { (eval echo "$as_me:8381: \"$ac_compile\"") >&5 +if { (eval echo "$as_me:8782: \"$ac_compile\"") >&5 (eval $ac_compile) 2>&5 ac_status=$? - echo "$as_me:8384: \$? = $ac_status" >&5 + echo "$as_me:8785: \$? = $ac_status" >&5 (exit "$ac_status"); } && { ac_try='test -s "conftest.$ac_objext"' - { (eval echo "$as_me:8387: \"$ac_try\"") >&5 + { (eval echo "$as_me:8788: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? - echo "$as_me:8390: \$? = $ac_status" >&5 + echo "$as_me:8791: \$? = $ac_status" >&5 (exit "$ac_status"); }; }; then cf_cv_term_header="$cf_test" @@ -8403,7 +8804,7 @@ rm -f "conftest.$ac_objext" "conftest.$ac_ext" done fi -echo "$as_me:8406: result: $cf_cv_term_header" >&5 +echo "$as_me:8807: result: $cf_cv_term_header" >&5 echo "${ECHO_T}$cf_cv_term_header" >&6 # Set definitions to allow ifdef'ing to accommodate subdirectories @@ -8441,7 +8842,7 @@ cat >>confdefs.h <<\EOF #define NCURSES 1 EOF -echo "$as_me:8444: checking for ncurses version" >&5 +echo "$as_me:8845: 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 @@ -8467,10 +8868,10 @@ Autoconf "old" #endif EOF cf_try="$ac_cpp conftest.$ac_ext 2>&5 | grep '^Autoconf ' >conftest.out" - { (eval echo "$as_me:8470: \"$cf_try\"") >&5 + { (eval echo "$as_me:8871: \"$cf_try\"") >&5 (eval $cf_try) 2>&5 ac_status=$? - echo "$as_me:8473: \$? = $ac_status" >&5 + echo "$as_me:8874: \$? = $ac_status" >&5 (exit "$ac_status"); } if test -f conftest.out ; then cf_out=`sed -e 's%^Autoconf %%' -e 's%^[^"]*"%%' -e 's%".*%%' conftest.out` @@ -8480,11 +8881,13 @@ EOF else cat >"conftest.$ac_ext" <<_ACEOF -#line 8483 "configure" +#line 8884 "configure" #include "confdefs.h" +$ac_includes_default + #include <${cf_cv_ncurses_header:-curses.h}> -#include <stdio.h> + int main(void) { FILE *fp = fopen("$cf_tempfile", "w"); @@ -8498,22 +8901,22 @@ int main(void) # ifdef __NCURSES_H fprintf(fp, "old\\n"); # else - make an error + #error expected ncurses header to define __NCURSES_H # endif #endif ${cf_cv_main_return:-return}(0); } _ACEOF rm -f "conftest$ac_exeext" -if { (eval echo "$as_me:8508: \"$ac_link\"") >&5 +if { (eval echo "$as_me:8911: \"$ac_link\"") >&5 (eval $ac_link) 2>&5 ac_status=$? - echo "$as_me:8511: \$? = $ac_status" >&5 + echo "$as_me:8914: \$? = $ac_status" >&5 (exit "$ac_status"); } && { ac_try='"./conftest$ac_exeext"' - { (eval echo "$as_me:8513: \"$ac_try\"") >&5 + { (eval echo "$as_me:8916: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? - echo "$as_me:8516: \$? = $ac_status" >&5 + echo "$as_me:8919: \$? = $ac_status" >&5 (exit "$ac_status"); }; }; then cf_cv_ncurses_version=`cat $cf_tempfile` @@ -8527,7 +8930,7 @@ fi rm -f "$cf_tempfile" fi -echo "$as_me:8530: result: $cf_cv_ncurses_version" >&5 +echo "$as_me:8933: result: $cf_cv_ncurses_version" >&5 echo "${ECHO_T}$cf_cv_ncurses_version" >&6 test "$cf_cv_ncurses_version" = no || cat >>confdefs.h <<\EOF @@ -8540,7 +8943,7 @@ cf_nculib_root=ncursesw # to link gpm. cf_ncurses_LIBS="" cf_ncurses_SAVE="$LIBS" -echo "$as_me:8543: checking for Gpm_Open in -lgpm" >&5 +echo "$as_me:8946: 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 @@ -8548,7 +8951,7 @@ else ac_check_lib_save_LIBS=$LIBS LIBS="-lgpm $LIBS" cat >"conftest.$ac_ext" <<_ACEOF -#line 8551 "configure" +#line 8954 "configure" #include "confdefs.h" /* Override any gcc2 internal prototype to avoid an error. */ @@ -8557,7 +8960,7 @@ extern "C" #endif /* We use char because int might match the return type of a gcc2 builtin and then its argument prototype would still apply. */ -char Gpm_Open (); +char Gpm_Open (void); int main (void) { @@ -8567,16 +8970,16 @@ Gpm_Open (); } _ACEOF rm -f "conftest.$ac_objext" "conftest$ac_exeext" -if { (eval echo "$as_me:8570: \"$ac_link\"") >&5 +if { (eval echo "$as_me:8973: \"$ac_link\"") >&5 (eval $ac_link) 2>&5 ac_status=$? - echo "$as_me:8573: \$? = $ac_status" >&5 + echo "$as_me:8976: \$? = $ac_status" >&5 (exit "$ac_status"); } && { ac_try='test -s "conftest$ac_exeext"' - { (eval echo "$as_me:8576: \"$ac_try\"") >&5 + { (eval echo "$as_me:8979: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? - echo "$as_me:8579: \$? = $ac_status" >&5 + echo "$as_me:8982: \$? = $ac_status" >&5 (exit "$ac_status"); }; }; then ac_cv_lib_gpm_Gpm_Open=yes else @@ -8587,10 +8990,10 @@ fi rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext" LIBS=$ac_check_lib_save_LIBS fi -echo "$as_me:8590: result: $ac_cv_lib_gpm_Gpm_Open" >&5 +echo "$as_me:8993: 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:8593: checking for initscr in -lgpm" >&5 + echo "$as_me:8996: 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 @@ -8598,7 +9001,7 @@ else ac_check_lib_save_LIBS=$LIBS LIBS="-lgpm $LIBS" cat >"conftest.$ac_ext" <<_ACEOF -#line 8601 "configure" +#line 9004 "configure" #include "confdefs.h" /* Override any gcc2 internal prototype to avoid an error. */ @@ -8607,7 +9010,7 @@ extern "C" #endif /* We use char because int might match the return type of a gcc2 builtin and then its argument prototype would still apply. */ -char initscr (); +char initscr (void); int main (void) { @@ -8617,16 +9020,16 @@ initscr (); } _ACEOF rm -f "conftest.$ac_objext" "conftest$ac_exeext" -if { (eval echo "$as_me:8620: \"$ac_link\"") >&5 +if { (eval echo "$as_me:9023: \"$ac_link\"") >&5 (eval $ac_link) 2>&5 ac_status=$? - echo "$as_me:8623: \$? = $ac_status" >&5 + echo "$as_me:9026: \$? = $ac_status" >&5 (exit "$ac_status"); } && { ac_try='test -s "conftest$ac_exeext"' - { (eval echo "$as_me:8626: \"$ac_try\"") >&5 + { (eval echo "$as_me:9029: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? - echo "$as_me:8629: \$? = $ac_status" >&5 + echo "$as_me:9032: \$? = $ac_status" >&5 (exit "$ac_status"); }; }; then ac_cv_lib_gpm_initscr=yes else @@ -8637,7 +9040,7 @@ fi rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext" LIBS=$ac_check_lib_save_LIBS fi -echo "$as_me:8640: result: $ac_cv_lib_gpm_initscr" >&5 +echo "$as_me:9043: 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" @@ -8650,9 +9053,9 @@ fi case "$host_os" in (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). + # version of ncurses (but it should do no harm, since it is static). if test "$cf_nculib_root" = ncurses ; then - echo "$as_me:8655: checking for tgoto in -lmytinfo" >&5 + echo "$as_me:9058: 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 @@ -8660,7 +9063,7 @@ else ac_check_lib_save_LIBS=$LIBS LIBS="-lmytinfo $LIBS" cat >"conftest.$ac_ext" <<_ACEOF -#line 8663 "configure" +#line 9066 "configure" #include "confdefs.h" /* Override any gcc2 internal prototype to avoid an error. */ @@ -8669,7 +9072,7 @@ extern "C" #endif /* We use char because int might match the return type of a gcc2 builtin and then its argument prototype would still apply. */ -char tgoto (); +char tgoto (void); int main (void) { @@ -8679,16 +9082,16 @@ tgoto (); } _ACEOF rm -f "conftest.$ac_objext" "conftest$ac_exeext" -if { (eval echo "$as_me:8682: \"$ac_link\"") >&5 +if { (eval echo "$as_me:9085: \"$ac_link\"") >&5 (eval $ac_link) 2>&5 ac_status=$? - echo "$as_me:8685: \$? = $ac_status" >&5 + echo "$as_me:9088: \$? = $ac_status" >&5 (exit "$ac_status"); } && { ac_try='test -s "conftest$ac_exeext"' - { (eval echo "$as_me:8688: \"$ac_try\"") >&5 + { (eval echo "$as_me:9091: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? - echo "$as_me:8691: \$? = $ac_status" >&5 + echo "$as_me:9094: \$? = $ac_status" >&5 (exit "$ac_status"); }; }; then ac_cv_lib_mytinfo_tgoto=yes else @@ -8699,7 +9102,7 @@ fi rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext" LIBS=$ac_check_lib_save_LIBS fi -echo "$as_me:8702: result: $ac_cv_lib_mytinfo_tgoto" >&5 +echo "$as_me:9105: 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" @@ -8748,13 +9151,13 @@ else eval 'cf_cv_have_lib_'"$cf_nculib_root"'=no' cf_libdir="" - echo "$as_me:8751: checking for initscr" >&5 + echo "$as_me:9154: 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 8757 "configure" +#line 9160 "configure" #include "confdefs.h" #define initscr autoconf_temporary #include <limits.h> /* least-intrusive standard header which defines gcc2 __stub macros */ @@ -8785,16 +9188,16 @@ main (void) } _ACEOF rm -f "conftest.$ac_objext" "conftest$ac_exeext" -if { (eval echo "$as_me:8788: \"$ac_link\"") >&5 +if { (eval echo "$as_me:9191: \"$ac_link\"") >&5 (eval $ac_link) 2>&5 ac_status=$? - echo "$as_me:8791: \$? = $ac_status" >&5 + echo "$as_me:9194: \$? = $ac_status" >&5 (exit "$ac_status"); } && { ac_try='test -s "conftest$ac_exeext"' - { (eval echo "$as_me:8794: \"$ac_try\"") >&5 + { (eval echo "$as_me:9197: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? - echo "$as_me:8797: \$? = $ac_status" >&5 + echo "$as_me:9200: \$? = $ac_status" >&5 (exit "$ac_status"); }; }; then ac_cv_func_initscr=yes else @@ -8804,18 +9207,18 @@ ac_cv_func_initscr=no fi rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext" fi -echo "$as_me:8807: result: $ac_cv_func_initscr" >&5 +echo "$as_me:9210: 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:8814: checking for initscr in -l$cf_nculib_root" >&5 + echo "$as_me:9217: 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 8818 "configure" +#line 9221 "configure" #include "confdefs.h" #include <${cf_cv_ncurses_header:-curses.h}> int @@ -8827,25 +9230,25 @@ initscr() } _ACEOF rm -f "conftest.$ac_objext" "conftest$ac_exeext" -if { (eval echo "$as_me:8830: \"$ac_link\"") >&5 +if { (eval echo "$as_me:9233: \"$ac_link\"") >&5 (eval $ac_link) 2>&5 ac_status=$? - echo "$as_me:8833: \$? = $ac_status" >&5 + echo "$as_me:9236: \$? = $ac_status" >&5 (exit "$ac_status"); } && { ac_try='test -s "conftest$ac_exeext"' - { (eval echo "$as_me:8836: \"$ac_try\"") >&5 + { (eval echo "$as_me:9239: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? - echo "$as_me:8839: \$? = $ac_status" >&5 + echo "$as_me:9242: \$? = $ac_status" >&5 (exit "$ac_status"); }; }; then - echo "$as_me:8841: result: yes" >&5 + echo "$as_me:9244: 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:8848: result: no" >&5 +echo "$as_me:9251: result: no" >&5 echo "${ECHO_T}no" >&6 cf_search= @@ -8913,11 +9316,11 @@ cf_search="$cf_library_path_list $cf_search" for cf_libdir in $cf_search do - echo "$as_me:8916: checking for -l$cf_nculib_root in $cf_libdir" >&5 + echo "$as_me:9319: 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 8920 "configure" +#line 9323 "configure" #include "confdefs.h" #include <${cf_cv_ncurses_header:-curses.h}> int @@ -8929,25 +9332,25 @@ initscr() } _ACEOF rm -f "conftest.$ac_objext" "conftest$ac_exeext" -if { (eval echo "$as_me:8932: \"$ac_link\"") >&5 +if { (eval echo "$as_me:9335: \"$ac_link\"") >&5 (eval $ac_link) 2>&5 ac_status=$? - echo "$as_me:8935: \$? = $ac_status" >&5 + echo "$as_me:9338: \$? = $ac_status" >&5 (exit "$ac_status"); } && { ac_try='test -s "conftest$ac_exeext"' - { (eval echo "$as_me:8938: \"$ac_try\"") >&5 + { (eval echo "$as_me:9341: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? - echo "$as_me:8941: \$? = $ac_status" >&5 + echo "$as_me:9344: \$? = $ac_status" >&5 (exit "$ac_status"); }; }; then - echo "$as_me:8943: result: yes" >&5 + echo "$as_me:9346: 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:8950: result: no" >&5 +echo "$as_me:9353: result: no" >&5 echo "${ECHO_T}no" >&6 LIBS="$cf_save_LIBS" fi @@ -8962,7 +9365,7 @@ fi eval 'cf_found_library="$cf_cv_have_lib_'"$cf_nculib_root"\" if test "$cf_found_library" = no ; then - { { echo "$as_me:8965: error: Cannot link $cf_nculib_root library" >&5 + { { echo "$as_me:9368: error: Cannot link $cf_nculib_root library" >&5 echo "$as_me: error: Cannot link $cf_nculib_root library" >&2;} { (exit 1); exit 1; }; } fi @@ -8970,7 +9373,7 @@ fi fi if test -n "$cf_ncurses_LIBS" ; then - echo "$as_me:8973: checking if we can link $cf_nculib_root without $cf_ncurses_LIBS" >&5 + echo "$as_me:9376: 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 @@ -8980,7 +9383,7 @@ echo $ECHO_N "checking if we can link $cf_nculib_root without $cf_ncurses_LIBS.. fi done cat >"conftest.$ac_ext" <<_ACEOF -#line 8983 "configure" +#line 9386 "configure" #include "confdefs.h" #include <${cf_cv_ncurses_header:-curses.h}> int @@ -8992,23 +9395,23 @@ initscr(); mousemask(0,0); tigetstr((char *)0); } _ACEOF rm -f "conftest.$ac_objext" "conftest$ac_exeext" -if { (eval echo "$as_me:8995: \"$ac_link\"") >&5 +if { (eval echo "$as_me:9398: \"$ac_link\"") >&5 (eval $ac_link) 2>&5 ac_status=$? - echo "$as_me:8998: \$? = $ac_status" >&5 + echo "$as_me:9401: \$? = $ac_status" >&5 (exit "$ac_status"); } && { ac_try='test -s "conftest$ac_exeext"' - { (eval echo "$as_me:9001: \"$ac_try\"") >&5 + { (eval echo "$as_me:9404: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? - echo "$as_me:9004: \$? = $ac_status" >&5 + echo "$as_me:9407: \$? = $ac_status" >&5 (exit "$ac_status"); }; }; then - echo "$as_me:9006: result: yes" >&5 + echo "$as_me:9409: result: yes" >&5 echo "${ECHO_T}yes" >&6 else echo "$as_me: failed program was:" >&5 cat "conftest.$ac_ext" >&5 -echo "$as_me:9011: result: no" >&5 +echo "$as_me:9414: result: no" >&5 echo "${ECHO_T}no" >&6 LIBS="$cf_ncurses_SAVE" fi @@ -9032,13 +9435,13 @@ cf_ncuconfig_root=ncurses cf_have_ncuconfig=no if test "x${PKG_CONFIG:=none}" != xnone; then - echo "$as_me:9035: checking pkg-config for $cf_ncuconfig_root" >&5 + echo "$as_me:9438: checking pkg-config for $cf_ncuconfig_root" >&5 echo $ECHO_N "checking pkg-config for $cf_ncuconfig_root... $ECHO_C" >&6 if "$PKG_CONFIG" --exists $cf_ncuconfig_root ; then - echo "$as_me:9038: result: yes" >&5 + echo "$as_me:9441: result: yes" >&5 echo "${ECHO_T}yes" >&6 - echo "$as_me:9041: checking if the $cf_ncuconfig_root package files work" >&5 + echo "$as_me:9444: checking if the $cf_ncuconfig_root package files work" >&5 echo $ECHO_N "checking if the $cf_ncuconfig_root package files work... $ECHO_C" >&6 cf_have_ncuconfig=unknown @@ -9171,7 +9574,7 @@ done LIBS="$cf_add_libs" cat >"conftest.$ac_ext" <<_ACEOF -#line 9174 "configure" +#line 9577 "configure" #include "confdefs.h" #include <${cf_cv_ncurses_header:-curses.h}> int @@ -9183,37 +9586,37 @@ initscr(); mousemask(0,0); tigetstr((char *)0); } _ACEOF rm -f "conftest.$ac_objext" "conftest$ac_exeext" -if { (eval echo "$as_me:9186: \"$ac_link\"") >&5 +if { (eval echo "$as_me:9589: \"$ac_link\"") >&5 (eval $ac_link) 2>&5 ac_status=$? - echo "$as_me:9189: \$? = $ac_status" >&5 + echo "$as_me:9592: \$? = $ac_status" >&5 (exit "$ac_status"); } && { ac_try='test -s "conftest$ac_exeext"' - { (eval echo "$as_me:9192: \"$ac_try\"") >&5 + { (eval echo "$as_me:9595: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? - echo "$as_me:9195: \$? = $ac_status" >&5 + echo "$as_me:9598: \$? = $ac_status" >&5 (exit "$ac_status"); }; }; then if test "$cross_compiling" = yes; then cf_test_ncuconfig=maybe else cat >"conftest.$ac_ext" <<_ACEOF -#line 9201 "configure" +#line 9604 "configure" #include "confdefs.h" #include <${cf_cv_ncurses_header:-curses.h}> int main(void) - { char *xx = curses_version(); return (xx == 0); } + { const char *xx = curses_version(); return (xx == 0); } _ACEOF rm -f "conftest$ac_exeext" -if { (eval echo "$as_me:9208: \"$ac_link\"") >&5 +if { (eval echo "$as_me:9611: \"$ac_link\"") >&5 (eval $ac_link) 2>&5 ac_status=$? - echo "$as_me:9211: \$? = $ac_status" >&5 + echo "$as_me:9614: \$? = $ac_status" >&5 (exit "$ac_status"); } && { ac_try='"./conftest$ac_exeext"' - { (eval echo "$as_me:9213: \"$ac_try\"") >&5 + { (eval echo "$as_me:9616: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? - echo "$as_me:9216: \$? = $ac_status" >&5 + echo "$as_me:9619: \$? = $ac_status" >&5 (exit "$ac_status"); }; }; then cf_test_ncuconfig=yes else @@ -9244,12 +9647,38 @@ rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext" ;; esac +for cf_add_cflags in $cf_pkg_cflags +do + case "x$cf_add_cflags" in + (x-[DU]*) + +cf_tmp_cflag=`echo "x$cf_add_cflags" | sed -e 's/^.//' -e 's/=.*//'` +while true +do + cf_old_cflag=`echo "x$CFLAGS" | sed -e 's/^.//' -e 's/[ ][ ]*-/ -/g' -e "s%$cf_tmp_cflag\\(=[^ ][^ ]*\\)\?%%" -e 's/^[ ]*//' -e 's%[ ][ ]*-D% -D%g' -e 's%[ ][ ]*-I% -I%g'` + test "$CFLAGS" != "$cf_old_cflag" || break + + CFLAGS="$cf_old_cflag" +done + +cf_tmp_cflag=`echo "x$cf_add_cflags" | sed -e 's/^.//' -e 's/=.*//'` +while true +do + cf_old_cflag=`echo "x$CPPFLAGS" | sed -e 's/^.//' -e 's/[ ][ ]*-/ -/g' -e "s%$cf_tmp_cflag\\(=[^ ][^ ]*\\)\?%%" -e 's/^[ ]*//' -e 's%[ ][ ]*-D% -D%g' -e 's%[ ][ ]*-I% -I%g'` + test "$CPPFLAGS" != "$cf_old_cflag" || break + + CPPFLAGS="$cf_old_cflag" +done + + ;; + esac + cf_fix_cppflags=no cf_new_cflags= cf_new_cppflags= cf_new_extra_cppflags= -for cf_add_cflags in $cf_pkg_cflags +for cf_add_cflags in $cf_add_cflags do case "$cf_fix_cppflags" in (no) @@ -9342,6 +9771,8 @@ if test -n "$cf_new_extra_cppflags" ; then fi +done + cf_add_libs="$LIBS" # reverse order cf_add_0lib= @@ -9359,7 +9790,7 @@ done LIBS="$cf_add_libs" cat >"conftest.$ac_ext" <<_ACEOF -#line 9362 "configure" +#line 9793 "configure" #include "confdefs.h" #include <${cf_cv_ncurses_header:-curses.h}> int @@ -9371,37 +9802,37 @@ initscr(); mousemask(0,0); tigetstr((char *)0); } _ACEOF rm -f "conftest.$ac_objext" "conftest$ac_exeext" -if { (eval echo "$as_me:9374: \"$ac_link\"") >&5 +if { (eval echo "$as_me:9805: \"$ac_link\"") >&5 (eval $ac_link) 2>&5 ac_status=$? - echo "$as_me:9377: \$? = $ac_status" >&5 + echo "$as_me:9808: \$? = $ac_status" >&5 (exit "$ac_status"); } && { ac_try='test -s "conftest$ac_exeext"' - { (eval echo "$as_me:9380: \"$ac_try\"") >&5 + { (eval echo "$as_me:9811: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? - echo "$as_me:9383: \$? = $ac_status" >&5 + echo "$as_me:9814: \$? = $ac_status" >&5 (exit "$ac_status"); }; }; then if test "$cross_compiling" = yes; then cf_have_ncuconfig=maybe else cat >"conftest.$ac_ext" <<_ACEOF -#line 9389 "configure" +#line 9820 "configure" #include "confdefs.h" #include <${cf_cv_ncurses_header:-curses.h}> int main(void) - { char *xx = curses_version(); return (xx == 0); } + { const char *xx = curses_version(); return (xx == 0); } _ACEOF rm -f "conftest$ac_exeext" -if { (eval echo "$as_me:9396: \"$ac_link\"") >&5 +if { (eval echo "$as_me:9827: \"$ac_link\"") >&5 (eval $ac_link) 2>&5 ac_status=$? - echo "$as_me:9399: \$? = $ac_status" >&5 + echo "$as_me:9830: \$? = $ac_status" >&5 (exit "$ac_status"); } && { ac_try='"./conftest$ac_exeext"' - { (eval echo "$as_me:9401: \"$ac_try\"") >&5 + { (eval echo "$as_me:9832: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? - echo "$as_me:9404: \$? = $ac_status" >&5 + echo "$as_me:9835: \$? = $ac_status" >&5 (exit "$ac_status"); }; }; then cf_have_ncuconfig=yes else @@ -9418,7 +9849,7 @@ cat "conftest.$ac_ext" >&5 cf_have_ncuconfig=no fi rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext" - echo "$as_me:9421: result: $cf_have_ncuconfig" >&5 + echo "$as_me:9852: result: $cf_have_ncuconfig" >&5 echo "${ECHO_T}$cf_have_ncuconfig" >&6 test "$cf_have_ncuconfig" = maybe && cf_have_ncuconfig=yes if test "$cf_have_ncuconfig" != "yes" @@ -9434,7 +9865,7 @@ EOF NCURSES_CONFIG_PKG=$cf_ncuconfig_root -echo "$as_me:9437: checking for terminfo header" >&5 +echo "$as_me:9868: 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 @@ -9452,7 +9883,7 @@ esac for cf_test in $cf_term_header "ncurses/term.h" "ncursesw/term.h" do cat >"conftest.$ac_ext" <<_ACEOF -#line 9455 "configure" +#line 9886 "configure" #include "confdefs.h" #include <stdio.h> #include <${cf_cv_ncurses_header:-curses.h}> @@ -9467,16 +9898,16 @@ int x = auto_left_margin; (void)x } _ACEOF rm -f "conftest.$ac_objext" -if { (eval echo "$as_me:9470: \"$ac_compile\"") >&5 +if { (eval echo "$as_me:9901: \"$ac_compile\"") >&5 (eval $ac_compile) 2>&5 ac_status=$? - echo "$as_me:9473: \$? = $ac_status" >&5 + echo "$as_me:9904: \$? = $ac_status" >&5 (exit "$ac_status"); } && { ac_try='test -s "conftest.$ac_objext"' - { (eval echo "$as_me:9476: \"$ac_try\"") >&5 + { (eval echo "$as_me:9907: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? - echo "$as_me:9479: \$? = $ac_status" >&5 + echo "$as_me:9910: \$? = $ac_status" >&5 (exit "$ac_status"); }; }; then cf_cv_term_header="$cf_test" @@ -9492,7 +9923,7 @@ rm -f "conftest.$ac_objext" "conftest.$ac_ext" done fi -echo "$as_me:9495: result: $cf_cv_term_header" >&5 +echo "$as_me:9926: result: $cf_cv_term_header" >&5 echo "${ECHO_T}$cf_cv_term_header" >&6 # Set definitions to allow ifdef'ing to accommodate subdirectories @@ -9527,7 +9958,7 @@ esac fi else - echo "$as_me:9530: result: no" >&5 + echo "$as_me:9961: result: no" >&5 echo "${ECHO_T}no" >&6 NCURSES_CONFIG_PKG=none fi @@ -9543,7 +9974,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:9546: checking for $ac_word" >&5 +echo "$as_me:9977: 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 @@ -9558,7 +9989,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:9561: found $ac_dir/$ac_word" >&5 +echo "$as_me:9992: found $ac_dir/$ac_word" >&5 break done @@ -9566,10 +9997,10 @@ fi fi NCURSES_CONFIG=$ac_cv_prog_NCURSES_CONFIG if test -n "$NCURSES_CONFIG"; then - echo "$as_me:9569: result: $NCURSES_CONFIG" >&5 + echo "$as_me:10000: result: $NCURSES_CONFIG" >&5 echo "${ECHO_T}$NCURSES_CONFIG" >&6 else - echo "$as_me:9572: result: no" >&5 + echo "$as_me:10003: result: no" >&5 echo "${ECHO_T}no" >&6 fi @@ -9582,7 +10013,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:9585: checking for $ac_word" >&5 +echo "$as_me:10016: 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 @@ -9597,7 +10028,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:9600: found $ac_dir/$ac_word" >&5 +echo "$as_me:10031: found $ac_dir/$ac_word" >&5 break done @@ -9605,10 +10036,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:9608: result: $ac_ct_NCURSES_CONFIG" >&5 + echo "$as_me:10039: result: $ac_ct_NCURSES_CONFIG" >&5 echo "${ECHO_T}$ac_ct_NCURSES_CONFIG" >&6 else - echo "$as_me:9611: result: no" >&5 + echo "$as_me:10042: result: no" >&5 echo "${ECHO_T}no" >&6 fi @@ -9621,12 +10052,38 @@ fi if test "$NCURSES_CONFIG" != none ; then +for cf_add_cflags in `$NCURSES_CONFIG --cflags` +do + case "x$cf_add_cflags" in + (x-[DU]*) + +cf_tmp_cflag=`echo "x$cf_add_cflags" | sed -e 's/^.//' -e 's/=.*//'` +while true +do + cf_old_cflag=`echo "x$CFLAGS" | sed -e 's/^.//' -e 's/[ ][ ]*-/ -/g' -e "s%$cf_tmp_cflag\\(=[^ ][^ ]*\\)\?%%" -e 's/^[ ]*//' -e 's%[ ][ ]*-D% -D%g' -e 's%[ ][ ]*-I% -I%g'` + test "$CFLAGS" != "$cf_old_cflag" || break + + CFLAGS="$cf_old_cflag" +done + +cf_tmp_cflag=`echo "x$cf_add_cflags" | sed -e 's/^.//' -e 's/=.*//'` +while true +do + cf_old_cflag=`echo "x$CPPFLAGS" | sed -e 's/^.//' -e 's/[ ][ ]*-/ -/g' -e "s%$cf_tmp_cflag\\(=[^ ][^ ]*\\)\?%%" -e 's/^[ ]*//' -e 's%[ ][ ]*-D% -D%g' -e 's%[ ][ ]*-I% -I%g'` + test "$CPPFLAGS" != "$cf_old_cflag" || break + + CPPFLAGS="$cf_old_cflag" +done + + ;; + esac + cf_fix_cppflags=no cf_new_cflags= cf_new_cppflags= cf_new_extra_cppflags= -for cf_add_cflags in `$NCURSES_CONFIG --cflags` +for cf_add_cflags in $cf_add_cflags do case "$cf_fix_cppflags" in (no) @@ -9719,6 +10176,8 @@ if test -n "$cf_new_extra_cppflags" ; then fi +done + cf_add_libs="$LIBS" # reverse order cf_add_0lib= @@ -9737,7 +10196,7 @@ LIBS="$cf_add_libs" # even with config script, some packages use no-override for curses.h -echo "$as_me:9740: checking if we have identified curses headers" >&5 +echo "$as_me:10199: 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 @@ -9749,28 +10208,28 @@ for cf_header in \ curses.h ncurses/curses.h do cat >"conftest.$ac_ext" <<_ACEOF -#line 9752 "configure" +#line 10211 "configure" #include "confdefs.h" #include <${cf_header}> int main (void) { -initscr(); tgoto("?", 0,0) +initscr(); endwin() ; return 0; } _ACEOF rm -f "conftest.$ac_objext" -if { (eval echo "$as_me:9764: \"$ac_compile\"") >&5 +if { (eval echo "$as_me:10223: \"$ac_compile\"") >&5 (eval $ac_compile) 2>&5 ac_status=$? - echo "$as_me:9767: \$? = $ac_status" >&5 + echo "$as_me:10226: \$? = $ac_status" >&5 (exit "$ac_status"); } && { ac_try='test -s "conftest.$ac_objext"' - { (eval echo "$as_me:9770: \"$ac_try\"") >&5 + { (eval echo "$as_me:10229: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? - echo "$as_me:9773: \$? = $ac_status" >&5 + echo "$as_me:10232: \$? = $ac_status" >&5 (exit "$ac_status"); }; }; then cf_cv_ncurses_header=$cf_header; break else @@ -9781,11 +10240,11 @@ rm -f "conftest.$ac_objext" "conftest.$ac_ext" done fi -echo "$as_me:9784: result: $cf_cv_ncurses_header" >&5 +echo "$as_me:10243: 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:9788: error: No curses header-files found" >&5 + { { echo "$as_me:10247: error: No curses header-files found" >&5 echo "$as_me: error: No curses header-files found" >&2;} { (exit 1); exit 1; }; } fi @@ -9795,23 +10254,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:9798: checking for $ac_header" >&5 +echo "$as_me:10257: 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 9804 "configure" +#line 10263 "configure" #include "confdefs.h" #include <$ac_header> _ACEOF -if { (eval echo "$as_me:9808: \"$ac_cpp "conftest.$ac_ext"\"") >&5 +if { (eval echo "$as_me:10267: \"$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:9814: \$? = $ac_status" >&5 + echo "$as_me:10273: \$? = $ac_status" >&5 (exit "$ac_status"); } >/dev/null; then if test -s conftest.err; then ac_cpp_err=$ac_c_preproc_warn_flag @@ -9830,7 +10289,7 @@ else fi rm -f conftest.err "conftest.$ac_ext" fi -echo "$as_me:9833: result: `eval echo '${'"$as_ac_Header"'}'`" >&5 +echo "$as_me:10292: 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 @@ -9886,7 +10345,7 @@ if test -n "$cf_cv_curses_dir/include/$cf_ncuhdr_root" ; then CPPFLAGS="${CPPFLAGS}-I$cf_add_incdir" cat >"conftest.$ac_ext" <<_ACEOF -#line 9889 "configure" +#line 10348 "configure" #include "confdefs.h" #include <stdio.h> int @@ -9898,16 +10357,16 @@ printf("Hello") } _ACEOF rm -f "conftest.$ac_objext" -if { (eval echo "$as_me:9901: \"$ac_compile\"") >&5 +if { (eval echo "$as_me:10360: \"$ac_compile\"") >&5 (eval $ac_compile) 2>&5 ac_status=$? - echo "$as_me:9904: \$? = $ac_status" >&5 + echo "$as_me:10363: \$? = $ac_status" >&5 (exit "$ac_status"); } && { ac_try='test -s "conftest.$ac_objext"' - { (eval echo "$as_me:9907: \"$ac_try\"") >&5 + { (eval echo "$as_me:10366: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? - echo "$as_me:9910: \$? = $ac_status" >&5 + echo "$as_me:10369: \$? = $ac_status" >&5 (exit "$ac_status"); }; }; then : else @@ -9924,7 +10383,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}:9927: testing adding $cf_add_incdir to include-path ..." 1>&5 +echo "${as_me:-configure}:10386: testing adding $cf_add_incdir to include-path ..." 1>&5 CPPFLAGS="$CPPFLAGS -I$cf_add_incdir" @@ -9943,7 +10402,7 @@ fi } -echo "$as_me:9946: checking for $cf_ncuhdr_root header in include-path" >&5 +echo "$as_me:10405: 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 @@ -9955,7 +10414,7 @@ else do cat >"conftest.$ac_ext" <<_ACEOF -#line 9958 "configure" +#line 10417 "configure" #include "confdefs.h" #include <$cf_header> @@ -9970,7 +10429,7 @@ printf("%s\\n", NCURSES_VERSION); #ifdef __NCURSES_H printf("old\\n"); #else - make an error + #error __NCURSES_H is not defined #endif #endif @@ -9979,16 +10438,16 @@ printf("old\\n"); } _ACEOF rm -f "conftest.$ac_objext" -if { (eval echo "$as_me:9982: \"$ac_compile\"") >&5 +if { (eval echo "$as_me:10441: \"$ac_compile\"") >&5 (eval $ac_compile) 2>&5 ac_status=$? - echo "$as_me:9985: \$? = $ac_status" >&5 + echo "$as_me:10444: \$? = $ac_status" >&5 (exit "$ac_status"); } && { ac_try='test -s "conftest.$ac_objext"' - { (eval echo "$as_me:9988: \"$ac_try\"") >&5 + { (eval echo "$as_me:10447: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? - echo "$as_me:9991: \$? = $ac_status" >&5 + echo "$as_me:10450: \$? = $ac_status" >&5 (exit "$ac_status"); }; }; then cf_cv_ncurses_h=$cf_header @@ -10003,14 +10462,14 @@ rm -f "conftest.$ac_objext" "conftest.$ac_ext" done fi -echo "$as_me:10006: result: $cf_cv_ncurses_h" >&5 +echo "$as_me:10465: 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:10013: checking for $cf_ncuhdr_root include-path" >&5 +echo "$as_me:10472: 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 @@ -10131,7 +10590,7 @@ if test -n "$cf_incdir" ; then CPPFLAGS="${CPPFLAGS}-I$cf_add_incdir" cat >"conftest.$ac_ext" <<_ACEOF -#line 10134 "configure" +#line 10593 "configure" #include "confdefs.h" #include <stdio.h> int @@ -10143,16 +10602,16 @@ printf("Hello") } _ACEOF rm -f "conftest.$ac_objext" -if { (eval echo "$as_me:10146: \"$ac_compile\"") >&5 +if { (eval echo "$as_me:10605: \"$ac_compile\"") >&5 (eval $ac_compile) 2>&5 ac_status=$? - echo "$as_me:10149: \$? = $ac_status" >&5 + echo "$as_me:10608: \$? = $ac_status" >&5 (exit "$ac_status"); } && { ac_try='test -s "conftest.$ac_objext"' - { (eval echo "$as_me:10152: \"$ac_try\"") >&5 + { (eval echo "$as_me:10611: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? - echo "$as_me:10155: \$? = $ac_status" >&5 + echo "$as_me:10614: \$? = $ac_status" >&5 (exit "$ac_status"); }; }; then : else @@ -10169,7 +10628,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}:10172: testing adding $cf_add_incdir to include-path ..." 1>&5 +echo "${as_me:-configure}:10631: testing adding $cf_add_incdir to include-path ..." 1>&5 CPPFLAGS="$CPPFLAGS -I$cf_add_incdir" @@ -10192,7 +10651,7 @@ fi do cat >"conftest.$ac_ext" <<_ACEOF -#line 10195 "configure" +#line 10654 "configure" #include "confdefs.h" #include <$cf_header> @@ -10207,7 +10666,7 @@ printf("%s\\n", NCURSES_VERSION); #ifdef __NCURSES_H printf("old\\n"); #else - make an error + #error __NCURSES_H is not defined #endif #endif @@ -10216,16 +10675,16 @@ printf("old\\n"); } _ACEOF rm -f "conftest.$ac_objext" -if { (eval echo "$as_me:10219: \"$ac_compile\"") >&5 +if { (eval echo "$as_me:10678: \"$ac_compile\"") >&5 (eval $ac_compile) 2>&5 ac_status=$? - echo "$as_me:10222: \$? = $ac_status" >&5 + echo "$as_me:10681: \$? = $ac_status" >&5 (exit "$ac_status"); } && { ac_try='test -s "conftest.$ac_objext"' - { (eval echo "$as_me:10225: \"$ac_try\"") >&5 + { (eval echo "$as_me:10684: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? - echo "$as_me:10228: \$? = $ac_status" >&5 + echo "$as_me:10687: \$? = $ac_status" >&5 (exit "$ac_status"); }; }; then cf_cv_ncurses_h2=$cf_header @@ -10246,12 +10705,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:10249: error: not found" >&5 + test "$cf_cv_ncurses_h2" = no && { { echo "$as_me:10708: error: not found" >&5 echo "$as_me: error: not found" >&2;} { (exit 1); exit 1; }; } fi -echo "$as_me:10254: result: $cf_cv_ncurses_h2" >&5 +echo "$as_me:10713: 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%/[^/]*$%%'` @@ -10287,7 +10746,7 @@ if test -n "$cf_1st_incdir" ; then CPPFLAGS="${CPPFLAGS}-I$cf_add_incdir" cat >"conftest.$ac_ext" <<_ACEOF -#line 10290 "configure" +#line 10749 "configure" #include "confdefs.h" #include <stdio.h> int @@ -10299,16 +10758,16 @@ printf("Hello") } _ACEOF rm -f "conftest.$ac_objext" -if { (eval echo "$as_me:10302: \"$ac_compile\"") >&5 +if { (eval echo "$as_me:10761: \"$ac_compile\"") >&5 (eval $ac_compile) 2>&5 ac_status=$? - echo "$as_me:10305: \$? = $ac_status" >&5 + echo "$as_me:10764: \$? = $ac_status" >&5 (exit "$ac_status"); } && { ac_try='test -s "conftest.$ac_objext"' - { (eval echo "$as_me:10308: \"$ac_try\"") >&5 + { (eval echo "$as_me:10767: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? - echo "$as_me:10311: \$? = $ac_status" >&5 + echo "$as_me:10770: \$? = $ac_status" >&5 (exit "$ac_status"); }; }; then : else @@ -10325,7 +10784,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}:10328: testing adding $cf_add_incdir to include-path ..." 1>&5 +echo "${as_me:-configure}:10787: testing adding $cf_add_incdir to include-path ..." 1>&5 CPPFLAGS="$CPPFLAGS -I$cf_add_incdir" @@ -10373,7 +10832,7 @@ EOF ;; esac -echo "$as_me:10376: checking for terminfo header" >&5 +echo "$as_me:10835: 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 @@ -10391,7 +10850,7 @@ esac for cf_test in $cf_term_header "ncurses/term.h" "ncursesw/term.h" do cat >"conftest.$ac_ext" <<_ACEOF -#line 10394 "configure" +#line 10853 "configure" #include "confdefs.h" #include <stdio.h> #include <${cf_cv_ncurses_header:-curses.h}> @@ -10406,16 +10865,16 @@ int x = auto_left_margin; (void)x } _ACEOF rm -f "conftest.$ac_objext" -if { (eval echo "$as_me:10409: \"$ac_compile\"") >&5 +if { (eval echo "$as_me:10868: \"$ac_compile\"") >&5 (eval $ac_compile) 2>&5 ac_status=$? - echo "$as_me:10412: \$? = $ac_status" >&5 + echo "$as_me:10871: \$? = $ac_status" >&5 (exit "$ac_status"); } && { ac_try='test -s "conftest.$ac_objext"' - { (eval echo "$as_me:10415: \"$ac_try\"") >&5 + { (eval echo "$as_me:10874: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? - echo "$as_me:10418: \$? = $ac_status" >&5 + echo "$as_me:10877: \$? = $ac_status" >&5 (exit "$ac_status"); }; }; then cf_cv_term_header="$cf_test" @@ -10431,7 +10890,7 @@ rm -f "conftest.$ac_objext" "conftest.$ac_ext" done fi -echo "$as_me:10434: result: $cf_cv_term_header" >&5 +echo "$as_me:10893: result: $cf_cv_term_header" >&5 echo "${ECHO_T}$cf_cv_term_header" >&6 # Set definitions to allow ifdef'ing to accommodate subdirectories @@ -10469,7 +10928,7 @@ cat >>confdefs.h <<\EOF #define NCURSES 1 EOF -echo "$as_me:10472: checking for ncurses version" >&5 +echo "$as_me:10931: 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 @@ -10495,10 +10954,10 @@ Autoconf "old" #endif EOF cf_try="$ac_cpp conftest.$ac_ext 2>&5 | grep '^Autoconf ' >conftest.out" - { (eval echo "$as_me:10498: \"$cf_try\"") >&5 + { (eval echo "$as_me:10957: \"$cf_try\"") >&5 (eval $cf_try) 2>&5 ac_status=$? - echo "$as_me:10501: \$? = $ac_status" >&5 + echo "$as_me:10960: \$? = $ac_status" >&5 (exit "$ac_status"); } if test -f conftest.out ; then cf_out=`sed -e 's%^Autoconf %%' -e 's%^[^"]*"%%' -e 's%".*%%' conftest.out` @@ -10508,11 +10967,13 @@ EOF else cat >"conftest.$ac_ext" <<_ACEOF -#line 10511 "configure" +#line 10970 "configure" #include "confdefs.h" +$ac_includes_default + #include <${cf_cv_ncurses_header:-curses.h}> -#include <stdio.h> + int main(void) { FILE *fp = fopen("$cf_tempfile", "w"); @@ -10526,22 +10987,22 @@ int main(void) # ifdef __NCURSES_H fprintf(fp, "old\\n"); # else - make an error + #error expected ncurses header to define __NCURSES_H # endif #endif ${cf_cv_main_return:-return}(0); } _ACEOF rm -f "conftest$ac_exeext" -if { (eval echo "$as_me:10536: \"$ac_link\"") >&5 +if { (eval echo "$as_me:10997: \"$ac_link\"") >&5 (eval $ac_link) 2>&5 ac_status=$? - echo "$as_me:10539: \$? = $ac_status" >&5 + echo "$as_me:11000: \$? = $ac_status" >&5 (exit "$ac_status"); } && { ac_try='"./conftest$ac_exeext"' - { (eval echo "$as_me:10541: \"$ac_try\"") >&5 + { (eval echo "$as_me:11002: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? - echo "$as_me:10544: \$? = $ac_status" >&5 + echo "$as_me:11005: \$? = $ac_status" >&5 (exit "$ac_status"); }; }; then cf_cv_ncurses_version=`cat $cf_tempfile` @@ -10555,7 +11016,7 @@ fi rm -f "$cf_tempfile" fi -echo "$as_me:10558: result: $cf_cv_ncurses_version" >&5 +echo "$as_me:11019: result: $cf_cv_ncurses_version" >&5 echo "${ECHO_T}$cf_cv_ncurses_version" >&6 test "$cf_cv_ncurses_version" = no || cat >>confdefs.h <<\EOF @@ -10568,7 +11029,7 @@ cf_nculib_root=ncurses # to link gpm. cf_ncurses_LIBS="" cf_ncurses_SAVE="$LIBS" -echo "$as_me:10571: checking for Gpm_Open in -lgpm" >&5 +echo "$as_me:11032: 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 @@ -10576,7 +11037,7 @@ else ac_check_lib_save_LIBS=$LIBS LIBS="-lgpm $LIBS" cat >"conftest.$ac_ext" <<_ACEOF -#line 10579 "configure" +#line 11040 "configure" #include "confdefs.h" /* Override any gcc2 internal prototype to avoid an error. */ @@ -10585,7 +11046,7 @@ extern "C" #endif /* We use char because int might match the return type of a gcc2 builtin and then its argument prototype would still apply. */ -char Gpm_Open (); +char Gpm_Open (void); int main (void) { @@ -10595,16 +11056,16 @@ Gpm_Open (); } _ACEOF rm -f "conftest.$ac_objext" "conftest$ac_exeext" -if { (eval echo "$as_me:10598: \"$ac_link\"") >&5 +if { (eval echo "$as_me:11059: \"$ac_link\"") >&5 (eval $ac_link) 2>&5 ac_status=$? - echo "$as_me:10601: \$? = $ac_status" >&5 + echo "$as_me:11062: \$? = $ac_status" >&5 (exit "$ac_status"); } && { ac_try='test -s "conftest$ac_exeext"' - { (eval echo "$as_me:10604: \"$ac_try\"") >&5 + { (eval echo "$as_me:11065: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? - echo "$as_me:10607: \$? = $ac_status" >&5 + echo "$as_me:11068: \$? = $ac_status" >&5 (exit "$ac_status"); }; }; then ac_cv_lib_gpm_Gpm_Open=yes else @@ -10615,10 +11076,10 @@ fi rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext" LIBS=$ac_check_lib_save_LIBS fi -echo "$as_me:10618: result: $ac_cv_lib_gpm_Gpm_Open" >&5 +echo "$as_me:11079: 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:10621: checking for initscr in -lgpm" >&5 + echo "$as_me:11082: 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 @@ -10626,7 +11087,7 @@ else ac_check_lib_save_LIBS=$LIBS LIBS="-lgpm $LIBS" cat >"conftest.$ac_ext" <<_ACEOF -#line 10629 "configure" +#line 11090 "configure" #include "confdefs.h" /* Override any gcc2 internal prototype to avoid an error. */ @@ -10635,7 +11096,7 @@ extern "C" #endif /* We use char because int might match the return type of a gcc2 builtin and then its argument prototype would still apply. */ -char initscr (); +char initscr (void); int main (void) { @@ -10645,16 +11106,16 @@ initscr (); } _ACEOF rm -f "conftest.$ac_objext" "conftest$ac_exeext" -if { (eval echo "$as_me:10648: \"$ac_link\"") >&5 +if { (eval echo "$as_me:11109: \"$ac_link\"") >&5 (eval $ac_link) 2>&5 ac_status=$? - echo "$as_me:10651: \$? = $ac_status" >&5 + echo "$as_me:11112: \$? = $ac_status" >&5 (exit "$ac_status"); } && { ac_try='test -s "conftest$ac_exeext"' - { (eval echo "$as_me:10654: \"$ac_try\"") >&5 + { (eval echo "$as_me:11115: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? - echo "$as_me:10657: \$? = $ac_status" >&5 + echo "$as_me:11118: \$? = $ac_status" >&5 (exit "$ac_status"); }; }; then ac_cv_lib_gpm_initscr=yes else @@ -10665,7 +11126,7 @@ fi rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext" LIBS=$ac_check_lib_save_LIBS fi -echo "$as_me:10668: result: $ac_cv_lib_gpm_initscr" >&5 +echo "$as_me:11129: 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" @@ -10678,9 +11139,9 @@ fi case "$host_os" in (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). + # version of ncurses (but it should do no harm, since it is static). if test "$cf_nculib_root" = ncurses ; then - echo "$as_me:10683: checking for tgoto in -lmytinfo" >&5 + echo "$as_me:11144: 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 @@ -10688,7 +11149,7 @@ else ac_check_lib_save_LIBS=$LIBS LIBS="-lmytinfo $LIBS" cat >"conftest.$ac_ext" <<_ACEOF -#line 10691 "configure" +#line 11152 "configure" #include "confdefs.h" /* Override any gcc2 internal prototype to avoid an error. */ @@ -10697,7 +11158,7 @@ extern "C" #endif /* We use char because int might match the return type of a gcc2 builtin and then its argument prototype would still apply. */ -char tgoto (); +char tgoto (void); int main (void) { @@ -10707,16 +11168,16 @@ tgoto (); } _ACEOF rm -f "conftest.$ac_objext" "conftest$ac_exeext" -if { (eval echo "$as_me:10710: \"$ac_link\"") >&5 +if { (eval echo "$as_me:11171: \"$ac_link\"") >&5 (eval $ac_link) 2>&5 ac_status=$? - echo "$as_me:10713: \$? = $ac_status" >&5 + echo "$as_me:11174: \$? = $ac_status" >&5 (exit "$ac_status"); } && { ac_try='test -s "conftest$ac_exeext"' - { (eval echo "$as_me:10716: \"$ac_try\"") >&5 + { (eval echo "$as_me:11177: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? - echo "$as_me:10719: \$? = $ac_status" >&5 + echo "$as_me:11180: \$? = $ac_status" >&5 (exit "$ac_status"); }; }; then ac_cv_lib_mytinfo_tgoto=yes else @@ -10727,7 +11188,7 @@ fi rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext" LIBS=$ac_check_lib_save_LIBS fi -echo "$as_me:10730: result: $ac_cv_lib_mytinfo_tgoto" >&5 +echo "$as_me:11191: 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" @@ -10776,13 +11237,13 @@ else eval 'cf_cv_have_lib_'"$cf_nculib_root"'=no' cf_libdir="" - echo "$as_me:10779: checking for initscr" >&5 + echo "$as_me:11240: 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 10785 "configure" +#line 11246 "configure" #include "confdefs.h" #define initscr autoconf_temporary #include <limits.h> /* least-intrusive standard header which defines gcc2 __stub macros */ @@ -10813,16 +11274,16 @@ main (void) } _ACEOF rm -f "conftest.$ac_objext" "conftest$ac_exeext" -if { (eval echo "$as_me:10816: \"$ac_link\"") >&5 +if { (eval echo "$as_me:11277: \"$ac_link\"") >&5 (eval $ac_link) 2>&5 ac_status=$? - echo "$as_me:10819: \$? = $ac_status" >&5 + echo "$as_me:11280: \$? = $ac_status" >&5 (exit "$ac_status"); } && { ac_try='test -s "conftest$ac_exeext"' - { (eval echo "$as_me:10822: \"$ac_try\"") >&5 + { (eval echo "$as_me:11283: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? - echo "$as_me:10825: \$? = $ac_status" >&5 + echo "$as_me:11286: \$? = $ac_status" >&5 (exit "$ac_status"); }; }; then ac_cv_func_initscr=yes else @@ -10832,18 +11293,18 @@ ac_cv_func_initscr=no fi rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext" fi -echo "$as_me:10835: result: $ac_cv_func_initscr" >&5 +echo "$as_me:11296: 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:10842: checking for initscr in -l$cf_nculib_root" >&5 + echo "$as_me:11303: 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 10846 "configure" +#line 11307 "configure" #include "confdefs.h" #include <${cf_cv_ncurses_header:-curses.h}> int @@ -10855,25 +11316,25 @@ initscr() } _ACEOF rm -f "conftest.$ac_objext" "conftest$ac_exeext" -if { (eval echo "$as_me:10858: \"$ac_link\"") >&5 +if { (eval echo "$as_me:11319: \"$ac_link\"") >&5 (eval $ac_link) 2>&5 ac_status=$? - echo "$as_me:10861: \$? = $ac_status" >&5 + echo "$as_me:11322: \$? = $ac_status" >&5 (exit "$ac_status"); } && { ac_try='test -s "conftest$ac_exeext"' - { (eval echo "$as_me:10864: \"$ac_try\"") >&5 + { (eval echo "$as_me:11325: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? - echo "$as_me:10867: \$? = $ac_status" >&5 + echo "$as_me:11328: \$? = $ac_status" >&5 (exit "$ac_status"); }; }; then - echo "$as_me:10869: result: yes" >&5 + echo "$as_me:11330: 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:10876: result: no" >&5 +echo "$as_me:11337: result: no" >&5 echo "${ECHO_T}no" >&6 cf_search= @@ -10941,11 +11402,11 @@ cf_search="$cf_library_path_list $cf_search" for cf_libdir in $cf_search do - echo "$as_me:10944: checking for -l$cf_nculib_root in $cf_libdir" >&5 + echo "$as_me:11405: 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 10948 "configure" +#line 11409 "configure" #include "confdefs.h" #include <${cf_cv_ncurses_header:-curses.h}> int @@ -10957,25 +11418,25 @@ initscr() } _ACEOF rm -f "conftest.$ac_objext" "conftest$ac_exeext" -if { (eval echo "$as_me:10960: \"$ac_link\"") >&5 +if { (eval echo "$as_me:11421: \"$ac_link\"") >&5 (eval $ac_link) 2>&5 ac_status=$? - echo "$as_me:10963: \$? = $ac_status" >&5 + echo "$as_me:11424: \$? = $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:11427: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? - echo "$as_me:10969: \$? = $ac_status" >&5 + echo "$as_me:11430: \$? = $ac_status" >&5 (exit "$ac_status"); }; }; then - echo "$as_me:10971: result: yes" >&5 + echo "$as_me:11432: 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:10978: result: no" >&5 +echo "$as_me:11439: result: no" >&5 echo "${ECHO_T}no" >&6 LIBS="$cf_save_LIBS" fi @@ -10990,7 +11451,7 @@ fi eval 'cf_found_library="$cf_cv_have_lib_'"$cf_nculib_root"\" if test "$cf_found_library" = no ; then - { { echo "$as_me:10993: error: Cannot link $cf_nculib_root library" >&5 + { { echo "$as_me:11454: error: Cannot link $cf_nculib_root library" >&5 echo "$as_me: error: Cannot link $cf_nculib_root library" >&2;} { (exit 1); exit 1; }; } fi @@ -10998,7 +11459,7 @@ fi fi if test -n "$cf_ncurses_LIBS" ; then - echo "$as_me:11001: checking if we can link $cf_nculib_root without $cf_ncurses_LIBS" >&5 + echo "$as_me:11462: 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 @@ -11008,7 +11469,7 @@ echo $ECHO_N "checking if we can link $cf_nculib_root without $cf_ncurses_LIBS.. fi done cat >"conftest.$ac_ext" <<_ACEOF -#line 11011 "configure" +#line 11472 "configure" #include "confdefs.h" #include <${cf_cv_ncurses_header:-curses.h}> int @@ -11020,23 +11481,23 @@ initscr(); mousemask(0,0); tigetstr((char *)0); } _ACEOF rm -f "conftest.$ac_objext" "conftest$ac_exeext" -if { (eval echo "$as_me:11023: \"$ac_link\"") >&5 +if { (eval echo "$as_me:11484: \"$ac_link\"") >&5 (eval $ac_link) 2>&5 ac_status=$? - echo "$as_me:11026: \$? = $ac_status" >&5 + echo "$as_me:11487: \$? = $ac_status" >&5 (exit "$ac_status"); } && { ac_try='test -s "conftest$ac_exeext"' - { (eval echo "$as_me:11029: \"$ac_try\"") >&5 + { (eval echo "$as_me:11490: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? - echo "$as_me:11032: \$? = $ac_status" >&5 + echo "$as_me:11493: \$? = $ac_status" >&5 (exit "$ac_status"); }; }; then - echo "$as_me:11034: result: yes" >&5 + echo "$as_me:11495: result: yes" >&5 echo "${ECHO_T}yes" >&6 else echo "$as_me: failed program was:" >&5 cat "conftest.$ac_ext" >&5 -echo "$as_me:11039: result: no" >&5 +echo "$as_me:11500: result: no" >&5 echo "${ECHO_T}no" >&6 LIBS="$cf_ncurses_SAVE" fi @@ -11089,10 +11550,10 @@ else AUTOCONF_$cf_name NCURSES_VERSION_$cf_name CF_EOF cf_try="$ac_cpp conftest.$ac_ext 2>&5 | fgrep AUTOCONF_$cf_name >conftest.out" - { (eval echo "$as_me:11092: \"$cf_try\"") >&5 + { (eval echo "$as_me:11553: \"$cf_try\"") >&5 (eval $cf_try) 2>&5 ac_status=$? - echo "$as_me:11095: \$? = $ac_status" >&5 + echo "$as_me:11556: \$? = $ac_status" >&5 (exit "$ac_status"); } if test -f conftest.out ; then cf_result=`sed -e "s/^.*AUTOCONF_${cf_name}[ ][ ]*//" conftest.out` @@ -11110,10 +11571,10 @@ cf_cv_rel_version=${NCURSES_MAJOR}.${NCURSES_MINOR} cf_cv_timestamp=`date` -echo "$as_me:11113: result: Configuring NCURSES $cf_cv_rel_version ABI $cf_cv_abi_version ($cf_cv_timestamp)" >&5 +echo "$as_me:11574: result: Configuring NCURSES $cf_cv_rel_version ABI $cf_cv_abi_version ($cf_cv_timestamp)" >&5 echo "${ECHO_T}Configuring NCURSES $cf_cv_rel_version ABI $cf_cv_abi_version ($cf_cv_timestamp)" >&6 -echo "$as_me:11116: checking if you want to have a library-prefix" >&5 +echo "$as_me:11577: checking if you want to have a library-prefix" >&5 echo $ECHO_N "checking if you want to have a library-prefix... $ECHO_C" >&6 # Check whether --with-lib-prefix or --without-lib-prefix was given. @@ -11123,7 +11584,7 @@ if test "${with_lib_prefix+set}" = set; then else with_lib_prefix=auto fi; -echo "$as_me:11126: result: $with_lib_prefix" >&5 +echo "$as_me:11587: result: $with_lib_prefix" >&5 echo "${ECHO_T}$with_lib_prefix" >&6 if test "$with_lib_prefix" = auto @@ -11161,7 +11622,7 @@ if test X"$CC_G_OPT" = X"" ; then test -n "$GCC" && test "${ac_cv_prog_cc_g}" != yes && CC_G_OPT='' fi -echo "$as_me:11164: checking for default loader flags" >&5 +echo "$as_me:11625: checking for default loader flags" >&5 echo $ECHO_N "checking for default loader flags... $ECHO_C" >&6 case $DFT_LWR_MODEL in (normal) LD_MODEL='' ;; @@ -11169,13 +11630,13 @@ case $DFT_LWR_MODEL in (profile) LD_MODEL='-pg';; (shared) LD_MODEL='' ;; esac -echo "$as_me:11172: result: $LD_MODEL" >&5 +echo "$as_me:11633: result: $LD_MODEL" >&5 echo "${ECHO_T}$LD_MODEL" >&6 LD_RPATH_OPT= if test "x$cf_cv_enable_rpath" != xno then - echo "$as_me:11178: checking for an rpath option" >&5 + echo "$as_me:11639: checking for an rpath option" >&5 echo $ECHO_N "checking for an rpath option... $ECHO_C" >&6 case "$cf_cv_system_name" in (irix*) @@ -11206,12 +11667,12 @@ echo $ECHO_N "checking for an rpath option... $ECHO_C" >&6 (*) ;; esac - echo "$as_me:11209: result: $LD_RPATH_OPT" >&5 + echo "$as_me:11670: result: $LD_RPATH_OPT" >&5 echo "${ECHO_T}$LD_RPATH_OPT" >&6 case "x$LD_RPATH_OPT" in (x-R*) - echo "$as_me:11214: checking if we need a space after rpath option" >&5 + echo "$as_me:11675: 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" @@ -11232,7 +11693,7 @@ done LIBS="$cf_add_libs" cat >"conftest.$ac_ext" <<_ACEOF -#line 11235 "configure" +#line 11696 "configure" #include "confdefs.h" int @@ -11244,16 +11705,16 @@ main (void) } _ACEOF rm -f "conftest.$ac_objext" "conftest$ac_exeext" -if { (eval echo "$as_me:11247: \"$ac_link\"") >&5 +if { (eval echo "$as_me:11708: \"$ac_link\"") >&5 (eval $ac_link) 2>&5 ac_status=$? - echo "$as_me:11250: \$? = $ac_status" >&5 + echo "$as_me:11711: \$? = $ac_status" >&5 (exit "$ac_status"); } && { ac_try='test -s "conftest$ac_exeext"' - { (eval echo "$as_me:11253: \"$ac_try\"") >&5 + { (eval echo "$as_me:11714: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? - echo "$as_me:11256: \$? = $ac_status" >&5 + echo "$as_me:11717: \$? = $ac_status" >&5 (exit "$ac_status"); }; }; then cf_rpath_space=no else @@ -11263,7 +11724,7 @@ cf_rpath_space=yes fi rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext" LIBS="$cf_save_LIBS" - echo "$as_me:11266: result: $cf_rpath_space" >&5 + echo "$as_me:11727: result: $cf_rpath_space" >&5 echo "${ECHO_T}$cf_rpath_space" >&6 test "$cf_rpath_space" = yes && LD_RPATH_OPT="$LD_RPATH_OPT " ;; @@ -11285,8 +11746,8 @@ fi cf_ld_rpath_opt= test "$cf_cv_enable_rpath" = yes && cf_ld_rpath_opt="$LD_RPATH_OPT" - echo "$as_me:11288: 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 + echo "$as_me:11749: checking whether to use release or ABI version in shared library file names" >&5 +echo $ECHO_N "checking whether to use release or ABI version in shared library file names... $ECHO_C" >&6 # Check whether --with-shlib-version or --without-shlib-version was given. if test "${with_shlib_version+set}" = set; then @@ -11300,9 +11761,9 @@ if test "${with_shlib_version+set}" = set; then cf_cv_shlib_version=$withval ;; (*) - echo "$as_me:11303: result: $withval" >&5 + echo "$as_me:11764: result: $withval" >&5 echo "${ECHO_T}$withval" >&6 - { { echo "$as_me:11305: error: option value must be one of: rel, abi, or auto" >&5 + { { echo "$as_me:11766: error: option value must be one of: rel, abi, or auto" >&5 echo "$as_me: error: option value must be one of: rel, abi, or auto" >&2;} { (exit 1); exit 1; }; } ;; @@ -11311,7 +11772,7 @@ echo "$as_me: error: option value must be one of: rel, abi, or auto" >&2;} else cf_cv_shlib_version=auto fi; - echo "$as_me:11314: result: $cf_cv_shlib_version" >&5 + echo "$as_me:11775: result: $cf_cv_shlib_version" >&5 echo "${ECHO_T}$cf_cv_shlib_version" >&6 cf_cv_rm_so_locs=no @@ -11334,35 +11795,35 @@ echo "${ECHO_T}$cf_cv_shlib_version" >&6 if test "$cf_try_fPIC" = yes then - echo "$as_me:11337: checking which $CC option to use" >&5 + echo "$as_me:11798: 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 11344 "configure" +#line 11805 "configure" #include "confdefs.h" #include <stdio.h> int main (void) { -int x = 1 +int x = 1; (void)x ; return 0; } _ACEOF rm -f "conftest.$ac_objext" -if { (eval echo "$as_me:11356: \"$ac_compile\"") >&5 +if { (eval echo "$as_me:11817: \"$ac_compile\"") >&5 (eval $ac_compile) 2>&5 ac_status=$? - echo "$as_me:11359: \$? = $ac_status" >&5 + echo "$as_me:11820: \$? = $ac_status" >&5 (exit "$ac_status"); } && { ac_try='test -s "conftest.$ac_objext"' - { (eval echo "$as_me:11362: \"$ac_try\"") >&5 + { (eval echo "$as_me:11823: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? - echo "$as_me:11365: \$? = $ac_status" >&5 + echo "$as_me:11826: \$? = $ac_status" >&5 (exit "$ac_status"); }; }; then break else @@ -11371,7 +11832,7 @@ cat "conftest.$ac_ext" >&5 fi rm -f "conftest.$ac_objext" "conftest.$ac_ext" done - echo "$as_me:11374: result: $CC_SHARED_OPTS" >&5 + echo "$as_me:11835: result: $CC_SHARED_OPTS" >&5 echo "${ECHO_T}$CC_SHARED_OPTS" >&6 CFLAGS="$cf_save_CFLAGS" fi @@ -11442,7 +11903,7 @@ CF_EOF MK_SHARED_LIB='${CC} ${LDFLAGS} ${CFLAGS} -dynamiclib -install_name ${libdir}/`basename $@` -compatibility_version ${ABI_VERSION} -current_version ${ABI_VERSION} -o $@' test "$cf_cv_shlib_version" = auto && cf_cv_shlib_version=abi cf_cv_shlib_version_infix=yes - echo "$as_me:11445: checking if ld -search_paths_first works" >&5 + echo "$as_me:11906: 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 @@ -11451,7 +11912,7 @@ else cf_save_LDFLAGS=$LDFLAGS LDFLAGS="$LDFLAGS -Wl,-search_paths_first" cat >"conftest.$ac_ext" <<_ACEOF -#line 11454 "configure" +#line 11915 "configure" #include "confdefs.h" int @@ -11463,16 +11924,16 @@ int i; } _ACEOF rm -f "conftest.$ac_objext" "conftest$ac_exeext" -if { (eval echo "$as_me:11466: \"$ac_link\"") >&5 +if { (eval echo "$as_me:11927: \"$ac_link\"") >&5 (eval $ac_link) 2>&5 ac_status=$? - echo "$as_me:11469: \$? = $ac_status" >&5 + echo "$as_me:11930: \$? = $ac_status" >&5 (exit "$ac_status"); } && { ac_try='test -s "conftest$ac_exeext"' - { (eval echo "$as_me:11472: \"$ac_try\"") >&5 + { (eval echo "$as_me:11933: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? - echo "$as_me:11475: \$? = $ac_status" >&5 + echo "$as_me:11936: \$? = $ac_status" >&5 (exit "$ac_status"); }; }; then cf_cv_ldflags_search_paths_first=yes else @@ -11483,12 +11944,23 @@ fi rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext" LDFLAGS=$cf_save_LDFLAGS fi -echo "$as_me:11486: result: $cf_cv_ldflags_search_paths_first" >&5 +echo "$as_me:11947: 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 ;; + (haiku*) + + 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} ${LDFLAGS} ${CFLAGS} -shared -Wl,-soname,'$cf_cv_shared_soname',-stats,-lc -o $@' + ;; (hpux[7-8]*) # HP-UX 8.07 ld lacks "+b" option used for libdir search-list if test "$GCC" != yes; then @@ -11802,11 +12274,11 @@ CF_EOF # 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_LDFLAGS="-R\$(LOCAL_LIBDIR):\${libdir}" LOCAL_LDFLAGS2="$LOCAL_LDFLAGS" fi if test "$cf_cv_enable_rpath" = yes ; then - EXTRA_LDFLAGS="-R \${libdir} $EXTRA_LDFLAGS" + EXTRA_LDFLAGS="-R\${libdir} $EXTRA_LDFLAGS" fi test "$cf_cv_shlib_version" = auto && cf_cv_shlib_version=rel @@ -11822,7 +12294,7 @@ CF_EOF do CFLAGS="$cf_shared_opts $cf_save_CFLAGS" cat >"conftest.$ac_ext" <<_ACEOF -#line 11825 "configure" +#line 12297 "configure" #include "confdefs.h" #include <stdio.h> int @@ -11834,16 +12306,16 @@ printf("Hello\\n"); } _ACEOF rm -f "conftest.$ac_objext" -if { (eval echo "$as_me:11837: \"$ac_compile\"") >&5 +if { (eval echo "$as_me:12309: \"$ac_compile\"") >&5 (eval $ac_compile) 2>&5 ac_status=$? - echo "$as_me:11840: \$? = $ac_status" >&5 + echo "$as_me:12312: \$? = $ac_status" >&5 (exit "$ac_status"); } && { ac_try='test -s "conftest.$ac_objext"' - { (eval echo "$as_me:11843: \"$ac_try\"") >&5 + { (eval echo "$as_me:12315: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? - echo "$as_me:11846: \$? = $ac_status" >&5 + echo "$as_me:12318: \$? = $ac_status" >&5 (exit "$ac_status"); }; }; then break else @@ -11854,9 +12326,9 @@ rm -f "conftest.$ac_objext" "conftest.$ac_ext" done CFLAGS="$cf_save_CFLAGS" CC_SHARED_OPTS=$cf_shared_opts - MK_SHARED_LIB='${CC} ${LDFLAGS} ${CFLAGS} -dy -G -h '$cf_cv_shared_soname' -o $@' + MK_SHARED_LIB='${CC} ${LDFLAGS} ${CFLAGS} -dy -G -Wl,-h,'$cf_cv_shared_soname' -o $@' else - MK_SHARED_LIB='${CC} ${LDFLAGS} ${CFLAGS} -shared -dy -G -h '$cf_cv_shared_soname' -o $@' + MK_SHARED_LIB='${CC} ${LDFLAGS} ${CFLAGS} -shared -dy -G -Wl,-h,'$cf_cv_shared_soname' -o $@' fi ;; (sysv5uw7*|unix_sv*) @@ -11880,7 +12352,7 @@ rm -f "conftest.$ac_objext" "conftest.$ac_ext" test "$cf_cv_do_symlinks" = no && cf_cv_do_symlinks=yes ;; (*) - { echo "$as_me:11883: WARNING: ignored --with-shlib-version" >&5 + { echo "$as_me:12355: WARNING: ignored --with-shlib-version" >&5 echo "$as_me: WARNING: ignored --with-shlib-version" >&2;} ;; esac @@ -11890,7 +12362,7 @@ echo "$as_me: WARNING: ignored --with-shlib-version" >&2;} if test -n "$cf_try_cflags" then cat > conftest.$ac_ext <<EOF -#line 11893 "${as_me:-configure}" +#line 12365 "${as_me:-configure}" #include <stdio.h> int main(int argc, char *argv[]) { @@ -11902,18 +12374,18 @@ EOF for cf_opt in $cf_try_cflags do CFLAGS="$cf_save_CFLAGS -$cf_opt" - echo "$as_me:11905: checking if CFLAGS option -$cf_opt works" >&5 + echo "$as_me:12377: 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:11907: \"$ac_compile\"") >&5 + if { (eval echo "$as_me:12379: \"$ac_compile\"") >&5 (eval $ac_compile) 2>&5 ac_status=$? - echo "$as_me:11910: \$? = $ac_status" >&5 + echo "$as_me:12382: \$? = $ac_status" >&5 (exit "$ac_status"); }; then - echo "$as_me:11912: result: yes" >&5 + echo "$as_me:12384: result: yes" >&5 echo "${ECHO_T}yes" >&6 cf_save_CFLAGS="$CFLAGS" else - echo "$as_me:11916: result: no" >&5 + echo "$as_me:12388: result: no" >&5 echo "${ECHO_T}no" >&6 fi done @@ -11928,17 +12400,17 @@ echo "${ECHO_T}no" >&6 test -n "$verbose" && echo " CC_SHARED_OPTS: $CC_SHARED_OPTS" 1>&6 -echo "${as_me:-configure}:11931: testing CC_SHARED_OPTS: $CC_SHARED_OPTS ..." 1>&5 +echo "${as_me:-configure}:12403: 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}:11935: testing MK_SHARED_LIB: $MK_SHARED_LIB ..." 1>&5 +echo "${as_me:-configure}:12407: testing MK_SHARED_LIB: $MK_SHARED_LIB ..." 1>&5 # The test/sample programs in the original tree link using rpath option. # Make it optional for packagers. if test -n "$LOCAL_LDFLAGS" then - echo "$as_me:11941: checking if you want to link sample programs with rpath option" >&5 + echo "$as_me:12413: checking if you want to link sample programs with rpath option" >&5 echo $ECHO_N "checking if you want to link sample programs with rpath option... $ECHO_C" >&6 # Check whether --enable-rpath-link or --disable-rpath-link was given. @@ -11948,7 +12420,7 @@ if test "${enable_rpath_link+set}" = set; then else with_rpath_link=yes fi; - echo "$as_me:11951: result: $with_rpath_link" >&5 + echo "$as_me:12423: result: $with_rpath_link" >&5 echo "${ECHO_T}$with_rpath_link" >&6 if test "$with_rpath_link" = no then @@ -11961,7 +12433,7 @@ fi ### use option --enable-broken-linker to force on use of broken-linker support -echo "$as_me:11964: checking if you want broken-linker support code" >&5 +echo "$as_me:12436: checking if you want broken-linker support code" >&5 echo $ECHO_N "checking if you want broken-linker support code... $ECHO_C" >&6 # Check whether --enable-broken_linker or --disable-broken_linker was given. @@ -11971,7 +12443,7 @@ if test "${enable_broken_linker+set}" = set; then else with_broken_linker=no fi; -echo "$as_me:11974: result: $with_broken_linker" >&5 +echo "$as_me:12446: result: $with_broken_linker" >&5 echo "${ECHO_T}$with_broken_linker" >&6 : "${BROKEN_LINKER:=0}" @@ -11986,14 +12458,14 @@ fi # Check to define _XOPEN_SOURCE "automatically" -echo "$as_me:11989: checking if the POSIX test-macros are already defined" >&5 +echo "$as_me:12461: checking if the POSIX test-macros are already defined" >&5 echo $ECHO_N "checking if the POSIX test-macros are already defined... $ECHO_C" >&6 if test "${cf_cv_posix_visible+set}" = set; then echo $ECHO_N "(cached) $ECHO_C" >&6 else cat >"conftest.$ac_ext" <<_ACEOF -#line 11996 "configure" +#line 12468 "configure" #include "confdefs.h" #include <stdio.h> int @@ -12012,16 +12484,16 @@ main (void) } _ACEOF rm -f "conftest.$ac_objext" -if { (eval echo "$as_me:12015: \"$ac_compile\"") >&5 +if { (eval echo "$as_me:12487: \"$ac_compile\"") >&5 (eval $ac_compile) 2>&5 ac_status=$? - echo "$as_me:12018: \$? = $ac_status" >&5 + echo "$as_me:12490: \$? = $ac_status" >&5 (exit "$ac_status"); } && { ac_try='test -s "conftest.$ac_objext"' - { (eval echo "$as_me:12021: \"$ac_try\"") >&5 + { (eval echo "$as_me:12493: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? - echo "$as_me:12024: \$? = $ac_status" >&5 + echo "$as_me:12496: \$? = $ac_status" >&5 (exit "$ac_status"); }; }; then cf_cv_posix_visible=no else @@ -12032,7 +12504,7 @@ fi rm -f "conftest.$ac_objext" "conftest.$ac_ext" fi -echo "$as_me:12035: result: $cf_cv_posix_visible" >&5 +echo "$as_me:12507: result: $cf_cv_posix_visible" >&5 echo "${ECHO_T}$cf_cv_posix_visible" >&6 if test "$cf_cv_posix_visible" = no; then @@ -12045,9 +12517,6 @@ case "$host_os" in (aix[4-7]*) cf_xopen_source="-D_ALL_SOURCE" ;; -(msys) - cf_XOPEN_SOURCE=600 - ;; (darwin[0-8].*) cf_xopen_source="-D_APPLE_C_SOURCE" ;; @@ -12073,18 +12542,18 @@ case "$host_os" in cf_xopen_source="-D_SGI_SOURCE" cf_XOPEN_SOURCE= ;; -(linux*|uclinux*|gnu*|mint*|k*bsd*-gnu|cygwin) +(linux*gnu|linux*gnuabi64|linux*gnuabin32|linux*gnueabi|linux*gnueabihf|linux*gnux32|uclinux*|gnu*|mint*|k*bsd*-gnu|cygwin|msys|mingw*|linux*uclibc) cf_gnu_xopen_source=$cf_XOPEN_SOURCE -echo "$as_me:12080: checking if this is the GNU C library" >&5 +echo "$as_me:12549: checking if this is the GNU C library" >&5 echo $ECHO_N "checking if this is the GNU C library... $ECHO_C" >&6 if test "${cf_cv_gnu_library+set}" = set; then echo $ECHO_N "(cached) $ECHO_C" >&6 else cat >"conftest.$ac_ext" <<_ACEOF -#line 12087 "configure" +#line 12556 "configure" #include "confdefs.h" #include <sys/types.h> int @@ -12103,16 +12572,16 @@ main (void) } _ACEOF rm -f "conftest.$ac_objext" -if { (eval echo "$as_me:12106: \"$ac_compile\"") >&5 +if { (eval echo "$as_me:12575: \"$ac_compile\"") >&5 (eval $ac_compile) 2>&5 ac_status=$? - echo "$as_me:12109: \$? = $ac_status" >&5 + echo "$as_me:12578: \$? = $ac_status" >&5 (exit "$ac_status"); } && { ac_try='test -s "conftest.$ac_objext"' - { (eval echo "$as_me:12112: \"$ac_try\"") >&5 + { (eval echo "$as_me:12581: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? - echo "$as_me:12115: \$? = $ac_status" >&5 + echo "$as_me:12584: \$? = $ac_status" >&5 (exit "$ac_status"); }; }; then cf_cv_gnu_library=yes else @@ -12123,7 +12592,7 @@ fi rm -f "conftest.$ac_objext" "conftest.$ac_ext" fi -echo "$as_me:12126: result: $cf_cv_gnu_library" >&5 +echo "$as_me:12595: result: $cf_cv_gnu_library" >&5 echo "${ECHO_T}$cf_cv_gnu_library" >&6 if test x$cf_cv_gnu_library = xyes; then @@ -12131,7 +12600,7 @@ if test x$cf_cv_gnu_library = xyes; then # With glibc 2.19 (13 years after this check was begun), _DEFAULT_SOURCE # was changed to help a little. newlib incorporated the change about 4 # years later. - echo "$as_me:12134: checking if _DEFAULT_SOURCE can be used as a basis" >&5 + echo "$as_me:12603: checking if _DEFAULT_SOURCE can be used as a basis" >&5 echo $ECHO_N "checking if _DEFAULT_SOURCE can be used as a basis... $ECHO_C" >&6 if test "${cf_cv_gnu_library_219+set}" = set; then echo $ECHO_N "(cached) $ECHO_C" >&6 @@ -12143,7 +12612,7 @@ else CPPFLAGS="${CPPFLAGS}-D_DEFAULT_SOURCE" cat >"conftest.$ac_ext" <<_ACEOF -#line 12146 "configure" +#line 12615 "configure" #include "confdefs.h" #include <sys/types.h> int @@ -12162,16 +12631,16 @@ main (void) } _ACEOF rm -f "conftest.$ac_objext" -if { (eval echo "$as_me:12165: \"$ac_compile\"") >&5 +if { (eval echo "$as_me:12634: \"$ac_compile\"") >&5 (eval $ac_compile) 2>&5 ac_status=$? - echo "$as_me:12168: \$? = $ac_status" >&5 + echo "$as_me:12637: \$? = $ac_status" >&5 (exit "$ac_status"); } && { ac_try='test -s "conftest.$ac_objext"' - { (eval echo "$as_me:12171: \"$ac_try\"") >&5 + { (eval echo "$as_me:12640: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? - echo "$as_me:12174: \$? = $ac_status" >&5 + echo "$as_me:12643: \$? = $ac_status" >&5 (exit "$ac_status"); }; }; then cf_cv_gnu_library_219=yes else @@ -12183,12 +12652,12 @@ rm -f "conftest.$ac_objext" "conftest.$ac_ext" CPPFLAGS="$cf_save" fi -echo "$as_me:12186: result: $cf_cv_gnu_library_219" >&5 +echo "$as_me:12655: result: $cf_cv_gnu_library_219" >&5 echo "${ECHO_T}$cf_cv_gnu_library_219" >&6 if test "x$cf_cv_gnu_library_219" = xyes; then cf_save="$CPPFLAGS" - echo "$as_me:12191: checking if _XOPEN_SOURCE=$cf_gnu_xopen_source works with _DEFAULT_SOURCE" >&5 + echo "$as_me:12660: checking if _XOPEN_SOURCE=$cf_gnu_xopen_source works with _DEFAULT_SOURCE" >&5 echo $ECHO_N "checking if _XOPEN_SOURCE=$cf_gnu_xopen_source works with _DEFAULT_SOURCE... $ECHO_C" >&6 if test "${cf_cv_gnu_dftsrc_219+set}" = set; then echo $ECHO_N "(cached) $ECHO_C" >&6 @@ -12293,7 +12762,7 @@ if test -n "$cf_new_extra_cppflags" ; then fi cat >"conftest.$ac_ext" <<_ACEOF -#line 12296 "configure" +#line 12765 "configure" #include "confdefs.h" #include <limits.h> @@ -12313,16 +12782,16 @@ main (void) } _ACEOF rm -f "conftest.$ac_objext" -if { (eval echo "$as_me:12316: \"$ac_compile\"") >&5 +if { (eval echo "$as_me:12785: \"$ac_compile\"") >&5 (eval $ac_compile) 2>&5 ac_status=$? - echo "$as_me:12319: \$? = $ac_status" >&5 + echo "$as_me:12788: \$? = $ac_status" >&5 (exit "$ac_status"); } && { ac_try='test -s "conftest.$ac_objext"' - { (eval echo "$as_me:12322: \"$ac_try\"") >&5 + { (eval echo "$as_me:12791: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? - echo "$as_me:12325: \$? = $ac_status" >&5 + echo "$as_me:12794: \$? = $ac_status" >&5 (exit "$ac_status"); }; }; then cf_cv_gnu_dftsrc_219=yes else @@ -12333,7 +12802,7 @@ fi rm -f "conftest.$ac_objext" "conftest.$ac_ext" fi -echo "$as_me:12336: result: $cf_cv_gnu_dftsrc_219" >&5 +echo "$as_me:12805: result: $cf_cv_gnu_dftsrc_219" >&5 echo "${ECHO_T}$cf_cv_gnu_dftsrc_219" >&6 test "x$cf_cv_gnu_dftsrc_219" = "xyes" || CPPFLAGS="$cf_save" else @@ -12342,14 +12811,14 @@ echo "${ECHO_T}$cf_cv_gnu_dftsrc_219" >&6 if test "x$cf_cv_gnu_dftsrc_219" != xyes; then - echo "$as_me:12345: checking if we must define _GNU_SOURCE" >&5 + echo "$as_me:12814: 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 12352 "configure" +#line 12821 "configure" #include "confdefs.h" #include <sys/types.h> int @@ -12364,16 +12833,16 @@ main (void) } _ACEOF rm -f "conftest.$ac_objext" -if { (eval echo "$as_me:12367: \"$ac_compile\"") >&5 +if { (eval echo "$as_me:12836: \"$ac_compile\"") >&5 (eval $ac_compile) 2>&5 ac_status=$? - echo "$as_me:12370: \$? = $ac_status" >&5 + echo "$as_me:12839: \$? = $ac_status" >&5 (exit "$ac_status"); } && { ac_try='test -s "conftest.$ac_objext"' - { (eval echo "$as_me:12373: \"$ac_try\"") >&5 + { (eval echo "$as_me:12842: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? - echo "$as_me:12376: \$? = $ac_status" >&5 + echo "$as_me:12845: \$? = $ac_status" >&5 (exit "$ac_status"); }; }; then cf_cv_gnu_source=no else @@ -12480,7 +12949,7 @@ if test -n "$cf_new_extra_cppflags" ; then fi cat >"conftest.$ac_ext" <<_ACEOF -#line 12483 "configure" +#line 12952 "configure" #include "confdefs.h" #include <sys/types.h> int @@ -12495,16 +12964,16 @@ main (void) } _ACEOF rm -f "conftest.$ac_objext" -if { (eval echo "$as_me:12498: \"$ac_compile\"") >&5 +if { (eval echo "$as_me:12967: \"$ac_compile\"") >&5 (eval $ac_compile) 2>&5 ac_status=$? - echo "$as_me:12501: \$? = $ac_status" >&5 + echo "$as_me:12970: \$? = $ac_status" >&5 (exit "$ac_status"); } && { ac_try='test -s "conftest.$ac_objext"' - { (eval echo "$as_me:12504: \"$ac_try\"") >&5 + { (eval echo "$as_me:12973: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? - echo "$as_me:12507: \$? = $ac_status" >&5 + echo "$as_me:12976: \$? = $ac_status" >&5 (exit "$ac_status"); }; }; then cf_cv_gnu_source=no else @@ -12519,12 +12988,12 @@ fi rm -f "conftest.$ac_objext" "conftest.$ac_ext" fi -echo "$as_me:12522: result: $cf_cv_gnu_source" >&5 +echo "$as_me:12991: result: $cf_cv_gnu_source" >&5 echo "${ECHO_T}$cf_cv_gnu_source" >&6 if test "$cf_cv_gnu_source" = yes then - echo "$as_me:12527: checking if we should also define _DEFAULT_SOURCE" >&5 + echo "$as_me:12996: checking if we should also define _DEFAULT_SOURCE" >&5 echo $ECHO_N "checking if we should also define _DEFAULT_SOURCE... $ECHO_C" >&6 if test "${cf_cv_default_source+set}" = set; then echo $ECHO_N "(cached) $ECHO_C" >&6 @@ -12534,7 +13003,7 @@ else CPPFLAGS="${CPPFLAGS}-D_GNU_SOURCE" cat >"conftest.$ac_ext" <<_ACEOF -#line 12537 "configure" +#line 13006 "configure" #include "confdefs.h" #include <sys/types.h> int @@ -12549,16 +13018,16 @@ main (void) } _ACEOF rm -f "conftest.$ac_objext" -if { (eval echo "$as_me:12552: \"$ac_compile\"") >&5 +if { (eval echo "$as_me:13021: \"$ac_compile\"") >&5 (eval $ac_compile) 2>&5 ac_status=$? - echo "$as_me:12555: \$? = $ac_status" >&5 + echo "$as_me:13024: \$? = $ac_status" >&5 (exit "$ac_status"); } && { ac_try='test -s "conftest.$ac_objext"' - { (eval echo "$as_me:12558: \"$ac_try\"") >&5 + { (eval echo "$as_me:13027: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? - echo "$as_me:12561: \$? = $ac_status" >&5 + echo "$as_me:13030: \$? = $ac_status" >&5 (exit "$ac_status"); }; }; then cf_cv_default_source=no else @@ -12569,7 +13038,7 @@ fi rm -f "conftest.$ac_objext" "conftest.$ac_ext" fi -echo "$as_me:12572: result: $cf_cv_default_source" >&5 +echo "$as_me:13041: result: $cf_cv_default_source" >&5 echo "${ECHO_T}$cf_cv_default_source" >&6 if test "$cf_cv_default_source" = yes then @@ -12606,16 +13075,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:12609: checking if we should define _POSIX_C_SOURCE" >&5 +echo "$as_me:13078: 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}:12615: testing if the symbol is already defined go no further ..." 1>&5 +echo "${as_me:-configure}:13084: testing if the symbol is already defined go no further ..." 1>&5 cat >"conftest.$ac_ext" <<_ACEOF -#line 12618 "configure" +#line 13087 "configure" #include "confdefs.h" #include <sys/types.h> int @@ -12623,23 +13092,23 @@ main (void) { #ifndef _POSIX_C_SOURCE -make an error +#error _POSIX_C_SOURCE is not defined #endif ; return 0; } _ACEOF rm -f "conftest.$ac_objext" -if { (eval echo "$as_me:12633: \"$ac_compile\"") >&5 +if { (eval echo "$as_me:13102: \"$ac_compile\"") >&5 (eval $ac_compile) 2>&5 ac_status=$? - echo "$as_me:12636: \$? = $ac_status" >&5 + echo "$as_me:13105: \$? = $ac_status" >&5 (exit "$ac_status"); } && { ac_try='test -s "conftest.$ac_objext"' - { (eval echo "$as_me:12639: \"$ac_try\"") >&5 + { (eval echo "$as_me:13108: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? - echo "$as_me:12642: \$? = $ac_status" >&5 + echo "$as_me:13111: \$? = $ac_status" >&5 (exit "$ac_status"); }; }; then cf_cv_posix_c_source=no else @@ -12660,7 +13129,7 @@ cf_want_posix_source=no esac if test "$cf_want_posix_source" = yes ; then cat >"conftest.$ac_ext" <<_ACEOF -#line 12663 "configure" +#line 13132 "configure" #include "confdefs.h" #include <sys/types.h> int @@ -12668,23 +13137,23 @@ main (void) { #ifdef _POSIX_SOURCE -make an error +#error _POSIX_SOURCE is defined #endif ; return 0; } _ACEOF rm -f "conftest.$ac_objext" -if { (eval echo "$as_me:12678: \"$ac_compile\"") >&5 +if { (eval echo "$as_me:13147: \"$ac_compile\"") >&5 (eval $ac_compile) 2>&5 ac_status=$? - echo "$as_me:12681: \$? = $ac_status" >&5 + echo "$as_me:13150: \$? = $ac_status" >&5 (exit "$ac_status"); } && { ac_try='test -s "conftest.$ac_objext"' - { (eval echo "$as_me:12684: \"$ac_try\"") >&5 + { (eval echo "$as_me:13153: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? - echo "$as_me:12687: \$? = $ac_status" >&5 + echo "$as_me:13156: \$? = $ac_status" >&5 (exit "$ac_status"); }; }; then : else @@ -12695,7 +13164,7 @@ fi rm -f "conftest.$ac_objext" "conftest.$ac_ext" fi -echo "${as_me:-configure}:12698: testing ifdef from value $cf_POSIX_C_SOURCE ..." 1>&5 +echo "${as_me:-configure}:13167: testing ifdef from value $cf_POSIX_C_SOURCE ..." 1>&5 CFLAGS="$cf_trim_CFLAGS" CPPFLAGS="$cf_trim_CPPFLAGS" @@ -12703,10 +13172,10 @@ echo "${as_me:-configure}:12698: testing ifdef from value $cf_POSIX_C_SOURCE ... test -n "$CPPFLAGS" && CPPFLAGS="$CPPFLAGS " CPPFLAGS="${CPPFLAGS}$cf_cv_posix_c_source" -echo "${as_me:-configure}:12706: testing if the second compile does not leave our definition intact error ..." 1>&5 +echo "${as_me:-configure}:13175: testing if the second compile does not leave our definition intact error ..." 1>&5 cat >"conftest.$ac_ext" <<_ACEOF -#line 12709 "configure" +#line 13178 "configure" #include "confdefs.h" #include <sys/types.h> int @@ -12714,23 +13183,23 @@ main (void) { #ifndef _POSIX_C_SOURCE -make an error +#error _POSIX_C_SOURCE is not defined #endif ; return 0; } _ACEOF rm -f "conftest.$ac_objext" -if { (eval echo "$as_me:12724: \"$ac_compile\"") >&5 +if { (eval echo "$as_me:13193: \"$ac_compile\"") >&5 (eval $ac_compile) 2>&5 ac_status=$? - echo "$as_me:12727: \$? = $ac_status" >&5 + echo "$as_me:13196: \$? = $ac_status" >&5 (exit "$ac_status"); } && { ac_try='test -s "conftest.$ac_objext"' - { (eval echo "$as_me:12730: \"$ac_try\"") >&5 + { (eval echo "$as_me:13199: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? - echo "$as_me:12733: \$? = $ac_status" >&5 + echo "$as_me:13202: \$? = $ac_status" >&5 (exit "$ac_status"); }; }; then : else @@ -12746,7 +13215,7 @@ fi rm -f "conftest.$ac_objext" "conftest.$ac_ext" fi -echo "$as_me:12749: result: $cf_cv_posix_c_source" >&5 +echo "$as_me:13218: 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 @@ -12859,7 +13328,16 @@ fi # cf_cv_posix_visible (netbsd*) cf_xopen_source="-D_NETBSD_SOURCE" # setting _XOPEN_SOURCE breaks IPv6 for lynx on NetBSD 1.6, breaks xterm, is not needed for ncursesw ;; -(openbsd[4-9]*) +(openbsd[6-9]*) + # OpenBSD 6.x has broken locale support, both compile-time and runtime. + # see https://www.mail-archive.com/bugs@openbsd.org/msg13200.html + # Abusing the conformance level is a workaround. + { echo "$as_me:13335: WARNING: this system does not provide usable locale support" >&5 +echo "$as_me: WARNING: this system does not provide usable locale support" >&2;} + cf_xopen_source="-D_BSD_SOURCE" + cf_XOPEN_SOURCE=700 + ;; +(openbsd[4-5]*) # setting _XOPEN_SOURCE lower than 500 breaks g++ compile with wchar.h, needed for ncursesw cf_xopen_source="-D_BSD_SOURCE" cf_XOPEN_SOURCE=600 @@ -12886,42 +13364,41 @@ fi # cf_cv_posix_visible ;; (*) -echo "$as_me:12889: checking if we should define _XOPEN_SOURCE" >&5 +echo "$as_me:13367: 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 12896 "configure" +#line 13374 "configure" #include "confdefs.h" -#include <stdlib.h> -#include <string.h> -#include <sys/types.h> +$ac_includes_default int main (void) { #ifndef _XOPEN_SOURCE -make an error +#error _XOPEN_SOURCE is not defined #endif + ; return 0; } _ACEOF rm -f "conftest.$ac_objext" -if { (eval echo "$as_me:12915: \"$ac_compile\"") >&5 +if { (eval echo "$as_me:13392: \"$ac_compile\"") >&5 (eval $ac_compile) 2>&5 ac_status=$? - echo "$as_me:12918: \$? = $ac_status" >&5 + echo "$as_me:13395: \$? = $ac_status" >&5 (exit "$ac_status"); } && { ac_try='test -s "conftest.$ac_objext"' - { (eval echo "$as_me:12921: \"$ac_try\"") >&5 + { (eval echo "$as_me:13398: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? - echo "$as_me:12924: \$? = $ac_status" >&5 + echo "$as_me:13401: \$? = $ac_status" >&5 (exit "$ac_status"); }; }; then cf_cv_xopen_source=no else @@ -12933,35 +13410,34 @@ cf_save="$CPPFLAGS" CPPFLAGS="${CPPFLAGS}-D_XOPEN_SOURCE=$cf_XOPEN_SOURCE" cat >"conftest.$ac_ext" <<_ACEOF -#line 12936 "configure" +#line 13413 "configure" #include "confdefs.h" -#include <stdlib.h> -#include <string.h> -#include <sys/types.h> +$ac_includes_default int main (void) { -#ifdef _XOPEN_SOURCE -make an error +#ifndef _XOPEN_SOURCE +#error _XOPEN_SOURCE is not defined #endif + ; return 0; } _ACEOF rm -f "conftest.$ac_objext" -if { (eval echo "$as_me:12955: \"$ac_compile\"") >&5 +if { (eval echo "$as_me:13431: \"$ac_compile\"") >&5 (eval $ac_compile) 2>&5 ac_status=$? - echo "$as_me:12958: \$? = $ac_status" >&5 + echo "$as_me:13434: \$? = $ac_status" >&5 (exit "$ac_status"); } && { ac_try='test -s "conftest.$ac_objext"' - { (eval echo "$as_me:12961: \"$ac_try\"") >&5 + { (eval echo "$as_me:13437: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? - echo "$as_me:12964: \$? = $ac_status" >&5 + echo "$as_me:13440: \$? = $ac_status" >&5 (exit "$ac_status"); }; }; then cf_cv_xopen_source=no else @@ -12970,13 +13446,13 @@ cat "conftest.$ac_ext" >&5 cf_cv_xopen_source=$cf_XOPEN_SOURCE fi rm -f "conftest.$ac_objext" "conftest.$ac_ext" - CPPFLAGS="$cf_save" + CPPFLAGS="$cf_save" fi rm -f "conftest.$ac_objext" "conftest.$ac_ext" fi -echo "$as_me:12979: result: $cf_cv_xopen_source" >&5 +echo "$as_me:13455: result: $cf_cv_xopen_source" >&5 echo "${ECHO_T}$cf_cv_xopen_source" >&6 if test "$cf_cv_xopen_source" != no ; then @@ -12991,12 +13467,38 @@ CPPFLAGS=`echo "$CPPFLAGS" | \ cf_temp_xopen_source="-D_XOPEN_SOURCE=$cf_cv_xopen_source" +for cf_add_cflags in $cf_temp_xopen_source +do + case "x$cf_add_cflags" in + (x-[DU]*) + +cf_tmp_cflag=`echo "x$cf_add_cflags" | sed -e 's/^.//' -e 's/=.*//'` +while true +do + cf_old_cflag=`echo "x$CFLAGS" | sed -e 's/^.//' -e 's/[ ][ ]*-/ -/g' -e "s%$cf_tmp_cflag\\(=[^ ][^ ]*\\)\?%%" -e 's/^[ ]*//' -e 's%[ ][ ]*-D% -D%g' -e 's%[ ][ ]*-I% -I%g'` + test "$CFLAGS" != "$cf_old_cflag" || break + + CFLAGS="$cf_old_cflag" +done + +cf_tmp_cflag=`echo "x$cf_add_cflags" | sed -e 's/^.//' -e 's/=.*//'` +while true +do + cf_old_cflag=`echo "x$CPPFLAGS" | sed -e 's/^.//' -e 's/[ ][ ]*-/ -/g' -e "s%$cf_tmp_cflag\\(=[^ ][^ ]*\\)\?%%" -e 's/^[ ]*//' -e 's%[ ][ ]*-D% -D%g' -e 's%[ ][ ]*-I% -I%g'` + test "$CPPFLAGS" != "$cf_old_cflag" || break + + CPPFLAGS="$cf_old_cflag" +done + + ;; + esac + cf_fix_cppflags=no cf_new_cflags= cf_new_cppflags= cf_new_extra_cppflags= -for cf_add_cflags in $cf_temp_xopen_source +for cf_add_cflags in $cf_add_cflags do case "$cf_fix_cppflags" in (no) @@ -13089,8 +13591,12 @@ if test -n "$cf_new_extra_cppflags" ; then fi +done + fi + cf_save_xopen_cppflags="$CPPFLAGS" + if test "$cf_cv_posix_visible" = no; then cf_POSIX_C_SOURCE=$cf_POSIX_C_SOURCE @@ -13106,16 +13612,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:13109: checking if we should define _POSIX_C_SOURCE" >&5 +echo "$as_me:13615: 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}:13115: testing if the symbol is already defined go no further ..." 1>&5 +echo "${as_me:-configure}:13621: testing if the symbol is already defined go no further ..." 1>&5 cat >"conftest.$ac_ext" <<_ACEOF -#line 13118 "configure" +#line 13624 "configure" #include "confdefs.h" #include <sys/types.h> int @@ -13123,23 +13629,23 @@ main (void) { #ifndef _POSIX_C_SOURCE -make an error +#error _POSIX_C_SOURCE is not defined #endif ; return 0; } _ACEOF rm -f "conftest.$ac_objext" -if { (eval echo "$as_me:13133: \"$ac_compile\"") >&5 +if { (eval echo "$as_me:13639: \"$ac_compile\"") >&5 (eval $ac_compile) 2>&5 ac_status=$? - echo "$as_me:13136: \$? = $ac_status" >&5 + echo "$as_me:13642: \$? = $ac_status" >&5 (exit "$ac_status"); } && { ac_try='test -s "conftest.$ac_objext"' - { (eval echo "$as_me:13139: \"$ac_try\"") >&5 + { (eval echo "$as_me:13645: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? - echo "$as_me:13142: \$? = $ac_status" >&5 + echo "$as_me:13648: \$? = $ac_status" >&5 (exit "$ac_status"); }; }; then cf_cv_posix_c_source=no else @@ -13160,7 +13666,7 @@ cf_want_posix_source=no esac if test "$cf_want_posix_source" = yes ; then cat >"conftest.$ac_ext" <<_ACEOF -#line 13163 "configure" +#line 13669 "configure" #include "confdefs.h" #include <sys/types.h> int @@ -13168,23 +13674,23 @@ main (void) { #ifdef _POSIX_SOURCE -make an error +#error _POSIX_SOURCE is defined #endif ; return 0; } _ACEOF rm -f "conftest.$ac_objext" -if { (eval echo "$as_me:13178: \"$ac_compile\"") >&5 +if { (eval echo "$as_me:13684: \"$ac_compile\"") >&5 (eval $ac_compile) 2>&5 ac_status=$? - echo "$as_me:13181: \$? = $ac_status" >&5 + echo "$as_me:13687: \$? = $ac_status" >&5 (exit "$ac_status"); } && { ac_try='test -s "conftest.$ac_objext"' - { (eval echo "$as_me:13184: \"$ac_try\"") >&5 + { (eval echo "$as_me:13690: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? - echo "$as_me:13187: \$? = $ac_status" >&5 + echo "$as_me:13693: \$? = $ac_status" >&5 (exit "$ac_status"); }; }; then : else @@ -13195,7 +13701,7 @@ fi rm -f "conftest.$ac_objext" "conftest.$ac_ext" fi -echo "${as_me:-configure}:13198: testing ifdef from value $cf_POSIX_C_SOURCE ..." 1>&5 +echo "${as_me:-configure}:13704: testing ifdef from value $cf_POSIX_C_SOURCE ..." 1>&5 CFLAGS="$cf_trim_CFLAGS" CPPFLAGS="$cf_trim_CPPFLAGS" @@ -13203,10 +13709,10 @@ echo "${as_me:-configure}:13198: testing ifdef from value $cf_POSIX_C_SOURCE ... test -n "$CPPFLAGS" && CPPFLAGS="$CPPFLAGS " CPPFLAGS="${CPPFLAGS}$cf_cv_posix_c_source" -echo "${as_me:-configure}:13206: testing if the second compile does not leave our definition intact error ..." 1>&5 +echo "${as_me:-configure}:13712: testing if the second compile does not leave our definition intact error ..." 1>&5 cat >"conftest.$ac_ext" <<_ACEOF -#line 13209 "configure" +#line 13715 "configure" #include "confdefs.h" #include <sys/types.h> int @@ -13214,23 +13720,23 @@ main (void) { #ifndef _POSIX_C_SOURCE -make an error +#error _POSIX_C_SOURCE is not defined #endif ; return 0; } _ACEOF rm -f "conftest.$ac_objext" -if { (eval echo "$as_me:13224: \"$ac_compile\"") >&5 +if { (eval echo "$as_me:13730: \"$ac_compile\"") >&5 (eval $ac_compile) 2>&5 ac_status=$? - echo "$as_me:13227: \$? = $ac_status" >&5 + echo "$as_me:13733: \$? = $ac_status" >&5 (exit "$ac_status"); } && { ac_try='test -s "conftest.$ac_objext"' - { (eval echo "$as_me:13230: \"$ac_try\"") >&5 + { (eval echo "$as_me:13736: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? - echo "$as_me:13233: \$? = $ac_status" >&5 + echo "$as_me:13739: \$? = $ac_status" >&5 (exit "$ac_status"); }; }; then : else @@ -13246,7 +13752,7 @@ fi rm -f "conftest.$ac_objext" "conftest.$ac_ext" fi -echo "$as_me:13249: result: $cf_cv_posix_c_source" >&5 +echo "$as_me:13755: 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 @@ -13355,17 +13861,96 @@ fi fi # cf_cv_posix_visible + # Some of these niche implementations use copy/paste, double-check... + if test "$cf_cv_xopen_source" = no ; then + test -n "$verbose" && echo " checking if _POSIX_C_SOURCE interferes with _XOPEN_SOURCE" 1>&6 + +echo "${as_me:-configure}:13868: testing checking if _POSIX_C_SOURCE interferes with _XOPEN_SOURCE ..." 1>&5 + + cat >"conftest.$ac_ext" <<_ACEOF +#line 13871 "configure" +#include "confdefs.h" + +$ac_includes_default + +int +main (void) +{ + +#ifndef _XOPEN_SOURCE +#error _XOPEN_SOURCE is not defined +#endif + + ; + return 0; +} +_ACEOF +rm -f "conftest.$ac_objext" +if { (eval echo "$as_me:13889: \"$ac_compile\"") >&5 + (eval $ac_compile) 2>&5 + ac_status=$? + echo "$as_me:13892: \$? = $ac_status" >&5 + (exit "$ac_status"); } && + { ac_try='test -s "conftest.$ac_objext"' + { (eval echo "$as_me:13895: \"$ac_try\"") >&5 + (eval $ac_try) 2>&5 + ac_status=$? + echo "$as_me:13898: \$? = $ac_status" >&5 + (exit "$ac_status"); }; }; then + : +else + echo "$as_me: failed program was:" >&5 +cat "conftest.$ac_ext" >&5 + + { echo "$as_me:13905: WARNING: _POSIX_C_SOURCE definition is not usable" >&5 +echo "$as_me: WARNING: _POSIX_C_SOURCE definition is not usable" >&2;} + CPPFLAGS="$cf_save_xopen_cppflags" +fi +rm -f "conftest.$ac_objext" "conftest.$ac_ext" + fi ;; esac if test -n "$cf_xopen_source" ; then +for cf_add_cflags in $cf_xopen_source +do + case "x$cf_add_cflags" in + (x-[DU]*) + +cf_tmp_cflag=`echo "x$cf_add_cflags" | sed -e 's/^.//' -e 's/=.*//'` +while true +do + cf_old_cflag=`echo "x$CFLAGS" | sed -e 's/^.//' -e 's/[ ][ ]*-/ -/g' -e "s%$cf_tmp_cflag\\(=[^ ][^ ]*\\)\?%%" -e 's/^[ ]*//' -e 's%[ ][ ]*-D% -D%g' -e 's%[ ][ ]*-I% -I%g'` + test "$CFLAGS" != "$cf_old_cflag" || break + test -n "$verbose" && echo " removing old option $cf_add_cflags from CFLAGS" 1>&6 + +echo "${as_me:-configure}:13928: testing removing old option $cf_add_cflags from CFLAGS ..." 1>&5 + + CFLAGS="$cf_old_cflag" +done + +cf_tmp_cflag=`echo "x$cf_add_cflags" | sed -e 's/^.//' -e 's/=.*//'` +while true +do + cf_old_cflag=`echo "x$CPPFLAGS" | sed -e 's/^.//' -e 's/[ ][ ]*-/ -/g' -e "s%$cf_tmp_cflag\\(=[^ ][^ ]*\\)\?%%" -e 's/^[ ]*//' -e 's%[ ][ ]*-D% -D%g' -e 's%[ ][ ]*-I% -I%g'` + test "$CPPFLAGS" != "$cf_old_cflag" || break + test -n "$verbose" && echo " removing old option $cf_add_cflags from CPPFLAGS" 1>&6 + +echo "${as_me:-configure}:13940: testing removing old option $cf_add_cflags from CPPFLAGS ..." 1>&5 + + CPPFLAGS="$cf_old_cflag" +done + + ;; + esac + cf_fix_cppflags=no cf_new_cflags= cf_new_cppflags= cf_new_extra_cppflags= -for cf_add_cflags in $cf_xopen_source +for cf_add_cflags in $cf_add_cflags do case "$cf_fix_cppflags" in (no) @@ -13440,7 +14025,7 @@ done if test -n "$cf_new_cflags" ; then test -n "$verbose" && echo " add to \$CFLAGS $cf_new_cflags" 1>&6 -echo "${as_me:-configure}:13443: testing add to \$CFLAGS $cf_new_cflags ..." 1>&5 +echo "${as_me:-configure}:14028: testing add to \$CFLAGS $cf_new_cflags ..." 1>&5 test -n "$CFLAGS" && CFLAGS="$CFLAGS " CFLAGS="${CFLAGS}$cf_new_cflags" @@ -13450,7 +14035,7 @@ fi if test -n "$cf_new_cppflags" ; then test -n "$verbose" && echo " add to \$CPPFLAGS $cf_new_cppflags" 1>&6 -echo "${as_me:-configure}:13453: testing add to \$CPPFLAGS $cf_new_cppflags ..." 1>&5 +echo "${as_me:-configure}:14038: testing add to \$CPPFLAGS $cf_new_cppflags ..." 1>&5 test -n "$CPPFLAGS" && CPPFLAGS="$CPPFLAGS " CPPFLAGS="${CPPFLAGS}$cf_new_cppflags" @@ -13460,20 +14045,22 @@ fi if test -n "$cf_new_extra_cppflags" ; then test -n "$verbose" && echo " add to \$EXTRA_CPPFLAGS $cf_new_extra_cppflags" 1>&6 -echo "${as_me:-configure}:13463: testing add to \$EXTRA_CPPFLAGS $cf_new_extra_cppflags ..." 1>&5 +echo "${as_me:-configure}:14048: testing add to \$EXTRA_CPPFLAGS $cf_new_extra_cppflags ..." 1>&5 test -n "$EXTRA_CPPFLAGS" && EXTRA_CPPFLAGS="$EXTRA_CPPFLAGS " EXTRA_CPPFLAGS="${EXTRA_CPPFLAGS}$cf_new_extra_cppflags" fi +done + fi if test -n "$cf_XOPEN_SOURCE" && test -z "$cf_cv_xopen_source" ; then - echo "$as_me:13473: checking if _XOPEN_SOURCE really is set" >&5 + echo "$as_me:14060: 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 13476 "configure" +#line 14063 "configure" #include "confdefs.h" #include <stdlib.h> int @@ -13481,23 +14068,23 @@ main (void) { #ifndef _XOPEN_SOURCE -make an error +#error _XOPEN_SOURCE is not defined #endif ; return 0; } _ACEOF rm -f "conftest.$ac_objext" -if { (eval echo "$as_me:13491: \"$ac_compile\"") >&5 +if { (eval echo "$as_me:14078: \"$ac_compile\"") >&5 (eval $ac_compile) 2>&5 ac_status=$? - echo "$as_me:13494: \$? = $ac_status" >&5 + echo "$as_me:14081: \$? = $ac_status" >&5 (exit "$ac_status"); } && { ac_try='test -s "conftest.$ac_objext"' - { (eval echo "$as_me:13497: \"$ac_try\"") >&5 + { (eval echo "$as_me:14084: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? - echo "$as_me:13500: \$? = $ac_status" >&5 + echo "$as_me:14087: \$? = $ac_status" >&5 (exit "$ac_status"); }; }; then cf_XOPEN_SOURCE_set=yes else @@ -13506,12 +14093,12 @@ cat "conftest.$ac_ext" >&5 cf_XOPEN_SOURCE_set=no fi rm -f "conftest.$ac_objext" "conftest.$ac_ext" - echo "$as_me:13509: result: $cf_XOPEN_SOURCE_set" >&5 + echo "$as_me:14096: 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 13514 "configure" +#line 14101 "configure" #include "confdefs.h" #include <stdlib.h> int @@ -13519,23 +14106,23 @@ main (void) { #if (_XOPEN_SOURCE - 0) < $cf_XOPEN_SOURCE -make an error +#error (_XOPEN_SOURCE - 0) < $cf_XOPEN_SOURCE #endif ; return 0; } _ACEOF rm -f "conftest.$ac_objext" -if { (eval echo "$as_me:13529: \"$ac_compile\"") >&5 +if { (eval echo "$as_me:14116: \"$ac_compile\"") >&5 (eval $ac_compile) 2>&5 ac_status=$? - echo "$as_me:13532: \$? = $ac_status" >&5 + echo "$as_me:14119: \$? = $ac_status" >&5 (exit "$ac_status"); } && { ac_try='test -s "conftest.$ac_objext"' - { (eval echo "$as_me:13535: \"$ac_try\"") >&5 + { (eval echo "$as_me:14122: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? - echo "$as_me:13538: \$? = $ac_status" >&5 + echo "$as_me:14125: \$? = $ac_status" >&5 (exit "$ac_status"); }; }; then cf_XOPEN_SOURCE_set_ok=yes else @@ -13546,47 +14133,46 @@ fi rm -f "conftest.$ac_objext" "conftest.$ac_ext" if test "$cf_XOPEN_SOURCE_set_ok" = no then - { echo "$as_me:13549: WARNING: _XOPEN_SOURCE is lower than requested" >&5 + { echo "$as_me:14136: WARNING: _XOPEN_SOURCE is lower than requested" >&5 echo "$as_me: WARNING: _XOPEN_SOURCE is lower than requested" >&2;} fi else -echo "$as_me:13554: checking if we should define _XOPEN_SOURCE" >&5 +echo "$as_me:14141: 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 13561 "configure" +#line 14148 "configure" #include "confdefs.h" -#include <stdlib.h> -#include <string.h> -#include <sys/types.h> +$ac_includes_default int main (void) { #ifndef _XOPEN_SOURCE -make an error +#error _XOPEN_SOURCE is not defined #endif + ; return 0; } _ACEOF rm -f "conftest.$ac_objext" -if { (eval echo "$as_me:13580: \"$ac_compile\"") >&5 +if { (eval echo "$as_me:14166: \"$ac_compile\"") >&5 (eval $ac_compile) 2>&5 ac_status=$? - echo "$as_me:13583: \$? = $ac_status" >&5 + echo "$as_me:14169: \$? = $ac_status" >&5 (exit "$ac_status"); } && { ac_try='test -s "conftest.$ac_objext"' - { (eval echo "$as_me:13586: \"$ac_try\"") >&5 + { (eval echo "$as_me:14172: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? - echo "$as_me:13589: \$? = $ac_status" >&5 + echo "$as_me:14175: \$? = $ac_status" >&5 (exit "$ac_status"); }; }; then cf_cv_xopen_source=no else @@ -13598,35 +14184,34 @@ cf_save="$CPPFLAGS" CPPFLAGS="${CPPFLAGS}-D_XOPEN_SOURCE=$cf_XOPEN_SOURCE" cat >"conftest.$ac_ext" <<_ACEOF -#line 13601 "configure" +#line 14187 "configure" #include "confdefs.h" -#include <stdlib.h> -#include <string.h> -#include <sys/types.h> +$ac_includes_default int main (void) { -#ifdef _XOPEN_SOURCE -make an error +#ifndef _XOPEN_SOURCE +#error _XOPEN_SOURCE is not defined #endif + ; return 0; } _ACEOF rm -f "conftest.$ac_objext" -if { (eval echo "$as_me:13620: \"$ac_compile\"") >&5 +if { (eval echo "$as_me:14205: \"$ac_compile\"") >&5 (eval $ac_compile) 2>&5 ac_status=$? - echo "$as_me:13623: \$? = $ac_status" >&5 + echo "$as_me:14208: \$? = $ac_status" >&5 (exit "$ac_status"); } && { ac_try='test -s "conftest.$ac_objext"' - { (eval echo "$as_me:13626: \"$ac_try\"") >&5 + { (eval echo "$as_me:14211: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? - echo "$as_me:13629: \$? = $ac_status" >&5 + echo "$as_me:14214: \$? = $ac_status" >&5 (exit "$ac_status"); }; }; then cf_cv_xopen_source=no else @@ -13635,13 +14220,13 @@ cat "conftest.$ac_ext" >&5 cf_cv_xopen_source=$cf_XOPEN_SOURCE fi rm -f "conftest.$ac_objext" "conftest.$ac_ext" - CPPFLAGS="$cf_save" + CPPFLAGS="$cf_save" fi rm -f "conftest.$ac_objext" "conftest.$ac_ext" fi -echo "$as_me:13644: result: $cf_cv_xopen_source" >&5 +echo "$as_me:14229: result: $cf_cv_xopen_source" >&5 echo "${ECHO_T}$cf_cv_xopen_source" >&6 if test "$cf_cv_xopen_source" != no ; then @@ -13656,12 +14241,38 @@ CPPFLAGS=`echo "$CPPFLAGS" | \ cf_temp_xopen_source="-D_XOPEN_SOURCE=$cf_cv_xopen_source" +for cf_add_cflags in $cf_temp_xopen_source +do + case "x$cf_add_cflags" in + (x-[DU]*) + +cf_tmp_cflag=`echo "x$cf_add_cflags" | sed -e 's/^.//' -e 's/=.*//'` +while true +do + cf_old_cflag=`echo "x$CFLAGS" | sed -e 's/^.//' -e 's/[ ][ ]*-/ -/g' -e "s%$cf_tmp_cflag\\(=[^ ][^ ]*\\)\?%%" -e 's/^[ ]*//' -e 's%[ ][ ]*-D% -D%g' -e 's%[ ][ ]*-I% -I%g'` + test "$CFLAGS" != "$cf_old_cflag" || break + + CFLAGS="$cf_old_cflag" +done + +cf_tmp_cflag=`echo "x$cf_add_cflags" | sed -e 's/^.//' -e 's/=.*//'` +while true +do + cf_old_cflag=`echo "x$CPPFLAGS" | sed -e 's/^.//' -e 's/[ ][ ]*-/ -/g' -e "s%$cf_tmp_cflag\\(=[^ ][^ ]*\\)\?%%" -e 's/^[ ]*//' -e 's%[ ][ ]*-D% -D%g' -e 's%[ ][ ]*-I% -I%g'` + test "$CPPFLAGS" != "$cf_old_cflag" || break + + CPPFLAGS="$cf_old_cflag" +done + + ;; + esac + cf_fix_cppflags=no cf_new_cflags= cf_new_cppflags= cf_new_extra_cppflags= -for cf_add_cflags in $cf_temp_xopen_source +for cf_add_cflags in $cf_add_cflags do case "$cf_fix_cppflags" in (no) @@ -13754,12 +14365,242 @@ if test -n "$cf_new_extra_cppflags" ; then fi +done + fi fi fi fi # cf_cv_posix_visible +echo "$as_me:14376: 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 14382 "configure" +#include "confdefs.h" +#include <stdlib.h> +#include <stdarg.h> +#include <string.h> +#include <float.h> + +_ACEOF +if { (eval echo "$as_me:14390: \"$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:14396: \$? = $ac_status" >&5 + (exit "$ac_status"); } >/dev/null; then + if test -s conftest.err; then + ac_cpp_err=$ac_c_preproc_warn_flag + else + ac_cpp_err= + fi +else + ac_cpp_err=yes +fi +if test -z "$ac_cpp_err"; then + ac_cv_header_stdc=yes +else + echo "$as_me: failed program was:" >&5 + cat "conftest.$ac_ext" >&5 + ac_cv_header_stdc=no +fi +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 14418 "configure" +#include "confdefs.h" +#include <string.h> + +_ACEOF +if (eval "$ac_cpp conftest.$ac_ext") 2>&5 | + $EGREP "memchr" >/dev/null 2>&1; then + : +else + ac_cv_header_stdc=no +fi +rm -rf conftest* + +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 14436 "configure" +#include "confdefs.h" +#include <stdlib.h> + +_ACEOF +if (eval "$ac_cpp conftest.$ac_ext") 2>&5 | + $EGREP "free" >/dev/null 2>&1; then + : +else + ac_cv_header_stdc=no +fi +rm -rf conftest* + +fi + +if test $ac_cv_header_stdc = yes; then + # /bin/cc in Irix-4.0.5 gets non-ANSI ctype macros unless using -ansi. + if test "$cross_compiling" = yes; then + : +else + cat >"conftest.$ac_ext" <<_ACEOF +#line 14457 "configure" +#include "confdefs.h" +#include <ctype.h> +#if ((' ' & 0x0FF) == 0x020) +# define ISLOWER(c) ('a' <= (c) && (c) <= 'z') +# define TOUPPER(c) (ISLOWER(c) ? 'A' + ((c) - 'a') : (c)) +#else +# define ISLOWER(c) (('a' <= (c) && (c) <= 'i') \ + || ('j' <= (c) && (c) <= 'r') \ + || ('s' <= (c) && (c) <= 'z')) +# define TOUPPER(c) (ISLOWER(c) ? ((c) | 0x40) : (c)) +#endif + +#define XOR(e, f) (((e) && !(f)) || (!(e) && (f))) +int +main (void) +{ + int i; + for (i = 0; i < 256; i++) + if (XOR (islower (i), ISLOWER (i)) + || toupper (i) != TOUPPER (i)) + $ac_main_return(2); + $ac_main_return (0); +} +_ACEOF +rm -f "conftest$ac_exeext" +if { (eval echo "$as_me:14483: \"$ac_link\"") >&5 + (eval $ac_link) 2>&5 + ac_status=$? + echo "$as_me:14486: \$? = $ac_status" >&5 + (exit "$ac_status"); } && { ac_try='"./conftest$ac_exeext"' + { (eval echo "$as_me:14488: \"$ac_try\"") >&5 + (eval $ac_try) 2>&5 + ac_status=$? + echo "$as_me:14491: \$? = $ac_status" >&5 + (exit "$ac_status"); }; }; then + : +else + echo "$as_me: program exited with status $ac_status" >&5 +echo "$as_me: failed program was:" >&5 +cat "conftest.$ac_ext" >&5 +ac_cv_header_stdc=no +fi +rm -f core ./core.* ./*.core "conftest$ac_exeext" "conftest.$ac_objext" "conftest.$ac_ext" +fi +fi +fi +echo "$as_me:14504: result: $ac_cv_header_stdc" >&5 +echo "${ECHO_T}$ac_cv_header_stdc" >&6 +if test $ac_cv_header_stdc = yes; then + +cat >>confdefs.h <<\EOF +#define STDC_HEADERS 1 +EOF + +fi + +# On IRIX 5.3, sys/types and inttypes.h are conflicting. + +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:14520: 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 14526 "configure" +#include "confdefs.h" +$ac_includes_default +#include <$ac_header> +_ACEOF +rm -f "conftest.$ac_objext" +if { (eval echo "$as_me:14532: \"$ac_compile\"") >&5 + (eval $ac_compile) 2>&5 + ac_status=$? + echo "$as_me:14535: \$? = $ac_status" >&5 + (exit "$ac_status"); } && + { ac_try='test -s "conftest.$ac_objext"' + { (eval echo "$as_me:14538: \"$ac_try\"") >&5 + (eval $ac_try) 2>&5 + ac_status=$? + echo "$as_me:14541: \$? = $ac_status" >&5 + (exit "$ac_status"); }; }; then + eval "$as_ac_Header=yes" +else + echo "$as_me: failed program was:" >&5 +cat "conftest.$ac_ext" >&5 +eval "$as_ac_Header=no" +fi +rm -f "conftest.$ac_objext" "conftest.$ac_ext" +fi +echo "$as_me:14551: 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 +#define `echo "HAVE_$ac_header" | $as_tr_cpp` 1 +EOF + +fi +done + +echo "$as_me:14561: checking whether exit is declared" >&5 +echo $ECHO_N "checking whether exit is declared... $ECHO_C" >&6 +if test "${ac_cv_have_decl_exit+set}" = set; then + echo $ECHO_N "(cached) $ECHO_C" >&6 +else + cat >"conftest.$ac_ext" <<_ACEOF +#line 14567 "configure" +#include "confdefs.h" +$ac_includes_default +int +main (void) +{ +#ifndef exit + (void) exit; +#endif + + ; + return 0; +} +_ACEOF +rm -f "conftest.$ac_objext" +if { (eval echo "$as_me:14582: \"$ac_compile\"") >&5 + (eval $ac_compile) 2>&5 + ac_status=$? + echo "$as_me:14585: \$? = $ac_status" >&5 + (exit "$ac_status"); } && + { ac_try='test -s "conftest.$ac_objext"' + { (eval echo "$as_me:14588: \"$ac_try\"") >&5 + (eval $ac_try) 2>&5 + ac_status=$? + echo "$as_me:14591: \$? = $ac_status" >&5 + (exit "$ac_status"); }; }; then + ac_cv_have_decl_exit=yes +else + echo "$as_me: failed program was:" >&5 +cat "conftest.$ac_ext" >&5 +ac_cv_have_decl_exit=no +fi +rm -f "conftest.$ac_objext" "conftest.$ac_ext" +fi +echo "$as_me:14601: result: $ac_cv_have_decl_exit" >&5 +echo "${ECHO_T}$ac_cv_have_decl_exit" >&6 + # Check whether --enable-largefile or --disable-largefile was given. if test "${enable_largefile+set}" = set; then enableval="$enable_largefile" @@ -13767,7 +14608,7 @@ if test "${enable_largefile+set}" = set; then fi; if test "$enable_largefile" != no; then - echo "$as_me:13770: checking for special C compiler options needed for large files" >&5 + echo "$as_me:14611: 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 @@ -13779,7 +14620,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 13782 "configure" +#line 14623 "configure" #include "confdefs.h" #include <sys/types.h> /* Check that off_t can represent 2**63 - 1 correctly. @@ -13799,16 +14640,16 @@ main (void) } _ACEOF rm -f "conftest.$ac_objext" -if { (eval echo "$as_me:13802: \"$ac_compile\"") >&5 +if { (eval echo "$as_me:14643: \"$ac_compile\"") >&5 (eval $ac_compile) 2>&5 ac_status=$? - echo "$as_me:13805: \$? = $ac_status" >&5 + echo "$as_me:14646: \$? = $ac_status" >&5 (exit "$ac_status"); } && { ac_try='test -s "conftest.$ac_objext"' - { (eval echo "$as_me:13808: \"$ac_try\"") >&5 + { (eval echo "$as_me:14649: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? - echo "$as_me:13811: \$? = $ac_status" >&5 + echo "$as_me:14652: \$? = $ac_status" >&5 (exit "$ac_status"); }; }; then break else @@ -13818,16 +14659,16 @@ fi rm -f "conftest.$ac_objext" CC="$CC -n32" rm -f "conftest.$ac_objext" -if { (eval echo "$as_me:13821: \"$ac_compile\"") >&5 +if { (eval echo "$as_me:14662: \"$ac_compile\"") >&5 (eval $ac_compile) 2>&5 ac_status=$? - echo "$as_me:13824: \$? = $ac_status" >&5 + echo "$as_me:14665: \$? = $ac_status" >&5 (exit "$ac_status"); } && { ac_try='test -s "conftest.$ac_objext"' - { (eval echo "$as_me:13827: \"$ac_try\"") >&5 + { (eval echo "$as_me:14668: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? - echo "$as_me:13830: \$? = $ac_status" >&5 + echo "$as_me:14671: \$? = $ac_status" >&5 (exit "$ac_status"); }; }; then ac_cv_sys_largefile_CC=' -n32'; break else @@ -13841,13 +14682,13 @@ rm -f "conftest.$ac_objext" rm -f "conftest.$ac_ext" fi fi -echo "$as_me:13844: result: $ac_cv_sys_largefile_CC" >&5 +echo "$as_me:14685: 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:13850: checking for _FILE_OFFSET_BITS value needed for large files" >&5 + echo "$as_me:14691: 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 @@ -13855,7 +14696,7 @@ else while :; do ac_cv_sys_file_offset_bits=no cat >"conftest.$ac_ext" <<_ACEOF -#line 13858 "configure" +#line 14699 "configure" #include "confdefs.h" #include <sys/types.h> /* Check that off_t can represent 2**63 - 1 correctly. @@ -13875,16 +14716,16 @@ main (void) } _ACEOF rm -f "conftest.$ac_objext" -if { (eval echo "$as_me:13878: \"$ac_compile\"") >&5 +if { (eval echo "$as_me:14719: \"$ac_compile\"") >&5 (eval $ac_compile) 2>&5 ac_status=$? - echo "$as_me:13881: \$? = $ac_status" >&5 + echo "$as_me:14722: \$? = $ac_status" >&5 (exit "$ac_status"); } && { ac_try='test -s "conftest.$ac_objext"' - { (eval echo "$as_me:13884: \"$ac_try\"") >&5 + { (eval echo "$as_me:14725: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? - echo "$as_me:13887: \$? = $ac_status" >&5 + echo "$as_me:14728: \$? = $ac_status" >&5 (exit "$ac_status"); }; }; then break else @@ -13893,7 +14734,7 @@ cat "conftest.$ac_ext" >&5 fi rm -f "conftest.$ac_objext" "conftest.$ac_ext" cat >"conftest.$ac_ext" <<_ACEOF -#line 13896 "configure" +#line 14737 "configure" #include "confdefs.h" #define _FILE_OFFSET_BITS 64 #include <sys/types.h> @@ -13914,16 +14755,16 @@ main (void) } _ACEOF rm -f "conftest.$ac_objext" -if { (eval echo "$as_me:13917: \"$ac_compile\"") >&5 +if { (eval echo "$as_me:14758: \"$ac_compile\"") >&5 (eval $ac_compile) 2>&5 ac_status=$? - echo "$as_me:13920: \$? = $ac_status" >&5 + echo "$as_me:14761: \$? = $ac_status" >&5 (exit "$ac_status"); } && { ac_try='test -s "conftest.$ac_objext"' - { (eval echo "$as_me:13923: \"$ac_try\"") >&5 + { (eval echo "$as_me:14764: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? - echo "$as_me:13926: \$? = $ac_status" >&5 + echo "$as_me:14767: \$? = $ac_status" >&5 (exit "$ac_status"); }; }; then ac_cv_sys_file_offset_bits=64; break else @@ -13934,7 +14775,7 @@ rm -f "conftest.$ac_objext" "conftest.$ac_ext" break done fi -echo "$as_me:13937: result: $ac_cv_sys_file_offset_bits" >&5 +echo "$as_me:14778: 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 @@ -13944,7 +14785,7 @@ EOF fi rm -rf conftest* - echo "$as_me:13947: checking for _LARGE_FILES value needed for large files" >&5 + echo "$as_me:14788: 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 @@ -13952,7 +14793,7 @@ else while :; do ac_cv_sys_large_files=no cat >"conftest.$ac_ext" <<_ACEOF -#line 13955 "configure" +#line 14796 "configure" #include "confdefs.h" #include <sys/types.h> /* Check that off_t can represent 2**63 - 1 correctly. @@ -13972,16 +14813,16 @@ main (void) } _ACEOF rm -f "conftest.$ac_objext" -if { (eval echo "$as_me:13975: \"$ac_compile\"") >&5 +if { (eval echo "$as_me:14816: \"$ac_compile\"") >&5 (eval $ac_compile) 2>&5 ac_status=$? - echo "$as_me:13978: \$? = $ac_status" >&5 + echo "$as_me:14819: \$? = $ac_status" >&5 (exit "$ac_status"); } && { ac_try='test -s "conftest.$ac_objext"' - { (eval echo "$as_me:13981: \"$ac_try\"") >&5 + { (eval echo "$as_me:14822: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? - echo "$as_me:13984: \$? = $ac_status" >&5 + echo "$as_me:14825: \$? = $ac_status" >&5 (exit "$ac_status"); }; }; then break else @@ -13990,7 +14831,7 @@ cat "conftest.$ac_ext" >&5 fi rm -f "conftest.$ac_objext" "conftest.$ac_ext" cat >"conftest.$ac_ext" <<_ACEOF -#line 13993 "configure" +#line 14834 "configure" #include "confdefs.h" #define _LARGE_FILES 1 #include <sys/types.h> @@ -14011,16 +14852,16 @@ main (void) } _ACEOF rm -f "conftest.$ac_objext" -if { (eval echo "$as_me:14014: \"$ac_compile\"") >&5 +if { (eval echo "$as_me:14855: \"$ac_compile\"") >&5 (eval $ac_compile) 2>&5 ac_status=$? - echo "$as_me:14017: \$? = $ac_status" >&5 + echo "$as_me:14858: \$? = $ac_status" >&5 (exit "$ac_status"); } && { ac_try='test -s "conftest.$ac_objext"' - { (eval echo "$as_me:14020: \"$ac_try\"") >&5 + { (eval echo "$as_me:14861: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? - echo "$as_me:14023: \$? = $ac_status" >&5 + echo "$as_me:14864: \$? = $ac_status" >&5 (exit "$ac_status"); }; }; then ac_cv_sys_large_files=1; break else @@ -14031,7 +14872,7 @@ rm -f "conftest.$ac_objext" "conftest.$ac_ext" break done fi -echo "$as_me:14034: result: $ac_cv_sys_large_files" >&5 +echo "$as_me:14875: 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 @@ -14044,7 +14885,7 @@ rm -rf conftest* fi if test "$enable_largefile" != no ; then - echo "$as_me:14047: checking for _LARGEFILE_SOURCE value needed for large files" >&5 + echo "$as_me:14888: 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 @@ -14052,28 +14893,31 @@ else while :; do ac_cv_sys_largefile_source=no cat >"conftest.$ac_ext" <<_ACEOF -#line 14055 "configure" +#line 14896 "configure" #include "confdefs.h" #include <stdio.h> + #include <sys/types.h> int main (void) { -return !fseeko; + + int (*my_fseeko)(FILE *, off_t, int) = fseeko; + return my_fseeko(stdin, 0, 0); ; return 0; } _ACEOF rm -f "conftest.$ac_objext" -if { (eval echo "$as_me:14067: \"$ac_compile\"") >&5 +if { (eval echo "$as_me:14911: \"$ac_compile\"") >&5 (eval $ac_compile) 2>&5 ac_status=$? - echo "$as_me:14070: \$? = $ac_status" >&5 + echo "$as_me:14914: \$? = $ac_status" >&5 (exit "$ac_status"); } && { ac_try='test -s "conftest.$ac_objext"' - { (eval echo "$as_me:14073: \"$ac_try\"") >&5 + { (eval echo "$as_me:14917: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? - echo "$as_me:14076: \$? = $ac_status" >&5 + echo "$as_me:14920: \$? = $ac_status" >&5 (exit "$ac_status"); }; }; then break else @@ -14082,29 +14926,32 @@ cat "conftest.$ac_ext" >&5 fi rm -f "conftest.$ac_objext" "conftest.$ac_ext" cat >"conftest.$ac_ext" <<_ACEOF -#line 14085 "configure" +#line 14929 "configure" #include "confdefs.h" #define _LARGEFILE_SOURCE 1 #include <stdio.h> + #include <sys/types.h> int main (void) { -return !fseeko; + + int (*my_fseeko)(FILE *, off_t, int) = fseeko; + return my_fseeko(stdin, 0, 0); ; return 0; } _ACEOF rm -f "conftest.$ac_objext" -if { (eval echo "$as_me:14098: \"$ac_compile\"") >&5 +if { (eval echo "$as_me:14945: \"$ac_compile\"") >&5 (eval $ac_compile) 2>&5 ac_status=$? - echo "$as_me:14101: \$? = $ac_status" >&5 + echo "$as_me:14948: \$? = $ac_status" >&5 (exit "$ac_status"); } && { ac_try='test -s "conftest.$ac_objext"' - { (eval echo "$as_me:14104: \"$ac_try\"") >&5 + { (eval echo "$as_me:14951: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? - echo "$as_me:14107: \$? = $ac_status" >&5 + echo "$as_me:14954: \$? = $ac_status" >&5 (exit "$ac_status"); }; }; then ac_cv_sys_largefile_source=1; break else @@ -14115,7 +14962,7 @@ rm -f "conftest.$ac_objext" "conftest.$ac_ext" break done fi -echo "$as_me:14118: result: $ac_cv_sys_largefile_source" >&5 +echo "$as_me:14965: 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 @@ -14129,34 +14976,36 @@ 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:14132: checking for fseeko" >&5 +echo "$as_me:14979: 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 14138 "configure" +#line 14985 "configure" #include "confdefs.h" #include <stdio.h> + #include <sys/types.h> int main (void) { -return fseeko && fseeko (stdin, 0, 0); +int (*my_fseeko)(FILE *, off_t, int) = fseeko; + return my_fseeko && my_fseeko (stdin, 0, 0); ; return 0; } _ACEOF rm -f "conftest.$ac_objext" "conftest$ac_exeext" -if { (eval echo "$as_me:14150: \"$ac_link\"") >&5 +if { (eval echo "$as_me:14999: \"$ac_link\"") >&5 (eval $ac_link) 2>&5 ac_status=$? - echo "$as_me:14153: \$? = $ac_status" >&5 + echo "$as_me:15002: \$? = $ac_status" >&5 (exit "$ac_status"); } && { ac_try='test -s "conftest$ac_exeext"' - { (eval echo "$as_me:14156: \"$ac_try\"") >&5 + { (eval echo "$as_me:15005: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? - echo "$as_me:14159: \$? = $ac_status" >&5 + echo "$as_me:15008: \$? = $ac_status" >&5 (exit "$ac_status"); }; }; then ac_cv_func_fseeko=yes else @@ -14166,7 +15015,7 @@ ac_cv_func_fseeko=no fi rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext" fi -echo "$as_me:14169: result: $ac_cv_func_fseeko" >&5 +echo "$as_me:15018: result: $ac_cv_func_fseeko" >&5 echo "${ECHO_T}$ac_cv_func_fseeko" >&6 if test $ac_cv_func_fseeko = yes; then @@ -14205,28 +15054,32 @@ fi fi - echo "$as_me:14208: checking whether to use struct dirent64" >&5 + echo "$as_me:15057: 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 14215 "configure" +#line 15064 "configure" #include "confdefs.h" #pragma GCC diagnostic error "-Wincompatible-pointer-types" #include <sys/types.h> #include <dirent.h> +#ifndef __REDIRECT +/* if transitional largefile support is setup, this is true */ +extern struct dirent64 * readdir(DIR *); +#endif + int main (void) { - /* if transitional largefile support is setup, this is true */ - extern struct dirent64 * readdir(DIR *); - struct dirent64 *x = readdir((DIR *)0); - struct dirent *y = readdir((DIR *)0); + DIR *dp = opendir("."); + struct dirent64 *x = readdir(dp); + struct dirent *y = readdir(dp); int z = x - y; (void)z; @@ -14235,16 +15088,16 @@ main (void) } _ACEOF rm -f "conftest.$ac_objext" -if { (eval echo "$as_me:14238: \"$ac_compile\"") >&5 +if { (eval echo "$as_me:15091: \"$ac_compile\"") >&5 (eval $ac_compile) 2>&5 ac_status=$? - echo "$as_me:14241: \$? = $ac_status" >&5 + echo "$as_me:15094: \$? = $ac_status" >&5 (exit "$ac_status"); } && { ac_try='test -s "conftest.$ac_objext"' - { (eval echo "$as_me:14244: \"$ac_try\"") >&5 + { (eval echo "$as_me:15097: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? - echo "$as_me:14247: \$? = $ac_status" >&5 + echo "$as_me:15100: \$? = $ac_status" >&5 (exit "$ac_status"); }; }; then cf_cv_struct_dirent64=yes else @@ -14255,7 +15108,7 @@ fi rm -f "conftest.$ac_objext" "conftest.$ac_ext" fi -echo "$as_me:14258: result: $cf_cv_struct_dirent64" >&5 +echo "$as_me:15111: result: $cf_cv_struct_dirent64" >&5 echo "${ECHO_T}$cf_cv_struct_dirent64" >&6 test "$cf_cv_struct_dirent64" = yes && cat >>confdefs.h <<\EOF @@ -14265,7 +15118,7 @@ EOF fi ### Enable compiling-in rcs id's -echo "$as_me:14268: checking if RCS identifiers should be compiled-in" >&5 +echo "$as_me:15121: checking if RCS identifiers should be compiled-in" >&5 echo $ECHO_N "checking if RCS identifiers should be compiled-in... $ECHO_C" >&6 # Check whether --with-rcs-ids or --without-rcs-ids was given. @@ -14275,7 +15128,7 @@ if test "${with_rcs_ids+set}" = set; then else with_rcs_ids=no fi; -echo "$as_me:14278: result: $with_rcs_ids" >&5 +echo "$as_me:15131: result: $with_rcs_ids" >&5 echo "${ECHO_T}$with_rcs_ids" >&6 test "$with_rcs_ids" = yes && cat >>confdefs.h <<\EOF @@ -14285,7 +15138,7 @@ EOF ############################################################################### ### Note that some functions (such as const) are normally disabled anyway. -echo "$as_me:14288: checking if you want to build with function extensions" >&5 +echo "$as_me:15141: checking if you want to build with function extensions" >&5 echo $ECHO_N "checking if you want to build with function extensions... $ECHO_C" >&6 # Check whether --enable-ext-funcs or --disable-ext-funcs was given. @@ -14295,7 +15148,7 @@ if test "${enable_ext_funcs+set}" = set; then else with_ext_funcs=yes fi; -echo "$as_me:14298: result: $with_ext_funcs" >&5 +echo "$as_me:15151: result: $with_ext_funcs" >&5 echo "${ECHO_T}$with_ext_funcs" >&6 if test "$with_ext_funcs" = yes ; then NCURSES_EXT_FUNCS=1 @@ -14313,7 +15166,7 @@ else fi ### use option --enable-const to turn on use of const beyond that in XSI. -echo "$as_me:14316: checking for extended use of const keyword" >&5 +echo "$as_me:15169: checking for extended use of const keyword" >&5 echo $ECHO_N "checking for extended use of const keyword... $ECHO_C" >&6 # Check whether --enable-const or --disable-const was given. @@ -14323,7 +15176,7 @@ if test "${enable_const+set}" = set; then else with_ext_const=no fi; -echo "$as_me:14326: result: $with_ext_const" >&5 +echo "$as_me:15179: result: $with_ext_const" >&5 echo "${ECHO_T}$with_ext_const" >&6 NCURSES_CONST='/*nothing*/' if test "$with_ext_const" = yes ; then @@ -14333,7 +15186,7 @@ fi ############################################################################### # These options are relatively safe to experiment with. -echo "$as_me:14336: checking if you want all development code" >&5 +echo "$as_me:15189: checking if you want all development code" >&5 echo $ECHO_N "checking if you want all development code... $ECHO_C" >&6 # Check whether --with-develop or --without-develop was given. @@ -14343,7 +15196,7 @@ if test "${with_develop+set}" = set; then else with_develop=no fi; -echo "$as_me:14346: result: $with_develop" >&5 +echo "$as_me:15199: result: $with_develop" >&5 echo "${ECHO_T}$with_develop" >&6 ############################################################################### @@ -14352,7 +15205,7 @@ echo "${ECHO_T}$with_develop" >&6 # This is still experimental (20080329), but should ultimately be moved to # the script-block --with-normal, etc. -echo "$as_me:14355: checking if you want to link with the pthread library" >&5 +echo "$as_me:15208: checking if you want to link with the pthread library" >&5 echo $ECHO_N "checking if you want to link with the pthread library... $ECHO_C" >&6 # Check whether --with-pthread or --without-pthread was given. @@ -14362,27 +15215,27 @@ if test "${with_pthread+set}" = set; then else with_pthread=no fi; -echo "$as_me:14365: result: $with_pthread" >&5 +echo "$as_me:15218: result: $with_pthread" >&5 echo "${ECHO_T}$with_pthread" >&6 if test "$with_pthread" != no ; then - echo "$as_me:14369: checking for pthread.h" >&5 + echo "$as_me:15222: checking for pthread.h" >&5 echo $ECHO_N "checking for pthread.h... $ECHO_C" >&6 if test "${ac_cv_header_pthread_h+set}" = set; then echo $ECHO_N "(cached) $ECHO_C" >&6 else cat >"conftest.$ac_ext" <<_ACEOF -#line 14375 "configure" +#line 15228 "configure" #include "confdefs.h" #include <pthread.h> _ACEOF -if { (eval echo "$as_me:14379: \"$ac_cpp "conftest.$ac_ext"\"") >&5 +if { (eval echo "$as_me:15232: \"$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:14385: \$? = $ac_status" >&5 + echo "$as_me:15238: \$? = $ac_status" >&5 (exit "$ac_status"); } >/dev/null; then if test -s conftest.err; then ac_cpp_err=$ac_c_preproc_warn_flag @@ -14401,7 +15254,7 @@ else fi rm -f conftest.err "conftest.$ac_ext" fi -echo "$as_me:14404: result: $ac_cv_header_pthread_h" >&5 +echo "$as_me:15257: result: $ac_cv_header_pthread_h" >&5 echo "${ECHO_T}$ac_cv_header_pthread_h" >&6 if test "$ac_cv_header_pthread_h" = yes; then @@ -14411,7 +15264,7 @@ EOF for cf_lib_pthread in pthread c_r do - echo "$as_me:14414: checking if we can link with the $cf_lib_pthread library" >&5 + echo "$as_me:15267: checking if we can link with the $cf_lib_pthread library" >&5 echo $ECHO_N "checking if we can link with the $cf_lib_pthread library... $ECHO_C" >&6 cf_save_LIBS="$LIBS" @@ -14432,7 +15285,7 @@ done LIBS="$cf_add_libs" cat >"conftest.$ac_ext" <<_ACEOF -#line 14435 "configure" +#line 15288 "configure" #include "confdefs.h" #include <pthread.h> @@ -14449,16 +15302,16 @@ main (void) } _ACEOF rm -f "conftest.$ac_objext" "conftest$ac_exeext" -if { (eval echo "$as_me:14452: \"$ac_link\"") >&5 +if { (eval echo "$as_me:15305: \"$ac_link\"") >&5 (eval $ac_link) 2>&5 ac_status=$? - echo "$as_me:14455: \$? = $ac_status" >&5 + echo "$as_me:15308: \$? = $ac_status" >&5 (exit "$ac_status"); } && { ac_try='test -s "conftest$ac_exeext"' - { (eval echo "$as_me:14458: \"$ac_try\"") >&5 + { (eval echo "$as_me:15311: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? - echo "$as_me:14461: \$? = $ac_status" >&5 + echo "$as_me:15314: \$? = $ac_status" >&5 (exit "$ac_status"); }; }; then with_pthread=yes else @@ -14468,7 +15321,7 @@ with_pthread=no fi rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext" LIBS="$cf_save_LIBS" - echo "$as_me:14471: result: $with_pthread" >&5 + echo "$as_me:15324: result: $with_pthread" >&5 echo "${ECHO_T}$with_pthread" >&6 test "$with_pthread" = yes && break done @@ -14496,7 +15349,7 @@ cat >>confdefs.h <<\EOF EOF else - { { echo "$as_me:14499: error: Cannot link with pthread library" >&5 + { { echo "$as_me:15352: error: Cannot link with pthread library" >&5 echo "$as_me: error: Cannot link with pthread library" >&2;} { (exit 1); exit 1; }; } fi @@ -14505,7 +15358,7 @@ fi fi -echo "$as_me:14508: checking if you want to use weak-symbols for pthreads" >&5 +echo "$as_me:15361: checking if you want to use weak-symbols for pthreads" >&5 echo $ECHO_N "checking if you want to use weak-symbols for pthreads... $ECHO_C" >&6 # Check whether --enable-weak-symbols or --disable-weak-symbols was given. @@ -14515,18 +15368,18 @@ if test "${enable_weak_symbols+set}" = set; then else use_weak_symbols=no fi; -echo "$as_me:14518: result: $use_weak_symbols" >&5 +echo "$as_me:15371: result: $use_weak_symbols" >&5 echo "${ECHO_T}$use_weak_symbols" >&6 if test "$use_weak_symbols" = yes ; then -echo "$as_me:14522: checking if $CC supports weak symbols" >&5 +echo "$as_me:15375: checking if $CC supports weak symbols" >&5 echo $ECHO_N "checking if $CC supports weak symbols... $ECHO_C" >&6 if test "${cf_cv_weak_symbols+set}" = set; then echo $ECHO_N "(cached) $ECHO_C" >&6 else cat >"conftest.$ac_ext" <<_ACEOF -#line 14529 "configure" +#line 15382 "configure" #include "confdefs.h" #include <stdio.h> @@ -14552,16 +15405,16 @@ weak_symbol(fopen); } _ACEOF rm -f "conftest.$ac_objext" -if { (eval echo "$as_me:14555: \"$ac_compile\"") >&5 +if { (eval echo "$as_me:15408: \"$ac_compile\"") >&5 (eval $ac_compile) 2>&5 ac_status=$? - echo "$as_me:14558: \$? = $ac_status" >&5 + echo "$as_me:15411: \$? = $ac_status" >&5 (exit "$ac_status"); } && { ac_try='test -s "conftest.$ac_objext"' - { (eval echo "$as_me:14561: \"$ac_try\"") >&5 + { (eval echo "$as_me:15414: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? - echo "$as_me:14564: \$? = $ac_status" >&5 + echo "$as_me:15417: \$? = $ac_status" >&5 (exit "$ac_status"); }; }; then cf_cv_weak_symbols=yes else @@ -14572,7 +15425,7 @@ fi rm -f "conftest.$ac_objext" "conftest.$ac_ext" fi -echo "$as_me:14575: result: $cf_cv_weak_symbols" >&5 +echo "$as_me:15428: result: $cf_cv_weak_symbols" >&5 echo "${ECHO_T}$cf_cv_weak_symbols" >&6 else @@ -14601,13 +15454,13 @@ EOF fi # OpenSUSE is installing ncurses6, using reentrant option. -echo "$as_me:14604: checking for _nc_TABSIZE" >&5 +echo "$as_me:15457: checking for _nc_TABSIZE" >&5 echo $ECHO_N "checking for _nc_TABSIZE... $ECHO_C" >&6 if test "${ac_cv_func__nc_TABSIZE+set}" = set; then echo $ECHO_N "(cached) $ECHO_C" >&6 else cat >"conftest.$ac_ext" <<_ACEOF -#line 14610 "configure" +#line 15463 "configure" #include "confdefs.h" #define _nc_TABSIZE autoconf_temporary #include <limits.h> /* least-intrusive standard header which defines gcc2 __stub macros */ @@ -14638,16 +15491,16 @@ main (void) } _ACEOF rm -f "conftest.$ac_objext" "conftest$ac_exeext" -if { (eval echo "$as_me:14641: \"$ac_link\"") >&5 +if { (eval echo "$as_me:15494: \"$ac_link\"") >&5 (eval $ac_link) 2>&5 ac_status=$? - echo "$as_me:14644: \$? = $ac_status" >&5 + echo "$as_me:15497: \$? = $ac_status" >&5 (exit "$ac_status"); } && { ac_try='test -s "conftest$ac_exeext"' - { (eval echo "$as_me:14647: \"$ac_try\"") >&5 + { (eval echo "$as_me:15500: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? - echo "$as_me:14650: \$? = $ac_status" >&5 + echo "$as_me:15503: \$? = $ac_status" >&5 (exit "$ac_status"); }; }; then ac_cv_func__nc_TABSIZE=yes else @@ -14657,7 +15510,7 @@ ac_cv_func__nc_TABSIZE=no fi rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext" fi -echo "$as_me:14660: result: $ac_cv_func__nc_TABSIZE" >&5 +echo "$as_me:15513: result: $ac_cv_func__nc_TABSIZE" >&5 echo "${ECHO_T}$ac_cv_func__nc_TABSIZE" >&6 if test "$ac_cv_func__nc_TABSIZE" = yes; then assume_reentrant=yes @@ -14669,7 +15522,7 @@ fi # opaque outside of that, so there is no --enable-opaque option. We can use # this option without --with-pthreads, but this will be always set for # pthreads. -echo "$as_me:14672: checking if you want experimental reentrant code" >&5 +echo "$as_me:15525: checking if you want experimental reentrant code" >&5 echo $ECHO_N "checking if you want experimental reentrant code... $ECHO_C" >&6 # Check whether --enable-reentrant or --disable-reentrant was given. @@ -14679,7 +15532,7 @@ if test "${enable_reentrant+set}" = set; then else with_reentrant=$assume_reentrant fi; -echo "$as_me:14682: result: $with_reentrant" >&5 +echo "$as_me:15535: result: $with_reentrant" >&5 echo "${ECHO_T}$with_reentrant" >&6 if test "$with_reentrant" = yes ; then cf_cv_enable_reentrant=1 @@ -14702,7 +15555,7 @@ fi ### Allow using a different wrap-prefix if test "$cf_cv_enable_reentrant" != 0 || test "$BROKEN_LINKER" = 1 ; then - echo "$as_me:14705: checking for prefix used to wrap public variables" >&5 + echo "$as_me:15558: checking for prefix used to wrap public variables" >&5 echo $ECHO_N "checking for prefix used to wrap public variables... $ECHO_C" >&6 # Check whether --with-wrap-prefix or --without-wrap-prefix was given. @@ -14712,7 +15565,7 @@ if test "${with_wrap_prefix+set}" = set; then else NCURSES_WRAP_PREFIX=_nc_ fi; - echo "$as_me:14715: result: $NCURSES_WRAP_PREFIX" >&5 + echo "$as_me:15568: result: $NCURSES_WRAP_PREFIX" >&5 echo "${ECHO_T}$NCURSES_WRAP_PREFIX" >&6 else NCURSES_WRAP_PREFIX=_nc_ @@ -14726,7 +15579,7 @@ EOF ### use option --disable-echo to suppress full display compiling commands -echo "$as_me:14729: checking if you want to see long compiling messages" >&5 +echo "$as_me:15582: 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. @@ -14760,9 +15613,93 @@ else ECHO_CC='' fi; -echo "$as_me:14763: result: $enableval" >&5 +echo "$as_me:15616: result: $enableval" >&5 echo "${ECHO_T}$enableval" >&6 +echo "$as_me:15619: checking if you want to use C11 _Noreturn feature" >&5 +echo $ECHO_N "checking if you want to use C11 _Noreturn feature... $ECHO_C" >&6 + +# Check whether --enable-stdnoreturn or --disable-stdnoreturn was given. +if test "${enable_stdnoreturn+set}" = set; then + enableval="$enable_stdnoreturn" + test "$enableval" != yes && enableval=no + if test "$enableval" != "no" ; then + enable_stdnoreturn=yes + else + enable_stdnoreturn=no + fi +else + enableval=no + enable_stdnoreturn=no + +fi; +echo "$as_me:15636: result: $enable_stdnoreturn" >&5 +echo "${ECHO_T}$enable_stdnoreturn" >&6 + +if test $enable_stdnoreturn = yes; then +echo "$as_me:15640: checking for C11 _Noreturn feature" >&5 +echo $ECHO_N "checking for C11 _Noreturn feature... $ECHO_C" >&6 +if test "${cf_cv_c11_noreturn+set}" = set; then + echo $ECHO_N "(cached) $ECHO_C" >&6 +else + cat >"conftest.$ac_ext" <<_ACEOF +#line 15646 "configure" +#include "confdefs.h" + +$ac_includes_default +#include <stdnoreturn.h> +static _Noreturn void giveup(void) { exit(0); } + +int +main (void) +{ +if (feof(stdin)) giveup() + ; + return 0; +} +_ACEOF +rm -f "conftest.$ac_objext" +if { (eval echo "$as_me:15662: \"$ac_compile\"") >&5 + (eval $ac_compile) 2>&5 + ac_status=$? + echo "$as_me:15665: \$? = $ac_status" >&5 + (exit "$ac_status"); } && + { ac_try='test -s "conftest.$ac_objext"' + { (eval echo "$as_me:15668: \"$ac_try\"") >&5 + (eval $ac_try) 2>&5 + ac_status=$? + echo "$as_me:15671: \$? = $ac_status" >&5 + (exit "$ac_status"); }; }; then + cf_cv_c11_noreturn=yes +else + echo "$as_me: failed program was:" >&5 +cat "conftest.$ac_ext" >&5 +cf_cv_c11_noreturn=no +fi +rm -f "conftest.$ac_objext" "conftest.$ac_ext" + +fi +echo "$as_me:15682: result: $cf_cv_c11_noreturn" >&5 +echo "${ECHO_T}$cf_cv_c11_noreturn" >&6 +else + cf_cv_c11_noreturn=no, +fi + +if test "$cf_cv_c11_noreturn" = yes; then + +cat >>confdefs.h <<\EOF +#define HAVE_STDNORETURN_H 1 +EOF + +cat >>confdefs.h <<EOF +#define STDC_NORETURN _Noreturn +EOF + + HAVE_STDNORETURN_H=1 +else + HAVE_STDNORETURN_H=0 +fi + if test "$GCC" = yes || test "$GXX" = yes then @@ -14770,14 +15707,16 @@ if test "$GCC" = yes || test "$GXX" = yes then case $CFLAGS in (*-Werror=*) - test -n "$verbose" && echo " repairing CFLAGS: $CFLAGS" 1>&6 - -echo "${as_me:-configure}:14775: testing repairing CFLAGS: $CFLAGS ..." 1>&5 - cf_temp_flags= for cf_temp_scan in $CFLAGS do case "x$cf_temp_scan" in + (x-Werror=format*) + + test -n "$cf_temp_flags" && cf_temp_flags="$cf_temp_flags " + cf_temp_flags="${cf_temp_flags}$cf_temp_scan" + + ;; (x-Werror=*) test -n "$EXTRA_CFLAGS" && EXTRA_CFLAGS="$EXTRA_CFLAGS " @@ -14792,15 +15731,22 @@ echo "${as_me:-configure}:14775: testing repairing CFLAGS: $CFLAGS ..." 1>&5 ;; esac done - CFLAGS="$cf_temp_flags" - test -n "$verbose" && echo " ... fixed $CFLAGS" 1>&6 + if test "x$CFLAGS" != "x$cf_temp_flags" + then + test -n "$verbose" && echo " repairing CFLAGS: $CFLAGS" 1>&6 + +echo "${as_me:-configure}:15738: testing repairing CFLAGS: $CFLAGS ..." 1>&5 -echo "${as_me:-configure}:14798: testing ... fixed $CFLAGS ..." 1>&5 + CFLAGS="$cf_temp_flags" + test -n "$verbose" && echo " ... fixed $CFLAGS" 1>&6 - test -n "$verbose" && echo " ... extra $EXTRA_CFLAGS" 1>&6 +echo "${as_me:-configure}:15743: testing ... fixed $CFLAGS ..." 1>&5 -echo "${as_me:-configure}:14802: testing ... extra $EXTRA_CFLAGS ..." 1>&5 + test -n "$verbose" && echo " ... extra $EXTRA_CFLAGS" 1>&6 +echo "${as_me:-configure}:15747: testing ... extra $EXTRA_CFLAGS ..." 1>&5 + + fi ;; esac fi @@ -14809,14 +15755,16 @@ if test "$GCC" = yes || test "$GXX" = yes then case $CPPFLAGS in (*-Werror=*) - test -n "$verbose" && echo " repairing CPPFLAGS: $CPPFLAGS" 1>&6 - -echo "${as_me:-configure}:14814: testing repairing CPPFLAGS: $CPPFLAGS ..." 1>&5 - cf_temp_flags= for cf_temp_scan in $CPPFLAGS do case "x$cf_temp_scan" in + (x-Werror=format*) + + test -n "$cf_temp_flags" && cf_temp_flags="$cf_temp_flags " + cf_temp_flags="${cf_temp_flags}$cf_temp_scan" + + ;; (x-Werror=*) test -n "$EXTRA_CFLAGS" && EXTRA_CFLAGS="$EXTRA_CFLAGS " @@ -14831,15 +15779,22 @@ echo "${as_me:-configure}:14814: testing repairing CPPFLAGS: $CPPFLAGS ..." 1>&5 ;; esac done - CPPFLAGS="$cf_temp_flags" - test -n "$verbose" && echo " ... fixed $CPPFLAGS" 1>&6 + if test "x$CPPFLAGS" != "x$cf_temp_flags" + then + test -n "$verbose" && echo " repairing CPPFLAGS: $CPPFLAGS" 1>&6 + +echo "${as_me:-configure}:15786: testing repairing CPPFLAGS: $CPPFLAGS ..." 1>&5 -echo "${as_me:-configure}:14837: testing ... fixed $CPPFLAGS ..." 1>&5 + CPPFLAGS="$cf_temp_flags" + test -n "$verbose" && echo " ... fixed $CPPFLAGS" 1>&6 - test -n "$verbose" && echo " ... extra $EXTRA_CFLAGS" 1>&6 +echo "${as_me:-configure}:15791: testing ... fixed $CPPFLAGS ..." 1>&5 -echo "${as_me:-configure}:14841: testing ... extra $EXTRA_CFLAGS ..." 1>&5 + test -n "$verbose" && echo " ... extra $EXTRA_CFLAGS" 1>&6 +echo "${as_me:-configure}:15795: testing ... extra $EXTRA_CFLAGS ..." 1>&5 + + fi ;; esac fi @@ -14848,14 +15803,16 @@ if test "$GCC" = yes || test "$GXX" = yes then case $LDFLAGS in (*-Werror=*) - test -n "$verbose" && echo " repairing LDFLAGS: $LDFLAGS" 1>&6 - -echo "${as_me:-configure}:14853: testing repairing LDFLAGS: $LDFLAGS ..." 1>&5 - cf_temp_flags= for cf_temp_scan in $LDFLAGS do case "x$cf_temp_scan" in + (x-Werror=format*) + + test -n "$cf_temp_flags" && cf_temp_flags="$cf_temp_flags " + cf_temp_flags="${cf_temp_flags}$cf_temp_scan" + + ;; (x-Werror=*) test -n "$EXTRA_CFLAGS" && EXTRA_CFLAGS="$EXTRA_CFLAGS " @@ -14870,20 +15827,27 @@ echo "${as_me:-configure}:14853: testing repairing LDFLAGS: $LDFLAGS ..." 1>&5 ;; esac done - LDFLAGS="$cf_temp_flags" - test -n "$verbose" && echo " ... fixed $LDFLAGS" 1>&6 + if test "x$LDFLAGS" != "x$cf_temp_flags" + then + test -n "$verbose" && echo " repairing LDFLAGS: $LDFLAGS" 1>&6 + +echo "${as_me:-configure}:15834: testing repairing LDFLAGS: $LDFLAGS ..." 1>&5 -echo "${as_me:-configure}:14876: testing ... fixed $LDFLAGS ..." 1>&5 + LDFLAGS="$cf_temp_flags" + test -n "$verbose" && echo " ... fixed $LDFLAGS" 1>&6 - test -n "$verbose" && echo " ... extra $EXTRA_CFLAGS" 1>&6 +echo "${as_me:-configure}:15839: testing ... fixed $LDFLAGS ..." 1>&5 -echo "${as_me:-configure}:14880: testing ... extra $EXTRA_CFLAGS ..." 1>&5 + test -n "$verbose" && echo " ... extra $EXTRA_CFLAGS" 1>&6 +echo "${as_me:-configure}:15843: testing ... extra $EXTRA_CFLAGS ..." 1>&5 + + fi ;; esac fi -echo "$as_me:14886: checking if you want to turn on gcc warnings" >&5 +echo "$as_me:15850: checking if you want to turn on gcc warnings" >&5 echo $ECHO_N "checking if you want to turn on gcc warnings... $ECHO_C" >&6 # Check whether --enable-warnings or --disable-warnings was given. @@ -14900,7 +15864,7 @@ else enable_warnings=no fi; -echo "$as_me:14903: result: $enable_warnings" >&5 +echo "$as_me:15867: result: $enable_warnings" >&5 echo "${ECHO_T}$enable_warnings" >&6 if test "$enable_warnings" = "yes" then @@ -14924,7 +15888,7 @@ do done cat >"conftest.$ac_ext" <<_ACEOF -#line 14927 "configure" +#line 15891 "configure" #include "confdefs.h" #include <stdlib.h> @@ -14933,34 +15897,35 @@ cat >"conftest.$ac_ext" <<_ACEOF int main (void) { -String foo = malloc(1); (void)foo +String foo = malloc(1); free((void*)foo) ; return 0; } _ACEOF rm -f "conftest.$ac_objext" -if { (eval echo "$as_me:14942: \"$ac_compile\"") >&5 +if { (eval echo "$as_me:15906: \"$ac_compile\"") >&5 (eval $ac_compile) 2>&5 ac_status=$? - echo "$as_me:14945: \$? = $ac_status" >&5 + echo "$as_me:15909: \$? = $ac_status" >&5 (exit "$ac_status"); } && { ac_try='test -s "conftest.$ac_objext"' - { (eval echo "$as_me:14948: \"$ac_try\"") >&5 + { (eval echo "$as_me:15912: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? - echo "$as_me:14951: \$? = $ac_status" >&5 + echo "$as_me:15915: \$? = $ac_status" >&5 (exit "$ac_status"); }; }; then -echo "$as_me:14954: checking for X11/Xt const-feature" >&5 +echo "$as_me:15918: checking for X11/Xt const-feature" >&5 echo $ECHO_N "checking for X11/Xt const-feature... $ECHO_C" >&6 if test "${cf_cv_const_x_string+set}" = set; then echo $ECHO_N "(cached) $ECHO_C" >&6 else cat >"conftest.$ac_ext" <<_ACEOF -#line 14961 "configure" +#line 15925 "configure" #include "confdefs.h" +#undef _CONST_X_STRING #define _CONST_X_STRING /* X11R7.8 (perhaps) */ #undef XTSTRINGDEFINES /* X11R5 and later */ #include <stdlib.h> @@ -14975,16 +15940,16 @@ String foo = malloc(1); *foo = 0 } _ACEOF rm -f "conftest.$ac_objext" -if { (eval echo "$as_me:14978: \"$ac_compile\"") >&5 +if { (eval echo "$as_me:15943: \"$ac_compile\"") >&5 (eval $ac_compile) 2>&5 ac_status=$? - echo "$as_me:14981: \$? = $ac_status" >&5 + echo "$as_me:15946: \$? = $ac_status" >&5 (exit "$ac_status"); } && { ac_try='test -s "conftest.$ac_objext"' - { (eval echo "$as_me:14984: \"$ac_try\"") >&5 + { (eval echo "$as_me:15949: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? - echo "$as_me:14987: \$? = $ac_status" >&5 + echo "$as_me:15952: \$? = $ac_status" >&5 (exit "$ac_status"); }; }; then cf_cv_const_x_string=no @@ -14999,7 +15964,7 @@ fi rm -f "conftest.$ac_objext" "conftest.$ac_ext" fi -echo "$as_me:15002: result: $cf_cv_const_x_string" >&5 +echo "$as_me:15967: result: $cf_cv_const_x_string" >&5 echo "${ECHO_T}$cf_cv_const_x_string" >&6 LIBS="$cf_save_LIBS_CF_CONST_X_STRING" @@ -15028,7 +15993,7 @@ fi rm -f "conftest.$ac_objext" "conftest.$ac_ext" fi cat > "conftest.$ac_ext" <<EOF -#line 15031 "${as_me:-configure}" +#line 15996 "${as_me:-configure}" int main(int argc, char *argv[]) { return (argv[argc-1] == 0) ; } EOF if test "$INTEL_COMPILER" = yes @@ -15044,7 +16009,7 @@ then # remark #981: operands are evaluated in unspecified order # warning #279: controlling expression is constant - { echo "$as_me:15047: checking for $CC warning options..." >&5 + { echo "$as_me:16012: checking for $CC warning options..." >&5 echo "$as_me: checking for $CC warning options..." >&6;} cf_save_CFLAGS="$CFLAGS" EXTRA_CFLAGS="$EXTRA_CFLAGS -Wall" @@ -15060,12 +16025,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:15063: \"$ac_compile\"") >&5 + if { (eval echo "$as_me:16028: \"$ac_compile\"") >&5 (eval $ac_compile) 2>&5 ac_status=$? - echo "$as_me:15066: \$? = $ac_status" >&5 + echo "$as_me:16031: \$? = $ac_status" >&5 (exit "$ac_status"); }; then - test -n "$verbose" && echo "$as_me:15068: result: ... -$cf_opt" >&5 + test -n "$verbose" && echo "$as_me:16033: result: ... -$cf_opt" >&5 echo "${ECHO_T}... -$cf_opt" >&6 EXTRA_CFLAGS="$EXTRA_CFLAGS -$cf_opt" fi @@ -15073,7 +16038,7 @@ echo "${ECHO_T}... -$cf_opt" >&6 CFLAGS="$cf_save_CFLAGS" elif test "$GCC" = yes && test "$GCC_VERSION" != "unknown" then - { echo "$as_me:15076: checking for $CC warning options..." >&5 + { echo "$as_me:16041: checking for $CC warning options..." >&5 echo "$as_me: checking for $CC warning options..." >&6;} cf_save_CFLAGS="$CFLAGS" cf_warn_CONST="" @@ -15096,12 +16061,12 @@ echo "$as_me: checking for $CC warning options..." >&6;} Wundef Wno-inline $cf_gcc_warnings $cf_warn_CONST Wno-unknown-pragmas Wswitch-enum do CFLAGS="$cf_save_CFLAGS $EXTRA_CFLAGS -$cf_opt" - if { (eval echo "$as_me:15099: \"$ac_compile\"") >&5 + if { (eval echo "$as_me:16064: \"$ac_compile\"") >&5 (eval $ac_compile) 2>&5 ac_status=$? - echo "$as_me:15102: \$? = $ac_status" >&5 + echo "$as_me:16067: \$? = $ac_status" >&5 (exit "$ac_status"); }; then - test -n "$verbose" && echo "$as_me:15104: result: ... -$cf_opt" >&5 + test -n "$verbose" && echo "$as_me:16069: result: ... -$cf_opt" >&5 echo "${ECHO_T}... -$cf_opt" >&6 case "$cf_opt" in (Winline) @@ -15109,7 +16074,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}:15112: testing feature is broken in gcc $GCC_VERSION ..." 1>&5 +echo "${as_me:-configure}:16077: testing feature is broken in gcc $GCC_VERSION ..." 1>&5 continue;; esac @@ -15119,7 +16084,7 @@ echo "${as_me:-configure}:15112: 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}:15122: testing feature is broken in gcc $GCC_VERSION ..." 1>&5 +echo "${as_me:-configure}:16087: testing feature is broken in gcc $GCC_VERSION ..." 1>&5 continue;; esac @@ -15152,10 +16117,11 @@ cat > conftest.i <<EOF EOF if test "$GCC" = yes then - { echo "$as_me:15155: checking for $CC __attribute__ directives..." >&5 + { echo "$as_me:16120: checking for $CC __attribute__ directives..." >&5 echo "$as_me: checking for $CC __attribute__ directives..." >&6;} cat > "conftest.$ac_ext" <<EOF -#line 15158 "${as_me:-configure}" +#line 16123 "${as_me:-configure}" +#include <stdio.h> #include "confdefs.h" #include "conftest.h" #include "conftest.i" @@ -15170,8 +16136,8 @@ cat > "conftest.$ac_ext" <<EOF #define GCC_SCANFLIKE(fmt,var) /*nothing*/ #endif extern void wow(char *,...) GCC_SCANFLIKE(1,2); -extern void oops(char *,...) GCC_PRINTFLIKE(1,2) GCC_NORETURN; -extern void foo(void) GCC_NORETURN; +extern GCC_NORETURN void oops(char *,...) GCC_PRINTFLIKE(1,2); +extern GCC_NORETURN void foo(void); int main(int argc GCC_UNUSED, char *argv[] GCC_UNUSED) { (void)argc; (void)argv; return 0; } EOF cf_printf_attribute=no @@ -15204,12 +16170,12 @@ EOF ;; esac - if { (eval echo "$as_me:15207: \"$ac_compile\"") >&5 + if { (eval echo "$as_me:16173: \"$ac_compile\"") >&5 (eval $ac_compile) 2>&5 ac_status=$? - echo "$as_me:15210: \$? = $ac_status" >&5 + echo "$as_me:16176: \$? = $ac_status" >&5 (exit "$ac_status"); }; then - test -n "$verbose" && echo "$as_me:15212: result: ... $cf_attribute" >&5 + test -n "$verbose" && echo "$as_me:16178: result: ... $cf_attribute" >&5 echo "${ECHO_T}... $cf_attribute" >&6 cat conftest.h >>confdefs.h case "$cf_attribute" in @@ -15272,12 +16238,12 @@ fi if test "x$enable_warnings" = "xyes"; then - ADAFLAGS="$ADAFLAGS -gnatg" + ADAFLAGS="$ADAFLAGS -gnatwa -gnatyg" fi ### use option --enable-assertions to turn on generation of assertion code -echo "$as_me:15280: checking if you want to enable runtime assertions" >&5 +echo "$as_me:16246: checking if you want to enable runtime assertions" >&5 echo $ECHO_N "checking if you want to enable runtime assertions... $ECHO_C" >&6 # Check whether --enable-assertions or --disable-assertions was given. @@ -15287,7 +16253,7 @@ if test "${enable_assertions+set}" = set; then else with_assertions=no fi; -echo "$as_me:15290: result: $with_assertions" >&5 +echo "$as_me:16256: result: $with_assertions" >&5 echo "${ECHO_T}$with_assertions" >&6 if test -n "$GCC" then @@ -15340,7 +16306,7 @@ case "$CFLAGS $CPPFLAGS" in ;; esac -echo "$as_me:15343: checking whether to add trace feature to all models" >&5 +echo "$as_me:16309: checking whether to add trace feature to all models" >&5 echo $ECHO_N "checking whether to add trace feature to all models... $ECHO_C" >&6 # Check whether --with-trace or --without-trace was given. @@ -15350,7 +16316,7 @@ if test "${with_trace+set}" = set; then else cf_with_trace=$cf_all_traces fi; -echo "$as_me:15353: result: $cf_with_trace" >&5 +echo "$as_me:16319: result: $cf_with_trace" >&5 echo "${ECHO_T}$cf_with_trace" >&6 if test "$cf_with_trace" = yes ; then @@ -15458,7 +16424,7 @@ else ADA_TRACE=FALSE fi -echo "$as_me:15461: checking if we want to use GNAT projects" >&5 +echo "$as_me:16427: checking if we want to use GNAT projects" >&5 echo $ECHO_N "checking if we want to use GNAT projects... $ECHO_C" >&6 # Check whether --enable-gnat-projects or --disable-gnat-projects was given. @@ -15475,21 +16441,181 @@ else enable_gnat_projects=yes fi; -echo "$as_me:15478: result: $enable_gnat_projects" >&5 +echo "$as_me:16444: result: $enable_gnat_projects" >&5 echo "${ECHO_T}$enable_gnat_projects" >&6 ### Checks for libraries. case $cf_cv_system_name in (*mingw32*) + +echo "$as_me:16451: checking if ssp library is needed" >&5 +echo $ECHO_N "checking if ssp library is needed... $ECHO_C" >&6 +if test "${cf_cv_need_libssp+set}" = set; then + echo $ECHO_N "(cached) $ECHO_C" >&6 +else + +cat >"conftest.$ac_ext" <<_ACEOF +#line 16458 "configure" +#include "confdefs.h" + +#include <sys/types.h> +#include <dirent.h> + +int +main (void) +{ + + DIR *dp = opendir("."); + + ; + return 0; +} +_ACEOF +rm -f "conftest.$ac_objext" "conftest$ac_exeext" +if { (eval echo "$as_me:16475: \"$ac_link\"") >&5 + (eval $ac_link) 2>&5 + ac_status=$? + echo "$as_me:16478: \$? = $ac_status" >&5 + (exit "$ac_status"); } && + { ac_try='test -s "conftest$ac_exeext"' + { (eval echo "$as_me:16481: \"$ac_try\"") >&5 + (eval $ac_try) 2>&5 + ac_status=$? + echo "$as_me:16484: \$? = $ac_status" >&5 + (exit "$ac_status"); }; }; then + cf_cv_need_libssp=no +else + echo "$as_me: failed program was:" >&5 +cat "conftest.$ac_ext" >&5 + + cf_save_LIBS="$LIBS" + LIBS="$LIBS -lssp" + cat >"conftest.$ac_ext" <<_ACEOF +#line 16494 "configure" +#include "confdefs.h" + +#include <sys/types.h> +#include <dirent.h> + +int +main (void) +{ + + DIR *dp = opendir("."); + + ; + return 0; +} +_ACEOF +rm -f "conftest.$ac_objext" "conftest$ac_exeext" +if { (eval echo "$as_me:16511: \"$ac_link\"") >&5 + (eval $ac_link) 2>&5 + ac_status=$? + echo "$as_me:16514: \$? = $ac_status" >&5 + (exit "$ac_status"); } && + { ac_try='test -s "conftest$ac_exeext"' + { (eval echo "$as_me:16517: \"$ac_try\"") >&5 + (eval $ac_try) 2>&5 + ac_status=$? + echo "$as_me:16520: \$? = $ac_status" >&5 + (exit "$ac_status"); }; }; then + cf_cv_need_libssp=yes +else + echo "$as_me: failed program was:" >&5 +cat "conftest.$ac_ext" >&5 +cf_cv_need_libssp=maybe +fi +rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext" + LIBS="$cf_save_LIBS" + +fi +rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext" +fi +echo "$as_me:16534: result: $cf_cv_need_libssp" >&5 +echo "${ECHO_T}$cf_cv_need_libssp" >&6 + +if test "x$cf_cv_need_libssp" = xyes +then + +cf_add_libs="$LIBS" +# reverse order +cf_add_0lib= +for cf_add_1lib in -lssp; do cf_add_0lib="$cf_add_1lib $cf_add_0lib"; done +# filter duplicates +for cf_add_1lib in $cf_add_0lib; do + for cf_add_2lib in $cf_add_libs; do + if test "x$cf_add_1lib" = "x$cf_add_2lib"; then + cf_add_1lib= + break + fi + done + test -n "$cf_add_1lib" && cf_add_libs="$cf_add_1lib $cf_add_libs" +done +LIBS="$cf_add_libs" + +fi + ;; (*) -echo "$as_me:15486: checking for gettimeofday" >&5 + +echo "$as_me:16561: checking for clock_gettime" >&5 +echo $ECHO_N "checking for clock_gettime... $ECHO_C" >&6 +if test "${cf_cv_func_clock_gettime+set}" = set; then + echo $ECHO_N "(cached) $ECHO_C" >&6 +else + + cat >"conftest.$ac_ext" <<_ACEOF +#line 16568 "configure" +#include "confdefs.h" +#include <time.h> +int +main (void) +{ +struct timespec ts; + int rc = clock_gettime(CLOCK_REALTIME, &ts); (void) rc; (void)ts + ; + return 0; +} +_ACEOF +rm -f "conftest.$ac_objext" "conftest$ac_exeext" +if { (eval echo "$as_me:16581: \"$ac_link\"") >&5 + (eval $ac_link) 2>&5 + ac_status=$? + echo "$as_me:16584: \$? = $ac_status" >&5 + (exit "$ac_status"); } && + { ac_try='test -s "conftest$ac_exeext"' + { (eval echo "$as_me:16587: \"$ac_try\"") >&5 + (eval $ac_try) 2>&5 + ac_status=$? + echo "$as_me:16590: \$? = $ac_status" >&5 + (exit "$ac_status"); }; }; then + cf_cv_func_clock_gettime=yes +else + echo "$as_me: failed program was:" >&5 +cat "conftest.$ac_ext" >&5 +cf_cv_func_clock_gettime=no +fi +rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext" + +fi +echo "$as_me:16601: result: $cf_cv_func_clock_gettime" >&5 +echo "${ECHO_T}$cf_cv_func_clock_gettime" >&6 + +if test "$cf_cv_func_clock_gettime" = yes +then + +cat >>confdefs.h <<\EOF +#define HAVE_CLOCK_GETTIME 1 +EOF + +else +echo "$as_me:16612: checking for gettimeofday" >&5 echo $ECHO_N "checking for gettimeofday... $ECHO_C" >&6 if test "${ac_cv_func_gettimeofday+set}" = set; then echo $ECHO_N "(cached) $ECHO_C" >&6 else cat >"conftest.$ac_ext" <<_ACEOF -#line 15492 "configure" +#line 16618 "configure" #include "confdefs.h" #define gettimeofday autoconf_temporary #include <limits.h> /* least-intrusive standard header which defines gcc2 __stub macros */ @@ -15520,16 +16646,16 @@ main (void) } _ACEOF rm -f "conftest.$ac_objext" "conftest$ac_exeext" -if { (eval echo "$as_me:15523: \"$ac_link\"") >&5 +if { (eval echo "$as_me:16649: \"$ac_link\"") >&5 (eval $ac_link) 2>&5 ac_status=$? - echo "$as_me:15526: \$? = $ac_status" >&5 + echo "$as_me:16652: \$? = $ac_status" >&5 (exit "$ac_status"); } && { ac_try='test -s "conftest$ac_exeext"' - { (eval echo "$as_me:15529: \"$ac_try\"") >&5 + { (eval echo "$as_me:16655: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? - echo "$as_me:15532: \$? = $ac_status" >&5 + echo "$as_me:16658: \$? = $ac_status" >&5 (exit "$ac_status"); }; }; then ac_cv_func_gettimeofday=yes else @@ -15539,16 +16665,17 @@ ac_cv_func_gettimeofday=no fi rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext" fi -echo "$as_me:15542: result: $ac_cv_func_gettimeofday" >&5 +echo "$as_me:16668: result: $ac_cv_func_gettimeofday" >&5 echo "${ECHO_T}$ac_cv_func_gettimeofday" >&6 if test "$ac_cv_func_gettimeofday" = yes; then - cat >>confdefs.h <<\EOF + +cat >>confdefs.h <<\EOF #define HAVE_GETTIMEOFDAY 1 EOF else -echo "$as_me:15551: checking for gettimeofday in -lbsd" >&5 +echo "$as_me:16678: checking for gettimeofday in -lbsd" >&5 echo $ECHO_N "checking for gettimeofday in -lbsd... $ECHO_C" >&6 if test "${ac_cv_lib_bsd_gettimeofday+set}" = set; then echo $ECHO_N "(cached) $ECHO_C" >&6 @@ -15556,7 +16683,7 @@ else ac_check_lib_save_LIBS=$LIBS LIBS="-lbsd $LIBS" cat >"conftest.$ac_ext" <<_ACEOF -#line 15559 "configure" +#line 16686 "configure" #include "confdefs.h" /* Override any gcc2 internal prototype to avoid an error. */ @@ -15565,7 +16692,7 @@ extern "C" #endif /* We use char because int might match the return type of a gcc2 builtin and then its argument prototype would still apply. */ -char gettimeofday (); +char gettimeofday (void); int main (void) { @@ -15575,16 +16702,16 @@ gettimeofday (); } _ACEOF rm -f "conftest.$ac_objext" "conftest$ac_exeext" -if { (eval echo "$as_me:15578: \"$ac_link\"") >&5 +if { (eval echo "$as_me:16705: \"$ac_link\"") >&5 (eval $ac_link) 2>&5 ac_status=$? - echo "$as_me:15581: \$? = $ac_status" >&5 + echo "$as_me:16708: \$? = $ac_status" >&5 (exit "$ac_status"); } && { ac_try='test -s "conftest$ac_exeext"' - { (eval echo "$as_me:15584: \"$ac_try\"") >&5 + { (eval echo "$as_me:16711: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? - echo "$as_me:15587: \$? = $ac_status" >&5 + echo "$as_me:16714: \$? = $ac_status" >&5 (exit "$ac_status"); }; }; then ac_cv_lib_bsd_gettimeofday=yes else @@ -15595,7 +16722,7 @@ fi rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext" LIBS=$ac_check_lib_save_LIBS fi -echo "$as_me:15598: result: $ac_cv_lib_bsd_gettimeofday" >&5 +echo "$as_me:16725: result: $ac_cv_lib_bsd_gettimeofday" >&5 echo "${ECHO_T}$ac_cv_lib_bsd_gettimeofday" >&6 if test "$ac_cv_lib_bsd_gettimeofday" = yes; then @@ -15603,206 +16730,38 @@ cat >>confdefs.h <<\EOF #define HAVE_GETTIMEOFDAY 1 EOF - LIBS="$LIBS -lbsd" -fi - -fi - ;; -esac - -### Checks for header files. -echo "$as_me:15614: 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 15620 "configure" -#include "confdefs.h" -#include <stdlib.h> -#include <stdarg.h> -#include <string.h> -#include <float.h> - -_ACEOF -if { (eval echo "$as_me:15628: \"$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:15634: \$? = $ac_status" >&5 - (exit "$ac_status"); } >/dev/null; then - if test -s conftest.err; then - ac_cpp_err=$ac_c_preproc_warn_flag - else - ac_cpp_err= - fi -else - ac_cpp_err=yes -fi -if test -z "$ac_cpp_err"; then - ac_cv_header_stdc=yes -else - echo "$as_me: failed program was:" >&5 - cat "conftest.$ac_ext" >&5 - ac_cv_header_stdc=no -fi -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 15656 "configure" -#include "confdefs.h" -#include <string.h> - -_ACEOF -if (eval "$ac_cpp conftest.$ac_ext") 2>&5 | - $EGREP "memchr" >/dev/null 2>&1; then - : -else - ac_cv_header_stdc=no -fi -rm -rf conftest* - -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 15674 "configure" -#include "confdefs.h" -#include <stdlib.h> - -_ACEOF -if (eval "$ac_cpp conftest.$ac_ext") 2>&5 | - $EGREP "free" >/dev/null 2>&1; then - : -else - ac_cv_header_stdc=no -fi -rm -rf conftest* - -fi - -if test $ac_cv_header_stdc = yes; then - # /bin/cc in Irix-4.0.5 gets non-ANSI ctype macros unless using -ansi. - if test "$cross_compiling" = yes; then - : -else - cat >"conftest.$ac_ext" <<_ACEOF -#line 15695 "configure" -#include "confdefs.h" -#include <ctype.h> -#if ((' ' & 0x0FF) == 0x020) -# define ISLOWER(c) ('a' <= (c) && (c) <= 'z') -# define TOUPPER(c) (ISLOWER(c) ? 'A' + ((c) - 'a') : (c)) -#else -# define ISLOWER(c) (('a' <= (c) && (c) <= 'i') \ - || ('j' <= (c) && (c) <= 'r') \ - || ('s' <= (c) && (c) <= 'z')) -# define TOUPPER(c) (ISLOWER(c) ? ((c) | 0x40) : (c)) -#endif - -#define XOR(e, f) (((e) && !(f)) || (!(e) && (f))) -int -main (void) -{ - int i; - for (i = 0; i < 256; i++) - if (XOR (islower (i), ISLOWER (i)) - || toupper (i) != TOUPPER (i)) - $ac_main_return(2); - $ac_main_return (0); -} -_ACEOF -rm -f "conftest$ac_exeext" -if { (eval echo "$as_me:15721: \"$ac_link\"") >&5 - (eval $ac_link) 2>&5 - ac_status=$? - echo "$as_me:15724: \$? = $ac_status" >&5 - (exit "$ac_status"); } && { ac_try='"./conftest$ac_exeext"' - { (eval echo "$as_me:15726: \"$ac_try\"") >&5 - (eval $ac_try) 2>&5 - ac_status=$? - echo "$as_me:15729: \$? = $ac_status" >&5 - (exit "$ac_status"); }; }; then - : -else - echo "$as_me: program exited with status $ac_status" >&5 -echo "$as_me: failed program was:" >&5 -cat "conftest.$ac_ext" >&5 -ac_cv_header_stdc=no -fi -rm -f core ./core.* ./*.core "conftest$ac_exeext" "conftest.$ac_objext" "conftest.$ac_ext" -fi -fi -fi -echo "$as_me:15742: result: $ac_cv_header_stdc" >&5 -echo "${ECHO_T}$ac_cv_header_stdc" >&6 -if test $ac_cv_header_stdc = yes; then - -cat >>confdefs.h <<\EOF -#define STDC_HEADERS 1 -EOF +cf_add_libs="$LIBS" +# reverse order +cf_add_0lib= +for cf_add_1lib in -lbsd; do cf_add_0lib="$cf_add_1lib $cf_add_0lib"; done +# filter duplicates +for cf_add_1lib in $cf_add_0lib; do + for cf_add_2lib in $cf_add_libs; do + if test "x$cf_add_1lib" = "x$cf_add_2lib"; then + cf_add_1lib= + break + fi + done + test -n "$cf_add_1lib" && cf_add_libs="$cf_add_1lib $cf_add_libs" +done +LIBS="$cf_add_libs" fi -# On IRIX 5.3, sys/types and inttypes.h are conflicting. - -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:15758: 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 15764 "configure" -#include "confdefs.h" -$ac_includes_default -#include <$ac_header> -_ACEOF -rm -f "conftest.$ac_objext" -if { (eval echo "$as_me:15770: \"$ac_compile\"") >&5 - (eval $ac_compile) 2>&5 - ac_status=$? - echo "$as_me:15773: \$? = $ac_status" >&5 - (exit "$ac_status"); } && - { ac_try='test -s "conftest.$ac_objext"' - { (eval echo "$as_me:15776: \"$ac_try\"") >&5 - (eval $ac_try) 2>&5 - ac_status=$? - echo "$as_me:15779: \$? = $ac_status" >&5 - (exit "$ac_status"); }; }; then - eval "$as_ac_Header=yes" -else - echo "$as_me: failed program was:" >&5 -cat "conftest.$ac_ext" >&5 -eval "$as_ac_Header=no" fi -rm -f "conftest.$ac_objext" "conftest.$ac_ext" fi -echo "$as_me:15789: 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 -#define `echo "HAVE_$ac_header" | $as_tr_cpp` 1 -EOF -fi -done + ;; +esac -echo "$as_me:15799: checking for signed char" >&5 +### Checks for header files. +echo "$as_me:16758: checking for signed char" >&5 echo $ECHO_N "checking for signed char... $ECHO_C" >&6 if test "${ac_cv_type_signed_char+set}" = set; then echo $ECHO_N "(cached) $ECHO_C" >&6 else cat >"conftest.$ac_ext" <<_ACEOF -#line 15805 "configure" +#line 16764 "configure" #include "confdefs.h" $ac_includes_default int @@ -15817,16 +16776,16 @@ if (sizeof (signed char)) } _ACEOF rm -f "conftest.$ac_objext" -if { (eval echo "$as_me:15820: \"$ac_compile\"") >&5 +if { (eval echo "$as_me:16779: \"$ac_compile\"") >&5 (eval $ac_compile) 2>&5 ac_status=$? - echo "$as_me:15823: \$? = $ac_status" >&5 + echo "$as_me:16782: \$? = $ac_status" >&5 (exit "$ac_status"); } && { ac_try='test -s "conftest.$ac_objext"' - { (eval echo "$as_me:15826: \"$ac_try\"") >&5 + { (eval echo "$as_me:16785: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? - echo "$as_me:15829: \$? = $ac_status" >&5 + echo "$as_me:16788: \$? = $ac_status" >&5 (exit "$ac_status"); }; }; then ac_cv_type_signed_char=yes else @@ -15836,10 +16795,10 @@ ac_cv_type_signed_char=no fi rm -f "conftest.$ac_objext" "conftest.$ac_ext" fi -echo "$as_me:15839: result: $ac_cv_type_signed_char" >&5 +echo "$as_me:16798: result: $ac_cv_type_signed_char" >&5 echo "${ECHO_T}$ac_cv_type_signed_char" >&6 -echo "$as_me:15842: checking size of signed char" >&5 +echo "$as_me:16801: checking size of signed char" >&5 echo $ECHO_N "checking size of signed char... $ECHO_C" >&6 if test "${ac_cv_sizeof_signed_char+set}" = set; then echo $ECHO_N "(cached) $ECHO_C" >&6 @@ -15848,7 +16807,7 @@ else if test "$cross_compiling" = yes; then # Depending upon the size, compute the lo and hi bounds. cat >"conftest.$ac_ext" <<_ACEOF -#line 15851 "configure" +#line 16810 "configure" #include "confdefs.h" $ac_includes_default int @@ -15860,21 +16819,21 @@ int _array_ [1 - 2 * !((sizeof (signed char)) >= 0)] } _ACEOF rm -f "conftest.$ac_objext" -if { (eval echo "$as_me:15863: \"$ac_compile\"") >&5 +if { (eval echo "$as_me:16822: \"$ac_compile\"") >&5 (eval $ac_compile) 2>&5 ac_status=$? - echo "$as_me:15866: \$? = $ac_status" >&5 + echo "$as_me:16825: \$? = $ac_status" >&5 (exit "$ac_status"); } && { ac_try='test -s "conftest.$ac_objext"' - { (eval echo "$as_me:15869: \"$ac_try\"") >&5 + { (eval echo "$as_me:16828: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? - echo "$as_me:15872: \$? = $ac_status" >&5 + echo "$as_me:16831: \$? = $ac_status" >&5 (exit "$ac_status"); }; }; then ac_lo=0 ac_mid=0 while :; do cat >"conftest.$ac_ext" <<_ACEOF -#line 15877 "configure" +#line 16836 "configure" #include "confdefs.h" $ac_includes_default int @@ -15886,16 +16845,16 @@ int _array_ [1 - 2 * !((sizeof (signed char)) <= $ac_mid)] } _ACEOF rm -f "conftest.$ac_objext" -if { (eval echo "$as_me:15889: \"$ac_compile\"") >&5 +if { (eval echo "$as_me:16848: \"$ac_compile\"") >&5 (eval $ac_compile) 2>&5 ac_status=$? - echo "$as_me:15892: \$? = $ac_status" >&5 + echo "$as_me:16851: \$? = $ac_status" >&5 (exit "$ac_status"); } && { ac_try='test -s "conftest.$ac_objext"' - { (eval echo "$as_me:15895: \"$ac_try\"") >&5 + { (eval echo "$as_me:16854: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? - echo "$as_me:15898: \$? = $ac_status" >&5 + echo "$as_me:16857: \$? = $ac_status" >&5 (exit "$ac_status"); }; }; then ac_hi=$ac_mid; break else @@ -15911,7 +16870,7 @@ cat "conftest.$ac_ext" >&5 ac_hi=-1 ac_mid=-1 while :; do cat >"conftest.$ac_ext" <<_ACEOF -#line 15914 "configure" +#line 16873 "configure" #include "confdefs.h" $ac_includes_default int @@ -15923,16 +16882,16 @@ int _array_ [1 - 2 * !((sizeof (signed char)) >= $ac_mid)] } _ACEOF rm -f "conftest.$ac_objext" -if { (eval echo "$as_me:15926: \"$ac_compile\"") >&5 +if { (eval echo "$as_me:16885: \"$ac_compile\"") >&5 (eval $ac_compile) 2>&5 ac_status=$? - echo "$as_me:15929: \$? = $ac_status" >&5 + echo "$as_me:16888: \$? = $ac_status" >&5 (exit "$ac_status"); } && { ac_try='test -s "conftest.$ac_objext"' - { (eval echo "$as_me:15932: \"$ac_try\"") >&5 + { (eval echo "$as_me:16891: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? - echo "$as_me:15935: \$? = $ac_status" >&5 + echo "$as_me:16894: \$? = $ac_status" >&5 (exit "$ac_status"); }; }; then ac_lo=$ac_mid; break else @@ -15948,7 +16907,7 @@ rm -f "conftest.$ac_objext" "conftest.$ac_ext" while test "x$ac_lo" != "x$ac_hi"; do ac_mid=`expr '(' "$ac_hi" - "$ac_lo" ')' / 2 + "$ac_lo"` cat >"conftest.$ac_ext" <<_ACEOF -#line 15951 "configure" +#line 16910 "configure" #include "confdefs.h" $ac_includes_default int @@ -15960,16 +16919,16 @@ int _array_ [1 - 2 * !((sizeof (signed char)) <= $ac_mid)] } _ACEOF rm -f "conftest.$ac_objext" -if { (eval echo "$as_me:15963: \"$ac_compile\"") >&5 +if { (eval echo "$as_me:16922: \"$ac_compile\"") >&5 (eval $ac_compile) 2>&5 ac_status=$? - echo "$as_me:15966: \$? = $ac_status" >&5 + echo "$as_me:16925: \$? = $ac_status" >&5 (exit "$ac_status"); } && { ac_try='test -s "conftest.$ac_objext"' - { (eval echo "$as_me:15969: \"$ac_try\"") >&5 + { (eval echo "$as_me:16928: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? - echo "$as_me:15972: \$? = $ac_status" >&5 + echo "$as_me:16931: \$? = $ac_status" >&5 (exit "$ac_status"); }; }; then ac_hi=$ac_mid else @@ -15982,12 +16941,12 @@ done ac_cv_sizeof_signed_char=$ac_lo else if test "$cross_compiling" = yes; then - { { echo "$as_me:15985: error: cannot run test program while cross compiling" >&5 + { { echo "$as_me:16944: error: cannot run test program while cross compiling" >&5 echo "$as_me: error: cannot run test program while cross compiling" >&2;} { (exit 1); exit 1; }; } else cat >"conftest.$ac_ext" <<_ACEOF -#line 15990 "configure" +#line 16949 "configure" #include "confdefs.h" $ac_includes_default int @@ -15996,22 +16955,22 @@ main (void) FILE *f = fopen ("conftest.val", "w"); if (!f) $ac_main_return (1); -fprintf (f, "%d", (sizeof (signed char))); +fprintf (f, "%ld", (long)(sizeof (signed char))); fclose (f); ; return 0; } _ACEOF rm -f "conftest$ac_exeext" -if { (eval echo "$as_me:16006: \"$ac_link\"") >&5 +if { (eval echo "$as_me:16965: \"$ac_link\"") >&5 (eval $ac_link) 2>&5 ac_status=$? - echo "$as_me:16009: \$? = $ac_status" >&5 + echo "$as_me:16968: \$? = $ac_status" >&5 (exit "$ac_status"); } && { ac_try='"./conftest$ac_exeext"' - { (eval echo "$as_me:16011: \"$ac_try\"") >&5 + { (eval echo "$as_me:16970: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? - echo "$as_me:16014: \$? = $ac_status" >&5 + echo "$as_me:16973: \$? = $ac_status" >&5 (exit "$ac_status"); }; }; then ac_cv_sizeof_signed_char=`cat conftest.val` else @@ -16027,160 +16986,22 @@ else ac_cv_sizeof_signed_char=0 fi fi -echo "$as_me:16030: result: $ac_cv_sizeof_signed_char" >&5 +echo "$as_me:16989: result: $ac_cv_sizeof_signed_char" >&5 echo "${ECHO_T}$ac_cv_sizeof_signed_char" >&6 cat >>confdefs.h <<EOF #define SIZEOF_SIGNED_CHAR $ac_cv_sizeof_signed_char EOF -echo "$as_me:16036: 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 16042 "configure" -#include "confdefs.h" -#include <stdlib.h> -#include <stdarg.h> -#include <string.h> -#include <float.h> - -_ACEOF -if { (eval echo "$as_me:16050: \"$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:16056: \$? = $ac_status" >&5 - (exit "$ac_status"); } >/dev/null; then - if test -s conftest.err; then - ac_cpp_err=$ac_c_preproc_warn_flag - else - ac_cpp_err= - fi -else - ac_cpp_err=yes -fi -if test -z "$ac_cpp_err"; then - ac_cv_header_stdc=yes -else - echo "$as_me: failed program was:" >&5 - cat "conftest.$ac_ext" >&5 - ac_cv_header_stdc=no -fi -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 16078 "configure" -#include "confdefs.h" -#include <string.h> - -_ACEOF -if (eval "$ac_cpp conftest.$ac_ext") 2>&5 | - $EGREP "memchr" >/dev/null 2>&1; then - : -else - ac_cv_header_stdc=no -fi -rm -rf conftest* - -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 16096 "configure" -#include "confdefs.h" -#include <stdlib.h> - -_ACEOF -if (eval "$ac_cpp conftest.$ac_ext") 2>&5 | - $EGREP "free" >/dev/null 2>&1; then - : -else - ac_cv_header_stdc=no -fi -rm -rf conftest* - -fi - -if test $ac_cv_header_stdc = yes; then - # /bin/cc in Irix-4.0.5 gets non-ANSI ctype macros unless using -ansi. - if test "$cross_compiling" = yes; then - : -else - cat >"conftest.$ac_ext" <<_ACEOF -#line 16117 "configure" -#include "confdefs.h" -#include <ctype.h> -#if ((' ' & 0x0FF) == 0x020) -# define ISLOWER(c) ('a' <= (c) && (c) <= 'z') -# define TOUPPER(c) (ISLOWER(c) ? 'A' + ((c) - 'a') : (c)) -#else -# define ISLOWER(c) (('a' <= (c) && (c) <= 'i') \ - || ('j' <= (c) && (c) <= 'r') \ - || ('s' <= (c) && (c) <= 'z')) -# define TOUPPER(c) (ISLOWER(c) ? ((c) | 0x40) : (c)) -#endif - -#define XOR(e, f) (((e) && !(f)) || (!(e) && (f))) -int -main (void) -{ - int i; - for (i = 0; i < 256; i++) - if (XOR (islower (i), ISLOWER (i)) - || toupper (i) != TOUPPER (i)) - $ac_main_return(2); - $ac_main_return (0); -} -_ACEOF -rm -f "conftest$ac_exeext" -if { (eval echo "$as_me:16143: \"$ac_link\"") >&5 - (eval $ac_link) 2>&5 - ac_status=$? - echo "$as_me:16146: \$? = $ac_status" >&5 - (exit "$ac_status"); } && { ac_try='"./conftest$ac_exeext"' - { (eval echo "$as_me:16148: \"$ac_try\"") >&5 - (eval $ac_try) 2>&5 - ac_status=$? - echo "$as_me:16151: \$? = $ac_status" >&5 - (exit "$ac_status"); }; }; then - : -else - echo "$as_me: program exited with status $ac_status" >&5 -echo "$as_me: failed program was:" >&5 -cat "conftest.$ac_ext" >&5 -ac_cv_header_stdc=no -fi -rm -f core ./core.* ./*.core "conftest$ac_exeext" "conftest.$ac_objext" "conftest.$ac_ext" -fi -fi -fi -echo "$as_me:16164: result: $ac_cv_header_stdc" >&5 -echo "${ECHO_T}$ac_cv_header_stdc" >&6 -if test $ac_cv_header_stdc = yes; then - -cat >>confdefs.h <<\EOF -#define STDC_HEADERS 1 -EOF - -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:16177: checking for $ac_hdr that defines DIR" >&5 +echo "$as_me:16998: 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 16183 "configure" +#line 17004 "configure" #include "confdefs.h" #include <sys/types.h> #include <$ac_hdr> @@ -16195,16 +17016,16 @@ return 0; } _ACEOF rm -f "conftest.$ac_objext" -if { (eval echo "$as_me:16198: \"$ac_compile\"") >&5 +if { (eval echo "$as_me:17019: \"$ac_compile\"") >&5 (eval $ac_compile) 2>&5 ac_status=$? - echo "$as_me:16201: \$? = $ac_status" >&5 + echo "$as_me:17022: \$? = $ac_status" >&5 (exit "$ac_status"); } && { ac_try='test -s "conftest.$ac_objext"' - { (eval echo "$as_me:16204: \"$ac_try\"") >&5 + { (eval echo "$as_me:17025: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? - echo "$as_me:16207: \$? = $ac_status" >&5 + echo "$as_me:17028: \$? = $ac_status" >&5 (exit "$ac_status"); }; }; then eval "$as_ac_Header=yes" else @@ -16214,7 +17035,7 @@ eval "$as_ac_Header=no" fi rm -f "conftest.$ac_objext" "conftest.$ac_ext" fi -echo "$as_me:16217: result: `eval echo '${'"$as_ac_Header"'}'`" >&5 +echo "$as_me:17038: 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 @@ -16227,7 +17048,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:16230: checking for opendir in -ldir" >&5 + echo "$as_me:17051: 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 @@ -16235,7 +17056,7 @@ else ac_check_lib_save_LIBS=$LIBS LIBS="-ldir $LIBS" cat >"conftest.$ac_ext" <<_ACEOF -#line 16238 "configure" +#line 17059 "configure" #include "confdefs.h" /* Override any gcc2 internal prototype to avoid an error. */ @@ -16244,7 +17065,7 @@ extern "C" #endif /* We use char because int might match the return type of a gcc2 builtin and then its argument prototype would still apply. */ -char opendir (); +char opendir (void); int main (void) { @@ -16254,16 +17075,16 @@ opendir (); } _ACEOF rm -f "conftest.$ac_objext" "conftest$ac_exeext" -if { (eval echo "$as_me:16257: \"$ac_link\"") >&5 +if { (eval echo "$as_me:17078: \"$ac_link\"") >&5 (eval $ac_link) 2>&5 ac_status=$? - echo "$as_me:16260: \$? = $ac_status" >&5 + echo "$as_me:17081: \$? = $ac_status" >&5 (exit "$ac_status"); } && { ac_try='test -s "conftest$ac_exeext"' - { (eval echo "$as_me:16263: \"$ac_try\"") >&5 + { (eval echo "$as_me:17084: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? - echo "$as_me:16266: \$? = $ac_status" >&5 + echo "$as_me:17087: \$? = $ac_status" >&5 (exit "$ac_status"); }; }; then ac_cv_lib_dir_opendir=yes else @@ -16274,14 +17095,14 @@ fi rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext" LIBS=$ac_check_lib_save_LIBS fi -echo "$as_me:16277: result: $ac_cv_lib_dir_opendir" >&5 +echo "$as_me:17098: 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:16284: checking for opendir in -lx" >&5 + echo "$as_me:17105: 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 @@ -16289,7 +17110,7 @@ else ac_check_lib_save_LIBS=$LIBS LIBS="-lx $LIBS" cat >"conftest.$ac_ext" <<_ACEOF -#line 16292 "configure" +#line 17113 "configure" #include "confdefs.h" /* Override any gcc2 internal prototype to avoid an error. */ @@ -16298,7 +17119,7 @@ extern "C" #endif /* We use char because int might match the return type of a gcc2 builtin and then its argument prototype would still apply. */ -char opendir (); +char opendir (void); int main (void) { @@ -16308,16 +17129,16 @@ opendir (); } _ACEOF rm -f "conftest.$ac_objext" "conftest$ac_exeext" -if { (eval echo "$as_me:16311: \"$ac_link\"") >&5 +if { (eval echo "$as_me:17132: \"$ac_link\"") >&5 (eval $ac_link) 2>&5 ac_status=$? - echo "$as_me:16314: \$? = $ac_status" >&5 + echo "$as_me:17135: \$? = $ac_status" >&5 (exit "$ac_status"); } && { ac_try='test -s "conftest$ac_exeext"' - { (eval echo "$as_me:16317: \"$ac_try\"") >&5 + { (eval echo "$as_me:17138: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? - echo "$as_me:16320: \$? = $ac_status" >&5 + echo "$as_me:17141: \$? = $ac_status" >&5 (exit "$ac_status"); }; }; then ac_cv_lib_x_opendir=yes else @@ -16328,7 +17149,7 @@ fi rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext" LIBS=$ac_check_lib_save_LIBS fi -echo "$as_me:16331: result: $ac_cv_lib_x_opendir" >&5 +echo "$as_me:17152: 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" @@ -16336,13 +17157,13 @@ fi fi -echo "$as_me:16339: checking whether time.h and sys/time.h may both be included" >&5 +echo "$as_me:17160: 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 16345 "configure" +#line 17166 "configure" #include "confdefs.h" #include <sys/types.h> #include <sys/time.h> @@ -16358,16 +17179,16 @@ return 0; } _ACEOF rm -f "conftest.$ac_objext" -if { (eval echo "$as_me:16361: \"$ac_compile\"") >&5 +if { (eval echo "$as_me:17182: \"$ac_compile\"") >&5 (eval $ac_compile) 2>&5 ac_status=$? - echo "$as_me:16364: \$? = $ac_status" >&5 + echo "$as_me:17185: \$? = $ac_status" >&5 (exit "$ac_status"); } && { ac_try='test -s "conftest.$ac_objext"' - { (eval echo "$as_me:16367: \"$ac_try\"") >&5 + { (eval echo "$as_me:17188: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? - echo "$as_me:16370: \$? = $ac_status" >&5 + echo "$as_me:17191: \$? = $ac_status" >&5 (exit "$ac_status"); }; }; then ac_cv_header_time=yes else @@ -16377,7 +17198,7 @@ ac_cv_header_time=no fi rm -f "conftest.$ac_objext" "conftest.$ac_ext" fi -echo "$as_me:16380: result: $ac_cv_header_time" >&5 +echo "$as_me:17201: result: $ac_cv_header_time" >&5 echo "${ECHO_T}$ac_cv_header_time" >&6 if test $ac_cv_header_time = yes; then @@ -16395,13 +17216,13 @@ ac_link='$CC -o "conftest$ac_exeext" $CFLAGS $CPPFLAGS $LDFLAGS "conftest.$ac_ex ac_compiler_gnu=$ac_cv_c_compiler_gnu ac_main_return="return" -echo "$as_me:16398: checking for an ANSI C-conforming const" >&5 +echo "$as_me:17219: checking for an ANSI C-conforming const" >&5 echo $ECHO_N "checking for an ANSI C-conforming const... $ECHO_C" >&6 if test "${ac_cv_c_const+set}" = set; then echo $ECHO_N "(cached) $ECHO_C" >&6 else cat >"conftest.$ac_ext" <<_ACEOF -#line 16404 "configure" +#line 17225 "configure" #include "confdefs.h" int @@ -16411,13 +17232,13 @@ main (void) #ifndef __cplusplus /* Ultrix mips cc rejects this. */ typedef int charset[2]; - const charset x; + const charset x; (void)x; /* SunOS 4.1.1 cc rejects this. */ char const *const *ccp; char **p; /* NEC SVR4.0.2 mips cc rejects this. */ struct point {int x, y;}; - static struct point const zero = {0,0}; + static struct point const zero = {0,0}; (void)zero; /* AIX XL C 1.02.0.0 rejects this. It does not let you subtract one const X* pointer from another in an arm of an if-expression whose if-part is not a constant @@ -16433,16 +17254,19 @@ main (void) char const *s = 0 ? (char *) 0 : (char const *) 0; *t++ = 0; + (void)s; } { /* Someone thinks the Sun supposedly-ANSI compiler will reject this. */ int x[] = {25, 17}; const int *foo = &x[0]; ++foo; + (void)foo; } { /* Sun SC1.0 ANSI compiler rejects this -- but not the above. */ typedef const int *iptr; iptr p = 0; ++p; + (void)p; } { /* AIX XL C 1.02.0.0 rejects this saying "k.c", line 2.27: 1506-025 (S) Operand must be a modifiable lvalue. */ @@ -16451,6 +17275,7 @@ main (void) } { /* ULTRIX-32 V3.1 (Rev 9) vcc rejects this */ const int foo = 10; + (void)foo; } #endif @@ -16459,16 +17284,16 @@ main (void) } _ACEOF rm -f "conftest.$ac_objext" -if { (eval echo "$as_me:16462: \"$ac_compile\"") >&5 +if { (eval echo "$as_me:17287: \"$ac_compile\"") >&5 (eval $ac_compile) 2>&5 ac_status=$? - echo "$as_me:16465: \$? = $ac_status" >&5 + echo "$as_me:17290: \$? = $ac_status" >&5 (exit "$ac_status"); } && { ac_try='test -s "conftest.$ac_objext"' - { (eval echo "$as_me:16468: \"$ac_try\"") >&5 + { (eval echo "$as_me:17293: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? - echo "$as_me:16471: \$? = $ac_status" >&5 + echo "$as_me:17296: \$? = $ac_status" >&5 (exit "$ac_status"); }; }; then ac_cv_c_const=yes else @@ -16478,7 +17303,7 @@ ac_cv_c_const=no fi rm -f "conftest.$ac_objext" "conftest.$ac_ext" fi -echo "$as_me:16481: result: $ac_cv_c_const" >&5 +echo "$as_me:17306: result: $ac_cv_c_const" >&5 echo "${ECHO_T}$ac_cv_c_const" >&6 if test $ac_cv_c_const = no; then @@ -16490,7 +17315,7 @@ fi ### Checks for external-data -echo "$as_me:16493: checking if data-only library module links" >&5 +echo "$as_me:17318: checking if data-only library module links" >&5 echo $ECHO_N "checking if data-only library module links... $ECHO_C" >&6 if test "${cf_cv_link_dataonly+set}" = set; then echo $ECHO_N "(cached) $ECHO_C" >&6 @@ -16498,36 +17323,40 @@ else rm -f conftest.a cat >conftest.$ac_ext <<EOF -#line 16501 "configure" +#line 17326 "configure" int testdata[3] = { 123, 456, 789 }; EOF - if { (eval echo "$as_me:16504: \"$ac_compile\"") >&5 + if { (eval echo "$as_me:17329: \"$ac_compile\"") >&5 (eval $ac_compile) 2>&5 ac_status=$? - echo "$as_me:16507: \$? = $ac_status" >&5 + echo "$as_me:17332: \$? = $ac_status" >&5 (exit "$ac_status"); } ; then mv conftest.o data.o && \ ( $AR $ARFLAGS conftest.a data.o ) 2>&5 1>/dev/null fi rm -f conftest.$ac_ext data.o cat >conftest.$ac_ext <<EOF -#line 16514 "configure" +#line 17339 "configure" +extern int testfunc(void); +#if defined(NeXT) int testfunc(void) { -#if defined(NeXT) ${cf_cv_main_return:-return}(1); /* I'm told this linker is broken */ +} #else - extern int testdata[3]; +extern int testdata[3]; +int testfunc(void) +{ return testdata[0] == 123 && testdata[1] == 456 && testdata[2] == 789; -#endif } +#endif EOF - if { (eval echo "$as_me:16527: \"$ac_compile\"") >&5 + if { (eval echo "$as_me:17356: \"$ac_compile\"") >&5 (eval $ac_compile) 2>&5 ac_status=$? - echo "$as_me:16530: \$? = $ac_status" >&5 + echo "$as_me:17359: \$? = $ac_status" >&5 (exit "$ac_status"); }; then mv conftest.o func.o && \ ( $AR $ARFLAGS conftest.a func.o ) 2>&5 1>/dev/null @@ -16540,26 +17369,26 @@ EOF cf_cv_link_dataonly=unknown else cat >"conftest.$ac_ext" <<_ACEOF -#line 16543 "configure" +#line 17372 "configure" #include "confdefs.h" + extern int testfunc(void); int main(void) { - extern int testfunc(); ${cf_cv_main_return:-return} (!testfunc()); } _ACEOF rm -f "conftest$ac_exeext" -if { (eval echo "$as_me:16554: \"$ac_link\"") >&5 +if { (eval echo "$as_me:17383: \"$ac_link\"") >&5 (eval $ac_link) 2>&5 ac_status=$? - echo "$as_me:16557: \$? = $ac_status" >&5 + echo "$as_me:17386: \$? = $ac_status" >&5 (exit "$ac_status"); } && { ac_try='"./conftest$ac_exeext"' - { (eval echo "$as_me:16559: \"$ac_try\"") >&5 + { (eval echo "$as_me:17388: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? - echo "$as_me:16562: \$? = $ac_status" >&5 + echo "$as_me:17391: \$? = $ac_status" >&5 (exit "$ac_status"); }; }; then cf_cv_link_dataonly=yes else @@ -16574,7 +17403,7 @@ fi fi -echo "$as_me:16577: result: $cf_cv_link_dataonly" >&5 +echo "$as_me:17406: result: $cf_cv_link_dataonly" >&5 echo "${ECHO_T}$cf_cv_link_dataonly" >&6 if test "$cf_cv_link_dataonly" = no ; then @@ -16593,23 +17422,23 @@ unistd.h \ do as_ac_Header=`echo "ac_cv_header_$ac_header" | $as_tr_sh` -echo "$as_me:16596: checking for $ac_header" >&5 +echo "$as_me:17425: 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 16602 "configure" +#line 17431 "configure" #include "confdefs.h" #include <$ac_header> _ACEOF -if { (eval echo "$as_me:16606: \"$ac_cpp "conftest.$ac_ext"\"") >&5 +if { (eval echo "$as_me:17435: \"$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:16612: \$? = $ac_status" >&5 + echo "$as_me:17441: \$? = $ac_status" >&5 (exit "$ac_status"); } >/dev/null; then if test -s conftest.err; then ac_cpp_err=$ac_c_preproc_warn_flag @@ -16628,7 +17457,7 @@ else fi rm -f conftest.err "conftest.$ac_ext" fi -echo "$as_me:16631: result: `eval echo '${'"$as_ac_Header"'}'`" >&5 +echo "$as_me:17460: 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 @@ -16638,7 +17467,7 @@ EOF fi done -echo "$as_me:16641: checking for working mkstemp" >&5 +echo "$as_me:17470: checking for working mkstemp" >&5 echo $ECHO_N "checking for working mkstemp... $ECHO_C" >&6 if test "${cf_cv_func_mkstemp+set}" = set; then echo $ECHO_N "(cached) $ECHO_C" >&6 @@ -16649,20 +17478,14 @@ if test "$cross_compiling" = yes; then cf_cv_func_mkstemp=maybe else cat >"conftest.$ac_ext" <<_ACEOF -#line 16652 "configure" +#line 17481 "configure" #include "confdefs.h" -#include <sys/types.h> -#ifdef HAVE_UNISTD_H -#include <unistd.h> -#endif -#include <stdlib.h> -#include <stdio.h> -#include <string.h> -#include <sys/stat.h> +$ac_includes_default + int main(void) { - char *tmpl = "conftestXXXXXX"; + static char tmpl[] = "conftestXXXXXX"; char name[2][80]; int n; int result = 0; @@ -16690,15 +17513,15 @@ int main(void) _ACEOF rm -f "conftest$ac_exeext" -if { (eval echo "$as_me:16693: \"$ac_link\"") >&5 +if { (eval echo "$as_me:17516: \"$ac_link\"") >&5 (eval $ac_link) 2>&5 ac_status=$? - echo "$as_me:16696: \$? = $ac_status" >&5 + echo "$as_me:17519: \$? = $ac_status" >&5 (exit "$ac_status"); } && { ac_try='"./conftest$ac_exeext"' - { (eval echo "$as_me:16698: \"$ac_try\"") >&5 + { (eval echo "$as_me:17521: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? - echo "$as_me:16701: \$? = $ac_status" >&5 + echo "$as_me:17524: \$? = $ac_status" >&5 (exit "$ac_status"); }; }; then cf_cv_func_mkstemp=yes @@ -16713,16 +17536,16 @@ rm -f core ./core.* ./*.core "conftest$ac_exeext" "conftest.$ac_objext" "conftes fi fi -echo "$as_me:16716: result: $cf_cv_func_mkstemp" >&5 +echo "$as_me:17539: result: $cf_cv_func_mkstemp" >&5 echo "${ECHO_T}$cf_cv_func_mkstemp" >&6 if test "x$cf_cv_func_mkstemp" = xmaybe ; then - echo "$as_me:16719: checking for mkstemp" >&5 + echo "$as_me:17542: checking for mkstemp" >&5 echo $ECHO_N "checking for mkstemp... $ECHO_C" >&6 if test "${ac_cv_func_mkstemp+set}" = set; then echo $ECHO_N "(cached) $ECHO_C" >&6 else cat >"conftest.$ac_ext" <<_ACEOF -#line 16725 "configure" +#line 17548 "configure" #include "confdefs.h" #define mkstemp autoconf_temporary #include <limits.h> /* least-intrusive standard header which defines gcc2 __stub macros */ @@ -16753,16 +17576,16 @@ main (void) } _ACEOF rm -f "conftest.$ac_objext" "conftest$ac_exeext" -if { (eval echo "$as_me:16756: \"$ac_link\"") >&5 +if { (eval echo "$as_me:17579: \"$ac_link\"") >&5 (eval $ac_link) 2>&5 ac_status=$? - echo "$as_me:16759: \$? = $ac_status" >&5 + echo "$as_me:17582: \$? = $ac_status" >&5 (exit "$ac_status"); } && { ac_try='test -s "conftest$ac_exeext"' - { (eval echo "$as_me:16762: \"$ac_try\"") >&5 + { (eval echo "$as_me:17585: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? - echo "$as_me:16765: \$? = $ac_status" >&5 + echo "$as_me:17588: \$? = $ac_status" >&5 (exit "$ac_status"); }; }; then ac_cv_func_mkstemp=yes else @@ -16772,7 +17595,7 @@ ac_cv_func_mkstemp=no fi rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext" fi -echo "$as_me:16775: result: $ac_cv_func_mkstemp" >&5 +echo "$as_me:17598: result: $ac_cv_func_mkstemp" >&5 echo "${ECHO_T}$ac_cv_func_mkstemp" >&6 fi @@ -16801,7 +17624,7 @@ cf_upper_prog_gnat=`echo "${cf_prog_gnat}" | sed y%abcdefghijklmnopqrstuvwxyz./- unset cf_TEMP_gnat # Extract the first word of "$cf_prog_gnat", so it can be a program name with args. set dummy $cf_prog_gnat; ac_word=$2 -echo "$as_me:16804: checking for $ac_word" >&5 +echo "$as_me:17627: checking for $ac_word" >&5 echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6 if test "${ac_cv_path_cf_TEMP_gnat+set}" = set; then echo $ECHO_N "(cached) $ECHO_C" >&6 @@ -16818,7 +17641,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_cf_TEMP_gnat="$ac_dir/$ac_word" - echo "$as_me:16821: found $ac_dir/$ac_word" >&5 + echo "$as_me:17644: found $ac_dir/$ac_word" >&5 break fi done @@ -16830,10 +17653,10 @@ fi cf_TEMP_gnat=$ac_cv_path_cf_TEMP_gnat if test -n "$cf_TEMP_gnat"; then - echo "$as_me:16833: result: $cf_TEMP_gnat" >&5 + echo "$as_me:17656: result: $cf_TEMP_gnat" >&5 echo "${ECHO_T}$cf_TEMP_gnat" >&6 else - echo "$as_me:16836: result: no" >&5 + echo "$as_me:17659: result: no" >&5 echo "${ECHO_T}no" >&6 fi @@ -16843,7 +17666,7 @@ fi unset cf_cv_gnat_version unset cf_TEMP_gnat -echo "$as_me:16846: checking for $cf_prog_gnat version" >&5 +echo "$as_me:17669: checking for $cf_prog_gnat version" >&5 echo $ECHO_N "checking for $cf_prog_gnat version... $ECHO_C" >&6 if test "${cf_cv_gnat_version+set}" = set; then echo $ECHO_N "(cached) $ECHO_C" >&6 @@ -16854,7 +17677,7 @@ cf_cv_gnat_version=`$cf_prog_gnat --version 2>&1 | \ sed -e '2,$d' -e 's/[^0-9 \.]//g' -e 's/^[ ]*//' -e 's/ .*//'` fi -echo "$as_me:16857: result: $cf_cv_gnat_version" >&5 +echo "$as_me:17680: result: $cf_cv_gnat_version" >&5 echo "${ECHO_T}$cf_cv_gnat_version" >&6 test -z "$cf_cv_gnat_version" && cf_cv_gnat_version=no eval cf_TEMP_gnat=$cf_cv_gnat_version; unset cf_cv_gnat_version @@ -16883,7 +17706,7 @@ else cd conftest.src for cf_gprconfig in Ada C do - echo "$as_me:16886: checking for gprconfig name for $cf_gprconfig" >&5 + echo "$as_me:17709: checking for gprconfig name for $cf_gprconfig" >&5 echo $ECHO_N "checking for gprconfig name for $cf_gprconfig... $ECHO_C" >&6 if test "$cf_gprconfig" = C then @@ -16902,10 +17725,10 @@ echo $ECHO_N "checking for gprconfig name for $cf_gprconfig... $ECHO_C" >&6 if test -n "$cf_gprconfig_value" then eval "cf_ada_config_$cf_gprconfig=$cf_gprconfig_value" - echo "$as_me:16905: result: $cf_gprconfig_value" >&5 + echo "$as_me:17728: result: $cf_gprconfig_value" >&5 echo "${ECHO_T}$cf_gprconfig_value" >&6 else - echo "$as_me:16908: result: missing" >&5 + echo "$as_me:17731: result: missing" >&5 echo "${ECHO_T}missing" >&6 cf_ada_config="#" break @@ -16918,7 +17741,7 @@ echo "${ECHO_T}missing" >&6 if test "x$cf_ada_config" != "x#" then -echo "$as_me:16921: checking for gnat version" >&5 +echo "$as_me:17744: checking for gnat version" >&5 echo $ECHO_N "checking for gnat version... $ECHO_C" >&6 if test "${cf_cv_gnat_version+set}" = set; then echo $ECHO_N "(cached) $ECHO_C" >&6 @@ -16929,7 +17752,7 @@ cf_cv_gnat_version=`${cf_ada_make:-gnatmake} --version 2>&1 | \ sed -e '2,$d' -e 's/[^0-9 \.]//g' -e 's/^[ ]*//' -e 's/ .*//'` fi -echo "$as_me:16932: result: $cf_cv_gnat_version" >&5 +echo "$as_me:17755: result: $cf_cv_gnat_version" >&5 echo "${ECHO_T}$cf_cv_gnat_version" >&6 test -z "$cf_cv_gnat_version" && cf_cv_gnat_version=no @@ -16938,7 +17761,7 @@ case "$cf_cv_gnat_version" in cf_cv_prog_gnat_correct=yes ;; (*) - { echo "$as_me:16941: WARNING: Unsupported GNAT version $cf_cv_gnat_version. We require 3.11 or better. Disabling Ada95 binding." >&5 + { echo "$as_me:17764: WARNING: Unsupported GNAT version $cf_cv_gnat_version. We require 3.11 or better. Disabling Ada95 binding." >&5 echo "$as_me: WARNING: Unsupported GNAT version $cf_cv_gnat_version. We require 3.11 or better. Disabling Ada95 binding." >&2;} cf_cv_prog_gnat_correct=no ;; @@ -16946,7 +17769,7 @@ esac # Extract the first word of "m4", so it can be a program name with args. set dummy m4; ac_word=$2 -echo "$as_me:16949: checking for $ac_word" >&5 +echo "$as_me:17772: checking for $ac_word" >&5 echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6 if test "${ac_cv_prog_M4_exists+set}" = set; then echo $ECHO_N "(cached) $ECHO_C" >&6 @@ -16961,7 +17784,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_M4_exists="yes" -echo "$as_me:16964: found $ac_dir/$ac_word" >&5 +echo "$as_me:17787: found $ac_dir/$ac_word" >&5 break done @@ -16970,20 +17793,20 @@ fi fi M4_exists=$ac_cv_prog_M4_exists if test -n "$M4_exists"; then - echo "$as_me:16973: result: $M4_exists" >&5 + echo "$as_me:17796: result: $M4_exists" >&5 echo "${ECHO_T}$M4_exists" >&6 else - echo "$as_me:16976: result: no" >&5 + echo "$as_me:17799: result: no" >&5 echo "${ECHO_T}no" >&6 fi if test "$ac_cv_prog_M4_exists" = no; then cf_cv_prog_gnat_correct=no - { echo "$as_me:16982: WARNING: Ada95 binding required program m4 not found. Ada95 binding disabled" >&5 + { echo "$as_me:17805: WARNING: Ada95 binding required program m4 not found. Ada95 binding disabled" >&5 echo "$as_me: WARNING: Ada95 binding required program m4 not found. Ada95 binding disabled" >&2;} fi if test "$cf_cv_prog_gnat_correct" = yes; then - echo "$as_me:16986: checking if GNAT works" >&5 + echo "$as_me:17809: checking if GNAT works" >&5 echo $ECHO_N "checking if GNAT works... $ECHO_C" >&6 rm -rf ./conftest* ./*~conftest* @@ -17011,7 +17834,7 @@ else fi rm -rf ./conftest* ./*~conftest* - echo "$as_me:17014: result: $cf_cv_prog_gnat_correct" >&5 + echo "$as_me:17837: result: $cf_cv_prog_gnat_correct" >&5 echo "${ECHO_T}$cf_cv_prog_gnat_correct" >&6 fi else @@ -17021,7 +17844,7 @@ fi if test "$cf_cv_prog_gnat_correct" = yes; then - echo "$as_me:17024: checking optimization options for ADAFLAGS" >&5 + echo "$as_me:17847: checking optimization options for ADAFLAGS" >&5 echo $ECHO_N "checking optimization options for ADAFLAGS... $ECHO_C" >&6 case "$CFLAGS" in (*-g*) @@ -17038,10 +17861,10 @@ echo $ECHO_N "checking optimization options for ADAFLAGS... $ECHO_C" >&6 ;; esac - echo "$as_me:17041: result: $ADAFLAGS" >&5 + echo "$as_me:17864: result: $ADAFLAGS" >&5 echo "${ECHO_T}$ADAFLAGS" >&6 -echo "$as_me:17044: checking if GNATPREP supports -T option" >&5 +echo "$as_me:17867: checking if GNATPREP supports -T option" >&5 echo $ECHO_N "checking if GNATPREP supports -T option... $ECHO_C" >&6 if test "${cf_cv_gnatprep_opt_t+set}" = set; then echo $ECHO_N "(cached) $ECHO_C" >&6 @@ -17051,11 +17874,11 @@ cf_cv_gnatprep_opt_t=no gnatprep -T 2>/dev/null >/dev/null && cf_cv_gnatprep_opt_t=yes fi -echo "$as_me:17054: result: $cf_cv_gnatprep_opt_t" >&5 +echo "$as_me:17877: result: $cf_cv_gnatprep_opt_t" >&5 echo "${ECHO_T}$cf_cv_gnatprep_opt_t" >&6 test "$cf_cv_gnatprep_opt_t" = yes && GNATPREP_OPTS="-T $GNATPREP_OPTS" -echo "$as_me:17058: checking if GNAT supports generics" >&5 +echo "$as_me:17881: checking if GNAT supports generics" >&5 echo $ECHO_N "checking if GNAT supports generics... $ECHO_C" >&6 case "$cf_cv_gnat_version" in (3.1[1-9]*|3.[2-9]*|[4-9].*|[1-9][0-9].[0-9]*|20[0-9][0-9]) @@ -17065,7 +17888,7 @@ case "$cf_cv_gnat_version" in cf_gnat_generics=no ;; esac -echo "$as_me:17068: result: $cf_gnat_generics" >&5 +echo "$as_me:17891: result: $cf_gnat_generics" >&5 echo "${ECHO_T}$cf_gnat_generics" >&6 if test "$cf_gnat_generics" = yes @@ -17077,7 +17900,7 @@ else cf_generic_objects= fi -echo "$as_me:17080: checking if GNAT supports SIGINT" >&5 +echo "$as_me:17903: checking if GNAT supports SIGINT" >&5 echo $ECHO_N "checking if GNAT supports SIGINT... $ECHO_C" >&6 if test "${cf_cv_gnat_sigint+set}" = set; then echo $ECHO_N "(cached) $ECHO_C" >&6 @@ -17125,7 +17948,7 @@ fi rm -rf ./conftest* ./*~conftest* fi -echo "$as_me:17128: result: $cf_cv_gnat_sigint" >&5 +echo "$as_me:17951: result: $cf_cv_gnat_sigint" >&5 echo "${ECHO_T}$cf_cv_gnat_sigint" >&6 if test "$cf_cv_gnat_sigint" = yes ; then @@ -17138,7 +17961,7 @@ cf_gnat_libraries=no cf_gnat_projects=no if test "$enable_gnat_projects" != no ; then -echo "$as_me:17141: checking if GNAT supports project files" >&5 +echo "$as_me:17964: checking if GNAT supports project files" >&5 echo $ECHO_N "checking if GNAT supports project files... $ECHO_C" >&6 case "$cf_cv_gnat_version" in (3.[0-9]*) @@ -17201,15 +18024,15 @@ CF_EOF esac ;; esac -echo "$as_me:17204: result: $cf_gnat_projects" >&5 +echo "$as_me:18027: result: $cf_gnat_projects" >&5 echo "${ECHO_T}$cf_gnat_projects" >&6 fi # enable_gnat_projects if test "$cf_gnat_projects" = yes then - echo "$as_me:17210: checking if GNAT supports libraries" >&5 + echo "$as_me:18033: checking if GNAT supports libraries" >&5 echo $ECHO_N "checking if GNAT supports libraries... $ECHO_C" >&6 - echo "$as_me:17212: result: $cf_gnat_libraries" >&5 + echo "$as_me:18035: result: $cf_gnat_libraries" >&5 echo "${ECHO_T}$cf_gnat_libraries" >&6 fi @@ -17229,7 +18052,7 @@ then then USE_GNAT_MAKE_GPR="" else - { echo "$as_me:17232: WARNING: use old makefile rules since tools are missing" >&5 + { echo "$as_me:18055: WARNING: use old makefile rules since tools are missing" >&5 echo "$as_me: WARNING: use old makefile rules since tools are missing" >&2;} fi fi @@ -17241,8 +18064,8 @@ else USE_GNAT_LIBRARIES="#" fi -echo "$as_me:17244: checking for ada-compiler" >&5 -echo $ECHO_N "checking for ada-compiler... $ECHO_C" >&6 +echo "$as_me:18067: checking for Ada95 compiler" >&5 +echo $ECHO_N "checking for Ada95 compiler... $ECHO_C" >&6 # Check whether --with-ada-compiler or --without-ada-compiler was given. if test "${with_ada_compiler+set}" = set; then @@ -17252,13 +18075,13 @@ else cf_ada_compiler=gnatmake fi; -echo "$as_me:17255: result: $cf_ada_compiler" >&5 +echo "$as_me:18078: result: $cf_ada_compiler" >&5 echo "${ECHO_T}$cf_ada_compiler" >&6 cf_ada_package=terminal_interface -echo "$as_me:17260: checking for ada-include" >&5 -echo $ECHO_N "checking for ada-include... $ECHO_C" >&6 +echo "$as_me:18083: checking for Ada95 include directory" >&5 +echo $ECHO_N "checking for Ada95 include directory... $ECHO_C" >&6 # Check whether --with-ada-include or --without-ada-include was given. if test "${with_ada_include+set}" = set; then @@ -17293,7 +18116,7 @@ case ".$withval" in withval=`echo "$withval" | sed -e s%NONE%$cf_path_syntax%` ;; (*) - { { echo "$as_me:17296: error: expected a pathname, not \"$withval\"" >&5 + { { echo "$as_me:18119: error: expected a pathname, not \"$withval\"" >&5 echo "$as_me: error: expected a pathname, not \"$withval\"" >&2;} { (exit 1); exit 1; }; } ;; @@ -17302,11 +18125,11 @@ esac fi eval ADA_INCLUDE="$withval" -echo "$as_me:17305: result: $ADA_INCLUDE" >&5 +echo "$as_me:18128: result: $ADA_INCLUDE" >&5 echo "${ECHO_T}$ADA_INCLUDE" >&6 -echo "$as_me:17308: checking for ada-objects" >&5 -echo $ECHO_N "checking for ada-objects... $ECHO_C" >&6 +echo "$as_me:18131: checking for Ada95 object directory" >&5 +echo $ECHO_N "checking for Ada95 object directory... $ECHO_C" >&6 # Check whether --with-ada-objects or --without-ada-objects was given. if test "${with_ada_objects+set}" = set; then @@ -17341,7 +18164,7 @@ case ".$withval" in withval=`echo "$withval" | sed -e s%NONE%$cf_path_syntax%` ;; (*) - { { echo "$as_me:17344: error: expected a pathname, not \"$withval\"" >&5 + { { echo "$as_me:18167: error: expected a pathname, not \"$withval\"" >&5 echo "$as_me: error: expected a pathname, not \"$withval\"" >&2;} { (exit 1); exit 1; }; } ;; @@ -17350,11 +18173,11 @@ esac fi eval ADA_OBJECTS="$withval" -echo "$as_me:17353: result: $ADA_OBJECTS" >&5 +echo "$as_me:18176: result: $ADA_OBJECTS" >&5 echo "${ECHO_T}$ADA_OBJECTS" >&6 -echo "$as_me:17356: checking if an Ada95 shared-library should be built" >&5 -echo $ECHO_N "checking if an Ada95 shared-library should be built... $ECHO_C" >&6 +echo "$as_me:18179: checking whether to build an Ada95 shared library" >&5 +echo $ECHO_N "checking whether to build an Ada95 shared library... $ECHO_C" >&6 # Check whether --with-ada-sharedlib or --without-ada-sharedlib was given. if test "${with_ada_sharedlib+set}" = set; then @@ -17363,19 +18186,25 @@ if test "${with_ada_sharedlib+set}" = set; then else with_ada_sharedlib=no fi; -echo "$as_me:17366: result: $with_ada_sharedlib" >&5 -echo "${ECHO_T}$with_ada_sharedlib" >&6 +cf_ada_sharedlib_warn=no if test "x$with_ada_sharedlib" != xno then if test "x$cf_gnat_projects" != xyes then - { echo "$as_me:17373: WARNING: disabling shared-library since GNAT projects are not supported" >&5 -echo "$as_me: WARNING: disabling shared-library since GNAT projects are not supported" >&2;} with_ada_sharedlib=no + cf_ada_sharedlib_warn=yes fi fi +echo "$as_me:18200: result: $with_ada_sharedlib" >&5 +echo "${ECHO_T}$with_ada_sharedlib" >&6 +if test "x$cf_ada_sharedlib_warn" != xno +then + { echo "$as_me:18204: WARNING: disabling Ada95 shared library since GNAT projects are not supported" >&5 +echo "$as_me: WARNING: disabling Ada95 shared library since GNAT projects are not supported" >&2;} +fi + ADA_SHAREDLIB='lib$(LIB_NAME).so.1' MAKE_ADA_SHAREDLIB="#" @@ -17390,8 +18219,8 @@ fi # allow the Ada binding to be renamed -echo "$as_me:17393: checking for ada-libname" >&5 -echo $ECHO_N "checking for ada-libname... $ECHO_C" >&6 +echo "$as_me:18222: checking for Ada95 curses library name" >&5 +echo $ECHO_N "checking for Ada95 curses library name... $ECHO_C" >&6 # Check whether --with-ada-libname or --without-ada-libname was given. if test "${with_ada_libname+set}" = set; then @@ -17406,16 +18235,16 @@ case "x$ADA_LIBNAME" in ;; esac -echo "$as_me:17409: result: $ADA_LIBNAME" >&5 +echo "$as_me:18238: result: $ADA_LIBNAME" >&5 echo "${ECHO_T}$ADA_LIBNAME" >&6 else - { { echo "$as_me:17413: error: No usable Ada compiler found" >&5 + { { echo "$as_me:18242: error: No usable Ada compiler found" >&5 echo "$as_me: error: No usable Ada compiler found" >&2;} { (exit 1); exit 1; }; } fi else - { { echo "$as_me:17418: error: The Ada compiler is needed for this package" >&5 + { { echo "$as_me:18247: error: The Ada compiler is needed for this package" >&5 echo "$as_me: error: The Ada compiler is needed for this package" >&2;} { (exit 1); exit 1; }; } fi @@ -17455,7 +18284,7 @@ elif test "$includedir" != "/usr/include"; then fi ### Build up pieces for makefile rules -echo "$as_me:17458: checking default library suffix" >&5 +echo "$as_me:18287: checking default library suffix" >&5 echo $ECHO_N "checking default library suffix... $ECHO_C" >&6 case $DFT_LWR_MODEL in @@ -17466,10 +18295,10 @@ echo $ECHO_N "checking default library suffix... $ECHO_C" >&6 (shared) DFT_ARG_SUFFIX='' ;; esac test -n "$LIB_SUFFIX" && DFT_ARG_SUFFIX="${LIB_SUFFIX}${DFT_ARG_SUFFIX}" -echo "$as_me:17469: result: $DFT_ARG_SUFFIX" >&5 +echo "$as_me:18298: result: $DFT_ARG_SUFFIX" >&5 echo "${ECHO_T}$DFT_ARG_SUFFIX" >&6 -echo "$as_me:17472: checking default library-dependency suffix" >&5 +echo "$as_me:18301: checking default library-dependency suffix" >&5 echo $ECHO_N "checking default library-dependency suffix... $ECHO_C" >&6 case X$DFT_LWR_MODEL in @@ -17552,10 +18381,10 @@ echo $ECHO_N "checking default library-dependency suffix... $ECHO_C" >&6 DFT_LIB_SUFFIX="${LIB_SUFFIX}${EXTRA_SUFFIX}${DFT_LIB_SUFFIX}" DFT_DEP_SUFFIX="${LIB_SUFFIX}${EXTRA_SUFFIX}${DFT_DEP_SUFFIX}" fi -echo "$as_me:17555: result: $DFT_DEP_SUFFIX" >&5 +echo "$as_me:18384: result: $DFT_DEP_SUFFIX" >&5 echo "${ECHO_T}$DFT_DEP_SUFFIX" >&6 -echo "$as_me:17558: checking default object directory" >&5 +echo "$as_me:18387: checking default object directory" >&5 echo $ECHO_N "checking default object directory... $ECHO_C" >&6 case $DFT_LWR_MODEL in @@ -17571,7 +18400,7 @@ echo $ECHO_N "checking default object directory... $ECHO_C" >&6 DFT_OBJ_SUBDIR='obj_s' ;; esac esac -echo "$as_me:17574: result: $DFT_OBJ_SUBDIR" >&5 +echo "$as_me:18403: result: $DFT_OBJ_SUBDIR" >&5 echo "${ECHO_T}$DFT_OBJ_SUBDIR" >&6 ### Set up low-level terminfo dependencies for makefiles. @@ -17644,7 +18473,7 @@ cat >confcache <<\_ACEOF # config.status only pays attention to the cache file if you give it # the --recheck option to rerun configure. # -# `ac_cv_env_foo' variables (set or unset) will be overriden when +# `ac_cv_env_foo' variables (set or unset) will be overridden when # loading this file, other *unset* `ac_cv_foo' will be assigned the # following values. @@ -17713,7 +18542,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:17716: creating $CONFIG_STATUS" >&5 +{ echo "$as_me:18545: creating $CONFIG_STATUS" >&5 echo "$as_me: creating $CONFIG_STATUS" >&6;} cat >"$CONFIG_STATUS" <<_ACEOF #! $SHELL @@ -17722,6 +18551,8 @@ cat >"$CONFIG_STATUS" <<_ACEOF # Compiler output produced by configure, useful for debugging # configure, is in config.log if it exists. +me=\`echo "\$0" | sed -e 's,.*\\/,,'\` + debug=false SHELL=\${CONFIG_SHELL-$SHELL} ac_cs_invocation="\$0 \$@" @@ -17743,9 +18574,9 @@ fi as_me=`echo "$0" |sed 's,.*[\\/],,'` if expr a : '\(a\)' >/dev/null 2>&1; then - as_expr=expr + as_expr="expr" else - as_expr=false + as_expr="false" fi rm -f conf$$ conf$$.exe conf$$.file @@ -17760,7 +18591,7 @@ if ln -s conf$$.file conf$$ 2>/dev/null; then as_ln_s='ln -s' fi elif ln conf$$.file conf$$ 2>/dev/null; then - as_ln_s=ln + as_ln_s='ln' else as_ln_s='cp -p' fi @@ -17847,10 +18678,10 @@ EOF cat >>"$CONFIG_STATUS" <<EOF ac_cs_version="\\ config.status -configured by $0, generated by GNU Autoconf 2.52.20210105, +configured by $0, generated by GNU Autoconf 2.52.20231210, with options \\"`echo "$ac_configure_args" | sed 's/[\\""\`\$]/\\\\&/g'`\\" -Copyright 2003-2020,2021 Thomas E. Dickey +Copyright 2003-2022,2023 Thomas E. Dickey Copyright 1992, 1993, 1994, 1995, 1996, 1998, 1999, 2000, 2001 Free Software Foundation, Inc. This config.status script is free software; the Free Software Foundation @@ -17892,7 +18723,7 @@ cat >>"$CONFIG_STATUS" <<\EOF echo "$ac_cs_version"; exit 0 ;; --he | --h) # Conflict between --help and --header - { { echo "$as_me:17895: error: ambiguous option: $1 + { { echo "$as_me:18726: 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;} @@ -17911,7 +18742,7 @@ Try \`$0 --help' for more information." >&2;} ac_need_defaults=false;; # This is an error. - -*) { { echo "$as_me:17914: error: unrecognized option: $1 + -*) { { echo "$as_me:18745: 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;} @@ -17930,7 +18761,7 @@ cat >&5 << _ACEOF ## Running config.status. ## ## ----------------------- ## -This file was extended by $as_me 2.52.20210105, executed with +This file was extended by $as_me 2.52.20231210, executed with CONFIG_FILES = $CONFIG_FILES CONFIG_HEADERS = $CONFIG_HEADERS CONFIG_LINKS = $CONFIG_LINKS @@ -17959,6 +18790,7 @@ LN_S="$LN_S" NCURSES_MAJOR="$NCURSES_MAJOR" NCURSES_MINOR="$NCURSES_MINOR" NCURSES_PATCH="$NCURSES_PATCH" +PACKAGE="$PACKAGE" USE_OLD_MAKERULES="$USE_OLD_MAKERULES" cf_cv_VERSION_GNATMAKE=$cf_cv_VERSION_GNATMAKE cf_cv_VERSION_GPRBUILD=$cf_cv_VERSION_GPRBUILD @@ -17985,7 +18817,7 @@ do "Makefile" ) CONFIG_FILES="$CONFIG_FILES Makefile" ;; "default" ) CONFIG_COMMANDS="$CONFIG_COMMANDS default" ;; "include/ncurses_cfg.h" ) CONFIG_HEADERS="$CONFIG_HEADERS include/ncurses_cfg.h:include/ncurses_cfg.hin" ;; - *) { { echo "$as_me:17988: error: invalid argument: $ac_config_target" >&5 + *) { { echo "$as_me:18820: error: invalid argument: $ac_config_target" >&5 echo "$as_me: error: invalid argument: $ac_config_target" >&2;} { (exit 1); exit 1; }; };; esac @@ -18009,14 +18841,14 @@ $debug || } # Create a (secure) tmp directory for tmp files. -: ${TMPDIR=/tmp} +: "${TMPDIR=/tmp}" { tmp=`(umask 077 && mktemp -d -q "$TMPDIR/csXXXXXX") 2>/dev/null` && test -n "$tmp" && test -d "$tmp" } || { tmp=$TMPDIR/cs$$-$RANDOM - (umask 077 && mkdir $tmp) + (umask 077 && mkdir "$tmp") } || { echo "$me: cannot create a temporary directory in $TMPDIR" >&2 @@ -18036,7 +18868,7 @@ cat >>"$CONFIG_STATUS" <<EOF if test -n "\$CONFIG_FILES"; then # Protect against being on the right side of a sed subst in config.status. sed 's/,@/@@/; s/@,/@@/; s/,;t t\$/@;t t/; /@;t t\$/s/[\\\\&,]/\\\\&/g; - s/@@/,@/; s/@@/@,/; s/@;t t\$/,;t t/' >\$tmp/subs.sed <<\\CEOF + s/@@/,@/; s/@@/@,/; s/@;t t\$/,;t t/' >"\$tmp"/subs.sed <<\\CEOF s,@SHELL@,$SHELL,;t t s,@exec_prefix@,$exec_prefix,;t t s,@prefix@,$prefix,;t t @@ -18069,6 +18901,7 @@ s,@ECHO_T@,$ECHO_T,;t t s,@PATH_SEPARATOR@,$PATH_SEPARATOR,;t t s,@DEFS@,$DEFS,;t t s,@LIBS@,$LIBS,;t t +s,@PACKAGE@,$PACKAGE,;t t s,@top_builddir@,$top_builddir,;t t s,@build@,$build,;t t s,@build_cpu@,$build_cpu,;t t @@ -18105,6 +18938,8 @@ s,@PKG_CONFIG@,$PKG_CONFIG,;t t s,@ac_pt_PKG_CONFIG@,$ac_pt_PKG_CONFIG,;t t s,@PKG_CONFIG_LIBDIR@,$PKG_CONFIG_LIBDIR,;t t s,@SET_MAKE@,$SET_MAKE,;t t +s,@MAKE_NO_PHONY@,$MAKE_NO_PHONY,;t t +s,@MAKE_PHONY@,$MAKE_PHONY,;t t s,@CTAGS@,$CTAGS,;t t s,@ETAGS@,$ETAGS,;t t s,@MAKE_LOWER_TAGS@,$MAKE_LOWER_TAGS,;t t @@ -18168,6 +19003,8 @@ s,@RULE_CC@,$RULE_CC,;t t s,@SHOW_CC@,$SHOW_CC,;t t s,@ECHO_CC@,$ECHO_CC,;t t s,@EXTRA_CFLAGS@,$EXTRA_CFLAGS,;t t +s,@HAVE_STDNORETURN_H@,$HAVE_STDNORETURN_H,;t t +s,@STDC_NORETURN@,$STDC_NORETURN,;t t s,@ADAFLAGS@,$ADAFLAGS,;t t s,@ADA_TRACE@,$ADA_TRACE,;t t s,@cf_TEMP_gnat@,$cf_TEMP_gnat,;t t @@ -18224,11 +19061,11 @@ EOF ac_sed_cmds= while "$ac_more_lines"; do if test "$ac_beg" -gt 1; then - sed "1,${ac_beg}d; ${ac_end}q" $tmp/subs.sed >$tmp/subs.frag + sed "1,${ac_beg}d; ${ac_end}q" "$tmp"/subs.sed >"$tmp"/subs.frag else - sed "${ac_end}q" $tmp/subs.sed >$tmp/subs.frag + sed "${ac_end}q" "$tmp"/subs.sed >"$tmp"/subs.frag fi - if test ! -s $tmp/subs.frag; then + if test ! -s "$tmp"/subs.frag; then ac_more_lines=false else # The purpose of the label and of the branching condition is to @@ -18236,17 +19073,17 @@ EOF # is no need to browse any of the substitutions). # These are the two extra sed commands mentioned above. (echo ':t - /@[a-zA-Z_][a-zA-Z_0-9]*@/!b' && cat $tmp/subs.frag) >$tmp/subs-$ac_sed_frag.sed + /@[a-zA-Z_][a-zA-Z_0-9]*@/!b' && cat "$tmp"/subs.frag) >"$tmp"/subs-$ac_sed_frag.sed # It is possible to make a multiline substitution using escaped newlines. # Ensure that we do not split the substitution between script fragments. ac_BEG=$ac_end ac_END=`expr "$ac_end" + "$ac_max_sed_lines"` - sed "1,${ac_BEG}d; ${ac_END}p; q" $tmp/subs.sed >$tmp/subs.next - if test -s $tmp/subs.next; then - grep '^s,@[^@,][^@,]*@,.*\\$' $tmp/subs.next >$tmp/subs.edit - if test ! -s $tmp/subs.edit; then - grep "^s,@[^@,][^@,]*@,.*,;t t$" $tmp/subs.next >$tmp/subs.edit - if test ! -s $tmp/subs.edit; then + sed "1,${ac_BEG}d; ${ac_END}p; q" "$tmp"/subs.sed >"$tmp"/subs.next + if test -s "$tmp"/subs.next; then + grep '^s,@[^@,][^@,]*@,.*\\$' "$tmp"/subs.next >"$tmp"/subs.edit + if test ! -s "$tmp"/subs.edit; then + grep "^s,@[^@,][^@,]*@,.*,;t t$" "$tmp"/subs.next >"$tmp"/subs.edit + if test ! -s "$tmp"/subs.edit; then if test "$ac_beg" -gt 1; then ac_end=`expr "$ac_end" - 1` continue @@ -18256,9 +19093,9 @@ EOF fi if test -z "$ac_sed_cmds"; then - ac_sed_cmds="sed -f $tmp/subs-$ac_sed_frag.sed" + ac_sed_cmds="sed -f \"$tmp\"/subs-$ac_sed_frag.sed" else - ac_sed_cmds="$ac_sed_cmds | sed -f $tmp/subs-$ac_sed_frag.sed" + ac_sed_cmds="$ac_sed_cmds | sed -f \"$tmp\"/subs-$ac_sed_frag.sed" fi ac_sed_frag=`expr "$ac_sed_frag" + 1` ac_beg=$ac_end @@ -18266,7 +19103,7 @@ EOF fi done if test -z "$ac_sed_cmds"; then - ac_sed_cmds=cat + ac_sed_cmds="cat" fi fi # test -n "$CONFIG_FILES" @@ -18276,7 +19113,7 @@ for ac_file in : $CONFIG_FILES; do test "x$ac_file" = x: && continue # Support "outfile[:infile[:infile...]]", defaulting infile="outfile.in". case "$ac_file" in - | *:- | *:-:* ) # input from stdin - cat >$tmp/stdin + cat >"$tmp"/stdin ac_file_in=`echo "$ac_file" | sed 's,[^:]*:,,'` ac_file=`echo "$ac_file" | sed 's,:.*,,'` ;; *:* ) ac_file_in=`echo "$ac_file" | sed 's,[^:]*:,,'` @@ -18313,7 +19150,7 @@ for as_mkdir_dir in `IFS='/\\'; set X $as_dummy; shift; echo "$@"`; do esac done; } - ac_dir_suffix="/`echo $ac_dir|sed 's,^\./,,'`" + ac_dir_suffix="/`echo "$ac_dir"|sed 's,^\./,,'`" # A "../" for each directory in $ac_dir_suffix. ac_dots=`echo "$ac_dir_suffix" | sed 's,/[^/]*,../,g'` else @@ -18341,7 +19178,7 @@ done; } esac if test x"$ac_file" != x-; then - { echo "$as_me:18344: creating $ac_file" >&5 + { echo "$as_me:19181: creating $ac_file" >&5 echo "$as_me: creating $ac_file" >&6;} rm -f "$ac_file" fi @@ -18356,23 +19193,23 @@ echo "$as_me: creating $ac_file" >&6;} ac_file_inputs=`IFS=: for f in $ac_file_in; do case $f in - -) echo $tmp/stdin ;; + -) echo "$tmp"/stdin ;; [\\/$]*) # Absolute (can't be DOS-style, as IFS=:) - test -f "$f" || { { echo "$as_me:18362: error: cannot find input file: $f" >&5 + test -f "$f" || { { echo "$as_me:19199: error: cannot find input file: $f" >&5 echo "$as_me: error: cannot find input file: $f" >&2;} { (exit 1); exit 1; }; } - echo $f;; + echo "$f";; *) # Relative if test -f "$f"; then # Build tree - echo $f + echo "$f" elif test -f "$srcdir/$f"; then # Source tree echo "$srcdir/$f" else # /dev/null tree - { { echo "$as_me:18375: error: cannot find input file: $f" >&5 + { { echo "$as_me:19212: error: cannot find input file: $f" >&5 echo "$as_me: error: cannot find input file: $f" >&2;} { (exit 1); exit 1; }; } fi;; @@ -18388,7 +19225,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:18391: WARNING: datarootdir was used implicitly but not set: + { echo "$as_me:19228: 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;} @@ -18397,7 +19234,7 @@ $ac_seen" >&2;} fi ac_seen=`grep '${datarootdir}' "$ac_item"` if test -n "$ac_seen"; then - { echo "$as_me:18400: WARNING: datarootdir was used explicitly but not set: + { echo "$as_me:19237: 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;} @@ -18422,38 +19259,46 @@ s,@configure_input@,$configure_input,;t t s,@srcdir@,$ac_srcdir,;t t s,@top_srcdir@,$ac_top_srcdir,;t t s,@INSTALL@,$ac_INSTALL,;t t -" $ac_file_inputs | (eval "$ac_sed_cmds") >$tmp/out - rm -f $tmp/stdin +" $ac_file_inputs | (eval "$ac_sed_cmds") >"$tmp"/out + rm -f "$tmp"/stdin +EOF +test -n "${FGREP}" || FGREP="grep -F" +test -n "${EGREP}" || EGREP="grep -E" +cat >>"$CONFIG_STATUS" <<EOF + test -n "\${FGREP}" || FGREP="$FGREP" + test -n "\${EGREP}" || EGREP="$EGREP" +EOF +cat >>"$CONFIG_STATUS" <<\EOF if test x"$ac_file" != x-; then cp "$tmp/out" "$ac_file" for ac_name in prefix exec_prefix datarootdir do - ac_seen=`${FGREP-fgrep} -n '${'$ac_name'[:=].*}' "$ac_file"` + ac_seen=`$FGREP -n '${'$ac_name'[:=].*}' "$ac_file"` if test -n "$ac_seen"; then - ac_init=`${EGREP-egrep} '[ ]*'$ac_name'[ ]*=' "$ac_file"` + 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:18437: WARNING: Variable $ac_name is used but was not set: + ac_seen=`echo "$ac_seen" |sed -e 's,^,'"$ac_file"':,'` + { echo "$as_me:19282: 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;} fi fi done - ${EGREP-egrep} -n '@[a-z_][a-z_0-9]+@' "$ac_file" >$tmp/out - ${EGREP-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:18448: WARNING: Some variables may not be substituted: + $EGREP -n '@[a-z_][a-z_0-9]+@' "$ac_file" >"$tmp"/out + $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:19293: WARNING: Some variables may not be substituted: $ac_seen" >&5 echo "$as_me: WARNING: Some variables may not be substituted: $ac_seen" >&2;} fi else - cat $tmp/out + cat "$tmp"/out fi - rm -f $tmp/out + rm -f "$tmp"/out done EOF @@ -18486,7 +19331,7 @@ for ac_file in : $CONFIG_HEADERS; do test "x$ac_file" = x: && continue # Support "outfile[:infile[:infile...]]", defaulting infile="outfile.in". case "$ac_file" in - | *:- | *:-:* ) # input from stdin - cat >$tmp/stdin + cat >"$tmp"/stdin ac_file_in=`echo "$ac_file" | sed 's,[^:]*:,,'` ac_file=`echo "$ac_file" | sed 's,:.*,,'` ;; *:* ) ac_file_in=`echo "$ac_file" | sed 's,[^:]*:,,'` @@ -18494,7 +19339,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:18497: creating $ac_file" >&5 + test x"$ac_file" != x- && { echo "$as_me:19342: creating $ac_file" >&5 echo "$as_me: creating $ac_file" >&6;} # First look for the input files in the build tree, otherwise in the @@ -18502,10 +19347,10 @@ echo "$as_me: creating $ac_file" >&6;} ac_file_inputs=`IFS=: for f in $ac_file_in; do case $f in - -) echo $tmp/stdin ;; + -) echo "$tmp"/stdin ;; [\\/$]*) # Absolute (can't be DOS-style, as IFS=:) - test -f "$f" || { { echo "$as_me:18508: error: cannot find input file: $f" >&5 + test -f "$f" || { { echo "$as_me:19353: error: cannot find input file: $f" >&5 echo "$as_me: error: cannot find input file: $f" >&2;} { (exit 1); exit 1; }; } echo $f;; @@ -18518,14 +19363,14 @@ echo "$as_me: error: cannot find input file: $f" >&2;} echo "$srcdir/$f" else # /dev/null tree - { { echo "$as_me:18521: error: cannot find input file: $f" >&5 + { { echo "$as_me:19366: error: cannot find input file: $f" >&5 echo "$as_me: error: cannot find input file: $f" >&2;} { (exit 1); exit 1; }; } fi;; esac done` || { (exit 1); exit 1; } # Remove the trailing spaces. - sed 's/[ ]*$//' $ac_file_inputs >$tmp/in + sed 's/[ ]*$//' $ac_file_inputs >"$tmp"/in EOF @@ -18557,9 +19402,9 @@ echo ' cat >> conftest.edit <<CEOF /@DEFS@/r conftest.frag /@DEFS@/d CEOF -sed -f conftest.edit $tmp/in > $tmp/out -rm -f $tmp/in -mv $tmp/out $tmp/in +sed -f conftest.edit "$tmp"/in > "$tmp"/out +rm -f "$tmp"/in +mv "$tmp"/out "$tmp"/in rm -f conftest.edit conftest.frag ' >> "$CONFIG_STATUS" @@ -18568,15 +19413,15 @@ cat >>"$CONFIG_STATUS" <<\EOF # use $as_me), people would be surprised to read: # /* config.h. Generated automatically by config.status. */ if test x"$ac_file" = x-; then - echo "/* Generated automatically by configure. */" >$tmp/config.h + echo "/* Generated automatically by configure. */" >"$tmp"/config.h else - echo "/* $ac_file. Generated automatically by configure. */" >$tmp/config.h + echo "/* $ac_file. Generated automatically by configure. */" >"$tmp"/config.h fi - cat $tmp/in >>$tmp/config.h - rm -f $tmp/in + cat "$tmp"/in >>"$tmp"/config.h + 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:18579: $ac_file is unchanged" >&5 + { echo "$as_me:19424: $ac_file is unchanged" >&5 echo "$as_me: $ac_file is unchanged" >&6;} else ac_dir=`$as_expr X"$ac_file" : 'X\(.*[^/]\)//*[^/][^/]*/*$' \| \ @@ -18612,8 +19457,8 @@ done; } mv "$tmp/config.h" "$ac_file" fi else - cat $tmp/config.h - rm -f $tmp/config.h + cat "$tmp"/config.h + rm -f "$tmp"/config.h fi done EOF @@ -18627,6 +19472,7 @@ for ac_file in : $CONFIG_COMMANDS; do test "x$ac_file" = x: && continue case "$ac_dest" in default ) +$AWK -v PACKAGE=$PACKAGE -f $srcdir/mk-pkg.awk </dev/null >> Makefile if test -z "$USE_OLD_MAKERULES" ; then $AWK -f $srcdir/mk-1st.awk <$srcdir/src/modules >>src/Makefile fi diff --git a/Ada95/configure.in b/Ada95/configure.in index eb544d4c2609..3384df245ea2 100644 --- a/Ada95/configure.in +++ b/Ada95/configure.in @@ -1,5 +1,5 @@ dnl*************************************************************************** -dnl Copyright 2018-2020,2021 Thomas E. Dickey * +dnl Copyright 2018-2022,2023 Thomas E. Dickey * dnl Copyright 2010-2016,2018 Free Software Foundation, Inc. * dnl * dnl Permission is hereby granted, free of charge, to any person obtaining a * @@ -29,7 +29,7 @@ dnl*************************************************************************** dnl dnl Author: Thomas E. Dickey dnl -dnl $Id: configure.in,v 1.82 2021/01/09 11:20:33 tom Exp $ +dnl $Id: configure.in,v 1.91 2023/02/18 23:21:29 tom Exp $ dnl Process this file with autoconf to produce a configure script. dnl dnl For additional information, see @@ -37,13 +37,15 @@ dnl https://invisible-island.net/autoconf/ dnl https://invisible-island.net/autoconf/my-autoconf.html dnl dnl --------------------------------------------------------------------------- -AC_PREREQ(2.52.20200111) -AC_REVISION($Revision: 1.82 $) +AC_PREREQ(2.52.20210509) +AC_REVISION($Revision: 1.91 $) AC_INIT(gen/gen.c) AC_CONFIG_HEADER(include/ncurses_cfg.h:include/ncurses_cfg.hin) AC_DEFUN([AC_PATH_XTRA],[])dnl ignore dependencies on this +PACKAGE="AdaCurses" AC_SUBST(PACKAGE) + CF_TOP_BUILDDIR CF_HELP_MESSAGE(General Options:) @@ -102,6 +104,7 @@ fi # do this after mixed-case option (tags/TAGS is not as important as tic). AC_PROG_MAKE_SET +CF_MAKE_PHONY CF_MAKE_TAGS CF_MAKEFLAGS @@ -219,6 +222,7 @@ CF_ENABLE_BROKEN_LINKER # Check to define _XOPEN_SOURCE "automatically" CF_XOPEN_SOURCE(600) +AC_CHECK_DECL(exit) CF_LARGEFILE @@ -355,7 +359,7 @@ CF_DISABLE_ECHO CF_ENABLE_WARNINGS(Wno-unknown-pragmas Wswitch-enum,yes) if test "x$enable_warnings" = "xyes"; then - CF_ADD_ADAFLAGS(-gnatg) + CF_ADD_ADAFLAGS(-gnatwa -gnatyg) fi ### use option --enable-assertions to turn on generation of assertion code @@ -418,20 +422,15 @@ CF_DISABLE_GNAT_PROJECTS ### Checks for libraries. case $cf_cv_system_name in (*mingw32*) + CF_CHECK_LIBSSP ;; (*) -AC_CHECK_FUNC(gettimeofday, - AC_DEFINE(HAVE_GETTIMEOFDAY),[ - -AC_CHECK_LIB(bsd, gettimeofday, - AC_DEFINE(HAVE_GETTIMEOFDAY,1,[Define to 1 if we have gettimeofday]) - LIBS="$LIBS -lbsd")])dnl CLIX: bzero, select, gettimeofday + CF_FUNC_GETTIME ;; esac ### Checks for header files. AC_CHECK_SIZEOF([signed char]) -AC_STDC_HEADERS AC_HEADER_DIRENT AC_HEADER_TIME @@ -586,6 +585,7 @@ AC_OUTPUT( \ src/library.gpr:src/library.gpr.in \ doc/adacurses${DFT_ARG_SUFFIX}-config.1:doc/MKada_config.in \ Makefile,[ +$AWK -v PACKAGE=$PACKAGE -f $srcdir/mk-pkg.awk </dev/null >> Makefile if test -z "$USE_OLD_MAKERULES" ; then $AWK -f $srcdir/mk-1st.awk <$srcdir/src/modules >>src/Makefile fi @@ -603,6 +603,7 @@ LN_S="$LN_S" NCURSES_MAJOR="$NCURSES_MAJOR" NCURSES_MINOR="$NCURSES_MINOR" NCURSES_PATCH="$NCURSES_PATCH" +PACKAGE="$PACKAGE" USE_OLD_MAKERULES="$USE_OLD_MAKERULES" cf_cv_VERSION_GNATMAKE=$cf_cv_VERSION_GNATMAKE cf_cv_VERSION_GPRBUILD=$cf_cv_VERSION_GPRBUILD diff --git a/Ada95/doc/Makefile.in b/Ada95/doc/Makefile.in index bde5c6112f51..0aed33feb3f7 100644 --- a/Ada95/doc/Makefile.in +++ b/Ada95/doc/Makefile.in @@ -1,4 +1,4 @@ -# $Id: Makefile.in,v 1.8 2021/01/23 20:42:08 tom Exp $ +# $Id: Makefile.in,v 1.9 2021/07/03 15:45:33 tom Exp $ ############################################################################## # Copyright 2019-2020,2021 Thomas E. Dickey # # Copyright 2011-2015,2018 Free Software Foundation, Inc. # @@ -52,9 +52,26 @@ THIS = @ADA_LIBNAME@ DOCDIR = $(DESTDIR)$(datadir)/doc/$(THIS) MANDIR = $(DESTDIR)$(mandir)/man1 +################################################################################ + +@MAKE_PHONY@.PHONY : all +@MAKE_PHONY@.PHONY : check +@MAKE_PHONY@.PHONY : clean +@MAKE_PHONY@.PHONY : distclean +@MAKE_PHONY@.PHONY : install +@MAKE_PHONY@.PHONY : install.html +@MAKE_PHONY@.PHONY : install.man +@MAKE_PHONY@.PHONY : libs +@MAKE_PHONY@.PHONY : lint +@MAKE_PHONY@.PHONY : mostlyclean +@MAKE_PHONY@.PHONY : realclean +@MAKE_PHONY@.PHONY : sources +@MAKE_PHONY@.PHONY : uninstall +@MAKE_PHONY@.PHONY : uninstall.html +@MAKE_PHONY@.PHONY : uninstall.man + all \ sources \ -depend \ tags : $(DOCDIR) \ diff --git a/Ada95/gen/Makefile.in b/Ada95/gen/Makefile.in index 13835743f95e..525ce9987876 100644 --- a/Ada95/gen/Makefile.in +++ b/Ada95/gen/Makefile.in @@ -1,5 +1,5 @@ ############################################################################## -# Copyright 2019-2020,2021 Thomas E. Dickey # +# Copyright 2019-2022,2024 Thomas E. Dickey # # Copyright 1998-2015,2018 Free Software Foundation, Inc. # # # # Permission is hereby granted, free of charge, to any person obtaining a # @@ -30,7 +30,7 @@ # Author: Juergen Pfeifer, 1996 # and: Thomas E. Dickey, 1997 # -# $Id: Makefile.in,v 1.96 2021/01/23 20:42:08 tom Exp $ +# $Id: Makefile.in,v 1.103 2024/01/19 16:51:56 tom Exp $ # .SUFFIXES: @@ -103,8 +103,7 @@ PROG_GENERATE = ./generate$x GENERATE = $(PROG_GENERATE) '@USE_ARG_SUFFIX@' DEL_ADAMODE = sed -e '/^\-\-\ \ \-\*\-\ ada\ \-\*\-.*/d' -GNATHTML = `type -p gnathtml || type -p gnathtml.pl 2>/dev/null` -GNATHP = www.gnat.com +GNATHTML = `command -v gnathtml || command -v gnathtml.pl` ################################################################################ ALIB = @cf_ada_package@ @@ -143,6 +142,19 @@ GEN_SRC = $(srcdir)/$(ABASE).ads.m4 \ $(srcdir)/$(ABASE)-forms-field_user_data.ads.m4 \ $(srcdir)/$(ABASE)-panels-user_data.ads.m4 +################################################################################ + +@MAKE_PHONY@.PHONY : all +@MAKE_PHONY@.PHONY : clean +@MAKE_PHONY@.PHONY : distclean +@MAKE_PHONY@.PHONY : install +@MAKE_PHONY@.PHONY : install.libs +@MAKE_PHONY@.PHONY : libs +@MAKE_PHONY@.PHONY : mostlyclean +@MAKE_PHONY@.PHONY : realclean +@MAKE_PHONY@.PHONY : sources +@MAKE_PHONY@.PHONY : uninstall +@MAKE_PHONY@.PHONY : uninstall.libs all \ libs : $(GEN_TARGETS) @@ -171,7 +183,8 @@ $(ADA_SRCDIR)/$(ABASE)_constants.ads: $(PROG_GENERATE) $(WRAPPER) "$(GENERATE) $@" ################################################################################ $(ADA_SRCDIR)/$(ABASE).ads: $(srcdir)/$(ABASE).ads.m4 \ - $(srcdir)/normal.m4 + $(srcdir)/normal.m4 \ + options.m4 $(M4) $(M4FLAGS) -DM4MACRO=$(srcdir)/normal.m4 \ $(srcdir)/$(ABASE).ads.m4 |\ $(DEL_ADAMODE) >$@ @@ -272,6 +285,7 @@ mostlyclean :: -rm -f a.out core $(PROG_GENERATE) *.o clean :: mostlyclean + -rm -f options.m4 -rm -f $(GEN_TARGETS) instab.tmp *.ad[bs] *.html *.ali *.tmp distclean :: clean @@ -282,29 +296,39 @@ realclean :: distclean HTML_DIR = @ADAHTML_DIR@ +options.m4 : + $(SHELL) -c "if [ @cf_cv_enable_sigwinch@ = 0 ]; \ + then \ + dashes=' --'; \ + else \ + dashes='';\ + fi; \ + echo \"define(OPT_KEY_RESIZE,\\\`\$$dashes')dnl\" > $@" + instab.tmp : table.m4 $(GEN_SRC) @rm -f $@ @for f in $(GEN_SRC) ; do \ $(M4) $(M4FLAGS) -DM4MACRO=table.m4 $$f | $(DEL_ADAMODE) >> $@ ;\ done; +TABLE_TITLE=Correspondence between ncurses C and Ada functions + $(HTML_DIR)/table.html : instab.tmp @-touch $@ @-chmod +w $@ - @echo '<!DOCTYPE HTML' > $@ - @echo 'PUBLIC "-//IETF//DTD HTML 3.0//EN">' >> $@ - @echo '<HTML>' >> $@ - @echo '<HEAD>' >> $@ - @echo '<TITLE>Correspondence between ncurses C and Ada functions</TITLE>' >>$@ - @echo '</HEAD>' >> $@ - @echo '<BODY>' >> $@ - @echo '<H1>Correspondence between ncurses C and Ada functions</H1>' >>$@ - @echo '<H2>Sorted by C function name</H2>' >>$@ - @echo '<TABLE ALIGN=CENTER BORDER>' >>$@ - @echo '<TR ALIGN=LEFT>' >>$@ - @echo '<TH>C name</TH><TH>Ada name</TH><TH>man page</TH></TR>' >>$@ + @echo '<!DOCTYPE html PUBLIC "-//W3C//DTD HTML 4.01//EN">' > $@ + @echo '<html>' >> $@ + @echo '<head>' >> $@ + @echo '<title>$(TABLE_TITLE)</title>' >>$@ + @echo '</head>' >> $@ + @echo '<body>' >> $@ + @echo '<h1>$(TABLE_TITLE)</h1>' >>$@ + @echo '<h2>Sorted by C function name</h2>' >>$@ + @echo '<table align="center" border summary="$(TABLE_TITLE)">' >>$@ + @echo '<tr align="left">' >>$@ + @echo '<th>C name</th><th>Ada name</th><th>man page</th></tr>' >>$@ @sort < instab.tmp >> $@ - @echo '</TABLE></BODY></HTML>' >>$@ + @echo '</table></body></html>' >>$@ @rm -f instab.tmp adahtml: @@ -328,7 +352,7 @@ adahtml: for f in html/$(ALIB)*.htm*; do \ a=`basename $$f` ; \ sed -e 's/You may also.*body.*//' <$$f |\ - sed -e 's%GNAT%<A HREF="http://$(GNATHP)">GNAT</A>%g' |\ + sed -e 's%\<GNAT\>%<strong>GNAT</strong>%g' |\ sed -e 's%<A HREF%<A HREF%g' |\ sed -e 's%">%">%g' |\ sed -e 's%#1A\([[:space:]]*NAME="[^"]*"\)#2%<A\1>%' |\ diff --git a/Ada95/gen/adacurses-config.in b/Ada95/gen/adacurses-config.in index 2b055dc53f11..a5394170d752 100644 --- a/Ada95/gen/adacurses-config.in +++ b/Ada95/gen/adacurses-config.in @@ -1,7 +1,7 @@ #! /bin/sh -# $Id: adacurses-config.in,v 1.14 2020/02/02 23:34:34 tom Exp $ +# $Id: adacurses-config.in,v 1.15 2022/07/16 21:16:43 tom Exp $ ############################################################################## -# Copyright 2019,2020 Thomas E. Dickey # +# Copyright 2019-2020,2022 Thomas E. Dickey # # Copyright 2007-2014,2016 Free Software Foundation, Inc. # # # # Permission is hereby granted, free of charge, to any person obtaining a # @@ -45,17 +45,17 @@ CFLAGS="-aI$ADA_INCLUDE -aO$ADA_OBJECTS" LIBS="-L$ADA_OBJECTS -l@ADA_LIBNAME@" THIS="@ADA_LIBNAME@" -THIS_CFG="$THIS@DFT_ARG_SUFFIX@-config" +THIS_CFG="${THIS}@DFT_ARG_SUFFIX@-config" case "x$1" in x--version) echo @ADA_LIBNAME@ $VERSION ;; x--cflags) - echo $CFLAGS + echo "$CFLAGS" ;; x--libs) - echo $LIBS + echo "$LIBS" ;; x) # if no parameter is given, give what gnatmake needs @@ -77,7 +77,7 @@ If no options are given, echos the full set of flags needed by gnatmake. ENDHELP ;; *) - echo 'Usage: $THIS_CFG [--version | --cflags | --libs]' >&2 + echo "Usage: ${THIS_CFG} [--version | --cflags | --libs]" >&2 exit 1 ;; esac diff --git a/Ada95/gen/gen.c b/Ada95/gen/gen.c index 51bc161a4685..b37de1b0219b 100644 --- a/Ada95/gen/gen.c +++ b/Ada95/gen/gen.c @@ -1,5 +1,5 @@ /**************************************************************************** - * Copyright 2020 Thomas E. Dickey * + * Copyright 2020-2021,2024 Thomas E. Dickey * * Copyright 1998-2014,2016 Free Software Foundation, Inc. * * * * Permission is hereby granted, free of charge, to any person obtaining a * @@ -35,7 +35,7 @@ /* Version Control - $Id: gen.c,v 1.77 2020/08/16 18:05:05 tom Exp $ + $Id: gen.c,v 1.79 2024/01/19 13:41:45 tom Exp $ --------------------------------------------------------------------------*/ /* This program prints on its standard output the source for the @@ -95,7 +95,7 @@ print_size_of(FILE * fp, const char *name, size_t value) { - fprintf(fp, " %-28s : constant := %lu;\n", name, value); + fprintf(fp, " %-28s : constant := %lu;\n", name, (unsigned long)value); } #define PRINT_NAMED_CONSTANT(name) \ @@ -424,7 +424,9 @@ main(int argc, const char *argv[]) PRINT_NAMED_CONSTANT(KEY_SUSPEND); PRINT_NAMED_CONSTANT(KEY_UNDO); PRINT_NAMED_CONSTANT(KEY_MOUSE); +#ifdef KEY_RESIZE PRINT_NAMED_CONSTANT(KEY_RESIZE); +#endif print_comment(fp, "alternate character codes (ACS) from addch(3NCURSES)"); #define PRINT_ACS(name) print_size_of (fp, #name, (size_t)(&name - &acs_map[0])) @@ -490,6 +492,7 @@ main(int argc, const char *argv[]) print_comment(fp, "Field_Options from opts(3FORM)"); PRINT_NAMED_BITMASK(Field_Options, O_NL_OVERLOAD); PRINT_NAMED_BITMASK(Field_Options, O_BS_OVERLOAD); + /* Field_Options_Size is defined below */ print_comment(fp, "MEVENT structure from mouse(3NCURSES)"); diff --git a/Ada95/gen/terminal_interface-curses.adb.m4 b/Ada95/gen/terminal_interface-curses.adb.m4 index 3f34d203d57c..c966f9b98cb0 100644 --- a/Ada95/gen/terminal_interface-curses.adb.m4 +++ b/Ada95/gen/terminal_interface-curses.adb.m4 @@ -9,7 +9,7 @@ include(M4MACRO)---------------------------------------------------------------- -- B O D Y -- -- -- ------------------------------------------------------------------------------ --- Copyright 2018,2020 Thomas E. Dickey -- +-- Copyright 2018-2020,2024 Thomas E. Dickey -- -- Copyright 2007-2011,2014 Free Software Foundation, Inc. -- -- -- -- Permission is hereby granted, free of charge, to any person obtaining a -- @@ -38,8 +38,8 @@ include(M4MACRO)---------------------------------------------------------------- ------------------------------------------------------------------------------ -- Author: Juergen Pfeifer, 1996 -- Version Control: --- $Revision: 1.16 $ --- $Date: 2020/02/02 23:34:34 $ +-- $Revision: 1.17 $ +-- $Date: 2024/03/30 13:24:07 $ -- Binding Version 01.00 ------------------------------------------------------------------------------ with System; @@ -564,7 +564,7 @@ package body Terminal_Interface.Curses is L : constant Special_Key_Code := Special_Key_Code (Natural (Key_F0) + Natural (Function_Key_Number'Last)); begin - if (Key >= Key_F0) and then (Key <= L) then + if Key >= Key_F0 and then Key <= L then return True; else return False; diff --git a/Ada95/gen/terminal_interface-curses.ads.m4 b/Ada95/gen/terminal_interface-curses.ads.m4 index a5e9103683aa..d6b18e587a38 100644 --- a/Ada95/gen/terminal_interface-curses.ads.m4 +++ b/Ada95/gen/terminal_interface-curses.ads.m4 @@ -1,6 +1,6 @@ -- -*- ada -*- define(`HTMLNAME',`terminal_interface-curses__ads.htm')dnl -include(M4MACRO)------------------------------------------------------------------------------ +include(M4MACRO)include(options.m4)------------------------------------------------------------------------------ -- -- -- GNAT ncurses Binding -- -- -- @@ -9,7 +9,7 @@ include(M4MACRO)---------------------------------------------------------------- -- S P E C -- -- -- ------------------------------------------------------------------------------ --- Copyright 2020 Thomas E. Dickey -- +-- Copyright 2020,2024 Thomas E. Dickey -- -- Copyright 1998-2011,2014 Free Software Foundation, Inc. -- -- -- -- Permission is hereby granted, free of charge, to any person obtaining a -- @@ -38,8 +38,8 @@ include(M4MACRO)---------------------------------------------------------------- ------------------------------------------------------------------------------ -- Author: Juergen Pfeifer, 1996 -- Version Control: --- $Revision: 1.48 $ --- $Date: 2020/02/02 23:34:34 $ +-- $Revision: 1.49 $ +-- $Date: 2024/01/19 16:51:30 $ -- Binding Version 01.00 ------------------------------------------------------------------------------ with System.Storage_Elements; @@ -377,8 +377,8 @@ package Terminal_Interface.Curses is := Curses_Constants.KEY_UNDO; Key_Mouse : constant Special_Key_Code := Curses_Constants.KEY_MOUSE; - Key_Resize : constant Special_Key_Code - := Curses_Constants.KEY_RESIZE; +OPT_KEY_RESIZE Key_Resize : constant Special_Key_Code +OPT_KEY_RESIZE := Curses_Constants.KEY_RESIZE; Key_Max : constant Special_Key_Code := Special_Key_Code'Last; diff --git a/Ada95/include/MKncurses_def.sh b/Ada95/include/MKncurses_def.sh index 4b2ae4166880..9d80244152a9 100755 --- a/Ada95/include/MKncurses_def.sh +++ b/Ada95/include/MKncurses_def.sh @@ -1,7 +1,7 @@ #! /bin/sh -# $Id: MKncurses_def.sh,v 1.4 2020/02/02 23:34:34 tom Exp $ +# $Id: MKncurses_def.sh,v 1.5 2022/07/16 17:03:59 tom Exp $ ############################################################################## -# Copyright 2020 Thomas E. Dickey # +# Copyright 2020,2022 Thomas E. Dickey # # Copyright 2003 Free Software Foundation, Inc. # # # # Permission is hereby granted, free of charge, to any person obtaining a # @@ -56,7 +56,7 @@ cat <<EOF EOF -${AWK-awk} <$DEFS ' +"${AWK-awk}" <"$DEFS" ' !/^[@#]/ { if ( NF == 1 ) { diff --git a/Ada95/include/Makefile.in b/Ada95/include/Makefile.in index 58713d17d2bc..89bb27d2b65b 100644 --- a/Ada95/include/Makefile.in +++ b/Ada95/include/Makefile.in @@ -1,6 +1,6 @@ -# $Id: Makefile.in,v 1.6 2020/02/02 23:34:34 tom Exp $ +# $Id: Makefile.in,v 1.7 2021/07/03 15:45:33 tom Exp $ ############################################################################## -# Copyright 2020 Thomas E. Dickey # +# Copyright 2020,2021 Thomas E. Dickey # # Copyright 2010-2015,2018 Free Software Foundation, Inc. # # # # Permission is hereby granted, free of charge, to any person obtaining a # @@ -60,9 +60,21 @@ AUTO_SRC = \ ncurses_def.h ################################################################################ + +@MAKE_PHONY@.PHONY : all +@MAKE_PHONY@.PHONY : clean +@MAKE_PHONY@.PHONY : distclean +@MAKE_PHONY@.PHONY : install +@MAKE_PHONY@.PHONY : install.libs +@MAKE_PHONY@.PHONY : libs +@MAKE_PHONY@.PHONY : mostlyclean +@MAKE_PHONY@.PHONY : realclean +@MAKE_PHONY@.PHONY : sources +@MAKE_PHONY@.PHONY : uninstall +@MAKE_PHONY@.PHONY : uninstall.libs + all \ libs \ -depend \ sources \ install :: $(AUTO_SRC) diff --git a/Ada95/include/ncurses_defs b/Ada95/include/ncurses_defs index 7a7059bf7de9..adc1b24f8506 100644 --- a/Ada95/include/ncurses_defs +++ b/Ada95/include/ncurses_defs @@ -1,6 +1,6 @@ -# $Id: ncurses_defs,v 1.45 2020/02/02 23:34:34 tom Exp $ +# $Id: ncurses_defs,v 1.47 2021/12/04 23:08:11 tom Exp $ ############################################################################## -# Copyright 2020 Thomas E. Dickey # +# Copyright 2020,2021 Thomas E. Dickey # # Copyright 2008-2012,2013 Free Software Foundation, Inc. # # # # Permission is hereby granted, free of charge, to any person obtaining a # @@ -44,7 +44,7 @@ GCC_UNUSED /* nothing */ HAVE_BIG_CORE HAVE_BSD_CGETENT HAVE_BSD_SIGNAL_H -HAVE_BTOWC +HAVE_BTOWC HAVE_BUILTIN_H HAVE_CHGAT 1 HAVE_COLOR_SET 1 @@ -63,7 +63,6 @@ HAVE_GETNSTR HAVE_GETOPT_H HAVE_GETPARX 1 HAVE_GETTIMEOFDAY -HAVE_GETTTYNAM HAVE_GETWIN 1 HAVE_GPM_H HAVE_GPP_BUILTIN_H @@ -101,7 +100,7 @@ HAVE_PANEL_H HAVE_POLL HAVE_POLL_H HAVE_PURIFY -HAVE_PUTWC +HAVE_PUTWC HAVE_PUTWIN 1 HAVE_REGEXPR_H_FUNCS HAVE_REGEXP_H_FUNCS @@ -111,10 +110,7 @@ HAVE_RESIZETERM HAVE_RESIZE_TERM HAVE_RIPOFFLINE 1 HAVE_SELECT -HAVE_SETBUF -HAVE_SETBUFFER HAVE_SETUPTERM 1 -HAVE_SETVBUF HAVE_SIGACTION HAVE_SIGVEC HAVE_SIZECHANGE @@ -143,7 +139,6 @@ HAVE_TGETENT 1 HAVE_TIGETNUM 1 HAVE_TIGETSTR 1 HAVE_TIMES -HAVE_TTYENT_H HAVE_TYPEAHEAD 1 HAVE_TYPEINFO HAVE_TYPE_ATTR_T @@ -156,7 +151,7 @@ HAVE_VSNPRINTF HAVE_VSSCANF HAVE_WCSRTOMBS HAVE_WCSTOMBS -HAVE_WCTOB +HAVE_WCTOB HAVE_WCTOMB HAVE_WCTYPE_H HAVE_WINSSTR 1 diff --git a/Ada95/make-tar.sh b/Ada95/make-tar.sh index e88b312841b1..083812da49bb 100755 --- a/Ada95/make-tar.sh +++ b/Ada95/make-tar.sh @@ -1,7 +1,7 @@ #!/bin/sh -# $Id: make-tar.sh,v 1.18 2020/02/02 23:34:34 tom Exp $ +# $Id: make-tar.sh,v 1.23 2022/11/05 20:29:41 tom Exp $ ############################################################################## -# Copyright 2019,2020 Thomas E. Dickey # +# Copyright 2019-2021,2022 Thomas E. Dickey # # Copyright 2010-2015,2017 Free Software Foundation, Inc. # # # # Permission is hereby granted, free of charge, to any person obtaining a # @@ -37,14 +37,19 @@ export CDPATH TARGET=`pwd` -: ${ROOTNAME:=ncurses-Ada95} -: ${PKG_NAME:=AdaCurses} -: ${DESTDIR:=$TARGET} -: ${TMPDIR:=/tmp} +: "${ROOTNAME:=ncurses-Ada95}" +: "${PKG_NAME:=AdaCurses}" +: "${DESTDIR:=$TARGET}" +: "${TMPDIR:=/tmp}" + +# make timestamps of generated files predictable +same_timestamp() { + touch -r ../NEWS "$1" +} grep_assign() { - grep_assign=`egrep "^$2\>" "$1" | sed -e "s/^$2[ ]*=[ ]*//" -e 's/"//g'` - eval $2=\"$grep_assign\" + grep_assign=`grep -E "^$2\>" "$1" | sed -e "s/^$2[ ]*=[ ]*//" -e 's/"//g'` + eval "$2"=\""$grep_assign"\" } grep_patchdate() { @@ -59,29 +64,35 @@ edit_specfile() { sed \ -e "s/\\<MAJOR\\>/$NCURSES_MAJOR/g" \ -e "s/\\<MINOR\\>/$NCURSES_MINOR/g" \ - -e "s/\\<YYYYMMDD\\>/$NCURSES_PATCH/g" $1 >$1.new - chmod u+w $1 - mv $1.new $1 + -e "s/\\<YYYYMMDD\\>/$NCURSES_PATCH/g" "$1" >"$1.new" + chmod u+w "$1" + mv "$1.new" "$1" + same_timestamp "$1" } make_changelog() { - test -f $1 && chmod u+w $1 - cat >$1 <<EOF -`echo $PKG_NAME|tr '[A-Z]' '[a-z]'` ($NCURSES_MAJOR.$NCURSES_MINOR+$NCURSES_PATCH) unstable; urgency=low + [ -f "$1" ] && chmod u+w "$1" + cat >"$1" <<EOF +`echo $PKG_NAME|tr 'ABCDEFGHIJKLMNOPQRSTUVWXYZ' 'abcdefghijklmnopqrstuvwxyz'` ($NCURSES_MAJOR.$NCURSES_MINOR+$NCURSES_PATCH) unstable; urgency=low * snapshot of ncurses subpackage for $PKG_NAME. - -- `head -n 1 $HOME/.signature` `date -R` + -- `head -n 1 "$HOME"/.signature` `date -R` EOF + same_timestamp "$1" } # This can be run from either the subdirectory, or from the top-level # source directory. We will put the tar file in the original directory. -test -d ./Ada95 && cd ./Ada95 +if [ -d ./Ada95 ] +then + cd ./Ada95 || exit +fi SOURCE=`cd ..;pwd` BUILD=$TMPDIR/make-tar$$ -trap "cd /; rm -rf $BUILD; exit 0" EXIT INT QUIT TERM HUP +trap "cd /; rm -rf $BUILD; exit 1" 1 2 3 15 +trap "cd /; rm -rf $BUILD" 0 umask 077 if ! ( mkdir $BUILD ) @@ -92,46 +103,49 @@ fi umask 022 mkdir $BUILD/$ROOTNAME -cp -p -r * $BUILD/$ROOTNAME/ || exit +cp -p -r ./* $BUILD/$ROOTNAME/ || exit # Add the config.* utility scripts from the top-level directory. for i in . .. do - for j in config.guess config.sub install-sh tar-copy.sh + for j in COPYING config.guess config.sub install-sh tar-copy.sh do - test -f $i/$j && cp -p $i/$j $BUILD/$ROOTNAME/ + [ -f $i/$j ] && cp -p $i/$j $BUILD/$ROOTNAME/ done done # Make rpm and dpkg scripts for test-builds grep_patchdate -for spec in $BUILD/$ROOTNAME/package/*.spec +for spec in "$BUILD/$ROOTNAME"/package/*.spec do - edit_specfile $spec + edit_specfile "$spec" done -for spec in $BUILD/$ROOTNAME/package/debian* +for spec in "$BUILD/$ROOTNAME"/package/debian* do - make_changelog $spec/changelog + make_changelog "$spec"/changelog done cp -p ../man/MKada_config.in $BUILD/$ROOTNAME/doc/ -if test -z "$NO_HTML_DOCS" +if [ -z "$NO_HTML_DOCS" ] then # Add the ada documentation. cd ../doc/html || exit cp -p -r Ada* $BUILD/$ROOTNAME/doc/ cp -p -r ada $BUILD/$ROOTNAME/doc/ + + cd ../../Ada95 || exit fi -cp -p $SOURCE/NEWS $BUILD/$ROOTNAME +cp -p "$SOURCE/NEWS" $BUILD/$ROOTNAME # cleanup empty directories (an artifact of ncurses source archives) -touch $BUILD/$ROOTNAME/MANIFEST -( cd $BUILD/$ROOTNAME && find . -type f -print |$SOURCE/misc/csort >MANIFEST ) +touch $BUILD/$ROOTNAME/MANIFEST +( cd $BUILD/$ROOTNAME && find . -type f -print | "$SOURCE/misc/csort" >MANIFEST ) +same_timestamp $BUILD/$ROOTNAME/MANIFEST -cd $BUILD || exit +cd $BUILD || exit # Remove build-artifacts. find . -name RCS -exec rm -rf {} \; @@ -148,8 +162,11 @@ find . -name "*.gz" -exec rm -rf {} \; # Make the files writable... chmod -R u+w . -tar cf - $ROOTNAME | gzip >$DESTDIR/$ROOTNAME.tar.gz -cd $DESTDIR +# Cleanup timestamps +[ -n "$TOUCH_DIRS" ] && "$TOUCH_DIRS" "$ROOTNAME" + +tar cf - $TAR_OPTIONS $ROOTNAME | gzip >"$DESTDIR/$ROOTNAME.tar.gz" +cd "$DESTDIR" || exit pwd ls -l $ROOTNAME.tar.gz diff --git a/Ada95/mk-pkg.awk b/Ada95/mk-pkg.awk new file mode 100644 index 000000000000..bb07abe06276 --- /dev/null +++ b/Ada95/mk-pkg.awk @@ -0,0 +1,90 @@ +# $Id: mk-pkg.awk,v 1.1 2022/12/17 23:41:18 tom Exp $ +############################################################################## +# Copyright 2022 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 without limitation # +# the rights to use, copy, modify, merge, publish, distribute, distribute # +# with modifications, sublicense, and/or sell copies of the Software, and to # +# permit persons to whom the Software is furnished to do so, subject to the # +# following conditions: # +# # +# The above copyright notice and this permission notice shall be included in # +# all copies or substantial portions of the Software. # +# # +# THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR # +# IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, # +# FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL # +# THE ABOVE COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER # +# LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING # +# FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER # +# DEALINGS IN THE SOFTWARE. # +# # +# Except as contained in this notice, the name(s) of the above copyright # +# holders shall not be used in advertising or otherwise to promote the sale, # +# use or other dealings in this Software without prior written # +# authorization. # +############################################################################## +# +# Author: Thomas E. Dickey +# +# add rules to Makefile for AdaCurses binding package. +BEGIN { + print "# generated by mk-pkg.awk\n"; + } +END { + printf "PACKAGE = %s\n", PACKAGE + print "real_bindir = $(libexecdir)/$(PACKAGE)" + print "REAL_BINDIR = $(LIBEXECDIR)/$(PACKAGE)" + print "SUB_MFLAGS = $(TOP_MFLAGS) BINDIR=$(REAL_BINDIR)" + print "samples = samples" + print "" + print "TESTS = \\" + print " $(samples)/ncurses \\" + print " $(samples)/rain \\" + print " $(samples)/tour" + print "" + print "DATAFILES = \\" + print " $(samples)/explain.txt" + print "" + print "all:: $(TESTS)" + print "" + print "# we might install the example-programs" + print "$(PACKAGE) :" + print " @echo \"creating $(PACKAGE) script\"" + print " @$(SHELL) -c '\\" + print " L=$(real_bindir); \\" + print " rm -f $@; \\" + print " echo \"#!$(SHELL)\" > $@;\\" + print " echo \"PATH=\\\"$$L\\\":\\$$PATH\" >>$@;\\" + print " echo \"export PATH\" >>$@;\\" + print " echo \"if test \\$$# != 0; then\" >>$@;\\" + print " echo \" exec \\\"\\$$@\\\"\" >>$@;\\" + print " echo \"elif test -t 1; then\" >>$@;\\" + print " echo \" cd \\\"$$L\\\" || exit\" >>$@;\\" + print " echo \" ls -l | \\$${PAGER:-less}\" >>$@;\\" + print " echo \"fi\" >>$@;\\" + print " echo \"echo \\\"usage: $@ [program]\\\"\" >>$@'" + print "" + print "install \\" + print "install.examples:: $(PACKAGE) $(BINDIR) $(REAL_BINDIR) $(DATADIR) $(TESTS)" + print " @echo \"installing $(PACKAGE) -> $(BINDIR)/\"" + print " $(INSTALL_SCRIPT) $(PACKAGE) $(BINDIR)" + print " ( cd samples && $(MAKE) $(SUB_MFLAGS) install.examples )" + print "" + print "uninstall \\" + print "uninstall.examples ::" + print " -rm -f $(BINDIR)/$(PACKAGE)" + print " ( cd samples && $(MAKE) $(SUB_MFLAGS) uninstall.examples )" + print "" + print "clean \\" + print "mostlyclean \\" + print "realclean \\" + print "distclean ::" + print " -rm -f $(PACKAGE)" + print "" + print "$(BINDIR) $(REAL_BINDIR) $(DATADIR) :" + print " mkdir -p $@" + + } diff --git a/Ada95/package/AdaCurses.spec b/Ada95/package/AdaCurses.spec index 9b39110eb842..540e8e54bad8 100644 --- a/Ada95/package/AdaCurses.spec +++ b/Ada95/package/AdaCurses.spec @@ -2,7 +2,7 @@ Summary: Ada95 binding for ncurses %define AppProgram AdaCurses %define AppVersion MAJOR.MINOR %define AppRelease YYYYMMDD -# $Id: AdaCurses.spec,v 1.25 2019/11/23 21:15:31 tom Exp $ +# $Id: AdaCurses.spec,v 1.31 2022/12/18 00:08:17 tom Exp $ Name: %{AppProgram} Version: %{AppVersion} Release: %{AppRelease} @@ -20,9 +20,13 @@ In addition to a library, this package installs sample programs in "bin/%{AppProgram}" to avoid conflict with other packages. %prep +%global is_mandriva %(test -f /etc/mandriva-release && echo 1 || echo 0) +%global is_redhat %(test -f /etc/redhat-release && echo 1 || echo 0) +%global is_suse %(if grep -E -i '(opensuse)' /etc/issue >/dev/null; then echo 1; else echo 0; fi) + %define debug_package %{nil} -%define need_filter %(if grep -E -i '(mageia|red hat|fedora)' /etc/issue >/dev/null; then echo 1; elif test -f /etc/fedora-release; then echo 1; else echo 0; fi) +%define need_filter %(if grep -E -i '(red hat|fedora)' /etc/issue >/dev/null; then echo 1; elif test -f /etc/fedora-release; then echo 1; else echo 0; fi) %if %{need_filter} == 1 # http://fedoraproject.org/wiki/EPEL:Packaging_Autoprovides_and_Requires_Filtering @@ -34,22 +38,38 @@ In addition to a library, this package installs sample programs in %build -%define ada_libdir %{_prefix}/lib/ada/adalib +%define ada_libdir %{_libdir}/ada/adalib %define ada_include %{_prefix}/share/ada/adainclude +%if %{is_mandriva} +# Mageia 8 lacks gprbuild, needed for building shared libraries. +%define ada_model --without-shared --without-ada-sharedlib --with-ada-objects=%{_libdir}/adalib +%else +# OpenSUSE actually lacks gprbuild, but there is a workable "community" package. +%define ada_model --with-shared --with-ada-sharedlib +%if %{is_redhat} +# Fedora 36 LTO does not work with gprbuild system configuration. +unset CFLAGS +unset LDFLAGS +unset LT_SYS_LIBRARY_PATH +%endif +%endif + INSTALL_PROGRAM='${INSTALL}' \ - ./configure \ + ./configure %{ada_model} \ --target %{_target_platform} \ --prefix=%{_prefix} \ --bindir=%{_bindir} \ --libdir=%{_libdir} \ + --libexecdir=%{_libexecdir} \ --with-ada-include=%{ada_include} \ --with-ada-objects=%{ada_libdir} \ --mandir=%{_mandir} \ --datadir=%{_datadir} \ --disable-rpath-link \ - --with-shared \ - --with-ada-sharedlib + --disable-echo \ + --verbose \ + --enable-warnings make @@ -57,12 +77,7 @@ make [ "$RPM_BUILD_ROOT" != "/" ] && rm -rf $RPM_BUILD_ROOT make install DESTDIR=$RPM_BUILD_ROOT - -( cd samples && - make install.examples \ - DESTDIR=$RPM_BUILD_ROOT \ - BINDIR=$RPM_BUILD_ROOT%{_bindir}/%{AppProgram} -) +make install.examples DESTDIR=$RPM_BUILD_ROOT %clean if rm -rf $RPM_BUILD_ROOT; then @@ -74,12 +89,16 @@ exit 0 %files %defattr(-,root,root) +%{_bindir}/%{AppProgram} %{_bindir}/adacurses*-config -%{_bindir}/%{AppProgram}/* +%{_libexecdir}/%{AppProgram}/* %{ada_libdir}/ %if %{need_filter} == 1 %{_libdir}/lib%{AppProgram}.* %endif +%if %{is_suse} +%{_libdir}/lib%{AppProgram}.* +%endif %{_mandir}/man1/adacurses*-config.1* %{_datadir}/%{AppProgram}/* %{ada_include}/ @@ -87,6 +106,16 @@ exit 0 %changelog # each patch should add its ChangeLog entries here +* Sat Dec 17 2022 Thomas Dickey +- install sample programs in libexec + +* Sat Nov 19 2022 Thomas Dickey +- use static libraries for Mageia. + +* Sat Nov 12 2022 Thomas Dickey +- unset environment variables to work around Fedora LTO bugs. +- build-fix for OpenSUSE with gprbuild. + * Sat Nov 16 2019 Thomas Dickey - modify clean-rule to work around Fedora NFS bugs. diff --git a/Ada95/package/debian/compat b/Ada95/package/debian/compat index f599e28b8ab0..48082f72f087 100644 --- a/Ada95/package/debian/compat +++ b/Ada95/package/debian/compat @@ -1 +1 @@ -10 +12 diff --git a/Ada95/package/debian/control b/Ada95/package/debian/control index 030adb17a5d2..1a9aefdaa839 100644 --- a/Ada95/package/debian/control +++ b/Ada95/package/debian/control @@ -2,9 +2,11 @@ Source: adacurses Maintainer: Thomas E. Dickey <dickey@invisible-island.net> Section: misc Priority: optional -Standards-Version: 3.8.4 -Build-Depends: debhelper (>= 5) +Build-Depends: debhelper (>= 5), + gnat, + gprbuild Homepage: https://invisible-island.net/adacurses/ +Standards-Version: 4.6.1.0 Package: adacurses Architecture: any diff --git a/Ada95/package/debian/copyright b/Ada95/package/debian/copyright index 897961d04527..b4060150e667 100644 --- a/Ada95/package/debian/copyright +++ b/Ada95/package/debian/copyright @@ -4,13 +4,13 @@ Current ncurses maintainer: Thomas Dickey <dickey@invisible-island.net> ------------------------------------------------------------------------------- Files: * -Copyright: 2017-2020,2021 by Thomas E. Dickey +Copyright: 2017-2023,2024 by Thomas E. Dickey Copyright: 1998-2016,2017 Free Software Foundation, Inc. -Licence: X11 +License: X11 Files: aclocal.m4 package -Copyright: 2010-2020,2021 by Thomas E. Dickey -Licence: X11 +Copyright: 2010-2023,2024 by Thomas E. Dickey +License: X11 Permission is hereby granted, free of charge, to any person obtaining a copy of this software and associated documentation files (the @@ -39,7 +39,7 @@ Licence: X11 ------------------------------------------------------------------------------- Files: install-sh Copyright: 1994 X Consortium -Licence: X11 +License: X11 Permission is hereby granted, free of charge, to any person obtaining a copy of this software and associated documentation files (the "Software"), to diff --git a/Ada95/package/debian/rules b/Ada95/package/debian/rules index 708d3eb2d591..0adde8de5345 100755 --- a/Ada95/package/debian/rules +++ b/Ada95/package/debian/rules @@ -12,7 +12,7 @@ DEB_HOST_GNU_TYPE ?= $(shell dpkg-architecture -qDEB_HOST_GNU_TYPE) DEB_BUILD_GNU_TYPE ?= $(shell dpkg-architecture -qDEB_BUILD_GNU_TYPE) TARGET_DIR = $(CURDIR)/debian/adacurses -SAMPLE_DIR = $(TARGET_DIR)/usr/bin/AdaCurses +SAMPLE_DIR = $(TARGET_DIR)/usr/libexec/AdaCurses CFLAGS = $(shell dpkg-buildflags --get CFLAGS) $(CC_NORMAL) CPPFLAGS = $(shell dpkg-buildflags --get CPPFLAGS) @@ -67,11 +67,11 @@ install: install-stamp install-stamp: build-stamp dh_testdir dh_testroot - dh_clean -k + dh_prep dh_installdirs $(MAKE) install DESTDIR=$(TARGET_DIR) - + # FIXME: it would be nice to make these into separate packages ( cd samples && $(MAKE) install.examples DESTDIR=$(TARGET_DIR) BINDIR=$(SAMPLE_DIR) ) ( cd doc && $(MAKE) install.html DESTDIR=$(TARGET_DIR) ) diff --git a/Ada95/samples/Makefile.in b/Ada95/samples/Makefile.in index 3a0c272f4092..3731085a3e51 100644 --- a/Ada95/samples/Makefile.in +++ b/Ada95/samples/Makefile.in @@ -29,7 +29,7 @@ # # Author: Juergen Pfeifer, 1996 # -# $Id: Makefile.in,v 1.62 2021/01/23 20:42:08 tom Exp $ +# $Id: Makefile.in,v 1.64 2021/07/03 15:45:33 tom Exp $ # .SUFFIXES: @@ -107,7 +107,23 @@ THISLIB = sample CARGS = -cargs $(ADAFLAGS) LARGS = -largs -L../lib -l@ADA_LIBNAME@ @TEST_ARG2@ $(LD_FLAGS) @TEST_LIBS2@ -PROGS = tour$x ncurses$x @USE_GNAT_SIGINT@ rain$x +PROGS = tour$x ncurses$x @USE_GNAT_SIGINT@ rain$x + +################################################################################ + +@MAKE_PHONY@.PHONY : all +@MAKE_PHONY@.PHONY : clean +@MAKE_PHONY@.PHONY : distclean +@MAKE_PHONY@.PHONY : install +@MAKE_PHONY@.PHONY : install.examples +@MAKE_PHONY@.PHONY : install.libs +@MAKE_PHONY@.PHONY : libs +@MAKE_PHONY@.PHONY : mostlyclean +@MAKE_PHONY@.PHONY : realclean +@MAKE_PHONY@.PHONY : sources +@MAKE_PHONY@.PHONY : uninstall +@MAKE_PHONY@.PHONY : uninstall.examples +@MAKE_PHONY@.PHONY : uninstall.libs all :: $(PROGS) @echo made $@ diff --git a/Ada95/samples/explain.txt b/Ada95/samples/explain.txt index be2cba154ee2..f05eede302a6 100644 --- a/Ada95/samples/explain.txt +++ b/Ada95/samples/explain.txt @@ -27,15 +27,15 @@ In a menu you can use the following Keys in the whole application: - Cursor Right Right one item - END Key Go to last item #FORMKEYS - - CTRL-X eXit the form + - CTRL-X eXit the form - CTRL-F Go forward to the next field - CTRL-B Go backward to the previous field - - CTRL-L Go to the field left of the current one + - CTRL-L Go to the field left of the current one - CTRL-R Go to the field right of the current one - - CTRL-U Go to the field above the current one - - CTRL-D Go to the field below the current one + - CTRL-U Go to the field above the current one + - CTRL-D Go to the field below the current one - - CTRL-W Go to the next word in the field + - CTRL-W Go to the next word in the field - CTRL-T Go to the previous word in the field - CTRL-A Go to the beginning of the field @@ -43,13 +43,13 @@ In a menu you can use the following Keys in the whole application: - CTRL-I Insert a blank character at the current position - CTRL-O Insert a line - - CTRL-V Delete a character - - CTRL-H Delete previous character - - CTRL-Y Delete a line - - CTRL-G Delete a word - - CTRL-K Clear to end of field + - CTRL-V Delete a character + - CTRL-H Delete previous character + - CTRL-Y Delete a line + - CTRL-G Delete a word + - CTRL-K Clear to end of field - - CTRL-N Next choice in a choice field (Enumerations etc.) + - CTRL-N Next choice in a choice field (Enumerations etc.) - CTRL-P Previous choice in a choice field. #HELP #HELPKEYS @@ -61,8 +61,8 @@ You may leave the help with the Function Key labeled 'Quit'. #MAIN This is the main menu of the sample program for the ncurses Ada95 binding. The main intention of the demo is not to demonstrate or -test all the features of ncurses and it's subsystems, but to provide -to you some sample code how to use the binding with Ada95. +test all the features of ncurses and its subsystems, but to provide +to you some sample code how to use the binding with Ada95. You may select this options: @@ -71,7 +71,7 @@ You may select this options: * Look at some features of the form subsystem * Look at the output of the Ada.Text_IO like functions for ncurses. - + #MAINPAD You may press at any place in this demo CTRL-C. This will give you a command window. You can just type in the Label-String of a function key, then this @@ -86,13 +86,13 @@ descriptions for the items, a marker and a padding character between the item name and the description. #MENU01 This is a demo of the some of the menu layout options. One of them -is the spacing functionality. Just press the Key labeled "Flip" to +is the spacing functionality. Just press the Key labeled "Flip" to flip between the non-spaced and a spaced version of the menu. Please -note that this functionality is unique for ncurses and is not found -in the SVr4 menu implementation. +note that this functionality is unique for ncurses and is not found +in the SVr4 menu implementation. -This is a menu that sometimes does not fit into it's window and -therefore it becomes a scroll menu. +This is a menu that sometimes does not fit into its window and +therefore it becomes a scroll menu. You can also see here very nicely the pattern matching functionality of menus. Type for example a 'J' and you will be positioned to the @@ -106,10 +106,10 @@ labeled "4x1", "4x2" or "4x3" to get a menu with that many rows and columns. With the Keys "O-Row" or "O-Col" (they occupy the same label and -switch on selection) you can change the major order scheme for +switch on selection) you can change the major order scheme for the menu. If "O-Col" is visible, the menu is currently major ordered by rows, you can switch to major column order by pressing -the key. If "O-Row" is visible, it's just the reverse situation. +the key. If "O-Row" is visible, it is just the reverse situation. This Key is not visible in "4x1" layout mode, because in this case the functionality makes no sense. @@ -136,7 +136,7 @@ For more details press the Key labeled "Help". This is a demo of the forms package. #FORM-PAD00 Please note that this demo is far from being complete. It really shows -only a small part of the functionality of the forms package. Let's hope +only a small part of the functionality of the forms package. Let's hope the next version will have a richer demo (You want to contribute ?). #NOTIMPL Sorry this functionality of the demo is not implemented at the moment. @@ -148,7 +148,7 @@ This is a menu where you can select some different demos of the ncurses functionality. #CURSES-PAD00 Please note that this demo is far from being complete. It really shows -only a small part of the functionality of the curses package. Let's hope +only a small part of the functionality of the curses package. Let's hope the next version will have a richer demo (You want to contribute ?). #MOUSEKEYS In this demo you may use this keys: @@ -160,16 +160,16 @@ In this demo you may use this keys: You may click the mouse buttons at any location at the screen and look at the protocol window ! #MOUSE00 -A rather simple use of a mouse as demo. It's there just to test the -code and to provide the sample source. +A rather simple use of a mouse as demo. It is there just to test the +code and to provide the sample source. It might be of interest, that the output into the protocol window is done by the (n)curses Text_IO subpackages. Especially the output of -the button and state names is done by Ads's enumeration IO, which +the button and state names is done by Ads's enumeration IO, which allows you to print the names of enumeration literals. That's really nice. #MOUSE-PAD00 -This is a very simple demo of the mouse features of ncurses. It's there +This is a very simple demo of the mouse features of ncurses. It is there just to test whether or not the generated code for the binding really works on the different architectures (seems so). #ATTRIBDEMO diff --git a/Ada95/samples/ncurses2-demo_forms.adb b/Ada95/samples/ncurses2-demo_forms.adb index 5c86af793357..b2d72ba4c6f3 100644 --- a/Ada95/samples/ncurses2-demo_forms.adb +++ b/Ada95/samples/ncurses2-demo_forms.adb @@ -7,7 +7,7 @@ -- B O D Y -- -- -- ------------------------------------------------------------------------------ --- Copyright 2020 Thomas E. Dickey -- +-- Copyright 2020,2021 Thomas E. Dickey -- -- Copyright 2000-2011,2014 Free Software Foundation, Inc. -- -- -- -- Permission is hereby granted, free of charge, to any person obtaining a -- @@ -36,8 +36,8 @@ ------------------------------------------------------------------------------ -- Author: Eugene V. Melaragno <aldomel@ix.netcom.com> 2000 -- Version Control --- $Revision: 1.8 $ --- $Date: 2020/02/02 23:34:34 $ +-- $Revision: 1.9 $ +-- $Date: 2021/09/04 10:52:55 $ -- Binding Version 01.00 ------------------------------------------------------------------------------ with ncurses2.util; use ncurses2.util; @@ -381,7 +381,7 @@ procedure ncurses2.demo_forms is Set_KeyPad_Mode (w, True); end if; - -- TODO if Post(f) /= Form_Ok then it's a procedure + -- TODO if Post(f) /= Form_Ok then it is a procedure declare begin Post (f); diff --git a/Ada95/samples/ncurses2-overlap_test.adb b/Ada95/samples/ncurses2-overlap_test.adb index 11a2d0be782b..6f3341ba2f23 100644 --- a/Ada95/samples/ncurses2-overlap_test.adb +++ b/Ada95/samples/ncurses2-overlap_test.adb @@ -7,7 +7,7 @@ -- B O D Y -- -- -- ------------------------------------------------------------------------------ --- Copyright 2020 Thomas E. Dickey -- +-- Copyright 2020-2021,2024 Thomas E. Dickey -- -- Copyright 2000-2014,2015 Free Software Foundation, Inc. -- -- -- -- Permission is hereby granted, free of charge, to any person obtaining a -- @@ -36,8 +36,8 @@ ------------------------------------------------------------------------------ -- Author: Eugene V. Melaragno <aldomel@ix.netcom.com> 2000 -- Version Control --- $Revision: 1.8 $ --- $Date: 2020/02/02 23:34:34 $ +-- $Revision: 1.10 $ +-- $Date: 2024/03/30 13:21:15 $ -- Binding Version 01.00 ------------------------------------------------------------------------------ with ncurses2.util; use ncurses2.util; @@ -73,8 +73,8 @@ procedure ncurses2.overlap_test is Get_Size (win, y1, x1); for y in 0 .. y1 - 1 loop for x in 0 .. x1 - 1 loop - if ((x > (x1 - 1) / 3) and (x <= (2 * (x1 - 1)) / 3)) or - (((y > (y1 - 1) / 3) and (y <= (2 * (y1 - 1)) / 3))) + if (x > (x1 - 1) / 3 and x <= (2 * (x1 - 1)) / 3) or + (y > (y1 - 1) / 3 and y <= (2 * (y1 - 1)) / 3) then Move_Cursor (win, y, x); Add (win, Ch => ch); @@ -130,9 +130,9 @@ begin Refresh_Without_Update (win2); Refresh_Without_Update (win1); Update_Screen; - when 'c' => -- fill window A so it's visible + when 'c' => -- fill window A so it is visible fillwin (win1, 'A'); - when 'd' => -- fill window B so it's visible + when 'd' => -- fill window B so it is visible fillwin (win2, 'B'); when 'e' => -- cross test pattern in window A crosswin (win1, 'A'); diff --git a/Ada95/samples/ncurses2-trace_set.adb b/Ada95/samples/ncurses2-trace_set.adb index d2739809dad4..3b1983daf592 100644 --- a/Ada95/samples/ncurses2-trace_set.adb +++ b/Ada95/samples/ncurses2-trace_set.adb @@ -7,7 +7,7 @@ -- B O D Y -- -- -- ------------------------------------------------------------------------------ --- Copyright 2020 Thomas E. Dickey -- +-- Copyright 2020,2023 Thomas E. Dickey -- -- Copyright 2000-2011,2014 Free Software Foundation, Inc. -- -- -- -- Permission is hereby granted, free of charge, to any person obtaining a -- @@ -36,8 +36,8 @@ ------------------------------------------------------------------------------ -- Author: Eugene V. Melaragno <aldomel@ix.netcom.com> 2000 -- Version Control --- $Revision: 1.7 $ --- $Date: 2020/02/02 23:34:34 $ +-- $Revision: 1.8 $ +-- $Date: 2023/06/17 17:21:47 $ -- Binding Version 01.00 ------------------------------------------------------------------------------ with ncurses2.util; use ncurses2.util; @@ -121,7 +121,7 @@ procedure ncurses2.trace_set is Trace_Attribute_Set'(Character_Calls => True, others => False)), (new String'("Termcap_TermInfo"), Trace_Attribute_Set'(Termcap_TermInfo => True, others => False)), - (new String'("Maximium"), + (new String'("Maximum"), Trace_Maximum) ); @@ -353,7 +353,7 @@ procedure ncurses2.trace_set is if subset (tlevel, Trace_Maximum) then - Append (buf, "Maximium"); + Append (buf, "Maximum"); Append (buf, ", "); end if; end if; diff --git a/Ada95/samples/sample-menu_demo-aux.adb b/Ada95/samples/sample-menu_demo-aux.adb index f430c88cd7c6..f64e41da8f73 100644 --- a/Ada95/samples/sample-menu_demo-aux.adb +++ b/Ada95/samples/sample-menu_demo-aux.adb @@ -7,7 +7,7 @@ -- B O D Y -- -- -- ------------------------------------------------------------------------------ --- Copyright 2020 Thomas E. Dickey -- +-- Copyright 2020,2023 Thomas E. Dickey -- -- Copyright 1998-2006,2009 Free Software Foundation, Inc. -- -- -- -- Permission is hereby granted, free of charge, to any person obtaining a -- @@ -36,8 +36,8 @@ ------------------------------------------------------------------------------ -- Author: Juergen Pfeifer, 1996 -- Version Control --- $Revision: 1.15 $ --- $Date: 2020/02/02 23:34:34 $ +-- $Revision: 1.16 $ +-- $Date: 2023/06/17 17:21:59 $ -- Binding Version 01.00 ------------------------------------------------------------------------------ with Ada.Characters.Latin_1; use Ada.Characters.Latin_1; @@ -79,7 +79,7 @@ package body Sample.Menu_Demo.Aux is -- Calculate horizontal coordinate at the screen center X := (Columns - C) / 2; - Y := 1; -- always startin line 1 + Y := 1; -- always starting on line 1 end Geometry; diff --git a/Ada95/samples/split-path.awk b/Ada95/samples/split-path.awk index 86e8ccdc10f1..5b340ba5cd6a 100644 --- a/Ada95/samples/split-path.awk +++ b/Ada95/samples/split-path.awk @@ -1,5 +1,5 @@ ############################################################################## -# Copyright 2020 Thomas E. Dickey # +# Copyright 2020,2022 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"), # @@ -28,9 +28,11 @@ # # Author: Thomas E. Dickey # -# $Id: split-path.awk,v 1.3 2020/02/02 23:34:34 tom Exp $ +# $Id: split-path.awk,v 1.4 2022/11/26 23:46:20 tom Exp $ BEGIN { cols = 72; } /[$]THIS_DATADIR/ { + if (substr(this_datadir, length(this_datadir)) != "/") + this_datadir = this_datadir "/"; gsub("[$]THIS_DATADIR", "\"" this_datadir "\""); if ( length ($0) > cols ) { indent = index($0, "\"") - 1; diff --git a/Ada95/src/Makefile.in b/Ada95/src/Makefile.in index 8360779ec830..eb4489b04c85 100644 --- a/Ada95/src/Makefile.in +++ b/Ada95/src/Makefile.in @@ -29,7 +29,7 @@ # # Author: Juergen Pfeifer, 1996 # -# $Id: Makefile.in,v 1.95 2021/01/23 20:42:08 tom Exp $ +# $Id: Makefile.in,v 1.96 2021/07/03 15:45:33 tom Exp $ # .SUFFIXES: @@ -174,6 +174,20 @@ GENOBJS=$(ABASE)-menus-menu_user_data.o \ $(ABASE)-text_io-modular_io.o \ $(ABASE)-text_io-complex_io.o +################################################################################ + +@MAKE_PHONY@.PHONY : all +@MAKE_PHONY@.PHONY : clean +@MAKE_PHONY@.PHONY : distclean +@MAKE_PHONY@.PHONY : install +@MAKE_PHONY@.PHONY : install.libs +@MAKE_PHONY@.PHONY : libs +@MAKE_PHONY@.PHONY : mostlyclean +@MAKE_PHONY@.PHONY : realclean +@MAKE_PHONY@.PHONY : sources +@MAKE_PHONY@.PHONY : uninstall +@MAKE_PHONY@.PHONY : uninstall.libs + all :: $(BUILD_DIR_LIB)/$(STATIC_LIBNAME) @echo done diff --git a/Ada95/src/c_threaded_variables.c b/Ada95/src/c_threaded_variables.c index 4c13153ed095..44b4bcbc9e13 100644 --- a/Ada95/src/c_threaded_variables.c +++ b/Ada95/src/c_threaded_variables.c @@ -1,5 +1,5 @@ /**************************************************************************** - * Copyright 2020 Thomas E. Dickey * + * Copyright 2020,2022 Thomas E. Dickey * * Copyright 2014 Free Software Foundation, Inc. * * * * Permission is hereby granted, free of charge, to any person obtaining a * @@ -35,7 +35,7 @@ #define WRAP(type, name) \ type \ - name ## _as_function () \ + name ## _as_function (void) \ { \ return name; \ } diff --git a/Ada95/src/library-cfg.sh b/Ada95/src/library-cfg.sh index c41661705a87..b9b5c9389495 100755 --- a/Ada95/src/library-cfg.sh +++ b/Ada95/src/library-cfg.sh @@ -1,6 +1,6 @@ #!/bin/sh ############################################################################## -# Copyright 2018-2019,2020 Thomas E. Dickey # +# Copyright 2018-2020,2022 Thomas E. Dickey # # Copyright 2016,2018 Free Software Foundation, Inc. # # # # Permission is hereby granted, free of charge, to any person obtaining a # @@ -28,7 +28,7 @@ # authorization. # ############################################################################## # -# $Id: library-cfg.sh,v 1.7 2020/02/02 23:34:34 tom Exp $ +# $Id: library-cfg.sh,v 1.8 2022/07/16 17:03:59 tom Exp $ # # Work around incompatible behavior introduced with gnat6, which causes # gnatmake to attempt to compile all of the C objects which might be part of @@ -67,7 +67,7 @@ cat >$SCRIPT <<EOF } EOF -sed -f $SCRIPT $input +sed -f "$SCRIPT" "$input" rc=$? -rm -f $SCRIPT -exit $? +rm -f "$SCRIPT" +exit $rc |