From e08b207a83337e02460f37d8b789cc164b7a3b0b Mon Sep 17 00:00:00 2001 From: John Zaitseff Date: Fri, 29 Jul 2011 12:41:43 +1000 Subject: [PATCH] Update all auto-generated files The auto-generated files are created by running ./build-aux/bootstrap with Gnulib as at commit fb733077fcd97a36e1ffdb292387943df8e1b9b4 (with a date stamp of Mon Jul 25 18:29:59 2011 +0200), Autoconf 2.68 and Automake 1.11.1. --- config.h.in | 33 +- configure | 1309 +++++++++++++++++++++++++++++++++++--------- m4/gnulib-comp.m4 | 2 + m4/include_next.m4 | 14 +- m4/warn-on-use.m4 | 4 +- 5 files changed, 1077 insertions(+), 285 deletions(-) diff --git a/config.h.in b/config.h.in index 8363379..31ee815 100644 --- a/config.h.in +++ b/config.h.in @@ -138,9 +138,21 @@ libc. */ #undef HAVE_COPYSIGN_IN_LIBC -/* Define if you have curses.h */ +/* Define to 1 if a SysV or X/Open compatible Curses library is present */ +#undef HAVE_CURSES + +/* Define to 1 if library supports color (enhanced functions) */ +#undef HAVE_CURSES_COLOR + +/* Define to 1 if library supports X/Open Enhanced functions */ +#undef HAVE_CURSES_ENHANCED + +/* Define to 1 if is present */ #undef HAVE_CURSES_H +/* Define to 1 if library supports certain obsolete features */ +#undef HAVE_CURSES_OBSOLETE + /* Define to 1 if you have the declaration of `copysign', and to 0 if you don't. */ #undef HAVE_DECL_COPYSIGN @@ -241,13 +253,22 @@ /* Define to 1 if you have the `mprotect' function. */ #undef HAVE_MPROTECT -/* Define if you have libncursesw */ +/* Define to 1 if the Ncurses library is present */ +#undef HAVE_NCURSES + +/* Define to 1 if the NcursesW library is present */ #undef HAVE_NCURSESW -/* Define if you have ncursesw.h */ +/* Define to 1 if is present */ +#undef HAVE_NCURSESW_CURSES_H + +/* Define to 1 if is present */ #undef HAVE_NCURSESW_H -/* Define if you have ncurses.h */ +/* Define to 1 if is present */ +#undef HAVE_NCURSES_CURSES_H + +/* Define to 1 if is present */ #undef HAVE_NCURSES_H /* Define to 1 if you have the `nl_langinfo' function. */ @@ -1189,7 +1210,3 @@ /* Define as a macro for copying va_list variables. */ #undef va_copy - -/* Define to empty if the keyword `volatile' does not work. Warning: valid - code using `volatile' can become incorrect without. Disable with care. */ -#undef volatile diff --git a/configure b/configure index 72f52e4..164d4fc 100755 --- a/configure +++ b/configure @@ -1,6 +1,6 @@ #! /bin/sh # Guess values for system-dependent variables and create Makefiles. -# Generated by GNU Autoconf 2.68 for Star Traders 7.0. +# Generated by GNU Autoconf 2.68 for Star Traders 7.1. # # Report bugs to . # @@ -560,8 +560,8 @@ MAKEFLAGS= # Identity of this package. PACKAGE_NAME='Star Traders' PACKAGE_TARNAME='trader' -PACKAGE_VERSION='7.0' -PACKAGE_STRING='Star Traders 7.0' +PACKAGE_VERSION='7.1' +PACKAGE_STRING='Star Traders 7.1' PACKAGE_BUGREPORT='J.Zaitseff@zap.org.au' PACKAGE_URL='http://www.zap.org.au/software/trader/' @@ -1410,7 +1410,8 @@ CFLAGS LDFLAGS LIBS CPPFLAGS -CPP' +CPP +CURSES_LIB' # Initialize some variables set by options. @@ -1953,7 +1954,7 @@ if test "$ac_init_help" = "long"; then # Omit some internal or obsolete options to make the list less imposing. # This message is too long to be a string in the A/UX 3.1 sh. cat <<_ACEOF -\`configure' configures Star Traders 7.0 to adapt to many kinds of systems. +\`configure' configures Star Traders 7.1 to adapt to many kinds of systems. Usage: $0 [OPTION]... [VAR=VALUE]... @@ -2023,7 +2024,7 @@ fi if test -n "$ac_init_help"; then case $ac_init_help in - short | recursive ) echo "Configuration of Star Traders 7.0:";; + short | recursive ) echo "Configuration of Star Traders 7.1:";; esac cat <<\_ACEOF @@ -2038,8 +2039,8 @@ Optional Features: Optional Packages: --with-PACKAGE[=ARG] use PACKAGE [ARG=yes] --without-PACKAGE do not use PACKAGE (same as --with-PACKAGE=no) - --with-ncurses Force the use of ncurses over curses - --without-ncursesw Don't use ncursesw (wide character support) + --with-ncurses force the use of Ncurses or NcursesW + --without-ncursesw do not use NcursesW (wide character support) Some influential environment variables: CC C compiler command @@ -2050,6 +2051,7 @@ Some influential environment variables: CPPFLAGS (Objective) C/C++ preprocessor flags, e.g. -I if you have headers in a nonstandard directory CPP C preprocessor + CURSES_LIB linker library for Curses, e.g. -lcurses Use these variables to override the choices made by `configure' or to help it to find libraries and programs with nonstandard names/locations. @@ -2118,7 +2120,7 @@ fi test -n "$ac_init_help" && exit $ac_status if $ac_init_version; then cat <<\_ACEOF -Star Traders configure 7.0 +Star Traders configure 7.1 generated by GNU Autoconf 2.68 Copyright (C) 2010 Free Software Foundation, Inc. @@ -2765,7 +2767,7 @@ cat >config.log <<_ACEOF This file contains any messages produced by compilers while running configure, to aid debugging if configure makes a mistake. -It was created by Star Traders $as_me 7.0, which was +It was created by Star Traders $as_me 7.1, which was generated by GNU Autoconf 2.68. Invocation command line was $ $0 $@ @@ -3165,6 +3167,8 @@ ac_config_sub="$SHELL $ac_aux_dir/config.sub" # Please don't use this var. ac_configure="$SHELL $ac_aux_dir/configure" # Please don't use this var. +ac_config_headers="$ac_config_headers config.h" + am__api_version='1.11' # Find a good install program. We prefer a C program (faster), @@ -3604,7 +3608,7 @@ fi # Define the identity of the package. PACKAGE='trader' - VERSION='7.0' + VERSION='7.1' cat >>confdefs.h <<_ACEOF @@ -4625,11 +4629,7 @@ else fi - case $ac_cv_prog_cc_stdc in #( - no) : - ac_cv_prog_cc_c99=no; ac_cv_prog_cc_c89=no ;; #( - *) : - { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $CC option to accept ISO C99" >&5 + { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $CC option to accept ISO C99" >&5 $as_echo_n "checking for $CC option to accept ISO C99... " >&6; } if ${ac_cv_prog_cc_c99+:} false; then : $as_echo_n "(cached) " >&6 @@ -4802,121 +4802,16 @@ $as_echo "unsupported" >&6; } ;; $as_echo "$ac_cv_prog_cc_c99" >&6; } ;; esac if test "x$ac_cv_prog_cc_c99" != xno; then : - ac_cv_prog_cc_stdc=$ac_cv_prog_cc_c99 -else - { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $CC option to accept ISO C89" >&5 -$as_echo_n "checking for $CC option to accept ISO C89... " >&6; } -if ${ac_cv_prog_cc_c89+:} false; then : - $as_echo_n "(cached) " >&6 -else - ac_cv_prog_cc_c89=no -ac_save_CC=$CC -cat confdefs.h - <<_ACEOF >conftest.$ac_ext -/* end confdefs.h. */ -#include -#include -#include -#include -/* 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; -{ - return p[i]; -} -static char *f (char * (*g) (char **, int), char **p, ...) -{ - char *s; - va_list v; - va_start (v,p); - s = g (p, va_arg (v,int)); - va_end (v); - return s; -} - -/* OSF 4.0 Compaq cc is some sort of almost-ANSI by default. It has - function prototypes and stuff, but not '\xHH' hex character constants. - These don't provoke an error unfortunately, instead are silently treated - as 'x'. The following induces an error, until -std is added to get - proper ANSI mode. Curiously '\x00'!='x' always comes out true, for an - array size at least. It's necessary to write '\x00'==0 to get something - that's true only with -std. */ -int osf4_cc_array ['\x00' == 0 ? 1 : -1]; - -/* IBM C 6 for AIX is almost-ANSI by default, but it replaces macro parameters - inside strings and character constants. */ -#define FOO(x) 'x' -int xlc6_cc_array[FOO(a) == 'x' ? 1 : -1]; - -int test (int i, double x); -struct s1 {int (*f) (int a);}; -struct s2 {int (*f) (double a);}; -int pairnames (int, char **, FILE *(*)(struct buf *, struct stat *, int), int, int); -int argc; -char **argv; -int -main () -{ -return f (e, argv, 0) != argv[0] || f (e, argv, 1) != argv[1]; - ; - return 0; -} -_ACEOF -for ac_arg in '' -qlanglvl=extc89 -qlanglvl=ansi -std \ - -Ae "-Aa -D_HPUX_SOURCE" "-Xc -D__EXTENSIONS__" -do - CC="$ac_save_CC $ac_arg" - if ac_fn_c_try_compile "$LINENO"; then : - ac_cv_prog_cc_c89=$ac_arg -fi -rm -f core conftest.err conftest.$ac_objext - test "x$ac_cv_prog_cc_c89" != "xno" && break -done -rm -f conftest.$ac_ext -CC=$ac_save_CC fi -# AC_CACHE_VAL -case "x$ac_cv_prog_cc_c89" in - x) - { $as_echo "$as_me:${as_lineno-$LINENO}: result: none needed" >&5 -$as_echo "none needed" >&6; } ;; - xno) - { $as_echo "$as_me:${as_lineno-$LINENO}: result: unsupported" >&5 -$as_echo "unsupported" >&6; } ;; - *) - CC="$CC $ac_cv_prog_cc_c89" - { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_prog_cc_c89" >&5 -$as_echo "$ac_cv_prog_cc_c89" >&6; } ;; -esac -if test "x$ac_cv_prog_cc_c89" != xno; then : - ac_cv_prog_cc_stdc=$ac_cv_prog_cc_c89 -else - ac_cv_prog_cc_stdc=no -fi + + + +if test "x$ac_cv_prog_cc_c99" = xno; then : + + as_fn_error $? "requires an ISO/IEC 9899:1999 (C99) compiler" "$LINENO" 5 fi - ;; -esac - { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $CC option to accept ISO Standard C" >&5 -$as_echo_n "checking for $CC option to accept ISO Standard C... " >&6; } - if ${ac_cv_prog_cc_stdc+:} false; then : - $as_echo_n "(cached) " >&6 -fi - - case $ac_cv_prog_cc_stdc in #( - no) : - { $as_echo "$as_me:${as_lineno-$LINENO}: result: unsupported" >&5 -$as_echo "unsupported" >&6; } ;; #( - '') : - { $as_echo "$as_me:${as_lineno-$LINENO}: result: none needed" >&5 -$as_echo "none needed" >&6; } ;; #( - *) : - { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_prog_cc_stdc" >&5 -$as_echo "$ac_cv_prog_cc_stdc" >&6; } ;; -esac 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. @@ -5585,6 +5480,299 @@ $as_echo "$ac_cv_safe_to_define___extensions__" >&6; } ;; esac + case $ac_cv_prog_cc_stdc in #( + no) : + ac_cv_prog_cc_c99=no; ac_cv_prog_cc_c89=no ;; #( + *) : + { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $CC option to accept ISO C99" >&5 +$as_echo_n "checking for $CC option to accept ISO C99... " >&6; } +if ${ac_cv_prog_cc_c99+:} false; then : + $as_echo_n "(cached) " >&6 +else + ac_cv_prog_cc_c99=no +ac_save_CC=$CC +cat confdefs.h - <<_ACEOF >conftest.$ac_ext +/* end confdefs.h. */ +#include +#include +#include +#include +#include + +// Check varargs macros. These examples are taken from C99 6.10.3.5. +#define debug(...) fprintf (stderr, __VA_ARGS__) +#define showlist(...) puts (#__VA_ARGS__) +#define report(test,...) ((test) ? puts (#test) : printf (__VA_ARGS__)) +static void +test_varargs_macros (void) +{ + int x = 1234; + int y = 5678; + debug ("Flag"); + debug ("X = %d\n", x); + showlist (The first, second, and third items.); + report (x>y, "x is %d but y is %d", x, y); +} + +// Check long long types. +#define BIG64 18446744073709551615ull +#define BIG32 4294967295ul +#define BIG_OK (BIG64 / BIG32 == 4294967297ull && BIG64 % BIG32 == 0) +#if !BIG_OK + your preprocessor is broken; +#endif +#if BIG_OK +#else + your preprocessor is broken; +#endif +static long long int bignum = -9223372036854775807LL; +static unsigned long long int ubignum = BIG64; + +struct incomplete_array +{ + int datasize; + double data[]; +}; + +struct named_init { + int number; + const wchar_t *name; + double average; +}; + +typedef const char *ccp; + +static inline int +test_restrict (ccp restrict text) +{ + // See if C++-style comments work. + // Iterate through items via the restricted pointer. + // Also check for declarations in for loops. + for (unsigned int i = 0; *(text+i) != '\0'; ++i) + continue; + return 0; +} + +// Check varargs and va_copy. +static void +test_varargs (const char *format, ...) +{ + va_list args; + va_start (args, format); + va_list args_copy; + va_copy (args_copy, args); + + const char *str; + int number; + float fnumber; + + while (*format) + { + switch (*format++) + { + case 's': // string + str = va_arg (args_copy, const char *); + break; + case 'd': // int + number = va_arg (args_copy, int); + break; + case 'f': // float + fnumber = va_arg (args_copy, double); + break; + default: + break; + } + } + va_end (args_copy); + va_end (args); +} + +int +main () +{ + + // Check bool. + _Bool success = false; + + // Check restrict. + if (test_restrict ("String literal") == 0) + success = true; + char *restrict newvar = "Another string"; + + // Check varargs. + test_varargs ("s, d' f .", "string", 65, 34.234); + test_varargs_macros (); + + // Check flexible array members. + struct incomplete_array *ia = + malloc (sizeof (struct incomplete_array) + (sizeof (double) * 10)); + ia->datasize = 10; + for (int i = 0; i < ia->datasize; ++i) + ia->data[i] = i * 1.234; + + // Check named initializers. + struct named_init ni = { + .number = 34, + .name = L"Test wide string", + .average = 543.34343, + }; + + ni.number = 58; + + int dynamic_array[ni.number]; + dynamic_array[ni.number - 1] = 543; + + // work around unused variable warnings + return (!success || bignum == 0LL || ubignum == 0uLL || newvar[0] == 'x' + || dynamic_array[ni.number - 1] != 543); + + ; + return 0; +} +_ACEOF +for ac_arg in '' -std=gnu99 -std=c99 -c99 -AC99 -xc99=all -qlanglvl=extc99 +do + CC="$ac_save_CC $ac_arg" + if ac_fn_c_try_compile "$LINENO"; then : + ac_cv_prog_cc_c99=$ac_arg +fi +rm -f core conftest.err conftest.$ac_objext + test "x$ac_cv_prog_cc_c99" != "xno" && break +done +rm -f conftest.$ac_ext +CC=$ac_save_CC + +fi +# AC_CACHE_VAL +case "x$ac_cv_prog_cc_c99" in + x) + { $as_echo "$as_me:${as_lineno-$LINENO}: result: none needed" >&5 +$as_echo "none needed" >&6; } ;; + xno) + { $as_echo "$as_me:${as_lineno-$LINENO}: result: unsupported" >&5 +$as_echo "unsupported" >&6; } ;; + *) + CC="$CC $ac_cv_prog_cc_c99" + { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_prog_cc_c99" >&5 +$as_echo "$ac_cv_prog_cc_c99" >&6; } ;; +esac +if test "x$ac_cv_prog_cc_c99" != xno; then : + ac_cv_prog_cc_stdc=$ac_cv_prog_cc_c99 +else + { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $CC option to accept ISO C89" >&5 +$as_echo_n "checking for $CC option to accept ISO C89... " >&6; } +if ${ac_cv_prog_cc_c89+:} false; then : + $as_echo_n "(cached) " >&6 +else + ac_cv_prog_cc_c89=no +ac_save_CC=$CC +cat confdefs.h - <<_ACEOF >conftest.$ac_ext +/* end confdefs.h. */ +#include +#include +#include +#include +/* 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; +{ + return p[i]; +} +static char *f (char * (*g) (char **, int), char **p, ...) +{ + char *s; + va_list v; + va_start (v,p); + s = g (p, va_arg (v,int)); + va_end (v); + return s; +} + +/* OSF 4.0 Compaq cc is some sort of almost-ANSI by default. It has + function prototypes and stuff, but not '\xHH' hex character constants. + These don't provoke an error unfortunately, instead are silently treated + as 'x'. The following induces an error, until -std is added to get + proper ANSI mode. Curiously '\x00'!='x' always comes out true, for an + array size at least. It's necessary to write '\x00'==0 to get something + that's true only with -std. */ +int osf4_cc_array ['\x00' == 0 ? 1 : -1]; + +/* IBM C 6 for AIX is almost-ANSI by default, but it replaces macro parameters + inside strings and character constants. */ +#define FOO(x) 'x' +int xlc6_cc_array[FOO(a) == 'x' ? 1 : -1]; + +int test (int i, double x); +struct s1 {int (*f) (int a);}; +struct s2 {int (*f) (double a);}; +int pairnames (int, char **, FILE *(*)(struct buf *, struct stat *, int), int, int); +int argc; +char **argv; +int +main () +{ +return f (e, argv, 0) != argv[0] || f (e, argv, 1) != argv[1]; + ; + return 0; +} +_ACEOF +for ac_arg in '' -qlanglvl=extc89 -qlanglvl=ansi -std \ + -Ae "-Aa -D_HPUX_SOURCE" "-Xc -D__EXTENSIONS__" +do + CC="$ac_save_CC $ac_arg" + if ac_fn_c_try_compile "$LINENO"; then : + ac_cv_prog_cc_c89=$ac_arg +fi +rm -f core conftest.err conftest.$ac_objext + test "x$ac_cv_prog_cc_c89" != "xno" && break +done +rm -f conftest.$ac_ext +CC=$ac_save_CC + +fi +# AC_CACHE_VAL +case "x$ac_cv_prog_cc_c89" in + x) + { $as_echo "$as_me:${as_lineno-$LINENO}: result: none needed" >&5 +$as_echo "none needed" >&6; } ;; + xno) + { $as_echo "$as_me:${as_lineno-$LINENO}: result: unsupported" >&5 +$as_echo "unsupported" >&6; } ;; + *) + CC="$CC $ac_cv_prog_cc_c89" + { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_prog_cc_c89" >&5 +$as_echo "$ac_cv_prog_cc_c89" >&6; } ;; +esac +if test "x$ac_cv_prog_cc_c89" != xno; then : + ac_cv_prog_cc_stdc=$ac_cv_prog_cc_c89 +else + ac_cv_prog_cc_stdc=no +fi + +fi + ;; +esac + { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $CC option to accept ISO Standard C" >&5 +$as_echo_n "checking for $CC option to accept ISO Standard C... " >&6; } + if ${ac_cv_prog_cc_stdc+:} false; then : + $as_echo_n "(cached) " >&6 +fi + + case $ac_cv_prog_cc_stdc in #( + no) : + { $as_echo "$as_me:${as_lineno-$LINENO}: result: unsupported" >&5 +$as_echo "unsupported" >&6; } ;; #( + '') : + { $as_echo "$as_me:${as_lineno-$LINENO}: result: none needed" >&5 +$as_echo "none needed" >&6; } ;; #( + *) : + { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_prog_cc_stdc" >&5 +$as_echo "$ac_cv_prog_cc_stdc" >&6; } ;; +esac + # Code from module alloca-opt: @@ -5611,6 +5799,7 @@ $as_echo "$ac_cv_safe_to_define___extensions__" >&6; } # Code from module isnand-nolibm: # Code from module isnanf-nolibm: # Code from module isnanl-nolibm: + # Code from module largefile: # Code from module locale: # Code from module malloc-posix: # Code from module math: @@ -5725,86 +5914,6 @@ ac_link='$CC -o conftest$ac_exeext $CFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $ ac_compiler_gnu=$ac_cv_c_compiler_gnu -{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for C/C++ restrict keyword" >&5 -$as_echo_n "checking for C/C++ restrict keyword... " >&6; } -if ${ac_cv_c_restrict+:} false; then : - $as_echo_n "(cached) " >&6 -else - ac_cv_c_restrict=no - # The order here caters to the fact that C++ does not require restrict. - for ac_kw in __restrict __restrict__ _Restrict restrict; do - cat confdefs.h - <<_ACEOF >conftest.$ac_ext -/* end confdefs.h. */ -typedef int * int_ptr; - int foo (int_ptr $ac_kw ip) { - return ip[0]; - } -int -main () -{ -int s[1]; - int * $ac_kw t = s; - t[0] = 0; - return foo(t) - ; - return 0; -} -_ACEOF -if ac_fn_c_try_compile "$LINENO"; then : - ac_cv_c_restrict=$ac_kw -fi -rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext - test "$ac_cv_c_restrict" != no && break - done - -fi -{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_c_restrict" >&5 -$as_echo "$ac_cv_c_restrict" >&6; } - - case $ac_cv_c_restrict in - restrict) ;; - no) $as_echo "#define restrict /**/" >>confdefs.h - ;; - *) cat >>confdefs.h <<_ACEOF -#define restrict $ac_cv_c_restrict -_ACEOF - ;; - esac - -{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for working volatile" >&5 -$as_echo_n "checking for working volatile... " >&6; } -if ${ac_cv_c_volatile+:} false; then : - $as_echo_n "(cached) " >&6 -else - cat confdefs.h - <<_ACEOF >conftest.$ac_ext -/* end confdefs.h. */ - -int -main () -{ - -volatile int x; -int * volatile y = (int *) 0; -return !x && !y; - ; - return 0; -} -_ACEOF -if ac_fn_c_try_compile "$LINENO"; then : - ac_cv_c_volatile=yes -else - ac_cv_c_volatile=no -fi -rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext -fi -{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_c_volatile" >&5 -$as_echo "$ac_cv_c_volatile" >&6; } -if test $ac_cv_c_volatile = no; then - -$as_echo "#define volatile /**/" >>confdefs.h - -fi - { $as_echo "$as_me:${as_lineno-$LINENO}: checking for __attribute__" >&5 $as_echo_n "checking for __attribute__... " >&6; } @@ -9497,6 +9606,52 @@ cat >>confdefs.h <<_ACEOF #define HAVE_DECL_GETENV $ac_have_decl _ACEOF +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for C/C++ restrict keyword" >&5 +$as_echo_n "checking for C/C++ restrict keyword... " >&6; } +if ${ac_cv_c_restrict+:} false; then : + $as_echo_n "(cached) " >&6 +else + ac_cv_c_restrict=no + # The order here caters to the fact that C++ does not require restrict. + for ac_kw in __restrict __restrict__ _Restrict restrict; do + cat confdefs.h - <<_ACEOF >conftest.$ac_ext +/* end confdefs.h. */ +typedef int * int_ptr; + int foo (int_ptr $ac_kw ip) { + return ip[0]; + } +int +main () +{ +int s[1]; + int * $ac_kw t = s; + t[0] = 0; + return foo(t) + ; + return 0; +} +_ACEOF +if ac_fn_c_try_compile "$LINENO"; then : + ac_cv_c_restrict=$ac_kw +fi +rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext + test "$ac_cv_c_restrict" != no && break + done + +fi +{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_c_restrict" >&5 +$as_echo "$ac_cv_c_restrict" >&6; } + + case $ac_cv_c_restrict in + restrict) ;; + no) $as_echo "#define restrict /**/" >>confdefs.h + ;; + *) cat >>confdefs.h <<_ACEOF +#define restrict $ac_cv_c_restrict +_ACEOF + ;; + esac + GNULIB_GETTIMEOFDAY=0; HAVE_GETTIMEOFDAY=1; @@ -19502,33 +19657,59 @@ done + + # Check whether --with-ncurses was given. if test "${with_ncurses+set}" = set; then : withval=$with_ncurses; +else + with_ncurses=check fi - ax_save_LIBS="$LIBS" # Check whether --with-ncursesw was given. if test "${with_ncursesw+set}" = set; then : withval=$with_ncursesw; +else + with_ncursesw=check fi - if test ! "$CURSES_LIB" && test "$with_ncurses" != no && test "$with_ncursesw" != "no" - then - { $as_echo "$as_me:${as_lineno-$LINENO}: checking for working ncursesw" >&5 -$as_echo_n "checking for working ncursesw... " >&6; } + + ax_saved_LIBS=$LIBS + if test "x$with_ncurses" = xyes || test "x$with_ncursesw" = xyes; then : + ax_with_plaincurses=no +else + ax_with_plaincurses=check +fi + + ax_cv_curses_which=no + + # Test for NcursesW + + if test "x$CURSES_LIB" = x && test "x$with_ncursesw" != xno; then : + + LIBS="$ax_saved_LIBS -lncursesw" + + { $as_echo "$as_me:${as_lineno-$LINENO}: checking for NcursesW wide-character library" >&5 +$as_echo_n "checking for NcursesW wide-character library... " >&6; } if ${ax_cv_ncursesw+:} false; then : $as_echo_n "(cached) " >&6 else - LIBS="$ax_save_LIBS -lncursesw" - cat confdefs.h - <<_ACEOF >conftest.$ac_ext + + cat confdefs.h - <<_ACEOF >conftest.$ac_ext /* end confdefs.h. */ -#include + +/* Override any GCC internal prototype to avoid an error. + Use char because int might match the return type of a GCC + builtin and then its argument prototype would still apply. */ +#ifdef __cplusplus +extern "C" +#endif +char initscr (); int main () { -chtype a; int b=A_STANDOUT, c=KEY_LEFT; initscr(); +return initscr (); ; return 0; } @@ -19540,45 +19721,257 @@ else fi rm -f core conftest.err conftest.$ac_objext \ conftest$ac_exeext conftest.$ac_ext + fi { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ax_cv_ncursesw" >&5 $as_echo "$ax_cv_ncursesw" >&6; } - if test "$ax_cv_ncursesw" = yes - then - ac_fn_c_check_header_mongrel "$LINENO" "ncursesw/curses.h" "ac_cv_header_ncursesw_curses_h" "$ac_includes_default" -if test "x$ac_cv_header_ncursesw_curses_h" = xyes; then : + if test "x$ax_cv_ncursesw" = xno && test "x$with_ncursesw" = xyes; then : -$as_echo "#define HAVE_NCURSESW_H 1" >>confdefs.h + as_fn_error $? "--with-ncursesw specified but could not find NcursesW library" "$LINENO" 5 fi + if test "x$ax_cv_ncursesw" = xyes; then : + + ax_cv_curses=yes + ax_cv_curses_which=ncursesw + CURSES_LIB="-lncursesw" + +$as_echo "#define HAVE_NCURSESW 1" >>confdefs.h + + +$as_echo "#define HAVE_CURSES 1" >>confdefs.h + + + { $as_echo "$as_me:${as_lineno-$LINENO}: checking for working ncursesw/curses.h" >&5 +$as_echo_n "checking for working ncursesw/curses.h... " >&6; } +if ${ax_cv_header_ncursesw_curses_h+:} false; then : + $as_echo_n "(cached) " >&6 +else + + cat confdefs.h - <<_ACEOF >conftest.$ac_ext +/* end confdefs.h. */ + + #define _XOPEN_SOURCE_EXTENDED 1 + #include + +int +main () +{ + + chtype a = A_BOLD; + int b = KEY_LEFT; + chtype c = COLOR_PAIR(1) & A_COLOR; + attr_t d = WA_NORMAL; + cchar_t e; + wint_t f; + int g = getattrs(stdscr); + int h = getcurx(stdscr) + getmaxx(stdscr); + initscr(); + init_pair(1, COLOR_WHITE, COLOR_RED); + wattr_set(stdscr, d, 0, NULL); + wget_wch(stdscr, &f); + + ; + return 0; +} +_ACEOF +if ac_fn_c_try_link "$LINENO"; then : + ax_cv_header_ncursesw_curses_h=yes +else + ax_cv_header_ncursesw_curses_h=no +fi +rm -f core conftest.err conftest.$ac_objext \ + conftest$ac_exeext conftest.$ac_ext + +fi +{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ax_cv_header_ncursesw_curses_h" >&5 +$as_echo "$ax_cv_header_ncursesw_curses_h" >&6; } + if test "x$ax_cv_header_ncursesw_curses_h" = xyes; then : + + ax_cv_curses_enhanced=yes + ax_cv_curses_color=yes + ax_cv_curses_obsolete=yes + +$as_echo "#define HAVE_CURSES_ENHANCED 1" >>confdefs.h + + +$as_echo "#define HAVE_CURSES_COLOR 1" >>confdefs.h + + +$as_echo "#define HAVE_CURSES_OBSOLETE 1" >>confdefs.h + + +$as_echo "#define HAVE_NCURSESW_CURSES_H 1" >>confdefs.h + + +fi + + { $as_echo "$as_me:${as_lineno-$LINENO}: checking for working ncursesw.h" >&5 +$as_echo_n "checking for working ncursesw.h... " >&6; } +if ${ax_cv_header_ncursesw_h+:} false; then : + $as_echo_n "(cached) " >&6 +else + + cat confdefs.h - <<_ACEOF >conftest.$ac_ext +/* end confdefs.h. */ + + #define _XOPEN_SOURCE_EXTENDED 1 + #include + +int +main () +{ + + chtype a = A_BOLD; + int b = KEY_LEFT; + chtype c = COLOR_PAIR(1) & A_COLOR; + attr_t d = WA_NORMAL; + cchar_t e; + wint_t f; + int g = getattrs(stdscr); + int h = getcurx(stdscr) + getmaxx(stdscr); + initscr(); + init_pair(1, COLOR_WHITE, COLOR_RED); + wattr_set(stdscr, d, 0, NULL); + wget_wch(stdscr, &f); + + ; + return 0; +} +_ACEOF +if ac_fn_c_try_link "$LINENO"; then : + ax_cv_header_ncursesw_h=yes +else + ax_cv_header_ncursesw_h=no +fi +rm -f core conftest.err conftest.$ac_objext \ + conftest$ac_exeext conftest.$ac_ext + +fi +{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ax_cv_header_ncursesw_h" >&5 +$as_echo "$ax_cv_header_ncursesw_h" >&6; } + if test "x$ax_cv_header_ncursesw_h" = xyes; then : + + ax_cv_curses_enhanced=yes + ax_cv_curses_color=yes + ax_cv_curses_obsolete=yes + +$as_echo "#define HAVE_CURSES_ENHANCED 1" >>confdefs.h + + +$as_echo "#define HAVE_CURSES_COLOR 1" >>confdefs.h + + +$as_echo "#define HAVE_CURSES_OBSOLETE 1" >>confdefs.h + + +$as_echo "#define HAVE_NCURSESW_H 1" >>confdefs.h + + +fi + + { $as_echo "$as_me:${as_lineno-$LINENO}: checking for working ncurses.h" >&5 +$as_echo_n "checking for working ncurses.h... " >&6; } +if ${ax_cv_header_ncurses_h_with_ncursesw+:} false; then : + $as_echo_n "(cached) " >&6 +else + + cat confdefs.h - <<_ACEOF >conftest.$ac_ext +/* end confdefs.h. */ + + #define _XOPEN_SOURCE_EXTENDED 1 + #include + +int +main () +{ + + chtype a = A_BOLD; + int b = KEY_LEFT; + chtype c = COLOR_PAIR(1) & A_COLOR; + attr_t d = WA_NORMAL; + cchar_t e; + wint_t f; + int g = getattrs(stdscr); + int h = getcurx(stdscr) + getmaxx(stdscr); + initscr(); + init_pair(1, COLOR_WHITE, COLOR_RED); + wattr_set(stdscr, d, 0, NULL); + wget_wch(stdscr, &f); + + ; + return 0; +} +_ACEOF +if ac_fn_c_try_link "$LINENO"; then : + ax_cv_header_ncurses_h_with_ncursesw=yes +else + ax_cv_header_ncurses_h_with_ncursesw=no +fi +rm -f core conftest.err conftest.$ac_objext \ + conftest$ac_exeext conftest.$ac_ext + +fi +{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ax_cv_header_ncurses_h_with_ncursesw" >&5 +$as_echo "$ax_cv_header_ncurses_h_with_ncursesw" >&6; } + if test "x$ax_cv_header_ncurses_h_with_ncursesw" = xyes; then : + + ax_cv_curses_enhanced=yes + ax_cv_curses_color=yes + ax_cv_curses_obsolete=yes + +$as_echo "#define HAVE_CURSES_ENHANCED 1" >>confdefs.h + + +$as_echo "#define HAVE_CURSES_COLOR 1" >>confdefs.h + + +$as_echo "#define HAVE_CURSES_OBSOLETE 1" >>confdefs.h $as_echo "#define HAVE_NCURSES_H 1" >>confdefs.h -$as_echo "#define HAVE_NCURSESW 1" >>confdefs.h +fi - CURSES_LIB="-lncursesw" - ax_cv_ncurses=yes - ax_cv_curses=yes - fi - fi - if test ! "$CURSES_LIB" && test "$with_ncurses" != no && test "$with_ncursesw" != yes - then - { $as_echo "$as_me:${as_lineno-$LINENO}: checking for working ncurses" >&5 -$as_echo_n "checking for working ncurses... " >&6; } + if test "x$ax_cv_header_ncursesw_curses_h" = xno && test "x$ax_cv_header_ncursesw_h" = xno && test "x$ax_cv_header_ncurses_h_with_ncursesw" = xno; then : + + { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: could not find a working ncursesw/curses.h, ncursesw.h or ncurses.h" >&5 +$as_echo "$as_me: WARNING: could not find a working ncursesw/curses.h, ncursesw.h or ncurses.h" >&2;} + +fi + +fi + +fi + + # Test for Ncurses + + if test "x$CURSES_LIB" = x && test "x$with_ncurses" != xno && test "x$ax_cv_curses_which" = xno; then : + + LIBS="$ax_saved_LIBS -lncurses" + + { $as_echo "$as_me:${as_lineno-$LINENO}: checking for Ncurses library" >&5 +$as_echo_n "checking for Ncurses library... " >&6; } if ${ax_cv_ncurses+:} false; then : $as_echo_n "(cached) " >&6 else - LIBS="$ax_save_LIBS -lncurses" - cat confdefs.h - <<_ACEOF >conftest.$ac_ext + + cat confdefs.h - <<_ACEOF >conftest.$ac_ext /* end confdefs.h. */ -#include + +/* Override any GCC internal prototype to avoid an error. + Use char because int might match the return type of a GCC + builtin and then its argument prototype would still apply. */ +#ifdef __cplusplus +extern "C" +#endif +char initscr (); int main () { -chtype a; int b=A_STANDOUT, c=KEY_LEFT; initscr(); +return initscr (); ; return 0; } @@ -19590,65 +19983,441 @@ else fi rm -f core conftest.err conftest.$ac_objext \ conftest$ac_exeext conftest.$ac_ext + fi { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ax_cv_ncurses" >&5 $as_echo "$ax_cv_ncurses" >&6; } - if test "$ax_cv_ncurses" = yes - then + if test "x$ax_cv_ncurses" = xno && test "x$with_ncurses" = xyes; then : -$as_echo "#define HAVE_NCURSES_H 1" >>confdefs.h + as_fn_error $? "--with-ncurses specified but could not find Ncurses library" "$LINENO" 5 - CURSES_LIB="-lncurses" - ax_cv_curses=yes - fi - fi - if test "$ax_cv_curses" != yes && test "$with_ncurses" != yes && test "$with_ncursesw" != yes - then - if test ! "$CURSES_LIB" - then - CURSES_LIB="-lcurses" - fi - { $as_echo "$as_me:${as_lineno-$LINENO}: checking for working curses" >&5 -$as_echo_n "checking for working curses... " >&6; } -if ${ax_cv_curses+:} false; then : +fi + + if test "x$ax_cv_ncurses" = xyes; then : + + ax_cv_curses=yes + ax_cv_curses_which=ncurses + CURSES_LIB="-lncurses" + +$as_echo "#define HAVE_NCURSES 1" >>confdefs.h + + +$as_echo "#define HAVE_CURSES 1" >>confdefs.h + + + { $as_echo "$as_me:${as_lineno-$LINENO}: checking for working ncurses/curses.h" >&5 +$as_echo_n "checking for working ncurses/curses.h... " >&6; } +if ${ax_cv_header_ncurses_curses_h+:} false; then : $as_echo_n "(cached) " >&6 else - LIBS="$ax_save_LIBS $CURSES_LIB" - cat confdefs.h - <<_ACEOF >conftest.$ac_ext + + cat confdefs.h - <<_ACEOF >conftest.$ac_ext /* end confdefs.h. */ -#include + + #include + int main () { -chtype a; int b=A_STANDOUT, c=KEY_LEFT; initscr(); + + chtype a = A_BOLD; + int b = KEY_LEFT; + chtype c = COLOR_PAIR(1) & A_COLOR; + int g = getattrs(stdscr); + int h = getcurx(stdscr) + getmaxx(stdscr); + initscr(); + init_pair(1, COLOR_WHITE, COLOR_RED); + ; return 0; } _ACEOF if ac_fn_c_try_link "$LINENO"; then : - ax_cv_curses=yes + ax_cv_header_ncurses_curses_h=yes else - ax_cv_curses=no + ax_cv_header_ncurses_curses_h=no fi rm -f core conftest.err conftest.$ac_objext \ conftest$ac_exeext conftest.$ac_ext + fi -{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ax_cv_curses" >&5 -$as_echo "$ax_cv_curses" >&6; } - if test "$ax_cv_curses" = yes - then +{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ax_cv_header_ncurses_curses_h" >&5 +$as_echo "$ax_cv_header_ncurses_curses_h" >&6; } + if test "x$ax_cv_header_ncurses_curses_h" = xyes; then : + + ax_cv_curses_color=yes + ax_cv_curses_obsolete=yes + +$as_echo "#define HAVE_CURSES_COLOR 1" >>confdefs.h + + +$as_echo "#define HAVE_CURSES_OBSOLETE 1" >>confdefs.h + + +$as_echo "#define HAVE_NCURSES_CURSES_H 1" >>confdefs.h + + +fi + + { $as_echo "$as_me:${as_lineno-$LINENO}: checking for working ncurses.h" >&5 +$as_echo_n "checking for working ncurses.h... " >&6; } +if ${ax_cv_header_ncurses_h+:} false; then : + $as_echo_n "(cached) " >&6 +else + + cat confdefs.h - <<_ACEOF >conftest.$ac_ext +/* end confdefs.h. */ + + #include + +int +main () +{ + + chtype a = A_BOLD; + int b = KEY_LEFT; + chtype c = COLOR_PAIR(1) & A_COLOR; + int g = getattrs(stdscr); + int h = getcurx(stdscr) + getmaxx(stdscr); + initscr(); + init_pair(1, COLOR_WHITE, COLOR_RED); + + ; + return 0; +} +_ACEOF +if ac_fn_c_try_link "$LINENO"; then : + ax_cv_header_ncurses_h=yes +else + ax_cv_header_ncurses_h=no +fi +rm -f core conftest.err conftest.$ac_objext \ + conftest$ac_exeext conftest.$ac_ext + +fi +{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ax_cv_header_ncurses_h" >&5 +$as_echo "$ax_cv_header_ncurses_h" >&6; } + if test "x$ax_cv_header_ncurses_h" = xyes; then : + + ax_cv_curses_color=yes + ax_cv_curses_obsolete=yes + +$as_echo "#define HAVE_CURSES_COLOR 1" >>confdefs.h + + +$as_echo "#define HAVE_CURSES_OBSOLETE 1" >>confdefs.h + + +$as_echo "#define HAVE_NCURSES_H 1" >>confdefs.h + + +fi + + if test "x$ax_cv_header_ncurses_curses_h" = xno && test "x$ax_cv_header_ncurses_h" = xno; then : + + { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: could not find a working ncurses/curses.h or ncurses.h" >&5 +$as_echo "$as_me: WARNING: could not find a working ncurses/curses.h or ncurses.h" >&2;} + +fi + +fi + +fi + + # Test for plain Curses (or if CURSES_LIB was set by user) + + if test "x$with_plaincurses" != xno && test "x$ax_cv_curses_which" = xno; then : + + if test "x$CURSES_LIB" = x; then : + + LIBS="$ax_saved_LIBS $CURSES_LIB" + +else + + LIBS="$ax_saved_LIBS -lcurses" + +fi + + { $as_echo "$as_me:${as_lineno-$LINENO}: checking for Curses library" >&5 +$as_echo_n "checking for Curses library... " >&6; } +if ${ax_cv_plaincurses+:} false; then : + $as_echo_n "(cached) " >&6 +else + + cat confdefs.h - <<_ACEOF >conftest.$ac_ext +/* end confdefs.h. */ + +/* Override any GCC internal prototype to avoid an error. + Use char because int might match the return type of a GCC + builtin and then its argument prototype would still apply. */ +#ifdef __cplusplus +extern "C" +#endif +char initscr (); +int +main () +{ +return initscr (); + ; + return 0; +} +_ACEOF +if ac_fn_c_try_link "$LINENO"; then : + ax_cv_plaincurses=yes +else + ax_cv_plaincurses=no +fi +rm -f core conftest.err conftest.$ac_objext \ + conftest$ac_exeext conftest.$ac_ext + +fi +{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ax_cv_plaincurses" >&5 +$as_echo "$ax_cv_plaincurses" >&6; } + + if test "x$ax_cv_plaincurses" = xyes; then : + + ax_cv_curses=yes + ax_cv_curses_which=plaincurses + if test "x$CURSES_LIB" = x; then : + + CURSES_LIB="-lcurses" + +fi + +$as_echo "#define HAVE_CURSES 1" >>confdefs.h + + + # Check for base conformance (and header file) + + { $as_echo "$as_me:${as_lineno-$LINENO}: checking for working curses.h" >&5 +$as_echo_n "checking for working curses.h... " >&6; } +if ${ax_cv_header_curses_h+:} false; then : + $as_echo_n "(cached) " >&6 +else + + cat confdefs.h - <<_ACEOF >conftest.$ac_ext +/* end confdefs.h. */ + + #include + +int +main () +{ + + chtype a = A_BOLD; + int b = KEY_LEFT; + initscr(); + + ; + return 0; +} +_ACEOF +if ac_fn_c_try_link "$LINENO"; then : + ax_cv_header_curses_h=yes +else + ax_cv_header_curses_h=no +fi +rm -f core conftest.err conftest.$ac_objext \ + conftest$ac_exeext conftest.$ac_ext + +fi +{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ax_cv_header_curses_h" >&5 +$as_echo "$ax_cv_header_curses_h" >&6; } + if test "x$ax_cv_header_curses_h" = xyes; then : + $as_echo "#define HAVE_CURSES_H 1" >>confdefs.h - fi - fi - LIBS="$ax_save_LIBS" -if test "x$ax_cv_curses" != "xyes"; then : - as_fn_error $? "requires an X/Open-compatible Curses library." "$LINENO" 5 + # Check for X/Open Enhanced conformance + + { $as_echo "$as_me:${as_lineno-$LINENO}: checking for X/Open Enhanced Curses conformance" >&5 +$as_echo_n "checking for X/Open Enhanced Curses conformance... " >&6; } +if ${ax_cv_plaincurses_enhanced+:} false; then : + $as_echo_n "(cached) " >&6 +else + + cat confdefs.h - <<_ACEOF >conftest.$ac_ext +/* end confdefs.h. */ + + #define _XOPEN_SOURCE_EXTENDED 1 + #include + #ifndef _XOPEN_CURSES + #error "this Curses library is not enhanced" + "this Curses library is not enhanced" + #endif + +int +main () +{ + + chtype a = A_BOLD; + int b = KEY_LEFT; + chtype c = COLOR_PAIR(1) & A_COLOR; + attr_t d = WA_NORMAL; + cchar_t e; + wint_t f; + initscr(); + init_pair(1, COLOR_WHITE, COLOR_RED); + wattr_set(stdscr, d, 0, NULL); + wget_wch(stdscr, &f); + + ; + return 0; +} +_ACEOF +if ac_fn_c_try_link "$LINENO"; then : + ax_cv_plaincurses_enhanced=yes +else + ax_cv_plaincurses_enhanced=no +fi +rm -f core conftest.err conftest.$ac_objext \ + conftest$ac_exeext conftest.$ac_ext + +fi +{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ax_cv_plaincurses_enhanced" >&5 +$as_echo "$ax_cv_plaincurses_enhanced" >&6; } + if test "x$ax_cv_plaincurses_enhanced" = xyes; then : + + ax_cv_curses_enhanced=yes + ax_cv_curses_color=yes + +$as_echo "#define HAVE_CURSES_ENHANCED 1" >>confdefs.h + + +$as_echo "#define HAVE_CURSES_COLOR 1" >>confdefs.h + + fi -ac_config_headers="$ac_config_headers config.h" + # Check for color functions + + { $as_echo "$as_me:${as_lineno-$LINENO}: checking for Curses color functions" >&5 +$as_echo_n "checking for Curses color functions... " >&6; } +if ${ax_cv_plaincurses_color+:} false; then : + $as_echo_n "(cached) " >&6 +else + + cat confdefs.h - <<_ACEOF >conftest.$ac_ext +/* end confdefs.h. */ + + #define _XOPEN_SOURCE_EXTENDED 1 + #include + +int +main () +{ + + chtype a = A_BOLD; + int b = KEY_LEFT; + chtype c = COLOR_PAIR(1) & A_COLOR; + initscr(); + init_pair(1, COLOR_WHITE, COLOR_RED); + + ; + return 0; +} +_ACEOF +if ac_fn_c_try_link "$LINENO"; then : + ax_cv_plaincurses_color=yes +else + ax_cv_plaincurses_color=no +fi +rm -f core conftest.err conftest.$ac_objext \ + conftest$ac_exeext conftest.$ac_ext + +fi +{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ax_cv_plaincurses_color" >&5 +$as_echo "$ax_cv_plaincurses_color" >&6; } + if test "x$ax_cv_plaincurses_color" = xyes; then : + + ax_cv_curses_color=yes + +$as_echo "#define HAVE_CURSES_COLOR 1" >>confdefs.h + + +fi + + # Check for obsolete functions + + { $as_echo "$as_me:${as_lineno-$LINENO}: checking for obsolete Curses functions" >&5 +$as_echo_n "checking for obsolete Curses functions... " >&6; } +if ${ax_cv_plaincurses_obsolete+:} false; then : + $as_echo_n "(cached) " >&6 +else + + cat confdefs.h - <<_ACEOF >conftest.$ac_ext +/* end confdefs.h. */ + + #include + +int +main () +{ + + chtype a = A_BOLD; + int b = KEY_LEFT; + int g = getattrs(stdscr); + int h = getcurx(stdscr) + getmaxx(stdscr); + initscr(); + + ; + return 0; +} +_ACEOF +if ac_fn_c_try_link "$LINENO"; then : + ax_cv_plaincurses_obsolete=yes +else + ax_cv_plaincurses_obsolete=no +fi +rm -f core conftest.err conftest.$ac_objext \ + conftest$ac_exeext conftest.$ac_ext + +fi +{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ax_cv_plaincurses_obsolete" >&5 +$as_echo "$ax_cv_plaincurses_obsolete" >&6; } + if test "x$ax_cv_plaincurses_obsolete" = xyes; then : + + ax_cv_curses_obsolete=yes + +$as_echo "#define HAVE_CURSES_OBSOLETE 1" >>confdefs.h + + +fi + +fi + + if test "x$ax_cv_header_curses_h" = xno; then : + + { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: could not find a working curses.h" >&5 +$as_echo "$as_me: WARNING: could not find a working curses.h" >&2;} + +fi + +fi + +fi + + if test "x$ax_cv_curses" != xyes; then : + ax_cv_curses=no +fi + if test "x$ax_cv_curses_enhanced" != xyes; then : + ax_cv_curses_enhanced=no +fi + if test "x$ax_cv_curses_color" != xyes; then : + ax_cv_curses_color=no +fi + if test "x$ax_cv_curses_obsolete" != xyes; then : + ax_cv_curses_obsolete=no +fi + + LIBS=$ax_saved_LIBS + +if test "x$ax_cv_curses" != xyes || test "x$ax_cv_curses_color" != xyes; then : + + as_fn_error $? "requires an X/Open-compatible Curses library with colour" "$LINENO" 5 + +fi ac_config_files="$ac_config_files Makefile lib/Makefile src/Makefile doc/Makefile m4/Makefile" @@ -20257,7 +21026,7 @@ cat >>$CONFIG_STATUS <<\_ACEOF || ac_write_fail=1 # report actual input values of CONFIG_FILES etc. instead of their # values after options handling. ac_log=" -This file was extended by Star Traders $as_me 7.0, which was +This file was extended by Star Traders $as_me 7.1, which was generated by GNU Autoconf 2.68. Invocation command line was CONFIG_FILES = $CONFIG_FILES @@ -20324,7 +21093,7 @@ _ACEOF cat >>$CONFIG_STATUS <<_ACEOF || ac_write_fail=1 ac_cs_config="`$as_echo "$ac_configure_args" | sed 's/^ //; s/[\\""\`\$]/\\\\&/g'`" ac_cs_version="\\ -Star Traders config.status 7.0 +Star Traders config.status 7.1 configured by $0, generated by GNU Autoconf 2.68, with options \\"\$ac_cs_config\\" @@ -20453,8 +21222,8 @@ cat >>$CONFIG_STATUS <<\_ACEOF || ac_write_fail=1 for ac_config_target in $ac_config_targets do case $ac_config_target in - "depfiles") CONFIG_COMMANDS="$CONFIG_COMMANDS depfiles" ;; "config.h") CONFIG_HEADERS="$CONFIG_HEADERS config.h" ;; + "depfiles") CONFIG_COMMANDS="$CONFIG_COMMANDS depfiles" ;; "Makefile") CONFIG_FILES="$CONFIG_FILES Makefile" ;; "lib/Makefile") CONFIG_FILES="$CONFIG_FILES lib/Makefile" ;; "src/Makefile") CONFIG_FILES="$CONFIG_FILES src/Makefile" ;; diff --git a/m4/gnulib-comp.m4 b/m4/gnulib-comp.m4 index ea922e7..818a430 100644 --- a/m4/gnulib-comp.m4 +++ b/m4/gnulib-comp.m4 @@ -50,6 +50,7 @@ AC_DEFUN([gl_EARLY], # Code from module isnand-nolibm: # Code from module isnanf-nolibm: # Code from module isnanl-nolibm: + # Code from module largefile: # Code from module locale: # Code from module malloc-posix: # Code from module math: @@ -489,6 +490,7 @@ AC_DEFUN([gl_FILE_LIST], [ m4/isnand.m4 m4/isnanf.m4 m4/isnanl.m4 + m4/largefile.m4 m4/ldexpl.m4 m4/locale_h.m4 m4/longlong.m4 diff --git a/m4/include_next.m4 b/m4/include_next.m4 index b3c7849..ebf081a 100644 --- a/m4/include_next.m4 +++ b/m4/include_next.m4 @@ -1,4 +1,4 @@ -# include_next.m4 serial 18 +# include_next.m4 serial 20 dnl Copyright (C) 2006-2011 Free Software Foundation, Inc. dnl This file is free software; the Free Software Foundation dnl gives unlimited permission to copy and/or distribute it, @@ -175,11 +175,13 @@ AC_DEFUN([gl_NEXT_HEADERS_INTERNAL], [AC_CHECK_HEADERS_ONCE([$1]) ]) +dnl FIXME: gl_next_header and gl_header_exists must be used unquoted +dnl until we can assume autoconf 2.64 or newer. m4_foreach_w([gl_HEADER_NAME], [$1], [AS_VAR_PUSHDEF([gl_next_header], [gl_cv_next_]m4_defn([gl_HEADER_NAME])) if test $gl_cv_have_include_next = yes; then - AS_VAR_SET([gl_next_header], ['<'gl_HEADER_NAME'>']) + AS_VAR_SET(gl_next_header, ['<'gl_HEADER_NAME'>']) else AC_CACHE_CHECK( [absolute name of <]m4_defn([gl_HEADER_NAME])[>], @@ -208,7 +210,7 @@ AC_DEFUN([gl_NEXT_HEADERS_INTERNAL], dnl eval is necessary to expand gl_absname_cpp. dnl Ultrix and Pyramid sh refuse to redirect output of eval, dnl so use subshell. - AS_VAR_SET([gl_next_header], + AS_VAR_SET(gl_next_header, ['"'`(eval "$gl_absname_cpp conftest.$ac_ext") 2>&AS_MESSAGE_LOG_FD | sed -n '\#/]m4_defn([gl_HEADER_NAME])[#{ s#.*"\(.*/]m4_defn([gl_HEADER_NAME])[\)".*#\1# @@ -218,20 +220,20 @@ AC_DEFUN([gl_NEXT_HEADERS_INTERNAL], }'`'"']) m4_if([$2], [check], [else - AS_VAR_SET([gl_next_header], ['<'gl_HEADER_NAME'>']) + AS_VAR_SET(gl_next_header, ['<'gl_HEADER_NAME'>']) fi ]) ]) fi AC_SUBST( AS_TR_CPP([NEXT_]m4_defn([gl_HEADER_NAME])), - [AS_VAR_GET([gl_next_header])]) + [AS_VAR_GET(gl_next_header)]) if test $gl_cv_have_include_next = yes || test $gl_cv_have_include_next = buggy; then # INCLUDE_NEXT_AS_FIRST_DIRECTIVE='include_next' gl_next_as_first_directive='<'gl_HEADER_NAME'>' else # INCLUDE_NEXT_AS_FIRST_DIRECTIVE='include' - gl_next_as_first_directive=AS_VAR_GET([gl_next_header]) + gl_next_as_first_directive=AS_VAR_GET(gl_next_header) fi AC_SUBST( AS_TR_CPP([NEXT_AS_FIRST_DIRECTIVE_]m4_defn([gl_HEADER_NAME])), diff --git a/m4/warn-on-use.m4 b/m4/warn-on-use.m4 index e0d0f27..e958580 100644 --- a/m4/warn-on-use.m4 +++ b/m4/warn-on-use.m4 @@ -1,4 +1,4 @@ -# warn-on-use.m4 serial 2 +# warn-on-use.m4 serial 3 dnl Copyright (C) 2010-2011 Free Software Foundation, Inc. dnl This file is free software; the Free Software Foundation dnl gives unlimited permission to copy and/or distribute it, @@ -27,6 +27,8 @@ AC_DEFUN([gl_WARN_ON_USE_PREPARE], [AH_TEMPLATE([HAVE_RAW_DECL_]AS_TR_CPP(m4_defn([gl_decl])), [Define to 1 if ]m4_defn([gl_decl])[ is declared even after undefining macros.])])dnl +dnl FIXME: gl_Symbol must be used unquoted until we can assume +dnl autoconf 2.64 or newer. for gl_func in m4_flatten([$2]); do AS_VAR_PUSHDEF([gl_Symbol], [gl_cv_have_raw_decl_$gl_func])dnl AC_CACHE_CHECK([whether $gl_func is declared without a macro],