X-Git-Url: https://ncurses.scripts.mit.edu/?p=ncurses.git;a=blobdiff_plain;f=Ada95%2Fconfigure;h=0507ec8c18155d1386087215f32fa89f97e1cebf;hp=90229aaca4e1ef89bb4b7a9e2b8404b24101ab5c;hb=HEAD;hpb=df51c7005b77c6dcc78565d8cc87f8f68a8525c2 diff --git a/Ada95/configure b/Ada95/configure index 90229aac..fa45b3c4 100755 --- a/Ada95/configure +++ b/Ada95/configure @@ -1,8 +1,9 @@ #! /bin/sh -# From configure.in Revision: 1.66 . +# From configure.in Revision: 1.93 . # Guess values for system-dependent variables and create Makefiles. -# Generated by Autoconf 2.52.20170501. +# Generated by Autoconf 2.52.20231210. # +# 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 @@ -33,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 @@ -50,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 @@ -60,9 +61,9 @@ as_executable_p="test -f" # Support unset when possible. if (FOO=FOO; unset FOO) >/dev/null 2>&1; then - as_unset=unset + as_unset="unset" else - as_unset=false + as_unset="false" fi # NLS nuisances. @@ -97,13 +98,14 @@ exec 6>&1 ac_default_prefix=/usr/local cross_compiling=no subdirs= -MFLAGS= MAKEFLAGS= +MFLAGS= +MAKEFLAGS= SHELL=${CONFIG_SHELL-/bin/sh} # Maximum number of lines to put in a shell here document. # This variable seems obsolete. It should probably be removed, and # only ac_max_sed_lines should be used. -: ${ac_max_here_lines=38} +: "${ac_max_here_lines=38}" ac_unique_file="gen/gen.c" # Factoring default headers for most tests. @@ -176,6 +178,7 @@ datadir='${datarootdir}' sysconfdir='${prefix}/etc' sharedstatedir='${prefix}/com' localstatedir='${prefix}/var' +runstatedir='${localstatedir}/run' libdir='${exec_prefix}/lib' includedir='${prefix}/include' oldincludedir='/usr/include' @@ -203,7 +206,7 @@ do # Accept the important Cygnus configure options, so we can diagnose typos. - case $ac_option in + case "$ac_option" in -bindir | --bindir | --bindi | --bind | --bin | --bi) ac_prev=bindir ;; @@ -244,7 +247,7 @@ do expr "x$ac_feature" : ".*[^-_$as_cr_alnum]" >/dev/null && { echo "$as_me: error: invalid feature name: $ac_feature" >&2 { (exit 1); exit 1; }; } - ac_feature=`echo $ac_feature | sed 's/-/_/g'` + ac_feature=`echo "$ac_feature" | sed 's/-/_/g'` eval "enable_$ac_feature=no" ;; -enable-* | --enable-*) @@ -253,8 +256,8 @@ do expr "x$ac_feature" : ".*[^-_$as_cr_alnum]" >/dev/null && { echo "$as_me: error: invalid feature name: $ac_feature" >&2 { (exit 1); exit 1; }; } - ac_feature=`echo $ac_feature | sed 's/-/_/g'` - case $ac_option in + ac_feature=`echo "$ac_feature" | sed 's/-/_/g'` + case "$ac_option" in *=*) ac_optarg=`echo "$ac_optarg" | sed "s/'/'\\\\\\\\''/g"`;; *) ac_optarg=yes ;; esac @@ -318,6 +321,15 @@ do | --locals=* | --local=* | --loca=* | --loc=* | --lo=*) localstatedir=$ac_optarg ;; + -runstatedir | --runstatedir | --runstatedi | --runstated \ + | --runstate | --runstat | --runsta | --runst \ + | --runs | --run | --ru) + ac_prev=runstatedir ;; + -runstatedir=* | --runstatedir=* | --runstatedi=* | --runstated=* \ + | --runstate=* | --runstat=* | --runsta=* | --runst=* \ + | --runs=* | --run=* | --ru=*) + runstatedir=$ac_optarg ;; + -mandir | --mandir | --mandi | --mand | --man | --ma | --m) ac_prev=mandir ;; -mandir=* | --mandir=* | --mandi=* | --mand=* | --man=* | --ma=* | --m=*) @@ -435,8 +447,8 @@ do expr "x$ac_package" : ".*[^-_$as_cr_alnum]" >/dev/null && { echo "$as_me: error: invalid package name: $ac_package" >&2 { (exit 1); exit 1; }; } - ac_package=`echo $ac_package| sed 's/-/_/g'` - case $ac_option in + ac_package=`echo "$ac_package" | sed 's/-/_/g'` + case "$ac_option" in *=*) ac_optarg=`echo "$ac_optarg" | sed "s/'/'\\\\\\\\''/g"`;; *) ac_optarg=yes ;; esac @@ -448,7 +460,7 @@ do expr "x$ac_package" : ".*[^-_$as_cr_alnum]" >/dev/null && { echo "$as_me: error: invalid package name: $ac_package" >&2 { (exit 1); exit 1; }; } - ac_package=`echo $ac_package | sed 's/-/_/g'` + ac_package=`echo "$ac_package" | sed 's/-/_/g'` eval "with_$ac_package=no" ;; --x) @@ -482,21 +494,21 @@ Try \`$0 --help' for more information." >&2 { (exit 1); exit 1; }; } ac_optarg=`echo "$ac_optarg" | sed "s/'/'\\\\\\\\''/g"` eval "$ac_envvar='$ac_optarg'" - export $ac_envvar ;; + export "$ac_envvar" ;; *) # FIXME: should be removed in autoconf 3.0. echo "$as_me: WARNING: you should use --build, --host, --target" >&2 expr "x$ac_option" : ".*[^-._$as_cr_alnum]" >/dev/null && echo "$as_me: WARNING: invalid host type: $ac_option" >&2 - : ${build_alias=$ac_option} ${host_alias=$ac_option} ${target_alias=$ac_option} + : "${build_alias=$ac_option}" "${host_alias=$ac_option}" "${target_alias=$ac_option}" ;; esac done if test -n "$ac_prev"; then - ac_option=--`echo $ac_prev | sed 's/_/-/g'` + ac_option=--`echo "$ac_prev" | sed 's/_/-/g'` { echo "$as_me: error: missing argument to $ac_option" >&2 { (exit 1); exit 1; }; } fi @@ -504,8 +516,8 @@ fi # Be sure to have absolute paths. for ac_var in exec_prefix prefix do - eval ac_val=$`echo $ac_var` - case $ac_val in + eval ac_val=$`echo "$ac_var"` + case "$ac_val" in [\\/$]* | ?:[\\/]* | NONE | '' ) ;; *) { echo "$as_me: error: expected an absolute path for --$ac_var: $ac_val" >&2 { (exit 1); exit 1; }; };; @@ -516,8 +528,8 @@ done for ac_var in bindir sbindir libexecdir datarootdir datadir sysconfdir sharedstatedir \ localstatedir libdir includedir oldincludedir infodir mandir do - eval ac_val=$`echo $ac_var` - case $ac_val in + eval ac_val=$`echo "$ac_var"` + case "$ac_val" in [\\/$]* | ?:[\\/]* ) ;; *) { echo "$as_me: error: expected an absolute path for --$ac_var: $ac_val" >&2 { (exit 1); exit 1; }; };; @@ -554,13 +566,13 @@ if test -z "$srcdir"; then ac_confdir=`echo "$ac_prog" | sed 's%[\\/][^\\/][^\\/]*$%%'` test "x$ac_confdir" = "x$ac_prog" && ac_confdir=. srcdir=$ac_confdir - if test ! -r $srcdir/$ac_unique_file; then + if test ! -r "$srcdir/$ac_unique_file"; then srcdir=.. fi else ac_srcdir_defaulted=no fi -if test ! -r $srcdir/$ac_unique_file; then +if test ! -r "$srcdir/$ac_unique_file"; then if test "$ac_srcdir_defaulted" = yes; then { echo "$as_me: error: cannot find sources in $ac_confdir or .." >&2 { (exit 1); exit 1; }; } @@ -655,6 +667,7 @@ Fine tuning of the installation directories: --sysconfdir=DIR read-only single-machine data [PREFIX/etc] --sharedstatedir=DIR modifiable architecture-independent data [PREFIX/com] --localstatedir=DIR modifiable single-machine data [PREFIX/var] + --runstatedir=DIR extra definition of runtime data [LOCALSTATEDIR/run] --libdir=DIR object code libraries [EPREFIX/lib] --includedir=DIR C header files [PREFIX/include] --oldincludedir=DIR C header files for non-gcc [/usr/include] @@ -690,9 +703,11 @@ Optional Features: General Options: --with-system-type=XXX test: override derived host system-type + --without-ada suppress check for Ada compiler --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) @@ -708,7 +723,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 @@ -726,17 +741,19 @@ Experimental Code: --with-wrap-prefix=XXX override prefix used for public variables Testing/development Options: --disable-echo do not display "compiling" commands - --enable-warnings build: turn on GCC compiler warnings + --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-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 @@ -757,42 +774,43 @@ if test "$ac_init_help" = "recursive"; then # If there are subdirs, report their specific --help. ac_popdir=`pwd` for ac_subdir in : $ac_subdirs_all; do test "x$ac_subdir" = x: && continue - cd $ac_subdir + cd "$ac_subdir" # A "../" for each directory in /$ac_subdir. - ac_dots=`echo $ac_subdir | + ac_dots=`echo "$ac_subdir" | sed 's,^\./,,;s,[^/]$,&/,;s,[^/]*/,../,g'` - case $srcdir in + case "$srcdir" in .) # No --srcdir option. We are building in place. - ac_sub_srcdir=$srcdir ;; + ac_sub_srcdir="$srcdir" ;; [\\/]* | ?:[\\/]* ) # Absolute path. - ac_sub_srcdir=$srcdir/$ac_subdir ;; + ac_sub_srcdir="$srcdir/$ac_subdir" ;; *) # Relative path. - ac_sub_srcdir=$ac_dots$srcdir/$ac_subdir ;; + ac_sub_srcdir="$ac_dots$srcdir/$ac_subdir" ;; esac # Check for guested configure; otherwise get Cygnus style configure. - if test -f $ac_sub_srcdir/configure.gnu; then + if test -f "$ac_sub_srcdir/configure.gnu"; then echo - $SHELL $ac_sub_srcdir/configure.gnu --help=recursive - elif test -f $ac_sub_srcdir/configure; then + $SHELL "$ac_sub_srcdir/configure.gnu" --help=recursive + elif test -f "$ac_sub_srcdir/configure"; then echo - $SHELL $ac_sub_srcdir/configure --help=recursive - elif test -f $ac_sub_srcdir/configure.ac || - test -f $ac_sub_srcdir/configure.in; then + $SHELL "$ac_sub_srcdir/configure" --help=recursive + elif test -f "$ac_sub_srcdir/configure.ac" || + test -f "$ac_sub_srcdir/configure.in"; then echo - $ac_configure --help + "$ac_configure" --help else echo "$as_me: WARNING: no configuration information is in $ac_subdir" >&2 fi - cd $ac_popdir + cd "$ac_popdir" done fi test -n "$ac_init_help" && exit 0 -if $ac_init_version; then +if "$ac_init_version"; then cat <<\EOF +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 @@ -806,7 +824,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.20170501. Invocation command line was +generated by GNU Autoconf 2.52.20231210. Invocation command line was $ $0 $@ @@ -853,7 +871,7 @@ ac_configure_args= ac_sep= for ac_arg do - case $ac_arg in + case "$ac_arg" in -no-create | --no-create | --no-creat | --no-crea | --no-cre \ | --no-cr | --no-c) ;; -no-recursion | --no-recursion | --no-recursio | --no-recursi \ @@ -910,7 +928,7 @@ trap 'exit_status=$? exit $exit_status ' 0 for ac_signal in 1 2 13 15; do - trap 'ac_signal='$ac_signal'; { (exit 1); exit 1; }' $ac_signal + trap 'ac_signal='$ac_signal'; { (exit 1); exit 1; }' "$ac_signal" done ac_signal=0 @@ -930,7 +948,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:933: loading site script $ac_site_file" >&5 + { echo "$as_me:951: 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" @@ -941,7 +959,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:944: loading cache $cache_file" >&5 + { echo "$as_me:962: loading cache $cache_file" >&5 echo "$as_me: loading cache $cache_file" >&6;} case $cache_file in [\\/]* | ?:[\\/]* ) . $cache_file;; @@ -949,7 +967,7 @@ echo "$as_me: loading cache $cache_file" >&6;} esac fi else - { echo "$as_me:952: creating cache $cache_file" >&5 + { echo "$as_me:970: creating cache $cache_file" >&5 echo "$as_me: creating cache $cache_file" >&6;} >$cache_file fi @@ -963,23 +981,23 @@ for ac_var in `(set) 2>&1 | eval ac_new_set=\$ac_env_${ac_var}_set eval ac_old_val="\$ac_cv_env_${ac_var}_value" eval ac_new_val="\$ac_env_${ac_var}_value" - case $ac_old_set,$ac_new_set in + case "$ac_old_set,$ac_new_set" in set,) - { echo "$as_me:968: error: \`$ac_var' was set to \`$ac_old_val' in the previous run" >&5 + { echo "$as_me:986: 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:972: error: \`$ac_var' was not set in the previous run" >&5 + { echo "$as_me:990: 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:978: error: \`$ac_var' has changed since the previous run:" >&5 + { echo "$as_me:996: 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:980: former value: $ac_old_val" >&5 + { echo "$as_me:998: former value: $ac_old_val" >&5 echo "$as_me: former value: $ac_old_val" >&2;} - { echo "$as_me:982: current value: $ac_new_val" >&5 + { echo "$as_me:1000: current value: $ac_new_val" >&5 echo "$as_me: current value: $ac_new_val" >&2;} ac_cache_corrupted=: fi;; @@ -987,7 +1005,7 @@ echo "$as_me: current value: $ac_new_val" >&2;} # Pass precious variables to config.status. It doesn't matter if # we pass some twice (in addition to the command line arguments). if test "$ac_new_set" = set; then - case $ac_new_val in + case "$ac_new_val" in *" "*|*" "*|*[\[\]\~\#\$\^\&\*\(\)\{\}\\\|\;\<\>\?\"\']*) ac_arg=$ac_var=`echo "$ac_new_val" | sed "s/'/'\\\\\\\\''/g"` ac_configure_args="$ac_configure_args '$ac_arg'" @@ -997,35 +1015,43 @@ echo "$as_me: current value: $ac_new_val" >&2;} esac fi done -if $ac_cache_corrupted; then - { echo "$as_me:1001: error: changes in the environment can compromise the build" >&5 +if "$ac_cache_corrupted"; then + { echo "$as_me:1019: 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:1003: error: run \`make distclean' and/or \`rm $cache_file' and start over" >&5 + { { echo "$as_me:1021: 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 ac_ext=c ac_cpp='$CPP $CPPFLAGS' -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_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 +ac_main_return="return" case `echo "testing\c" 2>/dev/null; echo 1,2,3`,`echo -n testing 2>/dev/null; echo 1,2,3` in - *c*,-n*) ECHO_N= ECHO_C= # newlines do not sed ;-) only broken shells would use this case anyway - ECHO_T=' ' ;; - *c*,* ) ECHO_N=-n ECHO_C= ECHO_T= ;; - *) ECHO_N= ECHO_C='\c' ECHO_T= ;; + *c*,-n*) ECHO_N= + ECHO_C= # newlines do not sed ;-) only broken shells would use this case anyway + ECHO_T=' ' + ;; + *c*,* ) ECHO_N=-n + ECHO_C= + ECHO_T= + ;; + *) ECHO_N= + ECHO_C='\c' + ECHO_T= + ;; esac echo "#! $SHELL" >conftest.sh echo "exit 0" >>conftest.sh chmod +x conftest.sh -if { (echo "$as_me:1024: PATH=\".;.\"; conftest.sh") >&5 +if { (echo "$as_me:1050: PATH=\".;.\"; conftest.sh") >&5 (PATH=".;."; conftest.sh) 2>&5 ac_status=$? - echo "$as_me:1027: \$? = $ac_status" >&5 - (exit $ac_status); }; then + echo "$as_me:1053: \$? = $ac_status" >&5 + (exit "$ac_status"); }; then ac_path_separator=';' else ac_path_separator=: @@ -1035,26 +1061,28 @@ 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= for ac_dir in $srcdir $srcdir/.. $srcdir/../..; do - if test -f $ac_dir/install-sh; then + if test -f "$ac_dir/install-sh"; then ac_aux_dir=$ac_dir ac_install_sh="$ac_aux_dir/install-sh -c" break - elif test -f $ac_dir/install.sh; then + elif test -f "$ac_dir/install.sh"; then ac_aux_dir=$ac_dir ac_install_sh="$ac_aux_dir/install.sh -c" break - elif test -f $ac_dir/shtool; then + elif test -f "$ac_dir/shtool"; then ac_aux_dir=$ac_dir ac_install_sh="$ac_aux_dir/shtool install -c" break fi done if test -z "$ac_aux_dir"; then - { { echo "$as_me:1057: error: cannot find install-sh or install.sh in $srcdir $srcdir/.. $srcdir/../.." >&5 + { { echo "$as_me:1085: 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 @@ -1064,11 +1092,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:1067: error: cannot run $ac_config_sub" >&5 + { { echo "$as_me:1095: error: cannot run $ac_config_sub" >&5 echo "$as_me: error: cannot run $ac_config_sub" >&2;} { (exit 1); exit 1; }; } -echo "$as_me:1071: checking build system type" >&5 +echo "$as_me:1099: 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 @@ -1077,23 +1105,23 @@ else test -z "$ac_cv_build_alias" && ac_cv_build_alias=`$ac_config_guess` test -z "$ac_cv_build_alias" && - { { echo "$as_me:1080: error: cannot guess build type; you must specify one" >&5 + { { echo "$as_me:1108: 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:1084: error: $ac_config_sub $ac_cv_build_alias failed." >&5 +ac_cv_build=`$ac_config_sub "$ac_cv_build_alias"` || + { { echo "$as_me:1112: 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:1089: result: $ac_cv_build" >&5 +echo "$as_me:1117: 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/'` +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:1096: checking host system type" >&5 +echo "$as_me:1124: 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 @@ -1101,21 +1129,21 @@ else ac_cv_host_alias=$host_alias 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:1105: error: $ac_config_sub $ac_cv_host_alias failed" >&5 +ac_cv_host=`$ac_config_sub "$ac_cv_host_alias"` || + { { echo "$as_me:1133: 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:1110: result: $ac_cv_host" >&5 +echo "$as_me:1138: 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/'` -host_vendor=`echo $ac_cv_host | sed 's/^\([^-]*\)-\([^-]*\)-\(.*\)$/\2/'` -host_os=`echo $ac_cv_host | sed 's/^\([^-]*\)-\([^-]*\)-\(.*\)$/\3/'` +host_cpu=`echo "$ac_cv_host" | sed 's/^\([^-]*\)-\([^-]*\)-\(.*\)$/\1/'` +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:1118: checking target system type" >&5 +if test -f "$srcdir/config.guess" || test -f "$ac_aux_dir/config.guess" ; then + echo "$as_me:1146: 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 @@ -1123,18 +1151,18 @@ else ac_cv_target_alias=$target_alias 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:1127: error: $ac_config_sub $ac_cv_target_alias failed" >&5 +ac_cv_target=`$ac_config_sub "$ac_cv_target_alias"` || + { { echo "$as_me:1155: 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:1132: result: $ac_cv_target" >&5 +echo "$as_me:1160: 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/'` -target_vendor=`echo $ac_cv_target | sed 's/^\([^-]*\)-\([^-]*\)-\(.*\)$/\2/'` -target_os=`echo $ac_cv_target | sed 's/^\([^-]*\)-\([^-]*\)-\(.*\)$/\3/'` +target_cpu=`echo "$ac_cv_target" | sed 's/^\([^-]*\)-\([^-]*\)-\(.*\)$/\1/'` +target_vendor=`echo "$ac_cv_target" | sed 's/^\([^-]*\)-\([^-]*\)-\(.*\)$/\2/'` +target_os=`echo "$ac_cv_target" | sed 's/^\([^-]*\)-\([^-]*\)-\(.*\)$/\3/'` # The aliases save the names the user supplied, while $host etc. # will get canonicalized. @@ -1161,13 +1189,13 @@ else fi test -z "$system_name" && system_name="$cf_cv_system_name" -test -n "$cf_cv_system_name" && echo "$as_me:1164: result: Configuring for $cf_cv_system_name" >&5 +test -n "$cf_cv_system_name" && echo "$as_me:1192: 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:1168: result: Cached system name ($system_name) does not agree with actual ($cf_cv_system_name)" >&5 + echo "$as_me:1196: 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:1170: error: \"Please remove config.cache and try again.\"" >&5 + { { echo "$as_me:1198: 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 @@ -1175,7 +1203,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:1178: WARNING: overriding system type to $withval" >&5 + { echo "$as_me:1206: 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 @@ -1186,8 +1214,105 @@ fi; cf_user_CFLAGS="$CFLAGS" ### Default install-location +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:1221: 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 +else + if test -n "$GREP"; then + ac_cv_prog_GREP="$GREP" # Let the user override the test. +else + ac_save_IFS=$IFS; IFS=$ac_path_separator +ac_dummy="$PATH" +for ac_dir in $ac_dummy; do + IFS=$ac_save_IFS + test -z "$ac_dir" && ac_dir=. + $as_executable_p "$ac_dir/$ac_word" || continue +ac_cv_prog_GREP="$ac_prog" +echo "$as_me:1236: found $ac_dir/$ac_word" >&5 +break +done + +fi +fi +GREP=$ac_cv_prog_GREP +if test -n "$GREP"; then + echo "$as_me:1244: result: $GREP" >&5 +echo "${ECHO_T}$GREP" >&6 +else + echo "$as_me:1247: result: no" >&5 +echo "${ECHO_T}no" >&6 +fi + + test -n "$GREP" && break +done +test -n "$GREP" || GREP=": " + +echo "$as_me:1255: 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 +else + if echo 'ab*c' | $GREP -F 'ab*c' >/dev/null 2>&1 + then ac_cv_path_FGREP="$GREP -F" + else + for ac_prog in gfgrep fgrep +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:1267: 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 +else + case $FGREP in + [\\/]* | ?:[\\/]*) + ac_cv_path_FGREP="$FGREP" # Let the user override the test with a path. + ;; + *) + ac_save_IFS=$IFS; IFS=$ac_path_separator +ac_dummy="$PATH" +for ac_dir in $ac_dummy; do + IFS=$ac_save_IFS + test -z "$ac_dir" && ac_dir=. + if $as_executable_p "$ac_dir/$ac_word"; then + ac_cv_path_FGREP="$ac_dir/$ac_word" + echo "$as_me:1284: found $ac_dir/$ac_word" >&5 + break +fi +done + + ;; +esac +fi +FGREP=$ac_cv_path_FGREP + +if test -n "$FGREP"; then + echo "$as_me:1295: result: $FGREP" >&5 +echo "${ECHO_T}$FGREP" >&6 +else + echo "$as_me:1298: result: no" >&5 +echo "${ECHO_T}no" >&6 +fi + + test -n "$FGREP" && break +done +test -n "$FGREP" || FGREP=": " + + test "x$ac_cv_path_FGREP" = "x:" && { { echo "$as_me:1306: error: cannot find workable fgrep" >&5 +echo "$as_me: error: cannot find workable fgrep" >&2;} + { (exit 1); exit 1; }; } + fi +fi +echo "$as_me:1311: result: $ac_cv_path_FGREP" >&5 +echo "${ECHO_T}$ac_cv_path_FGREP" >&6 + FGREP="$ac_cv_path_FGREP" -echo "$as_me:1190: checking for prefix" >&5 +echo "$as_me:1315: 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 @@ -1199,51 +1324,361 @@ if test "x$prefix" = "xNONE" ; then ;; esac fi -echo "$as_me:1202: result: $prefix" >&5 +echo "$as_me:1327: result: $prefix" >&5 echo "${ECHO_T}$prefix" >&6 if test "x$prefix" = "xNONE" ; then -echo "$as_me:1206: checking for default include-directory" >&5 +echo "$as_me:1331: 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 \ - $includedir \ - $includedir/ncurses \ - $prefix/include \ - $prefix/include/ncurses \ + "$includedir" \ + "$includedir/ncurses" \ + "$prefix/include" \ + "$prefix/include/ncurses" \ /usr/local/include \ /usr/local/include/ncurses \ /usr/include \ /usr/include/ncurses do - cf_dir=`eval echo $cf_symbol` - if test -f $cf_dir/curses.h ; then - if ( fgrep NCURSES_VERSION $cf_dir/curses.h 2>&1 >/dev/null ) ; then + cf_dir=`eval echo "$cf_symbol"` + if test -f "$cf_dir/curses.h" ; then + if ( ${FGREP-fgrep} NCURSES_VERSION "$cf_dir/curses.h" >/dev/null 2>&1 ) ; then includedir="$cf_symbol" - test -n "$verbose" && echo $ac_n " found " 1>&6 + test -n "$verbose" && echo $ECHO_N " found " 1>&6 break fi fi test -n "$verbose" && echo " tested $cf_dir" 1>&6 done -echo "$as_me:1229: result: $includedir" >&5 +echo "$as_me:1354: result: $includedir" >&5 echo "${ECHO_T}$includedir" >&6 fi ### Checks for programs. +# Check whether --with-ada or --without-ada was given. +if test "${with_ada+set}" = set; then + withval="$with_ada" + cf_with_ada=$withval +else + cf_with_ada=yes +fi; + +cf_prog_cc="gcc cc" +if test "x$cf_with_ada" = xyes +then + +for cf_prog_gnat in gnat gnatmake gprconfig gprbuild +do + +cf_upper_prog_gnat=`echo "${cf_prog_gnat}" | sed y%abcdefghijklmnopqrstuvwxyz./-%ABCDEFGHIJKLMNOPQRSTUVWXYZ___%` + + unset ac_cv_path_cf_TEMP_gnat + 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:1381: 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 +else + case $cf_TEMP_gnat in + [\\/]* | ?:[\\/]*) + ac_cv_path_cf_TEMP_gnat="$cf_TEMP_gnat" # Let the user override the test with a path. + ;; + *) + ac_save_IFS=$IFS; IFS=$ac_path_separator +ac_dummy="$PATH" +for ac_dir in $ac_dummy; do + IFS=$ac_save_IFS + test -z "$ac_dir" && ac_dir=. + if $as_executable_p "$ac_dir/$ac_word"; then + ac_cv_path_cf_TEMP_gnat="$ac_dir/$ac_word" + echo "$as_me:1398: found $ac_dir/$ac_word" >&5 + break +fi +done + + test -z "$ac_cv_path_cf_TEMP_gnat" && ac_cv_path_cf_TEMP_gnat="no" + ;; +esac +fi +cf_TEMP_gnat=$ac_cv_path_cf_TEMP_gnat + +if test -n "$cf_TEMP_gnat"; then + echo "$as_me:1410: result: $cf_TEMP_gnat" >&5 +echo "${ECHO_T}$cf_TEMP_gnat" >&6 +else + echo "$as_me:1413: result: no" >&5 +echo "${ECHO_T}no" >&6 +fi + + eval "cf_cv_PATH_$cf_upper_prog_gnat=$ac_cv_path_cf_TEMP_gnat" + + if test "x$cf_TEMP_gnat" != xno; then + unset cf_cv_gnat_version + unset cf_TEMP_gnat + +echo "$as_me:1423: 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 +else + +cf_cv_gnat_version=`$cf_prog_gnat --version 2>&1 | \ + grep '[0-9].[0-9][0-9]*' |\ + sed -e '2,$d' -e 's/[^0-9 \.]//g' -e 's/^[ ]*//' -e 's/ .*//'` + +fi +echo "$as_me:1434: 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 + + fi + eval "cf_cv_VERSION_$cf_upper_prog_gnat=$cf_TEMP_gnat" + + unset cf_TEMP_gnat + unset cf_cv_gnat_version + unset ac_cv_path_cf_TEMP_gnat +done + +if test "x$cf_cv_VERSION_GNATMAKE" = "xno"; then + cf_ada_make= + cf_cv_prog_gnat_correct=no +else + cf_ada_make=gnatmake + if test "x$cf_cv_VERSION_GPRCONFIG" = "xno"; then + # gprconfig is newer than gnatmake; we can continue... + cf_ada_config="##" + else + rm -rf ./conftest* ./*~conftest* + if mkdir conftest.src + then + cf_ada_config="" + cd conftest.src + for cf_gprconfig in Ada C + do + echo "$as_me:1463: 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 + for cf_gprconfig_param in \ + "$cf_gprconfig,,,,GNATGCC" \ + "$cf_gprconfig,,,,GCC" \ + "$cf_gprconfig" + do + cf_gprconfig_value=`echo s| gprconfig --config=$cf_gprconfig_param 2>&5 | ${AWK:-awk} '/^\*/{print $3;}' | head -n 1` + test -n "$cf_gprconfig_value" && break + done + else + cf_gprconfig_param=$cf_gprconfig + cf_gprconfig_value=`echo s| gprconfig --config=$cf_gprconfig_param 2>&5 | ${AWK:-awk} '/^\*/{print $3;}' | head -n 1` + fi + if test -n "$cf_gprconfig_value" + then + eval "cf_ada_config_$cf_gprconfig=$cf_gprconfig_value" + echo "$as_me:1482: result: $cf_gprconfig_value" >&5 +echo "${ECHO_T}$cf_gprconfig_value" >&6 + else + echo "$as_me:1485: result: missing" >&5 +echo "${ECHO_T}missing" >&6 + cf_ada_config="#" + break + fi + done + cd .. + rm -rf ./conftest* ./*~conftest* + fi + fi + if test "x$cf_ada_config" != "x#" + then + +echo "$as_me:1498: 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 +else + +cf_cv_gnat_version=`${cf_ada_make:-gnatmake} --version 2>&1 | \ + grep '[0-9].[0-9][0-9]*' |\ + sed -e '2,$d' -e 's/[^0-9 \.]//g' -e 's/^[ ]*//' -e 's/ .*//'` + +fi +echo "$as_me:1509: 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 + +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]) + cf_cv_prog_gnat_correct=yes + ;; +(*) + { echo "$as_me:1518: 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 + ;; +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:1526: 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 +else + if test -n "$M4_exists"; then + ac_cv_prog_M4_exists="$M4_exists" # Let the user override the test. +else + ac_save_IFS=$IFS; IFS=$ac_path_separator +ac_dummy="$PATH" +for ac_dir in $ac_dummy; do + IFS=$ac_save_IFS + test -z "$ac_dir" && ac_dir=. + $as_executable_p "$ac_dir/$ac_word" || continue +ac_cv_prog_M4_exists="yes" +echo "$as_me:1541: found $ac_dir/$ac_word" >&5 +break +done + + test -z "$ac_cv_prog_M4_exists" && ac_cv_prog_M4_exists="no" +fi +fi +M4_exists=$ac_cv_prog_M4_exists +if test -n "$M4_exists"; then + echo "$as_me:1550: result: $M4_exists" >&5 +echo "${ECHO_T}$M4_exists" >&6 +else + echo "$as_me:1553: 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:1559: 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:1563: checking if GNAT works" >&5 +echo $ECHO_N "checking if GNAT works... $ECHO_C" >&6 + +rm -rf ./conftest* ./*~conftest* +cat >>conftest.ads <>conftest.adb <&5 2>&1 ) ; then + if ( ./conftest 1>&5 2>&1 ) ; then + cf_cv_prog_gnat_correct=yes + else + cf_cv_prog_gnat_correct=no + fi +else + cf_cv_prog_gnat_correct=no +fi +rm -rf ./conftest* ./*~conftest* + + echo "$as_me:1591: result: $cf_cv_prog_gnat_correct" >&5 +echo "${ECHO_T}$cf_cv_prog_gnat_correct" >&6 + fi + else + cf_cv_prog_gnat_correct=no + fi +fi + + if test "x$cf_cv_prog_gnat_correct" = xyes; then + # gcc's developers chose to deprecate gnatgcc before making gprconfig + # work. They replaced gnatgcc in gcc 13 with a script which spits out + # a warning offering advice which could never work. + # + # Here is a workaround. + # Extract the first word of "gnatgcc", so it can be a program name with args. +set dummy gnatgcc; ac_word=$2 +echo "$as_me:1607: checking for $ac_word" >&5 +echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6 +if test "${ac_cv_path_cf_cv_path_gnatgcc+set}" = set; then + echo $ECHO_N "(cached) $ECHO_C" >&6 +else + case $cf_cv_path_gnatgcc in + [\\/]* | ?:[\\/]*) + ac_cv_path_cf_cv_path_gnatgcc="$cf_cv_path_gnatgcc" # Let the user override the test with a path. + ;; + *) + ac_save_IFS=$IFS; IFS=$ac_path_separator +ac_dummy="$PATH" +for ac_dir in $ac_dummy; do + IFS=$ac_save_IFS + test -z "$ac_dir" && ac_dir=. + if $as_executable_p "$ac_dir/$ac_word"; then + ac_cv_path_cf_cv_path_gnatgcc="$ac_dir/$ac_word" + echo "$as_me:1624: found $ac_dir/$ac_word" >&5 + break +fi +done + + test -z "$ac_cv_path_cf_cv_path_gnatgcc" && ac_cv_path_cf_cv_path_gnatgcc="no" + ;; +esac +fi +cf_cv_path_gnatgcc=$ac_cv_path_cf_cv_path_gnatgcc + +if test -n "$cf_cv_path_gnatgcc"; then + echo "$as_me:1636: result: $cf_cv_path_gnatgcc" >&5 +echo "${ECHO_T}$cf_cv_path_gnatgcc" >&6 +else + echo "$as_me:1639: result: no" >&5 +echo "${ECHO_T}no" >&6 +fi + + if test "$cf_cv_path_gnatgcc" != no + then + echo "$as_me:1645: checking for improvement" >&5 +echo $ECHO_N "checking for improvement... $ECHO_C" >&6 + cf_file_gnatgcc=`file -L "$cf_cv_path_gnatgcc" 2>/dev/null` + case "x$cf_file_gnatgcc" in + (*script*) + cf_cv_path_gnatgcc=`sh -x "$cf_cv_path_gnatgcc" --version 2>&1 | grep -w exec | sed -e 's/^[ ]*+[ ]*//' -e 's/exec[ ]//' -e 's/ .*//'` + ;; + (*) + cf_cv_path_gnatgcc=no + ;; + esac + echo "$as_me:1656: result: $cf_cv_path_gnatgcc" >&5 +echo "${ECHO_T}$cf_cv_path_gnatgcc" >&6 + test "$cf_cv_path_gnatgcc" = no && cf_cv_path_gnatgcc=gnatgcc + cf_prog_cc="$cf_cv_path_gnatgcc $cf_prog_cc" + fi + fi +fi +case "$cf_prog_cc" in +(*/*) + CC="$cf_prog_cc" + + ;; +(*) + ac_ext=c ac_cpp='$CPP $CPPFLAGS' -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_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 +ac_main_return="return" if test -n "$ac_tool_prefix"; then - for ac_prog in gnatgcc gcc cc + for ac_prog in $cf_prog_cc 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:1246: checking for $ac_word" >&5 +echo "$as_me:1681: 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 @@ -1258,7 +1693,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:1261: found $ac_dir/$ac_word" >&5 +echo "$as_me:1696: found $ac_dir/$ac_word" >&5 break done @@ -1266,10 +1701,10 @@ fi fi CC=$ac_cv_prog_CC if test -n "$CC"; then - echo "$as_me:1269: result: $CC" >&5 + echo "$as_me:1704: result: $CC" >&5 echo "${ECHO_T}$CC" >&6 else - echo "$as_me:1272: result: no" >&5 + echo "$as_me:1707: result: no" >&5 echo "${ECHO_T}no" >&6 fi @@ -1278,11 +1713,11 @@ fi fi if test -z "$CC"; then ac_ct_CC=$CC - for ac_prog in gnatgcc gcc cc + for ac_prog in $cf_prog_cc 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:1285: checking for $ac_word" >&5 +echo "$as_me:1720: 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 @@ -1297,7 +1732,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:1300: found $ac_dir/$ac_word" >&5 +echo "$as_me:1735: found $ac_dir/$ac_word" >&5 break done @@ -1305,10 +1740,10 @@ fi fi ac_ct_CC=$ac_cv_prog_ac_ct_CC if test -n "$ac_ct_CC"; then - echo "$as_me:1308: result: $ac_ct_CC" >&5 + echo "$as_me:1743: result: $ac_ct_CC" >&5 echo "${ECHO_T}$ac_ct_CC" >&6 else - echo "$as_me:1311: result: no" >&5 + echo "$as_me:1746: result: no" >&5 echo "${ECHO_T}no" >&6 fi @@ -1318,32 +1753,32 @@ done CC=$ac_ct_CC fi -test -z "$CC" && { { echo "$as_me:1321: error: no acceptable cc found in \$PATH" >&5 +test -z "$CC" && { { echo "$as_me:1756: 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:1326:" \ +echo "$as_me:1761:" \ "checking for C compiler version" >&5 -ac_compiler=`set X $ac_compile; echo $2` -{ (eval echo "$as_me:1329: \"$ac_compiler --version &5\"") >&5 +ac_compiler=`set X $ac_compile; echo "$2"` +{ (eval echo "$as_me:1764: \"$ac_compiler --version &5\"") >&5 (eval $ac_compiler --version &5) 2>&5 ac_status=$? - echo "$as_me:1332: \$? = $ac_status" >&5 - (exit $ac_status); } -{ (eval echo "$as_me:1334: \"$ac_compiler -v &5\"") >&5 + echo "$as_me:1767: \$? = $ac_status" >&5 + (exit "$ac_status"); } +{ (eval echo "$as_me:1769: \"$ac_compiler -v &5\"") >&5 (eval $ac_compiler -v &5) 2>&5 ac_status=$? - echo "$as_me:1337: \$? = $ac_status" >&5 - (exit $ac_status); } -{ (eval echo "$as_me:1339: \"$ac_compiler -V &5\"") >&5 + echo "$as_me:1772: \$? = $ac_status" >&5 + (exit "$ac_status"); } +{ (eval echo "$as_me:1774: \"$ac_compiler -V &5\"") >&5 (eval $ac_compiler -V &5) 2>&5 ac_status=$? - echo "$as_me:1342: \$? = $ac_status" >&5 - (exit $ac_status); } + echo "$as_me:1777: \$? = $ac_status" >&5 + (exit "$ac_status"); } -cat >conftest.$ac_ext <<_ACEOF -#line 1346 "configure" +cat >"conftest.$ac_ext" <<_ACEOF +#line 1781 "configure" #include "confdefs.h" int @@ -1359,14 +1794,14 @@ 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:1362: checking for C compiler default output" >&5 +echo "$as_me:1797: 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:1365: \"$ac_link_default\"") >&5 +ac_link_default=`echo "$ac_link" | sed 's/ -o *"conftest[^"]*"//'` +if { (eval echo "$as_me:1800: \"$ac_link_default\"") >&5 (eval $ac_link_default) 2>&5 ac_status=$? - echo "$as_me:1368: \$? = $ac_status" >&5 - (exit $ac_status); }; then + echo "$as_me:1803: \$? = $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 # resort. @@ -1387,35 +1822,35 @@ for ac_file in `ls a.exe conftest.exe 2>/dev/null; done else echo "$as_me: failed program was:" >&5 -cat conftest.$ac_ext >&5 -{ { echo "$as_me:1391: error: C compiler cannot create executables" >&5 +cat "conftest.$ac_ext" >&5 +{ { echo "$as_me:1826: 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:1397: result: $ac_file" >&5 +echo "$as_me:1832: 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:1402: checking whether the C compiler works" >&5 +echo "$as_me:1837: 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:1408: \"$ac_try\"") >&5 + { (eval echo "$as_me:1843: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? - echo "$as_me:1411: \$? = $ac_status" >&5 - (exit $ac_status); }; }; then + echo "$as_me:1846: \$? = $ac_status" >&5 + (exit "$ac_status"); }; }; then cross_compiling=no else if test "$cross_compiling" = maybe; then cross_compiling=yes else - { { echo "$as_me:1418: error: cannot run C compiled programs. + { { echo "$as_me:1853: 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;} @@ -1423,25 +1858,25 @@ If you meant to cross compile, use \`--host'." >&2;} fi fi fi -echo "$as_me:1426: result: yes" >&5 +echo "$as_me:1861: result: yes" >&5 echo "${ECHO_T}yes" >&6 -rm -f a.out a.exe conftest$ac_cv_exeext +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:1433: checking whether we are cross compiling" >&5 +echo "$as_me:1868: checking whether we are cross compiling" >&5 echo $ECHO_N "checking whether we are cross compiling... $ECHO_C" >&6 -echo "$as_me:1435: result: $cross_compiling" >&5 +echo "$as_me:1870: result: $cross_compiling" >&5 echo "${ECHO_T}$cross_compiling" >&6 -echo "$as_me:1438: checking for executable suffix" >&5 +echo "$as_me:1873: checking for executable suffix" >&5 echo $ECHO_N "checking for executable suffix... $ECHO_C" >&6 -if { (eval echo "$as_me:1440: \"$ac_link\"") >&5 +if { (eval echo "$as_me:1875: \"$ac_link\"") >&5 (eval $ac_link) 2>&5 ac_status=$? - echo "$as_me:1443: \$? = $ac_status" >&5 - (exit $ac_status); }; then + echo "$as_me:1878: \$? = $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 # work properly (i.e., refer to `conftest.exe'), while it won't with @@ -1456,25 +1891,25 @@ for ac_file in `(ls conftest.exe; ls conftest; ls conftest.*) 2>/dev/null`; do esac done else - { { echo "$as_me:1459: error: cannot compute EXEEXT: cannot compile and link" >&5 + { { echo "$as_me:1894: 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:1465: result: $ac_cv_exeext" >&5 +rm -f "conftest$ac_cv_exeext" +echo "$as_me:1900: result: $ac_cv_exeext" >&5 echo "${ECHO_T}$ac_cv_exeext" >&6 -rm -f conftest.$ac_ext +rm -f "conftest.$ac_ext" EXEEXT=$ac_cv_exeext ac_exeext=$EXEEXT -echo "$as_me:1471: checking for object suffix" >&5 +echo "$as_me:1906: 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 1477 "configure" + cat >"conftest.$ac_ext" <<_ACEOF +#line 1912 "configure" #include "confdefs.h" int @@ -1486,11 +1921,11 @@ main (void) } _ACEOF rm -f conftest.o conftest.obj -if { (eval echo "$as_me:1489: \"$ac_compile\"") >&5 +if { (eval echo "$as_me:1924: \"$ac_compile\"") >&5 (eval $ac_compile) 2>&5 ac_status=$? - echo "$as_me:1492: \$? = $ac_status" >&5 - (exit $ac_status); }; then + echo "$as_me:1927: \$? = $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 *.$ac_ext | *.xcoff | *.tds | *.d | *.dbg | *.pdb | *.xSYM | *.map | *.inf ) ;; @@ -1500,25 +1935,25 @@ if { (eval echo "$as_me:1489: \"$ac_compile\"") >&5 done else echo "$as_me: failed program was:" >&5 -cat conftest.$ac_ext >&5 -{ { echo "$as_me:1504: error: cannot compute OBJEXT: cannot compile" >&5 +cat "conftest.$ac_ext" >&5 +{ { echo "$as_me:1939: 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 +rm -f "conftest.$ac_cv_objext" "conftest.$ac_ext" fi -echo "$as_me:1511: result: $ac_cv_objext" >&5 +echo "$as_me:1946: result: $ac_cv_objext" >&5 echo "${ECHO_T}$ac_cv_objext" >&6 OBJEXT=$ac_cv_objext ac_objext=$OBJEXT -echo "$as_me:1515: checking whether we are using the GNU C compiler" >&5 +echo "$as_me:1950: 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 1521 "configure" + cat >"conftest.$ac_ext" <<_ACEOF +#line 1956 "configure" #include "confdefs.h" int @@ -1532,41 +1967,41 @@ main (void) return 0; } _ACEOF -rm -f conftest.$ac_objext -if { (eval echo "$as_me:1536: \"$ac_compile\"") >&5 +rm -f "conftest.$ac_objext" +if { (eval echo "$as_me:1971: \"$ac_compile\"") >&5 (eval $ac_compile) 2>&5 ac_status=$? - echo "$as_me:1539: \$? = $ac_status" >&5 - (exit $ac_status); } && - { ac_try='test -s conftest.$ac_objext' - { (eval echo "$as_me:1542: \"$ac_try\"") >&5 + echo "$as_me:1974: \$? = $ac_status" >&5 + (exit "$ac_status"); } && + { ac_try='test -s "conftest.$ac_objext"' + { (eval echo "$as_me:1977: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? - echo "$as_me:1545: \$? = $ac_status" >&5 - (exit $ac_status); }; }; then + echo "$as_me:1980: \$? = $ac_status" >&5 + (exit "$ac_status"); }; }; then ac_compiler_gnu=yes else echo "$as_me: failed program was:" >&5 -cat conftest.$ac_ext >&5 +cat "conftest.$ac_ext" >&5 ac_compiler_gnu=no fi -rm -f conftest.$ac_objext conftest.$ac_ext +rm -f "conftest.$ac_objext" "conftest.$ac_ext" ac_cv_c_compiler_gnu=$ac_compiler_gnu fi -echo "$as_me:1557: result: $ac_cv_c_compiler_gnu" >&5 +echo "$as_me:1992: 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:1563: checking whether $CC accepts -g" >&5 +echo "$as_me:1998: 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 1569 "configure" + cat >"conftest.$ac_ext" <<_ACEOF +#line 2004 "configure" #include "confdefs.h" int @@ -1577,27 +2012,27 @@ main (void) return 0; } _ACEOF -rm -f conftest.$ac_objext -if { (eval echo "$as_me:1581: \"$ac_compile\"") >&5 +rm -f "conftest.$ac_objext" +if { (eval echo "$as_me:2016: \"$ac_compile\"") >&5 (eval $ac_compile) 2>&5 ac_status=$? - echo "$as_me:1584: \$? = $ac_status" >&5 - (exit $ac_status); } && - { ac_try='test -s conftest.$ac_objext' - { (eval echo "$as_me:1587: \"$ac_try\"") >&5 + echo "$as_me:2019: \$? = $ac_status" >&5 + (exit "$ac_status"); } && + { ac_try='test -s "conftest.$ac_objext"' + { (eval echo "$as_me:2022: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? - echo "$as_me:1590: \$? = $ac_status" >&5 - (exit $ac_status); }; }; then + echo "$as_me:2025: \$? = $ac_status" >&5 + (exit "$ac_status"); }; }; then ac_cv_prog_cc_g=yes else echo "$as_me: failed program was:" >&5 -cat conftest.$ac_ext >&5 +cat "conftest.$ac_ext" >&5 ac_cv_prog_cc_g=no fi -rm -f conftest.$ac_objext conftest.$ac_ext +rm -f "conftest.$ac_objext" "conftest.$ac_ext" fi -echo "$as_me:1600: result: $ac_cv_prog_cc_g" >&5 +echo "$as_me:2035: 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 @@ -1618,23 +2053,23 @@ fi # in C++ we need to declare it. In case someone uses the same compiler # for both compiling C and C++ we need to have the C++ compiler decide # the declaration of exit, since it's the most demanding environment. -cat >conftest.$ac_ext <<_ACEOF +cat >"conftest.$ac_ext" <<_ACEOF #ifndef __cplusplus choke me #endif _ACEOF -rm -f conftest.$ac_objext -if { (eval echo "$as_me:1627: \"$ac_compile\"") >&5 +rm -f "conftest.$ac_objext" +if { (eval echo "$as_me:2062: \"$ac_compile\"") >&5 (eval $ac_compile) 2>&5 ac_status=$? - echo "$as_me:1630: \$? = $ac_status" >&5 - (exit $ac_status); } && - { ac_try='test -s conftest.$ac_objext' - { (eval echo "$as_me:1633: \"$ac_try\"") >&5 + echo "$as_me:2065: \$? = $ac_status" >&5 + (exit "$ac_status"); } && + { ac_try='test -s "conftest.$ac_objext"' + { (eval echo "$as_me:2068: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? - echo "$as_me:1636: \$? = $ac_status" >&5 - (exit $ac_status); }; }; then + echo "$as_me:2071: \$? = $ac_status" >&5 + (exit "$ac_status"); }; }; then for ac_declaration in \ ''\ '#include ' \ @@ -1644,8 +2079,8 @@ if { (eval echo "$as_me:1627: \"$ac_compile\"") >&5 'extern "C" void exit (int);' \ 'void exit (int);' do - cat >conftest.$ac_ext <<_ACEOF -#line 1648 "configure" + cat >"conftest.$ac_ext" <<_ACEOF +#line 2083 "configure" #include "confdefs.h" #include $ac_declaration @@ -1657,27 +2092,27 @@ exit (42); return 0; } _ACEOF -rm -f conftest.$ac_objext -if { (eval echo "$as_me:1661: \"$ac_compile\"") >&5 +rm -f "conftest.$ac_objext" +if { (eval echo "$as_me:2096: \"$ac_compile\"") >&5 (eval $ac_compile) 2>&5 ac_status=$? - echo "$as_me:1664: \$? = $ac_status" >&5 - (exit $ac_status); } && - { ac_try='test -s conftest.$ac_objext' - { (eval echo "$as_me:1667: \"$ac_try\"") >&5 + echo "$as_me:2099: \$? = $ac_status" >&5 + (exit "$ac_status"); } && + { ac_try='test -s "conftest.$ac_objext"' + { (eval echo "$as_me:2102: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? - echo "$as_me:1670: \$? = $ac_status" >&5 - (exit $ac_status); }; }; then + echo "$as_me:2105: \$? = $ac_status" >&5 + (exit "$ac_status"); }; }; then : else echo "$as_me: failed program was:" >&5 -cat conftest.$ac_ext >&5 +cat "conftest.$ac_ext" >&5 continue fi -rm -f conftest.$ac_objext conftest.$ac_ext - cat >conftest.$ac_ext <<_ACEOF -#line 1680 "configure" +rm -f "conftest.$ac_objext" "conftest.$ac_ext" + cat >"conftest.$ac_ext" <<_ACEOF +#line 2115 "configure" #include "confdefs.h" $ac_declaration int @@ -1688,63 +2123,240 @@ exit (42); return 0; } _ACEOF -rm -f conftest.$ac_objext -if { (eval echo "$as_me:1692: \"$ac_compile\"") >&5 +rm -f "conftest.$ac_objext" +if { (eval echo "$as_me:2127: \"$ac_compile\"") >&5 (eval $ac_compile) 2>&5 ac_status=$? - echo "$as_me:1695: \$? = $ac_status" >&5 - (exit $ac_status); } && - { ac_try='test -s conftest.$ac_objext' - { (eval echo "$as_me:1698: \"$ac_try\"") >&5 + echo "$as_me:2130: \$? = $ac_status" >&5 + (exit "$ac_status"); } && + { ac_try='test -s "conftest.$ac_objext"' + { (eval echo "$as_me:2133: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? - echo "$as_me:1701: \$? = $ac_status" >&5 - (exit $ac_status); }; }; then + echo "$as_me:2136: \$? = $ac_status" >&5 + (exit "$ac_status"); }; }; then break else echo "$as_me: failed program was:" >&5 -cat conftest.$ac_ext >&5 +cat "conftest.$ac_ext" >&5 fi -rm -f conftest.$ac_objext conftest.$ac_ext +rm -f "conftest.$ac_objext" "conftest.$ac_ext" done rm -rf conftest* if test -n "$ac_declaration"; then echo '#ifdef __cplusplus' >>confdefs.h - echo $ac_declaration >>confdefs.h + echo "$ac_declaration" >>confdefs.h echo '#endif' >>confdefs.h fi else echo "$as_me: failed program was:" >&5 -cat conftest.$ac_ext >&5 +cat "conftest.$ac_ext" >&5 fi -rm -f conftest.$ac_objext conftest.$ac_ext +rm -f "conftest.$ac_objext" "conftest.$ac_ext" ac_ext=c ac_cpp='$CPP $CPPFLAGS' -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_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 +ac_main_return="return" GCC_VERSION=none if test "$GCC" = yes ; then - echo "$as_me:1731: checking version of $CC" >&5 + echo "$as_me:2166: 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:1735: result: $GCC_VERSION" >&5 + echo "$as_me:2170: result: $GCC_VERSION" >&5 echo "${ECHO_T}$GCC_VERSION" >&6 fi -echo "$as_me:1739: checking for $CC option to accept ANSI C" >&5 -echo $ECHO_N "checking for $CC option to accept ANSI C... $ECHO_C" >&6 +INTEL_COMPILER=no + +if test "$GCC" = yes ; then + case "$host_os" in + (linux*|gnu*) + echo "$as_me:2179: 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 2184 "configure" +#include "confdefs.h" + +int +main (void) +{ + +#ifdef __INTEL_COMPILER +#else +#error __INTEL_COMPILER is not defined +#endif + + ; + return 0; +} +_ACEOF +rm -f "conftest.$ac_objext" +if { (eval echo "$as_me:2201: \"$ac_compile\"") >&5 + (eval $ac_compile) 2>&5 + ac_status=$? + echo "$as_me:2204: \$? = $ac_status" >&5 + (exit "$ac_status"); } && + { ac_try='test -s "conftest.$ac_objext"' + { (eval echo "$as_me:2207: \"$ac_try\"") >&5 + (eval $ac_try) 2>&5 + ac_status=$? + echo "$as_me:2210: \$? = $ac_status" >&5 + (exit "$ac_status"); }; }; then + INTEL_COMPILER=yes +cf_save_CFLAGS="$cf_save_CFLAGS -we147" + +else + echo "$as_me: failed program was:" >&5 +cat "conftest.$ac_ext" >&5 +fi +rm -f "conftest.$ac_objext" "conftest.$ac_ext" + CFLAGS="$cf_save_CFLAGS" + echo "$as_me:2221: result: $INTEL_COMPILER" >&5 +echo "${ECHO_T}$INTEL_COMPILER" >&6 + ;; + esac +fi + +CLANG_COMPILER=no + +if test "$GCC" = yes ; then + echo "$as_me:2230: 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 2234 "configure" +#include "confdefs.h" + +int +main (void) +{ + +#ifdef __clang__ +#else +#error __clang__ is not defined +#endif + + ; + return 0; +} +_ACEOF +rm -f "conftest.$ac_objext" +if { (eval echo "$as_me:2251: \"$ac_compile\"") >&5 + (eval $ac_compile) 2>&5 + ac_status=$? + echo "$as_me:2254: \$? = $ac_status" >&5 + (exit "$ac_status"); } && + { ac_try='test -s "conftest.$ac_objext"' + { (eval echo "$as_me:2257: \"$ac_try\"") >&5 + (eval $ac_try) 2>&5 + ac_status=$? + echo "$as_me:2260: \$? = $ac_status" >&5 + (exit "$ac_status"); }; }; then + CLANG_COMPILER=yes + +else + echo "$as_me: failed program was:" >&5 +cat "conftest.$ac_ext" >&5 +fi +rm -f "conftest.$ac_objext" "conftest.$ac_ext" + CFLAGS="$cf_save_CFLAGS" + echo "$as_me:2270: result: $CLANG_COMPILER" >&5 +echo "${ECHO_T}$CLANG_COMPILER" >&6 +fi + +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:2279: 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:2286: 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:2290: 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:2297: 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 2302 "configure" +#include "confdefs.h" + + #include +int +main (void) +{ + + printf("hello!\\n"); + ; + return 0; +} +_ACEOF +rm -f "conftest.$ac_objext" "conftest$ac_exeext" +if { (eval echo "$as_me:2316: \"$ac_link\"") >&5 + (eval $ac_link) 2>&5 + ac_status=$? + echo "$as_me:2319: \$? = $ac_status" >&5 + (exit "$ac_status"); } && + { ac_try='test -s "conftest$ac_exeext"' + { (eval echo "$as_me:2322: \"$ac_try\"") >&5 + (eval $ac_try) 2>&5 + ac_status=$? + echo "$as_me:2325: \$? = $ac_status" >&5 + (exit "$ac_status"); }; }; then + + cf_clang_optok=yes +else + echo "$as_me: failed program was:" >&5 +cat "conftest.$ac_ext" >&5 + + cf_clang_optok=no +fi +rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext" + echo "$as_me:2336: 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}:2342: testing adding option $cf_clang_opt ..." 1>&5 + + test -n "$CFLAGS" && CFLAGS="$CFLAGS " + CFLAGS="${CFLAGS}$cf_clang_opt" + + fi + done +fi + +echo "$as_me:2351: 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 else ac_cv_prog_cc_stdc=no ac_save_CC=$CC -cat >conftest.$ac_ext <<_ACEOF -#line 1747 "configure" +cat >"conftest.$ac_ext" <<_ACEOF +#line 2359 "configure" #include "confdefs.h" #include #include @@ -1753,9 +2365,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]; } @@ -1792,51 +2402,51 @@ _ACEOF for ac_arg in "" -qlanglvl=ansi -std1 -Ae "-Aa -D_HPUX_SOURCE" "-Xc -D__EXTENSIONS__" do CC="$ac_save_CC $ac_arg" - rm -f conftest.$ac_objext -if { (eval echo "$as_me:1796: \"$ac_compile\"") >&5 + rm -f "conftest.$ac_objext" +if { (eval echo "$as_me:2406: \"$ac_compile\"") >&5 (eval $ac_compile) 2>&5 ac_status=$? - echo "$as_me:1799: \$? = $ac_status" >&5 - (exit $ac_status); } && - { ac_try='test -s conftest.$ac_objext' - { (eval echo "$as_me:1802: \"$ac_try\"") >&5 + echo "$as_me:2409: \$? = $ac_status" >&5 + (exit "$ac_status"); } && + { ac_try='test -s "conftest.$ac_objext"' + { (eval echo "$as_me:2412: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? - echo "$as_me:1805: \$? = $ac_status" >&5 - (exit $ac_status); }; }; then + echo "$as_me:2415: \$? = $ac_status" >&5 + (exit "$ac_status"); }; }; then ac_cv_prog_cc_stdc=$ac_arg break else echo "$as_me: failed program was:" >&5 -cat conftest.$ac_ext >&5 +cat "conftest.$ac_ext" >&5 fi -rm -f conftest.$ac_objext +rm -f "conftest.$ac_objext" done -rm -f conftest.$ac_ext conftest.$ac_objext +rm -f "conftest.$ac_ext" "conftest.$ac_objext" CC=$ac_save_CC fi case "x$ac_cv_prog_cc_stdc" in x|xno) - echo "$as_me:1822: result: none needed" >&5 + echo "$as_me:2432: result: none needed" >&5 echo "${ECHO_T}none needed" >&6 ;; *) - echo "$as_me:1825: result: $ac_cv_prog_cc_stdc" >&5 + echo "$as_me:2435: result: $ac_cv_prog_cc_stdc" >&5 echo "${ECHO_T}$ac_cv_prog_cc_stdc" >&6 CC="$CC $ac_cv_prog_cc_stdc" ;; esac # This should have been defined by AC_PROG_CC -: ${CC:=cc} +: "${CC:=cc}" -echo "$as_me:1833: checking \$CFLAGS variable" >&5 +echo "$as_me:2443: checking \$CFLAGS variable" >&5 echo $ECHO_N "checking \$CFLAGS variable... $ECHO_C" >&6 case "x$CFLAGS" in (*-[IUD]*) - echo "$as_me:1837: result: broken" >&5 + echo "$as_me:2447: result: broken" >&5 echo "${ECHO_T}broken" >&6 - { echo "$as_me:1839: WARNING: your environment uses the CFLAGS variable to hold CPPFLAGS options" >&5 + { echo "$as_me:2449: 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= @@ -1850,19 +2460,19 @@ cf_new_extra_cppflags= for cf_add_cflags in $cf_arg do -case $cf_fix_cppflags in +case "$cf_fix_cppflags" in (no) - case $cf_add_cflags in + case "$cf_add_cflags" in (-undef|-nostdinc*|-I*|-D*|-U*|-E|-P|-C) - case $cf_add_cflags in + case "$cf_add_cflags" in (-D*) - cf_tst_cflags=`echo ${cf_add_cflags} |sed -e 's/^-D[^=]*='\''\"[^"]*//'` + cf_tst_cflags=`echo "${cf_add_cflags}" |sed -e 's/^-D[^=]*='\''\"[^"]*//'` test "x${cf_add_cflags}" != "x${cf_tst_cflags}" \ && test -z "${cf_tst_cflags}" \ && cf_fix_cppflags=yes - if test $cf_fix_cppflags = yes ; then + if test "$cf_fix_cppflags" = yes ; then test -n "$cf_new_extra_cppflags" && cf_new_extra_cppflags="$cf_new_extra_cppflags " cf_new_extra_cppflags="${cf_new_extra_cppflags}$cf_add_cflags" @@ -1881,7 +2491,7 @@ case $cf_fix_cppflags in (*$cf_add_cflags) ;; (*) - case $cf_add_cflags in + case "$cf_add_cflags" in (-D*) cf_tst_cppflags=`echo "x$cf_add_cflags" | sed -e 's/^...//' -e 's/=.*//'` @@ -1911,7 +2521,7 @@ CPPFLAGS=`echo "$CPPFLAGS" | \ test -n "$cf_new_extra_cppflags" && cf_new_extra_cppflags="$cf_new_extra_cppflags " cf_new_extra_cppflags="${cf_new_extra_cppflags}$cf_add_cflags" - cf_tst_cflags=`echo ${cf_add_cflags} |sed -e 's/^[^"]*"'\''//'` + cf_tst_cflags=`echo "${cf_add_cflags}" |sed -e 's/^[^"]*"'\''//'` test "x${cf_add_cflags}" != "x${cf_tst_cflags}" \ && test -z "${cf_tst_cflags}" \ @@ -1944,22 +2554,22 @@ fi done ;; (*) - echo "$as_me:1947: result: ok" >&5 + echo "$as_me:2557: result: ok" >&5 echo "${ECHO_T}ok" >&6 ;; esac -echo "$as_me:1952: checking \$CC variable" >&5 +echo "$as_me:2562: checking \$CC variable" >&5 echo $ECHO_N "checking \$CC variable... $ECHO_C" >&6 case "$CC" in (*[\ \ ]-*) - echo "$as_me:1956: result: broken" >&5 + echo "$as_me:2566: result: broken" >&5 echo "${ECHO_T}broken" >&6 - { echo "$as_me:1958: WARNING: your environment uses the CC variable to hold CFLAGS/CPPFLAGS options" >&5 + { echo "$as_me:2568: 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 @@ -1973,19 +2583,19 @@ cf_new_extra_cppflags= for cf_add_cflags in $cf_arg do -case $cf_fix_cppflags in +case "$cf_fix_cppflags" in (no) - case $cf_add_cflags in + case "$cf_add_cflags" in (-undef|-nostdinc*|-I*|-D*|-U*|-E|-P|-C) - case $cf_add_cflags in + case "$cf_add_cflags" in (-D*) - cf_tst_cflags=`echo ${cf_add_cflags} |sed -e 's/^-D[^=]*='\''\"[^"]*//'` + cf_tst_cflags=`echo "${cf_add_cflags}" |sed -e 's/^-D[^=]*='\''\"[^"]*//'` test "x${cf_add_cflags}" != "x${cf_tst_cflags}" \ && test -z "${cf_tst_cflags}" \ && cf_fix_cppflags=yes - if test $cf_fix_cppflags = yes ; then + if test "$cf_fix_cppflags" = yes ; then test -n "$cf_new_extra_cppflags" && cf_new_extra_cppflags="$cf_new_extra_cppflags " cf_new_extra_cppflags="${cf_new_extra_cppflags}$cf_add_cflags" @@ -2004,7 +2614,7 @@ case $cf_fix_cppflags in (*$cf_add_cflags) ;; (*) - case $cf_add_cflags in + case "$cf_add_cflags" in (-D*) cf_tst_cppflags=`echo "x$cf_add_cflags" | sed -e 's/^...//' -e 's/=.*//'` @@ -2034,7 +2644,7 @@ CPPFLAGS=`echo "$CPPFLAGS" | \ test -n "$cf_new_extra_cppflags" && cf_new_extra_cppflags="$cf_new_extra_cppflags " cf_new_extra_cppflags="${cf_new_extra_cppflags}$cf_add_cflags" - cf_tst_cflags=`echo ${cf_add_cflags} |sed -e 's/^[^"]*"'\''//'` + cf_tst_cflags=`echo "${cf_add_cflags}" |sed -e 's/^[^"]*"'\''//'` test "x${cf_add_cflags}" != "x${cf_tst_cflags}" \ && test -z "${cf_tst_cflags}" \ @@ -2072,30 +2682,93 @@ fi done test -n "$verbose" && echo " resulting CC: '$CC'" 1>&6 -echo "${as_me:-configure}:2075: testing resulting CC: '$CC' ..." 1>&5 +echo "${as_me:-configure}:2685: testing resulting CC: '$CC' ..." 1>&5 test -n "$verbose" && echo " resulting CFLAGS: '$CFLAGS'" 1>&6 -echo "${as_me:-configure}:2079: testing resulting CFLAGS: '$CFLAGS' ..." 1>&5 +echo "${as_me:-configure}:2689: testing resulting CFLAGS: '$CFLAGS' ..." 1>&5 test -n "$verbose" && echo " resulting CPPFLAGS: '$CPPFLAGS'" 1>&6 -echo "${as_me:-configure}:2083: testing resulting CPPFLAGS: '$CPPFLAGS' ..." 1>&5 +echo "${as_me:-configure}:2693: testing resulting CPPFLAGS: '$CPPFLAGS' ..." 1>&5 ;; (*) - echo "$as_me:2087: result: ok" >&5 + echo "$as_me:2697: result: ok" >&5 echo "${ECHO_T}ok" >&6 ;; esac + ;; +esac + +echo "$as_me:2705: 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 +else + if echo a | $GREP -E '(a|b)' >/dev/null 2>&1 + then ac_cv_path_EGREP="$GREP -E" + else + for ac_prog in gegrep egrep +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:2717: 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 +else + case $EGREP in + [\\/]* | ?:[\\/]*) + ac_cv_path_EGREP="$EGREP" # Let the user override the test with a path. + ;; + *) + ac_save_IFS=$IFS; IFS=$ac_path_separator +ac_dummy="$PATH" +for ac_dir in $ac_dummy; do + IFS=$ac_save_IFS + test -z "$ac_dir" && ac_dir=. + if $as_executable_p "$ac_dir/$ac_word"; then + ac_cv_path_EGREP="$ac_dir/$ac_word" + echo "$as_me:2734: found $ac_dir/$ac_word" >&5 + break +fi +done + + ;; +esac +fi +EGREP=$ac_cv_path_EGREP + +if test -n "$EGREP"; then + echo "$as_me:2745: result: $EGREP" >&5 +echo "${ECHO_T}$EGREP" >&6 +else + echo "$as_me:2748: result: no" >&5 +echo "${ECHO_T}no" >&6 +fi + + test -n "$EGREP" && break +done +test -n "$EGREP" || EGREP=": " + + test "x$ac_cv_path_EGREP" = "x:" && { { echo "$as_me:2756: error: cannot find workable egrep" >&5 +echo "$as_me: error: cannot find workable egrep" >&2;} + { (exit 1); exit 1; }; } + fi +fi +echo "$as_me:2761: result: $ac_cv_path_EGREP" >&5 +echo "${ECHO_T}$ac_cv_path_EGREP" >&6 + EGREP="$ac_cv_path_EGREP" + ac_ext=c ac_cpp='$CPP $CPPFLAGS' -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_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:2098: checking how to run the C preprocessor" >&5 +ac_main_return="return" +echo "$as_me:2771: 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 @@ -2115,20 +2788,20 @@ do # with a fresh cross-compiler works. # 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 2119 "configure" + cat >"conftest.$ac_ext" <<_ACEOF +#line 2792 "configure" #include "confdefs.h" #include Syntax error _ACEOF -if { (eval echo "$as_me:2124: \"$ac_cpp conftest.$ac_ext\"") >&5 - (eval $ac_cpp conftest.$ac_ext) 2>conftest.er1 +if { (eval echo "$as_me:2797: \"$ac_cpp "conftest.$ac_ext"\"") >&5 + (eval $ac_cpp "conftest.$ac_ext") 2>conftest.er1 ac_status=$? - egrep -v '^ *\+' conftest.er1 >conftest.err + $EGREP -v '^ *\+' conftest.er1 >conftest.err rm -f conftest.er1 cat conftest.err >&5 - echo "$as_me:2130: \$? = $ac_status" >&5 - (exit $ac_status); } >/dev/null; then + echo "$as_me:2803: \$? = $ac_status" >&5 + (exit "$ac_status"); } >/dev/null; then if test -s conftest.err; then ac_cpp_err=$ac_c_preproc_warn_flag else @@ -2141,27 +2814,27 @@ if test -z "$ac_cpp_err"; then : else echo "$as_me: failed program was:" >&5 - cat conftest.$ac_ext >&5 + cat "conftest.$ac_ext" >&5 # Broken: fails on valid input. continue fi -rm -f conftest.err conftest.$ac_ext +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 2153 "configure" + cat >"conftest.$ac_ext" <<_ACEOF +#line 2826 "configure" #include "confdefs.h" #include _ACEOF -if { (eval echo "$as_me:2157: \"$ac_cpp conftest.$ac_ext\"") >&5 - (eval $ac_cpp conftest.$ac_ext) 2>conftest.er1 +if { (eval echo "$as_me:2830: \"$ac_cpp "conftest.$ac_ext"\"") >&5 + (eval $ac_cpp "conftest.$ac_ext") 2>conftest.er1 ac_status=$? - egrep -v '^ *\+' conftest.er1 >conftest.err + $EGREP -v '^ *\+' conftest.er1 >conftest.err rm -f conftest.er1 cat conftest.err >&5 - echo "$as_me:2163: \$? = $ac_status" >&5 - (exit $ac_status); } >/dev/null; then + echo "$as_me:2836: \$? = $ac_status" >&5 + (exit "$ac_status"); } >/dev/null; then if test -s conftest.err; then ac_cpp_err=$ac_c_preproc_warn_flag else @@ -2175,16 +2848,16 @@ if test -z "$ac_cpp_err"; then continue else echo "$as_me: failed program was:" >&5 - cat conftest.$ac_ext >&5 + cat "conftest.$ac_ext" >&5 # Passes both tests. ac_preproc_ok=: break fi -rm -f conftest.err conftest.$ac_ext +rm -f conftest.err "conftest.$ac_ext" done # Because of `break', _AC_PREPROC_IFELSE's cleaning code was skipped. -rm -f conftest.err conftest.$ac_ext +rm -f conftest.err "conftest.$ac_ext" if $ac_preproc_ok; then break fi @@ -2197,7 +2870,7 @@ fi else ac_cv_prog_CPP=$CPP fi -echo "$as_me:2200: result: $CPP" >&5 +echo "$as_me:2873: result: $CPP" >&5 echo "${ECHO_T}$CPP" >&6 ac_preproc_ok=false for ac_c_preproc_warn_flag in '' yes @@ -2206,20 +2879,20 @@ do # with a fresh cross-compiler works. # 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 2210 "configure" + cat >"conftest.$ac_ext" <<_ACEOF +#line 2883 "configure" #include "confdefs.h" #include Syntax error _ACEOF -if { (eval echo "$as_me:2215: \"$ac_cpp conftest.$ac_ext\"") >&5 - (eval $ac_cpp conftest.$ac_ext) 2>conftest.er1 +if { (eval echo "$as_me:2888: \"$ac_cpp "conftest.$ac_ext"\"") >&5 + (eval $ac_cpp "conftest.$ac_ext") 2>conftest.er1 ac_status=$? - egrep -v '^ *\+' conftest.er1 >conftest.err + $EGREP -v '^ *\+' conftest.er1 >conftest.err rm -f conftest.er1 cat conftest.err >&5 - echo "$as_me:2221: \$? = $ac_status" >&5 - (exit $ac_status); } >/dev/null; then + echo "$as_me:2894: \$? = $ac_status" >&5 + (exit "$ac_status"); } >/dev/null; then if test -s conftest.err; then ac_cpp_err=$ac_c_preproc_warn_flag else @@ -2232,27 +2905,27 @@ if test -z "$ac_cpp_err"; then : else echo "$as_me: failed program was:" >&5 - cat conftest.$ac_ext >&5 + cat "conftest.$ac_ext" >&5 # Broken: fails on valid input. continue fi -rm -f conftest.err conftest.$ac_ext +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 2244 "configure" + cat >"conftest.$ac_ext" <<_ACEOF +#line 2917 "configure" #include "confdefs.h" #include _ACEOF -if { (eval echo "$as_me:2248: \"$ac_cpp conftest.$ac_ext\"") >&5 - (eval $ac_cpp conftest.$ac_ext) 2>conftest.er1 +if { (eval echo "$as_me:2921: \"$ac_cpp "conftest.$ac_ext"\"") >&5 + (eval $ac_cpp "conftest.$ac_ext") 2>conftest.er1 ac_status=$? - egrep -v '^ *\+' conftest.er1 >conftest.err + $EGREP -v '^ *\+' conftest.er1 >conftest.err rm -f conftest.er1 cat conftest.err >&5 - echo "$as_me:2254: \$? = $ac_status" >&5 - (exit $ac_status); } >/dev/null; then + echo "$as_me:2927: \$? = $ac_status" >&5 + (exit "$ac_status"); } >/dev/null; then if test -s conftest.err; then ac_cpp_err=$ac_c_preproc_warn_flag else @@ -2266,46 +2939,46 @@ if test -z "$ac_cpp_err"; then continue else echo "$as_me: failed program was:" >&5 - cat conftest.$ac_ext >&5 + cat "conftest.$ac_ext" >&5 # Passes both tests. ac_preproc_ok=: break fi -rm -f conftest.err conftest.$ac_ext +rm -f conftest.err "conftest.$ac_ext" done # Because of `break', _AC_PREPROC_IFELSE's cleaning code was skipped. -rm -f conftest.err conftest.$ac_ext +rm -f conftest.err "conftest.$ac_ext" if $ac_preproc_ok; then : else - { { echo "$as_me:2282: error: C preprocessor \"$CPP\" fails sanity check" >&5 + { { echo "$as_me:2955: error: C preprocessor \"$CPP\" fails sanity check" >&5 echo "$as_me: error: C preprocessor \"$CPP\" fails sanity check" >&2;} { (exit 1); exit 1; }; } fi ac_ext=c ac_cpp='$CPP $CPPFLAGS' -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_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 +ac_main_return="return" if test $ac_cv_c_compiler_gnu = yes; then - echo "$as_me:2295: checking whether $CC needs -traditional" >&5 + echo "$as_me:2968: 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 2302 "configure" + cat >"conftest.$ac_ext" <<_ACEOF +#line 2975 "configure" #include "confdefs.h" #include int Autoconf = TIOCGETP; _ACEOF if (eval "$ac_cpp conftest.$ac_ext") 2>&5 | - egrep "$ac_pattern" >/dev/null 2>&1; then + $EGREP "$ac_pattern" >/dev/null 2>&1; then ac_cv_prog_gcc_traditional=yes else ac_cv_prog_gcc_traditional=no @@ -2313,28 +2986,28 @@ fi rm -rf conftest* if test $ac_cv_prog_gcc_traditional = no; then - cat >conftest.$ac_ext <<_ACEOF -#line 2317 "configure" + cat >"conftest.$ac_ext" <<_ACEOF +#line 2990 "configure" #include "confdefs.h" #include int Autoconf = TCGETA; _ACEOF if (eval "$ac_cpp conftest.$ac_ext") 2>&5 | - egrep "$ac_pattern" >/dev/null 2>&1; then + $EGREP "$ac_pattern" >/dev/null 2>&1; then ac_cv_prog_gcc_traditional=yes fi rm -rf conftest* fi fi -echo "$as_me:2330: result: $ac_cv_prog_gcc_traditional" >&5 +echo "$as_me:3003: 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:2337: checking whether $CC understands -c and -o together" >&5 +echo "$as_me:3010: 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 @@ -2349,29 +3022,29 @@ 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:2352: \"$ac_try\"") >&5 +if { (eval echo "$as_me:3025: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? - echo "$as_me:2355: \$? = $ac_status" >&5 - (exit $ac_status); } && - test -f conftest2.$ac_objext && { (eval echo "$as_me:2357: \"$ac_try\"") >&5 + echo "$as_me:3028: \$? = $ac_status" >&5 + (exit "$ac_status"); } && + test -f conftest2.$ac_objext && { (eval echo "$as_me:3030: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? - echo "$as_me:2360: \$? = $ac_status" >&5 - (exit $ac_status); }; + echo "$as_me:3033: \$? = $ac_status" >&5 + (exit "$ac_status"); }; then eval cf_cv_prog_CC_c_o=yes else eval cf_cv_prog_CC_c_o=no fi -rm -rf conftest* +rm -rf ./conftest* fi -if test $cf_cv_prog_CC_c_o = yes; then - echo "$as_me:2371: result: yes" >&5 +if test "$cf_cv_prog_CC_c_o" = yes; then + echo "$as_me:3044: result: yes" >&5 echo "${ECHO_T}yes" >&6 else - echo "$as_me:2374: result: no" >&5 + echo "$as_me:3047: result: no" >&5 echo "${ECHO_T}no" >&6 fi @@ -2392,7 +3065,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:2395: checking for $ac_word" >&5 +echo "$as_me:3068: 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 @@ -2407,7 +3080,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:2410: found $ac_dir/$ac_word" >&5 +echo "$as_me:3083: found $ac_dir/$ac_word" >&5 break done @@ -2415,21 +3088,21 @@ fi fi AWK=$ac_cv_prog_AWK if test -n "$AWK"; then - echo "$as_me:2418: result: $AWK" >&5 + echo "$as_me:3091: result: $AWK" >&5 echo "${ECHO_T}$AWK" >&6 else - echo "$as_me:2421: result: no" >&5 + echo "$as_me:3094: result: no" >&5 echo "${ECHO_T}no" >&6 fi test -n "$AWK" && break done -test -z "$AWK" && { { echo "$as_me:2428: error: No awk program found" >&5 +test -z "$AWK" && { { echo "$as_me:3101: error: No awk program found" >&5 echo "$as_me: error: No awk program found" >&2;} { (exit 1); exit 1; }; } -echo "$as_me:2432: checking for egrep" >&5 +echo "$as_me:3105: 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 @@ -2439,11 +3112,11 @@ else else ac_cv_prog_egrep='egrep' fi fi -echo "$as_me:2442: result: $ac_cv_prog_egrep" >&5 +echo "$as_me:3115: 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:2446: error: No egrep program found" >&5 + test -z "$EGREP" && { { echo "$as_me:3119: error: No egrep program found" >&5 echo "$as_me: error: No egrep program found" >&2;} { (exit 1); exit 1; }; } @@ -2459,7 +3132,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:2462: checking for a BSD compatible install" >&5 +echo "$as_me:3135: 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 @@ -2508,7 +3181,7 @@ fi INSTALL=$ac_install_sh fi fi -echo "$as_me:2511: result: $INSTALL" >&5 +echo "$as_me:3184: result: $INSTALL" >&5 echo "${ECHO_T}$INSTALL" >&6 # Use test -z because SunOS4 sh mishandles braces in ${var-val}. @@ -2519,18 +3192,18 @@ test -z "$INSTALL_SCRIPT" && INSTALL_SCRIPT='${INSTALL}' test -z "$INSTALL_DATA" && INSTALL_DATA='${INSTALL} -m 644' -echo "$as_me:2522: checking whether ln -s works" >&5 +echo "$as_me:3195: 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:2526: result: yes" >&5 + echo "$as_me:3199: result: yes" >&5 echo "${ECHO_T}yes" >&6 else - echo "$as_me:2529: result: no, using $LN_S" >&5 + echo "$as_me:3202: result: no, using $LN_S" >&5 echo "${ECHO_T}no, using $LN_S" >&6 fi -echo "$as_me:2533: checking if $LN_S -f options work" >&5 +echo "$as_me:3206: 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 @@ -2542,7 +3215,7 @@ else cf_prog_ln_sf=no fi rm -f conf$$.dst conf$$src -echo "$as_me:2545: result: $cf_prog_ln_sf" >&5 +echo "$as_me:3218: 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" @@ -2559,7 +3232,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:2562: checking for a BSD compatible install" >&5 +echo "$as_me:3235: 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 @@ -2608,7 +3281,7 @@ fi INSTALL=$ac_install_sh fi fi -echo "$as_me:2611: result: $INSTALL" >&5 +echo "$as_me:3284: result: $INSTALL" >&5 echo "${ECHO_T}$INSTALL" >&6 # Use test -z because SunOS4 sh mishandles braces in ${var-val}. @@ -2623,13 +3296,13 @@ case $INSTALL in (/*) ;; (*) - cf_dir=`echo $INSTALL | sed -e 's%/[^/]*$%%'` + cf_dir=`echo "$INSTALL" | sed -e 's%/[^/]*$%%'` test -z "$cf_dir" && cf_dir=. - INSTALL=`cd $cf_dir && pwd`/`echo $INSTALL | sed -e 's%^.*/%%'` + INSTALL="`cd \"$cf_dir\" && pwd`"/"`echo "$INSTALL" | sed -e 's%^.*/%%'`" ;; esac -echo "$as_me:2632: checking if you want to install stripped executables" >&5 +echo "$as_me:3305: 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. @@ -2637,33 +3310,33 @@ if test "${enable_stripping+set}" = set; then enableval="$enable_stripping" test "$enableval" != no && enableval=yes if test "$enableval" != "yes" ; then - with_stripping=no + enable_stripping=no else - with_stripping=yes + enable_stripping=yes fi else enableval=yes - with_stripping=yes + enable_stripping=yes fi; -echo "$as_me:2649: result: $with_stripping" >&5 -echo "${ECHO_T}$with_stripping" >&6 +echo "$as_me:3322: result: $enable_stripping" >&5 +echo "${ECHO_T}$enable_stripping" >&6 -if test "$with_stripping" = yes +if test "$enable_stripping" = yes then INSTALL_OPT_S="-s" else INSTALL_OPT_S= fi -: ${INSTALL:=install} -echo "$as_me:2660: checking if install accepts -p option" >&5 +: "${INSTALL:=install}" +echo "$as_me:3333: 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 else - rm -rf conftest* + rm -rf ./conftest* date >conftest.in mkdir conftest.out sleep 3 @@ -2685,13 +3358,13 @@ else else cf_cv_install_p=no fi - rm -rf conftest* + rm -rf ./conftest* fi -echo "$as_me:2691: result: $cf_cv_install_p" >&5 +echo "$as_me:3364: result: $cf_cv_install_p" >&5 echo "${ECHO_T}$cf_cv_install_p" >&6 -echo "$as_me:2694: checking if install needs to be told about ownership" >&5 +echo "$as_me:3367: 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) @@ -2702,16 +3375,82 @@ case `$ac_config_guess` in ;; esac -echo "$as_me:2705: result: $with_install_o" >&5 +echo "$as_me:3378: result: $with_install_o" >&5 echo "${ECHO_T}$with_install_o" >&6 if test "x$with_install_o" = xyes then - INSTALL_OPT_O=`id root|sed -e 's/uid=[0-9]*(/ -o /' -e 's/gid=[0-9]*(/ -g /' -e 's/ [^=[:space:]][^=[:space:]]*=.*/ /' -e 's/)//g'` + INSTALL_OPT_O="`id root|sed -e 's/uid=[0-9]*(/ -o /' -e 's/gid=[0-9]*(/ -g /' -e 's/ [^=[:space:]][^=[:space:]]*=.*/ /' -e 's/)//g'`" else INSTALL_OPT_O= fi -echo "$as_me:2714: checking for long file names" >&5 +if test -n "$INSTALL_OPT_S" +then + echo "$as_me:3389: 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:3399: result: $with_strip_program" >&5 +echo "${ECHO_T}$with_strip_program" >&6 + if test "$with_strip_program" != no + then + echo "$as_me:3403: 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:3424: result: $check_install_strip" >&5 +echo "${ECHO_T}$check_install_strip" >&6 + case "$check_install_strip" in + (no) + { echo "$as_me:3428: 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}:3443: testing created $INSTALL ..." 1>&5 + + ;; + (option) + INSTALL_OPT_S="$INSTALL_OPT_S --strip-program=\"$with_strip_program\"" + ;; + esac + fi +fi + +echo "$as_me:3453: 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 @@ -2732,27 +3471,27 @@ if test -n "$TMPDIR" && test -d "$TMPDIR" && test -w "$TMPDIR"; then else ac_tmpdirs='/tmp /var/tmp /usr/tmp' fi -for ac_dir in . $ac_tmpdirs `eval echo $prefix/lib $exec_prefix/lib` ; do - test -d $ac_dir || continue - test -w $ac_dir || continue # It is less confusing to not echo anything here. +for ac_dir in . $ac_tmpdirs `eval echo "$prefix/lib" "$exec_prefix/lib"` ; do + test -d "$ac_dir" || continue + test -w "$ac_dir" || continue # It is less confusing to not echo anything here. ac_xdir=$ac_dir/cf$$ - (umask 077 && mkdir $ac_xdir 2>/dev/null) || continue + (umask 077 && mkdir "$ac_xdir" 2>/dev/null) || continue ac_tf1=$ac_xdir/conftest9012345 ac_tf2=$ac_xdir/conftest9012346 - (echo 1 >$ac_tf1) 2>/dev/null - (echo 2 >$ac_tf2) 2>/dev/null - ac_val=`cat $ac_tf1 2>/dev/null` - if test ! -f $ac_tf1 || test "$ac_val" != 1; then + (echo 1 >"$ac_tf1") 2>/dev/null + (echo 2 >"$ac_tf2") 2>/dev/null + ac_val=`cat "$ac_tf1" 2>/dev/null` + if test ! -f "$ac_tf1" || test "$ac_val" != 1; then ac_cv_sys_long_file_names=no - rm -rf $ac_xdir 2>/dev/null + rm -rf "$ac_xdir" 2>/dev/null break fi - rm -rf $ac_xdir 2>/dev/null + rm -rf "$ac_xdir" 2>/dev/null done fi -echo "$as_me:2753: result: $ac_cv_sys_long_file_names" >&5 +echo "$as_me:3492: 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 +if test "$ac_cv_sys_long_file_names" = yes; then cat >>confdefs.h <<\EOF #define HAVE_LONG_FILE_NAMES 1 @@ -2762,7 +3501,7 @@ fi # if we find pkg-config, check if we should install the ".pc" files. -echo "$as_me:2765: checking if you want to use pkg-config" >&5 +echo "$as_me:3504: 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. @@ -2772,10 +3511,10 @@ if test "${with_pkg_config+set}" = set; then else cf_pkg_config=yes fi; -echo "$as_me:2775: result: $cf_pkg_config" >&5 +echo "$as_me:3514: result: $cf_pkg_config" >&5 echo "${ECHO_T}$cf_pkg_config" >&6 -case $cf_pkg_config in +case "$cf_pkg_config" in (no) PKG_CONFIG=none ;; @@ -2784,7 +3523,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:2787: checking for $ac_word" >&5 +echo "$as_me:3526: 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 @@ -2801,7 +3540,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:2804: found $ac_dir/$ac_word" >&5 + echo "$as_me:3543: found $ac_dir/$ac_word" >&5 break fi done @@ -2812,10 +3551,10 @@ fi PKG_CONFIG=$ac_cv_path_PKG_CONFIG if test -n "$PKG_CONFIG"; then - echo "$as_me:2815: result: $PKG_CONFIG" >&5 + echo "$as_me:3554: result: $PKG_CONFIG" >&5 echo "${ECHO_T}$PKG_CONFIG" >&6 else - echo "$as_me:2818: result: no" >&5 + echo "$as_me:3557: result: no" >&5 echo "${ECHO_T}no" >&6 fi @@ -2824,7 +3563,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:2827: checking for $ac_word" >&5 +echo "$as_me:3566: 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 @@ -2841,7 +3580,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:2844: found $ac_dir/$ac_word" >&5 + echo "$as_me:3583: found $ac_dir/$ac_word" >&5 break fi done @@ -2853,10 +3592,10 @@ fi ac_pt_PKG_CONFIG=$ac_cv_path_ac_pt_PKG_CONFIG if test -n "$ac_pt_PKG_CONFIG"; then - echo "$as_me:2856: result: $ac_pt_PKG_CONFIG" >&5 + echo "$as_me:3595: result: $ac_pt_PKG_CONFIG" >&5 echo "${ECHO_T}$ac_pt_PKG_CONFIG" >&6 else - echo "$as_me:2859: result: no" >&5 + echo "$as_me:3598: result: no" >&5 echo "${ECHO_T}no" >&6 fi @@ -2887,117 +3626,171 @@ case ".$PKG_CONFIG" in ;; (.[a-zA-Z]:[\\/]*) # OS/2 EMX ;; -(.\${*prefix}*|.\${*dir}*) +(.\$\{*prefix\}*|.\$\{*dir\}*) eval PKG_CONFIG="$PKG_CONFIG" case ".$PKG_CONFIG" in (.NONE/*) - PKG_CONFIG=`echo $PKG_CONFIG | sed -e s%NONE%$cf_path_syntax%` + PKG_CONFIG=`echo "$PKG_CONFIG" | sed -e s%NONE%$cf_path_syntax%` ;; esac ;; (.no|.NONE/*) - PKG_CONFIG=`echo $PKG_CONFIG | sed -e s%NONE%$cf_path_syntax%` + PKG_CONFIG=`echo "$PKG_CONFIG" | sed -e s%NONE%$cf_path_syntax%` ;; (*) - { { echo "$as_me:2902: error: expected a pathname, not \"$PKG_CONFIG\"" >&5 + { { echo "$as_me:3641: 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:2909: WARNING: pkg-config is not installed" >&5 + { echo "$as_me:3648: WARNING: pkg-config is not installed" >&5 echo "$as_me: WARNING: pkg-config is not installed" >&2;} fi -case $PKG_CONFIG in +case "$PKG_CONFIG" in (no|none|yes) - echo "$as_me:2915: checking for pkg-config library directory" >&5 + echo "$as_me:3654: checking for pkg-config library directory" >&5 echo $ECHO_N "checking for pkg-config library directory... $ECHO_C" >&6 ;; (*) - echo "$as_me:2919: checking for $PKG_CONFIG library directory" >&5 + echo "$as_me:3658: 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:3685: 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:3696: result: $PKG_CONFIG_LIBDIR" >&5 +echo "${ECHO_T}$PKG_CONFIG_LIBDIR" >&6 + cf_search_path= ;; -(xyes) +(xyes|xauto) + echo "$as_me:3701: 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:3705: 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}:2974: testing list... ..." 1>&5 + echo "$as_me:3732: result: $cf_search_path" >&5 +echo "${ECHO_T}$cf_search_path" >&6 + ;; +(*) + { { echo "$as_me:3736: 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:3744: 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}:2980: 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:2985: checking done" >&5 -echo $ECHO_N "checking done... $ECHO_C" >&6 + cf_pkg_config_path=$cf_config break fi done - ;; -(*) - ;; -esac + echo "$as_me:3755: result: $cf_pkg_config_path" >&5 +echo "${ECHO_T}$cf_pkg_config_path" >&6 + + 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 "x$PKG_CONFIG_LIBDIR" != xno ; then - echo "$as_me:2996: result: $PKG_CONFIG_LIBDIR" >&5 + if test -z "$PKG_CONFIG_LIBDIR" && test -n "$cf_search_path" + then + echo "$as_me:3765: 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:3788: result: $PKG_CONFIG_LIBDIR" >&5 echo "${ECHO_T}$PKG_CONFIG_LIBDIR" >&6 + fi fi -echo "$as_me:3000: checking if you want to build test-programs" >&5 +echo "$as_me:3793: 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. @@ -3007,10 +3800,10 @@ if test "${with_tests+set}" = set; then else cf_with_tests=yes fi; -echo "$as_me:3010: result: $cf_with_tests" >&5 +echo "$as_me:3803: result: $cf_with_tests" >&5 echo "${ECHO_T}$cf_with_tests" >&6 -echo "$as_me:3013: checking if we should assume mixed-case filenames" >&5 +echo "$as_me:3806: 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. @@ -3020,19 +3813,19 @@ if test "${enable_mixed_case+set}" = set; then else enable_mixedcase=auto fi; -echo "$as_me:3023: result: $enable_mixedcase" >&5 +echo "$as_me:3816: result: $enable_mixedcase" >&5 echo "${ECHO_T}$enable_mixedcase" >&6 if test "$enable_mixedcase" = "auto" ; then -echo "$as_me:3027: checking if filesystem supports mixed-case filenames" >&5 +echo "$as_me:3820: 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 else if test "$cross_compiling" = yes ; then - case $target_alias in - (*-os2-emx*|*-msdosdjgpp*|*-cygwin*|*-msys*|*-mingw*|*-uwin*) + case "$target_alias" in + (*-os2-emx*|*-msdosdjgpp*|*-cygwin*|*-msys*|*-mingw*|*-uwin*|darwin*) cf_cv_mixedcase=no ;; (*) @@ -3051,7 +3844,7 @@ else fi fi -echo "$as_me:3054: result: $cf_cv_mixedcase" >&5 +echo "$as_me:3847: result: $cf_cv_mixedcase" >&5 echo "${ECHO_T}$cf_cv_mixedcase" >&6 test "$cf_cv_mixedcase" = yes && cat >>confdefs.h <<\EOF @@ -3069,7 +3862,7 @@ EOF fi # do this after mixed-case option (tags/TAGS is not as important as tic). -echo "$as_me:3072: checking whether ${MAKE-make} sets \${MAKE}" >&5 +echo "$as_me:3865: 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 @@ -3089,20 +3882,82 @@ fi rm -f conftest.make fi if eval "test \"`echo '$ac_cv_prog_make_'${ac_make}_set`\" = yes"; then - echo "$as_me:3092: result: yes" >&5 + echo "$as_me:3885: result: yes" >&5 echo "${ECHO_T}yes" >&6 SET_MAKE= else - echo "$as_me:3096: result: no" >&5 + echo "$as_me:3889: result: no" >&5 echo "${ECHO_T}no" >&6 SET_MAKE="MAKE=${MAKE-make}" fi +echo "$as_me:3894: 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:3949: 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:3105: checking for $ac_word" >&5 +echo "$as_me:3960: 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 @@ -3117,7 +3972,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:3120: found $ac_dir/$ac_word" >&5 +echo "$as_me:3975: found $ac_dir/$ac_word" >&5 break done @@ -3125,10 +3980,10 @@ fi fi CTAGS=$ac_cv_prog_CTAGS if test -n "$CTAGS"; then - echo "$as_me:3128: result: $CTAGS" >&5 + echo "$as_me:3983: result: $CTAGS" >&5 echo "${ECHO_T}$CTAGS" >&6 else - echo "$as_me:3131: result: no" >&5 + echo "$as_me:3986: result: no" >&5 echo "${ECHO_T}no" >&6 fi @@ -3139,7 +3994,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:3142: checking for $ac_word" >&5 +echo "$as_me:3997: 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 @@ -3154,7 +4009,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:3157: found $ac_dir/$ac_word" >&5 +echo "$as_me:4012: found $ac_dir/$ac_word" >&5 break done @@ -3162,10 +4017,10 @@ fi fi ETAGS=$ac_cv_prog_ETAGS if test -n "$ETAGS"; then - echo "$as_me:3165: result: $ETAGS" >&5 + echo "$as_me:4020: result: $ETAGS" >&5 echo "${ECHO_T}$ETAGS" >&6 else - echo "$as_me:3168: result: no" >&5 + echo "$as_me:4023: result: no" >&5 echo "${ECHO_T}no" >&6 fi @@ -3174,7 +4029,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:3177: checking for $ac_word" >&5 +echo "$as_me:4032: 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 @@ -3189,7 +4044,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:3192: found $ac_dir/$ac_word" >&5 +echo "$as_me:4047: found $ac_dir/$ac_word" >&5 break done @@ -3198,17 +4053,17 @@ fi fi MAKE_LOWER_TAGS=$ac_cv_prog_MAKE_LOWER_TAGS if test -n "$MAKE_LOWER_TAGS"; then - echo "$as_me:3201: result: $MAKE_LOWER_TAGS" >&5 + echo "$as_me:4056: result: $MAKE_LOWER_TAGS" >&5 echo "${ECHO_T}$MAKE_LOWER_TAGS" >&6 else - echo "$as_me:3204: result: no" >&5 + echo "$as_me:4059: 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:3211: checking for $ac_word" >&5 +echo "$as_me:4066: 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 @@ -3223,7 +4078,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:3226: found $ac_dir/$ac_word" >&5 +echo "$as_me:4081: found $ac_dir/$ac_word" >&5 break done @@ -3232,10 +4087,10 @@ fi fi MAKE_UPPER_TAGS=$ac_cv_prog_MAKE_UPPER_TAGS if test -n "$MAKE_UPPER_TAGS"; then - echo "$as_me:3235: result: $MAKE_UPPER_TAGS" >&5 + echo "$as_me:4090: result: $MAKE_UPPER_TAGS" >&5 echo "${ECHO_T}$MAKE_UPPER_TAGS" >&6 else - echo "$as_me:3238: result: no" >&5 + echo "$as_me:4093: result: no" >&5 echo "${ECHO_T}no" >&6 fi @@ -3255,7 +4110,7 @@ else MAKE_LOWER_TAGS="#" fi -echo "$as_me:3258: checking for makeflags variable" >&5 +echo "$as_me:4113: 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 @@ -3269,10 +4124,10 @@ SHELL = $SHELL all : @ echo '.$cf_option' CF_EOF - cf_result=`${MAKE:-make} -k -f cf_makeflags.tmp 2>/dev/null | fgrep -v "ing directory" | sed -e 's,[ ]*$,,'` + cf_result=`${MAKE:-make} -k -f cf_makeflags.tmp 2>/dev/null | ${FGREP-fgrep} -v "ing directory" | sed -e 's,[ ]*$,,'` case "$cf_result" in (.*k|.*kw) - cf_result=`${MAKE:-make} -k -f cf_makeflags.tmp CC=cc 2>/dev/null` + cf_result="`${MAKE:-make} -k -f cf_makeflags.tmp CC=cc 2>/dev/null`" case "$cf_result" in (.*CC=*) cf_cv_makeflags= ;; @@ -3285,7 +4140,7 @@ CF_EOF ;; (*) -echo "${as_me:-configure}:3288: testing given option \"$cf_option\",no match \"$cf_result\" ..." 1>&5 +echo "${as_me:-configure}:4143: testing given option \"$cf_option\",no match \"$cf_result\" ..." 1>&5 ;; esac @@ -3293,13 +4148,13 @@ echo "${as_me:-configure}:3288: testing given option \"$cf_option\",no match \"$ rm -f cf_makeflags.tmp fi -echo "$as_me:3296: result: $cf_cv_makeflags" >&5 +echo "$as_me:4151: 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:3302: checking for $ac_word" >&5 +echo "$as_me:4157: 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 @@ -3314,7 +4169,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:3317: found $ac_dir/$ac_word" >&5 +echo "$as_me:4172: found $ac_dir/$ac_word" >&5 break done @@ -3322,10 +4177,10 @@ fi fi RANLIB=$ac_cv_prog_RANLIB if test -n "$RANLIB"; then - echo "$as_me:3325: result: $RANLIB" >&5 + echo "$as_me:4180: result: $RANLIB" >&5 echo "${ECHO_T}$RANLIB" >&6 else - echo "$as_me:3328: result: no" >&5 + echo "$as_me:4183: result: no" >&5 echo "${ECHO_T}no" >&6 fi @@ -3334,7 +4189,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:3337: checking for $ac_word" >&5 +echo "$as_me:4192: 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 @@ -3349,7 +4204,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:3352: found $ac_dir/$ac_word" >&5 +echo "$as_me:4207: found $ac_dir/$ac_word" >&5 break done @@ -3358,10 +4213,10 @@ fi fi ac_ct_RANLIB=$ac_cv_prog_ac_ct_RANLIB if test -n "$ac_ct_RANLIB"; then - echo "$as_me:3361: result: $ac_ct_RANLIB" >&5 + echo "$as_me:4216: result: $ac_ct_RANLIB" >&5 echo "${ECHO_T}$ac_ct_RANLIB" >&6 else - echo "$as_me:3364: result: no" >&5 + echo "$as_me:4219: result: no" >&5 echo "${ECHO_T}no" >&6 fi @@ -3373,7 +4228,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:3376: checking for $ac_word" >&5 +echo "$as_me:4231: 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 @@ -3388,7 +4243,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:3391: found $ac_dir/$ac_word" >&5 +echo "$as_me:4246: found $ac_dir/$ac_word" >&5 break done @@ -3396,10 +4251,10 @@ fi fi LD=$ac_cv_prog_LD if test -n "$LD"; then - echo "$as_me:3399: result: $LD" >&5 + echo "$as_me:4254: result: $LD" >&5 echo "${ECHO_T}$LD" >&6 else - echo "$as_me:3402: result: no" >&5 + echo "$as_me:4257: result: no" >&5 echo "${ECHO_T}no" >&6 fi @@ -3408,7 +4263,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:3411: checking for $ac_word" >&5 +echo "$as_me:4266: 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 @@ -3423,7 +4278,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:3426: found $ac_dir/$ac_word" >&5 +echo "$as_me:4281: found $ac_dir/$ac_word" >&5 break done @@ -3432,10 +4287,10 @@ fi fi ac_ct_LD=$ac_cv_prog_ac_ct_LD if test -n "$ac_ct_LD"; then - echo "$as_me:3435: result: $ac_ct_LD" >&5 + echo "$as_me:4290: result: $ac_ct_LD" >&5 echo "${ECHO_T}$ac_ct_LD" >&6 else - echo "$as_me:3438: result: no" >&5 + echo "$as_me:4293: result: no" >&5 echo "${ECHO_T}no" >&6 fi @@ -3447,7 +4302,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:3450: checking for $ac_word" >&5 +echo "$as_me:4305: 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 @@ -3462,7 +4317,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:3465: found $ac_dir/$ac_word" >&5 +echo "$as_me:4320: found $ac_dir/$ac_word" >&5 break done @@ -3470,10 +4325,10 @@ fi fi AR=$ac_cv_prog_AR if test -n "$AR"; then - echo "$as_me:3473: result: $AR" >&5 + echo "$as_me:4328: result: $AR" >&5 echo "${ECHO_T}$AR" >&6 else - echo "$as_me:3476: result: no" >&5 + echo "$as_me:4331: result: no" >&5 echo "${ECHO_T}no" >&6 fi @@ -3482,7 +4337,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:3485: checking for $ac_word" >&5 +echo "$as_me:4340: 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 @@ -3497,7 +4352,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:3500: found $ac_dir/$ac_word" >&5 +echo "$as_me:4355: found $ac_dir/$ac_word" >&5 break done @@ -3506,10 +4361,10 @@ fi fi ac_ct_AR=$ac_cv_prog_ac_ct_AR if test -n "$ac_ct_AR"; then - echo "$as_me:3509: result: $ac_ct_AR" >&5 + echo "$as_me:4364: result: $ac_ct_AR" >&5 echo "${ECHO_T}$ac_ct_AR" >&6 else - echo "$as_me:3512: result: no" >&5 + echo "$as_me:4367: result: no" >&5 echo "${ECHO_T}no" >&6 fi @@ -3521,7 +4376,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:3524: checking for $ac_word" >&5 +echo "$as_me:4379: 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 @@ -3536,7 +4391,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:3539: found $ac_dir/$ac_word" >&5 +echo "$as_me:4394: found $ac_dir/$ac_word" >&5 break done @@ -3544,10 +4399,10 @@ fi fi AR=$ac_cv_prog_AR if test -n "$AR"; then - echo "$as_me:3547: result: $AR" >&5 + echo "$as_me:4402: result: $AR" >&5 echo "${ECHO_T}$AR" >&6 else - echo "$as_me:3550: result: no" >&5 + echo "$as_me:4405: result: no" >&5 echo "${ECHO_T}no" >&6 fi @@ -3556,7 +4411,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:3559: checking for $ac_word" >&5 +echo "$as_me:4414: 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 @@ -3571,7 +4426,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:3574: found $ac_dir/$ac_word" >&5 +echo "$as_me:4429: found $ac_dir/$ac_word" >&5 break done @@ -3580,10 +4435,10 @@ fi fi ac_ct_AR=$ac_cv_prog_ac_ct_AR if test -n "$ac_ct_AR"; then - echo "$as_me:3583: result: $ac_ct_AR" >&5 + echo "$as_me:4438: result: $ac_ct_AR" >&5 echo "${ECHO_T}$ac_ct_AR" >&6 else - echo "$as_me:3586: result: no" >&5 + echo "$as_me:4441: result: no" >&5 echo "${ECHO_T}no" >&6 fi @@ -3592,55 +4447,71 @@ else AR="$ac_cv_prog_AR" fi -echo "$as_me:3595: checking for options to update archives" >&5 +echo "$as_me:4450: 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 else - cf_cv_ar_flags=unknown - for cf_ar_flags in -curvU -curv curv -crv crv -cqv cqv -rv rv - do + case "$cf_cv_system_name" in + (*-msvc*) + cf_cv_ar_flags='' + cat >mk_static_lib.sh <<-EOF + #!$SHELL + MSVC_BIN="$AR" + out="\$1" + shift + exec \$MSVC_BIN -out:"\$out" \$@ + EOF + chmod +x mk_static_lib.sh + AR=`pwd`/mk_static_lib.sh + ;; + (*) + cf_cv_ar_flags=unknown + for cf_ar_flags in -curvU -curv curv -crv crv -cqv cqv -rv rv + do - # check if $ARFLAGS already contains this choice - if test "x$ARFLAGS" != "x" ; then - cf_check_ar_flags=`echo "x$ARFLAGS" | sed -e "s/$cf_ar_flags\$//" -e "s/$cf_ar_flags / /"` - if test "x$ARFLAGS" != "$cf_check_ar_flags" ; then - cf_cv_ar_flags= - break + # check if $ARFLAGS already contains this choice + if test "x$ARFLAGS" != "x" ; then + cf_check_ar_flags=`echo "x$ARFLAGS" | sed -e "s/$cf_ar_flags\$//" -e "s/$cf_ar_flags / /"` + if test "x$ARFLAGS" != "$cf_check_ar_flags" ; then + cf_cv_ar_flags= + break + fi fi - fi - rm -f conftest.$ac_cv_objext - rm -f conftest.a + rm -f "conftest.$ac_cv_objext" + rm -f conftest.a - cat >conftest.$ac_ext <"conftest.$ac_ext" <&5 + if { (eval echo "$as_me:4490: \"$ac_compile\"") >&5 (eval $ac_compile) 2>&5 ac_status=$? - echo "$as_me:3624: \$? = $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 - if test -f conftest.a ; then - cf_cv_ar_flags=$cf_ar_flags - break - fi - else - test -n "$verbose" && echo " cannot compile test-program" 1>&6 + echo "$as_me:4493: \$? = $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 + if test -f conftest.a ; then + cf_cv_ar_flags="$cf_ar_flags" + break + fi + else + test -n "$verbose" && echo " cannot compile test-program" 1>&6 -echo "${as_me:-configure}:3635: testing cannot compile test-program ..." 1>&5 +echo "${as_me:-configure}:4504: testing cannot compile test-program ..." 1>&5 - break - fi - done - rm -f conftest.a conftest.$ac_ext conftest.$ac_cv_objext + break + fi + done + rm -f conftest.a "conftest.$ac_ext" "conftest.$ac_cv_objext" + ;; + esac fi -echo "$as_me:3643: result: $cf_cv_ar_flags" >&5 +echo "$as_me:4514: result: $cf_cv_ar_flags" >&5 echo "${ECHO_T}$cf_cv_ar_flags" >&6 if test -n "$ARFLAGS" ; then @@ -3651,17 +4522,17 @@ else ARFLAGS=$cf_cv_ar_flags fi - echo "$as_me:3654: checking for PATH separator" >&5 + echo "$as_me:4525: checking for PATH separator" >&5 echo $ECHO_N "checking for PATH separator... $ECHO_C" >&6 - case $cf_cv_system_name in + case "$cf_cv_system_name" in (os2*) PATH_SEPARATOR=';' ;; (*) ${PATH_SEPARATOR:=':'} ;; esac - echo "$as_me:3661: result: $PATH_SEPARATOR" >&5 + echo "$as_me:4532: result: $PATH_SEPARATOR" >&5 echo "${ECHO_T}$PATH_SEPARATOR" >&6 -echo "$as_me:3664: checking if you have specified an install-prefix" >&5 +echo "$as_me:4535: 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. @@ -3674,7 +4545,7 @@ if test "${with_install_prefix+set}" = set; then ;; esac fi; -echo "$as_me:3677: result: $DESTDIR" >&5 +echo "$as_me:4548: result: $DESTDIR" >&5 echo "${ECHO_T}$DESTDIR" >&6 ############################################################################### @@ -3702,7 +4573,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:3705: checking for $ac_word" >&5 +echo "$as_me:4576: 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 @@ -3717,7 +4588,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:3720: found $ac_dir/$ac_word" >&5 +echo "$as_me:4591: found $ac_dir/$ac_word" >&5 break done @@ -3725,10 +4596,10 @@ fi fi BUILD_CC=$ac_cv_prog_BUILD_CC if test -n "$BUILD_CC"; then - echo "$as_me:3728: result: $BUILD_CC" >&5 + echo "$as_me:4599: result: $BUILD_CC" >&5 echo "${ECHO_T}$BUILD_CC" >&6 else - echo "$as_me:3731: result: no" >&5 + echo "$as_me:4602: result: no" >&5 echo "${ECHO_T}no" >&6 fi @@ -3737,12 +4608,12 @@ done test -n "$BUILD_CC" || BUILD_CC="none" fi; - echo "$as_me:3740: checking for native build C compiler" >&5 + echo "$as_me:4611: checking for native build C compiler" >&5 echo $ECHO_N "checking for native build C compiler... $ECHO_C" >&6 - echo "$as_me:3742: result: $BUILD_CC" >&5 + echo "$as_me:4613: result: $BUILD_CC" >&5 echo "${ECHO_T}$BUILD_CC" >&6 - echo "$as_me:3745: checking for native build C preprocessor" >&5 + echo "$as_me:4616: 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. @@ -3752,10 +4623,10 @@ if test "${with_build_cpp+set}" = set; then else BUILD_CPP='${BUILD_CC} -E' fi; - echo "$as_me:3755: result: $BUILD_CPP" >&5 + echo "$as_me:4626: result: $BUILD_CPP" >&5 echo "${ECHO_T}$BUILD_CPP" >&6 - echo "$as_me:3758: checking for native build C flags" >&5 + echo "$as_me:4629: 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. @@ -3763,10 +4634,10 @@ if test "${with_build_cflags+set}" = set; then withval="$with_build_cflags" BUILD_CFLAGS="$withval" fi; - echo "$as_me:3766: result: $BUILD_CFLAGS" >&5 + echo "$as_me:4637: result: $BUILD_CFLAGS" >&5 echo "${ECHO_T}$BUILD_CFLAGS" >&6 - echo "$as_me:3769: checking for native build C preprocessor-flags" >&5 + echo "$as_me:4640: 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. @@ -3774,10 +4645,10 @@ if test "${with_build_cppflags+set}" = set; then withval="$with_build_cppflags" BUILD_CPPFLAGS="$withval" fi; - echo "$as_me:3777: result: $BUILD_CPPFLAGS" >&5 + echo "$as_me:4648: result: $BUILD_CPPFLAGS" >&5 echo "${ECHO_T}$BUILD_CPPFLAGS" >&6 - echo "$as_me:3780: checking for native build linker-flags" >&5 + echo "$as_me:4651: 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. @@ -3785,10 +4656,10 @@ if test "${with_build_ldflags+set}" = set; then withval="$with_build_ldflags" BUILD_LDFLAGS="$withval" fi; - echo "$as_me:3788: result: $BUILD_LDFLAGS" >&5 + echo "$as_me:4659: result: $BUILD_LDFLAGS" >&5 echo "${ECHO_T}$BUILD_LDFLAGS" >&6 - echo "$as_me:3791: checking for native build linker-libraries" >&5 + echo "$as_me:4662: 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. @@ -3796,7 +4667,7 @@ if test "${with_build_libs+set}" = set; then withval="$with_build_libs" BUILD_LIBS="$withval" fi; - echo "$as_me:3799: result: $BUILD_LIBS" >&5 + echo "$as_me:4670: result: $BUILD_LIBS" >&5 echo "${ECHO_T}$BUILD_LIBS" >&6 # this assumes we're on Unix. @@ -3805,8 +4676,59 @@ echo "${ECHO_T}$BUILD_LIBS" >&6 : ${BUILD_CC:='${CC}'} - if ( test "$BUILD_CC" = "$CC" || test "$BUILD_CC" = '${CC}' ) ; then - { { echo "$as_me:3809: error: Cross-build requires two compilers. + echo "$as_me:4679: 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 4693 "configure" +#include "confdefs.h" +#include + 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:4703: \"$ac_link\"") >&5 + (eval $ac_link) 2>&5 + ac_status=$? + echo "$as_me:4706: \$? = $ac_status" >&5 + (exit "$ac_status"); } && { ac_try='"./conftest$ac_exeext"' + { (eval echo "$as_me:4708: \"$ac_try\"") >&5 + (eval $ac_try) 2>&5 + ac_status=$? + echo "$as_me:4711: \$? = $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:4726: 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:4731: 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;} @@ -3817,9 +4739,9 @@ else : ${BUILD_CC:='${CC}'} : ${BUILD_CPP:='${CPP}'} : ${BUILD_CFLAGS:='${CFLAGS}'} - : ${BUILD_CPPFLAGS:='${CPPFLAGS}'} + : ${BUILD_CPPFLAGS:=''${CPPFLAGS}''} : ${BUILD_LDFLAGS:='${LDFLAGS}'} - : ${BUILD_LIBS:='${LIBS}'} + : ${BUILD_LIBS:=''${LIBS}''} : ${BUILD_EXEEXT:='$x'} : ${BUILD_OBJEXT:='o'} fi @@ -3831,7 +4753,7 @@ fi ### shared, for example. cf_list_models="" -echo "$as_me:3834: checking if you want to build shared C-objects" >&5 +echo "$as_me:4756: 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. @@ -3841,27 +4763,27 @@ if test "${with_shared+set}" = set; then else with_shared=no fi; -echo "$as_me:3844: result: $with_shared" >&5 +echo "$as_me:4766: result: $with_shared" >&5 echo "${ECHO_T}$with_shared" >&6 test "$with_shared" = "yes" && cf_list_models="$cf_list_models shared" -echo "$as_me:3848: checking for specified models" >&5 +echo "$as_me:4770: 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:3851: result: $cf_list_models" >&5 +echo "$as_me:4773: 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:3856: checking for default model" >&5 +echo "$as_me:4778: 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:3859: result: $DFT_LWR_MODEL" >&5 +echo "$as_me:4781: 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:3864: checking for specific curses-directory" >&5 +echo "$as_me:4786: 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. @@ -3871,10 +4793,10 @@ if test "${with_curses_dir+set}" = set; then else cf_cv_curses_dir=no fi; -echo "$as_me:3874: result: $cf_cv_curses_dir" >&5 +echo "$as_me:4796: 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" ) +if test -n "$cf_cv_curses_dir" && test "$cf_cv_curses_dir" != "no" then if test "x$prefix" != xNONE; then @@ -3890,19 +4812,19 @@ case ".$withval" in ;; (.[a-zA-Z]:[\\/]*) # OS/2 EMX ;; -(.\${*prefix}*|.\${*dir}*) +(.\$\{*prefix\}*|.\$\{*dir\}*) eval withval="$withval" case ".$withval" in (.NONE/*) - withval=`echo $withval | sed -e s%NONE%$cf_path_syntax%` + withval=`echo "$withval" | sed -e s%NONE%$cf_path_syntax%` ;; esac ;; (.no|.NONE/*) - withval=`echo $withval | sed -e s%NONE%$cf_path_syntax%` + withval=`echo "$withval" | sed -e s%NONE%$cf_path_syntax%` ;; (*) - { { echo "$as_me:3905: error: expected a pathname, not \"$withval\"" >&5 + { { echo "$as_me:4827: error: expected a pathname, not \"$withval\"" >&5 echo "$as_me: error: expected a pathname, not \"$withval\"" >&2;} { (exit 1); exit 1; }; } ;; @@ -3914,9 +4836,9 @@ esac if test -n "$cf_cv_curses_dir/include" ; then for cf_add_incdir in $cf_cv_curses_dir/include do - while test $cf_add_incdir != /usr/include + while test "$cf_add_incdir" != /usr/include do - if test -d $cf_add_incdir + if test -d "$cf_add_incdir" then cf_have_incdir=no if test -n "$CFLAGS$CPPFLAGS" ; then @@ -3937,8 +4859,8 @@ if test -n "$cf_cv_curses_dir/include" ; then test -n "$CPPFLAGS" && CPPFLAGS="$CPPFLAGS " CPPFLAGS="${CPPFLAGS}-I$cf_add_incdir" - cat >conftest.$ac_ext <<_ACEOF -#line 3941 "configure" + cat >"conftest.$ac_ext" <<_ACEOF +#line 4863 "configure" #include "confdefs.h" #include int @@ -3949,25 +4871,25 @@ printf("Hello") return 0; } _ACEOF -rm -f conftest.$ac_objext -if { (eval echo "$as_me:3953: \"$ac_compile\"") >&5 +rm -f "conftest.$ac_objext" +if { (eval echo "$as_me:4875: \"$ac_compile\"") >&5 (eval $ac_compile) 2>&5 ac_status=$? - echo "$as_me:3956: \$? = $ac_status" >&5 - (exit $ac_status); } && - { ac_try='test -s conftest.$ac_objext' - { (eval echo "$as_me:3959: \"$ac_try\"") >&5 + echo "$as_me:4878: \$? = $ac_status" >&5 + (exit "$ac_status"); } && + { ac_try='test -s "conftest.$ac_objext"' + { (eval echo "$as_me:4881: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? - echo "$as_me:3962: \$? = $ac_status" >&5 - (exit $ac_status); }; }; then + echo "$as_me:4884: \$? = $ac_status" >&5 + (exit "$ac_status"); }; }; then : else echo "$as_me: failed program was:" >&5 -cat conftest.$ac_ext >&5 +cat "conftest.$ac_ext" >&5 cf_have_incdir=yes fi -rm -f conftest.$ac_objext conftest.$ac_ext +rm -f "conftest.$ac_objext" "conftest.$ac_ext" CPPFLAGS=$cf_save_CPPFLAGS fi fi @@ -3976,11 +4898,11 @@ 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}:3979: testing adding $cf_add_incdir to include-path ..." 1>&5 +echo "${as_me:-configure}:4901: testing adding $cf_add_incdir to include-path ..." 1>&5 CPPFLAGS="$CPPFLAGS -I$cf_add_incdir" - cf_top_incdir=`echo $cf_add_incdir | sed -e 's%/include/.*$%/include%'` + cf_top_incdir=`echo "$cf_add_incdir" | sed -e 's%/include/.*$%/include%'` test "$cf_top_incdir" = "$cf_add_incdir" && break cf_add_incdir="$cf_top_incdir" else @@ -3996,9 +4918,9 @@ fi if test -n "$cf_cv_curses_dir/lib" ; then for cf_add_libdir in $cf_cv_curses_dir/lib do - if test $cf_add_libdir = /usr/lib ; then + if test "$cf_add_libdir" = /usr/lib ; then : - elif test -d $cf_add_libdir + elif test -d "$cf_add_libdir" then cf_have_libdir=no if test -n "$LDFLAGS$LIBS" ; then @@ -4012,7 +4934,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}:4015: testing adding $cf_add_libdir to library-path ..." 1>&5 +echo "${as_me:-configure}:4937: testing adding $cf_add_libdir to library-path ..." 1>&5 LDFLAGS="-L$cf_add_libdir $LDFLAGS" fi @@ -4027,39 +4949,50 @@ cf_ncuconfig_root=ncurses cf_have_ncuconfig=no if test "x${PKG_CONFIG:=none}" != xnone; then - echo "$as_me:4030: checking pkg-config for $cf_ncuconfig_root" >&5 + echo "$as_me:4952: 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:4033: result: yes" >&5 + echo "$as_me:4955: result: yes" >&5 echo "${ECHO_T}yes" >&6 - echo "$as_me:4036: checking if the $cf_ncuconfig_root package files work" >&5 + echo "$as_me:4958: 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 + cf_save_CFLAGS="$CFLAGS" cf_save_CPPFLAGS="$CPPFLAGS" cf_save_LIBS="$LIBS" + cf_pkg_cflags="`$PKG_CONFIG --cflags $cf_ncuconfig_root`" + cf_pkg_libs="`$PKG_CONFIG --libs $cf_ncuconfig_root`" + + # while -W for passing linker flags is prevalent, it is not "standard". + # At least one wrapper for c89/c99 (in Apple's xcode) has its own + # incompatible _and_ non-standard -W option which gives an error. Work + # around that pitfall. + case "x${CC}@@${cf_pkg_libs}@${cf_pkg_cflags}" in + (x*c[89]9@@*-W*) + cf_fix_cppflags=no cf_new_cflags= cf_new_cppflags= cf_new_extra_cppflags= -for cf_add_cflags in `$PKG_CONFIG --cflags $cf_ncuconfig_root` +for cf_add_cflags in $cf_pkg_cflags do -case $cf_fix_cppflags in +case "$cf_fix_cppflags" in (no) - case $cf_add_cflags in + case "$cf_add_cflags" in (-undef|-nostdinc*|-I*|-D*|-U*|-E|-P|-C) - case $cf_add_cflags in + case "$cf_add_cflags" in (-D*) - cf_tst_cflags=`echo ${cf_add_cflags} |sed -e 's/^-D[^=]*='\''\"[^"]*//'` + cf_tst_cflags=`echo "${cf_add_cflags}" |sed -e 's/^-D[^=]*='\''\"[^"]*//'` test "x${cf_add_cflags}" != "x${cf_tst_cflags}" \ && test -z "${cf_tst_cflags}" \ && cf_fix_cppflags=yes - if test $cf_fix_cppflags = yes ; then + if test "$cf_fix_cppflags" = yes ; then test -n "$cf_new_extra_cppflags" && cf_new_extra_cppflags="$cf_new_extra_cppflags " cf_new_extra_cppflags="${cf_new_extra_cppflags}$cf_add_cflags" @@ -4078,7 +5011,7 @@ case $cf_fix_cppflags in (*$cf_add_cflags) ;; (*) - case $cf_add_cflags in + case "$cf_add_cflags" in (-D*) cf_tst_cppflags=`echo "x$cf_add_cflags" | sed -e 's/^...//' -e 's/=.*//'` @@ -4108,7 +5041,7 @@ CPPFLAGS=`echo "$CPPFLAGS" | \ test -n "$cf_new_extra_cppflags" && cf_new_extra_cppflags="$cf_new_extra_cppflags " cf_new_extra_cppflags="${cf_new_extra_cppflags}$cf_add_cflags" - cf_tst_cflags=`echo ${cf_add_cflags} |sed -e 's/^[^"]*"'\''//'` + cf_tst_cflags=`echo "${cf_add_cflags}" |sed -e 's/^[^"]*"'\''//'` test "x${cf_add_cflags}" != "x${cf_tst_cflags}" \ && test -z "${cf_tst_cflags}" \ @@ -4138,83 +5071,299 @@ if test -n "$cf_new_extra_cppflags" ; then fi -cf_add_libs="`$PKG_CONFIG --libs $cf_ncuconfig_root`" -# Filter out duplicates - this happens with badly-designed ".pc" files... -for cf_add_1lib in $LIBS +cf_add_libs="$LIBS" +# reverse order +cf_add_0lib= +for cf_add_1lib in $cf_pkg_libs; 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" + + cat >"conftest.$ac_ext" <<_ACEOF +#line 5091 "configure" +#include "confdefs.h" +#include <${cf_cv_ncurses_header:-curses.h}> +int +main (void) +{ +initscr(); mousemask(0,0); tigetstr((char *)0); + ; + return 0; +} +_ACEOF +rm -f "conftest.$ac_objext" "conftest$ac_exeext" +if { (eval echo "$as_me:5103: \"$ac_link\"") >&5 + (eval $ac_link) 2>&5 + ac_status=$? + echo "$as_me:5106: \$? = $ac_status" >&5 + (exit "$ac_status"); } && + { ac_try='test -s "conftest$ac_exeext"' + { (eval echo "$as_me:5109: \"$ac_try\"") >&5 + (eval $ac_try) 2>&5 + ac_status=$? + echo "$as_me:5112: \$? = $ac_status" >&5 + (exit "$ac_status"); }; }; then + if test "$cross_compiling" = yes; then + cf_test_ncuconfig=maybe +else + cat >"conftest.$ac_ext" <<_ACEOF +#line 5118 "configure" +#include "confdefs.h" +#include <${cf_cv_ncurses_header:-curses.h}> + int main(void) + { const char *xx = curses_version(); return (xx == 0); } +_ACEOF +rm -f "conftest$ac_exeext" +if { (eval echo "$as_me:5125: \"$ac_link\"") >&5 + (eval $ac_link) 2>&5 + ac_status=$? + echo "$as_me:5128: \$? = $ac_status" >&5 + (exit "$ac_status"); } && { ac_try='"./conftest$ac_exeext"' + { (eval echo "$as_me:5130: \"$ac_try\"") >&5 + (eval $ac_try) 2>&5 + ac_status=$? + echo "$as_me:5133: \$? = $ac_status" >&5 + (exit "$ac_status"); }; }; then + cf_test_ncuconfig=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_test_ncuconfig=no +fi +rm -f core ./core.* ./*.core "conftest$ac_exeext" "conftest.$ac_objext" "conftest.$ac_ext" +fi +else + echo "$as_me: failed program was:" >&5 +cat "conftest.$ac_ext" >&5 +cf_test_ncuconfig=no +fi +rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext" + + CFLAGS="$cf_save_CFLAGS" + CPPFLAGS="$cf_save_CPPFLAGS" + LIBS="$cf_save_LIBS" + + if test "x$cf_test_ncuconfig" != xyes; then + cf_temp=`echo "x$cf_pkg_cflags" | sed -e s/^x// -e 's/-W[^ ]*//g'` + cf_pkg_cflags="$cf_temp" + cf_temp=`echo "x$cf_pkg_libs" | sed -e s/^x// -e 's/-W[^ ]*//g'` + cf_pkg_libs="$cf_temp" + fi + ;; + esac + +for cf_add_cflags in $cf_pkg_cflags do - for cf_add_2lib in $cf_add_libs - do - if test "x$cf_add_1lib" = "x$cf_add_2lib" - then + 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_add_cflags +do +case "$cf_fix_cppflags" in +(no) + case "$cf_add_cflags" in + (-undef|-nostdinc*|-I*|-D*|-U*|-E|-P|-C) + case "$cf_add_cflags" in + (-D*) + cf_tst_cflags=`echo "${cf_add_cflags}" |sed -e 's/^-D[^=]*='\''\"[^"]*//'` + + test "x${cf_add_cflags}" != "x${cf_tst_cflags}" \ + && test -z "${cf_tst_cflags}" \ + && cf_fix_cppflags=yes + + if test "$cf_fix_cppflags" = yes ; then + + test -n "$cf_new_extra_cppflags" && cf_new_extra_cppflags="$cf_new_extra_cppflags " + cf_new_extra_cppflags="${cf_new_extra_cppflags}$cf_add_cflags" + + continue + elif test "${cf_tst_cflags}" = "\"'" ; then + + test -n "$cf_new_extra_cppflags" && cf_new_extra_cppflags="$cf_new_extra_cppflags " + cf_new_extra_cppflags="${cf_new_extra_cppflags}$cf_add_cflags" + + continue + fi + ;; + esac + case "$CPPFLAGS" in + (*$cf_add_cflags) + ;; + (*) + case "$cf_add_cflags" in + (-D*) + cf_tst_cppflags=`echo "x$cf_add_cflags" | sed -e 's/^...//' -e 's/=.*//'` + +CPPFLAGS=`echo "$CPPFLAGS" | \ + sed -e 's/-[UD]'"$cf_tst_cppflags"'\(=[^ ]*\)\?[ ]/ /g' \ + -e 's/-[UD]'"$cf_tst_cppflags"'\(=[^ ]*\)\?$//g'` + + ;; + esac + + test -n "$cf_new_cppflags" && cf_new_cppflags="$cf_new_cppflags " + cf_new_cppflags="${cf_new_cppflags}$cf_add_cflags" + + ;; + esac + ;; + (*) + + test -n "$cf_new_cflags" && cf_new_cflags="$cf_new_cflags " + cf_new_cflags="${cf_new_cflags}$cf_add_cflags" + + ;; + esac + ;; +(yes) + + test -n "$cf_new_extra_cppflags" && cf_new_extra_cppflags="$cf_new_extra_cppflags " + cf_new_extra_cppflags="${cf_new_extra_cppflags}$cf_add_cflags" + + cf_tst_cflags=`echo "${cf_add_cflags}" |sed -e 's/^[^"]*"'\''//'` + + test "x${cf_add_cflags}" != "x${cf_tst_cflags}" \ + && test -z "${cf_tst_cflags}" \ + && cf_fix_cppflags=no + ;; +esac +done + +if test -n "$cf_new_cflags" ; then + + test -n "$CFLAGS" && CFLAGS="$CFLAGS " + CFLAGS="${CFLAGS}$cf_new_cflags" + +fi + +if test -n "$cf_new_cppflags" ; then + + test -n "$CPPFLAGS" && CPPFLAGS="$CPPFLAGS " + CPPFLAGS="${CPPFLAGS}$cf_new_cppflags" + +fi + +if test -n "$cf_new_extra_cppflags" ; then + + test -n "$EXTRA_CPPFLAGS" && EXTRA_CPPFLAGS="$EXTRA_CPPFLAGS " + EXTRA_CPPFLAGS="${EXTRA_CPPFLAGS}$cf_new_extra_cppflags" + +fi + +done + +cf_add_libs="$LIBS" +# reverse order +cf_add_0lib= +for cf_add_1lib in $cf_pkg_libs; 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_libs $cf_add_1lib" + test -n "$cf_add_1lib" && cf_add_libs="$cf_add_1lib $cf_add_libs" done LIBS="$cf_add_libs" - cat >conftest.$ac_ext <<_ACEOF -#line 4158 "configure" + cat >"conftest.$ac_ext" <<_ACEOF +#line 5307 "configure" #include "confdefs.h" #include <${cf_cv_ncurses_header:-curses.h}> int main (void) { -initscr(); mousemask(0,0); tgoto((char *)0, 0, 0); +initscr(); mousemask(0,0); tigetstr((char *)0); ; return 0; } _ACEOF -rm -f conftest.$ac_objext conftest$ac_exeext -if { (eval echo "$as_me:4170: \"$ac_link\"") >&5 +rm -f "conftest.$ac_objext" "conftest$ac_exeext" +if { (eval echo "$as_me:5319: \"$ac_link\"") >&5 (eval $ac_link) 2>&5 ac_status=$? - echo "$as_me:4173: \$? = $ac_status" >&5 - (exit $ac_status); } && - { ac_try='test -s conftest$ac_exeext' - { (eval echo "$as_me:4176: \"$ac_try\"") >&5 + echo "$as_me:5322: \$? = $ac_status" >&5 + (exit "$ac_status"); } && + { ac_try='test -s "conftest$ac_exeext"' + { (eval echo "$as_me:5325: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? - echo "$as_me:4179: \$? = $ac_status" >&5 - (exit $ac_status); }; }; then + echo "$as_me:5328: \$? = $ac_status" >&5 + (exit "$ac_status"); }; }; then if test "$cross_compiling" = yes; then cf_have_ncuconfig=maybe else - cat >conftest.$ac_ext <<_ACEOF -#line 4185 "configure" + cat >"conftest.$ac_ext" <<_ACEOF +#line 5334 "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:4192: \"$ac_link\"") >&5 +rm -f "conftest$ac_exeext" +if { (eval echo "$as_me:5341: \"$ac_link\"") >&5 (eval $ac_link) 2>&5 ac_status=$? - echo "$as_me:4195: \$? = $ac_status" >&5 - (exit $ac_status); } && { ac_try='./conftest$ac_exeext' - { (eval echo "$as_me:4197: \"$ac_try\"") >&5 + echo "$as_me:5344: \$? = $ac_status" >&5 + (exit "$ac_status"); } && { ac_try='"./conftest$ac_exeext"' + { (eval echo "$as_me:5346: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? - echo "$as_me:4200: \$? = $ac_status" >&5 - (exit $ac_status); }; }; then + echo "$as_me:5349: \$? = $ac_status" >&5 + (exit "$ac_status"); }; }; then cf_have_ncuconfig=yes else echo "$as_me: program exited with status $ac_status" >&5 echo "$as_me: failed program was:" >&5 -cat conftest.$ac_ext >&5 +cat "conftest.$ac_ext" >&5 cf_have_ncuconfig=no fi -rm -f core core.* *.core conftest$ac_exeext conftest.$ac_objext conftest.$ac_ext +rm -f core ./core.* ./*.core "conftest$ac_exeext" "conftest.$ac_objext" "conftest.$ac_ext" fi else echo "$as_me: failed program was:" >&5 -cat conftest.$ac_ext >&5 +cat "conftest.$ac_ext" >&5 cf_have_ncuconfig=no fi -rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext - echo "$as_me:4217: result: $cf_have_ncuconfig" >&5 +rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext" + echo "$as_me:5366: 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" @@ -4230,13 +5379,13 @@ EOF NCURSES_CONFIG_PKG=$cf_ncuconfig_root -echo "$as_me:4233: checking for terminfo header" >&5 +echo "$as_me:5382: 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 else -case ${cf_cv_ncurses_header} in +case "${cf_cv_ncurses_header}" in (*/ncurses.h|*/ncursesw.h) cf_term_header=`echo "$cf_cv_ncurses_header" | sed -e 's%ncurses[^.]*\.h$%term.h%'` ;; @@ -4247,8 +5396,8 @@ esac for cf_test in $cf_term_header "ncurses/term.h" "ncursesw/term.h" do -cat >conftest.$ac_ext <<_ACEOF -#line 4251 "configure" +cat >"conftest.$ac_ext" <<_ACEOF +#line 5400 "configure" #include "confdefs.h" #include #include <${cf_cv_ncurses_header:-curses.h}> @@ -4257,43 +5406,43 @@ cat >conftest.$ac_ext <<_ACEOF int main (void) { -int x = auto_left_margin +int x = auto_left_margin; (void)x ; return 0; } _ACEOF -rm -f conftest.$ac_objext -if { (eval echo "$as_me:4266: \"$ac_compile\"") >&5 +rm -f "conftest.$ac_objext" +if { (eval echo "$as_me:5415: \"$ac_compile\"") >&5 (eval $ac_compile) 2>&5 ac_status=$? - echo "$as_me:4269: \$? = $ac_status" >&5 - (exit $ac_status); } && - { ac_try='test -s conftest.$ac_objext' - { (eval echo "$as_me:4272: \"$ac_try\"") >&5 + echo "$as_me:5418: \$? = $ac_status" >&5 + (exit "$ac_status"); } && + { ac_try='test -s "conftest.$ac_objext"' + { (eval echo "$as_me:5421: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? - echo "$as_me:4275: \$? = $ac_status" >&5 - (exit $ac_status); }; }; then + echo "$as_me:5424: \$? = $ac_status" >&5 + (exit "$ac_status"); }; }; then cf_cv_term_header="$cf_test" else echo "$as_me: failed program was:" >&5 -cat conftest.$ac_ext >&5 +cat "conftest.$ac_ext" >&5 cf_cv_term_header=unknown fi -rm -f conftest.$ac_objext conftest.$ac_ext +rm -f "conftest.$ac_objext" "conftest.$ac_ext" test "$cf_cv_term_header" != unknown && break done fi -echo "$as_me:4291: result: $cf_cv_term_header" >&5 +echo "$as_me:5440: result: $cf_cv_term_header" >&5 echo "${ECHO_T}$cf_cv_term_header" >&6 # Set definitions to allow ifdef'ing to accommodate subdirectories -case $cf_cv_term_header in +case "$cf_cv_term_header" in (*term.h) cat >>confdefs.h <<\EOF @@ -4303,7 +5452,7 @@ EOF ;; esac -case $cf_cv_term_header in +case "$cf_cv_term_header" in (ncurses/term.h) cat >>confdefs.h <<\EOF @@ -4323,7 +5472,7 @@ esac fi else - echo "$as_me:4326: result: no" >&5 + echo "$as_me:5475: result: no" >&5 echo "${ECHO_T}no" >&6 NCURSES_CONFIG_PKG=none fi @@ -4339,7 +5488,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:4342: checking for $ac_word" >&5 +echo "$as_me:5491: 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 @@ -4354,7 +5503,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:4357: found $ac_dir/$ac_word" >&5 +echo "$as_me:5506: found $ac_dir/$ac_word" >&5 break done @@ -4362,10 +5511,10 @@ fi fi NCURSES_CONFIG=$ac_cv_prog_NCURSES_CONFIG if test -n "$NCURSES_CONFIG"; then - echo "$as_me:4365: result: $NCURSES_CONFIG" >&5 + echo "$as_me:5514: result: $NCURSES_CONFIG" >&5 echo "${ECHO_T}$NCURSES_CONFIG" >&6 else - echo "$as_me:4368: result: no" >&5 + echo "$as_me:5517: result: no" >&5 echo "${ECHO_T}no" >&6 fi @@ -4378,7 +5527,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:4381: checking for $ac_word" >&5 +echo "$as_me:5530: 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 @@ -4393,7 +5542,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:4396: found $ac_dir/$ac_word" >&5 +echo "$as_me:5545: found $ac_dir/$ac_word" >&5 break done @@ -4401,10 +5550,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:4404: result: $ac_ct_NCURSES_CONFIG" >&5 + echo "$as_me:5553: result: $ac_ct_NCURSES_CONFIG" >&5 echo "${ECHO_T}$ac_ct_NCURSES_CONFIG" >&6 else - echo "$as_me:4407: result: no" >&5 + echo "$as_me:5556: result: no" >&5 echo "${ECHO_T}no" >&6 fi @@ -4417,26 +5566,52 @@ 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 +case "$cf_fix_cppflags" in (no) - case $cf_add_cflags in + case "$cf_add_cflags" in (-undef|-nostdinc*|-I*|-D*|-U*|-E|-P|-C) - case $cf_add_cflags in + case "$cf_add_cflags" in (-D*) - cf_tst_cflags=`echo ${cf_add_cflags} |sed -e 's/^-D[^=]*='\''\"[^"]*//'` + cf_tst_cflags=`echo "${cf_add_cflags}" |sed -e 's/^-D[^=]*='\''\"[^"]*//'` test "x${cf_add_cflags}" != "x${cf_tst_cflags}" \ && test -z "${cf_tst_cflags}" \ && cf_fix_cppflags=yes - if test $cf_fix_cppflags = yes ; then + if test "$cf_fix_cppflags" = yes ; then test -n "$cf_new_extra_cppflags" && cf_new_extra_cppflags="$cf_new_extra_cppflags " cf_new_extra_cppflags="${cf_new_extra_cppflags}$cf_add_cflags" @@ -4455,7 +5630,7 @@ case $cf_fix_cppflags in (*$cf_add_cflags) ;; (*) - case $cf_add_cflags in + case "$cf_add_cflags" in (-D*) cf_tst_cppflags=`echo "x$cf_add_cflags" | sed -e 's/^...//' -e 's/=.*//'` @@ -4485,7 +5660,7 @@ CPPFLAGS=`echo "$CPPFLAGS" | \ test -n "$cf_new_extra_cppflags" && cf_new_extra_cppflags="$cf_new_extra_cppflags " cf_new_extra_cppflags="${cf_new_extra_cppflags}$cf_add_cflags" - cf_tst_cflags=`echo ${cf_add_cflags} |sed -e 's/^[^"]*"'\''//'` + cf_tst_cflags=`echo "${cf_add_cflags}" |sed -e 's/^[^"]*"'\''//'` test "x${cf_add_cflags}" != "x${cf_tst_cflags}" \ && test -z "${cf_tst_cflags}" \ @@ -4515,25 +5690,27 @@ if test -n "$cf_new_extra_cppflags" ; then fi -cf_add_libs="`$NCURSES_CONFIG --libs`" -# Filter out duplicates - this happens with badly-designed ".pc" files... -for cf_add_1lib in $LIBS -do - for cf_add_2lib in $cf_add_libs - do - if test "x$cf_add_1lib" = "x$cf_add_2lib" - then +done + +cf_add_libs="$LIBS" +# reverse order +cf_add_0lib= +for cf_add_1lib in `$NCURSES_CONFIG --libs`; 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_libs $cf_add_1lib" + test -n "$cf_add_1lib" && cf_add_libs="$cf_add_1lib $cf_add_libs" done LIBS="$cf_add_libs" # even with config script, some packages use no-override for curses.h -echo "$as_me:4536: checking if we have identified curses headers" >&5 +echo "$as_me:5713: 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 @@ -4544,44 +5721,44 @@ for cf_header in \ ncurses.h ncurses/ncurses.h \ curses.h ncurses/curses.h do -cat >conftest.$ac_ext <<_ACEOF -#line 4548 "configure" +cat >"conftest.$ac_ext" <<_ACEOF +#line 5725 "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:4560: \"$ac_compile\"") >&5 +rm -f "conftest.$ac_objext" +if { (eval echo "$as_me:5737: \"$ac_compile\"") >&5 (eval $ac_compile) 2>&5 ac_status=$? - echo "$as_me:4563: \$? = $ac_status" >&5 - (exit $ac_status); } && - { ac_try='test -s conftest.$ac_objext' - { (eval echo "$as_me:4566: \"$ac_try\"") >&5 + echo "$as_me:5740: \$? = $ac_status" >&5 + (exit "$ac_status"); } && + { ac_try='test -s "conftest.$ac_objext"' + { (eval echo "$as_me:5743: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? - echo "$as_me:4569: \$? = $ac_status" >&5 - (exit $ac_status); }; }; then + echo "$as_me:5746: \$? = $ac_status" >&5 + (exit "$ac_status"); }; }; then cf_cv_ncurses_header=$cf_header; break else echo "$as_me: failed program was:" >&5 -cat conftest.$ac_ext >&5 +cat "conftest.$ac_ext" >&5 fi -rm -f conftest.$ac_objext conftest.$ac_ext +rm -f "conftest.$ac_objext" "conftest.$ac_ext" done fi -echo "$as_me:4580: result: $cf_cv_ncurses_header" >&5 +echo "$as_me:5757: 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:4584: error: No curses header-files found" >&5 + { { echo "$as_me:5761: error: No curses header-files found" >&5 echo "$as_me: error: No curses header-files found" >&2;} { (exit 1); exit 1; }; } fi @@ -4591,24 +5768,24 @@ 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:4594: checking for $ac_header" >&5 +echo "$as_me:5771: 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 4600 "configure" + cat >"conftest.$ac_ext" <<_ACEOF +#line 5777 "configure" #include "confdefs.h" #include <$ac_header> _ACEOF -if { (eval echo "$as_me:4604: \"$ac_cpp conftest.$ac_ext\"") >&5 - (eval $ac_cpp conftest.$ac_ext) 2>conftest.er1 +if { (eval echo "$as_me:5781: \"$ac_cpp "conftest.$ac_ext"\"") >&5 + (eval $ac_cpp "conftest.$ac_ext") 2>conftest.er1 ac_status=$? - egrep -v '^ *\+' conftest.er1 >conftest.err + $EGREP -v '^ *\+' conftest.er1 >conftest.err rm -f conftest.er1 cat conftest.err >&5 - echo "$as_me:4610: \$? = $ac_status" >&5 - (exit $ac_status); } >/dev/null; then + echo "$as_me:5787: \$? = $ac_status" >&5 + (exit "$ac_status"); } >/dev/null; then if test -s conftest.err; then ac_cpp_err=$ac_c_preproc_warn_flag else @@ -4621,14 +5798,14 @@ 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 + cat "conftest.$ac_ext" >&5 eval "$as_ac_Header=no" fi -rm -f conftest.err conftest.$ac_ext +rm -f conftest.err "conftest.$ac_ext" fi -echo "$as_me:4629: 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 +echo "$as_me:5806: 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 <conftest.$ac_ext <<_ACEOF -#line 4685 "configure" + cat >"conftest.$ac_ext" <<_ACEOF +#line 5862 "configure" #include "confdefs.h" #include int @@ -4693,25 +5870,25 @@ printf("Hello") return 0; } _ACEOF -rm -f conftest.$ac_objext -if { (eval echo "$as_me:4697: \"$ac_compile\"") >&5 +rm -f "conftest.$ac_objext" +if { (eval echo "$as_me:5874: \"$ac_compile\"") >&5 (eval $ac_compile) 2>&5 ac_status=$? - echo "$as_me:4700: \$? = $ac_status" >&5 - (exit $ac_status); } && - { ac_try='test -s conftest.$ac_objext' - { (eval echo "$as_me:4703: \"$ac_try\"") >&5 + echo "$as_me:5877: \$? = $ac_status" >&5 + (exit "$ac_status"); } && + { ac_try='test -s "conftest.$ac_objext"' + { (eval echo "$as_me:5880: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? - echo "$as_me:4706: \$? = $ac_status" >&5 - (exit $ac_status); }; }; then + echo "$as_me:5883: \$? = $ac_status" >&5 + (exit "$ac_status"); }; }; then : else echo "$as_me: failed program was:" >&5 -cat conftest.$ac_ext >&5 +cat "conftest.$ac_ext" >&5 cf_have_incdir=yes fi -rm -f conftest.$ac_objext conftest.$ac_ext +rm -f "conftest.$ac_objext" "conftest.$ac_ext" CPPFLAGS=$cf_save_CPPFLAGS fi fi @@ -4720,11 +5897,11 @@ 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}:4723: testing adding $cf_add_incdir to include-path ..." 1>&5 +echo "${as_me:-configure}:5900: testing adding $cf_add_incdir to include-path ..." 1>&5 CPPFLAGS="$CPPFLAGS -I$cf_add_incdir" - cf_top_incdir=`echo $cf_add_incdir | sed -e 's%/include/.*$%/include%'` + cf_top_incdir=`echo "$cf_add_incdir" | sed -e 's%/include/.*$%/include%'` test "$cf_top_incdir" = "$cf_add_incdir" && break cf_add_incdir="$cf_top_incdir" else @@ -4739,19 +5916,19 @@ fi } -echo "$as_me:4742: checking for $cf_ncuhdr_root header in include-path" >&5 +echo "$as_me:5919: 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 else cf_header_list="$cf_ncuhdr_root/curses.h $cf_ncuhdr_root/ncurses.h" - ( test "$cf_ncuhdr_root" = ncurses || test "$cf_ncuhdr_root" = ncursesw ) && cf_header_list="$cf_header_list curses.h ncurses.h" + { test "$cf_ncuhdr_root" = ncurses || test "$cf_ncuhdr_root" = ncursesw; } && cf_header_list="$cf_header_list curses.h ncurses.h" for cf_header in $cf_header_list do - cat >conftest.$ac_ext <<_ACEOF -#line 4754 "configure" + cat >"conftest.$ac_ext" <<_ACEOF +#line 5931 "configure" #include "confdefs.h" #include <$cf_header> @@ -4761,12 +5938,12 @@ main (void) #ifdef NCURSES_VERSION -printf("%s\n", NCURSES_VERSION); +printf("%s\\n", NCURSES_VERSION); #else #ifdef __NCURSES_H -printf("old\n"); +printf("old\\n"); #else - make an error + #error __NCURSES_H is not defined #endif #endif @@ -4774,39 +5951,39 @@ printf("old\n"); return 0; } _ACEOF -rm -f conftest.$ac_objext -if { (eval echo "$as_me:4778: \"$ac_compile\"") >&5 +rm -f "conftest.$ac_objext" +if { (eval echo "$as_me:5955: \"$ac_compile\"") >&5 (eval $ac_compile) 2>&5 ac_status=$? - echo "$as_me:4781: \$? = $ac_status" >&5 - (exit $ac_status); } && - { ac_try='test -s conftest.$ac_objext' - { (eval echo "$as_me:4784: \"$ac_try\"") >&5 + echo "$as_me:5958: \$? = $ac_status" >&5 + (exit "$ac_status"); } && + { ac_try='test -s "conftest.$ac_objext"' + { (eval echo "$as_me:5961: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? - echo "$as_me:4787: \$? = $ac_status" >&5 - (exit $ac_status); }; }; then + echo "$as_me:5964: \$? = $ac_status" >&5 + (exit "$ac_status"); }; }; then cf_cv_ncurses_h=$cf_header else echo "$as_me: failed program was:" >&5 -cat conftest.$ac_ext >&5 +cat "conftest.$ac_ext" >&5 cf_cv_ncurses_h=no fi -rm -f conftest.$ac_objext conftest.$ac_ext +rm -f "conftest.$ac_objext" "conftest.$ac_ext" test "$cf_cv_ncurses_h" != no && break done fi -echo "$as_me:4802: result: $cf_cv_ncurses_h" >&5 +echo "$as_me:5979: 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:4809: checking for $cf_ncuhdr_root include-path" >&5 +echo "$as_me:5986: 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 @@ -4821,7 +5998,7 @@ cf_header_path_list="" if test -n "${CFLAGS}${CPPFLAGS}" ; then for cf_header_path in $CPPFLAGS $CFLAGS do - case $cf_header_path in + case "$cf_header_path" in (-I*) cf_header_path=`echo ".$cf_header_path" |sed -e 's/^...//' -e 's,/include$,,'` @@ -4829,11 +6006,11 @@ test "x$cf_header_path" != "xNONE" && \ test -d "$cf_header_path" && \ { test -n "$verbose" && echo " ... testing for include-directories under $cf_header_path" - test -d $cf_header_path/include && cf_search="$cf_search $cf_header_path/include" - test -d $cf_header_path/include/$cf_ncuhdr_root && cf_search="$cf_search $cf_header_path/include/$cf_ncuhdr_root" - test -d $cf_header_path/include/$cf_ncuhdr_root/include && cf_search="$cf_search $cf_header_path/include/$cf_ncuhdr_root/include" - test -d $cf_header_path/$cf_ncuhdr_root/include && cf_search="$cf_search $cf_header_path/$cf_ncuhdr_root/include" - test -d $cf_header_path/$cf_ncuhdr_root/include/$cf_ncuhdr_root && cf_search="$cf_search $cf_header_path/$cf_ncuhdr_root/include/$cf_ncuhdr_root" + test -d "$cf_header_path/include" && cf_search="$cf_search $cf_header_path/include" + test -d "$cf_header_path/include/$cf_ncuhdr_root" && cf_search="$cf_search $cf_header_path/include/$cf_ncuhdr_root" + test -d "$cf_header_path/include/$cf_ncuhdr_root/include" && cf_search="$cf_search $cf_header_path/include/$cf_ncuhdr_root/include" + test -d "$cf_header_path/$cf_ncuhdr_root/include" && cf_search="$cf_search $cf_header_path/$cf_ncuhdr_root/include" + test -d "$cf_header_path/$cf_ncuhdr_root/include/$cf_ncuhdr_root" && cf_search="$cf_search $cf_header_path/$cf_ncuhdr_root/include/$cf_ncuhdr_root" } cf_header_path_list="$cf_header_path_list $cf_search" @@ -4850,11 +6027,11 @@ test "x$prefix" != "xNONE" && \ test -d "$prefix" && \ { test -n "$verbose" && echo " ... testing for include-directories under $prefix" - test -d $prefix/include && cf_search="$cf_search $prefix/include" - test -d $prefix/include/$cf_ncuhdr_root && cf_search="$cf_search $prefix/include/$cf_ncuhdr_root" - test -d $prefix/include/$cf_ncuhdr_root/include && cf_search="$cf_search $prefix/include/$cf_ncuhdr_root/include" - test -d $prefix/$cf_ncuhdr_root/include && cf_search="$cf_search $prefix/$cf_ncuhdr_root/include" - test -d $prefix/$cf_ncuhdr_root/include/$cf_ncuhdr_root && cf_search="$cf_search $prefix/$cf_ncuhdr_root/include/$cf_ncuhdr_root" + test -d "$prefix/include" && cf_search="$cf_search $prefix/include" + test -d "$prefix/include/$cf_ncuhdr_root" && cf_search="$cf_search $prefix/include/$cf_ncuhdr_root" + test -d "$prefix/include/$cf_ncuhdr_root/include" && cf_search="$cf_search $prefix/include/$cf_ncuhdr_root/include" + test -d "$prefix/$cf_ncuhdr_root/include" && cf_search="$cf_search $prefix/$cf_ncuhdr_root/include" + test -d "$prefix/$cf_ncuhdr_root/include/$cf_ncuhdr_root" && cf_search="$cf_search $prefix/$cf_ncuhdr_root/include/$cf_ncuhdr_root" } for cf_subdir_prefix in \ @@ -4868,13 +6045,13 @@ do test "x$cf_subdir_prefix" != "x$prefix" && \ test -d "$cf_subdir_prefix" && \ -(test -z "$prefix" || test x$prefix = xNONE || test "x$cf_subdir_prefix" != "x$prefix") && { +{ test -z "$prefix" || test "x$prefix" = xNONE || test "x$cf_subdir_prefix" != "x$prefix"; } && { test -n "$verbose" && echo " ... testing for include-directories under $cf_subdir_prefix" - test -d $cf_subdir_prefix/include && cf_search="$cf_search $cf_subdir_prefix/include" - test -d $cf_subdir_prefix/include/$cf_ncuhdr_root && cf_search="$cf_search $cf_subdir_prefix/include/$cf_ncuhdr_root" - test -d $cf_subdir_prefix/include/$cf_ncuhdr_root/include && cf_search="$cf_search $cf_subdir_prefix/include/$cf_ncuhdr_root/include" - test -d $cf_subdir_prefix/$cf_ncuhdr_root/include && cf_search="$cf_search $cf_subdir_prefix/$cf_ncuhdr_root/include" - test -d $cf_subdir_prefix/$cf_ncuhdr_root/include/$cf_ncuhdr_root && cf_search="$cf_search $cf_subdir_prefix/$cf_ncuhdr_root/include/$cf_ncuhdr_root" + test -d "$cf_subdir_prefix/include" && cf_search="$cf_search $cf_subdir_prefix/include" + test -d "$cf_subdir_prefix/include/$cf_ncuhdr_root" && cf_search="$cf_search $cf_subdir_prefix/include/$cf_ncuhdr_root" + test -d "$cf_subdir_prefix/include/$cf_ncuhdr_root/include" && cf_search="$cf_search $cf_subdir_prefix/include/$cf_ncuhdr_root/include" + test -d "$cf_subdir_prefix/$cf_ncuhdr_root/include" && cf_search="$cf_search $cf_subdir_prefix/$cf_ncuhdr_root/include" + test -d "$cf_subdir_prefix/$cf_ncuhdr_root/include/$cf_ncuhdr_root" && cf_search="$cf_search $cf_subdir_prefix/$cf_ncuhdr_root/include/$cf_ncuhdr_root" } done @@ -4882,20 +6059,20 @@ done test "$includedir" != NONE && \ test "$includedir" != "/usr/include" && \ test -d "$includedir" && { - test -d $includedir && cf_search="$cf_search $includedir" - test -d $includedir/$cf_ncuhdr_root && cf_search="$cf_search $includedir/$cf_ncuhdr_root" + test -d "$includedir" && cf_search="$cf_search $includedir" + test -d "$includedir/$cf_ncuhdr_root" && cf_search="$cf_search $includedir/$cf_ncuhdr_root" } test "$oldincludedir" != NONE && \ test "$oldincludedir" != "/usr/include" && \ test -d "$oldincludedir" && { - test -d $oldincludedir && cf_search="$cf_search $oldincludedir" - test -d $oldincludedir/$cf_ncuhdr_root && cf_search="$cf_search $oldincludedir/$cf_ncuhdr_root" + test -d "$oldincludedir" && cf_search="$cf_search $oldincludedir" + test -d "$oldincludedir/$cf_ncuhdr_root" && cf_search="$cf_search $oldincludedir/$cf_ncuhdr_root" } cf_search="$cf_search $cf_header_path_list" - test -n "$verbose" && echo search path $cf_search + test -n "$verbose" && echo "search path $cf_search" cf_save2_CPPFLAGS="$CPPFLAGS" for cf_incdir in $cf_search do @@ -4903,9 +6080,9 @@ cf_search="$cf_search $cf_header_path_list" if test -n "$cf_incdir" ; then for cf_add_incdir in $cf_incdir do - while test $cf_add_incdir != /usr/include + while test "$cf_add_incdir" != /usr/include do - if test -d $cf_add_incdir + if test -d "$cf_add_incdir" then cf_have_incdir=no if test -n "$CFLAGS$CPPFLAGS" ; then @@ -4926,8 +6103,8 @@ if test -n "$cf_incdir" ; then test -n "$CPPFLAGS" && CPPFLAGS="$CPPFLAGS " CPPFLAGS="${CPPFLAGS}-I$cf_add_incdir" - cat >conftest.$ac_ext <<_ACEOF -#line 4930 "configure" + cat >"conftest.$ac_ext" <<_ACEOF +#line 6107 "configure" #include "confdefs.h" #include int @@ -4938,25 +6115,25 @@ printf("Hello") return 0; } _ACEOF -rm -f conftest.$ac_objext -if { (eval echo "$as_me:4942: \"$ac_compile\"") >&5 +rm -f "conftest.$ac_objext" +if { (eval echo "$as_me:6119: \"$ac_compile\"") >&5 (eval $ac_compile) 2>&5 ac_status=$? - echo "$as_me:4945: \$? = $ac_status" >&5 - (exit $ac_status); } && - { ac_try='test -s conftest.$ac_objext' - { (eval echo "$as_me:4948: \"$ac_try\"") >&5 + echo "$as_me:6122: \$? = $ac_status" >&5 + (exit "$ac_status"); } && + { ac_try='test -s "conftest.$ac_objext"' + { (eval echo "$as_me:6125: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? - echo "$as_me:4951: \$? = $ac_status" >&5 - (exit $ac_status); }; }; then + echo "$as_me:6128: \$? = $ac_status" >&5 + (exit "$ac_status"); }; }; then : else echo "$as_me: failed program was:" >&5 -cat conftest.$ac_ext >&5 +cat "conftest.$ac_ext" >&5 cf_have_incdir=yes fi -rm -f conftest.$ac_objext conftest.$ac_ext +rm -f "conftest.$ac_objext" "conftest.$ac_ext" CPPFLAGS=$cf_save_CPPFLAGS fi fi @@ -4965,11 +6142,11 @@ 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}:4968: testing adding $cf_add_incdir to include-path ..." 1>&5 +echo "${as_me:-configure}:6145: testing adding $cf_add_incdir to include-path ..." 1>&5 CPPFLAGS="$CPPFLAGS -I$cf_add_incdir" - cf_top_incdir=`echo $cf_add_incdir | sed -e 's%/include/.*$%/include%'` + cf_top_incdir=`echo "$cf_add_incdir" | sed -e 's%/include/.*$%/include%'` test "$cf_top_incdir" = "$cf_add_incdir" && break cf_add_incdir="$cf_top_incdir" else @@ -4987,8 +6164,8 @@ fi curses.h do - cat >conftest.$ac_ext <<_ACEOF -#line 4991 "configure" + cat >"conftest.$ac_ext" <<_ACEOF +#line 6168 "configure" #include "confdefs.h" #include <$cf_header> @@ -4998,12 +6175,12 @@ main (void) #ifdef NCURSES_VERSION -printf("%s\n", NCURSES_VERSION); +printf("%s\\n", NCURSES_VERSION); #else #ifdef __NCURSES_H -printf("old\n"); +printf("old\\n"); #else - make an error + #error __NCURSES_H is not defined #endif #endif @@ -5011,30 +6188,30 @@ printf("old\n"); return 0; } _ACEOF -rm -f conftest.$ac_objext -if { (eval echo "$as_me:5015: \"$ac_compile\"") >&5 +rm -f "conftest.$ac_objext" +if { (eval echo "$as_me:6192: \"$ac_compile\"") >&5 (eval $ac_compile) 2>&5 ac_status=$? - echo "$as_me:5018: \$? = $ac_status" >&5 - (exit $ac_status); } && - { ac_try='test -s conftest.$ac_objext' - { (eval echo "$as_me:5021: \"$ac_try\"") >&5 + echo "$as_me:6195: \$? = $ac_status" >&5 + (exit "$ac_status"); } && + { ac_try='test -s "conftest.$ac_objext"' + { (eval echo "$as_me:6198: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? - echo "$as_me:5024: \$? = $ac_status" >&5 - (exit $ac_status); }; }; then + echo "$as_me:6201: \$? = $ac_status" >&5 + (exit "$ac_status"); }; }; then cf_cv_ncurses_h2=$cf_header else echo "$as_me: failed program was:" >&5 -cat conftest.$ac_ext >&5 +cat "conftest.$ac_ext" >&5 cf_cv_ncurses_h2=no fi -rm -f conftest.$ac_objext conftest.$ac_ext +rm -f "conftest.$ac_objext" "conftest.$ac_ext" if test "$cf_cv_ncurses_h2" != no ; then cf_cv_ncurses_h2=$cf_incdir/$cf_header - test -n "$verbose" && echo $ac_n " ... found $ac_c" 1>&6 + test -n "$verbose" && echo $ECHO_N " ... found $ECHO_C" 1>&6 break fi test -n "$verbose" && echo " ... tested $cf_incdir/$cf_header" 1>&6 @@ -5042,26 +6219,26 @@ 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:5045: error: not found" >&5 + test "$cf_cv_ncurses_h2" = no && { { echo "$as_me:6222: error: not found" >&5 echo "$as_me: error: not found" >&2;} { (exit 1); exit 1; }; } fi -echo "$as_me:5050: result: $cf_cv_ncurses_h2" >&5 +echo "$as_me:6227: 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%/[^/]*$%%'` - cf_cv_ncurses_header=`basename $cf_cv_ncurses_h2` - if test `basename $cf_1st_incdir` = $cf_ncuhdr_root ; then - cf_cv_ncurses_header=$cf_ncuhdr_root/$cf_cv_ncurses_header + cf_1st_incdir=`echo "$cf_cv_ncurses_h2" | sed -e 's%/[^/]*$%%'` + cf_cv_ncurses_header="`basename "$cf_cv_ncurses_h2"`" + if test "`basename "$cf_1st_incdir"`" = "$cf_ncuhdr_root" ; then + cf_cv_ncurses_header="$cf_ncuhdr_root/$cf_cv_ncurses_header" fi if test -n "$cf_1st_incdir" ; then for cf_add_incdir in $cf_1st_incdir do - while test $cf_add_incdir != /usr/include + while test "$cf_add_incdir" != /usr/include do - if test -d $cf_add_incdir + if test -d "$cf_add_incdir" then cf_have_incdir=no if test -n "$CFLAGS$CPPFLAGS" ; then @@ -5082,8 +6259,8 @@ if test -n "$cf_1st_incdir" ; then test -n "$CPPFLAGS" && CPPFLAGS="$CPPFLAGS " CPPFLAGS="${CPPFLAGS}-I$cf_add_incdir" - cat >conftest.$ac_ext <<_ACEOF -#line 5086 "configure" + cat >"conftest.$ac_ext" <<_ACEOF +#line 6263 "configure" #include "confdefs.h" #include int @@ -5094,25 +6271,25 @@ printf("Hello") return 0; } _ACEOF -rm -f conftest.$ac_objext -if { (eval echo "$as_me:5098: \"$ac_compile\"") >&5 +rm -f "conftest.$ac_objext" +if { (eval echo "$as_me:6275: \"$ac_compile\"") >&5 (eval $ac_compile) 2>&5 ac_status=$? - echo "$as_me:5101: \$? = $ac_status" >&5 - (exit $ac_status); } && - { ac_try='test -s conftest.$ac_objext' - { (eval echo "$as_me:5104: \"$ac_try\"") >&5 + echo "$as_me:6278: \$? = $ac_status" >&5 + (exit "$ac_status"); } && + { ac_try='test -s "conftest.$ac_objext"' + { (eval echo "$as_me:6281: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? - echo "$as_me:5107: \$? = $ac_status" >&5 - (exit $ac_status); }; }; then + echo "$as_me:6284: \$? = $ac_status" >&5 + (exit "$ac_status"); }; }; then : else echo "$as_me: failed program was:" >&5 -cat conftest.$ac_ext >&5 +cat "conftest.$ac_ext" >&5 cf_have_incdir=yes fi -rm -f conftest.$ac_objext conftest.$ac_ext +rm -f "conftest.$ac_objext" "conftest.$ac_ext" CPPFLAGS=$cf_save_CPPFLAGS fi fi @@ -5121,11 +6298,11 @@ 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}:5124: testing adding $cf_add_incdir to include-path ..." 1>&5 +echo "${as_me:-configure}:6301: testing adding $cf_add_incdir to include-path ..." 1>&5 CPPFLAGS="$CPPFLAGS -I$cf_add_incdir" - cf_top_incdir=`echo $cf_add_incdir | sed -e 's%/include/.*$%/include%'` + cf_top_incdir=`echo "$cf_add_incdir" | sed -e 's%/include/.*$%/include%'` test "$cf_top_incdir" = "$cf_add_incdir" && break cf_add_incdir="$cf_top_incdir" else @@ -5142,7 +6319,7 @@ fi # Set definitions to allow ifdef'ing for ncurses.h -case $cf_cv_ncurses_header in +case "$cf_cv_ncurses_header" in (*ncurses.h) cat >>confdefs.h <<\EOF @@ -5152,7 +6329,7 @@ EOF ;; esac -case $cf_cv_ncurses_header in +case "$cf_cv_ncurses_header" in (ncurses/curses.h|ncurses/ncurses.h) cat >>confdefs.h <<\EOF @@ -5169,13 +6346,13 @@ EOF ;; esac -echo "$as_me:5172: checking for terminfo header" >&5 +echo "$as_me:6349: 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 else -case ${cf_cv_ncurses_header} in +case "${cf_cv_ncurses_header}" in (*/ncurses.h|*/ncursesw.h) cf_term_header=`echo "$cf_cv_ncurses_header" | sed -e 's%ncurses[^.]*\.h$%term.h%'` ;; @@ -5186,8 +6363,8 @@ esac for cf_test in $cf_term_header "ncurses/term.h" "ncursesw/term.h" do -cat >conftest.$ac_ext <<_ACEOF -#line 5190 "configure" +cat >"conftest.$ac_ext" <<_ACEOF +#line 6367 "configure" #include "confdefs.h" #include #include <${cf_cv_ncurses_header:-curses.h}> @@ -5196,43 +6373,43 @@ cat >conftest.$ac_ext <<_ACEOF int main (void) { -int x = auto_left_margin +int x = auto_left_margin; (void)x ; return 0; } _ACEOF -rm -f conftest.$ac_objext -if { (eval echo "$as_me:5205: \"$ac_compile\"") >&5 +rm -f "conftest.$ac_objext" +if { (eval echo "$as_me:6382: \"$ac_compile\"") >&5 (eval $ac_compile) 2>&5 ac_status=$? - echo "$as_me:5208: \$? = $ac_status" >&5 - (exit $ac_status); } && - { ac_try='test -s conftest.$ac_objext' - { (eval echo "$as_me:5211: \"$ac_try\"") >&5 + echo "$as_me:6385: \$? = $ac_status" >&5 + (exit "$ac_status"); } && + { ac_try='test -s "conftest.$ac_objext"' + { (eval echo "$as_me:6388: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? - echo "$as_me:5214: \$? = $ac_status" >&5 - (exit $ac_status); }; }; then + echo "$as_me:6391: \$? = $ac_status" >&5 + (exit "$ac_status"); }; }; then cf_cv_term_header="$cf_test" else echo "$as_me: failed program was:" >&5 -cat conftest.$ac_ext >&5 +cat "conftest.$ac_ext" >&5 cf_cv_term_header=unknown fi -rm -f conftest.$ac_objext conftest.$ac_ext +rm -f "conftest.$ac_objext" "conftest.$ac_ext" test "$cf_cv_term_header" != unknown && break done fi -echo "$as_me:5230: result: $cf_cv_term_header" >&5 +echo "$as_me:6407: result: $cf_cv_term_header" >&5 echo "${ECHO_T}$cf_cv_term_header" >&6 # Set definitions to allow ifdef'ing to accommodate subdirectories -case $cf_cv_term_header in +case "$cf_cv_term_header" in (*term.h) cat >>confdefs.h <<\EOF @@ -5242,7 +6419,7 @@ EOF ;; esac -case $cf_cv_term_header in +case "$cf_cv_term_header" in (ncurses/term.h) cat >>confdefs.h <<\EOF @@ -5265,7 +6442,7 @@ cat >>confdefs.h <<\EOF #define NCURSES 1 EOF -echo "$as_me:5268: checking for ncurses version" >&5 +echo "$as_me:6445: 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 @@ -5273,12 +6450,12 @@ else cf_cv_ncurses_version=no cf_tempfile=out$$ - rm -f $cf_tempfile + rm -f "$cf_tempfile" if test "$cross_compiling" = yes; then # This will not work if the preprocessor splits the line after the # Autoconf token. The 'unproto' program does that. - cat > conftest.$ac_ext < "conftest.$ac_ext" < #undef Autoconf #ifdef NCURSES_VERSION @@ -5291,67 +6468,69 @@ Autoconf "old" #endif EOF cf_try="$ac_cpp conftest.$ac_ext 2>&5 | grep '^Autoconf ' >conftest.out" - { (eval echo "$as_me:5294: \"$cf_try\"") >&5 + { (eval echo "$as_me:6471: \"$cf_try\"") >&5 (eval $cf_try) 2>&5 ac_status=$? - echo "$as_me:5297: \$? = $ac_status" >&5 - (exit $ac_status); } + echo "$as_me:6474: \$? = $ac_status" >&5 + (exit "$ac_status"); } if test -f conftest.out ; then - cf_out=`cat conftest.out | sed -e 's%^Autoconf %%' -e 's%^[^"]*"%%' -e 's%".*%%'` + cf_out=`sed -e 's%^Autoconf %%' -e 's%^[^"]*"%%' -e 's%".*%%' conftest.out` test -n "$cf_out" && cf_cv_ncurses_version="$cf_out" rm -f conftest.out fi else - cat >conftest.$ac_ext <<_ACEOF -#line 5307 "configure" + cat >"conftest.$ac_ext" <<_ACEOF +#line 6484 "configure" #include "confdefs.h" +$ac_includes_default + #include <${cf_cv_ncurses_header:-curses.h}> -#include + int main(void) { FILE *fp = fopen("$cf_tempfile", "w"); #ifdef NCURSES_VERSION # ifdef NCURSES_VERSION_PATCH - fprintf(fp, "%s.%d\n", NCURSES_VERSION, NCURSES_VERSION_PATCH); + fprintf(fp, "%s.%d\\n", NCURSES_VERSION, NCURSES_VERSION_PATCH); # else - fprintf(fp, "%s\n", NCURSES_VERSION); + fprintf(fp, "%s\\n", NCURSES_VERSION); # endif #else # ifdef __NCURSES_H - fprintf(fp, "old\n"); + 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:5332: \"$ac_link\"") >&5 +rm -f "conftest$ac_exeext" +if { (eval echo "$as_me:6511: \"$ac_link\"") >&5 (eval $ac_link) 2>&5 ac_status=$? - echo "$as_me:5335: \$? = $ac_status" >&5 - (exit $ac_status); } && { ac_try='./conftest$ac_exeext' - { (eval echo "$as_me:5337: \"$ac_try\"") >&5 + echo "$as_me:6514: \$? = $ac_status" >&5 + (exit "$ac_status"); } && { ac_try='"./conftest$ac_exeext"' + { (eval echo "$as_me:6516: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? - echo "$as_me:5340: \$? = $ac_status" >&5 - (exit $ac_status); }; }; then + echo "$as_me:6519: \$? = $ac_status" >&5 + (exit "$ac_status"); }; }; then cf_cv_ncurses_version=`cat $cf_tempfile` else echo "$as_me: program exited with status $ac_status" >&5 echo "$as_me: failed program was:" >&5 -cat conftest.$ac_ext >&5 +cat "conftest.$ac_ext" >&5 fi -rm -f core core.* *.core conftest$ac_exeext conftest.$ac_objext conftest.$ac_ext +rm -f core ./core.* ./*.core "conftest$ac_exeext" "conftest.$ac_objext" "conftest.$ac_ext" fi - rm -f $cf_tempfile + rm -f "$cf_tempfile" fi -echo "$as_me:5354: result: $cf_cv_ncurses_version" >&5 +echo "$as_me:6533: result: $cf_cv_ncurses_version" >&5 echo "${ECHO_T}$cf_cv_ncurses_version" >&6 test "$cf_cv_ncurses_version" = no || cat >>confdefs.h <<\EOF @@ -5364,15 +6543,15 @@ cf_nculib_root=ncurses # to link gpm. cf_ncurses_LIBS="" cf_ncurses_SAVE="$LIBS" -echo "$as_me:5367: checking for Gpm_Open in -lgpm" >&5 +echo "$as_me:6546: 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 else ac_check_lib_save_LIBS=$LIBS LIBS="-lgpm $LIBS" -cat >conftest.$ac_ext <<_ACEOF -#line 5375 "configure" +cat >"conftest.$ac_ext" <<_ACEOF +#line 6554 "configure" #include "confdefs.h" /* Override any gcc2 internal prototype to avoid an error. */ @@ -5381,7 +6560,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) { @@ -5390,39 +6569,39 @@ Gpm_Open (); return 0; } _ACEOF -rm -f conftest.$ac_objext conftest$ac_exeext -if { (eval echo "$as_me:5394: \"$ac_link\"") >&5 +rm -f "conftest.$ac_objext" "conftest$ac_exeext" +if { (eval echo "$as_me:6573: \"$ac_link\"") >&5 (eval $ac_link) 2>&5 ac_status=$? - echo "$as_me:5397: \$? = $ac_status" >&5 - (exit $ac_status); } && - { ac_try='test -s conftest$ac_exeext' - { (eval echo "$as_me:5400: \"$ac_try\"") >&5 + echo "$as_me:6576: \$? = $ac_status" >&5 + (exit "$ac_status"); } && + { ac_try='test -s "conftest$ac_exeext"' + { (eval echo "$as_me:6579: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? - echo "$as_me:5403: \$? = $ac_status" >&5 - (exit $ac_status); }; }; then + echo "$as_me:6582: \$? = $ac_status" >&5 + (exit "$ac_status"); }; }; then ac_cv_lib_gpm_Gpm_Open=yes else echo "$as_me: failed program was:" >&5 -cat conftest.$ac_ext >&5 +cat "conftest.$ac_ext" >&5 ac_cv_lib_gpm_Gpm_Open=no fi -rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext +rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext" LIBS=$ac_check_lib_save_LIBS fi -echo "$as_me:5414: result: $ac_cv_lib_gpm_Gpm_Open" >&5 +echo "$as_me:6593: 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:5417: checking for initscr in -lgpm" >&5 +if test "$ac_cv_lib_gpm_Gpm_Open" = yes; then + echo "$as_me:6596: 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 else ac_check_lib_save_LIBS=$LIBS LIBS="-lgpm $LIBS" -cat >conftest.$ac_ext <<_ACEOF -#line 5425 "configure" +cat >"conftest.$ac_ext" <<_ACEOF +#line 6604 "configure" #include "confdefs.h" /* Override any gcc2 internal prototype to avoid an error. */ @@ -5431,7 +6610,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) { @@ -5440,30 +6619,30 @@ initscr (); return 0; } _ACEOF -rm -f conftest.$ac_objext conftest$ac_exeext -if { (eval echo "$as_me:5444: \"$ac_link\"") >&5 +rm -f "conftest.$ac_objext" "conftest$ac_exeext" +if { (eval echo "$as_me:6623: \"$ac_link\"") >&5 (eval $ac_link) 2>&5 ac_status=$? - echo "$as_me:5447: \$? = $ac_status" >&5 - (exit $ac_status); } && - { ac_try='test -s conftest$ac_exeext' - { (eval echo "$as_me:5450: \"$ac_try\"") >&5 + echo "$as_me:6626: \$? = $ac_status" >&5 + (exit "$ac_status"); } && + { ac_try='test -s "conftest$ac_exeext"' + { (eval echo "$as_me:6629: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? - echo "$as_me:5453: \$? = $ac_status" >&5 - (exit $ac_status); }; }; then + echo "$as_me:6632: \$? = $ac_status" >&5 + (exit "$ac_status"); }; }; then ac_cv_lib_gpm_initscr=yes else echo "$as_me: failed program was:" >&5 -cat conftest.$ac_ext >&5 +cat "conftest.$ac_ext" >&5 ac_cv_lib_gpm_initscr=no fi -rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext +rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext" LIBS=$ac_check_lib_save_LIBS fi -echo "$as_me:5464: result: $ac_cv_lib_gpm_initscr" >&5 +echo "$as_me:6643: 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 +if test "$ac_cv_lib_gpm_initscr" = yes; then LIBS="$cf_ncurses_SAVE" else cf_ncurses_LIBS="-lgpm" @@ -5471,20 +6650,20 @@ fi fi -case $host_os in +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:5479: checking for tgoto in -lmytinfo" >&5 + echo "$as_me:6658: 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 else ac_check_lib_save_LIBS=$LIBS LIBS="-lmytinfo $LIBS" -cat >conftest.$ac_ext <<_ACEOF -#line 5487 "configure" +cat >"conftest.$ac_ext" <<_ACEOF +#line 6666 "configure" #include "confdefs.h" /* Override any gcc2 internal prototype to avoid an error. */ @@ -5493,7 +6672,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) { @@ -5502,30 +6681,30 @@ tgoto (); return 0; } _ACEOF -rm -f conftest.$ac_objext conftest$ac_exeext -if { (eval echo "$as_me:5506: \"$ac_link\"") >&5 +rm -f "conftest.$ac_objext" "conftest$ac_exeext" +if { (eval echo "$as_me:6685: \"$ac_link\"") >&5 (eval $ac_link) 2>&5 ac_status=$? - echo "$as_me:5509: \$? = $ac_status" >&5 - (exit $ac_status); } && - { ac_try='test -s conftest$ac_exeext' - { (eval echo "$as_me:5512: \"$ac_try\"") >&5 + echo "$as_me:6688: \$? = $ac_status" >&5 + (exit "$ac_status"); } && + { ac_try='test -s "conftest$ac_exeext"' + { (eval echo "$as_me:6691: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? - echo "$as_me:5515: \$? = $ac_status" >&5 - (exit $ac_status); }; }; then + echo "$as_me:6694: \$? = $ac_status" >&5 + (exit "$ac_status"); }; }; then ac_cv_lib_mytinfo_tgoto=yes else echo "$as_me: failed program was:" >&5 -cat conftest.$ac_ext >&5 +cat "conftest.$ac_ext" >&5 ac_cv_lib_mytinfo_tgoto=no fi -rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext +rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext" LIBS=$ac_check_lib_save_LIBS fi -echo "$as_me:5526: result: $ac_cv_lib_mytinfo_tgoto" >&5 +echo "$as_me:6705: 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 +if test "$ac_cv_lib_mytinfo_tgoto" = yes; then cf_ncurses_LIBS="-lmytinfo $cf_ncurses_LIBS" fi @@ -5533,113 +6712,113 @@ fi ;; esac -cf_add_libs="$cf_ncurses_LIBS" -# Filter out duplicates - this happens with badly-designed ".pc" files... -for cf_add_1lib in $LIBS -do - for cf_add_2lib in $cf_add_libs - do - if test "x$cf_add_1lib" = "x$cf_add_2lib" - then +cf_add_libs="$LIBS" +# reverse order +cf_add_0lib= +for cf_add_1lib in $cf_ncurses_LIBS; 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_libs $cf_add_1lib" + test -n "$cf_add_1lib" && cf_add_libs="$cf_add_1lib $cf_add_libs" done LIBS="$cf_add_libs" -if ( test -n "$cf_cv_curses_dir" && test "$cf_cv_curses_dir" != "no" ) +if test -n "$cf_cv_curses_dir" && test "$cf_cv_curses_dir" != "no" then -cf_add_libs="-l$cf_nculib_root" -# Filter out duplicates - this happens with badly-designed ".pc" files... -for cf_add_1lib in $LIBS -do - for cf_add_2lib in $cf_add_libs - do - if test "x$cf_add_1lib" = "x$cf_add_2lib" - then +cf_add_libs="$LIBS" +# reverse order +cf_add_0lib= +for cf_add_1lib in -l$cf_nculib_root; 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_libs $cf_add_1lib" + test -n "$cf_add_1lib" && cf_add_libs="$cf_add_1lib $cf_add_libs" done LIBS="$cf_add_libs" else - eval 'cf_cv_have_lib_'$cf_nculib_root'=no' + eval 'cf_cv_have_lib_'"$cf_nculib_root"'=no' cf_libdir="" - echo "$as_me:5575: checking for initscr" >&5 + echo "$as_me:6754: 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 5581 "configure" + cat >"conftest.$ac_ext" <<_ACEOF +#line 6760 "configure" #include "confdefs.h" -/* System header to define __stub macros and hopefully few prototypes, - which can conflict with char initscr (); below. */ -#include -/* Override any gcc2 internal prototype to avoid an error. */ +#define initscr autoconf_temporary +#include /* least-intrusive standard header which defines gcc2 __stub macros */ +#undef initscr + #ifdef __cplusplus 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 (*f) (); +char initscr (void); int main (void) { -/* The GNU C library defines this for functions which it implements + +/* The GNU C library defines stubs for functions which it implements to always fail with ENOSYS. Some functions are actually named something starting with __ and the normal name is an alias. */ #if defined (__stub_initscr) || defined (__stub___initscr) -choke me -#else -f = initscr; /* workaround for ICC 12.0.3 */ if (f == 0) return 1; +#error found stub for initscr #endif + return initscr (); ; return 0; } _ACEOF -rm -f conftest.$ac_objext conftest$ac_exeext -if { (eval echo "$as_me:5612: \"$ac_link\"") >&5 +rm -f "conftest.$ac_objext" "conftest$ac_exeext" +if { (eval echo "$as_me:6791: \"$ac_link\"") >&5 (eval $ac_link) 2>&5 ac_status=$? - echo "$as_me:5615: \$? = $ac_status" >&5 - (exit $ac_status); } && - { ac_try='test -s conftest$ac_exeext' - { (eval echo "$as_me:5618: \"$ac_try\"") >&5 + echo "$as_me:6794: \$? = $ac_status" >&5 + (exit "$ac_status"); } && + { ac_try='test -s "conftest$ac_exeext"' + { (eval echo "$as_me:6797: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? - echo "$as_me:5621: \$? = $ac_status" >&5 - (exit $ac_status); }; }; then + echo "$as_me:6800: \$? = $ac_status" >&5 + (exit "$ac_status"); }; }; then ac_cv_func_initscr=yes else echo "$as_me: failed program was:" >&5 -cat conftest.$ac_ext >&5 +cat "conftest.$ac_ext" >&5 ac_cv_func_initscr=no fi -rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext +rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext" fi -echo "$as_me:5631: result: $ac_cv_func_initscr" >&5 +echo "$as_me:6810: 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' +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:5638: checking for initscr in -l$cf_nculib_root" >&5 + echo "$as_me:6817: 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 5642 "configure" + cat >"conftest.$ac_ext" <<_ACEOF +#line 6821 "configure" #include "confdefs.h" #include <${cf_cv_ncurses_header:-curses.h}> int @@ -5650,26 +6829,26 @@ initscr() return 0; } _ACEOF -rm -f conftest.$ac_objext conftest$ac_exeext -if { (eval echo "$as_me:5654: \"$ac_link\"") >&5 +rm -f "conftest.$ac_objext" "conftest$ac_exeext" +if { (eval echo "$as_me:6833: \"$ac_link\"") >&5 (eval $ac_link) 2>&5 ac_status=$? - echo "$as_me:5657: \$? = $ac_status" >&5 - (exit $ac_status); } && - { ac_try='test -s conftest$ac_exeext' - { (eval echo "$as_me:5660: \"$ac_try\"") >&5 + echo "$as_me:6836: \$? = $ac_status" >&5 + (exit "$ac_status"); } && + { ac_try='test -s "conftest$ac_exeext"' + { (eval echo "$as_me:6839: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? - echo "$as_me:5663: \$? = $ac_status" >&5 - (exit $ac_status); }; }; then - echo "$as_me:5665: result: yes" >&5 + echo "$as_me:6842: \$? = $ac_status" >&5 + (exit "$ac_status"); }; }; then + echo "$as_me:6844: result: yes" >&5 echo "${ECHO_T}yes" >&6 - eval 'cf_cv_have_lib_'$cf_nculib_root'=yes' + 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:5672: result: no" >&5 +cat "conftest.$ac_ext" >&5 +echo "$as_me:6851: result: no" >&5 echo "${ECHO_T}no" >&6 cf_search= @@ -5677,7 +6856,7 @@ cf_library_path_list="" if test -n "${LDFLAGS}${LIBS}" ; then for cf_library_path in $LDFLAGS $LIBS do - case $cf_library_path in + case "$cf_library_path" in (-L*) cf_library_path=`echo ".$cf_library_path" |sed -e 's/^...//' -e 's,/lib$,,'` @@ -5685,11 +6864,11 @@ test "x$cf_library_path" != "xNONE" && \ test -d "$cf_library_path" && \ { test -n "$verbose" && echo " ... testing for lib-directories under $cf_library_path" - test -d $cf_library_path/lib && cf_search="$cf_search $cf_library_path/lib" - test -d $cf_library_path/lib/$cf_nculib_root && cf_search="$cf_search $cf_library_path/lib/$cf_nculib_root" - test -d $cf_library_path/lib/$cf_nculib_root/lib && cf_search="$cf_search $cf_library_path/lib/$cf_nculib_root/lib" - test -d $cf_library_path/$cf_nculib_root/lib && cf_search="$cf_search $cf_library_path/$cf_nculib_root/lib" - test -d $cf_library_path/$cf_nculib_root/lib/$cf_nculib_root && cf_search="$cf_search $cf_library_path/$cf_nculib_root/lib/$cf_nculib_root" + test -d "$cf_library_path/lib" && cf_search="$cf_search $cf_library_path/lib" + test -d "$cf_library_path/lib/$cf_nculib_root" && cf_search="$cf_search $cf_library_path/lib/$cf_nculib_root" + test -d "$cf_library_path/lib/$cf_nculib_root/lib" && cf_search="$cf_search $cf_library_path/lib/$cf_nculib_root/lib" + test -d "$cf_library_path/$cf_nculib_root/lib" && cf_search="$cf_search $cf_library_path/$cf_nculib_root/lib" + test -d "$cf_library_path/$cf_nculib_root/lib/$cf_nculib_root" && cf_search="$cf_search $cf_library_path/$cf_nculib_root/lib/$cf_nculib_root" } cf_library_path_list="$cf_library_path_list $cf_search" @@ -5704,11 +6883,11 @@ test "x$prefix" != "xNONE" && \ test -d "$prefix" && \ { test -n "$verbose" && echo " ... testing for lib-directories under $prefix" - test -d $prefix/lib && cf_search="$cf_search $prefix/lib" - test -d $prefix/lib/$cf_nculib_root && cf_search="$cf_search $prefix/lib/$cf_nculib_root" - test -d $prefix/lib/$cf_nculib_root/lib && cf_search="$cf_search $prefix/lib/$cf_nculib_root/lib" - test -d $prefix/$cf_nculib_root/lib && cf_search="$cf_search $prefix/$cf_nculib_root/lib" - test -d $prefix/$cf_nculib_root/lib/$cf_nculib_root && cf_search="$cf_search $prefix/$cf_nculib_root/lib/$cf_nculib_root" + test -d "$prefix/lib" && cf_search="$cf_search $prefix/lib" + test -d "$prefix/lib/$cf_nculib_root" && cf_search="$cf_search $prefix/lib/$cf_nculib_root" + test -d "$prefix/lib/$cf_nculib_root/lib" && cf_search="$cf_search $prefix/lib/$cf_nculib_root/lib" + test -d "$prefix/$cf_nculib_root/lib" && cf_search="$cf_search $prefix/$cf_nculib_root/lib" + test -d "$prefix/$cf_nculib_root/lib/$cf_nculib_root" && cf_search="$cf_search $prefix/$cf_nculib_root/lib/$cf_nculib_root" } for cf_subdir_prefix in \ @@ -5722,13 +6901,13 @@ do test "x$cf_subdir_prefix" != "x$prefix" && \ test -d "$cf_subdir_prefix" && \ -(test -z "$prefix" || test x$prefix = xNONE || test "x$cf_subdir_prefix" != "x$prefix") && { +{ test -z "$prefix" || test "x$prefix" = xNONE || test "x$cf_subdir_prefix" != "x$prefix"; } && { test -n "$verbose" && echo " ... testing for lib-directories under $cf_subdir_prefix" - test -d $cf_subdir_prefix/lib && cf_search="$cf_search $cf_subdir_prefix/lib" - test -d $cf_subdir_prefix/lib/$cf_nculib_root && cf_search="$cf_search $cf_subdir_prefix/lib/$cf_nculib_root" - test -d $cf_subdir_prefix/lib/$cf_nculib_root/lib && cf_search="$cf_search $cf_subdir_prefix/lib/$cf_nculib_root/lib" - test -d $cf_subdir_prefix/$cf_nculib_root/lib && cf_search="$cf_search $cf_subdir_prefix/$cf_nculib_root/lib" - test -d $cf_subdir_prefix/$cf_nculib_root/lib/$cf_nculib_root && cf_search="$cf_search $cf_subdir_prefix/$cf_nculib_root/lib/$cf_nculib_root" + test -d "$cf_subdir_prefix/lib" && cf_search="$cf_search $cf_subdir_prefix/lib" + test -d "$cf_subdir_prefix/lib/$cf_nculib_root" && cf_search="$cf_search $cf_subdir_prefix/lib/$cf_nculib_root" + test -d "$cf_subdir_prefix/lib/$cf_nculib_root/lib" && cf_search="$cf_search $cf_subdir_prefix/lib/$cf_nculib_root/lib" + test -d "$cf_subdir_prefix/$cf_nculib_root/lib" && cf_search="$cf_search $cf_subdir_prefix/$cf_nculib_root/lib" + test -d "$cf_subdir_prefix/$cf_nculib_root/lib/$cf_nculib_root" && cf_search="$cf_search $cf_subdir_prefix/$cf_nculib_root/lib/$cf_nculib_root" } done @@ -5737,11 +6916,11 @@ cf_search="$cf_library_path_list $cf_search" for cf_libdir in $cf_search do - echo "$as_me:5740: checking for -l$cf_nculib_root in $cf_libdir" >&5 + echo "$as_me:6919: 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 5744 "configure" + cat >"conftest.$ac_ext" <<_ACEOF +#line 6923 "configure" #include "confdefs.h" #include <${cf_cv_ncurses_header:-curses.h}> int @@ -5752,41 +6931,41 @@ initscr() return 0; } _ACEOF -rm -f conftest.$ac_objext conftest$ac_exeext -if { (eval echo "$as_me:5756: \"$ac_link\"") >&5 +rm -f "conftest.$ac_objext" "conftest$ac_exeext" +if { (eval echo "$as_me:6935: \"$ac_link\"") >&5 (eval $ac_link) 2>&5 ac_status=$? - echo "$as_me:5759: \$? = $ac_status" >&5 - (exit $ac_status); } && - { ac_try='test -s conftest$ac_exeext' - { (eval echo "$as_me:5762: \"$ac_try\"") >&5 + echo "$as_me:6938: \$? = $ac_status" >&5 + (exit "$ac_status"); } && + { ac_try='test -s "conftest$ac_exeext"' + { (eval echo "$as_me:6941: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? - echo "$as_me:5765: \$? = $ac_status" >&5 - (exit $ac_status); }; }; then - echo "$as_me:5767: result: yes" >&5 + echo "$as_me:6944: \$? = $ac_status" >&5 + (exit "$ac_status"); }; }; then + echo "$as_me:6946: result: yes" >&5 echo "${ECHO_T}yes" >&6 - eval 'cf_cv_have_lib_'$cf_nculib_root'=yes' + 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:5774: result: no" >&5 +cat "conftest.$ac_ext" >&5 +echo "$as_me:6953: result: no" >&5 echo "${ECHO_T}no" >&6 LIBS="$cf_save_LIBS" fi -rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext +rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext" done fi -rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext +rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext" fi -eval 'cf_found_library=$cf_cv_have_lib_'$cf_nculib_root +eval 'cf_found_library="$cf_cv_have_lib_'"$cf_nculib_root"\" -if test $cf_found_library = no ; then - { { echo "$as_me:5789: error: Cannot link $cf_nculib_root library" >&5 +if test "$cf_found_library" = no ; then + { { echo "$as_me:6968: error: Cannot link $cf_nculib_root library" >&5 echo "$as_me: error: Cannot link $cf_nculib_root library" >&2;} { (exit 1); exit 1; }; } fi @@ -5794,49 +6973,49 @@ fi fi if test -n "$cf_ncurses_LIBS" ; then - echo "$as_me:5797: checking if we can link $cf_nculib_root without $cf_ncurses_LIBS" >&5 + echo "$as_me:6976: 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 - q=`echo $LIBS | sed -e "s%$p %%" -e "s%$p$%%"` + q=`echo "$LIBS" | sed -e "s%$p %%" -e "s%$p$%%"` if test "$q" != "$LIBS" ; then LIBS="$q" fi done - cat >conftest.$ac_ext <<_ACEOF -#line 5807 "configure" + cat >"conftest.$ac_ext" <<_ACEOF +#line 6986 "configure" #include "confdefs.h" #include <${cf_cv_ncurses_header:-curses.h}> int main (void) { -initscr(); mousemask(0,0); tgoto((char *)0, 0, 0); +initscr(); mousemask(0,0); tigetstr((char *)0); ; return 0; } _ACEOF -rm -f conftest.$ac_objext conftest$ac_exeext -if { (eval echo "$as_me:5819: \"$ac_link\"") >&5 +rm -f "conftest.$ac_objext" "conftest$ac_exeext" +if { (eval echo "$as_me:6998: \"$ac_link\"") >&5 (eval $ac_link) 2>&5 ac_status=$? - echo "$as_me:5822: \$? = $ac_status" >&5 - (exit $ac_status); } && - { ac_try='test -s conftest$ac_exeext' - { (eval echo "$as_me:5825: \"$ac_try\"") >&5 + echo "$as_me:7001: \$? = $ac_status" >&5 + (exit "$ac_status"); } && + { ac_try='test -s "conftest$ac_exeext"' + { (eval echo "$as_me:7004: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? - echo "$as_me:5828: \$? = $ac_status" >&5 - (exit $ac_status); }; }; then - echo "$as_me:5830: result: yes" >&5 + echo "$as_me:7007: \$? = $ac_status" >&5 + (exit "$ac_status"); }; }; then + echo "$as_me:7009: result: yes" >&5 echo "${ECHO_T}yes" >&6 else echo "$as_me: failed program was:" >&5 -cat conftest.$ac_ext >&5 -echo "$as_me:5835: result: no" >&5 +cat "conftest.$ac_ext" >&5 +echo "$as_me:7014: result: no" >&5 echo "${ECHO_T}no" >&6 LIBS="$cf_ncurses_SAVE" fi -rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext +rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext" fi cf_nculib_ROOT=`echo "HAVE_LIB$cf_nculib_root" | sed y%abcdefghijklmnopqrstuvwxyz./-%ABCDEFGHIJKLMNOPQRSTUVWXYZ___%` @@ -5850,7 +7029,7 @@ else NCURSES_CONFIG=none fi -echo "$as_me:5853: checking if you want wide-character code" >&5 +echo "$as_me:7032: 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. @@ -5860,22 +7039,74 @@ if test "${enable_widec+set}" = set; then else with_widec=no fi; -echo "$as_me:5863: result: $with_widec" >&5 +echo "$as_me:7042: result: $with_widec" >&5 echo "${ECHO_T}$with_widec" >&6 if test "$with_widec" = yes ; then -echo "$as_me:5867: 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:7049: 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 7055 "configure" +#include "confdefs.h" +#include <$ac_header> +_ACEOF +if { (eval echo "$as_me:7059: \"$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:7065: \$? = $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:7084: 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 <&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 else cf_save_LIBS="$LIBS" - cat >conftest.$ac_ext <<_ACEOF -#line 5875 "configure" + cat >"conftest.$ac_ext" <<_ACEOF +#line 7102 "configure" #include "confdefs.h" -#include +$ac_includes_default +#ifdef HAVE_WCHAR_H +#include +#endif + int main (void) { @@ -5884,34 +7115,34 @@ putwc(0,0); return 0; } _ACEOF -rm -f conftest.$ac_objext conftest$ac_exeext -if { (eval echo "$as_me:5888: \"$ac_link\"") >&5 +rm -f "conftest.$ac_objext" "conftest$ac_exeext" +if { (eval echo "$as_me:7119: \"$ac_link\"") >&5 (eval $ac_link) 2>&5 ac_status=$? - echo "$as_me:5891: \$? = $ac_status" >&5 - (exit $ac_status); } && - { ac_try='test -s conftest$ac_exeext' - { (eval echo "$as_me:5894: \"$ac_try\"") >&5 + echo "$as_me:7122: \$? = $ac_status" >&5 + (exit "$ac_status"); } && + { ac_try='test -s "conftest$ac_exeext"' + { (eval echo "$as_me:7125: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? - echo "$as_me:5897: \$? = $ac_status" >&5 - (exit $ac_status); }; }; then + echo "$as_me:7128: \$? = $ac_status" >&5 + (exit "$ac_status"); }; }; then cf_cv_utf8_lib=yes else echo "$as_me: failed program was:" >&5 -cat conftest.$ac_ext >&5 +cat "conftest.$ac_ext" >&5 # If the linkage is not already in the $CPPFLAGS/$LDFLAGS configuration, these # will be set on completion of the AC_TRY_LINK below. cf_cv_header_path_utf8= cf_cv_library_path_utf8= -echo "${as_me:-configure}:5909: testing Starting FIND_LINKAGE(utf8,) ..." 1>&5 +echo "${as_me:-configure}:7140: testing Starting FIND_LINKAGE(utf8,) ..." 1>&5 cf_save_LIBS="$LIBS" -cat >conftest.$ac_ext <<_ACEOF -#line 5914 "configure" +cat >"conftest.$ac_ext" <<_ACEOF +#line 7145 "configure" #include "confdefs.h" #include @@ -5923,18 +7154,18 @@ putwc(0,0); return 0; } _ACEOF -rm -f conftest.$ac_objext conftest$ac_exeext -if { (eval echo "$as_me:5927: \"$ac_link\"") >&5 +rm -f "conftest.$ac_objext" "conftest$ac_exeext" +if { (eval echo "$as_me:7158: \"$ac_link\"") >&5 (eval $ac_link) 2>&5 ac_status=$? - echo "$as_me:5930: \$? = $ac_status" >&5 - (exit $ac_status); } && - { ac_try='test -s conftest$ac_exeext' - { (eval echo "$as_me:5933: \"$ac_try\"") >&5 + echo "$as_me:7161: \$? = $ac_status" >&5 + (exit "$ac_status"); } && + { ac_try='test -s "conftest$ac_exeext"' + { (eval echo "$as_me:7164: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? - echo "$as_me:5936: \$? = $ac_status" >&5 - (exit $ac_status); }; }; then + echo "$as_me:7167: \$? = $ac_status" >&5 + (exit "$ac_status"); }; }; then cf_cv_find_linkage_utf8=yes cf_cv_header_path_utf8=/usr/include @@ -5942,12 +7173,12 @@ if { (eval echo "$as_me:5927: \"$ac_link\"") >&5 else echo "$as_me: failed program was:" >&5 -cat conftest.$ac_ext >&5 +cat "conftest.$ac_ext" >&5 LIBS="-lutf8 $cf_save_LIBS" -cat >conftest.$ac_ext <<_ACEOF -#line 5950 "configure" +cat >"conftest.$ac_ext" <<_ACEOF +#line 7181 "configure" #include "confdefs.h" #include @@ -5959,18 +7190,18 @@ putwc(0,0); return 0; } _ACEOF -rm -f conftest.$ac_objext conftest$ac_exeext -if { (eval echo "$as_me:5963: \"$ac_link\"") >&5 +rm -f "conftest.$ac_objext" "conftest$ac_exeext" +if { (eval echo "$as_me:7194: \"$ac_link\"") >&5 (eval $ac_link) 2>&5 ac_status=$? - echo "$as_me:5966: \$? = $ac_status" >&5 - (exit $ac_status); } && - { ac_try='test -s conftest$ac_exeext' - { (eval echo "$as_me:5969: \"$ac_try\"") >&5 + echo "$as_me:7197: \$? = $ac_status" >&5 + (exit "$ac_status"); } && + { ac_try='test -s "conftest$ac_exeext"' + { (eval echo "$as_me:7200: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? - echo "$as_me:5972: \$? = $ac_status" >&5 - (exit $ac_status); }; }; then + echo "$as_me:7203: \$? = $ac_status" >&5 + (exit "$ac_status"); }; }; then cf_cv_find_linkage_utf8=yes cf_cv_header_path_utf8=/usr/include @@ -5979,16 +7210,16 @@ if { (eval echo "$as_me:5963: \"$ac_link\"") >&5 else echo "$as_me: failed program was:" >&5 -cat conftest.$ac_ext >&5 +cat "conftest.$ac_ext" >&5 cf_cv_find_linkage_utf8=no LIBS="$cf_save_LIBS" test -n "$verbose" && echo " find linkage for utf8 library" 1>&6 -echo "${as_me:-configure}:5989: testing find linkage for utf8 library ..." 1>&5 +echo "${as_me:-configure}:7220: testing find linkage for utf8 library ..." 1>&5 -echo "${as_me:-configure}:5991: testing Searching for headers in FIND_LINKAGE(utf8,) ..." 1>&5 +echo "${as_me:-configure}:7222: testing Searching for headers in FIND_LINKAGE(utf8,) ..." 1>&5 cf_save_CPPFLAGS="$CPPFLAGS" cf_test_CPPFLAGS="$CPPFLAGS" @@ -6000,7 +7231,7 @@ cf_header_path_list="" if test -n "${CFLAGS}${CPPFLAGS}" ; then for cf_header_path in $CPPFLAGS $CFLAGS do - case $cf_header_path in + case "$cf_header_path" in (-I*) cf_header_path=`echo ".$cf_header_path" |sed -e 's/^...//' -e 's,/include$,,'` @@ -6008,11 +7239,11 @@ test "x$cf_header_path" != "xNONE" && \ test -d "$cf_header_path" && \ { test -n "$verbose" && echo " ... testing for include-directories under $cf_header_path" - test -d $cf_header_path/include && cf_search="$cf_search $cf_header_path/include" - test -d $cf_header_path/include/utf8 && cf_search="$cf_search $cf_header_path/include/utf8" - test -d $cf_header_path/include/utf8/include && cf_search="$cf_search $cf_header_path/include/utf8/include" - test -d $cf_header_path/utf8/include && cf_search="$cf_search $cf_header_path/utf8/include" - test -d $cf_header_path/utf8/include/utf8 && cf_search="$cf_search $cf_header_path/utf8/include/utf8" + test -d "$cf_header_path/include" && cf_search="$cf_search $cf_header_path/include" + test -d "$cf_header_path/include/utf8" && cf_search="$cf_search $cf_header_path/include/utf8" + test -d "$cf_header_path/include/utf8/include" && cf_search="$cf_search $cf_header_path/include/utf8/include" + test -d "$cf_header_path/utf8/include" && cf_search="$cf_search $cf_header_path/utf8/include" + test -d "$cf_header_path/utf8/include/utf8" && cf_search="$cf_search $cf_header_path/utf8/include/utf8" } cf_header_path_list="$cf_header_path_list $cf_search" @@ -6029,11 +7260,11 @@ test "x$prefix" != "xNONE" && \ test -d "$prefix" && \ { test -n "$verbose" && echo " ... testing for include-directories under $prefix" - test -d $prefix/include && cf_search="$cf_search $prefix/include" - test -d $prefix/include/utf8 && cf_search="$cf_search $prefix/include/utf8" - test -d $prefix/include/utf8/include && cf_search="$cf_search $prefix/include/utf8/include" - test -d $prefix/utf8/include && cf_search="$cf_search $prefix/utf8/include" - test -d $prefix/utf8/include/utf8 && cf_search="$cf_search $prefix/utf8/include/utf8" + test -d "$prefix/include" && cf_search="$cf_search $prefix/include" + test -d "$prefix/include/utf8" && cf_search="$cf_search $prefix/include/utf8" + test -d "$prefix/include/utf8/include" && cf_search="$cf_search $prefix/include/utf8/include" + test -d "$prefix/utf8/include" && cf_search="$cf_search $prefix/utf8/include" + test -d "$prefix/utf8/include/utf8" && cf_search="$cf_search $prefix/utf8/include/utf8" } for cf_subdir_prefix in \ @@ -6047,13 +7278,13 @@ do test "x$cf_subdir_prefix" != "x$prefix" && \ test -d "$cf_subdir_prefix" && \ -(test -z "$prefix" || test x$prefix = xNONE || test "x$cf_subdir_prefix" != "x$prefix") && { +{ test -z "$prefix" || test "x$prefix" = xNONE || test "x$cf_subdir_prefix" != "x$prefix"; } && { test -n "$verbose" && echo " ... testing for include-directories under $cf_subdir_prefix" - test -d $cf_subdir_prefix/include && cf_search="$cf_search $cf_subdir_prefix/include" - test -d $cf_subdir_prefix/include/utf8 && cf_search="$cf_search $cf_subdir_prefix/include/utf8" - test -d $cf_subdir_prefix/include/utf8/include && cf_search="$cf_search $cf_subdir_prefix/include/utf8/include" - test -d $cf_subdir_prefix/utf8/include && cf_search="$cf_search $cf_subdir_prefix/utf8/include" - test -d $cf_subdir_prefix/utf8/include/utf8 && cf_search="$cf_search $cf_subdir_prefix/utf8/include/utf8" + test -d "$cf_subdir_prefix/include" && cf_search="$cf_search $cf_subdir_prefix/include" + test -d "$cf_subdir_prefix/include/utf8" && cf_search="$cf_search $cf_subdir_prefix/include/utf8" + test -d "$cf_subdir_prefix/include/utf8/include" && cf_search="$cf_search $cf_subdir_prefix/include/utf8/include" + test -d "$cf_subdir_prefix/utf8/include" && cf_search="$cf_search $cf_subdir_prefix/utf8/include" + test -d "$cf_subdir_prefix/utf8/include/utf8" && cf_search="$cf_search $cf_subdir_prefix/utf8/include/utf8" } done @@ -6061,33 +7292,33 @@ done test "$includedir" != NONE && \ test "$includedir" != "/usr/include" && \ test -d "$includedir" && { - test -d $includedir && cf_search="$cf_search $includedir" - test -d $includedir/utf8 && cf_search="$cf_search $includedir/utf8" + test -d "$includedir" && cf_search="$cf_search $includedir" + test -d "$includedir/utf8" && cf_search="$cf_search $includedir/utf8" } test "$oldincludedir" != NONE && \ test "$oldincludedir" != "/usr/include" && \ test -d "$oldincludedir" && { - test -d $oldincludedir && cf_search="$cf_search $oldincludedir" - test -d $oldincludedir/utf8 && cf_search="$cf_search $oldincludedir/utf8" + test -d "$oldincludedir" && cf_search="$cf_search $oldincludedir" + test -d "$oldincludedir/utf8" && cf_search="$cf_search $oldincludedir/utf8" } cf_search="$cf_search $cf_header_path_list" for cf_cv_header_path_utf8 in $cf_search do - if test -d $cf_cv_header_path_utf8 ; then + 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}:6082: testing ... testing $cf_cv_header_path_utf8 ..." 1>&5 +echo "${as_me:-configure}:7313: testing ... testing $cf_cv_header_path_utf8 ..." 1>&5 CPPFLAGS="$cf_save_CPPFLAGS" test -n "$CPPFLAGS" && CPPFLAGS="$CPPFLAGS " CPPFLAGS="${CPPFLAGS}-I$cf_cv_header_path_utf8" - cat >conftest.$ac_ext <<_ACEOF -#line 6090 "configure" + cat >"conftest.$ac_ext" <<_ACEOF +#line 7321 "configure" #include "confdefs.h" #include @@ -6099,40 +7330,40 @@ putwc(0,0); return 0; } _ACEOF -rm -f conftest.$ac_objext -if { (eval echo "$as_me:6103: \"$ac_compile\"") >&5 +rm -f "conftest.$ac_objext" +if { (eval echo "$as_me:7334: \"$ac_compile\"") >&5 (eval $ac_compile) 2>&5 ac_status=$? - echo "$as_me:6106: \$? = $ac_status" >&5 - (exit $ac_status); } && - { ac_try='test -s conftest.$ac_objext' - { (eval echo "$as_me:6109: \"$ac_try\"") >&5 + echo "$as_me:7337: \$? = $ac_status" >&5 + (exit "$ac_status"); } && + { ac_try='test -s "conftest.$ac_objext"' + { (eval echo "$as_me:7340: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? - echo "$as_me:6112: \$? = $ac_status" >&5 - (exit $ac_status); }; }; then + echo "$as_me:7343: \$? = $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}:6117: testing ... found utf8 headers in $cf_cv_header_path_utf8 ..." 1>&5 +echo "${as_me:-configure}:7348: testing ... found utf8 headers in $cf_cv_header_path_utf8 ..." 1>&5 cf_cv_find_linkage_utf8=maybe cf_test_CPPFLAGS="$CPPFLAGS" break else echo "$as_me: failed program was:" >&5 -cat conftest.$ac_ext >&5 +cat "conftest.$ac_ext" >&5 CPPFLAGS="$cf_save_CPPFLAGS" fi -rm -f conftest.$ac_objext conftest.$ac_ext +rm -f "conftest.$ac_objext" "conftest.$ac_ext" fi done if test "$cf_cv_find_linkage_utf8" = maybe ; then -echo "${as_me:-configure}:6135: testing Searching for utf8 library in FIND_LINKAGE(utf8,) ..." 1>&5 +echo "${as_me:-configure}:7366: testing Searching for utf8 library in FIND_LINKAGE(utf8,) ..." 1>&5 cf_save_LIBS="$LIBS" cf_save_LDFLAGS="$LDFLAGS" @@ -6144,7 +7375,7 @@ cf_library_path_list="" if test -n "${LDFLAGS}${LIBS}" ; then for cf_library_path in $LDFLAGS $LIBS do - case $cf_library_path in + case "$cf_library_path" in (-L*) cf_library_path=`echo ".$cf_library_path" |sed -e 's/^...//' -e 's,/lib$,,'` @@ -6152,11 +7383,11 @@ test "x$cf_library_path" != "xNONE" && \ test -d "$cf_library_path" && \ { test -n "$verbose" && echo " ... testing for lib-directories under $cf_library_path" - test -d $cf_library_path/lib && cf_search="$cf_search $cf_library_path/lib" - test -d $cf_library_path/lib/utf8 && cf_search="$cf_search $cf_library_path/lib/utf8" - test -d $cf_library_path/lib/utf8/lib && cf_search="$cf_search $cf_library_path/lib/utf8/lib" - test -d $cf_library_path/utf8/lib && cf_search="$cf_search $cf_library_path/utf8/lib" - test -d $cf_library_path/utf8/lib/utf8 && cf_search="$cf_search $cf_library_path/utf8/lib/utf8" + test -d "$cf_library_path/lib" && cf_search="$cf_search $cf_library_path/lib" + test -d "$cf_library_path/lib/utf8" && cf_search="$cf_search $cf_library_path/lib/utf8" + test -d "$cf_library_path/lib/utf8/lib" && cf_search="$cf_search $cf_library_path/lib/utf8/lib" + test -d "$cf_library_path/utf8/lib" && cf_search="$cf_search $cf_library_path/utf8/lib" + test -d "$cf_library_path/utf8/lib/utf8" && cf_search="$cf_search $cf_library_path/utf8/lib/utf8" } cf_library_path_list="$cf_library_path_list $cf_search" @@ -6171,11 +7402,11 @@ test "x$prefix" != "xNONE" && \ test -d "$prefix" && \ { test -n "$verbose" && echo " ... testing for lib-directories under $prefix" - test -d $prefix/lib && cf_search="$cf_search $prefix/lib" - test -d $prefix/lib/utf8 && cf_search="$cf_search $prefix/lib/utf8" - test -d $prefix/lib/utf8/lib && cf_search="$cf_search $prefix/lib/utf8/lib" - test -d $prefix/utf8/lib && cf_search="$cf_search $prefix/utf8/lib" - test -d $prefix/utf8/lib/utf8 && cf_search="$cf_search $prefix/utf8/lib/utf8" + test -d "$prefix/lib" && cf_search="$cf_search $prefix/lib" + test -d "$prefix/lib/utf8" && cf_search="$cf_search $prefix/lib/utf8" + test -d "$prefix/lib/utf8/lib" && cf_search="$cf_search $prefix/lib/utf8/lib" + test -d "$prefix/utf8/lib" && cf_search="$cf_search $prefix/utf8/lib" + test -d "$prefix/utf8/lib/utf8" && cf_search="$cf_search $prefix/utf8/lib/utf8" } for cf_subdir_prefix in \ @@ -6189,13 +7420,13 @@ do test "x$cf_subdir_prefix" != "x$prefix" && \ test -d "$cf_subdir_prefix" && \ -(test -z "$prefix" || test x$prefix = xNONE || test "x$cf_subdir_prefix" != "x$prefix") && { +{ test -z "$prefix" || test "x$prefix" = xNONE || test "x$cf_subdir_prefix" != "x$prefix"; } && { test -n "$verbose" && echo " ... testing for lib-directories under $cf_subdir_prefix" - test -d $cf_subdir_prefix/lib && cf_search="$cf_search $cf_subdir_prefix/lib" - test -d $cf_subdir_prefix/lib/utf8 && cf_search="$cf_search $cf_subdir_prefix/lib/utf8" - test -d $cf_subdir_prefix/lib/utf8/lib && cf_search="$cf_search $cf_subdir_prefix/lib/utf8/lib" - test -d $cf_subdir_prefix/utf8/lib && cf_search="$cf_search $cf_subdir_prefix/utf8/lib" - test -d $cf_subdir_prefix/utf8/lib/utf8 && cf_search="$cf_search $cf_subdir_prefix/utf8/lib/utf8" + test -d "$cf_subdir_prefix/lib" && cf_search="$cf_search $cf_subdir_prefix/lib" + test -d "$cf_subdir_prefix/lib/utf8" && cf_search="$cf_search $cf_subdir_prefix/lib/utf8" + test -d "$cf_subdir_prefix/lib/utf8/lib" && cf_search="$cf_search $cf_subdir_prefix/lib/utf8/lib" + test -d "$cf_subdir_prefix/utf8/lib" && cf_search="$cf_search $cf_subdir_prefix/utf8/lib" + test -d "$cf_subdir_prefix/utf8/lib/utf8" && cf_search="$cf_search $cf_subdir_prefix/utf8/lib/utf8" } done @@ -6204,16 +7435,16 @@ cf_search="$cf_library_path_list $cf_search" for cf_cv_library_path_utf8 in $cf_search do - if test -d $cf_cv_library_path_utf8 ; then + 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}:6210: testing ... testing $cf_cv_library_path_utf8 ..." 1>&5 +echo "${as_me:-configure}:7441: 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 6216 "configure" + cat >"conftest.$ac_ext" <<_ACEOF +#line 7447 "configure" #include "confdefs.h" #include @@ -6225,36 +7456,36 @@ putwc(0,0); return 0; } _ACEOF -rm -f conftest.$ac_objext conftest$ac_exeext -if { (eval echo "$as_me:6229: \"$ac_link\"") >&5 +rm -f "conftest.$ac_objext" "conftest$ac_exeext" +if { (eval echo "$as_me:7460: \"$ac_link\"") >&5 (eval $ac_link) 2>&5 ac_status=$? - echo "$as_me:6232: \$? = $ac_status" >&5 - (exit $ac_status); } && - { ac_try='test -s conftest$ac_exeext' - { (eval echo "$as_me:6235: \"$ac_try\"") >&5 + echo "$as_me:7463: \$? = $ac_status" >&5 + (exit "$ac_status"); } && + { ac_try='test -s "conftest$ac_exeext"' + { (eval echo "$as_me:7466: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? - echo "$as_me:6238: \$? = $ac_status" >&5 - (exit $ac_status); }; }; then + echo "$as_me:7469: \$? = $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}:6243: testing ... found utf8 library in $cf_cv_library_path_utf8 ..." 1>&5 +echo "${as_me:-configure}:7474: testing ... found utf8 library in $cf_cv_library_path_utf8 ..." 1>&5 cf_cv_find_linkage_utf8=yes cf_cv_library_file_utf8="-lutf8" break else echo "$as_me: failed program was:" >&5 -cat conftest.$ac_ext >&5 +cat "conftest.$ac_ext" >&5 CPPFLAGS="$cf_save_CPPFLAGS" LIBS="$cf_save_LIBS" LDFLAGS="$cf_save_LDFLAGS" fi -rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext +rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext" fi done CPPFLAGS="$cf_save_CPPFLAGS" @@ -6266,10 +7497,10 @@ rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext fi fi -rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext +rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext" fi -rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext +rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext" LIBS="$cf_save_LIBS" @@ -6280,9 +7511,9 @@ cf_cv_utf8_lib=no fi fi -rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext +rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext" fi -echo "$as_me:6285: result: $cf_cv_utf8_lib" >&5 +echo "$as_me:7516: 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 @@ -6296,9 +7527,9 @@ EOF if test -n "$cf_cv_header_path_utf8" ; then for cf_add_incdir in $cf_cv_header_path_utf8 do - while test $cf_add_incdir != /usr/include + while test "$cf_add_incdir" != /usr/include do - if test -d $cf_add_incdir + if test -d "$cf_add_incdir" then cf_have_incdir=no if test -n "$CFLAGS$CPPFLAGS" ; then @@ -6319,8 +7550,8 @@ if test -n "$cf_cv_header_path_utf8" ; then test -n "$CPPFLAGS" && CPPFLAGS="$CPPFLAGS " CPPFLAGS="${CPPFLAGS}-I$cf_add_incdir" - cat >conftest.$ac_ext <<_ACEOF -#line 6323 "configure" + cat >"conftest.$ac_ext" <<_ACEOF +#line 7554 "configure" #include "confdefs.h" #include int @@ -6331,25 +7562,25 @@ printf("Hello") return 0; } _ACEOF -rm -f conftest.$ac_objext -if { (eval echo "$as_me:6335: \"$ac_compile\"") >&5 +rm -f "conftest.$ac_objext" +if { (eval echo "$as_me:7566: \"$ac_compile\"") >&5 (eval $ac_compile) 2>&5 ac_status=$? - echo "$as_me:6338: \$? = $ac_status" >&5 - (exit $ac_status); } && - { ac_try='test -s conftest.$ac_objext' - { (eval echo "$as_me:6341: \"$ac_try\"") >&5 + echo "$as_me:7569: \$? = $ac_status" >&5 + (exit "$ac_status"); } && + { ac_try='test -s "conftest.$ac_objext"' + { (eval echo "$as_me:7572: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? - echo "$as_me:6344: \$? = $ac_status" >&5 - (exit $ac_status); }; }; then + echo "$as_me:7575: \$? = $ac_status" >&5 + (exit "$ac_status"); }; }; then : else echo "$as_me: failed program was:" >&5 -cat conftest.$ac_ext >&5 +cat "conftest.$ac_ext" >&5 cf_have_incdir=yes fi -rm -f conftest.$ac_objext conftest.$ac_ext +rm -f "conftest.$ac_objext" "conftest.$ac_ext" CPPFLAGS=$cf_save_CPPFLAGS fi fi @@ -6358,11 +7589,11 @@ 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}:6361: testing adding $cf_add_incdir to include-path ..." 1>&5 +echo "${as_me:-configure}:7592: testing adding $cf_add_incdir to include-path ..." 1>&5 CPPFLAGS="$CPPFLAGS -I$cf_add_incdir" - cf_top_incdir=`echo $cf_add_incdir | sed -e 's%/include/.*$%/include%'` + cf_top_incdir=`echo "$cf_add_incdir" | sed -e 's%/include/.*$%/include%'` test "$cf_top_incdir" = "$cf_add_incdir" && break cf_add_incdir="$cf_top_incdir" else @@ -6378,9 +7609,9 @@ fi if test -n "$cf_cv_library_path_utf8" ; then for cf_add_libdir in $cf_cv_library_path_utf8 do - if test $cf_add_libdir = /usr/lib ; then + if test "$cf_add_libdir" = /usr/lib ; then : - elif test -d $cf_add_libdir + elif test -d "$cf_add_libdir" then cf_have_libdir=no if test -n "$LDFLAGS$LIBS" ; then @@ -6394,7 +7625,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}:6397: testing adding $cf_add_libdir to library-path ..." 1>&5 +echo "${as_me:-configure}:7628: testing adding $cf_add_libdir to library-path ..." 1>&5 LDFLAGS="-L$cf_add_libdir $LDFLAGS" fi @@ -6402,19 +7633,19 @@ echo "${as_me:-configure}:6397: testing adding $cf_add_libdir to library-path .. done fi -cf_add_libs="$cf_cv_library_file_utf8" -# Filter out duplicates - this happens with badly-designed ".pc" files... -for cf_add_1lib in $LIBS -do - for cf_add_2lib in $cf_add_libs - do - if test "x$cf_add_1lib" = "x$cf_add_2lib" - then +cf_add_libs="$LIBS" +# reverse order +cf_add_0lib= +for cf_add_1lib in $cf_cv_library_file_utf8; 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_libs $cf_add_1lib" + test -n "$cf_add_1lib" && cf_add_libs="$cf_add_1lib $cf_add_libs" done LIBS="$cf_add_libs" @@ -6424,39 +7655,50 @@ cf_ncuconfig_root=ncursesw cf_have_ncuconfig=no if test "x${PKG_CONFIG:=none}" != xnone; then - echo "$as_me:6427: checking pkg-config for $cf_ncuconfig_root" >&5 + echo "$as_me:7658: 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:6430: result: yes" >&5 + echo "$as_me:7661: result: yes" >&5 echo "${ECHO_T}yes" >&6 - echo "$as_me:6433: checking if the $cf_ncuconfig_root package files work" >&5 + echo "$as_me:7664: 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 + cf_save_CFLAGS="$CFLAGS" cf_save_CPPFLAGS="$CPPFLAGS" cf_save_LIBS="$LIBS" + cf_pkg_cflags="`$PKG_CONFIG --cflags $cf_ncuconfig_root`" + cf_pkg_libs="`$PKG_CONFIG --libs $cf_ncuconfig_root`" + + # while -W for passing linker flags is prevalent, it is not "standard". + # At least one wrapper for c89/c99 (in Apple's xcode) has its own + # incompatible _and_ non-standard -W option which gives an error. Work + # around that pitfall. + case "x${CC}@@${cf_pkg_libs}@${cf_pkg_cflags}" in + (x*c[89]9@@*-W*) + cf_fix_cppflags=no cf_new_cflags= cf_new_cppflags= cf_new_extra_cppflags= -for cf_add_cflags in `$PKG_CONFIG --cflags $cf_ncuconfig_root` +for cf_add_cflags in $cf_pkg_cflags do -case $cf_fix_cppflags in +case "$cf_fix_cppflags" in (no) - case $cf_add_cflags in + case "$cf_add_cflags" in (-undef|-nostdinc*|-I*|-D*|-U*|-E|-P|-C) - case $cf_add_cflags in + case "$cf_add_cflags" in (-D*) - cf_tst_cflags=`echo ${cf_add_cflags} |sed -e 's/^-D[^=]*='\''\"[^"]*//'` + cf_tst_cflags=`echo "${cf_add_cflags}" |sed -e 's/^-D[^=]*='\''\"[^"]*//'` test "x${cf_add_cflags}" != "x${cf_tst_cflags}" \ && test -z "${cf_tst_cflags}" \ && cf_fix_cppflags=yes - if test $cf_fix_cppflags = yes ; then + if test "$cf_fix_cppflags" = yes ; then test -n "$cf_new_extra_cppflags" && cf_new_extra_cppflags="$cf_new_extra_cppflags " cf_new_extra_cppflags="${cf_new_extra_cppflags}$cf_add_cflags" @@ -6475,7 +7717,7 @@ case $cf_fix_cppflags in (*$cf_add_cflags) ;; (*) - case $cf_add_cflags in + case "$cf_add_cflags" in (-D*) cf_tst_cppflags=`echo "x$cf_add_cflags" | sed -e 's/^...//' -e 's/=.*//'` @@ -6505,7 +7747,7 @@ CPPFLAGS=`echo "$CPPFLAGS" | \ test -n "$cf_new_extra_cppflags" && cf_new_extra_cppflags="$cf_new_extra_cppflags " cf_new_extra_cppflags="${cf_new_extra_cppflags}$cf_add_cflags" - cf_tst_cflags=`echo ${cf_add_cflags} |sed -e 's/^[^"]*"'\''//'` + cf_tst_cflags=`echo "${cf_add_cflags}" |sed -e 's/^[^"]*"'\''//'` test "x${cf_add_cflags}" != "x${cf_tst_cflags}" \ && test -z "${cf_tst_cflags}" \ @@ -6535,83 +7777,299 @@ if test -n "$cf_new_extra_cppflags" ; then fi -cf_add_libs="`$PKG_CONFIG --libs $cf_ncuconfig_root`" -# Filter out duplicates - this happens with badly-designed ".pc" files... -for cf_add_1lib in $LIBS +cf_add_libs="$LIBS" +# reverse order +cf_add_0lib= +for cf_add_1lib in $cf_pkg_libs; 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" + + cat >"conftest.$ac_ext" <<_ACEOF +#line 7797 "configure" +#include "confdefs.h" +#include <${cf_cv_ncurses_header:-curses.h}> +int +main (void) +{ +initscr(); mousemask(0,0); tigetstr((char *)0); + ; + return 0; +} +_ACEOF +rm -f "conftest.$ac_objext" "conftest$ac_exeext" +if { (eval echo "$as_me:7809: \"$ac_link\"") >&5 + (eval $ac_link) 2>&5 + ac_status=$? + echo "$as_me:7812: \$? = $ac_status" >&5 + (exit "$ac_status"); } && + { ac_try='test -s "conftest$ac_exeext"' + { (eval echo "$as_me:7815: \"$ac_try\"") >&5 + (eval $ac_try) 2>&5 + ac_status=$? + echo "$as_me:7818: \$? = $ac_status" >&5 + (exit "$ac_status"); }; }; then + if test "$cross_compiling" = yes; then + cf_test_ncuconfig=maybe +else + cat >"conftest.$ac_ext" <<_ACEOF +#line 7824 "configure" +#include "confdefs.h" +#include <${cf_cv_ncurses_header:-curses.h}> + int main(void) + { const char *xx = curses_version(); return (xx == 0); } +_ACEOF +rm -f "conftest$ac_exeext" +if { (eval echo "$as_me:7831: \"$ac_link\"") >&5 + (eval $ac_link) 2>&5 + ac_status=$? + echo "$as_me:7834: \$? = $ac_status" >&5 + (exit "$ac_status"); } && { ac_try='"./conftest$ac_exeext"' + { (eval echo "$as_me:7836: \"$ac_try\"") >&5 + (eval $ac_try) 2>&5 + ac_status=$? + echo "$as_me:7839: \$? = $ac_status" >&5 + (exit "$ac_status"); }; }; then + cf_test_ncuconfig=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_test_ncuconfig=no +fi +rm -f core ./core.* ./*.core "conftest$ac_exeext" "conftest.$ac_objext" "conftest.$ac_ext" +fi +else + echo "$as_me: failed program was:" >&5 +cat "conftest.$ac_ext" >&5 +cf_test_ncuconfig=no +fi +rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext" + + CFLAGS="$cf_save_CFLAGS" + CPPFLAGS="$cf_save_CPPFLAGS" + LIBS="$cf_save_LIBS" + + if test "x$cf_test_ncuconfig" != xyes; then + cf_temp=`echo "x$cf_pkg_cflags" | sed -e s/^x// -e 's/-W[^ ]*//g'` + cf_pkg_cflags="$cf_temp" + cf_temp=`echo "x$cf_pkg_libs" | sed -e s/^x// -e 's/-W[^ ]*//g'` + cf_pkg_libs="$cf_temp" + fi + ;; + esac + +for cf_add_cflags in $cf_pkg_cflags do - for cf_add_2lib in $cf_add_libs - do - if test "x$cf_add_1lib" = "x$cf_add_2lib" - then + 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_add_cflags +do +case "$cf_fix_cppflags" in +(no) + case "$cf_add_cflags" in + (-undef|-nostdinc*|-I*|-D*|-U*|-E|-P|-C) + case "$cf_add_cflags" in + (-D*) + cf_tst_cflags=`echo "${cf_add_cflags}" |sed -e 's/^-D[^=]*='\''\"[^"]*//'` + + test "x${cf_add_cflags}" != "x${cf_tst_cflags}" \ + && test -z "${cf_tst_cflags}" \ + && cf_fix_cppflags=yes + + if test "$cf_fix_cppflags" = yes ; then + + test -n "$cf_new_extra_cppflags" && cf_new_extra_cppflags="$cf_new_extra_cppflags " + cf_new_extra_cppflags="${cf_new_extra_cppflags}$cf_add_cflags" + + continue + elif test "${cf_tst_cflags}" = "\"'" ; then + + test -n "$cf_new_extra_cppflags" && cf_new_extra_cppflags="$cf_new_extra_cppflags " + cf_new_extra_cppflags="${cf_new_extra_cppflags}$cf_add_cflags" + + continue + fi + ;; + esac + case "$CPPFLAGS" in + (*$cf_add_cflags) + ;; + (*) + case "$cf_add_cflags" in + (-D*) + cf_tst_cppflags=`echo "x$cf_add_cflags" | sed -e 's/^...//' -e 's/=.*//'` + +CPPFLAGS=`echo "$CPPFLAGS" | \ + sed -e 's/-[UD]'"$cf_tst_cppflags"'\(=[^ ]*\)\?[ ]/ /g' \ + -e 's/-[UD]'"$cf_tst_cppflags"'\(=[^ ]*\)\?$//g'` + + ;; + esac + + test -n "$cf_new_cppflags" && cf_new_cppflags="$cf_new_cppflags " + cf_new_cppflags="${cf_new_cppflags}$cf_add_cflags" + + ;; + esac + ;; + (*) + + test -n "$cf_new_cflags" && cf_new_cflags="$cf_new_cflags " + cf_new_cflags="${cf_new_cflags}$cf_add_cflags" + + ;; + esac + ;; +(yes) + + test -n "$cf_new_extra_cppflags" && cf_new_extra_cppflags="$cf_new_extra_cppflags " + cf_new_extra_cppflags="${cf_new_extra_cppflags}$cf_add_cflags" + + cf_tst_cflags=`echo "${cf_add_cflags}" |sed -e 's/^[^"]*"'\''//'` + + test "x${cf_add_cflags}" != "x${cf_tst_cflags}" \ + && test -z "${cf_tst_cflags}" \ + && cf_fix_cppflags=no + ;; +esac +done + +if test -n "$cf_new_cflags" ; then + + test -n "$CFLAGS" && CFLAGS="$CFLAGS " + CFLAGS="${CFLAGS}$cf_new_cflags" + +fi + +if test -n "$cf_new_cppflags" ; then + + test -n "$CPPFLAGS" && CPPFLAGS="$CPPFLAGS " + CPPFLAGS="${CPPFLAGS}$cf_new_cppflags" + +fi + +if test -n "$cf_new_extra_cppflags" ; then + + test -n "$EXTRA_CPPFLAGS" && EXTRA_CPPFLAGS="$EXTRA_CPPFLAGS " + EXTRA_CPPFLAGS="${EXTRA_CPPFLAGS}$cf_new_extra_cppflags" + +fi + +done + +cf_add_libs="$LIBS" +# reverse order +cf_add_0lib= +for cf_add_1lib in $cf_pkg_libs; 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_libs $cf_add_1lib" + test -n "$cf_add_1lib" && cf_add_libs="$cf_add_1lib $cf_add_libs" done LIBS="$cf_add_libs" - cat >conftest.$ac_ext <<_ACEOF -#line 6555 "configure" + cat >"conftest.$ac_ext" <<_ACEOF +#line 8013 "configure" #include "confdefs.h" #include <${cf_cv_ncurses_header:-curses.h}> int main (void) { -initscr(); mousemask(0,0); tgoto((char *)0, 0, 0); +initscr(); mousemask(0,0); tigetstr((char *)0); ; return 0; } _ACEOF -rm -f conftest.$ac_objext conftest$ac_exeext -if { (eval echo "$as_me:6567: \"$ac_link\"") >&5 +rm -f "conftest.$ac_objext" "conftest$ac_exeext" +if { (eval echo "$as_me:8025: \"$ac_link\"") >&5 (eval $ac_link) 2>&5 ac_status=$? - echo "$as_me:6570: \$? = $ac_status" >&5 - (exit $ac_status); } && - { ac_try='test -s conftest$ac_exeext' - { (eval echo "$as_me:6573: \"$ac_try\"") >&5 + echo "$as_me:8028: \$? = $ac_status" >&5 + (exit "$ac_status"); } && + { ac_try='test -s "conftest$ac_exeext"' + { (eval echo "$as_me:8031: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? - echo "$as_me:6576: \$? = $ac_status" >&5 - (exit $ac_status); }; }; then + echo "$as_me:8034: \$? = $ac_status" >&5 + (exit "$ac_status"); }; }; then if test "$cross_compiling" = yes; then cf_have_ncuconfig=maybe else - cat >conftest.$ac_ext <<_ACEOF -#line 6582 "configure" + cat >"conftest.$ac_ext" <<_ACEOF +#line 8040 "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:6589: \"$ac_link\"") >&5 +rm -f "conftest$ac_exeext" +if { (eval echo "$as_me:8047: \"$ac_link\"") >&5 (eval $ac_link) 2>&5 ac_status=$? - echo "$as_me:6592: \$? = $ac_status" >&5 - (exit $ac_status); } && { ac_try='./conftest$ac_exeext' - { (eval echo "$as_me:6594: \"$ac_try\"") >&5 + echo "$as_me:8050: \$? = $ac_status" >&5 + (exit "$ac_status"); } && { ac_try='"./conftest$ac_exeext"' + { (eval echo "$as_me:8052: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? - echo "$as_me:6597: \$? = $ac_status" >&5 - (exit $ac_status); }; }; then + echo "$as_me:8055: \$? = $ac_status" >&5 + (exit "$ac_status"); }; }; then cf_have_ncuconfig=yes else echo "$as_me: program exited with status $ac_status" >&5 echo "$as_me: failed program was:" >&5 -cat conftest.$ac_ext >&5 +cat "conftest.$ac_ext" >&5 cf_have_ncuconfig=no fi -rm -f core core.* *.core conftest$ac_exeext conftest.$ac_objext conftest.$ac_ext +rm -f core ./core.* ./*.core "conftest$ac_exeext" "conftest.$ac_objext" "conftest.$ac_ext" fi else echo "$as_me: failed program was:" >&5 -cat conftest.$ac_ext >&5 +cat "conftest.$ac_ext" >&5 cf_have_ncuconfig=no fi -rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext - echo "$as_me:6614: result: $cf_have_ncuconfig" >&5 +rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext" + echo "$as_me:8072: 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" @@ -6627,13 +8085,13 @@ EOF NCURSES_CONFIG_PKG=$cf_ncuconfig_root -echo "$as_me:6630: checking for terminfo header" >&5 +echo "$as_me:8088: 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 else -case ${cf_cv_ncurses_header} in +case "${cf_cv_ncurses_header}" in (*/ncurses.h|*/ncursesw.h) cf_term_header=`echo "$cf_cv_ncurses_header" | sed -e 's%ncurses[^.]*\.h$%term.h%'` ;; @@ -6644,8 +8102,8 @@ esac for cf_test in $cf_term_header "ncurses/term.h" "ncursesw/term.h" do -cat >conftest.$ac_ext <<_ACEOF -#line 6648 "configure" +cat >"conftest.$ac_ext" <<_ACEOF +#line 8106 "configure" #include "confdefs.h" #include #include <${cf_cv_ncurses_header:-curses.h}> @@ -6654,43 +8112,43 @@ cat >conftest.$ac_ext <<_ACEOF int main (void) { -int x = auto_left_margin +int x = auto_left_margin; (void)x ; return 0; } _ACEOF -rm -f conftest.$ac_objext -if { (eval echo "$as_me:6663: \"$ac_compile\"") >&5 +rm -f "conftest.$ac_objext" +if { (eval echo "$as_me:8121: \"$ac_compile\"") >&5 (eval $ac_compile) 2>&5 ac_status=$? - echo "$as_me:6666: \$? = $ac_status" >&5 - (exit $ac_status); } && - { ac_try='test -s conftest.$ac_objext' - { (eval echo "$as_me:6669: \"$ac_try\"") >&5 + echo "$as_me:8124: \$? = $ac_status" >&5 + (exit "$ac_status"); } && + { ac_try='test -s "conftest.$ac_objext"' + { (eval echo "$as_me:8127: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? - echo "$as_me:6672: \$? = $ac_status" >&5 - (exit $ac_status); }; }; then + echo "$as_me:8130: \$? = $ac_status" >&5 + (exit "$ac_status"); }; }; then cf_cv_term_header="$cf_test" else echo "$as_me: failed program was:" >&5 -cat conftest.$ac_ext >&5 +cat "conftest.$ac_ext" >&5 cf_cv_term_header=unknown fi -rm -f conftest.$ac_objext conftest.$ac_ext +rm -f "conftest.$ac_objext" "conftest.$ac_ext" test "$cf_cv_term_header" != unknown && break done fi -echo "$as_me:6688: result: $cf_cv_term_header" >&5 +echo "$as_me:8146: result: $cf_cv_term_header" >&5 echo "${ECHO_T}$cf_cv_term_header" >&6 # Set definitions to allow ifdef'ing to accommodate subdirectories -case $cf_cv_term_header in +case "$cf_cv_term_header" in (*term.h) cat >>confdefs.h <<\EOF @@ -6700,7 +8158,7 @@ EOF ;; esac -case $cf_cv_term_header in +case "$cf_cv_term_header" in (ncurses/term.h) cat >>confdefs.h <<\EOF @@ -6720,7 +8178,7 @@ esac fi else - echo "$as_me:6723: result: no" >&5 + echo "$as_me:8181: result: no" >&5 echo "${ECHO_T}no" >&6 NCURSES_CONFIG_PKG=none fi @@ -6736,7 +8194,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:6739: checking for $ac_word" >&5 +echo "$as_me:8197: 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 @@ -6751,7 +8209,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:6754: found $ac_dir/$ac_word" >&5 +echo "$as_me:8212: found $ac_dir/$ac_word" >&5 break done @@ -6759,10 +8217,10 @@ fi fi NCURSES_CONFIG=$ac_cv_prog_NCURSES_CONFIG if test -n "$NCURSES_CONFIG"; then - echo "$as_me:6762: result: $NCURSES_CONFIG" >&5 + echo "$as_me:8220: result: $NCURSES_CONFIG" >&5 echo "${ECHO_T}$NCURSES_CONFIG" >&6 else - echo "$as_me:6765: result: no" >&5 + echo "$as_me:8223: result: no" >&5 echo "${ECHO_T}no" >&6 fi @@ -6775,7 +8233,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:6778: checking for $ac_word" >&5 +echo "$as_me:8236: 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 @@ -6790,7 +8248,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:6793: found $ac_dir/$ac_word" >&5 +echo "$as_me:8251: found $ac_dir/$ac_word" >&5 break done @@ -6798,10 +8256,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:6801: result: $ac_ct_NCURSES_CONFIG" >&5 + echo "$as_me:8259: result: $ac_ct_NCURSES_CONFIG" >&5 echo "${ECHO_T}$ac_ct_NCURSES_CONFIG" >&6 else - echo "$as_me:6804: result: no" >&5 + echo "$as_me:8262: result: no" >&5 echo "${ECHO_T}no" >&6 fi @@ -6814,26 +8272,52 @@ 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 +case "$cf_fix_cppflags" in (no) - case $cf_add_cflags in + case "$cf_add_cflags" in (-undef|-nostdinc*|-I*|-D*|-U*|-E|-P|-C) - case $cf_add_cflags in + case "$cf_add_cflags" in (-D*) - cf_tst_cflags=`echo ${cf_add_cflags} |sed -e 's/^-D[^=]*='\''\"[^"]*//'` + cf_tst_cflags=`echo "${cf_add_cflags}" |sed -e 's/^-D[^=]*='\''\"[^"]*//'` test "x${cf_add_cflags}" != "x${cf_tst_cflags}" \ && test -z "${cf_tst_cflags}" \ && cf_fix_cppflags=yes - if test $cf_fix_cppflags = yes ; then + if test "$cf_fix_cppflags" = yes ; then test -n "$cf_new_extra_cppflags" && cf_new_extra_cppflags="$cf_new_extra_cppflags " cf_new_extra_cppflags="${cf_new_extra_cppflags}$cf_add_cflags" @@ -6852,7 +8336,7 @@ case $cf_fix_cppflags in (*$cf_add_cflags) ;; (*) - case $cf_add_cflags in + case "$cf_add_cflags" in (-D*) cf_tst_cppflags=`echo "x$cf_add_cflags" | sed -e 's/^...//' -e 's/=.*//'` @@ -6882,7 +8366,7 @@ CPPFLAGS=`echo "$CPPFLAGS" | \ test -n "$cf_new_extra_cppflags" && cf_new_extra_cppflags="$cf_new_extra_cppflags " cf_new_extra_cppflags="${cf_new_extra_cppflags}$cf_add_cflags" - cf_tst_cflags=`echo ${cf_add_cflags} |sed -e 's/^[^"]*"'\''//'` + cf_tst_cflags=`echo "${cf_add_cflags}" |sed -e 's/^[^"]*"'\''//'` test "x${cf_add_cflags}" != "x${cf_tst_cflags}" \ && test -z "${cf_tst_cflags}" \ @@ -6912,25 +8396,27 @@ if test -n "$cf_new_extra_cppflags" ; then fi -cf_add_libs="`$NCURSES_CONFIG --libs`" -# Filter out duplicates - this happens with badly-designed ".pc" files... -for cf_add_1lib in $LIBS -do - for cf_add_2lib in $cf_add_libs - do - if test "x$cf_add_1lib" = "x$cf_add_2lib" - then +done + +cf_add_libs="$LIBS" +# reverse order +cf_add_0lib= +for cf_add_1lib in `$NCURSES_CONFIG --libs`; 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_libs $cf_add_1lib" + test -n "$cf_add_1lib" && cf_add_libs="$cf_add_1lib $cf_add_libs" done LIBS="$cf_add_libs" # even with config script, some packages use no-override for curses.h -echo "$as_me:6933: checking if we have identified curses headers" >&5 +echo "$as_me:8419: 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 @@ -6941,44 +8427,44 @@ for cf_header in \ ncurses.h ncursesw/ncurses.h \ curses.h ncursesw/curses.h do -cat >conftest.$ac_ext <<_ACEOF -#line 6945 "configure" +cat >"conftest.$ac_ext" <<_ACEOF +#line 8431 "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:6957: \"$ac_compile\"") >&5 +rm -f "conftest.$ac_objext" +if { (eval echo "$as_me:8443: \"$ac_compile\"") >&5 (eval $ac_compile) 2>&5 ac_status=$? - echo "$as_me:6960: \$? = $ac_status" >&5 - (exit $ac_status); } && - { ac_try='test -s conftest.$ac_objext' - { (eval echo "$as_me:6963: \"$ac_try\"") >&5 + echo "$as_me:8446: \$? = $ac_status" >&5 + (exit "$ac_status"); } && + { ac_try='test -s "conftest.$ac_objext"' + { (eval echo "$as_me:8449: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? - echo "$as_me:6966: \$? = $ac_status" >&5 - (exit $ac_status); }; }; then + echo "$as_me:8452: \$? = $ac_status" >&5 + (exit "$ac_status"); }; }; then cf_cv_ncurses_header=$cf_header; break else echo "$as_me: failed program was:" >&5 -cat conftest.$ac_ext >&5 +cat "conftest.$ac_ext" >&5 fi -rm -f conftest.$ac_objext conftest.$ac_ext +rm -f "conftest.$ac_objext" "conftest.$ac_ext" done fi -echo "$as_me:6977: result: $cf_cv_ncurses_header" >&5 +echo "$as_me:8463: 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:6981: error: No curses header-files found" >&5 + { { echo "$as_me:8467: error: No curses header-files found" >&5 echo "$as_me: error: No curses header-files found" >&2;} { (exit 1); exit 1; }; } fi @@ -6988,24 +8474,24 @@ 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:6991: checking for $ac_header" >&5 +echo "$as_me:8477: 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 6997 "configure" + cat >"conftest.$ac_ext" <<_ACEOF +#line 8483 "configure" #include "confdefs.h" #include <$ac_header> _ACEOF -if { (eval echo "$as_me:7001: \"$ac_cpp conftest.$ac_ext\"") >&5 - (eval $ac_cpp conftest.$ac_ext) 2>conftest.er1 +if { (eval echo "$as_me:8487: \"$ac_cpp "conftest.$ac_ext"\"") >&5 + (eval $ac_cpp "conftest.$ac_ext") 2>conftest.er1 ac_status=$? - egrep -v '^ *\+' conftest.er1 >conftest.err + $EGREP -v '^ *\+' conftest.er1 >conftest.err rm -f conftest.er1 cat conftest.err >&5 - echo "$as_me:7007: \$? = $ac_status" >&5 - (exit $ac_status); } >/dev/null; then + echo "$as_me:8493: \$? = $ac_status" >&5 + (exit "$ac_status"); } >/dev/null; then if test -s conftest.err; then ac_cpp_err=$ac_c_preproc_warn_flag else @@ -7018,14 +8504,14 @@ 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 + cat "conftest.$ac_ext" >&5 eval "$as_ac_Header=no" fi -rm -f conftest.err conftest.$ac_ext +rm -f conftest.err "conftest.$ac_ext" fi -echo "$as_me:7026: 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 +echo "$as_me:8512: 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 <conftest.$ac_ext <<_ACEOF -#line 7082 "configure" + cat >"conftest.$ac_ext" <<_ACEOF +#line 8568 "configure" #include "confdefs.h" #include int @@ -7090,25 +8576,25 @@ printf("Hello") return 0; } _ACEOF -rm -f conftest.$ac_objext -if { (eval echo "$as_me:7094: \"$ac_compile\"") >&5 +rm -f "conftest.$ac_objext" +if { (eval echo "$as_me:8580: \"$ac_compile\"") >&5 (eval $ac_compile) 2>&5 ac_status=$? - echo "$as_me:7097: \$? = $ac_status" >&5 - (exit $ac_status); } && - { ac_try='test -s conftest.$ac_objext' - { (eval echo "$as_me:7100: \"$ac_try\"") >&5 + echo "$as_me:8583: \$? = $ac_status" >&5 + (exit "$ac_status"); } && + { ac_try='test -s "conftest.$ac_objext"' + { (eval echo "$as_me:8586: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? - echo "$as_me:7103: \$? = $ac_status" >&5 - (exit $ac_status); }; }; then + echo "$as_me:8589: \$? = $ac_status" >&5 + (exit "$ac_status"); }; }; then : else echo "$as_me: failed program was:" >&5 -cat conftest.$ac_ext >&5 +cat "conftest.$ac_ext" >&5 cf_have_incdir=yes fi -rm -f conftest.$ac_objext conftest.$ac_ext +rm -f "conftest.$ac_objext" "conftest.$ac_ext" CPPFLAGS=$cf_save_CPPFLAGS fi fi @@ -7117,11 +8603,11 @@ 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}:7120: testing adding $cf_add_incdir to include-path ..." 1>&5 +echo "${as_me:-configure}:8606: testing adding $cf_add_incdir to include-path ..." 1>&5 CPPFLAGS="$CPPFLAGS -I$cf_add_incdir" - cf_top_incdir=`echo $cf_add_incdir | sed -e 's%/include/.*$%/include%'` + cf_top_incdir=`echo "$cf_add_incdir" | sed -e 's%/include/.*$%/include%'` test "$cf_top_incdir" = "$cf_add_incdir" && break cf_add_incdir="$cf_top_incdir" else @@ -7136,19 +8622,19 @@ fi } -echo "$as_me:7139: checking for $cf_ncuhdr_root header in include-path" >&5 +echo "$as_me:8625: 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 else cf_header_list="$cf_ncuhdr_root/curses.h $cf_ncuhdr_root/ncurses.h" - ( test "$cf_ncuhdr_root" = ncurses || test "$cf_ncuhdr_root" = ncursesw ) && cf_header_list="$cf_header_list curses.h ncurses.h" + { test "$cf_ncuhdr_root" = ncurses || test "$cf_ncuhdr_root" = ncursesw; } && cf_header_list="$cf_header_list curses.h ncurses.h" for cf_header in $cf_header_list do - cat >conftest.$ac_ext <<_ACEOF -#line 7151 "configure" + cat >"conftest.$ac_ext" <<_ACEOF +#line 8637 "configure" #include "confdefs.h" #define _XOPEN_SOURCE_EXTENDED @@ -7163,15 +8649,15 @@ main (void) #ifdef NCURSES_VERSION #ifndef WACS_BSSB - make an error + #error WACS_BSSB is not defined #endif -printf("%s\n", NCURSES_VERSION); +printf("%s\\n", NCURSES_VERSION); #else #ifdef __NCURSES_H -printf("old\n"); +printf("old\\n"); #else - make an error + #error __NCURSES_H is not defined #endif #endif @@ -7179,39 +8665,39 @@ printf("old\n"); return 0; } _ACEOF -rm -f conftest.$ac_objext -if { (eval echo "$as_me:7183: \"$ac_compile\"") >&5 +rm -f "conftest.$ac_objext" +if { (eval echo "$as_me:8669: \"$ac_compile\"") >&5 (eval $ac_compile) 2>&5 ac_status=$? - echo "$as_me:7186: \$? = $ac_status" >&5 - (exit $ac_status); } && - { ac_try='test -s conftest.$ac_objext' - { (eval echo "$as_me:7189: \"$ac_try\"") >&5 + echo "$as_me:8672: \$? = $ac_status" >&5 + (exit "$ac_status"); } && + { ac_try='test -s "conftest.$ac_objext"' + { (eval echo "$as_me:8675: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? - echo "$as_me:7192: \$? = $ac_status" >&5 - (exit $ac_status); }; }; then + echo "$as_me:8678: \$? = $ac_status" >&5 + (exit "$ac_status"); }; }; then cf_cv_ncurses_h=$cf_header else echo "$as_me: failed program was:" >&5 -cat conftest.$ac_ext >&5 +cat "conftest.$ac_ext" >&5 cf_cv_ncurses_h=no fi -rm -f conftest.$ac_objext conftest.$ac_ext +rm -f "conftest.$ac_objext" "conftest.$ac_ext" test "$cf_cv_ncurses_h" != no && break done fi -echo "$as_me:7207: result: $cf_cv_ncurses_h" >&5 +echo "$as_me:8693: 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:7214: checking for $cf_ncuhdr_root include-path" >&5 +echo "$as_me:8700: 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 @@ -7226,7 +8712,7 @@ cf_header_path_list="" if test -n "${CFLAGS}${CPPFLAGS}" ; then for cf_header_path in $CPPFLAGS $CFLAGS do - case $cf_header_path in + case "$cf_header_path" in (-I*) cf_header_path=`echo ".$cf_header_path" |sed -e 's/^...//' -e 's,/include$,,'` @@ -7234,11 +8720,11 @@ test "x$cf_header_path" != "xNONE" && \ test -d "$cf_header_path" && \ { test -n "$verbose" && echo " ... testing for include-directories under $cf_header_path" - test -d $cf_header_path/include && cf_search="$cf_search $cf_header_path/include" - test -d $cf_header_path/include/$cf_ncuhdr_root && cf_search="$cf_search $cf_header_path/include/$cf_ncuhdr_root" - test -d $cf_header_path/include/$cf_ncuhdr_root/include && cf_search="$cf_search $cf_header_path/include/$cf_ncuhdr_root/include" - test -d $cf_header_path/$cf_ncuhdr_root/include && cf_search="$cf_search $cf_header_path/$cf_ncuhdr_root/include" - test -d $cf_header_path/$cf_ncuhdr_root/include/$cf_ncuhdr_root && cf_search="$cf_search $cf_header_path/$cf_ncuhdr_root/include/$cf_ncuhdr_root" + test -d "$cf_header_path/include" && cf_search="$cf_search $cf_header_path/include" + test -d "$cf_header_path/include/$cf_ncuhdr_root" && cf_search="$cf_search $cf_header_path/include/$cf_ncuhdr_root" + test -d "$cf_header_path/include/$cf_ncuhdr_root/include" && cf_search="$cf_search $cf_header_path/include/$cf_ncuhdr_root/include" + test -d "$cf_header_path/$cf_ncuhdr_root/include" && cf_search="$cf_search $cf_header_path/$cf_ncuhdr_root/include" + test -d "$cf_header_path/$cf_ncuhdr_root/include/$cf_ncuhdr_root" && cf_search="$cf_search $cf_header_path/$cf_ncuhdr_root/include/$cf_ncuhdr_root" } cf_header_path_list="$cf_header_path_list $cf_search" @@ -7255,11 +8741,11 @@ test "x$prefix" != "xNONE" && \ test -d "$prefix" && \ { test -n "$verbose" && echo " ... testing for include-directories under $prefix" - test -d $prefix/include && cf_search="$cf_search $prefix/include" - test -d $prefix/include/$cf_ncuhdr_root && cf_search="$cf_search $prefix/include/$cf_ncuhdr_root" - test -d $prefix/include/$cf_ncuhdr_root/include && cf_search="$cf_search $prefix/include/$cf_ncuhdr_root/include" - test -d $prefix/$cf_ncuhdr_root/include && cf_search="$cf_search $prefix/$cf_ncuhdr_root/include" - test -d $prefix/$cf_ncuhdr_root/include/$cf_ncuhdr_root && cf_search="$cf_search $prefix/$cf_ncuhdr_root/include/$cf_ncuhdr_root" + test -d "$prefix/include" && cf_search="$cf_search $prefix/include" + test -d "$prefix/include/$cf_ncuhdr_root" && cf_search="$cf_search $prefix/include/$cf_ncuhdr_root" + test -d "$prefix/include/$cf_ncuhdr_root/include" && cf_search="$cf_search $prefix/include/$cf_ncuhdr_root/include" + test -d "$prefix/$cf_ncuhdr_root/include" && cf_search="$cf_search $prefix/$cf_ncuhdr_root/include" + test -d "$prefix/$cf_ncuhdr_root/include/$cf_ncuhdr_root" && cf_search="$cf_search $prefix/$cf_ncuhdr_root/include/$cf_ncuhdr_root" } for cf_subdir_prefix in \ @@ -7273,13 +8759,13 @@ do test "x$cf_subdir_prefix" != "x$prefix" && \ test -d "$cf_subdir_prefix" && \ -(test -z "$prefix" || test x$prefix = xNONE || test "x$cf_subdir_prefix" != "x$prefix") && { +{ test -z "$prefix" || test "x$prefix" = xNONE || test "x$cf_subdir_prefix" != "x$prefix"; } && { test -n "$verbose" && echo " ... testing for include-directories under $cf_subdir_prefix" - test -d $cf_subdir_prefix/include && cf_search="$cf_search $cf_subdir_prefix/include" - test -d $cf_subdir_prefix/include/$cf_ncuhdr_root && cf_search="$cf_search $cf_subdir_prefix/include/$cf_ncuhdr_root" - test -d $cf_subdir_prefix/include/$cf_ncuhdr_root/include && cf_search="$cf_search $cf_subdir_prefix/include/$cf_ncuhdr_root/include" - test -d $cf_subdir_prefix/$cf_ncuhdr_root/include && cf_search="$cf_search $cf_subdir_prefix/$cf_ncuhdr_root/include" - test -d $cf_subdir_prefix/$cf_ncuhdr_root/include/$cf_ncuhdr_root && cf_search="$cf_search $cf_subdir_prefix/$cf_ncuhdr_root/include/$cf_ncuhdr_root" + test -d "$cf_subdir_prefix/include" && cf_search="$cf_search $cf_subdir_prefix/include" + test -d "$cf_subdir_prefix/include/$cf_ncuhdr_root" && cf_search="$cf_search $cf_subdir_prefix/include/$cf_ncuhdr_root" + test -d "$cf_subdir_prefix/include/$cf_ncuhdr_root/include" && cf_search="$cf_search $cf_subdir_prefix/include/$cf_ncuhdr_root/include" + test -d "$cf_subdir_prefix/$cf_ncuhdr_root/include" && cf_search="$cf_search $cf_subdir_prefix/$cf_ncuhdr_root/include" + test -d "$cf_subdir_prefix/$cf_ncuhdr_root/include/$cf_ncuhdr_root" && cf_search="$cf_search $cf_subdir_prefix/$cf_ncuhdr_root/include/$cf_ncuhdr_root" } done @@ -7287,20 +8773,20 @@ done test "$includedir" != NONE && \ test "$includedir" != "/usr/include" && \ test -d "$includedir" && { - test -d $includedir && cf_search="$cf_search $includedir" - test -d $includedir/$cf_ncuhdr_root && cf_search="$cf_search $includedir/$cf_ncuhdr_root" + test -d "$includedir" && cf_search="$cf_search $includedir" + test -d "$includedir/$cf_ncuhdr_root" && cf_search="$cf_search $includedir/$cf_ncuhdr_root" } test "$oldincludedir" != NONE && \ test "$oldincludedir" != "/usr/include" && \ test -d "$oldincludedir" && { - test -d $oldincludedir && cf_search="$cf_search $oldincludedir" - test -d $oldincludedir/$cf_ncuhdr_root && cf_search="$cf_search $oldincludedir/$cf_ncuhdr_root" + test -d "$oldincludedir" && cf_search="$cf_search $oldincludedir" + test -d "$oldincludedir/$cf_ncuhdr_root" && cf_search="$cf_search $oldincludedir/$cf_ncuhdr_root" } cf_search="$cf_search $cf_header_path_list" - test -n "$verbose" && echo search path $cf_search + test -n "$verbose" && echo "search path $cf_search" cf_save2_CPPFLAGS="$CPPFLAGS" for cf_incdir in $cf_search do @@ -7308,9 +8794,9 @@ cf_search="$cf_search $cf_header_path_list" if test -n "$cf_incdir" ; then for cf_add_incdir in $cf_incdir do - while test $cf_add_incdir != /usr/include + while test "$cf_add_incdir" != /usr/include do - if test -d $cf_add_incdir + if test -d "$cf_add_incdir" then cf_have_incdir=no if test -n "$CFLAGS$CPPFLAGS" ; then @@ -7331,8 +8817,8 @@ if test -n "$cf_incdir" ; then test -n "$CPPFLAGS" && CPPFLAGS="$CPPFLAGS " CPPFLAGS="${CPPFLAGS}-I$cf_add_incdir" - cat >conftest.$ac_ext <<_ACEOF -#line 7335 "configure" + cat >"conftest.$ac_ext" <<_ACEOF +#line 8821 "configure" #include "confdefs.h" #include int @@ -7343,25 +8829,25 @@ printf("Hello") return 0; } _ACEOF -rm -f conftest.$ac_objext -if { (eval echo "$as_me:7347: \"$ac_compile\"") >&5 +rm -f "conftest.$ac_objext" +if { (eval echo "$as_me:8833: \"$ac_compile\"") >&5 (eval $ac_compile) 2>&5 ac_status=$? - echo "$as_me:7350: \$? = $ac_status" >&5 - (exit $ac_status); } && - { ac_try='test -s conftest.$ac_objext' - { (eval echo "$as_me:7353: \"$ac_try\"") >&5 + echo "$as_me:8836: \$? = $ac_status" >&5 + (exit "$ac_status"); } && + { ac_try='test -s "conftest.$ac_objext"' + { (eval echo "$as_me:8839: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? - echo "$as_me:7356: \$? = $ac_status" >&5 - (exit $ac_status); }; }; then + echo "$as_me:8842: \$? = $ac_status" >&5 + (exit "$ac_status"); }; }; then : else echo "$as_me: failed program was:" >&5 -cat conftest.$ac_ext >&5 +cat "conftest.$ac_ext" >&5 cf_have_incdir=yes fi -rm -f conftest.$ac_objext conftest.$ac_ext +rm -f "conftest.$ac_objext" "conftest.$ac_ext" CPPFLAGS=$cf_save_CPPFLAGS fi fi @@ -7370,11 +8856,11 @@ 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}:7373: testing adding $cf_add_incdir to include-path ..." 1>&5 +echo "${as_me:-configure}:8859: testing adding $cf_add_incdir to include-path ..." 1>&5 CPPFLAGS="$CPPFLAGS -I$cf_add_incdir" - cf_top_incdir=`echo $cf_add_incdir | sed -e 's%/include/.*$%/include%'` + cf_top_incdir=`echo "$cf_add_incdir" | sed -e 's%/include/.*$%/include%'` test "$cf_top_incdir" = "$cf_add_incdir" && break cf_add_incdir="$cf_top_incdir" else @@ -7392,8 +8878,8 @@ fi curses.h do - cat >conftest.$ac_ext <<_ACEOF -#line 7396 "configure" + cat >"conftest.$ac_ext" <<_ACEOF +#line 8882 "configure" #include "confdefs.h" #include <$cf_header> @@ -7403,12 +8889,12 @@ main (void) #ifdef NCURSES_VERSION -printf("%s\n", NCURSES_VERSION); +printf("%s\\n", NCURSES_VERSION); #else #ifdef __NCURSES_H -printf("old\n"); +printf("old\\n"); #else - make an error + #error __NCURSES_H is not defined #endif #endif @@ -7416,30 +8902,30 @@ printf("old\n"); return 0; } _ACEOF -rm -f conftest.$ac_objext -if { (eval echo "$as_me:7420: \"$ac_compile\"") >&5 +rm -f "conftest.$ac_objext" +if { (eval echo "$as_me:8906: \"$ac_compile\"") >&5 (eval $ac_compile) 2>&5 ac_status=$? - echo "$as_me:7423: \$? = $ac_status" >&5 - (exit $ac_status); } && - { ac_try='test -s conftest.$ac_objext' - { (eval echo "$as_me:7426: \"$ac_try\"") >&5 + echo "$as_me:8909: \$? = $ac_status" >&5 + (exit "$ac_status"); } && + { ac_try='test -s "conftest.$ac_objext"' + { (eval echo "$as_me:8912: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? - echo "$as_me:7429: \$? = $ac_status" >&5 - (exit $ac_status); }; }; then + echo "$as_me:8915: \$? = $ac_status" >&5 + (exit "$ac_status"); }; }; then cf_cv_ncurses_h2=$cf_header else echo "$as_me: failed program was:" >&5 -cat conftest.$ac_ext >&5 +cat "conftest.$ac_ext" >&5 cf_cv_ncurses_h2=no fi -rm -f conftest.$ac_objext conftest.$ac_ext +rm -f "conftest.$ac_objext" "conftest.$ac_ext" if test "$cf_cv_ncurses_h2" != no ; then cf_cv_ncurses_h2=$cf_incdir/$cf_header - test -n "$verbose" && echo $ac_n " ... found $ac_c" 1>&6 + test -n "$verbose" && echo $ECHO_N " ... found $ECHO_C" 1>&6 break fi test -n "$verbose" && echo " ... tested $cf_incdir/$cf_header" 1>&6 @@ -7447,26 +8933,26 @@ 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:7450: error: not found" >&5 + test "$cf_cv_ncurses_h2" = no && { { echo "$as_me:8936: error: not found" >&5 echo "$as_me: error: not found" >&2;} { (exit 1); exit 1; }; } fi -echo "$as_me:7455: result: $cf_cv_ncurses_h2" >&5 +echo "$as_me:8941: 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%/[^/]*$%%'` - cf_cv_ncurses_header=`basename $cf_cv_ncurses_h2` - if test `basename $cf_1st_incdir` = $cf_ncuhdr_root ; then - cf_cv_ncurses_header=$cf_ncuhdr_root/$cf_cv_ncurses_header + cf_1st_incdir=`echo "$cf_cv_ncurses_h2" | sed -e 's%/[^/]*$%%'` + cf_cv_ncurses_header="`basename "$cf_cv_ncurses_h2"`" + if test "`basename "$cf_1st_incdir"`" = "$cf_ncuhdr_root" ; then + cf_cv_ncurses_header="$cf_ncuhdr_root/$cf_cv_ncurses_header" fi if test -n "$cf_1st_incdir" ; then for cf_add_incdir in $cf_1st_incdir do - while test $cf_add_incdir != /usr/include + while test "$cf_add_incdir" != /usr/include do - if test -d $cf_add_incdir + if test -d "$cf_add_incdir" then cf_have_incdir=no if test -n "$CFLAGS$CPPFLAGS" ; then @@ -7487,8 +8973,8 @@ if test -n "$cf_1st_incdir" ; then test -n "$CPPFLAGS" && CPPFLAGS="$CPPFLAGS " CPPFLAGS="${CPPFLAGS}-I$cf_add_incdir" - cat >conftest.$ac_ext <<_ACEOF -#line 7491 "configure" + cat >"conftest.$ac_ext" <<_ACEOF +#line 8977 "configure" #include "confdefs.h" #include int @@ -7499,25 +8985,25 @@ printf("Hello") return 0; } _ACEOF -rm -f conftest.$ac_objext -if { (eval echo "$as_me:7503: \"$ac_compile\"") >&5 +rm -f "conftest.$ac_objext" +if { (eval echo "$as_me:8989: \"$ac_compile\"") >&5 (eval $ac_compile) 2>&5 ac_status=$? - echo "$as_me:7506: \$? = $ac_status" >&5 - (exit $ac_status); } && - { ac_try='test -s conftest.$ac_objext' - { (eval echo "$as_me:7509: \"$ac_try\"") >&5 + echo "$as_me:8992: \$? = $ac_status" >&5 + (exit "$ac_status"); } && + { ac_try='test -s "conftest.$ac_objext"' + { (eval echo "$as_me:8995: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? - echo "$as_me:7512: \$? = $ac_status" >&5 - (exit $ac_status); }; }; then + echo "$as_me:8998: \$? = $ac_status" >&5 + (exit "$ac_status"); }; }; then : else echo "$as_me: failed program was:" >&5 -cat conftest.$ac_ext >&5 +cat "conftest.$ac_ext" >&5 cf_have_incdir=yes fi -rm -f conftest.$ac_objext conftest.$ac_ext +rm -f "conftest.$ac_objext" "conftest.$ac_ext" CPPFLAGS=$cf_save_CPPFLAGS fi fi @@ -7526,11 +9012,11 @@ 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}:7529: testing adding $cf_add_incdir to include-path ..." 1>&5 +echo "${as_me:-configure}:9015: testing adding $cf_add_incdir to include-path ..." 1>&5 CPPFLAGS="$CPPFLAGS -I$cf_add_incdir" - cf_top_incdir=`echo $cf_add_incdir | sed -e 's%/include/.*$%/include%'` + cf_top_incdir=`echo "$cf_add_incdir" | sed -e 's%/include/.*$%/include%'` test "$cf_top_incdir" = "$cf_add_incdir" && break cf_add_incdir="$cf_top_incdir" else @@ -7547,7 +9033,7 @@ fi # Set definitions to allow ifdef'ing for ncurses.h -case $cf_cv_ncurses_header in +case "$cf_cv_ncurses_header" in (*ncurses.h) cat >>confdefs.h <<\EOF @@ -7557,7 +9043,7 @@ EOF ;; esac -case $cf_cv_ncurses_header in +case "$cf_cv_ncurses_header" in (ncurses/curses.h|ncurses/ncurses.h) cat >>confdefs.h <<\EOF @@ -7574,13 +9060,13 @@ EOF ;; esac -echo "$as_me:7577: checking for terminfo header" >&5 +echo "$as_me:9063: 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 else -case ${cf_cv_ncurses_header} in +case "${cf_cv_ncurses_header}" in (*/ncurses.h|*/ncursesw.h) cf_term_header=`echo "$cf_cv_ncurses_header" | sed -e 's%ncurses[^.]*\.h$%term.h%'` ;; @@ -7591,8 +9077,8 @@ esac for cf_test in $cf_term_header "ncurses/term.h" "ncursesw/term.h" do -cat >conftest.$ac_ext <<_ACEOF -#line 7595 "configure" +cat >"conftest.$ac_ext" <<_ACEOF +#line 9081 "configure" #include "confdefs.h" #include #include <${cf_cv_ncurses_header:-curses.h}> @@ -7601,43 +9087,43 @@ cat >conftest.$ac_ext <<_ACEOF int main (void) { -int x = auto_left_margin +int x = auto_left_margin; (void)x ; return 0; } _ACEOF -rm -f conftest.$ac_objext -if { (eval echo "$as_me:7610: \"$ac_compile\"") >&5 +rm -f "conftest.$ac_objext" +if { (eval echo "$as_me:9096: \"$ac_compile\"") >&5 (eval $ac_compile) 2>&5 ac_status=$? - echo "$as_me:7613: \$? = $ac_status" >&5 - (exit $ac_status); } && - { ac_try='test -s conftest.$ac_objext' - { (eval echo "$as_me:7616: \"$ac_try\"") >&5 + echo "$as_me:9099: \$? = $ac_status" >&5 + (exit "$ac_status"); } && + { ac_try='test -s "conftest.$ac_objext"' + { (eval echo "$as_me:9102: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? - echo "$as_me:7619: \$? = $ac_status" >&5 - (exit $ac_status); }; }; then + echo "$as_me:9105: \$? = $ac_status" >&5 + (exit "$ac_status"); }; }; then cf_cv_term_header="$cf_test" else echo "$as_me: failed program was:" >&5 -cat conftest.$ac_ext >&5 +cat "conftest.$ac_ext" >&5 cf_cv_term_header=unknown fi -rm -f conftest.$ac_objext conftest.$ac_ext +rm -f "conftest.$ac_objext" "conftest.$ac_ext" test "$cf_cv_term_header" != unknown && break done fi -echo "$as_me:7635: result: $cf_cv_term_header" >&5 +echo "$as_me:9121: result: $cf_cv_term_header" >&5 echo "${ECHO_T}$cf_cv_term_header" >&6 # Set definitions to allow ifdef'ing to accommodate subdirectories -case $cf_cv_term_header in +case "$cf_cv_term_header" in (*term.h) cat >>confdefs.h <<\EOF @@ -7647,7 +9133,7 @@ EOF ;; esac -case $cf_cv_term_header in +case "$cf_cv_term_header" in (ncurses/term.h) cat >>confdefs.h <<\EOF @@ -7670,7 +9156,7 @@ cat >>confdefs.h <<\EOF #define NCURSES 1 EOF -echo "$as_me:7673: checking for ncurses version" >&5 +echo "$as_me:9159: 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 @@ -7678,12 +9164,12 @@ else cf_cv_ncurses_version=no cf_tempfile=out$$ - rm -f $cf_tempfile + rm -f "$cf_tempfile" if test "$cross_compiling" = yes; then # This will not work if the preprocessor splits the line after the # Autoconf token. The 'unproto' program does that. - cat > conftest.$ac_ext < "conftest.$ac_ext" < #undef Autoconf #ifdef NCURSES_VERSION @@ -7696,67 +9182,69 @@ Autoconf "old" #endif EOF cf_try="$ac_cpp conftest.$ac_ext 2>&5 | grep '^Autoconf ' >conftest.out" - { (eval echo "$as_me:7699: \"$cf_try\"") >&5 + { (eval echo "$as_me:9185: \"$cf_try\"") >&5 (eval $cf_try) 2>&5 ac_status=$? - echo "$as_me:7702: \$? = $ac_status" >&5 - (exit $ac_status); } + echo "$as_me:9188: \$? = $ac_status" >&5 + (exit "$ac_status"); } if test -f conftest.out ; then - cf_out=`cat conftest.out | sed -e 's%^Autoconf %%' -e 's%^[^"]*"%%' -e 's%".*%%'` + cf_out=`sed -e 's%^Autoconf %%' -e 's%^[^"]*"%%' -e 's%".*%%' conftest.out` test -n "$cf_out" && cf_cv_ncurses_version="$cf_out" rm -f conftest.out fi else - cat >conftest.$ac_ext <<_ACEOF -#line 7712 "configure" + cat >"conftest.$ac_ext" <<_ACEOF +#line 9198 "configure" #include "confdefs.h" +$ac_includes_default + #include <${cf_cv_ncurses_header:-curses.h}> -#include + int main(void) { FILE *fp = fopen("$cf_tempfile", "w"); #ifdef NCURSES_VERSION # ifdef NCURSES_VERSION_PATCH - fprintf(fp, "%s.%d\n", NCURSES_VERSION, NCURSES_VERSION_PATCH); + fprintf(fp, "%s.%d\\n", NCURSES_VERSION, NCURSES_VERSION_PATCH); # else - fprintf(fp, "%s\n", NCURSES_VERSION); + fprintf(fp, "%s\\n", NCURSES_VERSION); # endif #else # ifdef __NCURSES_H - fprintf(fp, "old\n"); + 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:7737: \"$ac_link\"") >&5 +rm -f "conftest$ac_exeext" +if { (eval echo "$as_me:9225: \"$ac_link\"") >&5 (eval $ac_link) 2>&5 ac_status=$? - echo "$as_me:7740: \$? = $ac_status" >&5 - (exit $ac_status); } && { ac_try='./conftest$ac_exeext' - { (eval echo "$as_me:7742: \"$ac_try\"") >&5 + echo "$as_me:9228: \$? = $ac_status" >&5 + (exit "$ac_status"); } && { ac_try='"./conftest$ac_exeext"' + { (eval echo "$as_me:9230: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? - echo "$as_me:7745: \$? = $ac_status" >&5 - (exit $ac_status); }; }; then + echo "$as_me:9233: \$? = $ac_status" >&5 + (exit "$ac_status"); }; }; then cf_cv_ncurses_version=`cat $cf_tempfile` else echo "$as_me: program exited with status $ac_status" >&5 echo "$as_me: failed program was:" >&5 -cat conftest.$ac_ext >&5 +cat "conftest.$ac_ext" >&5 fi -rm -f core core.* *.core conftest$ac_exeext conftest.$ac_objext conftest.$ac_ext +rm -f core ./core.* ./*.core "conftest$ac_exeext" "conftest.$ac_objext" "conftest.$ac_ext" fi - rm -f $cf_tempfile + rm -f "$cf_tempfile" fi -echo "$as_me:7759: result: $cf_cv_ncurses_version" >&5 +echo "$as_me:9247: result: $cf_cv_ncurses_version" >&5 echo "${ECHO_T}$cf_cv_ncurses_version" >&6 test "$cf_cv_ncurses_version" = no || cat >>confdefs.h <<\EOF @@ -7769,15 +9257,15 @@ cf_nculib_root=ncursesw # to link gpm. cf_ncurses_LIBS="" cf_ncurses_SAVE="$LIBS" -echo "$as_me:7772: checking for Gpm_Open in -lgpm" >&5 +echo "$as_me:9260: 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 else ac_check_lib_save_LIBS=$LIBS LIBS="-lgpm $LIBS" -cat >conftest.$ac_ext <<_ACEOF -#line 7780 "configure" +cat >"conftest.$ac_ext" <<_ACEOF +#line 9268 "configure" #include "confdefs.h" /* Override any gcc2 internal prototype to avoid an error. */ @@ -7786,7 +9274,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) { @@ -7795,39 +9283,39 @@ Gpm_Open (); return 0; } _ACEOF -rm -f conftest.$ac_objext conftest$ac_exeext -if { (eval echo "$as_me:7799: \"$ac_link\"") >&5 +rm -f "conftest.$ac_objext" "conftest$ac_exeext" +if { (eval echo "$as_me:9287: \"$ac_link\"") >&5 (eval $ac_link) 2>&5 ac_status=$? - echo "$as_me:7802: \$? = $ac_status" >&5 - (exit $ac_status); } && - { ac_try='test -s conftest$ac_exeext' - { (eval echo "$as_me:7805: \"$ac_try\"") >&5 + echo "$as_me:9290: \$? = $ac_status" >&5 + (exit "$ac_status"); } && + { ac_try='test -s "conftest$ac_exeext"' + { (eval echo "$as_me:9293: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? - echo "$as_me:7808: \$? = $ac_status" >&5 - (exit $ac_status); }; }; then + echo "$as_me:9296: \$? = $ac_status" >&5 + (exit "$ac_status"); }; }; then ac_cv_lib_gpm_Gpm_Open=yes else echo "$as_me: failed program was:" >&5 -cat conftest.$ac_ext >&5 +cat "conftest.$ac_ext" >&5 ac_cv_lib_gpm_Gpm_Open=no fi -rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext +rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext" LIBS=$ac_check_lib_save_LIBS fi -echo "$as_me:7819: result: $ac_cv_lib_gpm_Gpm_Open" >&5 +echo "$as_me:9307: 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:7822: checking for initscr in -lgpm" >&5 +if test "$ac_cv_lib_gpm_Gpm_Open" = yes; then + echo "$as_me:9310: 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 else ac_check_lib_save_LIBS=$LIBS LIBS="-lgpm $LIBS" -cat >conftest.$ac_ext <<_ACEOF -#line 7830 "configure" +cat >"conftest.$ac_ext" <<_ACEOF +#line 9318 "configure" #include "confdefs.h" /* Override any gcc2 internal prototype to avoid an error. */ @@ -7836,7 +9324,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) { @@ -7845,30 +9333,30 @@ initscr (); return 0; } _ACEOF -rm -f conftest.$ac_objext conftest$ac_exeext -if { (eval echo "$as_me:7849: \"$ac_link\"") >&5 +rm -f "conftest.$ac_objext" "conftest$ac_exeext" +if { (eval echo "$as_me:9337: \"$ac_link\"") >&5 (eval $ac_link) 2>&5 ac_status=$? - echo "$as_me:7852: \$? = $ac_status" >&5 - (exit $ac_status); } && - { ac_try='test -s conftest$ac_exeext' - { (eval echo "$as_me:7855: \"$ac_try\"") >&5 + echo "$as_me:9340: \$? = $ac_status" >&5 + (exit "$ac_status"); } && + { ac_try='test -s "conftest$ac_exeext"' + { (eval echo "$as_me:9343: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? - echo "$as_me:7858: \$? = $ac_status" >&5 - (exit $ac_status); }; }; then + echo "$as_me:9346: \$? = $ac_status" >&5 + (exit "$ac_status"); }; }; then ac_cv_lib_gpm_initscr=yes else echo "$as_me: failed program was:" >&5 -cat conftest.$ac_ext >&5 +cat "conftest.$ac_ext" >&5 ac_cv_lib_gpm_initscr=no fi -rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext +rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext" LIBS=$ac_check_lib_save_LIBS fi -echo "$as_me:7869: result: $ac_cv_lib_gpm_initscr" >&5 +echo "$as_me:9357: 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 +if test "$ac_cv_lib_gpm_initscr" = yes; then LIBS="$cf_ncurses_SAVE" else cf_ncurses_LIBS="-lgpm" @@ -7876,20 +9364,20 @@ fi fi -case $host_os in +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:7884: checking for tgoto in -lmytinfo" >&5 + echo "$as_me:9372: 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 else ac_check_lib_save_LIBS=$LIBS LIBS="-lmytinfo $LIBS" -cat >conftest.$ac_ext <<_ACEOF -#line 7892 "configure" +cat >"conftest.$ac_ext" <<_ACEOF +#line 9380 "configure" #include "confdefs.h" /* Override any gcc2 internal prototype to avoid an error. */ @@ -7898,7 +9386,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) { @@ -7907,30 +9395,30 @@ tgoto (); return 0; } _ACEOF -rm -f conftest.$ac_objext conftest$ac_exeext -if { (eval echo "$as_me:7911: \"$ac_link\"") >&5 +rm -f "conftest.$ac_objext" "conftest$ac_exeext" +if { (eval echo "$as_me:9399: \"$ac_link\"") >&5 (eval $ac_link) 2>&5 ac_status=$? - echo "$as_me:7914: \$? = $ac_status" >&5 - (exit $ac_status); } && - { ac_try='test -s conftest$ac_exeext' - { (eval echo "$as_me:7917: \"$ac_try\"") >&5 + echo "$as_me:9402: \$? = $ac_status" >&5 + (exit "$ac_status"); } && + { ac_try='test -s "conftest$ac_exeext"' + { (eval echo "$as_me:9405: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? - echo "$as_me:7920: \$? = $ac_status" >&5 - (exit $ac_status); }; }; then + echo "$as_me:9408: \$? = $ac_status" >&5 + (exit "$ac_status"); }; }; then ac_cv_lib_mytinfo_tgoto=yes else echo "$as_me: failed program was:" >&5 -cat conftest.$ac_ext >&5 +cat "conftest.$ac_ext" >&5 ac_cv_lib_mytinfo_tgoto=no fi -rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext +rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext" LIBS=$ac_check_lib_save_LIBS fi -echo "$as_me:7931: result: $ac_cv_lib_mytinfo_tgoto" >&5 +echo "$as_me:9419: 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 +if test "$ac_cv_lib_mytinfo_tgoto" = yes; then cf_ncurses_LIBS="-lmytinfo $cf_ncurses_LIBS" fi @@ -7938,113 +9426,113 @@ fi ;; esac -cf_add_libs="$cf_ncurses_LIBS" -# Filter out duplicates - this happens with badly-designed ".pc" files... -for cf_add_1lib in $LIBS -do - for cf_add_2lib in $cf_add_libs - do - if test "x$cf_add_1lib" = "x$cf_add_2lib" - then +cf_add_libs="$LIBS" +# reverse order +cf_add_0lib= +for cf_add_1lib in $cf_ncurses_LIBS; 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_libs $cf_add_1lib" + test -n "$cf_add_1lib" && cf_add_libs="$cf_add_1lib $cf_add_libs" done LIBS="$cf_add_libs" -if ( test -n "$cf_cv_curses_dir" && test "$cf_cv_curses_dir" != "no" ) +if test -n "$cf_cv_curses_dir" && test "$cf_cv_curses_dir" != "no" then -cf_add_libs="-l$cf_nculib_root" -# Filter out duplicates - this happens with badly-designed ".pc" files... -for cf_add_1lib in $LIBS -do - for cf_add_2lib in $cf_add_libs - do - if test "x$cf_add_1lib" = "x$cf_add_2lib" - then +cf_add_libs="$LIBS" +# reverse order +cf_add_0lib= +for cf_add_1lib in -l$cf_nculib_root; 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_libs $cf_add_1lib" + test -n "$cf_add_1lib" && cf_add_libs="$cf_add_1lib $cf_add_libs" done LIBS="$cf_add_libs" else - eval 'cf_cv_have_lib_'$cf_nculib_root'=no' + eval 'cf_cv_have_lib_'"$cf_nculib_root"'=no' cf_libdir="" - echo "$as_me:7980: checking for initscr" >&5 + echo "$as_me:9468: 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 7986 "configure" + cat >"conftest.$ac_ext" <<_ACEOF +#line 9474 "configure" #include "confdefs.h" -/* System header to define __stub macros and hopefully few prototypes, - which can conflict with char initscr (); below. */ -#include -/* Override any gcc2 internal prototype to avoid an error. */ +#define initscr autoconf_temporary +#include /* least-intrusive standard header which defines gcc2 __stub macros */ +#undef initscr + #ifdef __cplusplus 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 (*f) (); +char initscr (void); int main (void) { -/* The GNU C library defines this for functions which it implements + +/* The GNU C library defines stubs for functions which it implements to always fail with ENOSYS. Some functions are actually named something starting with __ and the normal name is an alias. */ #if defined (__stub_initscr) || defined (__stub___initscr) -choke me -#else -f = initscr; /* workaround for ICC 12.0.3 */ if (f == 0) return 1; +#error found stub for initscr #endif + return initscr (); ; return 0; } _ACEOF -rm -f conftest.$ac_objext conftest$ac_exeext -if { (eval echo "$as_me:8017: \"$ac_link\"") >&5 +rm -f "conftest.$ac_objext" "conftest$ac_exeext" +if { (eval echo "$as_me:9505: \"$ac_link\"") >&5 (eval $ac_link) 2>&5 ac_status=$? - echo "$as_me:8020: \$? = $ac_status" >&5 - (exit $ac_status); } && - { ac_try='test -s conftest$ac_exeext' - { (eval echo "$as_me:8023: \"$ac_try\"") >&5 + echo "$as_me:9508: \$? = $ac_status" >&5 + (exit "$ac_status"); } && + { ac_try='test -s "conftest$ac_exeext"' + { (eval echo "$as_me:9511: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? - echo "$as_me:8026: \$? = $ac_status" >&5 - (exit $ac_status); }; }; then + echo "$as_me:9514: \$? = $ac_status" >&5 + (exit "$ac_status"); }; }; then ac_cv_func_initscr=yes else echo "$as_me: failed program was:" >&5 -cat conftest.$ac_ext >&5 +cat "conftest.$ac_ext" >&5 ac_cv_func_initscr=no fi -rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext +rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext" fi -echo "$as_me:8036: result: $ac_cv_func_initscr" >&5 +echo "$as_me:9524: 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' +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:8043: checking for initscr in -l$cf_nculib_root" >&5 + echo "$as_me:9531: 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 8047 "configure" + cat >"conftest.$ac_ext" <<_ACEOF +#line 9535 "configure" #include "confdefs.h" #include <${cf_cv_ncurses_header:-curses.h}> int @@ -8055,26 +9543,26 @@ initscr() return 0; } _ACEOF -rm -f conftest.$ac_objext conftest$ac_exeext -if { (eval echo "$as_me:8059: \"$ac_link\"") >&5 +rm -f "conftest.$ac_objext" "conftest$ac_exeext" +if { (eval echo "$as_me:9547: \"$ac_link\"") >&5 (eval $ac_link) 2>&5 ac_status=$? - echo "$as_me:8062: \$? = $ac_status" >&5 - (exit $ac_status); } && - { ac_try='test -s conftest$ac_exeext' - { (eval echo "$as_me:8065: \"$ac_try\"") >&5 + echo "$as_me:9550: \$? = $ac_status" >&5 + (exit "$ac_status"); } && + { ac_try='test -s "conftest$ac_exeext"' + { (eval echo "$as_me:9553: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? - echo "$as_me:8068: \$? = $ac_status" >&5 - (exit $ac_status); }; }; then - echo "$as_me:8070: result: yes" >&5 + echo "$as_me:9556: \$? = $ac_status" >&5 + (exit "$ac_status"); }; }; then + echo "$as_me:9558: result: yes" >&5 echo "${ECHO_T}yes" >&6 - eval 'cf_cv_have_lib_'$cf_nculib_root'=yes' + 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:8077: result: no" >&5 +cat "conftest.$ac_ext" >&5 +echo "$as_me:9565: result: no" >&5 echo "${ECHO_T}no" >&6 cf_search= @@ -8082,7 +9570,7 @@ cf_library_path_list="" if test -n "${LDFLAGS}${LIBS}" ; then for cf_library_path in $LDFLAGS $LIBS do - case $cf_library_path in + case "$cf_library_path" in (-L*) cf_library_path=`echo ".$cf_library_path" |sed -e 's/^...//' -e 's,/lib$,,'` @@ -8090,11 +9578,11 @@ test "x$cf_library_path" != "xNONE" && \ test -d "$cf_library_path" && \ { test -n "$verbose" && echo " ... testing for lib-directories under $cf_library_path" - test -d $cf_library_path/lib && cf_search="$cf_search $cf_library_path/lib" - test -d $cf_library_path/lib/$cf_nculib_root && cf_search="$cf_search $cf_library_path/lib/$cf_nculib_root" - test -d $cf_library_path/lib/$cf_nculib_root/lib && cf_search="$cf_search $cf_library_path/lib/$cf_nculib_root/lib" - test -d $cf_library_path/$cf_nculib_root/lib && cf_search="$cf_search $cf_library_path/$cf_nculib_root/lib" - test -d $cf_library_path/$cf_nculib_root/lib/$cf_nculib_root && cf_search="$cf_search $cf_library_path/$cf_nculib_root/lib/$cf_nculib_root" + test -d "$cf_library_path/lib" && cf_search="$cf_search $cf_library_path/lib" + test -d "$cf_library_path/lib/$cf_nculib_root" && cf_search="$cf_search $cf_library_path/lib/$cf_nculib_root" + test -d "$cf_library_path/lib/$cf_nculib_root/lib" && cf_search="$cf_search $cf_library_path/lib/$cf_nculib_root/lib" + test -d "$cf_library_path/$cf_nculib_root/lib" && cf_search="$cf_search $cf_library_path/$cf_nculib_root/lib" + test -d "$cf_library_path/$cf_nculib_root/lib/$cf_nculib_root" && cf_search="$cf_search $cf_library_path/$cf_nculib_root/lib/$cf_nculib_root" } cf_library_path_list="$cf_library_path_list $cf_search" @@ -8109,11 +9597,11 @@ test "x$prefix" != "xNONE" && \ test -d "$prefix" && \ { test -n "$verbose" && echo " ... testing for lib-directories under $prefix" - test -d $prefix/lib && cf_search="$cf_search $prefix/lib" - test -d $prefix/lib/$cf_nculib_root && cf_search="$cf_search $prefix/lib/$cf_nculib_root" - test -d $prefix/lib/$cf_nculib_root/lib && cf_search="$cf_search $prefix/lib/$cf_nculib_root/lib" - test -d $prefix/$cf_nculib_root/lib && cf_search="$cf_search $prefix/$cf_nculib_root/lib" - test -d $prefix/$cf_nculib_root/lib/$cf_nculib_root && cf_search="$cf_search $prefix/$cf_nculib_root/lib/$cf_nculib_root" + test -d "$prefix/lib" && cf_search="$cf_search $prefix/lib" + test -d "$prefix/lib/$cf_nculib_root" && cf_search="$cf_search $prefix/lib/$cf_nculib_root" + test -d "$prefix/lib/$cf_nculib_root/lib" && cf_search="$cf_search $prefix/lib/$cf_nculib_root/lib" + test -d "$prefix/$cf_nculib_root/lib" && cf_search="$cf_search $prefix/$cf_nculib_root/lib" + test -d "$prefix/$cf_nculib_root/lib/$cf_nculib_root" && cf_search="$cf_search $prefix/$cf_nculib_root/lib/$cf_nculib_root" } for cf_subdir_prefix in \ @@ -8127,13 +9615,13 @@ do test "x$cf_subdir_prefix" != "x$prefix" && \ test -d "$cf_subdir_prefix" && \ -(test -z "$prefix" || test x$prefix = xNONE || test "x$cf_subdir_prefix" != "x$prefix") && { +{ test -z "$prefix" || test "x$prefix" = xNONE || test "x$cf_subdir_prefix" != "x$prefix"; } && { test -n "$verbose" && echo " ... testing for lib-directories under $cf_subdir_prefix" - test -d $cf_subdir_prefix/lib && cf_search="$cf_search $cf_subdir_prefix/lib" - test -d $cf_subdir_prefix/lib/$cf_nculib_root && cf_search="$cf_search $cf_subdir_prefix/lib/$cf_nculib_root" - test -d $cf_subdir_prefix/lib/$cf_nculib_root/lib && cf_search="$cf_search $cf_subdir_prefix/lib/$cf_nculib_root/lib" - test -d $cf_subdir_prefix/$cf_nculib_root/lib && cf_search="$cf_search $cf_subdir_prefix/$cf_nculib_root/lib" - test -d $cf_subdir_prefix/$cf_nculib_root/lib/$cf_nculib_root && cf_search="$cf_search $cf_subdir_prefix/$cf_nculib_root/lib/$cf_nculib_root" + test -d "$cf_subdir_prefix/lib" && cf_search="$cf_search $cf_subdir_prefix/lib" + test -d "$cf_subdir_prefix/lib/$cf_nculib_root" && cf_search="$cf_search $cf_subdir_prefix/lib/$cf_nculib_root" + test -d "$cf_subdir_prefix/lib/$cf_nculib_root/lib" && cf_search="$cf_search $cf_subdir_prefix/lib/$cf_nculib_root/lib" + test -d "$cf_subdir_prefix/$cf_nculib_root/lib" && cf_search="$cf_search $cf_subdir_prefix/$cf_nculib_root/lib" + test -d "$cf_subdir_prefix/$cf_nculib_root/lib/$cf_nculib_root" && cf_search="$cf_search $cf_subdir_prefix/$cf_nculib_root/lib/$cf_nculib_root" } done @@ -8142,11 +9630,11 @@ cf_search="$cf_library_path_list $cf_search" for cf_libdir in $cf_search do - echo "$as_me:8145: checking for -l$cf_nculib_root in $cf_libdir" >&5 + echo "$as_me:9633: 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 8149 "configure" + cat >"conftest.$ac_ext" <<_ACEOF +#line 9637 "configure" #include "confdefs.h" #include <${cf_cv_ncurses_header:-curses.h}> int @@ -8157,41 +9645,41 @@ initscr() return 0; } _ACEOF -rm -f conftest.$ac_objext conftest$ac_exeext -if { (eval echo "$as_me:8161: \"$ac_link\"") >&5 +rm -f "conftest.$ac_objext" "conftest$ac_exeext" +if { (eval echo "$as_me:9649: \"$ac_link\"") >&5 (eval $ac_link) 2>&5 ac_status=$? - echo "$as_me:8164: \$? = $ac_status" >&5 - (exit $ac_status); } && - { ac_try='test -s conftest$ac_exeext' - { (eval echo "$as_me:8167: \"$ac_try\"") >&5 + echo "$as_me:9652: \$? = $ac_status" >&5 + (exit "$ac_status"); } && + { ac_try='test -s "conftest$ac_exeext"' + { (eval echo "$as_me:9655: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? - echo "$as_me:8170: \$? = $ac_status" >&5 - (exit $ac_status); }; }; then - echo "$as_me:8172: result: yes" >&5 + echo "$as_me:9658: \$? = $ac_status" >&5 + (exit "$ac_status"); }; }; then + echo "$as_me:9660: result: yes" >&5 echo "${ECHO_T}yes" >&6 - eval 'cf_cv_have_lib_'$cf_nculib_root'=yes' + 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:8179: result: no" >&5 +cat "conftest.$ac_ext" >&5 +echo "$as_me:9667: result: no" >&5 echo "${ECHO_T}no" >&6 LIBS="$cf_save_LIBS" fi -rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext +rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext" done fi -rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext +rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext" fi -eval 'cf_found_library=$cf_cv_have_lib_'$cf_nculib_root +eval 'cf_found_library="$cf_cv_have_lib_'"$cf_nculib_root"\" -if test $cf_found_library = no ; then - { { echo "$as_me:8194: error: Cannot link $cf_nculib_root library" >&5 +if test "$cf_found_library" = no ; then + { { echo "$as_me:9682: error: Cannot link $cf_nculib_root library" >&5 echo "$as_me: error: Cannot link $cf_nculib_root library" >&2;} { (exit 1); exit 1; }; } fi @@ -8199,49 +9687,49 @@ fi fi if test -n "$cf_ncurses_LIBS" ; then - echo "$as_me:8202: checking if we can link $cf_nculib_root without $cf_ncurses_LIBS" >&5 + echo "$as_me:9690: 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 - q=`echo $LIBS | sed -e "s%$p %%" -e "s%$p$%%"` + q=`echo "$LIBS" | sed -e "s%$p %%" -e "s%$p$%%"` if test "$q" != "$LIBS" ; then LIBS="$q" fi done - cat >conftest.$ac_ext <<_ACEOF -#line 8212 "configure" + cat >"conftest.$ac_ext" <<_ACEOF +#line 9700 "configure" #include "confdefs.h" #include <${cf_cv_ncurses_header:-curses.h}> int main (void) { -initscr(); mousemask(0,0); tgoto((char *)0, 0, 0); +initscr(); mousemask(0,0); tigetstr((char *)0); ; return 0; } _ACEOF -rm -f conftest.$ac_objext conftest$ac_exeext -if { (eval echo "$as_me:8224: \"$ac_link\"") >&5 +rm -f "conftest.$ac_objext" "conftest$ac_exeext" +if { (eval echo "$as_me:9712: \"$ac_link\"") >&5 (eval $ac_link) 2>&5 ac_status=$? - echo "$as_me:8227: \$? = $ac_status" >&5 - (exit $ac_status); } && - { ac_try='test -s conftest$ac_exeext' - { (eval echo "$as_me:8230: \"$ac_try\"") >&5 + echo "$as_me:9715: \$? = $ac_status" >&5 + (exit "$ac_status"); } && + { ac_try='test -s "conftest$ac_exeext"' + { (eval echo "$as_me:9718: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? - echo "$as_me:8233: \$? = $ac_status" >&5 - (exit $ac_status); }; }; then - echo "$as_me:8235: result: yes" >&5 + echo "$as_me:9721: \$? = $ac_status" >&5 + (exit "$ac_status"); }; }; then + echo "$as_me:9723: result: yes" >&5 echo "${ECHO_T}yes" >&6 else echo "$as_me: failed program was:" >&5 -cat conftest.$ac_ext >&5 -echo "$as_me:8240: result: no" >&5 +cat "conftest.$ac_ext" >&5 +echo "$as_me:9728: result: no" >&5 echo "${ECHO_T}no" >&6 LIBS="$cf_ncurses_SAVE" fi -rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext +rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext" fi cf_nculib_ROOT=`echo "HAVE_LIB$cf_nculib_root" | sed y%abcdefghijklmnopqrstuvwxyz./-%ABCDEFGHIJKLMNOPQRSTUVWXYZ___%` @@ -8261,39 +9749,50 @@ cf_ncuconfig_root=ncurses cf_have_ncuconfig=no if test "x${PKG_CONFIG:=none}" != xnone; then - echo "$as_me:8264: checking pkg-config for $cf_ncuconfig_root" >&5 + echo "$as_me:9752: 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:8267: result: yes" >&5 + echo "$as_me:9755: result: yes" >&5 echo "${ECHO_T}yes" >&6 - echo "$as_me:8270: checking if the $cf_ncuconfig_root package files work" >&5 + echo "$as_me:9758: 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 + cf_save_CFLAGS="$CFLAGS" cf_save_CPPFLAGS="$CPPFLAGS" cf_save_LIBS="$LIBS" + cf_pkg_cflags="`$PKG_CONFIG --cflags $cf_ncuconfig_root`" + cf_pkg_libs="`$PKG_CONFIG --libs $cf_ncuconfig_root`" + + # while -W for passing linker flags is prevalent, it is not "standard". + # At least one wrapper for c89/c99 (in Apple's xcode) has its own + # incompatible _and_ non-standard -W option which gives an error. Work + # around that pitfall. + case "x${CC}@@${cf_pkg_libs}@${cf_pkg_cflags}" in + (x*c[89]9@@*-W*) + cf_fix_cppflags=no cf_new_cflags= cf_new_cppflags= cf_new_extra_cppflags= -for cf_add_cflags in `$PKG_CONFIG --cflags $cf_ncuconfig_root` +for cf_add_cflags in $cf_pkg_cflags do -case $cf_fix_cppflags in +case "$cf_fix_cppflags" in (no) - case $cf_add_cflags in + case "$cf_add_cflags" in (-undef|-nostdinc*|-I*|-D*|-U*|-E|-P|-C) - case $cf_add_cflags in + case "$cf_add_cflags" in (-D*) - cf_tst_cflags=`echo ${cf_add_cflags} |sed -e 's/^-D[^=]*='\''\"[^"]*//'` + cf_tst_cflags=`echo "${cf_add_cflags}" |sed -e 's/^-D[^=]*='\''\"[^"]*//'` test "x${cf_add_cflags}" != "x${cf_tst_cflags}" \ && test -z "${cf_tst_cflags}" \ && cf_fix_cppflags=yes - if test $cf_fix_cppflags = yes ; then + if test "$cf_fix_cppflags" = yes ; then test -n "$cf_new_extra_cppflags" && cf_new_extra_cppflags="$cf_new_extra_cppflags " cf_new_extra_cppflags="${cf_new_extra_cppflags}$cf_add_cflags" @@ -8312,7 +9811,7 @@ case $cf_fix_cppflags in (*$cf_add_cflags) ;; (*) - case $cf_add_cflags in + case "$cf_add_cflags" in (-D*) cf_tst_cppflags=`echo "x$cf_add_cflags" | sed -e 's/^...//' -e 's/=.*//'` @@ -8342,7 +9841,7 @@ CPPFLAGS=`echo "$CPPFLAGS" | \ test -n "$cf_new_extra_cppflags" && cf_new_extra_cppflags="$cf_new_extra_cppflags " cf_new_extra_cppflags="${cf_new_extra_cppflags}$cf_add_cflags" - cf_tst_cflags=`echo ${cf_add_cflags} |sed -e 's/^[^"]*"'\''//'` + cf_tst_cflags=`echo "${cf_add_cflags}" |sed -e 's/^[^"]*"'\''//'` test "x${cf_add_cflags}" != "x${cf_tst_cflags}" \ && test -z "${cf_tst_cflags}" \ @@ -8372,162 +9871,378 @@ if test -n "$cf_new_extra_cppflags" ; then fi -cf_add_libs="`$PKG_CONFIG --libs $cf_ncuconfig_root`" -# Filter out duplicates - this happens with badly-designed ".pc" files... -for cf_add_1lib in $LIBS -do - for cf_add_2lib in $cf_add_libs - do - if test "x$cf_add_1lib" = "x$cf_add_2lib" - then +cf_add_libs="$LIBS" +# reverse order +cf_add_0lib= +for cf_add_1lib in $cf_pkg_libs; 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_libs $cf_add_1lib" + test -n "$cf_add_1lib" && cf_add_libs="$cf_add_1lib $cf_add_libs" done LIBS="$cf_add_libs" - cat >conftest.$ac_ext <<_ACEOF -#line 8392 "configure" + cat >"conftest.$ac_ext" <<_ACEOF +#line 9891 "configure" #include "confdefs.h" #include <${cf_cv_ncurses_header:-curses.h}> int main (void) { -initscr(); mousemask(0,0); tgoto((char *)0, 0, 0); +initscr(); mousemask(0,0); tigetstr((char *)0); ; return 0; } _ACEOF -rm -f conftest.$ac_objext conftest$ac_exeext -if { (eval echo "$as_me:8404: \"$ac_link\"") >&5 +rm -f "conftest.$ac_objext" "conftest$ac_exeext" +if { (eval echo "$as_me:9903: \"$ac_link\"") >&5 (eval $ac_link) 2>&5 ac_status=$? - echo "$as_me:8407: \$? = $ac_status" >&5 - (exit $ac_status); } && - { ac_try='test -s conftest$ac_exeext' - { (eval echo "$as_me:8410: \"$ac_try\"") >&5 + echo "$as_me:9906: \$? = $ac_status" >&5 + (exit "$ac_status"); } && + { ac_try='test -s "conftest$ac_exeext"' + { (eval echo "$as_me:9909: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? - echo "$as_me:8413: \$? = $ac_status" >&5 - (exit $ac_status); }; }; then + echo "$as_me:9912: \$? = $ac_status" >&5 + (exit "$ac_status"); }; }; then if test "$cross_compiling" = yes; then - cf_have_ncuconfig=maybe + cf_test_ncuconfig=maybe else - cat >conftest.$ac_ext <<_ACEOF -#line 8419 "configure" + cat >"conftest.$ac_ext" <<_ACEOF +#line 9918 "configure" #include "confdefs.h" #include <${cf_cv_ncurses_header:-curses.h}> - int main(void) - { char *xx = curses_version(); return (xx == 0); } + int main(void) + { const char *xx = curses_version(); return (xx == 0); } _ACEOF -rm -f conftest$ac_exeext -if { (eval echo "$as_me:8426: \"$ac_link\"") >&5 +rm -f "conftest$ac_exeext" +if { (eval echo "$as_me:9925: \"$ac_link\"") >&5 (eval $ac_link) 2>&5 ac_status=$? - echo "$as_me:8429: \$? = $ac_status" >&5 - (exit $ac_status); } && { ac_try='./conftest$ac_exeext' - { (eval echo "$as_me:8431: \"$ac_try\"") >&5 + echo "$as_me:9928: \$? = $ac_status" >&5 + (exit "$ac_status"); } && { ac_try='"./conftest$ac_exeext"' + { (eval echo "$as_me:9930: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? - echo "$as_me:8434: \$? = $ac_status" >&5 - (exit $ac_status); }; }; then - cf_have_ncuconfig=yes + echo "$as_me:9933: \$? = $ac_status" >&5 + (exit "$ac_status"); }; }; then + cf_test_ncuconfig=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_have_ncuconfig=no +cat "conftest.$ac_ext" >&5 +cf_test_ncuconfig=no fi -rm -f core core.* *.core conftest$ac_exeext conftest.$ac_objext conftest.$ac_ext +rm -f core ./core.* ./*.core "conftest$ac_exeext" "conftest.$ac_objext" "conftest.$ac_ext" fi else echo "$as_me: failed program was:" >&5 -cat conftest.$ac_ext >&5 -cf_have_ncuconfig=no +cat "conftest.$ac_ext" >&5 +cf_test_ncuconfig=no fi -rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext - echo "$as_me:8451: 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" - then +rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext" + + CFLAGS="$cf_save_CFLAGS" CPPFLAGS="$cf_save_CPPFLAGS" LIBS="$cf_save_LIBS" - NCURSES_CONFIG_PKG=none - else -cat >>confdefs.h <<\EOF -#define NCURSES 1 -EOF + if test "x$cf_test_ncuconfig" != xyes; then + cf_temp=`echo "x$cf_pkg_cflags" | sed -e s/^x// -e 's/-W[^ ]*//g'` + cf_pkg_cflags="$cf_temp" + cf_temp=`echo "x$cf_pkg_libs" | sed -e s/^x// -e 's/-W[^ ]*//g'` + cf_pkg_libs="$cf_temp" + fi + ;; + esac - NCURSES_CONFIG_PKG=$cf_ncuconfig_root +for cf_add_cflags in $cf_pkg_cflags +do + case "x$cf_add_cflags" in + (x-[DU]*) -echo "$as_me:8467: 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 -else +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 -case ${cf_cv_ncurses_header} in -(*/ncurses.h|*/ncursesw.h) - cf_term_header=`echo "$cf_cv_ncurses_header" | sed -e 's%ncurses[^.]*\.h$%term.h%'` - ;; -(*) - cf_term_header=term.h - ;; -esac + CFLAGS="$cf_old_cflag" +done -for cf_test in $cf_term_header "ncurses/term.h" "ncursesw/term.h" +cf_tmp_cflag=`echo "x$cf_add_cflags" | sed -e 's/^.//' -e 's/=.*//'` +while true do -cat >conftest.$ac_ext <<_ACEOF -#line 8485 "configure" -#include "confdefs.h" -#include -#include <${cf_cv_ncurses_header:-curses.h}> -#include <$cf_test> + 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 -int -main (void) -{ -int x = auto_left_margin - ; - return 0; -} -_ACEOF -rm -f conftest.$ac_objext -if { (eval echo "$as_me:8500: \"$ac_compile\"") >&5 - (eval $ac_compile) 2>&5 - ac_status=$? - echo "$as_me:8503: \$? = $ac_status" >&5 - (exit $ac_status); } && - { ac_try='test -s conftest.$ac_objext' - { (eval echo "$as_me:8506: \"$ac_try\"") >&5 - (eval $ac_try) 2>&5 - ac_status=$? - echo "$as_me:8509: \$? = $ac_status" >&5 - (exit $ac_status); }; }; then + 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_add_cflags +do +case "$cf_fix_cppflags" in +(no) + case "$cf_add_cflags" in + (-undef|-nostdinc*|-I*|-D*|-U*|-E|-P|-C) + case "$cf_add_cflags" in + (-D*) + cf_tst_cflags=`echo "${cf_add_cflags}" |sed -e 's/^-D[^=]*='\''\"[^"]*//'` + + test "x${cf_add_cflags}" != "x${cf_tst_cflags}" \ + && test -z "${cf_tst_cflags}" \ + && cf_fix_cppflags=yes + + if test "$cf_fix_cppflags" = yes ; then + + test -n "$cf_new_extra_cppflags" && cf_new_extra_cppflags="$cf_new_extra_cppflags " + cf_new_extra_cppflags="${cf_new_extra_cppflags}$cf_add_cflags" + + continue + elif test "${cf_tst_cflags}" = "\"'" ; then + + test -n "$cf_new_extra_cppflags" && cf_new_extra_cppflags="$cf_new_extra_cppflags " + cf_new_extra_cppflags="${cf_new_extra_cppflags}$cf_add_cflags" + + continue + fi + ;; + esac + case "$CPPFLAGS" in + (*$cf_add_cflags) + ;; + (*) + case "$cf_add_cflags" in + (-D*) + cf_tst_cppflags=`echo "x$cf_add_cflags" | sed -e 's/^...//' -e 's/=.*//'` + +CPPFLAGS=`echo "$CPPFLAGS" | \ + sed -e 's/-[UD]'"$cf_tst_cppflags"'\(=[^ ]*\)\?[ ]/ /g' \ + -e 's/-[UD]'"$cf_tst_cppflags"'\(=[^ ]*\)\?$//g'` + + ;; + esac + + test -n "$cf_new_cppflags" && cf_new_cppflags="$cf_new_cppflags " + cf_new_cppflags="${cf_new_cppflags}$cf_add_cflags" + + ;; + esac + ;; + (*) + + test -n "$cf_new_cflags" && cf_new_cflags="$cf_new_cflags " + cf_new_cflags="${cf_new_cflags}$cf_add_cflags" + + ;; + esac + ;; +(yes) + + test -n "$cf_new_extra_cppflags" && cf_new_extra_cppflags="$cf_new_extra_cppflags " + cf_new_extra_cppflags="${cf_new_extra_cppflags}$cf_add_cflags" + + cf_tst_cflags=`echo "${cf_add_cflags}" |sed -e 's/^[^"]*"'\''//'` + + test "x${cf_add_cflags}" != "x${cf_tst_cflags}" \ + && test -z "${cf_tst_cflags}" \ + && cf_fix_cppflags=no + ;; +esac +done + +if test -n "$cf_new_cflags" ; then + + test -n "$CFLAGS" && CFLAGS="$CFLAGS " + CFLAGS="${CFLAGS}$cf_new_cflags" + +fi + +if test -n "$cf_new_cppflags" ; then + + test -n "$CPPFLAGS" && CPPFLAGS="$CPPFLAGS " + CPPFLAGS="${CPPFLAGS}$cf_new_cppflags" + +fi + +if test -n "$cf_new_extra_cppflags" ; then + + test -n "$EXTRA_CPPFLAGS" && EXTRA_CPPFLAGS="$EXTRA_CPPFLAGS " + EXTRA_CPPFLAGS="${EXTRA_CPPFLAGS}$cf_new_extra_cppflags" + +fi + +done + +cf_add_libs="$LIBS" +# reverse order +cf_add_0lib= +for cf_add_1lib in $cf_pkg_libs; 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" + + cat >"conftest.$ac_ext" <<_ACEOF +#line 10107 "configure" +#include "confdefs.h" +#include <${cf_cv_ncurses_header:-curses.h}> +int +main (void) +{ +initscr(); mousemask(0,0); tigetstr((char *)0); + ; + return 0; +} +_ACEOF +rm -f "conftest.$ac_objext" "conftest$ac_exeext" +if { (eval echo "$as_me:10119: \"$ac_link\"") >&5 + (eval $ac_link) 2>&5 + ac_status=$? + echo "$as_me:10122: \$? = $ac_status" >&5 + (exit "$ac_status"); } && + { ac_try='test -s "conftest$ac_exeext"' + { (eval echo "$as_me:10125: \"$ac_try\"") >&5 + (eval $ac_try) 2>&5 + ac_status=$? + echo "$as_me:10128: \$? = $ac_status" >&5 + (exit "$ac_status"); }; }; then + if test "$cross_compiling" = yes; then + cf_have_ncuconfig=maybe +else + cat >"conftest.$ac_ext" <<_ACEOF +#line 10134 "configure" +#include "confdefs.h" +#include <${cf_cv_ncurses_header:-curses.h}> + int main(void) + { const char *xx = curses_version(); return (xx == 0); } +_ACEOF +rm -f "conftest$ac_exeext" +if { (eval echo "$as_me:10141: \"$ac_link\"") >&5 + (eval $ac_link) 2>&5 + ac_status=$? + echo "$as_me:10144: \$? = $ac_status" >&5 + (exit "$ac_status"); } && { ac_try='"./conftest$ac_exeext"' + { (eval echo "$as_me:10146: \"$ac_try\"") >&5 + (eval $ac_try) 2>&5 + ac_status=$? + echo "$as_me:10149: \$? = $ac_status" >&5 + (exit "$ac_status"); }; }; then + cf_have_ncuconfig=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_have_ncuconfig=no +fi +rm -f core ./core.* ./*.core "conftest$ac_exeext" "conftest.$ac_objext" "conftest.$ac_ext" +fi +else + echo "$as_me: failed program was:" >&5 +cat "conftest.$ac_ext" >&5 +cf_have_ncuconfig=no +fi +rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext" + echo "$as_me:10166: 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" + then + CPPFLAGS="$cf_save_CPPFLAGS" + LIBS="$cf_save_LIBS" + NCURSES_CONFIG_PKG=none + else + +cat >>confdefs.h <<\EOF +#define NCURSES 1 +EOF + + NCURSES_CONFIG_PKG=$cf_ncuconfig_root + +echo "$as_me:10182: 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 +else + +case "${cf_cv_ncurses_header}" in +(*/ncurses.h|*/ncursesw.h) + cf_term_header=`echo "$cf_cv_ncurses_header" | sed -e 's%ncurses[^.]*\.h$%term.h%'` + ;; +(*) + cf_term_header=term.h + ;; +esac + +for cf_test in $cf_term_header "ncurses/term.h" "ncursesw/term.h" +do +cat >"conftest.$ac_ext" <<_ACEOF +#line 10200 "configure" +#include "confdefs.h" +#include +#include <${cf_cv_ncurses_header:-curses.h}> +#include <$cf_test> + +int +main (void) +{ +int x = auto_left_margin; (void)x + ; + return 0; +} +_ACEOF +rm -f "conftest.$ac_objext" +if { (eval echo "$as_me:10215: \"$ac_compile\"") >&5 + (eval $ac_compile) 2>&5 + ac_status=$? + echo "$as_me:10218: \$? = $ac_status" >&5 + (exit "$ac_status"); } && + { ac_try='test -s "conftest.$ac_objext"' + { (eval echo "$as_me:10221: \"$ac_try\"") >&5 + (eval $ac_try) 2>&5 + ac_status=$? + echo "$as_me:10224: \$? = $ac_status" >&5 + (exit "$ac_status"); }; }; then cf_cv_term_header="$cf_test" else echo "$as_me: failed program was:" >&5 -cat conftest.$ac_ext >&5 +cat "conftest.$ac_ext" >&5 cf_cv_term_header=unknown fi -rm -f conftest.$ac_objext conftest.$ac_ext +rm -f "conftest.$ac_objext" "conftest.$ac_ext" test "$cf_cv_term_header" != unknown && break done fi -echo "$as_me:8525: result: $cf_cv_term_header" >&5 +echo "$as_me:10240: result: $cf_cv_term_header" >&5 echo "${ECHO_T}$cf_cv_term_header" >&6 # Set definitions to allow ifdef'ing to accommodate subdirectories -case $cf_cv_term_header in +case "$cf_cv_term_header" in (*term.h) cat >>confdefs.h <<\EOF @@ -8537,7 +10252,7 @@ EOF ;; esac -case $cf_cv_term_header in +case "$cf_cv_term_header" in (ncurses/term.h) cat >>confdefs.h <<\EOF @@ -8557,7 +10272,7 @@ esac fi else - echo "$as_me:8560: result: no" >&5 + echo "$as_me:10275: result: no" >&5 echo "${ECHO_T}no" >&6 NCURSES_CONFIG_PKG=none fi @@ -8573,7 +10288,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:8576: checking for $ac_word" >&5 +echo "$as_me:10291: 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 @@ -8588,7 +10303,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:8591: found $ac_dir/$ac_word" >&5 +echo "$as_me:10306: found $ac_dir/$ac_word" >&5 break done @@ -8596,10 +10311,10 @@ fi fi NCURSES_CONFIG=$ac_cv_prog_NCURSES_CONFIG if test -n "$NCURSES_CONFIG"; then - echo "$as_me:8599: result: $NCURSES_CONFIG" >&5 + echo "$as_me:10314: result: $NCURSES_CONFIG" >&5 echo "${ECHO_T}$NCURSES_CONFIG" >&6 else - echo "$as_me:8602: result: no" >&5 + echo "$as_me:10317: result: no" >&5 echo "${ECHO_T}no" >&6 fi @@ -8612,7 +10327,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:8615: checking for $ac_word" >&5 +echo "$as_me:10330: 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 @@ -8627,7 +10342,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:8630: found $ac_dir/$ac_word" >&5 +echo "$as_me:10345: found $ac_dir/$ac_word" >&5 break done @@ -8635,10 +10350,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:8638: result: $ac_ct_NCURSES_CONFIG" >&5 + echo "$as_me:10353: result: $ac_ct_NCURSES_CONFIG" >&5 echo "${ECHO_T}$ac_ct_NCURSES_CONFIG" >&6 else - echo "$as_me:8641: result: no" >&5 + echo "$as_me:10356: result: no" >&5 echo "${ECHO_T}no" >&6 fi @@ -8651,26 +10366,52 @@ 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 +case "$cf_fix_cppflags" in (no) - case $cf_add_cflags in + case "$cf_add_cflags" in (-undef|-nostdinc*|-I*|-D*|-U*|-E|-P|-C) - case $cf_add_cflags in + case "$cf_add_cflags" in (-D*) - cf_tst_cflags=`echo ${cf_add_cflags} |sed -e 's/^-D[^=]*='\''\"[^"]*//'` + cf_tst_cflags=`echo "${cf_add_cflags}" |sed -e 's/^-D[^=]*='\''\"[^"]*//'` test "x${cf_add_cflags}" != "x${cf_tst_cflags}" \ && test -z "${cf_tst_cflags}" \ && cf_fix_cppflags=yes - if test $cf_fix_cppflags = yes ; then + if test "$cf_fix_cppflags" = yes ; then test -n "$cf_new_extra_cppflags" && cf_new_extra_cppflags="$cf_new_extra_cppflags " cf_new_extra_cppflags="${cf_new_extra_cppflags}$cf_add_cflags" @@ -8689,7 +10430,7 @@ case $cf_fix_cppflags in (*$cf_add_cflags) ;; (*) - case $cf_add_cflags in + case "$cf_add_cflags" in (-D*) cf_tst_cppflags=`echo "x$cf_add_cflags" | sed -e 's/^...//' -e 's/=.*//'` @@ -8719,7 +10460,7 @@ CPPFLAGS=`echo "$CPPFLAGS" | \ test -n "$cf_new_extra_cppflags" && cf_new_extra_cppflags="$cf_new_extra_cppflags " cf_new_extra_cppflags="${cf_new_extra_cppflags}$cf_add_cflags" - cf_tst_cflags=`echo ${cf_add_cflags} |sed -e 's/^[^"]*"'\''//'` + cf_tst_cflags=`echo "${cf_add_cflags}" |sed -e 's/^[^"]*"'\''//'` test "x${cf_add_cflags}" != "x${cf_tst_cflags}" \ && test -z "${cf_tst_cflags}" \ @@ -8749,25 +10490,27 @@ if test -n "$cf_new_extra_cppflags" ; then fi -cf_add_libs="`$NCURSES_CONFIG --libs`" -# Filter out duplicates - this happens with badly-designed ".pc" files... -for cf_add_1lib in $LIBS -do - for cf_add_2lib in $cf_add_libs - do - if test "x$cf_add_1lib" = "x$cf_add_2lib" - then +done + +cf_add_libs="$LIBS" +# reverse order +cf_add_0lib= +for cf_add_1lib in `$NCURSES_CONFIG --libs`; 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_libs $cf_add_1lib" + test -n "$cf_add_1lib" && cf_add_libs="$cf_add_1lib $cf_add_libs" done LIBS="$cf_add_libs" # even with config script, some packages use no-override for curses.h -echo "$as_me:8770: checking if we have identified curses headers" >&5 +echo "$as_me:10513: 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 @@ -8778,44 +10521,44 @@ for cf_header in \ ncurses.h ncurses/ncurses.h \ curses.h ncurses/curses.h do -cat >conftest.$ac_ext <<_ACEOF -#line 8782 "configure" +cat >"conftest.$ac_ext" <<_ACEOF +#line 10525 "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:8794: \"$ac_compile\"") >&5 +rm -f "conftest.$ac_objext" +if { (eval echo "$as_me:10537: \"$ac_compile\"") >&5 (eval $ac_compile) 2>&5 ac_status=$? - echo "$as_me:8797: \$? = $ac_status" >&5 - (exit $ac_status); } && - { ac_try='test -s conftest.$ac_objext' - { (eval echo "$as_me:8800: \"$ac_try\"") >&5 + echo "$as_me:10540: \$? = $ac_status" >&5 + (exit "$ac_status"); } && + { ac_try='test -s "conftest.$ac_objext"' + { (eval echo "$as_me:10543: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? - echo "$as_me:8803: \$? = $ac_status" >&5 - (exit $ac_status); }; }; then + echo "$as_me:10546: \$? = $ac_status" >&5 + (exit "$ac_status"); }; }; then cf_cv_ncurses_header=$cf_header; break else echo "$as_me: failed program was:" >&5 -cat conftest.$ac_ext >&5 +cat "conftest.$ac_ext" >&5 fi -rm -f conftest.$ac_objext conftest.$ac_ext +rm -f "conftest.$ac_objext" "conftest.$ac_ext" done fi -echo "$as_me:8814: result: $cf_cv_ncurses_header" >&5 +echo "$as_me:10557: 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:8818: error: No curses header-files found" >&5 + { { echo "$as_me:10561: error: No curses header-files found" >&5 echo "$as_me: error: No curses header-files found" >&2;} { (exit 1); exit 1; }; } fi @@ -8825,24 +10568,24 @@ 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:8828: checking for $ac_header" >&5 +echo "$as_me:10571: 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 8834 "configure" + cat >"conftest.$ac_ext" <<_ACEOF +#line 10577 "configure" #include "confdefs.h" #include <$ac_header> _ACEOF -if { (eval echo "$as_me:8838: \"$ac_cpp conftest.$ac_ext\"") >&5 - (eval $ac_cpp conftest.$ac_ext) 2>conftest.er1 +if { (eval echo "$as_me:10581: \"$ac_cpp "conftest.$ac_ext"\"") >&5 + (eval $ac_cpp "conftest.$ac_ext") 2>conftest.er1 ac_status=$? - egrep -v '^ *\+' conftest.er1 >conftest.err + $EGREP -v '^ *\+' conftest.er1 >conftest.err rm -f conftest.er1 cat conftest.err >&5 - echo "$as_me:8844: \$? = $ac_status" >&5 - (exit $ac_status); } >/dev/null; then + echo "$as_me:10587: \$? = $ac_status" >&5 + (exit "$ac_status"); } >/dev/null; then if test -s conftest.err; then ac_cpp_err=$ac_c_preproc_warn_flag else @@ -8855,14 +10598,14 @@ 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 + cat "conftest.$ac_ext" >&5 eval "$as_ac_Header=no" fi -rm -f conftest.err conftest.$ac_ext +rm -f conftest.err "conftest.$ac_ext" fi -echo "$as_me:8863: 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 +echo "$as_me:10606: 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 <conftest.$ac_ext <<_ACEOF -#line 8919 "configure" + cat >"conftest.$ac_ext" <<_ACEOF +#line 10662 "configure" #include "confdefs.h" #include int @@ -8927,25 +10670,25 @@ printf("Hello") return 0; } _ACEOF -rm -f conftest.$ac_objext -if { (eval echo "$as_me:8931: \"$ac_compile\"") >&5 +rm -f "conftest.$ac_objext" +if { (eval echo "$as_me:10674: \"$ac_compile\"") >&5 (eval $ac_compile) 2>&5 ac_status=$? - echo "$as_me:8934: \$? = $ac_status" >&5 - (exit $ac_status); } && - { ac_try='test -s conftest.$ac_objext' - { (eval echo "$as_me:8937: \"$ac_try\"") >&5 + echo "$as_me:10677: \$? = $ac_status" >&5 + (exit "$ac_status"); } && + { ac_try='test -s "conftest.$ac_objext"' + { (eval echo "$as_me:10680: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? - echo "$as_me:8940: \$? = $ac_status" >&5 - (exit $ac_status); }; }; then + echo "$as_me:10683: \$? = $ac_status" >&5 + (exit "$ac_status"); }; }; then : else echo "$as_me: failed program was:" >&5 -cat conftest.$ac_ext >&5 +cat "conftest.$ac_ext" >&5 cf_have_incdir=yes fi -rm -f conftest.$ac_objext conftest.$ac_ext +rm -f "conftest.$ac_objext" "conftest.$ac_ext" CPPFLAGS=$cf_save_CPPFLAGS fi fi @@ -8954,11 +10697,11 @@ 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}:8957: testing adding $cf_add_incdir to include-path ..." 1>&5 +echo "${as_me:-configure}:10700: testing adding $cf_add_incdir to include-path ..." 1>&5 CPPFLAGS="$CPPFLAGS -I$cf_add_incdir" - cf_top_incdir=`echo $cf_add_incdir | sed -e 's%/include/.*$%/include%'` + cf_top_incdir=`echo "$cf_add_incdir" | sed -e 's%/include/.*$%/include%'` test "$cf_top_incdir" = "$cf_add_incdir" && break cf_add_incdir="$cf_top_incdir" else @@ -8973,19 +10716,19 @@ fi } -echo "$as_me:8976: checking for $cf_ncuhdr_root header in include-path" >&5 +echo "$as_me:10719: 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 else cf_header_list="$cf_ncuhdr_root/curses.h $cf_ncuhdr_root/ncurses.h" - ( test "$cf_ncuhdr_root" = ncurses || test "$cf_ncuhdr_root" = ncursesw ) && cf_header_list="$cf_header_list curses.h ncurses.h" + { test "$cf_ncuhdr_root" = ncurses || test "$cf_ncuhdr_root" = ncursesw; } && cf_header_list="$cf_header_list curses.h ncurses.h" for cf_header in $cf_header_list do - cat >conftest.$ac_ext <<_ACEOF -#line 8988 "configure" + cat >"conftest.$ac_ext" <<_ACEOF +#line 10731 "configure" #include "confdefs.h" #include <$cf_header> @@ -8995,12 +10738,12 @@ main (void) #ifdef NCURSES_VERSION -printf("%s\n", NCURSES_VERSION); +printf("%s\\n", NCURSES_VERSION); #else #ifdef __NCURSES_H -printf("old\n"); +printf("old\\n"); #else - make an error + #error __NCURSES_H is not defined #endif #endif @@ -9008,39 +10751,39 @@ printf("old\n"); return 0; } _ACEOF -rm -f conftest.$ac_objext -if { (eval echo "$as_me:9012: \"$ac_compile\"") >&5 +rm -f "conftest.$ac_objext" +if { (eval echo "$as_me:10755: \"$ac_compile\"") >&5 (eval $ac_compile) 2>&5 ac_status=$? - echo "$as_me:9015: \$? = $ac_status" >&5 - (exit $ac_status); } && - { ac_try='test -s conftest.$ac_objext' - { (eval echo "$as_me:9018: \"$ac_try\"") >&5 + echo "$as_me:10758: \$? = $ac_status" >&5 + (exit "$ac_status"); } && + { ac_try='test -s "conftest.$ac_objext"' + { (eval echo "$as_me:10761: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? - echo "$as_me:9021: \$? = $ac_status" >&5 - (exit $ac_status); }; }; then + echo "$as_me:10764: \$? = $ac_status" >&5 + (exit "$ac_status"); }; }; then cf_cv_ncurses_h=$cf_header else echo "$as_me: failed program was:" >&5 -cat conftest.$ac_ext >&5 +cat "conftest.$ac_ext" >&5 cf_cv_ncurses_h=no fi -rm -f conftest.$ac_objext conftest.$ac_ext +rm -f "conftest.$ac_objext" "conftest.$ac_ext" test "$cf_cv_ncurses_h" != no && break done fi -echo "$as_me:9036: result: $cf_cv_ncurses_h" >&5 +echo "$as_me:10779: 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:9043: checking for $cf_ncuhdr_root include-path" >&5 +echo "$as_me:10786: 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 @@ -9055,7 +10798,7 @@ cf_header_path_list="" if test -n "${CFLAGS}${CPPFLAGS}" ; then for cf_header_path in $CPPFLAGS $CFLAGS do - case $cf_header_path in + case "$cf_header_path" in (-I*) cf_header_path=`echo ".$cf_header_path" |sed -e 's/^...//' -e 's,/include$,,'` @@ -9063,11 +10806,11 @@ test "x$cf_header_path" != "xNONE" && \ test -d "$cf_header_path" && \ { test -n "$verbose" && echo " ... testing for include-directories under $cf_header_path" - test -d $cf_header_path/include && cf_search="$cf_search $cf_header_path/include" - test -d $cf_header_path/include/$cf_ncuhdr_root && cf_search="$cf_search $cf_header_path/include/$cf_ncuhdr_root" - test -d $cf_header_path/include/$cf_ncuhdr_root/include && cf_search="$cf_search $cf_header_path/include/$cf_ncuhdr_root/include" - test -d $cf_header_path/$cf_ncuhdr_root/include && cf_search="$cf_search $cf_header_path/$cf_ncuhdr_root/include" - test -d $cf_header_path/$cf_ncuhdr_root/include/$cf_ncuhdr_root && cf_search="$cf_search $cf_header_path/$cf_ncuhdr_root/include/$cf_ncuhdr_root" + test -d "$cf_header_path/include" && cf_search="$cf_search $cf_header_path/include" + test -d "$cf_header_path/include/$cf_ncuhdr_root" && cf_search="$cf_search $cf_header_path/include/$cf_ncuhdr_root" + test -d "$cf_header_path/include/$cf_ncuhdr_root/include" && cf_search="$cf_search $cf_header_path/include/$cf_ncuhdr_root/include" + test -d "$cf_header_path/$cf_ncuhdr_root/include" && cf_search="$cf_search $cf_header_path/$cf_ncuhdr_root/include" + test -d "$cf_header_path/$cf_ncuhdr_root/include/$cf_ncuhdr_root" && cf_search="$cf_search $cf_header_path/$cf_ncuhdr_root/include/$cf_ncuhdr_root" } cf_header_path_list="$cf_header_path_list $cf_search" @@ -9084,11 +10827,11 @@ test "x$prefix" != "xNONE" && \ test -d "$prefix" && \ { test -n "$verbose" && echo " ... testing for include-directories under $prefix" - test -d $prefix/include && cf_search="$cf_search $prefix/include" - test -d $prefix/include/$cf_ncuhdr_root && cf_search="$cf_search $prefix/include/$cf_ncuhdr_root" - test -d $prefix/include/$cf_ncuhdr_root/include && cf_search="$cf_search $prefix/include/$cf_ncuhdr_root/include" - test -d $prefix/$cf_ncuhdr_root/include && cf_search="$cf_search $prefix/$cf_ncuhdr_root/include" - test -d $prefix/$cf_ncuhdr_root/include/$cf_ncuhdr_root && cf_search="$cf_search $prefix/$cf_ncuhdr_root/include/$cf_ncuhdr_root" + test -d "$prefix/include" && cf_search="$cf_search $prefix/include" + test -d "$prefix/include/$cf_ncuhdr_root" && cf_search="$cf_search $prefix/include/$cf_ncuhdr_root" + test -d "$prefix/include/$cf_ncuhdr_root/include" && cf_search="$cf_search $prefix/include/$cf_ncuhdr_root/include" + test -d "$prefix/$cf_ncuhdr_root/include" && cf_search="$cf_search $prefix/$cf_ncuhdr_root/include" + test -d "$prefix/$cf_ncuhdr_root/include/$cf_ncuhdr_root" && cf_search="$cf_search $prefix/$cf_ncuhdr_root/include/$cf_ncuhdr_root" } for cf_subdir_prefix in \ @@ -9102,13 +10845,13 @@ do test "x$cf_subdir_prefix" != "x$prefix" && \ test -d "$cf_subdir_prefix" && \ -(test -z "$prefix" || test x$prefix = xNONE || test "x$cf_subdir_prefix" != "x$prefix") && { +{ test -z "$prefix" || test "x$prefix" = xNONE || test "x$cf_subdir_prefix" != "x$prefix"; } && { test -n "$verbose" && echo " ... testing for include-directories under $cf_subdir_prefix" - test -d $cf_subdir_prefix/include && cf_search="$cf_search $cf_subdir_prefix/include" - test -d $cf_subdir_prefix/include/$cf_ncuhdr_root && cf_search="$cf_search $cf_subdir_prefix/include/$cf_ncuhdr_root" - test -d $cf_subdir_prefix/include/$cf_ncuhdr_root/include && cf_search="$cf_search $cf_subdir_prefix/include/$cf_ncuhdr_root/include" - test -d $cf_subdir_prefix/$cf_ncuhdr_root/include && cf_search="$cf_search $cf_subdir_prefix/$cf_ncuhdr_root/include" - test -d $cf_subdir_prefix/$cf_ncuhdr_root/include/$cf_ncuhdr_root && cf_search="$cf_search $cf_subdir_prefix/$cf_ncuhdr_root/include/$cf_ncuhdr_root" + test -d "$cf_subdir_prefix/include" && cf_search="$cf_search $cf_subdir_prefix/include" + test -d "$cf_subdir_prefix/include/$cf_ncuhdr_root" && cf_search="$cf_search $cf_subdir_prefix/include/$cf_ncuhdr_root" + test -d "$cf_subdir_prefix/include/$cf_ncuhdr_root/include" && cf_search="$cf_search $cf_subdir_prefix/include/$cf_ncuhdr_root/include" + test -d "$cf_subdir_prefix/$cf_ncuhdr_root/include" && cf_search="$cf_search $cf_subdir_prefix/$cf_ncuhdr_root/include" + test -d "$cf_subdir_prefix/$cf_ncuhdr_root/include/$cf_ncuhdr_root" && cf_search="$cf_search $cf_subdir_prefix/$cf_ncuhdr_root/include/$cf_ncuhdr_root" } done @@ -9116,20 +10859,20 @@ done test "$includedir" != NONE && \ test "$includedir" != "/usr/include" && \ test -d "$includedir" && { - test -d $includedir && cf_search="$cf_search $includedir" - test -d $includedir/$cf_ncuhdr_root && cf_search="$cf_search $includedir/$cf_ncuhdr_root" + test -d "$includedir" && cf_search="$cf_search $includedir" + test -d "$includedir/$cf_ncuhdr_root" && cf_search="$cf_search $includedir/$cf_ncuhdr_root" } test "$oldincludedir" != NONE && \ test "$oldincludedir" != "/usr/include" && \ test -d "$oldincludedir" && { - test -d $oldincludedir && cf_search="$cf_search $oldincludedir" - test -d $oldincludedir/$cf_ncuhdr_root && cf_search="$cf_search $oldincludedir/$cf_ncuhdr_root" + test -d "$oldincludedir" && cf_search="$cf_search $oldincludedir" + test -d "$oldincludedir/$cf_ncuhdr_root" && cf_search="$cf_search $oldincludedir/$cf_ncuhdr_root" } cf_search="$cf_search $cf_header_path_list" - test -n "$verbose" && echo search path $cf_search + test -n "$verbose" && echo "search path $cf_search" cf_save2_CPPFLAGS="$CPPFLAGS" for cf_incdir in $cf_search do @@ -9137,9 +10880,9 @@ cf_search="$cf_search $cf_header_path_list" if test -n "$cf_incdir" ; then for cf_add_incdir in $cf_incdir do - while test $cf_add_incdir != /usr/include + while test "$cf_add_incdir" != /usr/include do - if test -d $cf_add_incdir + if test -d "$cf_add_incdir" then cf_have_incdir=no if test -n "$CFLAGS$CPPFLAGS" ; then @@ -9160,8 +10903,8 @@ if test -n "$cf_incdir" ; then test -n "$CPPFLAGS" && CPPFLAGS="$CPPFLAGS " CPPFLAGS="${CPPFLAGS}-I$cf_add_incdir" - cat >conftest.$ac_ext <<_ACEOF -#line 9164 "configure" + cat >"conftest.$ac_ext" <<_ACEOF +#line 10907 "configure" #include "confdefs.h" #include int @@ -9172,25 +10915,25 @@ printf("Hello") return 0; } _ACEOF -rm -f conftest.$ac_objext -if { (eval echo "$as_me:9176: \"$ac_compile\"") >&5 +rm -f "conftest.$ac_objext" +if { (eval echo "$as_me:10919: \"$ac_compile\"") >&5 (eval $ac_compile) 2>&5 ac_status=$? - echo "$as_me:9179: \$? = $ac_status" >&5 - (exit $ac_status); } && - { ac_try='test -s conftest.$ac_objext' - { (eval echo "$as_me:9182: \"$ac_try\"") >&5 + echo "$as_me:10922: \$? = $ac_status" >&5 + (exit "$ac_status"); } && + { ac_try='test -s "conftest.$ac_objext"' + { (eval echo "$as_me:10925: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? - echo "$as_me:9185: \$? = $ac_status" >&5 - (exit $ac_status); }; }; then + echo "$as_me:10928: \$? = $ac_status" >&5 + (exit "$ac_status"); }; }; then : else echo "$as_me: failed program was:" >&5 -cat conftest.$ac_ext >&5 +cat "conftest.$ac_ext" >&5 cf_have_incdir=yes fi -rm -f conftest.$ac_objext conftest.$ac_ext +rm -f "conftest.$ac_objext" "conftest.$ac_ext" CPPFLAGS=$cf_save_CPPFLAGS fi fi @@ -9199,11 +10942,11 @@ 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}:9202: testing adding $cf_add_incdir to include-path ..." 1>&5 +echo "${as_me:-configure}:10945: testing adding $cf_add_incdir to include-path ..." 1>&5 CPPFLAGS="$CPPFLAGS -I$cf_add_incdir" - cf_top_incdir=`echo $cf_add_incdir | sed -e 's%/include/.*$%/include%'` + cf_top_incdir=`echo "$cf_add_incdir" | sed -e 's%/include/.*$%/include%'` test "$cf_top_incdir" = "$cf_add_incdir" && break cf_add_incdir="$cf_top_incdir" else @@ -9221,8 +10964,8 @@ fi curses.h do - cat >conftest.$ac_ext <<_ACEOF -#line 9225 "configure" + cat >"conftest.$ac_ext" <<_ACEOF +#line 10968 "configure" #include "confdefs.h" #include <$cf_header> @@ -9232,12 +10975,12 @@ main (void) #ifdef NCURSES_VERSION -printf("%s\n", NCURSES_VERSION); +printf("%s\\n", NCURSES_VERSION); #else #ifdef __NCURSES_H -printf("old\n"); +printf("old\\n"); #else - make an error + #error __NCURSES_H is not defined #endif #endif @@ -9245,30 +10988,30 @@ printf("old\n"); return 0; } _ACEOF -rm -f conftest.$ac_objext -if { (eval echo "$as_me:9249: \"$ac_compile\"") >&5 +rm -f "conftest.$ac_objext" +if { (eval echo "$as_me:10992: \"$ac_compile\"") >&5 (eval $ac_compile) 2>&5 ac_status=$? - echo "$as_me:9252: \$? = $ac_status" >&5 - (exit $ac_status); } && - { ac_try='test -s conftest.$ac_objext' - { (eval echo "$as_me:9255: \"$ac_try\"") >&5 + echo "$as_me:10995: \$? = $ac_status" >&5 + (exit "$ac_status"); } && + { ac_try='test -s "conftest.$ac_objext"' + { (eval echo "$as_me:10998: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? - echo "$as_me:9258: \$? = $ac_status" >&5 - (exit $ac_status); }; }; then + echo "$as_me:11001: \$? = $ac_status" >&5 + (exit "$ac_status"); }; }; then cf_cv_ncurses_h2=$cf_header else echo "$as_me: failed program was:" >&5 -cat conftest.$ac_ext >&5 +cat "conftest.$ac_ext" >&5 cf_cv_ncurses_h2=no fi -rm -f conftest.$ac_objext conftest.$ac_ext +rm -f "conftest.$ac_objext" "conftest.$ac_ext" if test "$cf_cv_ncurses_h2" != no ; then cf_cv_ncurses_h2=$cf_incdir/$cf_header - test -n "$verbose" && echo $ac_n " ... found $ac_c" 1>&6 + test -n "$verbose" && echo $ECHO_N " ... found $ECHO_C" 1>&6 break fi test -n "$verbose" && echo " ... tested $cf_incdir/$cf_header" 1>&6 @@ -9276,26 +11019,26 @@ 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:9279: error: not found" >&5 + test "$cf_cv_ncurses_h2" = no && { { echo "$as_me:11022: error: not found" >&5 echo "$as_me: error: not found" >&2;} { (exit 1); exit 1; }; } fi -echo "$as_me:9284: result: $cf_cv_ncurses_h2" >&5 +echo "$as_me:11027: 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%/[^/]*$%%'` - cf_cv_ncurses_header=`basename $cf_cv_ncurses_h2` - if test `basename $cf_1st_incdir` = $cf_ncuhdr_root ; then - cf_cv_ncurses_header=$cf_ncuhdr_root/$cf_cv_ncurses_header + cf_1st_incdir=`echo "$cf_cv_ncurses_h2" | sed -e 's%/[^/]*$%%'` + cf_cv_ncurses_header="`basename "$cf_cv_ncurses_h2"`" + if test "`basename "$cf_1st_incdir"`" = "$cf_ncuhdr_root" ; then + cf_cv_ncurses_header="$cf_ncuhdr_root/$cf_cv_ncurses_header" fi if test -n "$cf_1st_incdir" ; then for cf_add_incdir in $cf_1st_incdir do - while test $cf_add_incdir != /usr/include + while test "$cf_add_incdir" != /usr/include do - if test -d $cf_add_incdir + if test -d "$cf_add_incdir" then cf_have_incdir=no if test -n "$CFLAGS$CPPFLAGS" ; then @@ -9316,8 +11059,8 @@ if test -n "$cf_1st_incdir" ; then test -n "$CPPFLAGS" && CPPFLAGS="$CPPFLAGS " CPPFLAGS="${CPPFLAGS}-I$cf_add_incdir" - cat >conftest.$ac_ext <<_ACEOF -#line 9320 "configure" + cat >"conftest.$ac_ext" <<_ACEOF +#line 11063 "configure" #include "confdefs.h" #include int @@ -9328,25 +11071,25 @@ printf("Hello") return 0; } _ACEOF -rm -f conftest.$ac_objext -if { (eval echo "$as_me:9332: \"$ac_compile\"") >&5 +rm -f "conftest.$ac_objext" +if { (eval echo "$as_me:11075: \"$ac_compile\"") >&5 (eval $ac_compile) 2>&5 ac_status=$? - echo "$as_me:9335: \$? = $ac_status" >&5 - (exit $ac_status); } && - { ac_try='test -s conftest.$ac_objext' - { (eval echo "$as_me:9338: \"$ac_try\"") >&5 + echo "$as_me:11078: \$? = $ac_status" >&5 + (exit "$ac_status"); } && + { ac_try='test -s "conftest.$ac_objext"' + { (eval echo "$as_me:11081: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? - echo "$as_me:9341: \$? = $ac_status" >&5 - (exit $ac_status); }; }; then + echo "$as_me:11084: \$? = $ac_status" >&5 + (exit "$ac_status"); }; }; then : else echo "$as_me: failed program was:" >&5 -cat conftest.$ac_ext >&5 +cat "conftest.$ac_ext" >&5 cf_have_incdir=yes fi -rm -f conftest.$ac_objext conftest.$ac_ext +rm -f "conftest.$ac_objext" "conftest.$ac_ext" CPPFLAGS=$cf_save_CPPFLAGS fi fi @@ -9355,11 +11098,11 @@ 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}:9358: testing adding $cf_add_incdir to include-path ..." 1>&5 +echo "${as_me:-configure}:11101: testing adding $cf_add_incdir to include-path ..." 1>&5 CPPFLAGS="$CPPFLAGS -I$cf_add_incdir" - cf_top_incdir=`echo $cf_add_incdir | sed -e 's%/include/.*$%/include%'` + cf_top_incdir=`echo "$cf_add_incdir" | sed -e 's%/include/.*$%/include%'` test "$cf_top_incdir" = "$cf_add_incdir" && break cf_add_incdir="$cf_top_incdir" else @@ -9376,7 +11119,7 @@ fi # Set definitions to allow ifdef'ing for ncurses.h -case $cf_cv_ncurses_header in +case "$cf_cv_ncurses_header" in (*ncurses.h) cat >>confdefs.h <<\EOF @@ -9386,7 +11129,7 @@ EOF ;; esac -case $cf_cv_ncurses_header in +case "$cf_cv_ncurses_header" in (ncurses/curses.h|ncurses/ncurses.h) cat >>confdefs.h <<\EOF @@ -9403,13 +11146,13 @@ EOF ;; esac -echo "$as_me:9406: checking for terminfo header" >&5 +echo "$as_me:11149: 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 else -case ${cf_cv_ncurses_header} in +case "${cf_cv_ncurses_header}" in (*/ncurses.h|*/ncursesw.h) cf_term_header=`echo "$cf_cv_ncurses_header" | sed -e 's%ncurses[^.]*\.h$%term.h%'` ;; @@ -9420,8 +11163,8 @@ esac for cf_test in $cf_term_header "ncurses/term.h" "ncursesw/term.h" do -cat >conftest.$ac_ext <<_ACEOF -#line 9424 "configure" +cat >"conftest.$ac_ext" <<_ACEOF +#line 11167 "configure" #include "confdefs.h" #include #include <${cf_cv_ncurses_header:-curses.h}> @@ -9430,43 +11173,43 @@ cat >conftest.$ac_ext <<_ACEOF int main (void) { -int x = auto_left_margin +int x = auto_left_margin; (void)x ; return 0; } _ACEOF -rm -f conftest.$ac_objext -if { (eval echo "$as_me:9439: \"$ac_compile\"") >&5 +rm -f "conftest.$ac_objext" +if { (eval echo "$as_me:11182: \"$ac_compile\"") >&5 (eval $ac_compile) 2>&5 ac_status=$? - echo "$as_me:9442: \$? = $ac_status" >&5 - (exit $ac_status); } && - { ac_try='test -s conftest.$ac_objext' - { (eval echo "$as_me:9445: \"$ac_try\"") >&5 + echo "$as_me:11185: \$? = $ac_status" >&5 + (exit "$ac_status"); } && + { ac_try='test -s "conftest.$ac_objext"' + { (eval echo "$as_me:11188: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? - echo "$as_me:9448: \$? = $ac_status" >&5 - (exit $ac_status); }; }; then + echo "$as_me:11191: \$? = $ac_status" >&5 + (exit "$ac_status"); }; }; then cf_cv_term_header="$cf_test" else echo "$as_me: failed program was:" >&5 -cat conftest.$ac_ext >&5 +cat "conftest.$ac_ext" >&5 cf_cv_term_header=unknown fi -rm -f conftest.$ac_objext conftest.$ac_ext +rm -f "conftest.$ac_objext" "conftest.$ac_ext" test "$cf_cv_term_header" != unknown && break done fi -echo "$as_me:9464: result: $cf_cv_term_header" >&5 +echo "$as_me:11207: result: $cf_cv_term_header" >&5 echo "${ECHO_T}$cf_cv_term_header" >&6 # Set definitions to allow ifdef'ing to accommodate subdirectories -case $cf_cv_term_header in +case "$cf_cv_term_header" in (*term.h) cat >>confdefs.h <<\EOF @@ -9476,7 +11219,7 @@ EOF ;; esac -case $cf_cv_term_header in +case "$cf_cv_term_header" in (ncurses/term.h) cat >>confdefs.h <<\EOF @@ -9499,7 +11242,7 @@ cat >>confdefs.h <<\EOF #define NCURSES 1 EOF -echo "$as_me:9502: checking for ncurses version" >&5 +echo "$as_me:11245: 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 @@ -9507,12 +11250,12 @@ else cf_cv_ncurses_version=no cf_tempfile=out$$ - rm -f $cf_tempfile + rm -f "$cf_tempfile" if test "$cross_compiling" = yes; then # This will not work if the preprocessor splits the line after the # Autoconf token. The 'unproto' program does that. - cat > conftest.$ac_ext < "conftest.$ac_ext" < #undef Autoconf #ifdef NCURSES_VERSION @@ -9525,67 +11268,69 @@ Autoconf "old" #endif EOF cf_try="$ac_cpp conftest.$ac_ext 2>&5 | grep '^Autoconf ' >conftest.out" - { (eval echo "$as_me:9528: \"$cf_try\"") >&5 + { (eval echo "$as_me:11271: \"$cf_try\"") >&5 (eval $cf_try) 2>&5 ac_status=$? - echo "$as_me:9531: \$? = $ac_status" >&5 - (exit $ac_status); } + echo "$as_me:11274: \$? = $ac_status" >&5 + (exit "$ac_status"); } if test -f conftest.out ; then - cf_out=`cat conftest.out | sed -e 's%^Autoconf %%' -e 's%^[^"]*"%%' -e 's%".*%%'` + cf_out=`sed -e 's%^Autoconf %%' -e 's%^[^"]*"%%' -e 's%".*%%' conftest.out` test -n "$cf_out" && cf_cv_ncurses_version="$cf_out" rm -f conftest.out fi else - cat >conftest.$ac_ext <<_ACEOF -#line 9541 "configure" + cat >"conftest.$ac_ext" <<_ACEOF +#line 11284 "configure" #include "confdefs.h" +$ac_includes_default + #include <${cf_cv_ncurses_header:-curses.h}> -#include + int main(void) { FILE *fp = fopen("$cf_tempfile", "w"); #ifdef NCURSES_VERSION # ifdef NCURSES_VERSION_PATCH - fprintf(fp, "%s.%d\n", NCURSES_VERSION, NCURSES_VERSION_PATCH); + fprintf(fp, "%s.%d\\n", NCURSES_VERSION, NCURSES_VERSION_PATCH); # else - fprintf(fp, "%s\n", NCURSES_VERSION); + fprintf(fp, "%s\\n", NCURSES_VERSION); # endif #else # ifdef __NCURSES_H - fprintf(fp, "old\n"); + 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:9566: \"$ac_link\"") >&5 +rm -f "conftest$ac_exeext" +if { (eval echo "$as_me:11311: \"$ac_link\"") >&5 (eval $ac_link) 2>&5 ac_status=$? - echo "$as_me:9569: \$? = $ac_status" >&5 - (exit $ac_status); } && { ac_try='./conftest$ac_exeext' - { (eval echo "$as_me:9571: \"$ac_try\"") >&5 + echo "$as_me:11314: \$? = $ac_status" >&5 + (exit "$ac_status"); } && { ac_try='"./conftest$ac_exeext"' + { (eval echo "$as_me:11316: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? - echo "$as_me:9574: \$? = $ac_status" >&5 - (exit $ac_status); }; }; then + echo "$as_me:11319: \$? = $ac_status" >&5 + (exit "$ac_status"); }; }; then cf_cv_ncurses_version=`cat $cf_tempfile` else echo "$as_me: program exited with status $ac_status" >&5 echo "$as_me: failed program was:" >&5 -cat conftest.$ac_ext >&5 +cat "conftest.$ac_ext" >&5 fi -rm -f core core.* *.core conftest$ac_exeext conftest.$ac_objext conftest.$ac_ext +rm -f core ./core.* ./*.core "conftest$ac_exeext" "conftest.$ac_objext" "conftest.$ac_ext" fi - rm -f $cf_tempfile + rm -f "$cf_tempfile" fi -echo "$as_me:9588: result: $cf_cv_ncurses_version" >&5 +echo "$as_me:11333: result: $cf_cv_ncurses_version" >&5 echo "${ECHO_T}$cf_cv_ncurses_version" >&6 test "$cf_cv_ncurses_version" = no || cat >>confdefs.h <<\EOF @@ -9598,15 +11343,15 @@ cf_nculib_root=ncurses # to link gpm. cf_ncurses_LIBS="" cf_ncurses_SAVE="$LIBS" -echo "$as_me:9601: checking for Gpm_Open in -lgpm" >&5 +echo "$as_me:11346: 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 else ac_check_lib_save_LIBS=$LIBS LIBS="-lgpm $LIBS" -cat >conftest.$ac_ext <<_ACEOF -#line 9609 "configure" +cat >"conftest.$ac_ext" <<_ACEOF +#line 11354 "configure" #include "confdefs.h" /* Override any gcc2 internal prototype to avoid an error. */ @@ -9615,7 +11360,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) { @@ -9624,39 +11369,39 @@ Gpm_Open (); return 0; } _ACEOF -rm -f conftest.$ac_objext conftest$ac_exeext -if { (eval echo "$as_me:9628: \"$ac_link\"") >&5 +rm -f "conftest.$ac_objext" "conftest$ac_exeext" +if { (eval echo "$as_me:11373: \"$ac_link\"") >&5 (eval $ac_link) 2>&5 ac_status=$? - echo "$as_me:9631: \$? = $ac_status" >&5 - (exit $ac_status); } && - { ac_try='test -s conftest$ac_exeext' - { (eval echo "$as_me:9634: \"$ac_try\"") >&5 + echo "$as_me:11376: \$? = $ac_status" >&5 + (exit "$ac_status"); } && + { ac_try='test -s "conftest$ac_exeext"' + { (eval echo "$as_me:11379: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? - echo "$as_me:9637: \$? = $ac_status" >&5 - (exit $ac_status); }; }; then + echo "$as_me:11382: \$? = $ac_status" >&5 + (exit "$ac_status"); }; }; then ac_cv_lib_gpm_Gpm_Open=yes else echo "$as_me: failed program was:" >&5 -cat conftest.$ac_ext >&5 +cat "conftest.$ac_ext" >&5 ac_cv_lib_gpm_Gpm_Open=no fi -rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext +rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext" LIBS=$ac_check_lib_save_LIBS fi -echo "$as_me:9648: result: $ac_cv_lib_gpm_Gpm_Open" >&5 +echo "$as_me:11393: 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:9651: checking for initscr in -lgpm" >&5 +if test "$ac_cv_lib_gpm_Gpm_Open" = yes; then + echo "$as_me:11396: 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 else ac_check_lib_save_LIBS=$LIBS LIBS="-lgpm $LIBS" -cat >conftest.$ac_ext <<_ACEOF -#line 9659 "configure" +cat >"conftest.$ac_ext" <<_ACEOF +#line 11404 "configure" #include "confdefs.h" /* Override any gcc2 internal prototype to avoid an error. */ @@ -9665,7 +11410,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) { @@ -9674,30 +11419,30 @@ initscr (); return 0; } _ACEOF -rm -f conftest.$ac_objext conftest$ac_exeext -if { (eval echo "$as_me:9678: \"$ac_link\"") >&5 +rm -f "conftest.$ac_objext" "conftest$ac_exeext" +if { (eval echo "$as_me:11423: \"$ac_link\"") >&5 (eval $ac_link) 2>&5 ac_status=$? - echo "$as_me:9681: \$? = $ac_status" >&5 - (exit $ac_status); } && - { ac_try='test -s conftest$ac_exeext' - { (eval echo "$as_me:9684: \"$ac_try\"") >&5 + echo "$as_me:11426: \$? = $ac_status" >&5 + (exit "$ac_status"); } && + { ac_try='test -s "conftest$ac_exeext"' + { (eval echo "$as_me:11429: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? - echo "$as_me:9687: \$? = $ac_status" >&5 - (exit $ac_status); }; }; then + echo "$as_me:11432: \$? = $ac_status" >&5 + (exit "$ac_status"); }; }; then ac_cv_lib_gpm_initscr=yes else echo "$as_me: failed program was:" >&5 -cat conftest.$ac_ext >&5 +cat "conftest.$ac_ext" >&5 ac_cv_lib_gpm_initscr=no fi -rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext +rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext" LIBS=$ac_check_lib_save_LIBS fi -echo "$as_me:9698: result: $ac_cv_lib_gpm_initscr" >&5 +echo "$as_me:11443: 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 +if test "$ac_cv_lib_gpm_initscr" = yes; then LIBS="$cf_ncurses_SAVE" else cf_ncurses_LIBS="-lgpm" @@ -9705,20 +11450,20 @@ fi fi -case $host_os in +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:9713: checking for tgoto in -lmytinfo" >&5 + echo "$as_me:11458: 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 else ac_check_lib_save_LIBS=$LIBS LIBS="-lmytinfo $LIBS" -cat >conftest.$ac_ext <<_ACEOF -#line 9721 "configure" +cat >"conftest.$ac_ext" <<_ACEOF +#line 11466 "configure" #include "confdefs.h" /* Override any gcc2 internal prototype to avoid an error. */ @@ -9727,7 +11472,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) { @@ -9736,30 +11481,30 @@ tgoto (); return 0; } _ACEOF -rm -f conftest.$ac_objext conftest$ac_exeext -if { (eval echo "$as_me:9740: \"$ac_link\"") >&5 +rm -f "conftest.$ac_objext" "conftest$ac_exeext" +if { (eval echo "$as_me:11485: \"$ac_link\"") >&5 (eval $ac_link) 2>&5 ac_status=$? - echo "$as_me:9743: \$? = $ac_status" >&5 - (exit $ac_status); } && - { ac_try='test -s conftest$ac_exeext' - { (eval echo "$as_me:9746: \"$ac_try\"") >&5 + echo "$as_me:11488: \$? = $ac_status" >&5 + (exit "$ac_status"); } && + { ac_try='test -s "conftest$ac_exeext"' + { (eval echo "$as_me:11491: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? - echo "$as_me:9749: \$? = $ac_status" >&5 - (exit $ac_status); }; }; then + echo "$as_me:11494: \$? = $ac_status" >&5 + (exit "$ac_status"); }; }; then ac_cv_lib_mytinfo_tgoto=yes else echo "$as_me: failed program was:" >&5 -cat conftest.$ac_ext >&5 +cat "conftest.$ac_ext" >&5 ac_cv_lib_mytinfo_tgoto=no fi -rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext +rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext" LIBS=$ac_check_lib_save_LIBS fi -echo "$as_me:9760: result: $ac_cv_lib_mytinfo_tgoto" >&5 +echo "$as_me:11505: 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 +if test "$ac_cv_lib_mytinfo_tgoto" = yes; then cf_ncurses_LIBS="-lmytinfo $cf_ncurses_LIBS" fi @@ -9767,113 +11512,113 @@ fi ;; esac -cf_add_libs="$cf_ncurses_LIBS" -# Filter out duplicates - this happens with badly-designed ".pc" files... -for cf_add_1lib in $LIBS -do - for cf_add_2lib in $cf_add_libs - do - if test "x$cf_add_1lib" = "x$cf_add_2lib" - then +cf_add_libs="$LIBS" +# reverse order +cf_add_0lib= +for cf_add_1lib in $cf_ncurses_LIBS; 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_libs $cf_add_1lib" + test -n "$cf_add_1lib" && cf_add_libs="$cf_add_1lib $cf_add_libs" done LIBS="$cf_add_libs" -if ( test -n "$cf_cv_curses_dir" && test "$cf_cv_curses_dir" != "no" ) +if test -n "$cf_cv_curses_dir" && test "$cf_cv_curses_dir" != "no" then -cf_add_libs="-l$cf_nculib_root" -# Filter out duplicates - this happens with badly-designed ".pc" files... -for cf_add_1lib in $LIBS -do - for cf_add_2lib in $cf_add_libs - do - if test "x$cf_add_1lib" = "x$cf_add_2lib" - then +cf_add_libs="$LIBS" +# reverse order +cf_add_0lib= +for cf_add_1lib in -l$cf_nculib_root; 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_libs $cf_add_1lib" + test -n "$cf_add_1lib" && cf_add_libs="$cf_add_1lib $cf_add_libs" done LIBS="$cf_add_libs" else - eval 'cf_cv_have_lib_'$cf_nculib_root'=no' + eval 'cf_cv_have_lib_'"$cf_nculib_root"'=no' cf_libdir="" - echo "$as_me:9809: checking for initscr" >&5 + echo "$as_me:11554: 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 9815 "configure" + cat >"conftest.$ac_ext" <<_ACEOF +#line 11560 "configure" #include "confdefs.h" -/* System header to define __stub macros and hopefully few prototypes, - which can conflict with char initscr (); below. */ -#include -/* Override any gcc2 internal prototype to avoid an error. */ +#define initscr autoconf_temporary +#include /* least-intrusive standard header which defines gcc2 __stub macros */ +#undef initscr + #ifdef __cplusplus 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 (*f) (); +char initscr (void); int main (void) { -/* The GNU C library defines this for functions which it implements + +/* The GNU C library defines stubs for functions which it implements to always fail with ENOSYS. Some functions are actually named something starting with __ and the normal name is an alias. */ #if defined (__stub_initscr) || defined (__stub___initscr) -choke me -#else -f = initscr; /* workaround for ICC 12.0.3 */ if (f == 0) return 1; +#error found stub for initscr #endif + return initscr (); ; return 0; } _ACEOF -rm -f conftest.$ac_objext conftest$ac_exeext -if { (eval echo "$as_me:9846: \"$ac_link\"") >&5 +rm -f "conftest.$ac_objext" "conftest$ac_exeext" +if { (eval echo "$as_me:11591: \"$ac_link\"") >&5 (eval $ac_link) 2>&5 ac_status=$? - echo "$as_me:9849: \$? = $ac_status" >&5 - (exit $ac_status); } && - { ac_try='test -s conftest$ac_exeext' - { (eval echo "$as_me:9852: \"$ac_try\"") >&5 + echo "$as_me:11594: \$? = $ac_status" >&5 + (exit "$ac_status"); } && + { ac_try='test -s "conftest$ac_exeext"' + { (eval echo "$as_me:11597: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? - echo "$as_me:9855: \$? = $ac_status" >&5 - (exit $ac_status); }; }; then + echo "$as_me:11600: \$? = $ac_status" >&5 + (exit "$ac_status"); }; }; then ac_cv_func_initscr=yes else echo "$as_me: failed program was:" >&5 -cat conftest.$ac_ext >&5 +cat "conftest.$ac_ext" >&5 ac_cv_func_initscr=no fi -rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext +rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext" fi -echo "$as_me:9865: result: $ac_cv_func_initscr" >&5 +echo "$as_me:11610: 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' +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:9872: checking for initscr in -l$cf_nculib_root" >&5 + echo "$as_me:11617: 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 9876 "configure" + cat >"conftest.$ac_ext" <<_ACEOF +#line 11621 "configure" #include "confdefs.h" #include <${cf_cv_ncurses_header:-curses.h}> int @@ -9884,26 +11629,26 @@ initscr() return 0; } _ACEOF -rm -f conftest.$ac_objext conftest$ac_exeext -if { (eval echo "$as_me:9888: \"$ac_link\"") >&5 +rm -f "conftest.$ac_objext" "conftest$ac_exeext" +if { (eval echo "$as_me:11633: \"$ac_link\"") >&5 (eval $ac_link) 2>&5 ac_status=$? - echo "$as_me:9891: \$? = $ac_status" >&5 - (exit $ac_status); } && - { ac_try='test -s conftest$ac_exeext' - { (eval echo "$as_me:9894: \"$ac_try\"") >&5 + echo "$as_me:11636: \$? = $ac_status" >&5 + (exit "$ac_status"); } && + { ac_try='test -s "conftest$ac_exeext"' + { (eval echo "$as_me:11639: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? - echo "$as_me:9897: \$? = $ac_status" >&5 - (exit $ac_status); }; }; then - echo "$as_me:9899: result: yes" >&5 + echo "$as_me:11642: \$? = $ac_status" >&5 + (exit "$ac_status"); }; }; then + echo "$as_me:11644: result: yes" >&5 echo "${ECHO_T}yes" >&6 - eval 'cf_cv_have_lib_'$cf_nculib_root'=yes' + 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:9906: result: no" >&5 +cat "conftest.$ac_ext" >&5 +echo "$as_me:11651: result: no" >&5 echo "${ECHO_T}no" >&6 cf_search= @@ -9911,7 +11656,7 @@ cf_library_path_list="" if test -n "${LDFLAGS}${LIBS}" ; then for cf_library_path in $LDFLAGS $LIBS do - case $cf_library_path in + case "$cf_library_path" in (-L*) cf_library_path=`echo ".$cf_library_path" |sed -e 's/^...//' -e 's,/lib$,,'` @@ -9919,11 +11664,11 @@ test "x$cf_library_path" != "xNONE" && \ test -d "$cf_library_path" && \ { test -n "$verbose" && echo " ... testing for lib-directories under $cf_library_path" - test -d $cf_library_path/lib && cf_search="$cf_search $cf_library_path/lib" - test -d $cf_library_path/lib/$cf_nculib_root && cf_search="$cf_search $cf_library_path/lib/$cf_nculib_root" - test -d $cf_library_path/lib/$cf_nculib_root/lib && cf_search="$cf_search $cf_library_path/lib/$cf_nculib_root/lib" - test -d $cf_library_path/$cf_nculib_root/lib && cf_search="$cf_search $cf_library_path/$cf_nculib_root/lib" - test -d $cf_library_path/$cf_nculib_root/lib/$cf_nculib_root && cf_search="$cf_search $cf_library_path/$cf_nculib_root/lib/$cf_nculib_root" + test -d "$cf_library_path/lib" && cf_search="$cf_search $cf_library_path/lib" + test -d "$cf_library_path/lib/$cf_nculib_root" && cf_search="$cf_search $cf_library_path/lib/$cf_nculib_root" + test -d "$cf_library_path/lib/$cf_nculib_root/lib" && cf_search="$cf_search $cf_library_path/lib/$cf_nculib_root/lib" + test -d "$cf_library_path/$cf_nculib_root/lib" && cf_search="$cf_search $cf_library_path/$cf_nculib_root/lib" + test -d "$cf_library_path/$cf_nculib_root/lib/$cf_nculib_root" && cf_search="$cf_search $cf_library_path/$cf_nculib_root/lib/$cf_nculib_root" } cf_library_path_list="$cf_library_path_list $cf_search" @@ -9938,11 +11683,11 @@ test "x$prefix" != "xNONE" && \ test -d "$prefix" && \ { test -n "$verbose" && echo " ... testing for lib-directories under $prefix" - test -d $prefix/lib && cf_search="$cf_search $prefix/lib" - test -d $prefix/lib/$cf_nculib_root && cf_search="$cf_search $prefix/lib/$cf_nculib_root" - test -d $prefix/lib/$cf_nculib_root/lib && cf_search="$cf_search $prefix/lib/$cf_nculib_root/lib" - test -d $prefix/$cf_nculib_root/lib && cf_search="$cf_search $prefix/$cf_nculib_root/lib" - test -d $prefix/$cf_nculib_root/lib/$cf_nculib_root && cf_search="$cf_search $prefix/$cf_nculib_root/lib/$cf_nculib_root" + test -d "$prefix/lib" && cf_search="$cf_search $prefix/lib" + test -d "$prefix/lib/$cf_nculib_root" && cf_search="$cf_search $prefix/lib/$cf_nculib_root" + test -d "$prefix/lib/$cf_nculib_root/lib" && cf_search="$cf_search $prefix/lib/$cf_nculib_root/lib" + test -d "$prefix/$cf_nculib_root/lib" && cf_search="$cf_search $prefix/$cf_nculib_root/lib" + test -d "$prefix/$cf_nculib_root/lib/$cf_nculib_root" && cf_search="$cf_search $prefix/$cf_nculib_root/lib/$cf_nculib_root" } for cf_subdir_prefix in \ @@ -9956,13 +11701,13 @@ do test "x$cf_subdir_prefix" != "x$prefix" && \ test -d "$cf_subdir_prefix" && \ -(test -z "$prefix" || test x$prefix = xNONE || test "x$cf_subdir_prefix" != "x$prefix") && { +{ test -z "$prefix" || test "x$prefix" = xNONE || test "x$cf_subdir_prefix" != "x$prefix"; } && { test -n "$verbose" && echo " ... testing for lib-directories under $cf_subdir_prefix" - test -d $cf_subdir_prefix/lib && cf_search="$cf_search $cf_subdir_prefix/lib" - test -d $cf_subdir_prefix/lib/$cf_nculib_root && cf_search="$cf_search $cf_subdir_prefix/lib/$cf_nculib_root" - test -d $cf_subdir_prefix/lib/$cf_nculib_root/lib && cf_search="$cf_search $cf_subdir_prefix/lib/$cf_nculib_root/lib" - test -d $cf_subdir_prefix/$cf_nculib_root/lib && cf_search="$cf_search $cf_subdir_prefix/$cf_nculib_root/lib" - test -d $cf_subdir_prefix/$cf_nculib_root/lib/$cf_nculib_root && cf_search="$cf_search $cf_subdir_prefix/$cf_nculib_root/lib/$cf_nculib_root" + test -d "$cf_subdir_prefix/lib" && cf_search="$cf_search $cf_subdir_prefix/lib" + test -d "$cf_subdir_prefix/lib/$cf_nculib_root" && cf_search="$cf_search $cf_subdir_prefix/lib/$cf_nculib_root" + test -d "$cf_subdir_prefix/lib/$cf_nculib_root/lib" && cf_search="$cf_search $cf_subdir_prefix/lib/$cf_nculib_root/lib" + test -d "$cf_subdir_prefix/$cf_nculib_root/lib" && cf_search="$cf_search $cf_subdir_prefix/$cf_nculib_root/lib" + test -d "$cf_subdir_prefix/$cf_nculib_root/lib/$cf_nculib_root" && cf_search="$cf_search $cf_subdir_prefix/$cf_nculib_root/lib/$cf_nculib_root" } done @@ -9971,11 +11716,11 @@ cf_search="$cf_library_path_list $cf_search" for cf_libdir in $cf_search do - echo "$as_me:9974: checking for -l$cf_nculib_root in $cf_libdir" >&5 + echo "$as_me:11719: 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 9978 "configure" + cat >"conftest.$ac_ext" <<_ACEOF +#line 11723 "configure" #include "confdefs.h" #include <${cf_cv_ncurses_header:-curses.h}> int @@ -9986,41 +11731,41 @@ initscr() return 0; } _ACEOF -rm -f conftest.$ac_objext conftest$ac_exeext -if { (eval echo "$as_me:9990: \"$ac_link\"") >&5 +rm -f "conftest.$ac_objext" "conftest$ac_exeext" +if { (eval echo "$as_me:11735: \"$ac_link\"") >&5 (eval $ac_link) 2>&5 ac_status=$? - echo "$as_me:9993: \$? = $ac_status" >&5 - (exit $ac_status); } && - { ac_try='test -s conftest$ac_exeext' - { (eval echo "$as_me:9996: \"$ac_try\"") >&5 + echo "$as_me:11738: \$? = $ac_status" >&5 + (exit "$ac_status"); } && + { ac_try='test -s "conftest$ac_exeext"' + { (eval echo "$as_me:11741: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? - echo "$as_me:9999: \$? = $ac_status" >&5 - (exit $ac_status); }; }; then - echo "$as_me:10001: result: yes" >&5 + echo "$as_me:11744: \$? = $ac_status" >&5 + (exit "$ac_status"); }; }; then + echo "$as_me:11746: result: yes" >&5 echo "${ECHO_T}yes" >&6 - eval 'cf_cv_have_lib_'$cf_nculib_root'=yes' + 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:10008: result: no" >&5 +cat "conftest.$ac_ext" >&5 +echo "$as_me:11753: result: no" >&5 echo "${ECHO_T}no" >&6 LIBS="$cf_save_LIBS" fi -rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext +rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext" done fi -rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext +rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext" fi -eval 'cf_found_library=$cf_cv_have_lib_'$cf_nculib_root +eval 'cf_found_library="$cf_cv_have_lib_'"$cf_nculib_root"\" -if test $cf_found_library = no ; then - { { echo "$as_me:10023: error: Cannot link $cf_nculib_root library" >&5 +if test "$cf_found_library" = no ; then + { { echo "$as_me:11768: error: Cannot link $cf_nculib_root library" >&5 echo "$as_me: error: Cannot link $cf_nculib_root library" >&2;} { (exit 1); exit 1; }; } fi @@ -10028,49 +11773,49 @@ fi fi if test -n "$cf_ncurses_LIBS" ; then - echo "$as_me:10031: checking if we can link $cf_nculib_root without $cf_ncurses_LIBS" >&5 + echo "$as_me:11776: 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 - q=`echo $LIBS | sed -e "s%$p %%" -e "s%$p$%%"` + q=`echo "$LIBS" | sed -e "s%$p %%" -e "s%$p$%%"` if test "$q" != "$LIBS" ; then LIBS="$q" fi done - cat >conftest.$ac_ext <<_ACEOF -#line 10041 "configure" + cat >"conftest.$ac_ext" <<_ACEOF +#line 11786 "configure" #include "confdefs.h" #include <${cf_cv_ncurses_header:-curses.h}> int main (void) { -initscr(); mousemask(0,0); tgoto((char *)0, 0, 0); +initscr(); mousemask(0,0); tigetstr((char *)0); ; return 0; } _ACEOF -rm -f conftest.$ac_objext conftest$ac_exeext -if { (eval echo "$as_me:10053: \"$ac_link\"") >&5 +rm -f "conftest.$ac_objext" "conftest$ac_exeext" +if { (eval echo "$as_me:11798: \"$ac_link\"") >&5 (eval $ac_link) 2>&5 ac_status=$? - echo "$as_me:10056: \$? = $ac_status" >&5 - (exit $ac_status); } && - { ac_try='test -s conftest$ac_exeext' - { (eval echo "$as_me:10059: \"$ac_try\"") >&5 + echo "$as_me:11801: \$? = $ac_status" >&5 + (exit "$ac_status"); } && + { ac_try='test -s "conftest$ac_exeext"' + { (eval echo "$as_me:11804: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? - echo "$as_me:10062: \$? = $ac_status" >&5 - (exit $ac_status); }; }; then - echo "$as_me:10064: result: yes" >&5 + echo "$as_me:11807: \$? = $ac_status" >&5 + (exit "$ac_status"); }; }; then + echo "$as_me:11809: result: yes" >&5 echo "${ECHO_T}yes" >&6 else echo "$as_me: failed program was:" >&5 -cat conftest.$ac_ext >&5 -echo "$as_me:10069: result: no" >&5 +cat "conftest.$ac_ext" >&5 +echo "$as_me:11814: result: no" >&5 echo "${ECHO_T}no" >&6 LIBS="$cf_ncurses_SAVE" fi -rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext +rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext" fi cf_nculib_ROOT=`echo "HAVE_LIB$cf_nculib_root" | sed y%abcdefghijklmnopqrstuvwxyz./-%ABCDEFGHIJKLMNOPQRSTUVWXYZ___%` @@ -10119,13 +11864,13 @@ 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:10122: \"$cf_try\"") >&5 + { (eval echo "$as_me:11867: \"$cf_try\"") >&5 (eval $cf_try) 2>&5 ac_status=$? - echo "$as_me:10125: \$? = $ac_status" >&5 - (exit $ac_status); } + echo "$as_me:11870: \$? = $ac_status" >&5 + (exit "$ac_status"); } if test -f conftest.out ; then - cf_result=`cat conftest.out | sed -e "s/^.*AUTOCONF_$cf_name[ ][ ]*//"` + cf_result=`sed -e "s/^.*AUTOCONF_${cf_name}[ ][ ]*//" conftest.out` eval NCURSES_$cf_name=\"$cf_result\" # cat conftest.$ac_ext # cat conftest.out @@ -10140,10 +11885,10 @@ cf_cv_rel_version=${NCURSES_MAJOR}.${NCURSES_MINOR} cf_cv_timestamp=`date` -echo "$as_me:10143: result: Configuring NCURSES $cf_cv_rel_version ABI $cf_cv_abi_version ($cf_cv_timestamp)" >&5 +echo "$as_me:11888: 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:10146: checking if you want to have a library-prefix" >&5 +echo "$as_me:11891: 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. @@ -10153,13 +11898,13 @@ if test "${with_lib_prefix+set}" = set; then else with_lib_prefix=auto fi; -echo "$as_me:10156: result: $with_lib_prefix" >&5 +echo "$as_me:11901: result: $with_lib_prefix" >&5 echo "${ECHO_T}$with_lib_prefix" >&6 -if test $with_lib_prefix = auto +if test "$with_lib_prefix" = auto then - case $cf_cv_system_name in + case "$cf_cv_system_name" in (OS/2*|os2*) if test "$DFT_LWR_MODEL" = libtool; then LIB_PREFIX='lib' @@ -10167,12 +11912,15 @@ then LIB_PREFIX='' fi ;; + (*-msvc*) + LIB_PREFIX='' + ;; (*) LIB_PREFIX='lib' ;; esac cf_prefix=$LIB_PREFIX -elif test $with_lib_prefix = no +elif test "$with_lib_prefix" = no then LIB_PREFIX= else @@ -10188,7 +11936,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:10191: checking for default loader flags" >&5 +echo "$as_me:11939: 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='' ;; @@ -10196,15 +11944,15 @@ case $DFT_LWR_MODEL in (profile) LD_MODEL='-pg';; (shared) LD_MODEL='' ;; esac -echo "$as_me:10199: result: $LD_MODEL" >&5 +echo "$as_me:11947: 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:10205: checking for an rpath option" >&5 + echo "$as_me:11953: checking for an rpath option" >&5 echo $ECHO_N "checking for an rpath option... $ECHO_C" >&6 - case $cf_cv_system_name in + case "$cf_cv_system_name" in (irix*) if test "$GCC" = yes; then LD_RPATH_OPT="-Wl,-rpath," @@ -10233,33 +11981,33 @@ echo $ECHO_N "checking for an rpath option... $ECHO_C" >&6 (*) ;; esac - echo "$as_me:10236: result: $LD_RPATH_OPT" >&5 + echo "$as_me:11984: result: $LD_RPATH_OPT" >&5 echo "${ECHO_T}$LD_RPATH_OPT" >&6 case "x$LD_RPATH_OPT" in (x-R*) - echo "$as_me:10241: checking if we need a space after rpath option" >&5 + echo "$as_me:11989: 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" -cf_add_libs="${LD_RPATH_OPT}$libdir" -# Filter out duplicates - this happens with badly-designed ".pc" files... -for cf_add_1lib in $LIBS -do - for cf_add_2lib in $cf_add_libs - do - if test "x$cf_add_1lib" = "x$cf_add_2lib" - then +cf_add_libs="$LIBS" +# reverse order +cf_add_0lib= +for cf_add_1lib in ${LD_RPATH_OPT}$libdir; 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_libs $cf_add_1lib" + test -n "$cf_add_1lib" && cf_add_libs="$cf_add_1lib $cf_add_libs" done LIBS="$cf_add_libs" - cat >conftest.$ac_ext <<_ACEOF -#line 10262 "configure" + cat >"conftest.$ac_ext" <<_ACEOF +#line 12010 "configure" #include "confdefs.h" int @@ -10270,27 +12018,27 @@ main (void) return 0; } _ACEOF -rm -f conftest.$ac_objext conftest$ac_exeext -if { (eval echo "$as_me:10274: \"$ac_link\"") >&5 +rm -f "conftest.$ac_objext" "conftest$ac_exeext" +if { (eval echo "$as_me:12022: \"$ac_link\"") >&5 (eval $ac_link) 2>&5 ac_status=$? - echo "$as_me:10277: \$? = $ac_status" >&5 - (exit $ac_status); } && - { ac_try='test -s conftest$ac_exeext' - { (eval echo "$as_me:10280: \"$ac_try\"") >&5 + echo "$as_me:12025: \$? = $ac_status" >&5 + (exit "$ac_status"); } && + { ac_try='test -s "conftest$ac_exeext"' + { (eval echo "$as_me:12028: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? - echo "$as_me:10283: \$? = $ac_status" >&5 - (exit $ac_status); }; }; then + echo "$as_me:12031: \$? = $ac_status" >&5 + (exit "$ac_status"); }; }; then cf_rpath_space=no else echo "$as_me: failed program was:" >&5 -cat conftest.$ac_ext >&5 +cat "conftest.$ac_ext" >&5 cf_rpath_space=yes fi -rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext +rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext" LIBS="$cf_save_LIBS" - echo "$as_me:10293: result: $cf_rpath_space" >&5 + echo "$as_me:12041: result: $cf_rpath_space" >&5 echo "${ECHO_T}$cf_rpath_space" >&6 test "$cf_rpath_space" = yes && LD_RPATH_OPT="$LD_RPATH_OPT " ;; @@ -10312,14 +12060,14 @@ fi cf_ld_rpath_opt= test "$cf_cv_enable_rpath" = yes && cf_ld_rpath_opt="$LD_RPATH_OPT" - echo "$as_me:10315: 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:12063: 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 withval="$with_shlib_version" test -z "$withval" && withval=auto - case $withval in + case "$withval" in (yes) cf_cv_shlib_version=auto ;; @@ -10327,9 +12075,9 @@ if test "${with_shlib_version+set}" = set; then cf_cv_shlib_version=$withval ;; (*) - echo "$as_me:10330: result: $withval" >&5 + echo "$as_me:12078: result: $withval" >&5 echo "${ECHO_T}$withval" >&6 - { { echo "$as_me:10332: error: option value must be one of: rel, abi, or auto" >&5 + { { echo "$as_me:12080: 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; }; } ;; @@ -10338,7 +12086,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:10341: result: $cf_cv_shlib_version" >&5 + echo "$as_me:12089: result: $cf_cv_shlib_version" >&5 echo "${ECHO_T}$cf_cv_shlib_version" >&6 cf_cv_rm_so_locs=no @@ -10352,7 +12100,7 @@ echo "${ECHO_T}$cf_cv_shlib_version" >&6 then cf_try_fPIC=yes else - case $cf_cv_system_name in + case "$cf_cv_system_name" in (*linux*) # e.g., PGI compiler cf_try_fPIC=yes ;; @@ -10361,51 +12109,51 @@ echo "${ECHO_T}$cf_cv_shlib_version" >&6 if test "$cf_try_fPIC" = yes then - echo "$as_me:10364: checking which $CC option to use" >&5 + echo "$as_me:12112: 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 10371 "configure" + cat >"conftest.$ac_ext" <<_ACEOF +#line 12119 "configure" #include "confdefs.h" #include int main (void) { -int x = 1 +int x = 1; (void)x ; return 0; } _ACEOF -rm -f conftest.$ac_objext -if { (eval echo "$as_me:10383: \"$ac_compile\"") >&5 +rm -f "conftest.$ac_objext" +if { (eval echo "$as_me:12131: \"$ac_compile\"") >&5 (eval $ac_compile) 2>&5 ac_status=$? - echo "$as_me:10386: \$? = $ac_status" >&5 - (exit $ac_status); } && - { ac_try='test -s conftest.$ac_objext' - { (eval echo "$as_me:10389: \"$ac_try\"") >&5 + echo "$as_me:12134: \$? = $ac_status" >&5 + (exit "$ac_status"); } && + { ac_try='test -s "conftest.$ac_objext"' + { (eval echo "$as_me:12137: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? - echo "$as_me:10392: \$? = $ac_status" >&5 - (exit $ac_status); }; }; then + echo "$as_me:12140: \$? = $ac_status" >&5 + (exit "$ac_status"); }; }; then break else echo "$as_me: failed program was:" >&5 -cat conftest.$ac_ext >&5 +cat "conftest.$ac_ext" >&5 fi -rm -f conftest.$ac_objext conftest.$ac_ext +rm -f "conftest.$ac_objext" "conftest.$ac_ext" done - echo "$as_me:10401: result: $CC_SHARED_OPTS" >&5 + echo "$as_me:12149: result: $CC_SHARED_OPTS" >&5 echo "${ECHO_T}$CC_SHARED_OPTS" >&6 CFLAGS="$cf_save_CFLAGS" fi cf_cv_shlib_version_infix=no - case $cf_cv_system_name in + case "$cf_cv_system_name" in (aix4.3-9*|aix[5-7]*) if test "$GCC" = yes; then CC_SHARED_OPTS='-Wl,-brtl' @@ -10469,7 +12217,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:10472: checking if ld -search_paths_first works" >&5 + echo "$as_me:12220: 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 @@ -10477,8 +12225,8 @@ else cf_save_LDFLAGS=$LDFLAGS LDFLAGS="$LDFLAGS -Wl,-search_paths_first" - cat >conftest.$ac_ext <<_ACEOF -#line 10481 "configure" + cat >"conftest.$ac_ext" <<_ACEOF +#line 12229 "configure" #include "confdefs.h" int @@ -10489,33 +12237,44 @@ int i; return 0; } _ACEOF -rm -f conftest.$ac_objext conftest$ac_exeext -if { (eval echo "$as_me:10493: \"$ac_link\"") >&5 +rm -f "conftest.$ac_objext" "conftest$ac_exeext" +if { (eval echo "$as_me:12241: \"$ac_link\"") >&5 (eval $ac_link) 2>&5 ac_status=$? - echo "$as_me:10496: \$? = $ac_status" >&5 - (exit $ac_status); } && - { ac_try='test -s conftest$ac_exeext' - { (eval echo "$as_me:10499: \"$ac_try\"") >&5 + echo "$as_me:12244: \$? = $ac_status" >&5 + (exit "$ac_status"); } && + { ac_try='test -s "conftest$ac_exeext"' + { (eval echo "$as_me:12247: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? - echo "$as_me:10502: \$? = $ac_status" >&5 - (exit $ac_status); }; }; then + echo "$as_me:12250: \$? = $ac_status" >&5 + (exit "$ac_status"); }; }; then cf_cv_ldflags_search_paths_first=yes else echo "$as_me: failed program was:" >&5 -cat conftest.$ac_ext >&5 +cat "conftest.$ac_ext" >&5 cf_cv_ldflags_search_paths_first=no fi -rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext +rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext" LDFLAGS=$cf_save_LDFLAGS fi -echo "$as_me:10513: result: $cf_cv_ldflags_search_paths_first" >&5 +echo "$as_me:12261: 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 + 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 @@ -10578,33 +12337,139 @@ echo "${ECHO_T}$cf_cv_ldflags_search_paths_first" >&6 MK_SHARED_LIB='${CC} ${LDFLAGS} ${CFLAGS} -shared -Wl,-soname,'$cf_cv_shared_soname',-stats,-lc -o $@' ;; - (mingw*) - cf_cv_shlib_version=mingw - cf_cv_shlib_version_infix=mingw + (mingw*msvc*) + cf_cv_shlib_version=msvcdll + cf_cv_shlib_version_infix=msvcdll shlibdir=$bindir MAKE_DLLS= if test "$DFT_LWR_MODEL" = "shared" ; then - LOCAL_LDFLAGS="-Wl,--enable-auto-import" + LOCAL_LDFLAGS="-link -dll" LOCAL_LDFLAGS2="$LOCAL_LDFLAGS" - EXTRA_LDFLAGS="-Wl,--enable-auto-import $EXTRA_LDFLAGS" + EXTRA_LDFLAGS="-link -dll $EXTRA_LDFLAGS" fi CC_SHARED_OPTS= - MK_SHARED_LIB=$SHELL' '$rel_builddir'/mk_shared_lib.sh $@ ${CC} ${CFLAGS}' - RM_SHARED_OPTS="$RM_SHARED_OPTS $rel_builddir/mk_shared_lib.sh *.dll.a" + MK_SHARED_LIB=$SHELL' '$rel_builddir'/mk_shared_lib.sh $@ ${LD} ${CFLAGS}' + RM_SHARED_OPTS="$RM_SHARED_OPTS $rel_builddir/mk_shared_lib.sh *.dll.lib" cat >mk_shared_lib.sh <<-CF_EOF #!$SHELL SHARED_LIB=\$1 - IMPORT_LIB=\`echo "\$1" | sed -e 's/[0-9]*\.dll$/.dll.a/'\` + IMPORT_LIB=\`echo "\$1" | sed -e 's/[0-9]*\.dll$/.dll.lib/'\` + shift + my_ld=\$1 shift cat <<-EOF Linking shared library - ** SHARED_LIB \$SHARED_LIB + ** SHARED LIB \$SHARED_LIB ** IMPORT_LIB \$IMPORT_LIB EOF - exec \$* ${LDFLAGS} -shared -Wl,--enable-auto-import,--out-implib=\${IMPORT_LIB} -Wl,--export-all-symbols -o \${SHARED_LIB} + args=\$(echo \$* | sed -E "s#-l(\w*)#\1.dll.lib#g" | sed -E "s#-L(\w*)#-LIBPATH:\1#g") + exec \$my_ld -DLL -IMPLIB:"\${IMPORT_LIB}" -OUT:"\${SHARED_LIB}" ${LDFLAGS} \$args + mv "\${IMPORT_LIB}" "\${IMPORT_LIB}" CF_EOF chmod +x mk_shared_lib.sh - ;; + cat >mk_prog.sh <<-CF_EOF + #!$SHELL + shift + # Ignore first argument (compiler) and use LD (link.exe) unconditionally + LD="$LD" + clopts=() + ldopts=("/subsystem:console") + libs=() + isdll=0 + while test \$# -gt 0; do + case "\$1" in + -link) + # ignore -link argument + ;; + -M[TD] | -M[TD]d) + # ignore runtime-library option + ;; + -dll) + isdll=1 + ;; + -W* | -w*) + # ignore warnings + ;; + -D*) + clopts+=("\$1") + ;; + -I*) + clopts+=("\$1") + ;; + -l*) + libs+=("\`echo \"\$1\" | sed \"s/^-l//\"\`") + ;; + -L*) + ldopts+=("\`echo \"\$1\" | sed \"s/^-L/-LIBPATH:/\"\`") + ;; + *.obj | *.o) + ldopts+=("\$1") + ;; + -Wl,*) + for linkarg in \`echo '\$1' | sed -e 's/-Wl,//' -e 's/,/ /'\`; do + ldopts+=("\${linkarg}") + done + ;; + *.lib) + ldopts+=("\$1") + ;; + -o) + shift + ldopts+=("-out:\$1") + ;; + *) + clopts+=("\$1") + ldopts+=("\$1") + ;; + esac + shift + done + if [ "\$isdll" -ne 0 ]; then + for lib in \${libs[*]}; do + ldopts+=("\$lib.dll.lib") + done + else + for lib in \${libs[*]}; do + ldopts+=("\$lib.lib") + done + fi + cat <<-EOF + Creating program + ** ld options: "\${ldopts[@]}" +EOF + exec \$LD \${ldopts[@]} +CF_EOF + chmod +x mk_prog.sh + LINK_PROGS="$SHELL ${rel_builddir}/mk_prog.sh" + LINK_TESTS="$SHELL ${rel_builddir}/mk_prog.sh" + ;; + (mingw*) + cf_cv_shlib_version=mingw + cf_cv_shlib_version_infix=mingw + shlibdir=$bindir + MAKE_DLLS= + if test "$DFT_LWR_MODEL" = "shared" ; then + LOCAL_LDFLAGS="-Wl,--enable-auto-import" + LOCAL_LDFLAGS2="$LOCAL_LDFLAGS" + EXTRA_LDFLAGS="-Wl,--enable-auto-import $EXTRA_LDFLAGS" + fi + CC_SHARED_OPTS= + MK_SHARED_LIB=$SHELL' '$rel_builddir'/mk_shared_lib.sh $@ ${CC} ${CFLAGS}' + RM_SHARED_OPTS="$RM_SHARED_OPTS $rel_builddir/mk_shared_lib.sh *.dll.a" + cat >mk_shared_lib.sh <<-CF_EOF + #!$SHELL + SHARED_LIB=\$1 + IMPORT_LIB=\`echo "\$1" | sed -e 's/[0-9]*\.dll$/.dll.a/'\` + shift + cat <<-EOF + Linking shared library + ** SHARED_LIB \$SHARED_LIB + ** IMPORT_LIB \$IMPORT_LIB +EOF + exec \$* ${LDFLAGS} -shared -Wl,--enable-auto-import,--out-implib=\${IMPORT_LIB} -Wl,--export-all-symbols -o \${SHARED_LIB} +CF_EOF + chmod +x mk_shared_lib.sh + ;; (openbsd[2-9].*|mirbsd*) if test "$DFT_LWR_MODEL" = "shared" && test -n "$LD_RPATH_OPT" ; then LOCAL_LDFLAGS="${LD_RPATH_OPT}\$(LOCAL_LIBDIR)" @@ -10624,6 +12489,14 @@ CF_EOF MK_SHARED_LIB='${CC} ${LDFLAGS} ${CFLAGS} -shared -Wl,-Bshareable,-soname,'$cf_cv_shared_soname',-stats,-lc -o $@' ;; + (nskJ*) + CC_SHARED_OPTS= + MK_SHARED_LIB='${LD} -Wshared -Weld=-export_all -o $@' + ;; + (nskL*) + CC_SHARED_OPTS= + MK_SHARED_LIB='${LD} -Wshared -Wxld=-export_all -o $@' + ;; (nto-qnx*|openbsd*|freebsd[12].*) CC_SHARED_OPTS="$CC_SHARED_OPTS -DPIC" MK_SHARED_LIB='${LD} ${LDFLAGS} -Bshareable -o $@' @@ -10669,7 +12542,7 @@ CF_EOF MK_SHARED_LIB='${CC} ${LDFLAGS} ${CFLAGS} -shared -Wl,-soname,'$cf_cv_shared_soname' -o $@' else - MK_SHARED_LIB='${CC} ${LDFLAGS} ${CFLAGS} -Wl,-shared -Wl,-Bshareable -o $@' + MK_SHARED_LIB='${CC} ${LDFLAGS} ${CFLAGS} -shared -o $@' fi ;; (osf*|mls+*) @@ -10677,7 +12550,7 @@ CF_EOF # tested with OSF/1 V3.2 and gcc 2.6.3 (but the c++ demo didn't # link with shared libs). MK_SHARED_LIB='${LD} ${LDFLAGS} -set_version ${REL_VERSION}:${ABI_VERSION} -expect_unresolved "*" -shared -soname `basename $@`' - case $host_os in + case "$host_os" in (osf4*) MK_SHARED_LIB="${MK_SHARED_LIB} -msym" ;; @@ -10715,11 +12588,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 @@ -10734,42 +12607,42 @@ CF_EOF for cf_shared_opts in -xcode=pic32 -xcode=pic13 -KPIC -Kpic -O do CFLAGS="$cf_shared_opts $cf_save_CFLAGS" - cat >conftest.$ac_ext <<_ACEOF -#line 10738 "configure" + cat >"conftest.$ac_ext" <<_ACEOF +#line 12611 "configure" #include "confdefs.h" #include int main (void) { -printf("Hello\n"); +printf("Hello\\n"); ; return 0; } _ACEOF -rm -f conftest.$ac_objext -if { (eval echo "$as_me:10750: \"$ac_compile\"") >&5 +rm -f "conftest.$ac_objext" +if { (eval echo "$as_me:12623: \"$ac_compile\"") >&5 (eval $ac_compile) 2>&5 ac_status=$? - echo "$as_me:10753: \$? = $ac_status" >&5 - (exit $ac_status); } && - { ac_try='test -s conftest.$ac_objext' - { (eval echo "$as_me:10756: \"$ac_try\"") >&5 + echo "$as_me:12626: \$? = $ac_status" >&5 + (exit "$ac_status"); } && + { ac_try='test -s "conftest.$ac_objext"' + { (eval echo "$as_me:12629: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? - echo "$as_me:10759: \$? = $ac_status" >&5 - (exit $ac_status); }; }; then + echo "$as_me:12632: \$? = $ac_status" >&5 + (exit "$ac_status"); }; }; then break else echo "$as_me: failed program was:" >&5 -cat conftest.$ac_ext >&5 +cat "conftest.$ac_ext" >&5 fi -rm -f conftest.$ac_objext conftest.$ac_ext +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*) @@ -10793,7 +12666,7 @@ rm -f conftest.$ac_objext conftest.$ac_ext test "$cf_cv_do_symlinks" = no && cf_cv_do_symlinks=yes ;; (*) - { echo "$as_me:10796: WARNING: ignored --with-shlib-version" >&5 + { echo "$as_me:12669: WARNING: ignored --with-shlib-version" >&5 echo "$as_me: WARNING: ignored --with-shlib-version" >&2;} ;; esac @@ -10803,11 +12676,11 @@ echo "$as_me: WARNING: ignored --with-shlib-version" >&2;} if test -n "$cf_try_cflags" then cat > conftest.$ac_ext < int main(int argc, char *argv[]) { - printf("hello\n"); + printf("hello\\n"); return (argv[argc-1] == 0) ; } EOF @@ -10815,18 +12688,18 @@ EOF for cf_opt in $cf_try_cflags do CFLAGS="$cf_save_CFLAGS -$cf_opt" - echo "$as_me:10818: checking if CFLAGS option -$cf_opt works" >&5 + echo "$as_me:12691: 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:10820: \"$ac_compile\"") >&5 + if { (eval echo "$as_me:12693: \"$ac_compile\"") >&5 (eval $ac_compile) 2>&5 ac_status=$? - echo "$as_me:10823: \$? = $ac_status" >&5 - (exit $ac_status); }; then - echo "$as_me:10825: result: yes" >&5 + echo "$as_me:12696: \$? = $ac_status" >&5 + (exit "$ac_status"); }; then + echo "$as_me:12698: result: yes" >&5 echo "${ECHO_T}yes" >&6 cf_save_CFLAGS="$CFLAGS" else - echo "$as_me:10829: result: no" >&5 + echo "$as_me:12702: result: no" >&5 echo "${ECHO_T}no" >&6 fi done @@ -10837,21 +12710,21 @@ echo "${ECHO_T}no" >&6 test -n "$cf_ld_rpath_opt" && MK_SHARED_LIB="$MK_SHARED_LIB $cf_ld_rpath_opt\${RPATH_LIST}" test -z "$RPATH_LIST" && RPATH_LIST="\${libdir}" - test $cf_cv_rm_so_locs = yes && RM_SHARED_OPTS="$RM_SHARED_OPTS so_locations" + test "$cf_cv_rm_so_locs" = yes && RM_SHARED_OPTS="$RM_SHARED_OPTS so_locations" test -n "$verbose" && echo " CC_SHARED_OPTS: $CC_SHARED_OPTS" 1>&6 -echo "${as_me:-configure}:10844: testing CC_SHARED_OPTS: $CC_SHARED_OPTS ..." 1>&5 +echo "${as_me:-configure}:12717: 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}:10848: testing MK_SHARED_LIB: $MK_SHARED_LIB ..." 1>&5 +echo "${as_me:-configure}:12721: 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:10854: checking if you want to link sample programs with rpath option" >&5 + echo "$as_me:12727: 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. @@ -10861,7 +12734,7 @@ if test "${enable_rpath_link+set}" = set; then else with_rpath_link=yes fi; - echo "$as_me:10864: result: $with_rpath_link" >&5 + echo "$as_me:12737: result: $with_rpath_link" >&5 echo "${ECHO_T}$with_rpath_link" >&6 if test "$with_rpath_link" = no then @@ -10873,7 +12746,8 @@ fi ############################################################################### ### use option --enable-broken-linker to force on use of broken-linker support -echo "$as_me:10876: checking if you want broken-linker support code" >&5 + +echo "$as_me:12750: 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. @@ -10881,47 +12755,82 @@ if test "${enable_broken_linker+set}" = set; then enableval="$enable_broken_linker" with_broken_linker=$enableval else - with_broken_linker=${BROKEN_LINKER:-no} + with_broken_linker=no fi; -echo "$as_me:10886: result: $with_broken_linker" >&5 +echo "$as_me:12760: result: $with_broken_linker" >&5 echo "${ECHO_T}$with_broken_linker" >&6 -BROKEN_LINKER=0 -if test "$with_broken_linker" = yes ; then - cat >>confdefs.h <<\EOF +: "${BROKEN_LINKER:=0}" +if test "x$with_broken_linker" = xyes ; then + +cat >>confdefs.h <<\EOF #define BROKEN_LINKER 1 EOF BROKEN_LINKER=1 -elif test "$DFT_LWR_MODEL" = shared ; then - case $cf_cv_system_name in - (cygwin*) - cat >>confdefs.h <<\EOF -#define BROKEN_LINKER 1 -EOF +fi - BROKEN_LINKER=1 - test -n "$verbose" && echo " cygwin linker is broken anyway" 1>&6 +# Check to define _XOPEN_SOURCE "automatically" -echo "${as_me:-configure}:10906: testing cygwin linker is broken anyway ..." 1>&5 +echo "$as_me:12775: 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 - ;; - esac +cat >"conftest.$ac_ext" <<_ACEOF +#line 12782 "configure" +#include "confdefs.h" +#include +int +main (void) +{ + +#if defined(__POSIX_VISIBLE) && ((__POSIX_VISIBLE - 0L) > 0) \ + && defined(__XSI_VISIBLE) && ((__XSI_VISIBLE - 0L) > 0) \ + && defined(__BSD_VISIBLE) && ((__BSD_VISIBLE - 0L) > 0) \ + && defined(__ISO_C_VISIBLE) && ((__ISO_C_VISIBLE - 0L) > 0) +#error conflicting symbols found +#endif + + ; + return 0; +} +_ACEOF +rm -f "conftest.$ac_objext" +if { (eval echo "$as_me:12801: \"$ac_compile\"") >&5 + (eval $ac_compile) 2>&5 + ac_status=$? + echo "$as_me:12804: \$? = $ac_status" >&5 + (exit "$ac_status"); } && + { ac_try='test -s "conftest.$ac_objext"' + { (eval echo "$as_me:12807: \"$ac_try\"") >&5 + (eval $ac_try) 2>&5 + ac_status=$? + echo "$as_me:12810: \$? = $ac_status" >&5 + (exit "$ac_status"); }; }; then + cf_cv_posix_visible=no +else + echo "$as_me: failed program was:" >&5 +cat "conftest.$ac_ext" >&5 +cf_cv_posix_visible=yes fi +rm -f "conftest.$ac_objext" "conftest.$ac_ext" -# Check to define _XOPEN_SOURCE "automatically" +fi +echo "$as_me:12821: result: $cf_cv_posix_visible" >&5 +echo "${ECHO_T}$cf_cv_posix_visible" >&6 + +if test "$cf_cv_posix_visible" = no; then cf_XOPEN_SOURCE=600 cf_POSIX_C_SOURCE=199506L cf_xopen_source= -case $host_os in +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" ;; @@ -10929,7 +12838,7 @@ case $host_os in cf_xopen_source="-D_DARWIN_C_SOURCE" cf_XOPEN_SOURCE= ;; -(freebsd*|dragonfly*) +(freebsd*|dragonfly*|midnightbsd*) # 5.x headers associate # _XOPEN_SOURCE=600 with _POSIX_C_SOURCE=200112L # _XOPEN_SOURCE=500 with _POSIX_C_SOURCE=199506L @@ -10947,18 +12856,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:10954: checking if this is the GNU C library" >&5 +echo "$as_me:12863: 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 10961 "configure" +cat >"conftest.$ac_ext" <<_ACEOF +#line 12870 "configure" #include "confdefs.h" #include int @@ -10967,6 +12876,8 @@ main (void) #if __GLIBC__ > 0 && __GLIBC_MINOR__ >= 0 return 0; + #elif __NEWLIB__ > 0 && __NEWLIB_MINOR__ >= 0 + return 0; #else # error not GNU C library #endif @@ -10974,35 +12885,36 @@ main (void) return 0; } _ACEOF -rm -f conftest.$ac_objext -if { (eval echo "$as_me:10978: \"$ac_compile\"") >&5 +rm -f "conftest.$ac_objext" +if { (eval echo "$as_me:12889: \"$ac_compile\"") >&5 (eval $ac_compile) 2>&5 ac_status=$? - echo "$as_me:10981: \$? = $ac_status" >&5 - (exit $ac_status); } && - { ac_try='test -s conftest.$ac_objext' - { (eval echo "$as_me:10984: \"$ac_try\"") >&5 + echo "$as_me:12892: \$? = $ac_status" >&5 + (exit "$ac_status"); } && + { ac_try='test -s "conftest.$ac_objext"' + { (eval echo "$as_me:12895: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? - echo "$as_me:10987: \$? = $ac_status" >&5 - (exit $ac_status); }; }; then + echo "$as_me:12898: \$? = $ac_status" >&5 + (exit "$ac_status"); }; }; then cf_cv_gnu_library=yes else echo "$as_me: failed program was:" >&5 -cat conftest.$ac_ext >&5 +cat "conftest.$ac_ext" >&5 cf_cv_gnu_library=no fi -rm -f conftest.$ac_objext conftest.$ac_ext +rm -f "conftest.$ac_objext" "conftest.$ac_ext" fi -echo "$as_me:10998: result: $cf_cv_gnu_library" >&5 +echo "$as_me:12909: result: $cf_cv_gnu_library" >&5 echo "${ECHO_T}$cf_cv_gnu_library" >&6 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... - echo "$as_me:11005: checking if _DEFAULT_SOURCE can be used as a basis" >&5 + # was changed to help a little. newlib incorporated the change about 4 + # years later. + echo "$as_me:12917: 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 @@ -11013,8 +12925,8 @@ else test -n "$CPPFLAGS" && CPPFLAGS="$CPPFLAGS " CPPFLAGS="${CPPFLAGS}-D_DEFAULT_SOURCE" - cat >conftest.$ac_ext <<_ACEOF -#line 11017 "configure" + cat >"conftest.$ac_ext" <<_ACEOF +#line 12929 "configure" #include "confdefs.h" #include int @@ -11023,6 +12935,8 @@ main (void) #if (__GLIBC__ == 2 && __GLIBC_MINOR__ >= 19) || (__GLIBC__ > 2) return 0; + #elif (__NEWLIB__ == 2 && __NEWLIB_MINOR__ >= 4) || (__GLIBC__ > 3) + return 0; #else # error GNU C library __GLIBC__.__GLIBC_MINOR__ is too old #endif @@ -11030,34 +12944,34 @@ main (void) return 0; } _ACEOF -rm -f conftest.$ac_objext -if { (eval echo "$as_me:11034: \"$ac_compile\"") >&5 +rm -f "conftest.$ac_objext" +if { (eval echo "$as_me:12948: \"$ac_compile\"") >&5 (eval $ac_compile) 2>&5 ac_status=$? - echo "$as_me:11037: \$? = $ac_status" >&5 - (exit $ac_status); } && - { ac_try='test -s conftest.$ac_objext' - { (eval echo "$as_me:11040: \"$ac_try\"") >&5 + echo "$as_me:12951: \$? = $ac_status" >&5 + (exit "$ac_status"); } && + { ac_try='test -s "conftest.$ac_objext"' + { (eval echo "$as_me:12954: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? - echo "$as_me:11043: \$? = $ac_status" >&5 - (exit $ac_status); }; }; then + echo "$as_me:12957: \$? = $ac_status" >&5 + (exit "$ac_status"); }; }; then cf_cv_gnu_library_219=yes else echo "$as_me: failed program was:" >&5 -cat conftest.$ac_ext >&5 +cat "conftest.$ac_ext" >&5 cf_cv_gnu_library_219=no fi -rm -f conftest.$ac_objext conftest.$ac_ext +rm -f "conftest.$ac_objext" "conftest.$ac_ext" CPPFLAGS="$cf_save" fi -echo "$as_me:11055: result: $cf_cv_gnu_library_219" >&5 +echo "$as_me:12969: 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:11060: checking if _XOPEN_SOURCE=$cf_gnu_xopen_source works with _DEFAULT_SOURCE" >&5 + echo "$as_me:12974: 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 @@ -11070,19 +12984,19 @@ cf_new_extra_cppflags= for cf_add_cflags in -D_DEFAULT_SOURCE -D_XOPEN_SOURCE=$cf_gnu_xopen_source do -case $cf_fix_cppflags in +case "$cf_fix_cppflags" in (no) - case $cf_add_cflags in + case "$cf_add_cflags" in (-undef|-nostdinc*|-I*|-D*|-U*|-E|-P|-C) - case $cf_add_cflags in + case "$cf_add_cflags" in (-D*) - cf_tst_cflags=`echo ${cf_add_cflags} |sed -e 's/^-D[^=]*='\''\"[^"]*//'` + cf_tst_cflags=`echo "${cf_add_cflags}" |sed -e 's/^-D[^=]*='\''\"[^"]*//'` test "x${cf_add_cflags}" != "x${cf_tst_cflags}" \ && test -z "${cf_tst_cflags}" \ && cf_fix_cppflags=yes - if test $cf_fix_cppflags = yes ; then + if test "$cf_fix_cppflags" = yes ; then test -n "$cf_new_extra_cppflags" && cf_new_extra_cppflags="$cf_new_extra_cppflags " cf_new_extra_cppflags="${cf_new_extra_cppflags}$cf_add_cflags" @@ -11101,7 +13015,7 @@ case $cf_fix_cppflags in (*$cf_add_cflags) ;; (*) - case $cf_add_cflags in + case "$cf_add_cflags" in (-D*) cf_tst_cppflags=`echo "x$cf_add_cflags" | sed -e 's/^...//' -e 's/=.*//'` @@ -11131,7 +13045,7 @@ CPPFLAGS=`echo "$CPPFLAGS" | \ test -n "$cf_new_extra_cppflags" && cf_new_extra_cppflags="$cf_new_extra_cppflags " cf_new_extra_cppflags="${cf_new_extra_cppflags}$cf_add_cflags" - cf_tst_cflags=`echo ${cf_add_cflags} |sed -e 's/^[^"]*"'\''//'` + cf_tst_cflags=`echo "${cf_add_cflags}" |sed -e 's/^[^"]*"'\''//'` test "x${cf_add_cflags}" != "x${cf_tst_cflags}" \ && test -z "${cf_tst_cflags}" \ @@ -11161,8 +13075,8 @@ if test -n "$cf_new_extra_cppflags" ; then fi - cat >conftest.$ac_ext <<_ACEOF -#line 11165 "configure" + cat >"conftest.$ac_ext" <<_ACEOF +#line 13079 "configure" #include "confdefs.h" #include @@ -11181,28 +13095,28 @@ main (void) return 0; } _ACEOF -rm -f conftest.$ac_objext -if { (eval echo "$as_me:11185: \"$ac_compile\"") >&5 +rm -f "conftest.$ac_objext" +if { (eval echo "$as_me:13099: \"$ac_compile\"") >&5 (eval $ac_compile) 2>&5 ac_status=$? - echo "$as_me:11188: \$? = $ac_status" >&5 - (exit $ac_status); } && - { ac_try='test -s conftest.$ac_objext' - { (eval echo "$as_me:11191: \"$ac_try\"") >&5 + echo "$as_me:13102: \$? = $ac_status" >&5 + (exit "$ac_status"); } && + { ac_try='test -s "conftest.$ac_objext"' + { (eval echo "$as_me:13105: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? - echo "$as_me:11194: \$? = $ac_status" >&5 - (exit $ac_status); }; }; then + echo "$as_me:13108: \$? = $ac_status" >&5 + (exit "$ac_status"); }; }; then cf_cv_gnu_dftsrc_219=yes else echo "$as_me: failed program was:" >&5 -cat conftest.$ac_ext >&5 +cat "conftest.$ac_ext" >&5 cf_cv_gnu_dftsrc_219=no fi -rm -f conftest.$ac_objext conftest.$ac_ext +rm -f "conftest.$ac_objext" "conftest.$ac_ext" fi -echo "$as_me:11205: result: $cf_cv_gnu_dftsrc_219" >&5 +echo "$as_me:13119: 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 @@ -11211,14 +13125,14 @@ echo "${ECHO_T}$cf_cv_gnu_dftsrc_219" >&6 if test "x$cf_cv_gnu_dftsrc_219" != xyes; then - echo "$as_me:11214: checking if we must define _GNU_SOURCE" >&5 + echo "$as_me:13128: 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 11221 "configure" + cat >"conftest.$ac_ext" <<_ACEOF +#line 13135 "configure" #include "confdefs.h" #include int @@ -11232,22 +13146,22 @@ main (void) return 0; } _ACEOF -rm -f conftest.$ac_objext -if { (eval echo "$as_me:11236: \"$ac_compile\"") >&5 +rm -f "conftest.$ac_objext" +if { (eval echo "$as_me:13150: \"$ac_compile\"") >&5 (eval $ac_compile) 2>&5 ac_status=$? - echo "$as_me:11239: \$? = $ac_status" >&5 - (exit $ac_status); } && - { ac_try='test -s conftest.$ac_objext' - { (eval echo "$as_me:11242: \"$ac_try\"") >&5 + echo "$as_me:13153: \$? = $ac_status" >&5 + (exit "$ac_status"); } && + { ac_try='test -s "conftest.$ac_objext"' + { (eval echo "$as_me:13156: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? - echo "$as_me:11245: \$? = $ac_status" >&5 - (exit $ac_status); }; }; then + echo "$as_me:13159: \$? = $ac_status" >&5 + (exit "$ac_status"); }; }; then cf_cv_gnu_source=no else echo "$as_me: failed program was:" >&5 -cat conftest.$ac_ext >&5 +cat "conftest.$ac_ext" >&5 cf_save="$CPPFLAGS" cf_fix_cppflags=no @@ -11257,19 +13171,19 @@ cf_new_extra_cppflags= for cf_add_cflags in -D_GNU_SOURCE do -case $cf_fix_cppflags in +case "$cf_fix_cppflags" in (no) - case $cf_add_cflags in + case "$cf_add_cflags" in (-undef|-nostdinc*|-I*|-D*|-U*|-E|-P|-C) - case $cf_add_cflags in + case "$cf_add_cflags" in (-D*) - cf_tst_cflags=`echo ${cf_add_cflags} |sed -e 's/^-D[^=]*='\''\"[^"]*//'` + cf_tst_cflags=`echo "${cf_add_cflags}" |sed -e 's/^-D[^=]*='\''\"[^"]*//'` test "x${cf_add_cflags}" != "x${cf_tst_cflags}" \ && test -z "${cf_tst_cflags}" \ && cf_fix_cppflags=yes - if test $cf_fix_cppflags = yes ; then + if test "$cf_fix_cppflags" = yes ; then test -n "$cf_new_extra_cppflags" && cf_new_extra_cppflags="$cf_new_extra_cppflags " cf_new_extra_cppflags="${cf_new_extra_cppflags}$cf_add_cflags" @@ -11288,7 +13202,7 @@ case $cf_fix_cppflags in (*$cf_add_cflags) ;; (*) - case $cf_add_cflags in + case "$cf_add_cflags" in (-D*) cf_tst_cppflags=`echo "x$cf_add_cflags" | sed -e 's/^...//' -e 's/=.*//'` @@ -11318,7 +13232,7 @@ CPPFLAGS=`echo "$CPPFLAGS" | \ test -n "$cf_new_extra_cppflags" && cf_new_extra_cppflags="$cf_new_extra_cppflags " cf_new_extra_cppflags="${cf_new_extra_cppflags}$cf_add_cflags" - cf_tst_cflags=`echo ${cf_add_cflags} |sed -e 's/^[^"]*"'\''//'` + cf_tst_cflags=`echo "${cf_add_cflags}" |sed -e 's/^[^"]*"'\''//'` test "x${cf_add_cflags}" != "x${cf_tst_cflags}" \ && test -z "${cf_tst_cflags}" \ @@ -11348,8 +13262,8 @@ if test -n "$cf_new_extra_cppflags" ; then fi - cat >conftest.$ac_ext <<_ACEOF -#line 11352 "configure" + cat >"conftest.$ac_ext" <<_ACEOF +#line 13266 "configure" #include "confdefs.h" #include int @@ -11363,37 +13277,37 @@ main (void) return 0; } _ACEOF -rm -f conftest.$ac_objext -if { (eval echo "$as_me:11367: \"$ac_compile\"") >&5 +rm -f "conftest.$ac_objext" +if { (eval echo "$as_me:13281: \"$ac_compile\"") >&5 (eval $ac_compile) 2>&5 ac_status=$? - echo "$as_me:11370: \$? = $ac_status" >&5 - (exit $ac_status); } && - { ac_try='test -s conftest.$ac_objext' - { (eval echo "$as_me:11373: \"$ac_try\"") >&5 + echo "$as_me:13284: \$? = $ac_status" >&5 + (exit "$ac_status"); } && + { ac_try='test -s "conftest.$ac_objext"' + { (eval echo "$as_me:13287: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? - echo "$as_me:11376: \$? = $ac_status" >&5 - (exit $ac_status); }; }; then + echo "$as_me:13290: \$? = $ac_status" >&5 + (exit "$ac_status"); }; }; then cf_cv_gnu_source=no else echo "$as_me: failed program was:" >&5 -cat conftest.$ac_ext >&5 +cat "conftest.$ac_ext" >&5 cf_cv_gnu_source=yes fi -rm -f conftest.$ac_objext conftest.$ac_ext +rm -f "conftest.$ac_objext" "conftest.$ac_ext" CPPFLAGS="$cf_save" fi -rm -f conftest.$ac_objext conftest.$ac_ext +rm -f "conftest.$ac_objext" "conftest.$ac_ext" fi -echo "$as_me:11391: result: $cf_cv_gnu_source" >&5 +echo "$as_me:13305: 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:11396: checking if we should also define _DEFAULT_SOURCE" >&5 + echo "$as_me:13310: 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 @@ -11402,8 +13316,8 @@ else test -n "$CPPFLAGS" && CPPFLAGS="$CPPFLAGS " CPPFLAGS="${CPPFLAGS}-D_GNU_SOURCE" - cat >conftest.$ac_ext <<_ACEOF -#line 11406 "configure" + cat >"conftest.$ac_ext" <<_ACEOF +#line 13320 "configure" #include "confdefs.h" #include int @@ -11417,28 +13331,28 @@ main (void) return 0; } _ACEOF -rm -f conftest.$ac_objext -if { (eval echo "$as_me:11421: \"$ac_compile\"") >&5 +rm -f "conftest.$ac_objext" +if { (eval echo "$as_me:13335: \"$ac_compile\"") >&5 (eval $ac_compile) 2>&5 ac_status=$? - echo "$as_me:11424: \$? = $ac_status" >&5 - (exit $ac_status); } && - { ac_try='test -s conftest.$ac_objext' - { (eval echo "$as_me:11427: \"$ac_try\"") >&5 + echo "$as_me:13338: \$? = $ac_status" >&5 + (exit "$ac_status"); } && + { ac_try='test -s "conftest.$ac_objext"' + { (eval echo "$as_me:13341: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? - echo "$as_me:11430: \$? = $ac_status" >&5 - (exit $ac_status); }; }; then + echo "$as_me:13344: \$? = $ac_status" >&5 + (exit "$ac_status"); }; }; then cf_cv_default_source=no else echo "$as_me: failed program was:" >&5 -cat conftest.$ac_ext >&5 +cat "conftest.$ac_ext" >&5 cf_cv_default_source=yes fi -rm -f conftest.$ac_objext conftest.$ac_ext +rm -f "conftest.$ac_objext" "conftest.$ac_ext" fi -echo "$as_me:11441: result: $cf_cv_default_source" >&5 +echo "$as_me:13355: result: $cf_cv_default_source" >&5 echo "${ECHO_T}$cf_cv_default_source" >&6 if test "$cf_cv_default_source" = yes then @@ -11460,6 +13374,8 @@ fi # setting _XOPEN_SOURCE or _POSIX_SOURCE breaks and other headers which use u_int / u_short types cf_XOPEN_SOURCE= +if test "$cf_cv_posix_visible" = no; then + cf_POSIX_C_SOURCE=$cf_POSIX_C_SOURCE cf_save_CFLAGS="$CFLAGS" @@ -11473,16 +13389,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:11476: checking if we should define _POSIX_C_SOURCE" >&5 +echo "$as_me:13392: 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}:11482: testing if the symbol is already defined go no further ..." 1>&5 +echo "${as_me:-configure}:13398: testing if the symbol is already defined go no further ..." 1>&5 - cat >conftest.$ac_ext <<_ACEOF -#line 11485 "configure" + cat >"conftest.$ac_ext" <<_ACEOF +#line 13401 "configure" #include "confdefs.h" #include int @@ -11490,28 +13406,28 @@ 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:11500: \"$ac_compile\"") >&5 +rm -f "conftest.$ac_objext" +if { (eval echo "$as_me:13416: \"$ac_compile\"") >&5 (eval $ac_compile) 2>&5 ac_status=$? - echo "$as_me:11503: \$? = $ac_status" >&5 - (exit $ac_status); } && - { ac_try='test -s conftest.$ac_objext' - { (eval echo "$as_me:11506: \"$ac_try\"") >&5 + echo "$as_me:13419: \$? = $ac_status" >&5 + (exit "$ac_status"); } && + { ac_try='test -s "conftest.$ac_objext"' + { (eval echo "$as_me:13422: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? - echo "$as_me:11509: \$? = $ac_status" >&5 - (exit $ac_status); }; }; then + echo "$as_me:13425: \$? = $ac_status" >&5 + (exit "$ac_status"); }; }; then cf_cv_posix_c_source=no else echo "$as_me: failed program was:" >&5 -cat conftest.$ac_ext >&5 +cat "conftest.$ac_ext" >&5 cf_want_posix_source=no case .$cf_POSIX_C_SOURCE in (.[12]??*) @@ -11526,8 +13442,8 @@ cf_want_posix_source=no ;; esac if test "$cf_want_posix_source" = yes ; then - cat >conftest.$ac_ext <<_ACEOF -#line 11530 "configure" + cat >"conftest.$ac_ext" <<_ACEOF +#line 13446 "configure" #include "confdefs.h" #include int @@ -11535,34 +13451,34 @@ 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:11545: \"$ac_compile\"") >&5 +rm -f "conftest.$ac_objext" +if { (eval echo "$as_me:13461: \"$ac_compile\"") >&5 (eval $ac_compile) 2>&5 ac_status=$? - echo "$as_me:11548: \$? = $ac_status" >&5 - (exit $ac_status); } && - { ac_try='test -s conftest.$ac_objext' - { (eval echo "$as_me:11551: \"$ac_try\"") >&5 + echo "$as_me:13464: \$? = $ac_status" >&5 + (exit "$ac_status"); } && + { ac_try='test -s "conftest.$ac_objext"' + { (eval echo "$as_me:13467: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? - echo "$as_me:11554: \$? = $ac_status" >&5 - (exit $ac_status); }; }; then + echo "$as_me:13470: \$? = $ac_status" >&5 + (exit "$ac_status"); }; }; then : else echo "$as_me: failed program was:" >&5 -cat conftest.$ac_ext >&5 +cat "conftest.$ac_ext" >&5 cf_cv_posix_c_source="$cf_cv_posix_c_source -D_POSIX_SOURCE" fi -rm -f conftest.$ac_objext conftest.$ac_ext +rm -f "conftest.$ac_objext" "conftest.$ac_ext" fi -echo "${as_me:-configure}:11565: testing ifdef from value $cf_POSIX_C_SOURCE ..." 1>&5 +echo "${as_me:-configure}:13481: testing ifdef from value $cf_POSIX_C_SOURCE ..." 1>&5 CFLAGS="$cf_trim_CFLAGS" CPPFLAGS="$cf_trim_CPPFLAGS" @@ -11570,10 +13486,10 @@ echo "${as_me:-configure}:11565: testing ifdef from value $cf_POSIX_C_SOURCE ... test -n "$CPPFLAGS" && CPPFLAGS="$CPPFLAGS " CPPFLAGS="${CPPFLAGS}$cf_cv_posix_c_source" -echo "${as_me:-configure}:11573: testing if the second compile does not leave our definition intact error ..." 1>&5 +echo "${as_me:-configure}:13489: testing if the second compile does not leave our definition intact error ..." 1>&5 - cat >conftest.$ac_ext <<_ACEOF -#line 11576 "configure" + cat >"conftest.$ac_ext" <<_ACEOF +#line 13492 "configure" #include "confdefs.h" #include int @@ -11581,39 +13497,39 @@ 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:11591: \"$ac_compile\"") >&5 +rm -f "conftest.$ac_objext" +if { (eval echo "$as_me:13507: \"$ac_compile\"") >&5 (eval $ac_compile) 2>&5 ac_status=$? - echo "$as_me:11594: \$? = $ac_status" >&5 - (exit $ac_status); } && - { ac_try='test -s conftest.$ac_objext' - { (eval echo "$as_me:11597: \"$ac_try\"") >&5 + echo "$as_me:13510: \$? = $ac_status" >&5 + (exit "$ac_status"); } && + { ac_try='test -s "conftest.$ac_objext"' + { (eval echo "$as_me:13513: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? - echo "$as_me:11600: \$? = $ac_status" >&5 - (exit $ac_status); }; }; then + echo "$as_me:13516: \$? = $ac_status" >&5 + (exit "$ac_status"); }; }; then : else echo "$as_me: failed program was:" >&5 -cat conftest.$ac_ext >&5 +cat "conftest.$ac_ext" >&5 cf_cv_posix_c_source=no fi -rm -f conftest.$ac_objext conftest.$ac_ext +rm -f "conftest.$ac_objext" "conftest.$ac_ext" CFLAGS="$cf_save_CFLAGS" CPPFLAGS="$cf_save_CPPFLAGS" fi -rm -f conftest.$ac_objext conftest.$ac_ext +rm -f "conftest.$ac_objext" "conftest.$ac_ext" fi -echo "$as_me:11616: result: $cf_cv_posix_c_source" >&5 +echo "$as_me:13532: 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 @@ -11627,19 +13543,19 @@ cf_new_extra_cppflags= for cf_add_cflags in $cf_cv_posix_c_source do -case $cf_fix_cppflags in +case "$cf_fix_cppflags" in (no) - case $cf_add_cflags in + case "$cf_add_cflags" in (-undef|-nostdinc*|-I*|-D*|-U*|-E|-P|-C) - case $cf_add_cflags in + case "$cf_add_cflags" in (-D*) - cf_tst_cflags=`echo ${cf_add_cflags} |sed -e 's/^-D[^=]*='\''\"[^"]*//'` + cf_tst_cflags=`echo "${cf_add_cflags}" |sed -e 's/^-D[^=]*='\''\"[^"]*//'` test "x${cf_add_cflags}" != "x${cf_tst_cflags}" \ && test -z "${cf_tst_cflags}" \ && cf_fix_cppflags=yes - if test $cf_fix_cppflags = yes ; then + if test "$cf_fix_cppflags" = yes ; then test -n "$cf_new_extra_cppflags" && cf_new_extra_cppflags="$cf_new_extra_cppflags " cf_new_extra_cppflags="${cf_new_extra_cppflags}$cf_add_cflags" @@ -11658,7 +13574,7 @@ case $cf_fix_cppflags in (*$cf_add_cflags) ;; (*) - case $cf_add_cflags in + case "$cf_add_cflags" in (-D*) cf_tst_cppflags=`echo "x$cf_add_cflags" | sed -e 's/^...//' -e 's/=.*//'` @@ -11688,7 +13604,7 @@ CPPFLAGS=`echo "$CPPFLAGS" | \ test -n "$cf_new_extra_cppflags" && cf_new_extra_cppflags="$cf_new_extra_cppflags " cf_new_extra_cppflags="${cf_new_extra_cppflags}$cf_add_cflags" - cf_tst_cflags=`echo ${cf_add_cflags} |sed -e 's/^[^"]*"'\''//'` + cf_tst_cflags=`echo "${cf_add_cflags}" |sed -e 's/^[^"]*"'\''//'` test "x${cf_add_cflags}" != "x${cf_tst_cflags}" \ && test -z "${cf_tst_cflags}" \ @@ -11720,11 +13636,22 @@ fi fi +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:13649: 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 @@ -11751,97 +13678,95 @@ fi ;; (*) -echo "$as_me:11754: checking if we should define _XOPEN_SOURCE" >&5 +echo "$as_me:13681: 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 11761 "configure" + cat >"conftest.$ac_ext" <<_ACEOF +#line 13688 "configure" #include "confdefs.h" -#include -#include -#include +$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:11780: \"$ac_compile\"") >&5 +rm -f "conftest.$ac_objext" +if { (eval echo "$as_me:13706: \"$ac_compile\"") >&5 (eval $ac_compile) 2>&5 ac_status=$? - echo "$as_me:11783: \$? = $ac_status" >&5 - (exit $ac_status); } && - { ac_try='test -s conftest.$ac_objext' - { (eval echo "$as_me:11786: \"$ac_try\"") >&5 + echo "$as_me:13709: \$? = $ac_status" >&5 + (exit "$ac_status"); } && + { ac_try='test -s "conftest.$ac_objext"' + { (eval echo "$as_me:13712: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? - echo "$as_me:11789: \$? = $ac_status" >&5 - (exit $ac_status); }; }; then + echo "$as_me:13715: \$? = $ac_status" >&5 + (exit "$ac_status"); }; }; then cf_cv_xopen_source=no else echo "$as_me: failed program was:" >&5 -cat conftest.$ac_ext >&5 +cat "conftest.$ac_ext" >&5 cf_save="$CPPFLAGS" test -n "$CPPFLAGS" && CPPFLAGS="$CPPFLAGS " CPPFLAGS="${CPPFLAGS}-D_XOPEN_SOURCE=$cf_XOPEN_SOURCE" - cat >conftest.$ac_ext <<_ACEOF -#line 11801 "configure" + cat >"conftest.$ac_ext" <<_ACEOF +#line 13727 "configure" #include "confdefs.h" -#include -#include -#include +$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:11820: \"$ac_compile\"") >&5 +rm -f "conftest.$ac_objext" +if { (eval echo "$as_me:13745: \"$ac_compile\"") >&5 (eval $ac_compile) 2>&5 ac_status=$? - echo "$as_me:11823: \$? = $ac_status" >&5 - (exit $ac_status); } && - { ac_try='test -s conftest.$ac_objext' - { (eval echo "$as_me:11826: \"$ac_try\"") >&5 + echo "$as_me:13748: \$? = $ac_status" >&5 + (exit "$ac_status"); } && + { ac_try='test -s "conftest.$ac_objext"' + { (eval echo "$as_me:13751: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? - echo "$as_me:11829: \$? = $ac_status" >&5 - (exit $ac_status); }; }; then + echo "$as_me:13754: \$? = $ac_status" >&5 + (exit "$ac_status"); }; }; then cf_cv_xopen_source=no else echo "$as_me: failed program was:" >&5 -cat conftest.$ac_ext >&5 +cat "conftest.$ac_ext" >&5 cf_cv_xopen_source=$cf_XOPEN_SOURCE fi -rm -f conftest.$ac_objext conftest.$ac_ext - CPPFLAGS="$cf_save" +rm -f "conftest.$ac_objext" "conftest.$ac_ext" + CPPFLAGS="$cf_save" fi -rm -f conftest.$ac_objext conftest.$ac_ext +rm -f "conftest.$ac_objext" "conftest.$ac_ext" fi -echo "$as_me:11844: result: $cf_cv_xopen_source" >&5 +echo "$as_me:13769: result: $cf_cv_xopen_source" >&5 echo "${ECHO_T}$cf_cv_xopen_source" >&6 if test "$cf_cv_xopen_source" != no ; then @@ -11856,26 +13781,52 @@ 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 +case "$cf_fix_cppflags" in (no) - case $cf_add_cflags in + case "$cf_add_cflags" in (-undef|-nostdinc*|-I*|-D*|-U*|-E|-P|-C) - case $cf_add_cflags in + case "$cf_add_cflags" in (-D*) - cf_tst_cflags=`echo ${cf_add_cflags} |sed -e 's/^-D[^=]*='\''\"[^"]*//'` + cf_tst_cflags=`echo "${cf_add_cflags}" |sed -e 's/^-D[^=]*='\''\"[^"]*//'` test "x${cf_add_cflags}" != "x${cf_tst_cflags}" \ && test -z "${cf_tst_cflags}" \ && cf_fix_cppflags=yes - if test $cf_fix_cppflags = yes ; then + if test "$cf_fix_cppflags" = yes ; then test -n "$cf_new_extra_cppflags" && cf_new_extra_cppflags="$cf_new_extra_cppflags " cf_new_extra_cppflags="${cf_new_extra_cppflags}$cf_add_cflags" @@ -11894,7 +13845,7 @@ case $cf_fix_cppflags in (*$cf_add_cflags) ;; (*) - case $cf_add_cflags in + case "$cf_add_cflags" in (-D*) cf_tst_cppflags=`echo "x$cf_add_cflags" | sed -e 's/^...//' -e 's/=.*//'` @@ -11924,7 +13875,7 @@ CPPFLAGS=`echo "$CPPFLAGS" | \ test -n "$cf_new_extra_cppflags" && cf_new_extra_cppflags="$cf_new_extra_cppflags " cf_new_extra_cppflags="${cf_new_extra_cppflags}$cf_add_cflags" - cf_tst_cflags=`echo ${cf_add_cflags} |sed -e 's/^[^"]*"'\''//'` + cf_tst_cflags=`echo "${cf_add_cflags}" |sed -e 's/^[^"]*"'\''//'` test "x${cf_add_cflags}" != "x${cf_tst_cflags}" \ && test -z "${cf_tst_cflags}" \ @@ -11954,8 +13905,14 @@ 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 cf_save_CFLAGS="$CFLAGS" @@ -11969,16 +13926,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:11972: checking if we should define _POSIX_C_SOURCE" >&5 +echo "$as_me:13929: 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}:11978: testing if the symbol is already defined go no further ..." 1>&5 +echo "${as_me:-configure}:13935: testing if the symbol is already defined go no further ..." 1>&5 - cat >conftest.$ac_ext <<_ACEOF -#line 11981 "configure" + cat >"conftest.$ac_ext" <<_ACEOF +#line 13938 "configure" #include "confdefs.h" #include int @@ -11986,28 +13943,28 @@ 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:11996: \"$ac_compile\"") >&5 +rm -f "conftest.$ac_objext" +if { (eval echo "$as_me:13953: \"$ac_compile\"") >&5 (eval $ac_compile) 2>&5 ac_status=$? - echo "$as_me:11999: \$? = $ac_status" >&5 - (exit $ac_status); } && - { ac_try='test -s conftest.$ac_objext' - { (eval echo "$as_me:12002: \"$ac_try\"") >&5 + echo "$as_me:13956: \$? = $ac_status" >&5 + (exit "$ac_status"); } && + { ac_try='test -s "conftest.$ac_objext"' + { (eval echo "$as_me:13959: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? - echo "$as_me:12005: \$? = $ac_status" >&5 - (exit $ac_status); }; }; then + echo "$as_me:13962: \$? = $ac_status" >&5 + (exit "$ac_status"); }; }; then cf_cv_posix_c_source=no else echo "$as_me: failed program was:" >&5 -cat conftest.$ac_ext >&5 +cat "conftest.$ac_ext" >&5 cf_want_posix_source=no case .$cf_POSIX_C_SOURCE in (.[12]??*) @@ -12022,8 +13979,8 @@ cf_want_posix_source=no ;; esac if test "$cf_want_posix_source" = yes ; then - cat >conftest.$ac_ext <<_ACEOF -#line 12026 "configure" + cat >"conftest.$ac_ext" <<_ACEOF +#line 13983 "configure" #include "confdefs.h" #include int @@ -12031,34 +13988,34 @@ 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:12041: \"$ac_compile\"") >&5 +rm -f "conftest.$ac_objext" +if { (eval echo "$as_me:13998: \"$ac_compile\"") >&5 (eval $ac_compile) 2>&5 ac_status=$? - echo "$as_me:12044: \$? = $ac_status" >&5 - (exit $ac_status); } && - { ac_try='test -s conftest.$ac_objext' - { (eval echo "$as_me:12047: \"$ac_try\"") >&5 + echo "$as_me:14001: \$? = $ac_status" >&5 + (exit "$ac_status"); } && + { ac_try='test -s "conftest.$ac_objext"' + { (eval echo "$as_me:14004: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? - echo "$as_me:12050: \$? = $ac_status" >&5 - (exit $ac_status); }; }; then + echo "$as_me:14007: \$? = $ac_status" >&5 + (exit "$ac_status"); }; }; then : else echo "$as_me: failed program was:" >&5 -cat conftest.$ac_ext >&5 +cat "conftest.$ac_ext" >&5 cf_cv_posix_c_source="$cf_cv_posix_c_source -D_POSIX_SOURCE" fi -rm -f conftest.$ac_objext conftest.$ac_ext +rm -f "conftest.$ac_objext" "conftest.$ac_ext" fi -echo "${as_me:-configure}:12061: testing ifdef from value $cf_POSIX_C_SOURCE ..." 1>&5 +echo "${as_me:-configure}:14018: testing ifdef from value $cf_POSIX_C_SOURCE ..." 1>&5 CFLAGS="$cf_trim_CFLAGS" CPPFLAGS="$cf_trim_CPPFLAGS" @@ -12066,10 +14023,10 @@ echo "${as_me:-configure}:12061: testing ifdef from value $cf_POSIX_C_SOURCE ... test -n "$CPPFLAGS" && CPPFLAGS="$CPPFLAGS " CPPFLAGS="${CPPFLAGS}$cf_cv_posix_c_source" -echo "${as_me:-configure}:12069: testing if the second compile does not leave our definition intact error ..." 1>&5 +echo "${as_me:-configure}:14026: testing if the second compile does not leave our definition intact error ..." 1>&5 - cat >conftest.$ac_ext <<_ACEOF -#line 12072 "configure" + cat >"conftest.$ac_ext" <<_ACEOF +#line 14029 "configure" #include "confdefs.h" #include int @@ -12077,39 +14034,39 @@ 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:12087: \"$ac_compile\"") >&5 +rm -f "conftest.$ac_objext" +if { (eval echo "$as_me:14044: \"$ac_compile\"") >&5 (eval $ac_compile) 2>&5 ac_status=$? - echo "$as_me:12090: \$? = $ac_status" >&5 - (exit $ac_status); } && - { ac_try='test -s conftest.$ac_objext' - { (eval echo "$as_me:12093: \"$ac_try\"") >&5 + echo "$as_me:14047: \$? = $ac_status" >&5 + (exit "$ac_status"); } && + { ac_try='test -s "conftest.$ac_objext"' + { (eval echo "$as_me:14050: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? - echo "$as_me:12096: \$? = $ac_status" >&5 - (exit $ac_status); }; }; then + echo "$as_me:14053: \$? = $ac_status" >&5 + (exit "$ac_status"); }; }; then : else echo "$as_me: failed program was:" >&5 -cat conftest.$ac_ext >&5 +cat "conftest.$ac_ext" >&5 cf_cv_posix_c_source=no fi -rm -f conftest.$ac_objext conftest.$ac_ext +rm -f "conftest.$ac_objext" "conftest.$ac_ext" CFLAGS="$cf_save_CFLAGS" CPPFLAGS="$cf_save_CPPFLAGS" fi -rm -f conftest.$ac_objext conftest.$ac_ext +rm -f "conftest.$ac_objext" "conftest.$ac_ext" fi -echo "$as_me:12112: result: $cf_cv_posix_c_source" >&5 +echo "$as_me:14069: 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 @@ -12123,19 +14080,19 @@ cf_new_extra_cppflags= for cf_add_cflags in $cf_cv_posix_c_source do -case $cf_fix_cppflags in +case "$cf_fix_cppflags" in (no) - case $cf_add_cflags in + case "$cf_add_cflags" in (-undef|-nostdinc*|-I*|-D*|-U*|-E|-P|-C) - case $cf_add_cflags in + case "$cf_add_cflags" in (-D*) - cf_tst_cflags=`echo ${cf_add_cflags} |sed -e 's/^-D[^=]*='\''\"[^"]*//'` + cf_tst_cflags=`echo "${cf_add_cflags}" |sed -e 's/^-D[^=]*='\''\"[^"]*//'` test "x${cf_add_cflags}" != "x${cf_tst_cflags}" \ && test -z "${cf_tst_cflags}" \ && cf_fix_cppflags=yes - if test $cf_fix_cppflags = yes ; then + if test "$cf_fix_cppflags" = yes ; then test -n "$cf_new_extra_cppflags" && cf_new_extra_cppflags="$cf_new_extra_cppflags " cf_new_extra_cppflags="${cf_new_extra_cppflags}$cf_add_cflags" @@ -12154,7 +14111,7 @@ case $cf_fix_cppflags in (*$cf_add_cflags) ;; (*) - case $cf_add_cflags in + case "$cf_add_cflags" in (-D*) cf_tst_cppflags=`echo "x$cf_add_cflags" | sed -e 's/^...//' -e 's/=.*//'` @@ -12184,7 +14141,7 @@ CPPFLAGS=`echo "$CPPFLAGS" | \ test -n "$cf_new_extra_cppflags" && cf_new_extra_cppflags="$cf_new_extra_cppflags " cf_new_extra_cppflags="${cf_new_extra_cppflags}$cf_add_cflags" - cf_tst_cflags=`echo ${cf_add_cflags} |sed -e 's/^[^"]*"'\''//'` + cf_tst_cflags=`echo "${cf_add_cflags}" |sed -e 's/^[^"]*"'\''//'` test "x${cf_add_cflags}" != "x${cf_tst_cflags}" \ && test -z "${cf_tst_cflags}" \ @@ -12216,31 +14173,112 @@ fi 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}:14182: testing checking if _POSIX_C_SOURCE interferes with _XOPEN_SOURCE ..." 1>&5 + + cat >"conftest.$ac_ext" <<_ACEOF +#line 14185 "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:14203: \"$ac_compile\"") >&5 + (eval $ac_compile) 2>&5 + ac_status=$? + echo "$as_me:14206: \$? = $ac_status" >&5 + (exit "$ac_status"); } && + { ac_try='test -s "conftest.$ac_objext"' + { (eval echo "$as_me:14209: \"$ac_try\"") >&5 + (eval $ac_try) 2>&5 + ac_status=$? + echo "$as_me:14212: \$? = $ac_status" >&5 + (exit "$ac_status"); }; }; then + : +else + echo "$as_me: failed program was:" >&5 +cat "conftest.$ac_ext" >&5 + + { echo "$as_me:14219: 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}:14242: 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}:14254: 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 +case "$cf_fix_cppflags" in (no) - case $cf_add_cflags in + case "$cf_add_cflags" in (-undef|-nostdinc*|-I*|-D*|-U*|-E|-P|-C) - case $cf_add_cflags in + case "$cf_add_cflags" in (-D*) - cf_tst_cflags=`echo ${cf_add_cflags} |sed -e 's/^-D[^=]*='\''\"[^"]*//'` + cf_tst_cflags=`echo "${cf_add_cflags}" |sed -e 's/^-D[^=]*='\''\"[^"]*//'` test "x${cf_add_cflags}" != "x${cf_tst_cflags}" \ && test -z "${cf_tst_cflags}" \ && cf_fix_cppflags=yes - if test $cf_fix_cppflags = yes ; then + if test "$cf_fix_cppflags" = yes ; then test -n "$cf_new_extra_cppflags" && cf_new_extra_cppflags="$cf_new_extra_cppflags " cf_new_extra_cppflags="${cf_new_extra_cppflags}$cf_add_cflags" @@ -12259,7 +14297,7 @@ case $cf_fix_cppflags in (*$cf_add_cflags) ;; (*) - case $cf_add_cflags in + case "$cf_add_cflags" in (-D*) cf_tst_cppflags=`echo "x$cf_add_cflags" | sed -e 's/^...//' -e 's/=.*//'` @@ -12289,7 +14327,7 @@ CPPFLAGS=`echo "$CPPFLAGS" | \ test -n "$cf_new_extra_cppflags" && cf_new_extra_cppflags="$cf_new_extra_cppflags " cf_new_extra_cppflags="${cf_new_extra_cppflags}$cf_add_cflags" - cf_tst_cflags=`echo ${cf_add_cflags} |sed -e 's/^[^"]*"'\''//'` + cf_tst_cflags=`echo "${cf_add_cflags}" |sed -e 's/^[^"]*"'\''//'` test "x${cf_add_cflags}" != "x${cf_tst_cflags}" \ && test -z "${cf_tst_cflags}" \ @@ -12301,7 +14339,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}:12304: testing add to \$CFLAGS $cf_new_cflags ..." 1>&5 +echo "${as_me:-configure}:14342: testing add to \$CFLAGS $cf_new_cflags ..." 1>&5 test -n "$CFLAGS" && CFLAGS="$CFLAGS " CFLAGS="${CFLAGS}$cf_new_cflags" @@ -12311,7 +14349,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}:12314: testing add to \$CPPFLAGS $cf_new_cppflags ..." 1>&5 +echo "${as_me:-configure}:14352: testing add to \$CPPFLAGS $cf_new_cppflags ..." 1>&5 test -n "$CPPFLAGS" && CPPFLAGS="$CPPFLAGS " CPPFLAGS="${CPPFLAGS}$cf_new_cppflags" @@ -12321,20 +14359,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}:12324: testing add to \$EXTRA_CPPFLAGS $cf_new_extra_cppflags ..." 1>&5 +echo "${as_me:-configure}:14362: 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:12334: checking if _XOPEN_SOURCE really is set" >&5 + echo "$as_me:14374: 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 12337 "configure" + cat >"conftest.$ac_ext" <<_ACEOF +#line 14377 "configure" #include "confdefs.h" #include int @@ -12342,37 +14382,37 @@ 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:12352: \"$ac_compile\"") >&5 +rm -f "conftest.$ac_objext" +if { (eval echo "$as_me:14392: \"$ac_compile\"") >&5 (eval $ac_compile) 2>&5 ac_status=$? - echo "$as_me:12355: \$? = $ac_status" >&5 - (exit $ac_status); } && - { ac_try='test -s conftest.$ac_objext' - { (eval echo "$as_me:12358: \"$ac_try\"") >&5 + echo "$as_me:14395: \$? = $ac_status" >&5 + (exit "$ac_status"); } && + { ac_try='test -s "conftest.$ac_objext"' + { (eval echo "$as_me:14398: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? - echo "$as_me:12361: \$? = $ac_status" >&5 - (exit $ac_status); }; }; then + echo "$as_me:14401: \$? = $ac_status" >&5 + (exit "$ac_status"); }; }; then cf_XOPEN_SOURCE_set=yes else echo "$as_me: failed program was:" >&5 -cat conftest.$ac_ext >&5 +cat "conftest.$ac_ext" >&5 cf_XOPEN_SOURCE_set=no fi -rm -f conftest.$ac_objext conftest.$ac_ext - echo "$as_me:12370: result: $cf_XOPEN_SOURCE_set" >&5 +rm -f "conftest.$ac_objext" "conftest.$ac_ext" + echo "$as_me:14410: result: $cf_XOPEN_SOURCE_set" >&5 echo "${ECHO_T}$cf_XOPEN_SOURCE_set" >&6 - if test $cf_XOPEN_SOURCE_set = yes + if test "$cf_XOPEN_SOURCE_set" = yes then - cat >conftest.$ac_ext <<_ACEOF -#line 12375 "configure" + cat >"conftest.$ac_ext" <<_ACEOF +#line 14415 "configure" #include "confdefs.h" #include int @@ -12380,129 +14420,127 @@ 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:12390: \"$ac_compile\"") >&5 +rm -f "conftest.$ac_objext" +if { (eval echo "$as_me:14430: \"$ac_compile\"") >&5 (eval $ac_compile) 2>&5 ac_status=$? - echo "$as_me:12393: \$? = $ac_status" >&5 - (exit $ac_status); } && - { ac_try='test -s conftest.$ac_objext' - { (eval echo "$as_me:12396: \"$ac_try\"") >&5 + echo "$as_me:14433: \$? = $ac_status" >&5 + (exit "$ac_status"); } && + { ac_try='test -s "conftest.$ac_objext"' + { (eval echo "$as_me:14436: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? - echo "$as_me:12399: \$? = $ac_status" >&5 - (exit $ac_status); }; }; then + echo "$as_me:14439: \$? = $ac_status" >&5 + (exit "$ac_status"); }; }; then cf_XOPEN_SOURCE_set_ok=yes else echo "$as_me: failed program was:" >&5 -cat conftest.$ac_ext >&5 +cat "conftest.$ac_ext" >&5 cf_XOPEN_SOURCE_set_ok=no fi -rm -f conftest.$ac_objext conftest.$ac_ext - if test $cf_XOPEN_SOURCE_set_ok = no +rm -f "conftest.$ac_objext" "conftest.$ac_ext" + if test "$cf_XOPEN_SOURCE_set_ok" = no then - { echo "$as_me:12410: WARNING: _XOPEN_SOURCE is lower than requested" >&5 + { echo "$as_me:14450: WARNING: _XOPEN_SOURCE is lower than requested" >&5 echo "$as_me: WARNING: _XOPEN_SOURCE is lower than requested" >&2;} fi else -echo "$as_me:12415: checking if we should define _XOPEN_SOURCE" >&5 +echo "$as_me:14455: 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 12422 "configure" + cat >"conftest.$ac_ext" <<_ACEOF +#line 14462 "configure" #include "confdefs.h" -#include -#include -#include +$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:12441: \"$ac_compile\"") >&5 +rm -f "conftest.$ac_objext" +if { (eval echo "$as_me:14480: \"$ac_compile\"") >&5 (eval $ac_compile) 2>&5 ac_status=$? - echo "$as_me:12444: \$? = $ac_status" >&5 - (exit $ac_status); } && - { ac_try='test -s conftest.$ac_objext' - { (eval echo "$as_me:12447: \"$ac_try\"") >&5 + echo "$as_me:14483: \$? = $ac_status" >&5 + (exit "$ac_status"); } && + { ac_try='test -s "conftest.$ac_objext"' + { (eval echo "$as_me:14486: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? - echo "$as_me:12450: \$? = $ac_status" >&5 - (exit $ac_status); }; }; then + echo "$as_me:14489: \$? = $ac_status" >&5 + (exit "$ac_status"); }; }; then cf_cv_xopen_source=no else echo "$as_me: failed program was:" >&5 -cat conftest.$ac_ext >&5 +cat "conftest.$ac_ext" >&5 cf_save="$CPPFLAGS" test -n "$CPPFLAGS" && CPPFLAGS="$CPPFLAGS " CPPFLAGS="${CPPFLAGS}-D_XOPEN_SOURCE=$cf_XOPEN_SOURCE" - cat >conftest.$ac_ext <<_ACEOF -#line 12462 "configure" + cat >"conftest.$ac_ext" <<_ACEOF +#line 14501 "configure" #include "confdefs.h" -#include -#include -#include +$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:12481: \"$ac_compile\"") >&5 +rm -f "conftest.$ac_objext" +if { (eval echo "$as_me:14519: \"$ac_compile\"") >&5 (eval $ac_compile) 2>&5 ac_status=$? - echo "$as_me:12484: \$? = $ac_status" >&5 - (exit $ac_status); } && - { ac_try='test -s conftest.$ac_objext' - { (eval echo "$as_me:12487: \"$ac_try\"") >&5 + echo "$as_me:14522: \$? = $ac_status" >&5 + (exit "$ac_status"); } && + { ac_try='test -s "conftest.$ac_objext"' + { (eval echo "$as_me:14525: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? - echo "$as_me:12490: \$? = $ac_status" >&5 - (exit $ac_status); }; }; then + echo "$as_me:14528: \$? = $ac_status" >&5 + (exit "$ac_status"); }; }; then cf_cv_xopen_source=no else echo "$as_me: failed program was:" >&5 -cat conftest.$ac_ext >&5 +cat "conftest.$ac_ext" >&5 cf_cv_xopen_source=$cf_XOPEN_SOURCE fi -rm -f conftest.$ac_objext conftest.$ac_ext - CPPFLAGS="$cf_save" +rm -f "conftest.$ac_objext" "conftest.$ac_ext" + CPPFLAGS="$cf_save" fi -rm -f conftest.$ac_objext conftest.$ac_ext +rm -f "conftest.$ac_objext" "conftest.$ac_ext" fi -echo "$as_me:12505: result: $cf_cv_xopen_source" >&5 +echo "$as_me:14543: result: $cf_cv_xopen_source" >&5 echo "${ECHO_T}$cf_cv_xopen_source" >&6 if test "$cf_cv_xopen_source" != no ; then @@ -12517,26 +14555,52 @@ 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 +case "$cf_fix_cppflags" in (no) - case $cf_add_cflags in + case "$cf_add_cflags" in (-undef|-nostdinc*|-I*|-D*|-U*|-E|-P|-C) - case $cf_add_cflags in + case "$cf_add_cflags" in (-D*) - cf_tst_cflags=`echo ${cf_add_cflags} |sed -e 's/^-D[^=]*='\''\"[^"]*//'` + cf_tst_cflags=`echo "${cf_add_cflags}" |sed -e 's/^-D[^=]*='\''\"[^"]*//'` test "x${cf_add_cflags}" != "x${cf_tst_cflags}" \ && test -z "${cf_tst_cflags}" \ && cf_fix_cppflags=yes - if test $cf_fix_cppflags = yes ; then + if test "$cf_fix_cppflags" = yes ; then test -n "$cf_new_extra_cppflags" && cf_new_extra_cppflags="$cf_new_extra_cppflags " cf_new_extra_cppflags="${cf_new_extra_cppflags}$cf_add_cflags" @@ -12555,7 +14619,7 @@ case $cf_fix_cppflags in (*$cf_add_cflags) ;; (*) - case $cf_add_cflags in + case "$cf_add_cflags" in (-D*) cf_tst_cppflags=`echo "x$cf_add_cflags" | sed -e 's/^...//' -e 's/=.*//'` @@ -12585,7 +14649,7 @@ CPPFLAGS=`echo "$CPPFLAGS" | \ test -n "$cf_new_extra_cppflags" && cf_new_extra_cppflags="$cf_new_extra_cppflags " cf_new_extra_cppflags="${cf_new_extra_cppflags}$cf_add_cflags" - cf_tst_cflags=`echo ${cf_add_cflags} |sed -e 's/^[^"]*"'\''//'` + cf_tst_cflags=`echo "${cf_add_cflags}" |sed -e 's/^[^"]*"'\''//'` test "x${cf_add_cflags}" != "x${cf_tst_cflags}" \ && test -z "${cf_tst_cflags}" \ @@ -12615,107 +14679,338 @@ if test -n "$cf_new_extra_cppflags" ; then fi +done + fi fi fi +fi # cf_cv_posix_visible -# Check whether --enable-largefile or --disable-largefile was given. -if test "${enable_largefile+set}" = set; then - enableval="$enable_largefile" - -fi; -if test "$enable_largefile" != no; then - - echo "$as_me:12630: 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 "$as_me:14690: 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 - ac_cv_sys_largefile_CC=no - if test "$GCC" != yes; then - ac_save_CC=$CC - while :; do - # 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 12642 "configure" + cat >"conftest.$ac_ext" <<_ACEOF +#line 14696 "configure" #include "confdefs.h" -#include - /* Check that off_t can represent 2**63 - 1 correctly. - We can't simply define LARGE_OFF_T to be 9223372036854775807, - since some C++ compilers masquerading as C compilers - incorrectly reject 9223372036854775807. */ -#define LARGE_OFF_T (((off_t) 1 << 62) - 1 + ((off_t) 1 << 62)) - int off_t_is_large[(LARGE_OFF_T % 2147483629 == 721 - && LARGE_OFF_T % 2147483647 == 1) - ? 1 : -1]; -int -main (void) -{ +#include +#include +#include +#include - ; - return 0; -} _ACEOF - rm -f conftest.$ac_objext -if { (eval echo "$as_me:12662: \"$ac_compile\"") >&5 - (eval $ac_compile) 2>&5 - ac_status=$? - echo "$as_me:12665: \$? = $ac_status" >&5 - (exit $ac_status); } && - { ac_try='test -s conftest.$ac_objext' - { (eval echo "$as_me:12668: \"$ac_try\"") >&5 - (eval $ac_try) 2>&5 +if { (eval echo "$as_me:14704: \"$ac_cpp "conftest.$ac_ext"\"") >&5 + (eval $ac_cpp "conftest.$ac_ext") 2>conftest.er1 ac_status=$? - echo "$as_me:12671: \$? = $ac_status" >&5 - (exit $ac_status); }; }; then - break + $EGREP -v '^ *\+' conftest.er1 >conftest.err + rm -f conftest.er1 + cat conftest.err >&5 + echo "$as_me:14710: \$? = $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 - echo "$as_me: failed program was:" >&5 -cat conftest.$ac_ext >&5 + ac_cpp_err=yes fi -rm -f conftest.$ac_objext - CC="$CC -n32" - rm -f conftest.$ac_objext -if { (eval echo "$as_me:12681: \"$ac_compile\"") >&5 - (eval $ac_compile) 2>&5 - ac_status=$? - echo "$as_me:12684: \$? = $ac_status" >&5 - (exit $ac_status); } && - { ac_try='test -s conftest.$ac_objext' - { (eval echo "$as_me:12687: \"$ac_try\"") >&5 - (eval $ac_try) 2>&5 - ac_status=$? - echo "$as_me:12690: \$? = $ac_status" >&5 - (exit $ac_status); }; }; then - ac_cv_sys_largefile_CC=' -n32'; break +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 + cat "conftest.$ac_ext" >&5 + ac_cv_header_stdc=no fi -rm -f conftest.$ac_objext - break +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 14732 "configure" +#include "confdefs.h" +#include + +_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 14750 "configure" +#include "confdefs.h" +#include + +_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 14771 "configure" +#include "confdefs.h" +#include +#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:14797: \"$ac_link\"") >&5 + (eval $ac_link) 2>&5 + ac_status=$? + echo "$as_me:14800: \$? = $ac_status" >&5 + (exit "$ac_status"); } && { ac_try='"./conftest$ac_exeext"' + { (eval echo "$as_me:14802: \"$ac_try\"") >&5 + (eval $ac_try) 2>&5 + ac_status=$? + echo "$as_me:14805: \$? = $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:14818: 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:14834: 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 14840 "configure" +#include "confdefs.h" +$ac_includes_default +#include <$ac_header> +_ACEOF +rm -f "conftest.$ac_objext" +if { (eval echo "$as_me:14846: \"$ac_compile\"") >&5 + (eval $ac_compile) 2>&5 + ac_status=$? + echo "$as_me:14849: \$? = $ac_status" >&5 + (exit "$ac_status"); } && + { ac_try='test -s "conftest.$ac_objext"' + { (eval echo "$as_me:14852: \"$ac_try\"") >&5 + (eval $ac_try) 2>&5 + ac_status=$? + echo "$as_me:14855: \$? = $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:14865: 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 <&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 14881 "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:14896: \"$ac_compile\"") >&5 + (eval $ac_compile) 2>&5 + ac_status=$? + echo "$as_me:14899: \$? = $ac_status" >&5 + (exit "$ac_status"); } && + { ac_try='test -s "conftest.$ac_objext"' + { (eval echo "$as_me:14902: \"$ac_try\"") >&5 + (eval $ac_try) 2>&5 + ac_status=$? + echo "$as_me:14905: \$? = $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:14915: 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" + +fi; +if test "$enable_largefile" != no; then + + echo "$as_me:14925: 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 +else + ac_cv_sys_largefile_CC=no + if test "$GCC" != yes; then + ac_save_CC=$CC + while :; do + # 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 14937 "configure" +#include "confdefs.h" +#include + /* Check that off_t can represent 2**63 - 1 correctly. + We can't simply define LARGE_OFF_T to be 9223372036854775807, + since some C++ compilers masquerading as C compilers + incorrectly reject 9223372036854775807. */ +#define LARGE_OFF_T (((off_t) 1 << 62) - 1 + ((off_t) 1 << 62)) + int off_t_is_large[(LARGE_OFF_T % 2147483629 == 721 + && LARGE_OFF_T % 2147483647 == 1) + ? 1 : -1]; +int +main (void) +{ + + ; + return 0; +} +_ACEOF + rm -f "conftest.$ac_objext" +if { (eval echo "$as_me:14957: \"$ac_compile\"") >&5 + (eval $ac_compile) 2>&5 + ac_status=$? + echo "$as_me:14960: \$? = $ac_status" >&5 + (exit "$ac_status"); } && + { ac_try='test -s "conftest.$ac_objext"' + { (eval echo "$as_me:14963: \"$ac_try\"") >&5 + (eval $ac_try) 2>&5 + ac_status=$? + echo "$as_me:14966: \$? = $ac_status" >&5 + (exit "$ac_status"); }; }; then + break +else + echo "$as_me: failed program was:" >&5 +cat "conftest.$ac_ext" >&5 +fi +rm -f "conftest.$ac_objext" + CC="$CC -n32" + rm -f "conftest.$ac_objext" +if { (eval echo "$as_me:14976: \"$ac_compile\"") >&5 + (eval $ac_compile) 2>&5 + ac_status=$? + echo "$as_me:14979: \$? = $ac_status" >&5 + (exit "$ac_status"); } && + { ac_try='test -s "conftest.$ac_objext"' + { (eval echo "$as_me:14982: \"$ac_try\"") >&5 + (eval $ac_try) 2>&5 + ac_status=$? + echo "$as_me:14985: \$? = $ac_status" >&5 + (exit "$ac_status"); }; }; then + ac_cv_sys_largefile_CC=' -n32'; break +else + echo "$as_me: failed program was:" >&5 +cat "conftest.$ac_ext" >&5 +fi +rm -f "conftest.$ac_objext" + break done CC=$ac_save_CC - rm -f conftest.$ac_ext + rm -f "conftest.$ac_ext" fi fi -echo "$as_me:12704: result: $ac_cv_sys_largefile_CC" >&5 +echo "$as_me:14999: 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:12710: checking for _FILE_OFFSET_BITS value needed for large files" >&5 + echo "$as_me:15005: 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 else while :; do ac_cv_sys_file_offset_bits=no - cat >conftest.$ac_ext <<_ACEOF -#line 12718 "configure" + cat >"conftest.$ac_ext" <<_ACEOF +#line 15013 "configure" #include "confdefs.h" #include /* Check that off_t can represent 2**63 - 1 correctly. @@ -12734,26 +15029,26 @@ main (void) return 0; } _ACEOF -rm -f conftest.$ac_objext -if { (eval echo "$as_me:12738: \"$ac_compile\"") >&5 +rm -f "conftest.$ac_objext" +if { (eval echo "$as_me:15033: \"$ac_compile\"") >&5 (eval $ac_compile) 2>&5 ac_status=$? - echo "$as_me:12741: \$? = $ac_status" >&5 - (exit $ac_status); } && - { ac_try='test -s conftest.$ac_objext' - { (eval echo "$as_me:12744: \"$ac_try\"") >&5 + echo "$as_me:15036: \$? = $ac_status" >&5 + (exit "$ac_status"); } && + { ac_try='test -s "conftest.$ac_objext"' + { (eval echo "$as_me:15039: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? - echo "$as_me:12747: \$? = $ac_status" >&5 - (exit $ac_status); }; }; then + echo "$as_me:15042: \$? = $ac_status" >&5 + (exit "$ac_status"); }; }; then break else echo "$as_me: failed program was:" >&5 -cat conftest.$ac_ext >&5 +cat "conftest.$ac_ext" >&5 fi -rm -f conftest.$ac_objext conftest.$ac_ext - cat >conftest.$ac_ext <<_ACEOF -#line 12756 "configure" +rm -f "conftest.$ac_objext" "conftest.$ac_ext" + cat >"conftest.$ac_ext" <<_ACEOF +#line 15051 "configure" #include "confdefs.h" #define _FILE_OFFSET_BITS 64 #include @@ -12773,28 +15068,28 @@ main (void) return 0; } _ACEOF -rm -f conftest.$ac_objext -if { (eval echo "$as_me:12777: \"$ac_compile\"") >&5 +rm -f "conftest.$ac_objext" +if { (eval echo "$as_me:15072: \"$ac_compile\"") >&5 (eval $ac_compile) 2>&5 ac_status=$? - echo "$as_me:12780: \$? = $ac_status" >&5 - (exit $ac_status); } && - { ac_try='test -s conftest.$ac_objext' - { (eval echo "$as_me:12783: \"$ac_try\"") >&5 + echo "$as_me:15075: \$? = $ac_status" >&5 + (exit "$ac_status"); } && + { ac_try='test -s "conftest.$ac_objext"' + { (eval echo "$as_me:15078: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? - echo "$as_me:12786: \$? = $ac_status" >&5 - (exit $ac_status); }; }; then + echo "$as_me:15081: \$? = $ac_status" >&5 + (exit "$ac_status"); }; }; then ac_cv_sys_file_offset_bits=64; break else echo "$as_me: failed program was:" >&5 -cat conftest.$ac_ext >&5 +cat "conftest.$ac_ext" >&5 fi -rm -f conftest.$ac_objext conftest.$ac_ext +rm -f "conftest.$ac_objext" "conftest.$ac_ext" break done fi -echo "$as_me:12797: result: $ac_cv_sys_file_offset_bits" >&5 +echo "$as_me:15092: 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 @@ -12804,15 +15099,15 @@ EOF fi rm -rf conftest* - echo "$as_me:12807: checking for _LARGE_FILES value needed for large files" >&5 + echo "$as_me:15102: 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 else while :; do ac_cv_sys_large_files=no - cat >conftest.$ac_ext <<_ACEOF -#line 12815 "configure" + cat >"conftest.$ac_ext" <<_ACEOF +#line 15110 "configure" #include "confdefs.h" #include /* Check that off_t can represent 2**63 - 1 correctly. @@ -12831,26 +15126,26 @@ main (void) return 0; } _ACEOF -rm -f conftest.$ac_objext -if { (eval echo "$as_me:12835: \"$ac_compile\"") >&5 +rm -f "conftest.$ac_objext" +if { (eval echo "$as_me:15130: \"$ac_compile\"") >&5 (eval $ac_compile) 2>&5 ac_status=$? - echo "$as_me:12838: \$? = $ac_status" >&5 - (exit $ac_status); } && - { ac_try='test -s conftest.$ac_objext' - { (eval echo "$as_me:12841: \"$ac_try\"") >&5 + echo "$as_me:15133: \$? = $ac_status" >&5 + (exit "$ac_status"); } && + { ac_try='test -s "conftest.$ac_objext"' + { (eval echo "$as_me:15136: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? - echo "$as_me:12844: \$? = $ac_status" >&5 - (exit $ac_status); }; }; then + echo "$as_me:15139: \$? = $ac_status" >&5 + (exit "$ac_status"); }; }; then break else echo "$as_me: failed program was:" >&5 -cat conftest.$ac_ext >&5 +cat "conftest.$ac_ext" >&5 fi -rm -f conftest.$ac_objext conftest.$ac_ext - cat >conftest.$ac_ext <<_ACEOF -#line 12853 "configure" +rm -f "conftest.$ac_objext" "conftest.$ac_ext" + cat >"conftest.$ac_ext" <<_ACEOF +#line 15148 "configure" #include "confdefs.h" #define _LARGE_FILES 1 #include @@ -12870,28 +15165,28 @@ main (void) return 0; } _ACEOF -rm -f conftest.$ac_objext -if { (eval echo "$as_me:12874: \"$ac_compile\"") >&5 +rm -f "conftest.$ac_objext" +if { (eval echo "$as_me:15169: \"$ac_compile\"") >&5 (eval $ac_compile) 2>&5 ac_status=$? - echo "$as_me:12877: \$? = $ac_status" >&5 - (exit $ac_status); } && - { ac_try='test -s conftest.$ac_objext' - { (eval echo "$as_me:12880: \"$ac_try\"") >&5 + echo "$as_me:15172: \$? = $ac_status" >&5 + (exit "$ac_status"); } && + { ac_try='test -s "conftest.$ac_objext"' + { (eval echo "$as_me:15175: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? - echo "$as_me:12883: \$? = $ac_status" >&5 - (exit $ac_status); }; }; then + echo "$as_me:15178: \$? = $ac_status" >&5 + (exit "$ac_status"); }; }; then ac_cv_sys_large_files=1; break else echo "$as_me: failed program was:" >&5 -cat conftest.$ac_ext >&5 +cat "conftest.$ac_ext" >&5 fi -rm -f conftest.$ac_objext conftest.$ac_ext +rm -f "conftest.$ac_objext" "conftest.$ac_ext" break done fi -echo "$as_me:12894: result: $ac_cv_sys_large_files" >&5 +echo "$as_me:15189: 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 @@ -12904,78 +15199,84 @@ rm -rf conftest* fi if test "$enable_largefile" != no ; then - echo "$as_me:12907: checking for _LARGEFILE_SOURCE value needed for large files" >&5 + echo "$as_me:15202: 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 else while :; do ac_cv_sys_largefile_source=no - cat >conftest.$ac_ext <<_ACEOF -#line 12915 "configure" + cat >"conftest.$ac_ext" <<_ACEOF +#line 15210 "configure" #include "confdefs.h" #include + #include 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:12927: \"$ac_compile\"") >&5 +rm -f "conftest.$ac_objext" +if { (eval echo "$as_me:15225: \"$ac_compile\"") >&5 (eval $ac_compile) 2>&5 ac_status=$? - echo "$as_me:12930: \$? = $ac_status" >&5 - (exit $ac_status); } && - { ac_try='test -s conftest.$ac_objext' - { (eval echo "$as_me:12933: \"$ac_try\"") >&5 + echo "$as_me:15228: \$? = $ac_status" >&5 + (exit "$ac_status"); } && + { ac_try='test -s "conftest.$ac_objext"' + { (eval echo "$as_me:15231: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? - echo "$as_me:12936: \$? = $ac_status" >&5 - (exit $ac_status); }; }; then + echo "$as_me:15234: \$? = $ac_status" >&5 + (exit "$ac_status"); }; }; then break else echo "$as_me: failed program was:" >&5 -cat conftest.$ac_ext >&5 +cat "conftest.$ac_ext" >&5 fi -rm -f conftest.$ac_objext conftest.$ac_ext - cat >conftest.$ac_ext <<_ACEOF -#line 12945 "configure" +rm -f "conftest.$ac_objext" "conftest.$ac_ext" + cat >"conftest.$ac_ext" <<_ACEOF +#line 15243 "configure" #include "confdefs.h" #define _LARGEFILE_SOURCE 1 #include + #include 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:12958: \"$ac_compile\"") >&5 +rm -f "conftest.$ac_objext" +if { (eval echo "$as_me:15259: \"$ac_compile\"") >&5 (eval $ac_compile) 2>&5 ac_status=$? - echo "$as_me:12961: \$? = $ac_status" >&5 - (exit $ac_status); } && - { ac_try='test -s conftest.$ac_objext' - { (eval echo "$as_me:12964: \"$ac_try\"") >&5 + echo "$as_me:15262: \$? = $ac_status" >&5 + (exit "$ac_status"); } && + { ac_try='test -s "conftest.$ac_objext"' + { (eval echo "$as_me:15265: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? - echo "$as_me:12967: \$? = $ac_status" >&5 - (exit $ac_status); }; }; then + echo "$as_me:15268: \$? = $ac_status" >&5 + (exit "$ac_status"); }; }; then ac_cv_sys_largefile_source=1; break else echo "$as_me: failed program was:" >&5 -cat conftest.$ac_ext >&5 +cat "conftest.$ac_ext" >&5 fi -rm -f conftest.$ac_objext conftest.$ac_ext +rm -f "conftest.$ac_objext" "conftest.$ac_ext" break done fi -echo "$as_me:12978: result: $ac_cv_sys_largefile_source" >&5 +echo "$as_me:15279: 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 @@ -12989,44 +15290,46 @@ 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:12992: checking for fseeko" >&5 +echo "$as_me:15293: 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 12998 "configure" + cat >"conftest.$ac_ext" <<_ACEOF +#line 15299 "configure" #include "confdefs.h" #include + #include 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:13010: \"$ac_link\"") >&5 +rm -f "conftest.$ac_objext" "conftest$ac_exeext" +if { (eval echo "$as_me:15313: \"$ac_link\"") >&5 (eval $ac_link) 2>&5 ac_status=$? - echo "$as_me:13013: \$? = $ac_status" >&5 - (exit $ac_status); } && - { ac_try='test -s conftest$ac_exeext' - { (eval echo "$as_me:13016: \"$ac_try\"") >&5 + echo "$as_me:15316: \$? = $ac_status" >&5 + (exit "$ac_status"); } && + { ac_try='test -s "conftest$ac_exeext"' + { (eval echo "$as_me:15319: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? - echo "$as_me:13019: \$? = $ac_status" >&5 - (exit $ac_status); }; }; then + echo "$as_me:15322: \$? = $ac_status" >&5 + (exit "$ac_status"); }; }; then ac_cv_func_fseeko=yes else echo "$as_me: failed program was:" >&5 -cat conftest.$ac_ext >&5 +cat "conftest.$ac_ext" >&5 ac_cv_func_fseeko=no fi -rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext +rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext" fi -echo "$as_me:13029: result: $ac_cv_func_fseeko" >&5 +echo "$as_me:15332: result: $ac_cv_func_fseeko" >&5 echo "${ECHO_T}$ac_cv_func_fseeko" >&6 if test $ac_cv_func_fseeko = yes; then @@ -13065,56 +15368,61 @@ fi fi - echo "$as_me:13068: checking whether to use struct dirent64" >&5 + echo "$as_me:15371: 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 13075 "configure" + cat >"conftest.$ac_ext" <<_ACEOF +#line 15378 "configure" #include "confdefs.h" #pragma GCC diagnostic error "-Wincompatible-pointer-types" #include #include +#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; ; return 0; } _ACEOF -rm -f conftest.$ac_objext -if { (eval echo "$as_me:13097: \"$ac_compile\"") >&5 +rm -f "conftest.$ac_objext" +if { (eval echo "$as_me:15405: \"$ac_compile\"") >&5 (eval $ac_compile) 2>&5 ac_status=$? - echo "$as_me:13100: \$? = $ac_status" >&5 - (exit $ac_status); } && - { ac_try='test -s conftest.$ac_objext' - { (eval echo "$as_me:13103: \"$ac_try\"") >&5 + echo "$as_me:15408: \$? = $ac_status" >&5 + (exit "$ac_status"); } && + { ac_try='test -s "conftest.$ac_objext"' + { (eval echo "$as_me:15411: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? - echo "$as_me:13106: \$? = $ac_status" >&5 - (exit $ac_status); }; }; then + echo "$as_me:15414: \$? = $ac_status" >&5 + (exit "$ac_status"); }; }; then cf_cv_struct_dirent64=yes else echo "$as_me: failed program was:" >&5 -cat conftest.$ac_ext >&5 +cat "conftest.$ac_ext" >&5 cf_cv_struct_dirent64=no fi -rm -f conftest.$ac_objext conftest.$ac_ext +rm -f "conftest.$ac_objext" "conftest.$ac_ext" fi -echo "$as_me:13117: result: $cf_cv_struct_dirent64" >&5 +echo "$as_me:15425: result: $cf_cv_struct_dirent64" >&5 echo "${ECHO_T}$cf_cv_struct_dirent64" >&6 test "$cf_cv_struct_dirent64" = yes && cat >>confdefs.h <<\EOF @@ -13124,7 +15432,7 @@ EOF fi ### Enable compiling-in rcs id's -echo "$as_me:13127: checking if RCS identifiers should be compiled-in" >&5 +echo "$as_me:15435: 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. @@ -13134,7 +15442,7 @@ if test "${with_rcs_ids+set}" = set; then else with_rcs_ids=no fi; -echo "$as_me:13137: result: $with_rcs_ids" >&5 +echo "$as_me:15445: result: $with_rcs_ids" >&5 echo "${ECHO_T}$with_rcs_ids" >&6 test "$with_rcs_ids" = yes && cat >>confdefs.h <<\EOF @@ -13144,7 +15452,7 @@ EOF ############################################################################### ### Note that some functions (such as const) are normally disabled anyway. -echo "$as_me:13147: checking if you want to build with function extensions" >&5 +echo "$as_me:15455: 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. @@ -13154,7 +15462,7 @@ if test "${enable_ext_funcs+set}" = set; then else with_ext_funcs=yes fi; -echo "$as_me:13157: result: $with_ext_funcs" >&5 +echo "$as_me:15465: result: $with_ext_funcs" >&5 echo "${ECHO_T}$with_ext_funcs" >&6 if test "$with_ext_funcs" = yes ; then NCURSES_EXT_FUNCS=1 @@ -13172,7 +15480,7 @@ else fi ### use option --enable-const to turn on use of const beyond that in XSI. -echo "$as_me:13175: checking for extended use of const keyword" >&5 +echo "$as_me:15483: 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. @@ -13182,7 +15490,7 @@ if test "${enable_const+set}" = set; then else with_ext_const=no fi; -echo "$as_me:13185: result: $with_ext_const" >&5 +echo "$as_me:15493: result: $with_ext_const" >&5 echo "${ECHO_T}$with_ext_const" >&6 NCURSES_CONST='/*nothing*/' if test "$with_ext_const" = yes ; then @@ -13192,7 +15500,7 @@ fi ############################################################################### # These options are relatively safe to experiment with. -echo "$as_me:13195: checking if you want all development code" >&5 +echo "$as_me:15503: 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. @@ -13202,7 +15510,7 @@ if test "${with_develop+set}" = set; then else with_develop=no fi; -echo "$as_me:13205: result: $with_develop" >&5 +echo "$as_me:15513: result: $with_develop" >&5 echo "${ECHO_T}$with_develop" >&6 ############################################################################### @@ -13211,7 +15519,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:13214: checking if you want to link with the pthread library" >&5 +echo "$as_me:15522: 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. @@ -13221,28 +15529,28 @@ if test "${with_pthread+set}" = set; then else with_pthread=no fi; -echo "$as_me:13224: result: $with_pthread" >&5 +echo "$as_me:15532: result: $with_pthread" >&5 echo "${ECHO_T}$with_pthread" >&6 if test "$with_pthread" != no ; then - echo "$as_me:13228: checking for pthread.h" >&5 + echo "$as_me:15536: 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 13234 "configure" + cat >"conftest.$ac_ext" <<_ACEOF +#line 15542 "configure" #include "confdefs.h" #include _ACEOF -if { (eval echo "$as_me:13238: \"$ac_cpp conftest.$ac_ext\"") >&5 - (eval $ac_cpp conftest.$ac_ext) 2>conftest.er1 +if { (eval echo "$as_me:15546: \"$ac_cpp "conftest.$ac_ext"\"") >&5 + (eval $ac_cpp "conftest.$ac_ext") 2>conftest.er1 ac_status=$? - egrep -v '^ *\+' conftest.er1 >conftest.err + $EGREP -v '^ *\+' conftest.er1 >conftest.err rm -f conftest.er1 cat conftest.err >&5 - echo "$as_me:13244: \$? = $ac_status" >&5 - (exit $ac_status); } >/dev/null; then + echo "$as_me:15552: \$? = $ac_status" >&5 + (exit "$ac_status"); } >/dev/null; then if test -s conftest.err; then ac_cpp_err=$ac_c_preproc_warn_flag else @@ -13255,14 +15563,14 @@ if test -z "$ac_cpp_err"; then ac_cv_header_pthread_h=yes else echo "$as_me: failed program was:" >&5 - cat conftest.$ac_ext >&5 + cat "conftest.$ac_ext" >&5 ac_cv_header_pthread_h=no fi -rm -f conftest.err conftest.$ac_ext +rm -f conftest.err "conftest.$ac_ext" fi -echo "$as_me:13263: result: $ac_cv_header_pthread_h" >&5 +echo "$as_me:15571: 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 +if test "$ac_cv_header_pthread_h" = yes; then cat >>confdefs.h <<\EOF #define HAVE_PTHREADS_H 1 @@ -13270,28 +15578,28 @@ EOF for cf_lib_pthread in pthread c_r do - echo "$as_me:13273: checking if we can link with the $cf_lib_pthread library" >&5 + echo "$as_me:15581: 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" -cf_add_libs="-l$cf_lib_pthread" -# Filter out duplicates - this happens with badly-designed ".pc" files... -for cf_add_1lib in $LIBS -do - for cf_add_2lib in $cf_add_libs - do - if test "x$cf_add_1lib" = "x$cf_add_2lib" - then +cf_add_libs="$LIBS" +# reverse order +cf_add_0lib= +for cf_add_1lib in -l$cf_lib_pthread; 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_libs $cf_add_1lib" + test -n "$cf_add_1lib" && cf_add_libs="$cf_add_1lib $cf_add_libs" done LIBS="$cf_add_libs" - cat >conftest.$ac_ext <<_ACEOF -#line 13294 "configure" + cat >"conftest.$ac_ext" <<_ACEOF +#line 15602 "configure" #include "confdefs.h" #include @@ -13307,46 +15615,46 @@ main (void) return 0; } _ACEOF -rm -f conftest.$ac_objext conftest$ac_exeext -if { (eval echo "$as_me:13311: \"$ac_link\"") >&5 +rm -f "conftest.$ac_objext" "conftest$ac_exeext" +if { (eval echo "$as_me:15619: \"$ac_link\"") >&5 (eval $ac_link) 2>&5 ac_status=$? - echo "$as_me:13314: \$? = $ac_status" >&5 - (exit $ac_status); } && - { ac_try='test -s conftest$ac_exeext' - { (eval echo "$as_me:13317: \"$ac_try\"") >&5 + echo "$as_me:15622: \$? = $ac_status" >&5 + (exit "$ac_status"); } && + { ac_try='test -s "conftest$ac_exeext"' + { (eval echo "$as_me:15625: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? - echo "$as_me:13320: \$? = $ac_status" >&5 - (exit $ac_status); }; }; then + echo "$as_me:15628: \$? = $ac_status" >&5 + (exit "$ac_status"); }; }; then with_pthread=yes else echo "$as_me: failed program was:" >&5 -cat conftest.$ac_ext >&5 +cat "conftest.$ac_ext" >&5 with_pthread=no fi -rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext +rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext" LIBS="$cf_save_LIBS" - echo "$as_me:13330: result: $with_pthread" >&5 + echo "$as_me:15638: result: $with_pthread" >&5 echo "${ECHO_T}$with_pthread" >&6 test "$with_pthread" = yes && break done if test "$with_pthread" = yes ; then -cf_add_libs="-l$cf_lib_pthread" -# Filter out duplicates - this happens with badly-designed ".pc" files... -for cf_add_1lib in $LIBS -do - for cf_add_2lib in $cf_add_libs - do - if test "x$cf_add_1lib" = "x$cf_add_2lib" - then +cf_add_libs="$LIBS" +# reverse order +cf_add_0lib= +for cf_add_1lib in -l$cf_lib_pthread; 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_libs $cf_add_1lib" + test -n "$cf_add_1lib" && cf_add_libs="$cf_add_1lib $cf_add_libs" done LIBS="$cf_add_libs" @@ -13355,7 +15663,7 @@ cat >>confdefs.h <<\EOF EOF else - { { echo "$as_me:13358: error: Cannot link with pthread library" >&5 + { { echo "$as_me:15666: error: Cannot link with pthread library" >&5 echo "$as_me: error: Cannot link with pthread library" >&2;} { (exit 1); exit 1; }; } fi @@ -13364,7 +15672,7 @@ fi fi -echo "$as_me:13367: checking if you want to use weak-symbols for pthreads" >&5 +echo "$as_me:15675: 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. @@ -13374,18 +15682,18 @@ if test "${enable_weak_symbols+set}" = set; then else use_weak_symbols=no fi; -echo "$as_me:13377: result: $use_weak_symbols" >&5 +echo "$as_me:15685: result: $use_weak_symbols" >&5 echo "${ECHO_T}$use_weak_symbols" >&6 if test "$use_weak_symbols" = yes ; then -echo "$as_me:13381: checking if $CC supports weak symbols" >&5 +echo "$as_me:15689: 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 13388 "configure" +cat >"conftest.$ac_ext" <<_ACEOF +#line 15696 "configure" #include "confdefs.h" #include @@ -13410,28 +15718,28 @@ weak_symbol(fopen); return 0; } _ACEOF -rm -f conftest.$ac_objext -if { (eval echo "$as_me:13414: \"$ac_compile\"") >&5 +rm -f "conftest.$ac_objext" +if { (eval echo "$as_me:15722: \"$ac_compile\"") >&5 (eval $ac_compile) 2>&5 ac_status=$? - echo "$as_me:13417: \$? = $ac_status" >&5 - (exit $ac_status); } && - { ac_try='test -s conftest.$ac_objext' - { (eval echo "$as_me:13420: \"$ac_try\"") >&5 + echo "$as_me:15725: \$? = $ac_status" >&5 + (exit "$ac_status"); } && + { ac_try='test -s "conftest.$ac_objext"' + { (eval echo "$as_me:15728: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? - echo "$as_me:13423: \$? = $ac_status" >&5 - (exit $ac_status); }; }; then + echo "$as_me:15731: \$? = $ac_status" >&5 + (exit "$ac_status"); }; }; then cf_cv_weak_symbols=yes else echo "$as_me: failed program was:" >&5 -cat conftest.$ac_ext >&5 +cat "conftest.$ac_ext" >&5 cf_cv_weak_symbols=no fi -rm -f conftest.$ac_objext conftest.$ac_ext +rm -f "conftest.$ac_objext" "conftest.$ac_ext" fi -echo "$as_me:13434: result: $cf_cv_weak_symbols" >&5 +echo "$as_me:15742: result: $cf_cv_weak_symbols" >&5 echo "${ECHO_T}$cf_cv_weak_symbols" >&6 else @@ -13460,65 +15768,65 @@ EOF fi # OpenSUSE is installing ncurses6, using reentrant option. -echo "$as_me:13463: checking for _nc_TABSIZE" >&5 +echo "$as_me:15771: 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 13469 "configure" + cat >"conftest.$ac_ext" <<_ACEOF +#line 15777 "configure" #include "confdefs.h" -/* System header to define __stub macros and hopefully few prototypes, - which can conflict with char _nc_TABSIZE (); below. */ -#include -/* Override any gcc2 internal prototype to avoid an error. */ +#define _nc_TABSIZE autoconf_temporary +#include /* least-intrusive standard header which defines gcc2 __stub macros */ +#undef _nc_TABSIZE + #ifdef __cplusplus 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 _nc_TABSIZE (); -char (*f) (); +char _nc_TABSIZE (void); int main (void) { -/* The GNU C library defines this for functions which it implements + +/* The GNU C library defines stubs for functions which it implements to always fail with ENOSYS. Some functions are actually named something starting with __ and the normal name is an alias. */ #if defined (__stub__nc_TABSIZE) || defined (__stub____nc_TABSIZE) -choke me -#else -f = _nc_TABSIZE; /* workaround for ICC 12.0.3 */ if (f == 0) return 1; +#error found stub for _nc_TABSIZE #endif + return _nc_TABSIZE (); ; return 0; } _ACEOF -rm -f conftest.$ac_objext conftest$ac_exeext -if { (eval echo "$as_me:13500: \"$ac_link\"") >&5 +rm -f "conftest.$ac_objext" "conftest$ac_exeext" +if { (eval echo "$as_me:15808: \"$ac_link\"") >&5 (eval $ac_link) 2>&5 ac_status=$? - echo "$as_me:13503: \$? = $ac_status" >&5 - (exit $ac_status); } && - { ac_try='test -s conftest$ac_exeext' - { (eval echo "$as_me:13506: \"$ac_try\"") >&5 + echo "$as_me:15811: \$? = $ac_status" >&5 + (exit "$ac_status"); } && + { ac_try='test -s "conftest$ac_exeext"' + { (eval echo "$as_me:15814: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? - echo "$as_me:13509: \$? = $ac_status" >&5 - (exit $ac_status); }; }; then + echo "$as_me:15817: \$? = $ac_status" >&5 + (exit "$ac_status"); }; }; then ac_cv_func__nc_TABSIZE=yes else echo "$as_me: failed program was:" >&5 -cat conftest.$ac_ext >&5 +cat "conftest.$ac_ext" >&5 ac_cv_func__nc_TABSIZE=no fi -rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext +rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext" fi -echo "$as_me:13519: result: $ac_cv_func__nc_TABSIZE" >&5 +echo "$as_me:15827: 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 +if test "$ac_cv_func__nc_TABSIZE" = yes; then assume_reentrant=yes else assume_reentrant=no @@ -13528,7 +15836,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:13531: checking if you want experimental reentrant code" >&5 +echo "$as_me:15839: 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. @@ -13538,7 +15846,7 @@ if test "${enable_reentrant+set}" = set; then else with_reentrant=$assume_reentrant fi; -echo "$as_me:13541: result: $with_reentrant" >&5 +echo "$as_me:15849: result: $with_reentrant" >&5 echo "${ECHO_T}$with_reentrant" >&6 if test "$with_reentrant" = yes ; then cf_cv_enable_reentrant=1 @@ -13561,7 +15869,7 @@ fi ### Allow using a different wrap-prefix if test "$cf_cv_enable_reentrant" != 0 || test "$BROKEN_LINKER" = 1 ; then - echo "$as_me:13564: checking for prefix used to wrap public variables" >&5 + echo "$as_me:15872: 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. @@ -13571,7 +15879,7 @@ if test "${with_wrap_prefix+set}" = set; then else NCURSES_WRAP_PREFIX=_nc_ fi; - echo "$as_me:13574: result: $NCURSES_WRAP_PREFIX" >&5 + echo "$as_me:15882: result: $NCURSES_WRAP_PREFIX" >&5 echo "${ECHO_T}$NCURSES_WRAP_PREFIX" >&6 else NCURSES_WRAP_PREFIX=_nc_ @@ -13585,7 +15893,7 @@ EOF ### use option --disable-echo to suppress full display compiling commands -echo "$as_me:13588: checking if you want to see long compiling messages" >&5 +echo "$as_me:15896: 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. @@ -13619,132 +15927,389 @@ else ECHO_CC='' fi; -echo "$as_me:13622: result: $enableval" >&5 +echo "$as_me:15930: result: $enableval" >&5 echo "${ECHO_T}$enableval" >&6 -### use option --enable-warnings to turn on all gcc warnings -echo "$as_me:13626: checking if you want to see compiler warnings" >&5 -echo $ECHO_N "checking if you want to see compiler warnings... $ECHO_C" >&6 - -# Check whether --enable-warnings or --disable-warnings was given. -if test "${enable_warnings+set}" = set; then - enableval="$enable_warnings" - with_warnings=$enableval -fi; -echo "$as_me:13634: result: $with_warnings" >&5 -echo "${ECHO_T}$with_warnings" >&6 - -if test "x$with_warnings" = "xyes"; then +echo "$as_me:15933: 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 - ADAFLAGS="$ADAFLAGS -gnatg" +# 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 -INTEL_COMPILER=no +fi; +echo "$as_me:15950: result: $enable_stdnoreturn" >&5 +echo "${ECHO_T}$enable_stdnoreturn" >&6 -if test "$GCC" = yes ; then - case $host_os in - (linux*|gnu*) - echo "$as_me:13646: 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 13651 "configure" +if test $enable_stdnoreturn = yes; then +echo "$as_me:15954: 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 15960 "configure" #include "confdefs.h" +$ac_includes_default +#include +static _Noreturn void giveup(void) { exit(0); } + int main (void) { - -#ifdef __INTEL_COMPILER -#else -make an error -#endif - +if (feof(stdin)) giveup() ; return 0; } _ACEOF -rm -f conftest.$ac_objext -if { (eval echo "$as_me:13668: \"$ac_compile\"") >&5 +rm -f "conftest.$ac_objext" +if { (eval echo "$as_me:15976: \"$ac_compile\"") >&5 (eval $ac_compile) 2>&5 ac_status=$? - echo "$as_me:13671: \$? = $ac_status" >&5 - (exit $ac_status); } && - { ac_try='test -s conftest.$ac_objext' - { (eval echo "$as_me:13674: \"$ac_try\"") >&5 + echo "$as_me:15979: \$? = $ac_status" >&5 + (exit "$ac_status"); } && + { ac_try='test -s "conftest.$ac_objext"' + { (eval echo "$as_me:15982: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? - echo "$as_me:13677: \$? = $ac_status" >&5 - (exit $ac_status); }; }; then - INTEL_COMPILER=yes -cf_save_CFLAGS="$cf_save_CFLAGS -we147" - + echo "$as_me:15985: \$? = $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 +cat "conftest.$ac_ext" >&5 +cf_cv_c11_noreturn=no fi -rm -f conftest.$ac_objext conftest.$ac_ext - CFLAGS="$cf_save_CFLAGS" - echo "$as_me:13688: result: $INTEL_COMPILER" >&5 -echo "${ECHO_T}$INTEL_COMPILER" >&6 - ;; - esac +rm -f "conftest.$ac_objext" "conftest.$ac_ext" + +fi +echo "$as_me:15996: result: $cf_cv_c11_noreturn" >&5 +echo "${ECHO_T}$cf_cv_c11_noreturn" >&6 +else + cf_cv_c11_noreturn=no, fi -CLANG_COMPILER=no +if test "$cf_cv_c11_noreturn" = yes; then -if test "$GCC" = yes ; then - echo "$as_me:13697: checking if this is really Clang C compiler" >&5 -echo $ECHO_N "checking if this is really Clang C compiler... $ECHO_C" >&6 - cf_save_CFLAGS="$CFLAGS" - CFLAGS="$CFLAGS -Qunused-arguments" - cat >conftest.$ac_ext <<_ACEOF -#line 13702 "configure" -#include "confdefs.h" +cat >>confdefs.h <<\EOF +#define HAVE_STDNORETURN_H 1 +EOF -int -main (void) -{ +cat >>confdefs.h <&6 + +echo "${as_me:-configure}:16052: testing repairing CFLAGS: $CFLAGS ..." 1>&5 + + CFLAGS="$cf_temp_flags" + test -n "$verbose" && echo " ... fixed $CFLAGS" 1>&6 + +echo "${as_me:-configure}:16057: testing ... fixed $CFLAGS ..." 1>&5 + + test -n "$verbose" && echo " ... extra $EXTRA_CFLAGS" 1>&6 + +echo "${as_me:-configure}:16061: testing ... extra $EXTRA_CFLAGS ..." 1>&5 + + fi + ;; + esac +fi + +if test "$GCC" = yes || test "$GXX" = yes +then + case $CPPFLAGS in + (*-Werror=*) + 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 " + EXTRA_CFLAGS="${EXTRA_CFLAGS}$cf_temp_scan" + + ;; + (*) + + test -n "$cf_temp_flags" && cf_temp_flags="$cf_temp_flags " + cf_temp_flags="${cf_temp_flags}$cf_temp_scan" + + ;; + esac + done + if test "x$CPPFLAGS" != "x$cf_temp_flags" + then + test -n "$verbose" && echo " repairing CPPFLAGS: $CPPFLAGS" 1>&6 + +echo "${as_me:-configure}:16100: testing repairing CPPFLAGS: $CPPFLAGS ..." 1>&5 + + CPPFLAGS="$cf_temp_flags" + test -n "$verbose" && echo " ... fixed $CPPFLAGS" 1>&6 + +echo "${as_me:-configure}:16105: testing ... fixed $CPPFLAGS ..." 1>&5 + + test -n "$verbose" && echo " ... extra $EXTRA_CFLAGS" 1>&6 + +echo "${as_me:-configure}:16109: testing ... extra $EXTRA_CFLAGS ..." 1>&5 + + fi + ;; + esac +fi + +if test "$GCC" = yes || test "$GXX" = yes +then + case $LDFLAGS in + (*-Werror=*) + 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 " + EXTRA_CFLAGS="${EXTRA_CFLAGS}$cf_temp_scan" + + ;; + (*) + + test -n "$cf_temp_flags" && cf_temp_flags="$cf_temp_flags " + cf_temp_flags="${cf_temp_flags}$cf_temp_scan" + + ;; + esac + done + if test "x$LDFLAGS" != "x$cf_temp_flags" + then + test -n "$verbose" && echo " repairing LDFLAGS: $LDFLAGS" 1>&6 + +echo "${as_me:-configure}:16148: testing repairing LDFLAGS: $LDFLAGS ..." 1>&5 + + LDFLAGS="$cf_temp_flags" + test -n "$verbose" && echo " ... fixed $LDFLAGS" 1>&6 + +echo "${as_me:-configure}:16153: testing ... fixed $LDFLAGS ..." 1>&5 + + test -n "$verbose" && echo " ... extra $EXTRA_CFLAGS" 1>&6 + +echo "${as_me:-configure}:16157: testing ... extra $EXTRA_CFLAGS ..." 1>&5 + + fi + ;; + esac +fi + +echo "$as_me:16164: 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. +if test "${enable_warnings+set}" = set; then + enableval="$enable_warnings" + test "$enableval" != yes && enableval=no + if test "$enableval" != "no" ; then + enable_warnings=yes + else + enable_warnings=no + fi +else + enableval=no + enable_warnings=no + +fi; +echo "$as_me:16181: result: $enable_warnings" >&5 +echo "${ECHO_T}$enable_warnings" >&6 +if test "$enable_warnings" = "yes" +then + +if test "x$have_x" = xyes; then + +cf_save_LIBS_CF_CONST_X_STRING="$LIBS" +cf_save_CFLAGS_CF_CONST_X_STRING="$CFLAGS" +cf_save_CPPFLAGS_CF_CONST_X_STRING="$CPPFLAGS" +LIBS="$LIBS ${X_PRE_LIBS} ${X_LIBS} ${X_EXTRA_LIBS}" +for cf_X_CFLAGS in $X_CFLAGS +do + case "x$cf_X_CFLAGS" in + x-[IUD]*) + CPPFLAGS="$CPPFLAGS $cf_X_CFLAGS" + ;; + *) + CFLAGS="$CFLAGS $cf_X_CFLAGS" + ;; + esac +done + +cat >"conftest.$ac_ext" <<_ACEOF +#line 16205 "configure" +#include "confdefs.h" + +#include +#include + +int +main (void) +{ +String foo = malloc(1); free((void*)foo) ; return 0; } _ACEOF -rm -f conftest.$ac_objext -if { (eval echo "$as_me:13719: \"$ac_compile\"") >&5 +rm -f "conftest.$ac_objext" +if { (eval echo "$as_me:16220: \"$ac_compile\"") >&5 (eval $ac_compile) 2>&5 ac_status=$? - echo "$as_me:13722: \$? = $ac_status" >&5 - (exit $ac_status); } && - { ac_try='test -s conftest.$ac_objext' - { (eval echo "$as_me:13725: \"$ac_try\"") >&5 + echo "$as_me:16223: \$? = $ac_status" >&5 + (exit "$ac_status"); } && + { ac_try='test -s "conftest.$ac_objext"' + { (eval echo "$as_me:16226: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? - echo "$as_me:13728: \$? = $ac_status" >&5 - (exit $ac_status); }; }; then - CLANG_COMPILER=yes -cf_save_CFLAGS="$cf_save_CFLAGS -Qunused-arguments" + echo "$as_me:16229: \$? = $ac_status" >&5 + (exit "$ac_status"); }; }; then + +echo "$as_me:16232: 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 16239 "configure" +#include "confdefs.h" + +#undef _CONST_X_STRING +#define _CONST_X_STRING /* X11R7.8 (perhaps) */ +#undef XTSTRINGDEFINES /* X11R5 and later */ +#include +#include + +int +main (void) +{ +String foo = malloc(1); *foo = 0 + ; + return 0; +} +_ACEOF +rm -f "conftest.$ac_objext" +if { (eval echo "$as_me:16257: \"$ac_compile\"") >&5 + (eval $ac_compile) 2>&5 + ac_status=$? + echo "$as_me:16260: \$? = $ac_status" >&5 + (exit "$ac_status"); } && + { ac_try='test -s "conftest.$ac_objext"' + { (eval echo "$as_me:16263: \"$ac_try\"") >&5 + (eval $ac_try) 2>&5 + ac_status=$? + echo "$as_me:16266: \$? = $ac_status" >&5 + (exit "$ac_status"); }; }; then + + cf_cv_const_x_string=no else echo "$as_me: failed program was:" >&5 -cat conftest.$ac_ext >&5 +cat "conftest.$ac_ext" >&5 + + cf_cv_const_x_string=yes + fi -rm -f conftest.$ac_objext conftest.$ac_ext - CFLAGS="$cf_save_CFLAGS" - echo "$as_me:13739: result: $CLANG_COMPILER" >&5 -echo "${ECHO_T}$CLANG_COMPILER" >&6 +rm -f "conftest.$ac_objext" "conftest.$ac_ext" + fi +echo "$as_me:16281: result: $cf_cv_const_x_string" >&5 +echo "${ECHO_T}$cf_cv_const_x_string" >&6 -cat > conftest.$ac_ext <&5 +cat "conftest.$ac_ext" >&5 +fi +rm -f "conftest.$ac_objext" "conftest.$ac_ext" + fi +cat > "conftest.$ac_ext" <&5 + { echo "$as_me:16326: checking for $CC warning options..." >&5 echo "$as_me: checking for $CC warning options..." >&6;} cf_save_CFLAGS="$CFLAGS" - EXTRA_CFLAGS="-Wall" + EXTRA_CFLAGS="$EXTRA_CFLAGS -Wall" for cf_opt in \ wd1419 \ wd1683 \ @@ -13774,24 +16339,22 @@ echo "$as_me: checking for $CC warning options..." >&6;} wd981 do CFLAGS="$cf_save_CFLAGS $EXTRA_CFLAGS -$cf_opt" - if { (eval echo "$as_me:13777: \"$ac_compile\"") >&5 + if { (eval echo "$as_me:16342: \"$ac_compile\"") >&5 (eval $ac_compile) 2>&5 ac_status=$? - echo "$as_me:13780: \$? = $ac_status" >&5 - (exit $ac_status); }; then - test -n "$verbose" && echo "$as_me:13782: result: ... -$cf_opt" >&5 + echo "$as_me:16345: \$? = $ac_status" >&5 + (exit "$ac_status"); }; then + test -n "$verbose" && echo "$as_me:16347: result: ... -$cf_opt" >&5 echo "${ECHO_T}... -$cf_opt" >&6 EXTRA_CFLAGS="$EXTRA_CFLAGS -$cf_opt" fi done CFLAGS="$cf_save_CFLAGS" - -elif test "$GCC" = yes +elif test "$GCC" = yes && test "$GCC_VERSION" != "unknown" then - { echo "$as_me:13791: checking for $CC warning options..." >&5 + { echo "$as_me:16355: checking for $CC warning options..." >&5 echo "$as_me: checking for $CC warning options..." >&6;} cf_save_CFLAGS="$CFLAGS" - EXTRA_CFLAGS= cf_warn_CONST="" test "$with_ext_const" = yes && cf_warn_CONST="Wwrite-strings" cf_gcc_warnings="Wignored-qualifiers Wlogical-op Wvarargs" @@ -13809,39 +16372,33 @@ echo "$as_me: checking for $CC warning options..." >&6;} Wpointer-arith \ Wshadow \ Wstrict-prototypes \ - Wundef $cf_gcc_warnings $cf_warn_CONST Wno-unknown-pragmas Wswitch-enum + 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:13815: \"$ac_compile\"") >&5 + if { (eval echo "$as_me:16378: \"$ac_compile\"") >&5 (eval $ac_compile) 2>&5 ac_status=$? - echo "$as_me:13818: \$? = $ac_status" >&5 - (exit $ac_status); }; then - test -n "$verbose" && echo "$as_me:13820: result: ... -$cf_opt" >&5 + echo "$as_me:16381: \$? = $ac_status" >&5 + (exit "$ac_status"); }; then + test -n "$verbose" && echo "$as_me:16383: result: ... -$cf_opt" >&5 echo "${ECHO_T}... -$cf_opt" >&6 - case $cf_opt in - (Wcast-qual) - - test -n "$CPPFLAGS" && CPPFLAGS="$CPPFLAGS " - CPPFLAGS="${CPPFLAGS}-DXTSTRINGDEFINES" - - ;; + case "$cf_opt" in (Winline) - case $GCC_VERSION in + case "$GCC_VERSION" in ([34].*) test -n "$verbose" && echo " feature is broken in gcc $GCC_VERSION" 1>&6 -echo "${as_me:-configure}:13834: testing feature is broken in gcc $GCC_VERSION ..." 1>&5 +echo "${as_me:-configure}:16391: testing feature is broken in gcc $GCC_VERSION ..." 1>&5 continue;; esac ;; (Wpointer-arith) - case $GCC_VERSION in + case "$GCC_VERSION" in ([12].*) test -n "$verbose" && echo " feature is broken in gcc $GCC_VERSION" 1>&6 -echo "${as_me:-configure}:13844: testing feature is broken in gcc $GCC_VERSION ..." 1>&5 +echo "${as_me:-configure}:16401: testing feature is broken in gcc $GCC_VERSION ..." 1>&5 continue;; esac @@ -13852,11 +16409,11 @@ echo "${as_me:-configure}:13844: testing feature is broken in gcc $GCC_VERSION . done CFLAGS="$cf_save_CFLAGS" fi -rm -rf conftest* +rm -rf ./conftest* fi -if test "$GCC" = yes +if test "$GCC" = yes || test "$GXX" = yes then cat > conftest.i < conftest.i <&5 + { echo "$as_me:16434: checking for $CC __attribute__ directives..." >&5 echo "$as_me: checking for $CC __attribute__ directives..." >&6;} -cat > conftest.$ac_ext < "conftest.$ac_ext" < #include "confdefs.h" #include "conftest.h" #include "conftest.i" @@ -13892,9 +16450,9 @@ cat > conftest.$ac_ext <&5 - case $cf_attribute in + case "$cf_attribute" in (printf) cf_printf_attribute=yes cat >conftest.h <&5 + if { (eval echo "$as_me:16487: \"$ac_compile\"") >&5 (eval $ac_compile) 2>&5 ac_status=$? - echo "$as_me:13932: \$? = $ac_status" >&5 - (exit $ac_status); }; then - test -n "$verbose" && echo "$as_me:13934: result: ... $cf_attribute" >&5 + echo "$as_me:16490: \$? = $ac_status" >&5 + (exit "$ac_status"); }; then + test -n "$verbose" && echo "$as_me:16492: result: ... $cf_attribute" >&5 echo "${ECHO_T}... $cf_attribute" >&6 cat conftest.h >>confdefs.h - case $cf_attribute in + case "$cf_attribute" in (noreturn) cat >>confdefs.h <>confdefs.h + ${FGREP-fgrep} define conftest.i >>confdefs.h fi -rm -rf conftest* +rm -rf ./conftest* +fi + +fi + +if test "x$enable_warnings" = "xyes"; then + + ADAFLAGS="$ADAFLAGS -gnatwa -gnatyg" + fi ### use option --enable-assertions to turn on generation of assertion code -echo "$as_me:13994: checking if you want to enable runtime assertions" >&5 +echo "$as_me:16560: 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. @@ -14001,7 +16567,7 @@ if test "${enable_assertions+set}" = set; then else with_assertions=no fi; -echo "$as_me:14004: result: $with_assertions" >&5 +echo "$as_me:16570: result: $with_assertions" >&5 echo "${ECHO_T}$with_assertions" >&6 if test -n "$GCC" then @@ -14054,7 +16620,7 @@ case "$CFLAGS $CPPFLAGS" in ;; esac -echo "$as_me:14057: checking whether to add trace feature to all models" >&5 +echo "$as_me:16623: 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. @@ -14064,213 +16630,225 @@ if test "${with_trace+set}" = set; then else cf_with_trace=$cf_all_traces fi; -echo "$as_me:14067: result: $cf_with_trace" >&5 +echo "$as_me:16633: result: $cf_with_trace" >&5 echo "${ECHO_T}$cf_with_trace" >&6 if test "$cf_with_trace" = yes ; then ADA_TRACE=TRUE -cf_fix_cppflags=no -cf_new_cflags= -cf_new_cppflags= -cf_new_extra_cppflags= +cat >>confdefs.h <<\EOF +#define TRACE 1 +EOF -for cf_add_cflags in -DTRACE -do -case $cf_fix_cppflags in -(no) - case $cf_add_cflags in - (-undef|-nostdinc*|-I*|-D*|-U*|-E|-P|-C) - case $cf_add_cflags in - (-D*) - cf_tst_cflags=`echo ${cf_add_cflags} |sed -e 's/^-D[^=]*='\''\"[^"]*//'` +else + ADA_TRACE=FALSE +fi - test "x${cf_add_cflags}" != "x${cf_tst_cflags}" \ - && test -z "${cf_tst_cflags}" \ - && cf_fix_cppflags=yes +echo "$as_me:16647: checking if we want to use GNAT projects" >&5 +echo $ECHO_N "checking if we want to use GNAT projects... $ECHO_C" >&6 - if test $cf_fix_cppflags = yes ; then +# Check whether --enable-gnat-projects or --disable-gnat-projects was given. +if test "${enable_gnat_projects+set}" = set; then + enableval="$enable_gnat_projects" + test "$enableval" != no && enableval=yes + if test "$enableval" != "yes" ; then + enable_gnat_projects=no + else + enable_gnat_projects=yes + fi +else + enableval=yes + enable_gnat_projects=yes - test -n "$cf_new_extra_cppflags" && cf_new_extra_cppflags="$cf_new_extra_cppflags " - cf_new_extra_cppflags="${cf_new_extra_cppflags}$cf_add_cflags" +fi; +echo "$as_me:16664: result: $enable_gnat_projects" >&5 +echo "${ECHO_T}$enable_gnat_projects" >&6 - continue - elif test "${cf_tst_cflags}" = "\"'" ; then +### Checks for libraries. +case $cf_cv_system_name in +(*mingw32*) - test -n "$cf_new_extra_cppflags" && cf_new_extra_cppflags="$cf_new_extra_cppflags " - cf_new_extra_cppflags="${cf_new_extra_cppflags}$cf_add_cflags" +echo "$as_me:16671: 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 - continue - fi - ;; - esac - case "$CPPFLAGS" in - (*$cf_add_cflags) - ;; - (*) - case $cf_add_cflags in - (-D*) - cf_tst_cppflags=`echo "x$cf_add_cflags" | sed -e 's/^...//' -e 's/=.*//'` +cat >"conftest.$ac_ext" <<_ACEOF +#line 16678 "configure" +#include "confdefs.h" -CPPFLAGS=`echo "$CPPFLAGS" | \ - sed -e 's/-[UD]'"$cf_tst_cppflags"'\(=[^ ]*\)\?[ ]/ /g' \ - -e 's/-[UD]'"$cf_tst_cppflags"'\(=[^ ]*\)\?$//g'` +#include +#include - ;; - esac +int +main (void) +{ - test -n "$cf_new_cppflags" && cf_new_cppflags="$cf_new_cppflags " - cf_new_cppflags="${cf_new_cppflags}$cf_add_cflags" + DIR *dp = opendir("."); - ;; - esac - ;; - (*) + ; + return 0; +} +_ACEOF +rm -f "conftest.$ac_objext" "conftest$ac_exeext" +if { (eval echo "$as_me:16695: \"$ac_link\"") >&5 + (eval $ac_link) 2>&5 + ac_status=$? + echo "$as_me:16698: \$? = $ac_status" >&5 + (exit "$ac_status"); } && + { ac_try='test -s "conftest$ac_exeext"' + { (eval echo "$as_me:16701: \"$ac_try\"") >&5 + (eval $ac_try) 2>&5 + ac_status=$? + echo "$as_me:16704: \$? = $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 - test -n "$cf_new_cflags" && cf_new_cflags="$cf_new_cflags " - cf_new_cflags="${cf_new_cflags}$cf_add_cflags" + cf_save_LIBS="$LIBS" + LIBS="$LIBS -lssp" + cat >"conftest.$ac_ext" <<_ACEOF +#line 16714 "configure" +#include "confdefs.h" - ;; - esac - ;; -(yes) +#include +#include - test -n "$cf_new_extra_cppflags" && cf_new_extra_cppflags="$cf_new_extra_cppflags " - cf_new_extra_cppflags="${cf_new_extra_cppflags}$cf_add_cflags" - - cf_tst_cflags=`echo ${cf_add_cflags} |sed -e 's/^[^"]*"'\''//'` - - test "x${cf_add_cflags}" != "x${cf_tst_cflags}" \ - && test -z "${cf_tst_cflags}" \ - && cf_fix_cppflags=no - ;; -esac -done - -if test -n "$cf_new_cflags" ; then - - test -n "$CFLAGS" && CFLAGS="$CFLAGS " - CFLAGS="${CFLAGS}$cf_new_cflags" - -fi - -if test -n "$cf_new_cppflags" ; then +int +main (void) +{ - test -n "$CPPFLAGS" && CPPFLAGS="$CPPFLAGS " - CPPFLAGS="${CPPFLAGS}$cf_new_cppflags" + DIR *dp = opendir("."); + ; + return 0; +} +_ACEOF +rm -f "conftest.$ac_objext" "conftest$ac_exeext" +if { (eval echo "$as_me:16731: \"$ac_link\"") >&5 + (eval $ac_link) 2>&5 + ac_status=$? + echo "$as_me:16734: \$? = $ac_status" >&5 + (exit "$ac_status"); } && + { ac_try='test -s "conftest$ac_exeext"' + { (eval echo "$as_me:16737: \"$ac_try\"") >&5 + (eval $ac_try) 2>&5 + ac_status=$? + echo "$as_me:16740: \$? = $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 - -if test -n "$cf_new_extra_cppflags" ; then - - test -n "$EXTRA_CPPFLAGS" && EXTRA_CPPFLAGS="$EXTRA_CPPFLAGS " - EXTRA_CPPFLAGS="${EXTRA_CPPFLAGS}$cf_new_extra_cppflags" +rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext" + LIBS="$cf_save_LIBS" fi - -else - ADA_TRACE=FALSE +rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext" fi +echo "$as_me:16754: result: $cf_cv_need_libssp" >&5 +echo "${ECHO_T}$cf_cv_need_libssp" >&6 -echo "$as_me:14175: checking if we want to use GNAT projects" >&5 -echo $ECHO_N "checking if we want to use GNAT projects... $ECHO_C" >&6 +if test "x$cf_cv_need_libssp" = xyes +then -# Check whether --enable-gnat-projects or --disable-gnat-projects was given. -if test "${enable_gnat_projects+set}" = set; then - enableval="$enable_gnat_projects" - test "$enableval" != no && enableval=yes - if test "$enableval" != "yes" ; then - enable_gnat_projects=no - else - enable_gnat_projects=yes - fi -else - enableval=yes - enable_gnat_projects=yes +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:14192: result: $enable_gnat_projects" >&5 -echo "${ECHO_T}$enable_gnat_projects" >&6 +fi -### Checks for libraries. -case $cf_cv_system_name in -(*mingw32*) ;; (*) -echo "$as_me:14200: checking for gettimeofday" >&5 -echo $ECHO_N "checking for gettimeofday... $ECHO_C" >&6 -if test "${ac_cv_func_gettimeofday+set}" = set; then + +cf_save_libs="$LIBS" +echo "$as_me:16782: checking for clock_gettime" >&5 +echo $ECHO_N "checking for clock_gettime... $ECHO_C" >&6 +if test "${ac_cv_func_clock_gettime+set}" = set; then echo $ECHO_N "(cached) $ECHO_C" >&6 else - cat >conftest.$ac_ext <<_ACEOF -#line 14206 "configure" + cat >"conftest.$ac_ext" <<_ACEOF +#line 16788 "configure" #include "confdefs.h" -/* System header to define __stub macros and hopefully few prototypes, - which can conflict with char gettimeofday (); below. */ -#include -/* Override any gcc2 internal prototype to avoid an error. */ +#define clock_gettime autoconf_temporary +#include /* least-intrusive standard header which defines gcc2 __stub macros */ +#undef clock_gettime + #ifdef __cplusplus 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 (*f) (); +char clock_gettime (void); int main (void) { -/* The GNU C library defines this for functions which it implements + +/* The GNU C library defines stubs for functions which it implements to always fail with ENOSYS. Some functions are actually named something starting with __ and the normal name is an alias. */ -#if defined (__stub_gettimeofday) || defined (__stub___gettimeofday) -choke me -#else -f = gettimeofday; /* workaround for ICC 12.0.3 */ if (f == 0) return 1; +#if defined (__stub_clock_gettime) || defined (__stub___clock_gettime) +#error found stub for clock_gettime #endif + return clock_gettime (); ; return 0; } _ACEOF -rm -f conftest.$ac_objext conftest$ac_exeext -if { (eval echo "$as_me:14237: \"$ac_link\"") >&5 +rm -f "conftest.$ac_objext" "conftest$ac_exeext" +if { (eval echo "$as_me:16819: \"$ac_link\"") >&5 (eval $ac_link) 2>&5 ac_status=$? - echo "$as_me:14240: \$? = $ac_status" >&5 - (exit $ac_status); } && - { ac_try='test -s conftest$ac_exeext' - { (eval echo "$as_me:14243: \"$ac_try\"") >&5 + echo "$as_me:16822: \$? = $ac_status" >&5 + (exit "$ac_status"); } && + { ac_try='test -s "conftest$ac_exeext"' + { (eval echo "$as_me:16825: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? - echo "$as_me:14246: \$? = $ac_status" >&5 - (exit $ac_status); }; }; then - ac_cv_func_gettimeofday=yes + echo "$as_me:16828: \$? = $ac_status" >&5 + (exit "$ac_status"); }; }; then + ac_cv_func_clock_gettime=yes else echo "$as_me: failed program was:" >&5 -cat conftest.$ac_ext >&5 -ac_cv_func_gettimeofday=no +cat "conftest.$ac_ext" >&5 +ac_cv_func_clock_gettime=no fi -rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext +rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext" fi -echo "$as_me:14256: 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 -#define HAVE_GETTIMEOFDAY 1 -EOF - +echo "$as_me:16838: result: $ac_cv_func_clock_gettime" >&5 +echo "${ECHO_T}$ac_cv_func_clock_gettime" >&6 +if test "$ac_cv_func_clock_gettime" = yes; then + cf_cv_test_clock_gettime=yes else - -echo "$as_me:14265: 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 "$as_me:16843: checking for clock_gettime in -lrt" >&5 +echo $ECHO_N "checking for clock_gettime in -lrt... $ECHO_C" >&6 +if test "${ac_cv_lib_rt_clock_gettime+set}" = set; then echo $ECHO_N "(cached) $ECHO_C" >&6 else ac_check_lib_save_LIBS=$LIBS -LIBS="-lbsd $LIBS" -cat >conftest.$ac_ext <<_ACEOF -#line 14273 "configure" +LIBS="-lrt $LIBS" +cat >"conftest.$ac_ext" <<_ACEOF +#line 16851 "configure" #include "confdefs.h" /* Override any gcc2 internal prototype to avoid an error. */ @@ -14279,244 +16857,260 @@ 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 clock_gettime (void); int main (void) { -gettimeofday (); +clock_gettime (); ; return 0; } _ACEOF -rm -f conftest.$ac_objext conftest$ac_exeext -if { (eval echo "$as_me:14292: \"$ac_link\"") >&5 +rm -f "conftest.$ac_objext" "conftest$ac_exeext" +if { (eval echo "$as_me:16870: \"$ac_link\"") >&5 (eval $ac_link) 2>&5 ac_status=$? - echo "$as_me:14295: \$? = $ac_status" >&5 - (exit $ac_status); } && - { ac_try='test -s conftest$ac_exeext' - { (eval echo "$as_me:14298: \"$ac_try\"") >&5 + echo "$as_me:16873: \$? = $ac_status" >&5 + (exit "$ac_status"); } && + { ac_try='test -s "conftest$ac_exeext"' + { (eval echo "$as_me:16876: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? - echo "$as_me:14301: \$? = $ac_status" >&5 - (exit $ac_status); }; }; then - ac_cv_lib_bsd_gettimeofday=yes + echo "$as_me:16879: \$? = $ac_status" >&5 + (exit "$ac_status"); }; }; then + ac_cv_lib_rt_clock_gettime=yes else echo "$as_me: failed program was:" >&5 -cat conftest.$ac_ext >&5 -ac_cv_lib_bsd_gettimeofday=no +cat "conftest.$ac_ext" >&5 +ac_cv_lib_rt_clock_gettime=no fi -rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext +rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext" LIBS=$ac_check_lib_save_LIBS fi -echo "$as_me:14312: 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 - -cat >>confdefs.h <<\EOF -#define HAVE_GETTIMEOFDAY 1 -EOF - - LIBS="$LIBS -lbsd" +echo "$as_me:16890: result: $ac_cv_lib_rt_clock_gettime" >&5 +echo "${ECHO_T}$ac_cv_lib_rt_clock_gettime" >&6 +if test "$ac_cv_lib_rt_clock_gettime" = yes; then + LIBS="-lrt $LIBS" + cf_cv_test_clock_gettime=yes +else + cf_cv_test_clock_gettime=no fi fi - ;; -esac -### Checks for header files. -echo "$as_me:14328: 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 +if test "$cf_cv_test_clock_gettime" = yes ; then +echo "$as_me:16902: checking if clock_gettime links" >&5 +echo $ECHO_N "checking if clock_gettime links... $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 14334 "configure" + + cat >"conftest.$ac_ext" <<_ACEOF +#line 16909 "configure" #include "confdefs.h" -#include -#include -#include -#include +$ac_includes_default +#include + +int +main (void) +{ +struct timespec ts; + int rc = clock_gettime(CLOCK_REALTIME, &ts) + + clock_gettime(CLOCK_MONOTONIC, &ts); + (void) rc; (void)ts + ; + return 0; +} _ACEOF -if { (eval echo "$as_me:14342: \"$ac_cpp conftest.$ac_ext\"") >&5 - (eval $ac_cpp conftest.$ac_ext) 2>conftest.er1 +rm -f "conftest.$ac_objext" "conftest$ac_exeext" +if { (eval echo "$as_me:16927: \"$ac_link\"") >&5 + (eval $ac_link) 2>&5 ac_status=$? - egrep -v '^ *\+' conftest.er1 >conftest.err - rm -f conftest.er1 - cat conftest.err >&5 - echo "$as_me:14348: \$? = $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 + echo "$as_me:16930: \$? = $ac_status" >&5 + (exit "$ac_status"); } && + { ac_try='test -s "conftest$ac_exeext"' + { (eval echo "$as_me:16933: \"$ac_try\"") >&5 + (eval $ac_try) 2>&5 + ac_status=$? + echo "$as_me:16936: \$? = $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 - ac_cv_header_stdc=no +cat "conftest.$ac_ext" >&5 +cf_cv_func_clock_gettime=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 14370 "configure" -#include "confdefs.h" -#include +rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext" -_ACEOF -if (eval "$ac_cpp conftest.$ac_ext") 2>&5 | - egrep "memchr" >/dev/null 2>&1; then - : +fi +echo "$as_me:16947: result: $cf_cv_func_clock_gettime" >&5 +echo "${ECHO_T}$cf_cv_func_clock_gettime" >&6 else - ac_cv_header_stdc=no + cf_cv_func_clock_gettime=no fi -rm -rf conftest* -fi +if test "$cf_cv_func_clock_gettime" = yes +then -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 14388 "configure" -#include "confdefs.h" -#include +cat >>confdefs.h <<\EOF +#define HAVE_CLOCK_GETTIME 1 +EOF -_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 - : +echo "$as_me:16961: 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 14409 "configure" + cat >"conftest.$ac_ext" <<_ACEOF +#line 16967 "configure" #include "confdefs.h" -#include -#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)) +#define gettimeofday autoconf_temporary +#include /* least-intrusive standard header which defines gcc2 __stub macros */ +#undef gettimeofday + +#ifdef __cplusplus +extern "C" #endif -#define XOR(e, f) (((e) && !(f)) || (!(e) && (f))) +/* We use char because int might match the return type of a gcc2 + builtin and then its argument prototype would still apply. */ +char gettimeofday (void); + 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); + +/* The GNU C library defines stubs for functions which it implements + to always fail with ENOSYS. Some functions are actually named + something starting with __ and the normal name is an alias. */ +#if defined (__stub_gettimeofday) || defined (__stub___gettimeofday) +#error found stub for gettimeofday +#endif + + return gettimeofday (); + ; + return 0; } _ACEOF -rm -f conftest$ac_exeext -if { (eval echo "$as_me:14435: \"$ac_link\"") >&5 +rm -f "conftest.$ac_objext" "conftest$ac_exeext" +if { (eval echo "$as_me:16998: \"$ac_link\"") >&5 (eval $ac_link) 2>&5 ac_status=$? - echo "$as_me:14438: \$? = $ac_status" >&5 - (exit $ac_status); } && { ac_try='./conftest$ac_exeext' - { (eval echo "$as_me:14440: \"$ac_try\"") >&5 + echo "$as_me:17001: \$? = $ac_status" >&5 + (exit "$ac_status"); } && + { ac_try='test -s "conftest$ac_exeext"' + { (eval echo "$as_me:17004: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? - echo "$as_me:14443: \$? = $ac_status" >&5 - (exit $ac_status); }; }; then - : + echo "$as_me:17007: \$? = $ac_status" >&5 + (exit "$ac_status"); }; }; then + ac_cv_func_gettimeofday=yes 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 + echo "$as_me: failed program was:" >&5 +cat "conftest.$ac_ext" >&5 +ac_cv_func_gettimeofday=no fi +rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext" fi -echo "$as_me:14456: result: $ac_cv_header_stdc" >&5 -echo "${ECHO_T}$ac_cv_header_stdc" >&6 -if test $ac_cv_header_stdc = yes; then +echo "$as_me:17017: 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 -#define STDC_HEADERS 1 +#define HAVE_GETTIMEOFDAY 1 EOF -fi - -# On IRIX 5.3, sys/types and inttypes.h are conflicting. +else -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:14472: 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 "$as_me:17027: 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 else - cat >conftest.$ac_ext <<_ACEOF -#line 14478 "configure" + ac_check_lib_save_LIBS=$LIBS +LIBS="-lbsd $LIBS" +cat >"conftest.$ac_ext" <<_ACEOF +#line 17035 "configure" #include "confdefs.h" -$ac_includes_default -#include <$ac_header> + +/* Override any gcc2 internal prototype to avoid an error. */ +#ifdef __cplusplus +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 (void); +int +main (void) +{ +gettimeofday (); + ; + return 0; +} _ACEOF -rm -f conftest.$ac_objext -if { (eval echo "$as_me:14484: \"$ac_compile\"") >&5 - (eval $ac_compile) 2>&5 +rm -f "conftest.$ac_objext" "conftest$ac_exeext" +if { (eval echo "$as_me:17054: \"$ac_link\"") >&5 + (eval $ac_link) 2>&5 ac_status=$? - echo "$as_me:14487: \$? = $ac_status" >&5 - (exit $ac_status); } && - { ac_try='test -s conftest.$ac_objext' - { (eval echo "$as_me:14490: \"$ac_try\"") >&5 + echo "$as_me:17057: \$? = $ac_status" >&5 + (exit "$ac_status"); } && + { ac_try='test -s "conftest$ac_exeext"' + { (eval echo "$as_me:17060: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? - echo "$as_me:14493: \$? = $ac_status" >&5 - (exit $ac_status); }; }; then - eval "$as_ac_Header=yes" + echo "$as_me:17063: \$? = $ac_status" >&5 + (exit "$ac_status"); }; }; then + ac_cv_lib_bsd_gettimeofday=yes else echo "$as_me: failed program was:" >&5 -cat conftest.$ac_ext >&5 -eval "$as_ac_Header=no" +cat "conftest.$ac_ext" >&5 +ac_cv_lib_bsd_gettimeofday=no fi -rm -f conftest.$ac_objext conftest.$ac_ext +rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext" +LIBS=$ac_check_lib_save_LIBS fi -echo "$as_me:14503: 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 <&5 +echo "${ECHO_T}$ac_cv_lib_bsd_gettimeofday" >&6 +if test "$ac_cv_lib_bsd_gettimeofday" = yes; then + +cat >>confdefs.h <<\EOF +#define HAVE_GETTIMEOFDAY 1 EOF -fi +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" -echo "$as_me:14513: checking for signed char" >&5 +fi + +fi +fi + + ;; +esac + +### Checks for header files. +echo "$as_me:17107: 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 14519 "configure" + cat >"conftest.$ac_ext" <<_ACEOF +#line 17113 "configure" #include "confdefs.h" $ac_includes_default int @@ -14530,30 +17124,30 @@ if (sizeof (signed char)) return 0; } _ACEOF -rm -f conftest.$ac_objext -if { (eval echo "$as_me:14534: \"$ac_compile\"") >&5 +rm -f "conftest.$ac_objext" +if { (eval echo "$as_me:17128: \"$ac_compile\"") >&5 (eval $ac_compile) 2>&5 ac_status=$? - echo "$as_me:14537: \$? = $ac_status" >&5 - (exit $ac_status); } && - { ac_try='test -s conftest.$ac_objext' - { (eval echo "$as_me:14540: \"$ac_try\"") >&5 + echo "$as_me:17131: \$? = $ac_status" >&5 + (exit "$ac_status"); } && + { ac_try='test -s "conftest.$ac_objext"' + { (eval echo "$as_me:17134: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? - echo "$as_me:14543: \$? = $ac_status" >&5 - (exit $ac_status); }; }; then + echo "$as_me:17137: \$? = $ac_status" >&5 + (exit "$ac_status"); }; }; then ac_cv_type_signed_char=yes else echo "$as_me: failed program was:" >&5 -cat conftest.$ac_ext >&5 +cat "conftest.$ac_ext" >&5 ac_cv_type_signed_char=no fi -rm -f conftest.$ac_objext conftest.$ac_ext +rm -f "conftest.$ac_objext" "conftest.$ac_ext" fi -echo "$as_me:14553: result: $ac_cv_type_signed_char" >&5 +echo "$as_me:17147: result: $ac_cv_type_signed_char" >&5 echo "${ECHO_T}$ac_cv_type_signed_char" >&6 -echo "$as_me:14556: checking size of signed char" >&5 +echo "$as_me:17150: 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 @@ -14561,8 +17155,8 @@ else if test "$ac_cv_type_signed_char" = yes; then if test "$cross_compiling" = yes; then # Depending upon the size, compute the lo and hi bounds. -cat >conftest.$ac_ext <<_ACEOF -#line 14565 "configure" +cat >"conftest.$ac_ext" <<_ACEOF +#line 17159 "configure" #include "confdefs.h" $ac_includes_default int @@ -14573,22 +17167,22 @@ int _array_ [1 - 2 * !((sizeof (signed char)) >= 0)] return 0; } _ACEOF -rm -f conftest.$ac_objext -if { (eval echo "$as_me:14577: \"$ac_compile\"") >&5 +rm -f "conftest.$ac_objext" +if { (eval echo "$as_me:17171: \"$ac_compile\"") >&5 (eval $ac_compile) 2>&5 ac_status=$? - echo "$as_me:14580: \$? = $ac_status" >&5 - (exit $ac_status); } && - { ac_try='test -s conftest.$ac_objext' - { (eval echo "$as_me:14583: \"$ac_try\"") >&5 + echo "$as_me:17174: \$? = $ac_status" >&5 + (exit "$ac_status"); } && + { ac_try='test -s "conftest.$ac_objext"' + { (eval echo "$as_me:17177: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? - echo "$as_me:14586: \$? = $ac_status" >&5 - (exit $ac_status); }; }; then + echo "$as_me:17180: \$? = $ac_status" >&5 + (exit "$ac_status"); }; }; then ac_lo=0 ac_mid=0 while :; do - cat >conftest.$ac_ext <<_ACEOF -#line 14591 "configure" + cat >"conftest.$ac_ext" <<_ACEOF +#line 17185 "configure" #include "confdefs.h" $ac_includes_default int @@ -14599,302 +17193,164 @@ int _array_ [1 - 2 * !((sizeof (signed char)) <= $ac_mid)] return 0; } _ACEOF -rm -f conftest.$ac_objext -if { (eval echo "$as_me:14603: \"$ac_compile\"") >&5 +rm -f "conftest.$ac_objext" +if { (eval echo "$as_me:17197: \"$ac_compile\"") >&5 (eval $ac_compile) 2>&5 ac_status=$? - echo "$as_me:14606: \$? = $ac_status" >&5 - (exit $ac_status); } && - { ac_try='test -s conftest.$ac_objext' - { (eval echo "$as_me:14609: \"$ac_try\"") >&5 + echo "$as_me:17200: \$? = $ac_status" >&5 + (exit "$ac_status"); } && + { ac_try='test -s "conftest.$ac_objext"' + { (eval echo "$as_me:17203: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? - echo "$as_me:14612: \$? = $ac_status" >&5 - (exit $ac_status); }; }; then + echo "$as_me:17206: \$? = $ac_status" >&5 + (exit "$ac_status"); }; }; then ac_hi=$ac_mid; break else echo "$as_me: failed program was:" >&5 -cat conftest.$ac_ext >&5 -ac_lo=`expr $ac_mid + 1`; ac_mid=`expr 2 '*' $ac_mid + 1` -fi -rm -f conftest.$ac_objext conftest.$ac_ext - done -else - echo "$as_me: failed program was:" >&5 -cat conftest.$ac_ext >&5 -ac_hi=-1 ac_mid=-1 - while :; do - cat >conftest.$ac_ext <<_ACEOF -#line 14628 "configure" -#include "confdefs.h" -$ac_includes_default -int -main (void) -{ -int _array_ [1 - 2 * !((sizeof (signed char)) >= $ac_mid)] - ; - return 0; -} -_ACEOF -rm -f conftest.$ac_objext -if { (eval echo "$as_me:14640: \"$ac_compile\"") >&5 - (eval $ac_compile) 2>&5 - ac_status=$? - echo "$as_me:14643: \$? = $ac_status" >&5 - (exit $ac_status); } && - { ac_try='test -s conftest.$ac_objext' - { (eval echo "$as_me:14646: \"$ac_try\"") >&5 - (eval $ac_try) 2>&5 - ac_status=$? - echo "$as_me:14649: \$? = $ac_status" >&5 - (exit $ac_status); }; }; then - ac_lo=$ac_mid; break -else - echo "$as_me: failed program was:" >&5 -cat conftest.$ac_ext >&5 -ac_hi=`expr $ac_mid - 1`; ac_mid=`expr 2 '*' $ac_mid` +cat "conftest.$ac_ext" >&5 +ac_lo=`expr "$ac_mid" + 1`; ac_mid=`expr 2 '*' "$ac_mid" + 1` fi -rm -f conftest.$ac_objext conftest.$ac_ext +rm -f "conftest.$ac_objext" "conftest.$ac_ext" done -fi -rm -f conftest.$ac_objext conftest.$ac_ext -# Binary search between lo and hi bounds. -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 14665 "configure" -#include "confdefs.h" -$ac_includes_default -int -main (void) -{ -int _array_ [1 - 2 * !((sizeof (signed char)) <= $ac_mid)] - ; - return 0; -} -_ACEOF -rm -f conftest.$ac_objext -if { (eval echo "$as_me:14677: \"$ac_compile\"") >&5 - (eval $ac_compile) 2>&5 - ac_status=$? - echo "$as_me:14680: \$? = $ac_status" >&5 - (exit $ac_status); } && - { ac_try='test -s conftest.$ac_objext' - { (eval echo "$as_me:14683: \"$ac_try\"") >&5 - (eval $ac_try) 2>&5 - ac_status=$? - echo "$as_me:14686: \$? = $ac_status" >&5 - (exit $ac_status); }; }; then - ac_hi=$ac_mid -else - echo "$as_me: failed program was:" >&5 -cat conftest.$ac_ext >&5 -ac_lo=`expr $ac_mid + 1` -fi -rm -f conftest.$ac_objext conftest.$ac_ext -done -ac_cv_sizeof_signed_char=$ac_lo -else - if test "$cross_compiling" = yes; then - { { echo "$as_me:14699: 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 14704 "configure" -#include "confdefs.h" -$ac_includes_default -int -main (void) -{ -FILE *f = fopen ("conftest.val", "w"); -if (!f) - $ac_main_return (1); -fprintf (f, "%d", (sizeof (signed char))); -fclose (f); - ; - return 0; -} -_ACEOF -rm -f conftest$ac_exeext -if { (eval echo "$as_me:14720: \"$ac_link\"") >&5 - (eval $ac_link) 2>&5 - ac_status=$? - echo "$as_me:14723: \$? = $ac_status" >&5 - (exit $ac_status); } && { ac_try='./conftest$ac_exeext' - { (eval echo "$as_me:14725: \"$ac_try\"") >&5 - (eval $ac_try) 2>&5 - ac_status=$? - echo "$as_me:14728: \$? = $ac_status" >&5 - (exit $ac_status); }; }; then - ac_cv_sizeof_signed_char=`cat conftest.val` -else - echo "$as_me: program exited with status $ac_status" >&5 -echo "$as_me: failed program was:" >&5 -cat conftest.$ac_ext >&5 -fi -rm -f core core.* *.core conftest$ac_exeext conftest.$ac_objext conftest.$ac_ext -fi -fi -rm -f conftest.val -else - ac_cv_sizeof_signed_char=0 -fi -fi -echo "$as_me:14744: result: $ac_cv_sizeof_signed_char" >&5 -echo "${ECHO_T}$ac_cv_sizeof_signed_char" >&6 -cat >>confdefs.h <&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 14756 "configure" -#include "confdefs.h" -#include -#include -#include -#include - -_ACEOF -if { (eval echo "$as_me:14764: \"$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:14770: \$? = $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 14792 "configure" +cat "conftest.$ac_ext" >&5 +ac_hi=-1 ac_mid=-1 + while :; do + cat >"conftest.$ac_ext" <<_ACEOF +#line 17222 "configure" #include "confdefs.h" -#include - +$ac_includes_default +int +main (void) +{ +int _array_ [1 - 2 * !((sizeof (signed char)) >= $ac_mid)] + ; + return 0; +} _ACEOF -if (eval "$ac_cpp conftest.$ac_ext") 2>&5 | - egrep "memchr" >/dev/null 2>&1; then - : +rm -f "conftest.$ac_objext" +if { (eval echo "$as_me:17234: \"$ac_compile\"") >&5 + (eval $ac_compile) 2>&5 + ac_status=$? + echo "$as_me:17237: \$? = $ac_status" >&5 + (exit "$ac_status"); } && + { ac_try='test -s "conftest.$ac_objext"' + { (eval echo "$as_me:17240: \"$ac_try\"") >&5 + (eval $ac_try) 2>&5 + ac_status=$? + echo "$as_me:17243: \$? = $ac_status" >&5 + (exit "$ac_status"); }; }; then + ac_lo=$ac_mid; break else - ac_cv_header_stdc=no + echo "$as_me: failed program was:" >&5 +cat "conftest.$ac_ext" >&5 +ac_hi=`expr "$ac_mid" - 1`; ac_mid=`expr 2 '*' "$ac_mid"` fi -rm -rf conftest* - +rm -f "conftest.$ac_objext" "conftest.$ac_ext" + done 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 14810 "configure" +rm -f "conftest.$ac_objext" "conftest.$ac_ext" +# Binary search between lo and hi bounds. +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 17259 "configure" #include "confdefs.h" -#include - +$ac_includes_default +int +main (void) +{ +int _array_ [1 - 2 * !((sizeof (signed char)) <= $ac_mid)] + ; + return 0; +} _ACEOF -if (eval "$ac_cpp conftest.$ac_ext") 2>&5 | - egrep "free" >/dev/null 2>&1; then - : +rm -f "conftest.$ac_objext" +if { (eval echo "$as_me:17271: \"$ac_compile\"") >&5 + (eval $ac_compile) 2>&5 + ac_status=$? + echo "$as_me:17274: \$? = $ac_status" >&5 + (exit "$ac_status"); } && + { ac_try='test -s "conftest.$ac_objext"' + { (eval echo "$as_me:17277: \"$ac_try\"") >&5 + (eval $ac_try) 2>&5 + ac_status=$? + echo "$as_me:17280: \$? = $ac_status" >&5 + (exit "$ac_status"); }; }; then + ac_hi=$ac_mid else - ac_cv_header_stdc=no -fi -rm -rf conftest* - + echo "$as_me: failed program was:" >&5 +cat "conftest.$ac_ext" >&5 +ac_lo=`expr "$ac_mid" + 1` fi - -if test $ac_cv_header_stdc = yes; then - # /bin/cc in Irix-4.0.5 gets non-ANSI ctype macros unless using -ansi. +rm -f "conftest.$ac_objext" "conftest.$ac_ext" +done +ac_cv_sizeof_signed_char=$ac_lo +else if test "$cross_compiling" = yes; then - : + { { echo "$as_me:17293: 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 14831 "configure" + cat >"conftest.$ac_ext" <<_ACEOF +#line 17298 "configure" #include "confdefs.h" -#include -#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))) +$ac_includes_default 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); +FILE *f = fopen ("conftest.val", "w"); +if (!f) + $ac_main_return (1); +fprintf (f, "%ld", (long)(sizeof (signed char))); +fclose (f); + ; + return 0; } _ACEOF -rm -f conftest$ac_exeext -if { (eval echo "$as_me:14857: \"$ac_link\"") >&5 +rm -f "conftest$ac_exeext" +if { (eval echo "$as_me:17314: \"$ac_link\"") >&5 (eval $ac_link) 2>&5 ac_status=$? - echo "$as_me:14860: \$? = $ac_status" >&5 - (exit $ac_status); } && { ac_try='./conftest$ac_exeext' - { (eval echo "$as_me:14862: \"$ac_try\"") >&5 + echo "$as_me:17317: \$? = $ac_status" >&5 + (exit "$ac_status"); } && { ac_try='"./conftest$ac_exeext"' + { (eval echo "$as_me:17319: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? - echo "$as_me:14865: \$? = $ac_status" >&5 - (exit $ac_status); }; }; then - : + echo "$as_me:17322: \$? = $ac_status" >&5 + (exit "$ac_status"); }; }; then + ac_cv_sizeof_signed_char=`cat conftest.val` 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 +cat "conftest.$ac_ext" >&5 +fi +rm -f core ./core.* ./*.core "conftest$ac_exeext" "conftest.$ac_objext" "conftest.$ac_ext" fi -rm -f core core.* *.core conftest$ac_exeext conftest.$ac_objext conftest.$ac_ext fi +rm -f conftest.val +else + ac_cv_sizeof_signed_char=0 fi fi -echo "$as_me:14878: 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 +echo "$as_me:17338: result: $ac_cv_sizeof_signed_char" >&5 +echo "${ECHO_T}$ac_cv_sizeof_signed_char" >&6 +cat >>confdefs.h <&5 +echo "$as_me:17347: 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 14897 "configure" + cat >"conftest.$ac_ext" <<_ACEOF +#line 17353 "configure" #include "confdefs.h" #include #include <$ac_hdr> @@ -14908,29 +17364,29 @@ return 0; return 0; } _ACEOF -rm -f conftest.$ac_objext -if { (eval echo "$as_me:14912: \"$ac_compile\"") >&5 +rm -f "conftest.$ac_objext" +if { (eval echo "$as_me:17368: \"$ac_compile\"") >&5 (eval $ac_compile) 2>&5 ac_status=$? - echo "$as_me:14915: \$? = $ac_status" >&5 - (exit $ac_status); } && - { ac_try='test -s conftest.$ac_objext' - { (eval echo "$as_me:14918: \"$ac_try\"") >&5 + echo "$as_me:17371: \$? = $ac_status" >&5 + (exit "$ac_status"); } && + { ac_try='test -s "conftest.$ac_objext"' + { (eval echo "$as_me:17374: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? - echo "$as_me:14921: \$? = $ac_status" >&5 - (exit $ac_status); }; }; then + echo "$as_me:17377: \$? = $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 +cat "conftest.$ac_ext" >&5 eval "$as_ac_Header=no" fi -rm -f conftest.$ac_objext conftest.$ac_ext +rm -f "conftest.$ac_objext" "conftest.$ac_ext" fi -echo "$as_me:14931: 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 +echo "$as_me:17387: 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 <&5 + echo "$as_me:17400: 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 else ac_check_lib_save_LIBS=$LIBS LIBS="-ldir $LIBS" -cat >conftest.$ac_ext <<_ACEOF -#line 14952 "configure" +cat >"conftest.$ac_ext" <<_ACEOF +#line 17408 "configure" #include "confdefs.h" /* Override any gcc2 internal prototype to avoid an error. */ @@ -14958,7 +17414,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) { @@ -14967,43 +17423,43 @@ opendir (); return 0; } _ACEOF -rm -f conftest.$ac_objext conftest$ac_exeext -if { (eval echo "$as_me:14971: \"$ac_link\"") >&5 +rm -f "conftest.$ac_objext" "conftest$ac_exeext" +if { (eval echo "$as_me:17427: \"$ac_link\"") >&5 (eval $ac_link) 2>&5 ac_status=$? - echo "$as_me:14974: \$? = $ac_status" >&5 - (exit $ac_status); } && - { ac_try='test -s conftest$ac_exeext' - { (eval echo "$as_me:14977: \"$ac_try\"") >&5 + echo "$as_me:17430: \$? = $ac_status" >&5 + (exit "$ac_status"); } && + { ac_try='test -s "conftest$ac_exeext"' + { (eval echo "$as_me:17433: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? - echo "$as_me:14980: \$? = $ac_status" >&5 - (exit $ac_status); }; }; then + echo "$as_me:17436: \$? = $ac_status" >&5 + (exit "$ac_status"); }; }; then ac_cv_lib_dir_opendir=yes else echo "$as_me: failed program was:" >&5 -cat conftest.$ac_ext >&5 +cat "conftest.$ac_ext" >&5 ac_cv_lib_dir_opendir=no fi -rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext +rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext" LIBS=$ac_check_lib_save_LIBS fi -echo "$as_me:14991: result: $ac_cv_lib_dir_opendir" >&5 +echo "$as_me:17447: 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 +if test "$ac_cv_lib_dir_opendir" = yes; then LIBS="$LIBS -ldir" fi else - echo "$as_me:14998: checking for opendir in -lx" >&5 + echo "$as_me:17454: 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 else ac_check_lib_save_LIBS=$LIBS LIBS="-lx $LIBS" -cat >conftest.$ac_ext <<_ACEOF -#line 15006 "configure" +cat >"conftest.$ac_ext" <<_ACEOF +#line 17462 "configure" #include "confdefs.h" /* Override any gcc2 internal prototype to avoid an error. */ @@ -15012,7 +17468,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) { @@ -15021,42 +17477,42 @@ opendir (); return 0; } _ACEOF -rm -f conftest.$ac_objext conftest$ac_exeext -if { (eval echo "$as_me:15025: \"$ac_link\"") >&5 +rm -f "conftest.$ac_objext" "conftest$ac_exeext" +if { (eval echo "$as_me:17481: \"$ac_link\"") >&5 (eval $ac_link) 2>&5 ac_status=$? - echo "$as_me:15028: \$? = $ac_status" >&5 - (exit $ac_status); } && - { ac_try='test -s conftest$ac_exeext' - { (eval echo "$as_me:15031: \"$ac_try\"") >&5 + echo "$as_me:17484: \$? = $ac_status" >&5 + (exit "$ac_status"); } && + { ac_try='test -s "conftest$ac_exeext"' + { (eval echo "$as_me:17487: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? - echo "$as_me:15034: \$? = $ac_status" >&5 - (exit $ac_status); }; }; then + echo "$as_me:17490: \$? = $ac_status" >&5 + (exit "$ac_status"); }; }; then ac_cv_lib_x_opendir=yes else echo "$as_me: failed program was:" >&5 -cat conftest.$ac_ext >&5 +cat "conftest.$ac_ext" >&5 ac_cv_lib_x_opendir=no fi -rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext +rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext" LIBS=$ac_check_lib_save_LIBS fi -echo "$as_me:15045: result: $ac_cv_lib_x_opendir" >&5 +echo "$as_me:17501: 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 +if test "$ac_cv_lib_x_opendir" = yes; then LIBS="$LIBS -lx" fi fi -echo "$as_me:15053: checking whether time.h and sys/time.h may both be included" >&5 +echo "$as_me:17509: 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 15059 "configure" + cat >"conftest.$ac_ext" <<_ACEOF +#line 17515 "configure" #include "confdefs.h" #include #include @@ -15071,27 +17527,27 @@ return 0; return 0; } _ACEOF -rm -f conftest.$ac_objext -if { (eval echo "$as_me:15075: \"$ac_compile\"") >&5 +rm -f "conftest.$ac_objext" +if { (eval echo "$as_me:17531: \"$ac_compile\"") >&5 (eval $ac_compile) 2>&5 ac_status=$? - echo "$as_me:15078: \$? = $ac_status" >&5 - (exit $ac_status); } && - { ac_try='test -s conftest.$ac_objext' - { (eval echo "$as_me:15081: \"$ac_try\"") >&5 + echo "$as_me:17534: \$? = $ac_status" >&5 + (exit "$ac_status"); } && + { ac_try='test -s "conftest.$ac_objext"' + { (eval echo "$as_me:17537: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? - echo "$as_me:15084: \$? = $ac_status" >&5 - (exit $ac_status); }; }; then + echo "$as_me:17540: \$? = $ac_status" >&5 + (exit "$ac_status"); }; }; then ac_cv_header_time=yes else echo "$as_me: failed program was:" >&5 -cat conftest.$ac_ext >&5 +cat "conftest.$ac_ext" >&5 ac_cv_header_time=no fi -rm -f conftest.$ac_objext conftest.$ac_ext +rm -f "conftest.$ac_objext" "conftest.$ac_ext" fi -echo "$as_me:15094: result: $ac_cv_header_time" >&5 +echo "$as_me:17550: result: $ac_cv_header_time" >&5 echo "${ECHO_T}$ac_cv_header_time" >&6 if test $ac_cv_header_time = yes; then @@ -15104,18 +17560,18 @@ fi ### checks for compiler characteristics ac_ext=c ac_cpp='$CPP $CPPFLAGS' -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_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 +ac_main_return="return" -echo "$as_me:15112: checking for an ANSI C-conforming const" >&5 +echo "$as_me:17568: 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 15118 "configure" + cat >"conftest.$ac_ext" <<_ACEOF +#line 17574 "configure" #include "confdefs.h" int @@ -15125,13 +17581,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 @@ -15147,16 +17603,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. */ @@ -15165,6 +17624,7 @@ main (void) } { /* ULTRIX-32 V3.1 (Rev 9) vcc rejects this */ const int foo = 10; + (void)foo; } #endif @@ -15172,27 +17632,27 @@ main (void) return 0; } _ACEOF -rm -f conftest.$ac_objext -if { (eval echo "$as_me:15176: \"$ac_compile\"") >&5 +rm -f "conftest.$ac_objext" +if { (eval echo "$as_me:17636: \"$ac_compile\"") >&5 (eval $ac_compile) 2>&5 ac_status=$? - echo "$as_me:15179: \$? = $ac_status" >&5 - (exit $ac_status); } && - { ac_try='test -s conftest.$ac_objext' - { (eval echo "$as_me:15182: \"$ac_try\"") >&5 + echo "$as_me:17639: \$? = $ac_status" >&5 + (exit "$ac_status"); } && + { ac_try='test -s "conftest.$ac_objext"' + { (eval echo "$as_me:17642: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? - echo "$as_me:15185: \$? = $ac_status" >&5 - (exit $ac_status); }; }; then + echo "$as_me:17645: \$? = $ac_status" >&5 + (exit "$ac_status"); }; }; then ac_cv_c_const=yes else echo "$as_me: failed program was:" >&5 -cat conftest.$ac_ext >&5 +cat "conftest.$ac_ext" >&5 ac_cv_c_const=no fi -rm -f conftest.$ac_objext conftest.$ac_ext +rm -f "conftest.$ac_objext" "conftest.$ac_ext" fi -echo "$as_me:15195: result: $ac_cv_c_const" >&5 +echo "$as_me:17655: result: $ac_cv_c_const" >&5 echo "${ECHO_T}$ac_cv_c_const" >&6 if test $ac_cv_c_const = no; then @@ -15204,7 +17664,7 @@ fi ### Checks for external-data -echo "$as_me:15207: checking if data-only library module links" >&5 +echo "$as_me:17667: 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 @@ -15212,37 +17672,41 @@ else rm -f conftest.a cat >conftest.$ac_ext <&5 + if { (eval echo "$as_me:17678: \"$ac_compile\"") >&5 (eval $ac_compile) 2>&5 ac_status=$? - echo "$as_me:15221: \$? = $ac_status" >&5 - (exit $ac_status); } ; then + echo "$as_me:17681: \$? = $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 <&5 + if { (eval echo "$as_me:17705: \"$ac_compile\"") >&5 (eval $ac_compile) 2>&5 ac_status=$? - echo "$as_me:15244: \$? = $ac_status" >&5 - (exit $ac_status); }; then + echo "$as_me:17708: \$? = $ac_status" >&5 + (exit "$ac_status"); }; then mv conftest.o func.o && \ ( $AR $ARFLAGS conftest.a func.o ) 2>&5 1>/dev/null fi @@ -15253,42 +17717,42 @@ EOF if test "$cross_compiling" = yes; then cf_cv_link_dataonly=unknown else - cat >conftest.$ac_ext <<_ACEOF -#line 15257 "configure" + cat >"conftest.$ac_ext" <<_ACEOF +#line 17721 "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:15268: \"$ac_link\"") >&5 +rm -f "conftest$ac_exeext" +if { (eval echo "$as_me:17732: \"$ac_link\"") >&5 (eval $ac_link) 2>&5 ac_status=$? - echo "$as_me:15271: \$? = $ac_status" >&5 - (exit $ac_status); } && { ac_try='./conftest$ac_exeext' - { (eval echo "$as_me:15273: \"$ac_try\"") >&5 + echo "$as_me:17735: \$? = $ac_status" >&5 + (exit "$ac_status"); } && { ac_try='"./conftest$ac_exeext"' + { (eval echo "$as_me:17737: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? - echo "$as_me:15276: \$? = $ac_status" >&5 - (exit $ac_status); }; }; then + echo "$as_me:17740: \$? = $ac_status" >&5 + (exit "$ac_status"); }; }; then cf_cv_link_dataonly=yes else echo "$as_me: program exited with status $ac_status" >&5 echo "$as_me: failed program was:" >&5 -cat conftest.$ac_ext >&5 +cat "conftest.$ac_ext" >&5 cf_cv_link_dataonly=no fi -rm -f core core.* *.core conftest$ac_exeext conftest.$ac_objext conftest.$ac_ext +rm -f core ./core.* ./*.core "conftest$ac_exeext" "conftest.$ac_objext" "conftest.$ac_ext" fi LIBS="$cf_saveLIBS" fi -echo "$as_me:15291: result: $cf_cv_link_dataonly" >&5 +echo "$as_me:17755: result: $cf_cv_link_dataonly" >&5 echo "${ECHO_T}$cf_cv_link_dataonly" >&6 if test "$cf_cv_link_dataonly" = no ; then @@ -15307,24 +17771,24 @@ unistd.h \ do as_ac_Header=`echo "ac_cv_header_$ac_header" | $as_tr_sh` -echo "$as_me:15310: checking for $ac_header" >&5 +echo "$as_me:17774: 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 15316 "configure" + cat >"conftest.$ac_ext" <<_ACEOF +#line 17780 "configure" #include "confdefs.h" #include <$ac_header> _ACEOF -if { (eval echo "$as_me:15320: \"$ac_cpp conftest.$ac_ext\"") >&5 - (eval $ac_cpp conftest.$ac_ext) 2>conftest.er1 +if { (eval echo "$as_me:17784: \"$ac_cpp "conftest.$ac_ext"\"") >&5 + (eval $ac_cpp "conftest.$ac_ext") 2>conftest.er1 ac_status=$? - egrep -v '^ *\+' conftest.er1 >conftest.err + $EGREP -v '^ *\+' conftest.er1 >conftest.err rm -f conftest.er1 cat conftest.err >&5 - echo "$as_me:15326: \$? = $ac_status" >&5 - (exit $ac_status); } >/dev/null; then + echo "$as_me:17790: \$? = $ac_status" >&5 + (exit "$ac_status"); } >/dev/null; then if test -s conftest.err; then ac_cpp_err=$ac_c_preproc_warn_flag else @@ -15337,14 +17801,14 @@ 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 + cat "conftest.$ac_ext" >&5 eval "$as_ac_Header=no" fi -rm -f conftest.err conftest.$ac_ext +rm -f conftest.err "conftest.$ac_ext" fi -echo "$as_me:15345: 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 +echo "$as_me:17809: 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 <&5 +echo "$as_me:17819: 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 else -rm -rf conftest* +rm -rf ./conftest* if test "$cross_compiling" = yes; then cf_cv_func_mkstemp=maybe else - cat >conftest.$ac_ext <<_ACEOF -#line 15366 "configure" + cat >"conftest.$ac_ext" <<_ACEOF +#line 17830 "configure" #include "confdefs.h" -#include -#ifdef HAVE_UNISTD_H -#include -#endif -#include -#include -#include -#include +$ac_includes_default + int main(void) { - char *tmpl = "conftestXXXXXX"; + static char tmpl[] = "conftestXXXXXX"; char name[2][80]; int n; int result = 0; @@ -15403,311 +17861,111 @@ int main(void) } _ACEOF -rm -f conftest$ac_exeext -if { (eval echo "$as_me:15407: \"$ac_link\"") >&5 +rm -f "conftest$ac_exeext" +if { (eval echo "$as_me:17865: \"$ac_link\"") >&5 (eval $ac_link) 2>&5 ac_status=$? - echo "$as_me:15410: \$? = $ac_status" >&5 - (exit $ac_status); } && { ac_try='./conftest$ac_exeext' - { (eval echo "$as_me:15412: \"$ac_try\"") >&5 + echo "$as_me:17868: \$? = $ac_status" >&5 + (exit "$ac_status"); } && { ac_try='"./conftest$ac_exeext"' + { (eval echo "$as_me:17870: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? - echo "$as_me:15415: \$? = $ac_status" >&5 - (exit $ac_status); }; }; then + echo "$as_me:17873: \$? = $ac_status" >&5 + (exit "$ac_status"); }; }; then cf_cv_func_mkstemp=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_cv_func_mkstemp=no - -fi -rm -f core core.* *.core conftest$ac_exeext conftest.$ac_objext conftest.$ac_ext -fi - -fi -echo "$as_me:15430: 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:15433: 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 15439 "configure" -#include "confdefs.h" -/* System header to define __stub macros and hopefully few prototypes, - which can conflict with char mkstemp (); below. */ -#include -/* Override any gcc2 internal prototype to avoid an error. */ -#ifdef __cplusplus -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 mkstemp (); -char (*f) (); - -int -main (void) -{ -/* The GNU C library defines this for functions which it implements - to always fail with ENOSYS. Some functions are actually named - something starting with __ and the normal name is an alias. */ -#if defined (__stub_mkstemp) || defined (__stub___mkstemp) -choke me -#else -f = mkstemp; /* workaround for ICC 12.0.3 */ if (f == 0) return 1; -#endif - - ; - return 0; -} -_ACEOF -rm -f conftest.$ac_objext conftest$ac_exeext -if { (eval echo "$as_me:15470: \"$ac_link\"") >&5 - (eval $ac_link) 2>&5 - ac_status=$? - echo "$as_me:15473: \$? = $ac_status" >&5 - (exit $ac_status); } && - { ac_try='test -s conftest$ac_exeext' - { (eval echo "$as_me:15476: \"$ac_try\"") >&5 - (eval $ac_try) 2>&5 - ac_status=$? - echo "$as_me:15479: \$? = $ac_status" >&5 - (exit $ac_status); }; }; then - ac_cv_func_mkstemp=yes -else - echo "$as_me: failed program was:" >&5 -cat conftest.$ac_ext >&5 -ac_cv_func_mkstemp=no -fi -rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext -fi -echo "$as_me:15489: result: $ac_cv_func_mkstemp" >&5 -echo "${ECHO_T}$ac_cv_func_mkstemp" >&6 - -fi -if test "x$cf_cv_func_mkstemp" = xyes || test "x$ac_cv_func_mkstemp" = xyes ; then - -cat >>confdefs.h <<\EOF -#define HAVE_MKSTEMP 1 -EOF - -fi - -if test -z "$cf_user_CFLAGS" && test "$with_no_leaks" = no ; then - CFLAGS=`echo ${CFLAGS} | sed -e 's%-g %%' -e 's%-g$%%'` - CXXFLAGS=`echo ${CXXFLAGS} | sed -e 's%-g %%' -e 's%-g$%%'` -fi - -cf_with_ada=yes -if test "$cf_with_ada" != "no" ; then - -cf_ada_make=gnatmake -cf_ada_config="#" -# Extract the first word of "$cf_ada_make", so it can be a program name with args. -set dummy $cf_ada_make; ac_word=$2 -echo "$as_me:15513: checking for $ac_word" >&5 -echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6 -if test "${ac_cv_prog_gnatmake_exists+set}" = set; then - echo $ECHO_N "(cached) $ECHO_C" >&6 -else - if test -n "$gnatmake_exists"; then - ac_cv_prog_gnatmake_exists="$gnatmake_exists" # Let the user override the test. -else - ac_save_IFS=$IFS; IFS=$ac_path_separator -ac_dummy="$PATH" -for ac_dir in $ac_dummy; do - IFS=$ac_save_IFS - test -z "$ac_dir" && ac_dir=. - $as_executable_p "$ac_dir/$ac_word" || continue -ac_cv_prog_gnatmake_exists="yes" -echo "$as_me:15528: found $ac_dir/$ac_word" >&5 -break -done - - test -z "$ac_cv_prog_gnatmake_exists" && ac_cv_prog_gnatmake_exists="no" -fi -fi -gnatmake_exists=$ac_cv_prog_gnatmake_exists -if test -n "$gnatmake_exists"; then - echo "$as_me:15537: result: $gnatmake_exists" >&5 -echo "${ECHO_T}$gnatmake_exists" >&6 -else - echo "$as_me:15540: result: no" >&5 -echo "${ECHO_T}no" >&6 -fi - -if test "$ac_cv_prog_gnatmake_exists" = no; then - cf_ada_make= - cf_cv_prog_gnat_correct=no -else - # Extract the first word of "gprconfig", so it can be a program name with args. -set dummy gprconfig; ac_word=$2 -echo "$as_me:15550: checking for $ac_word" >&5 -echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6 -if test "${ac_cv_prog_gprconfig_exists+set}" = set; then - echo $ECHO_N "(cached) $ECHO_C" >&6 -else - if test -n "$gprconfig_exists"; then - ac_cv_prog_gprconfig_exists="$gprconfig_exists" # Let the user override the test. -else - ac_save_IFS=$IFS; IFS=$ac_path_separator -ac_dummy="$PATH" -for ac_dir in $ac_dummy; do - IFS=$ac_save_IFS - test -z "$ac_dir" && ac_dir=. - $as_executable_p "$ac_dir/$ac_word" || continue -ac_cv_prog_gprconfig_exists="yes" -echo "$as_me:15565: found $ac_dir/$ac_word" >&5 -break -done - - test -z "$ac_cv_prog_gprconfig_exists" && ac_cv_prog_gprconfig_exists="no" -fi -fi -gprconfig_exists=$ac_cv_prog_gprconfig_exists -if test -n "$gprconfig_exists"; then - echo "$as_me:15574: result: $gprconfig_exists" >&5 -echo "${ECHO_T}$gprconfig_exists" >&6 -else - echo "$as_me:15577: result: no" >&5 -echo "${ECHO_T}no" >&6 -fi - - if test "$ac_cv_prog_gprconfig_exists" = yes - then - rm -rf conftest* *~conftest* - if mkdir conftest.src - then - cf_ada_config="" - cd conftest.src - for cf_gprconfig in Ada C - do - echo "$as_me:15590: checking for gprconfig name for $cf_gprconfig" >&5 -echo $ECHO_N "checking for gprconfig name for $cf_gprconfig... $ECHO_C" >&6 - cf_gprconfig_value=`echo s| gprconfig --config=$cf_gprconfig 2>&5 | ${AWK:-awk} '/^\*/{print $3;}' | head -n 1` - if test -n "$cf_gprconfig_value" - then - eval cf_ada_config_$cf_gprconfig=$cf_gprconfig_value - echo "$as_me:15596: result: $cf_gprconfig_value" >&5 -echo "${ECHO_T}$cf_gprconfig_value" >&6 - else - echo "$as_me:15599: result: missing" >&5 -echo "${ECHO_T}missing" >&6 - cf_ada_config="#" - break - fi - done - cd .. - rm -rf conftest* *~conftest* - fi - else - # gprconfig is newer than gnatmake; we can continue... - cf_ada_config="##" - fi - if test "x$cf_ada_config" != "x#" - then - -echo "$as_me:15615: checking for gnat version" >&5 -echo $ECHO_N "checking for gnat version... $ECHO_C" >&6 -cf_gnat_version=`${cf_ada_make:-gnatmake} -v 2>&1 | \ - grep '[0-9].[0-9][0-9]*' |\ - sed -e '2,$d' -e 's/[^0-9 \.]//g' -e 's/^[ ]*//' -e 's/ .*//'` -echo "$as_me:15620: result: $cf_gnat_version" >&5 -echo "${ECHO_T}$cf_gnat_version" >&6 + echo "$as_me: program exited with status $ac_status" >&5 +echo "$as_me: failed program was:" >&5 +cat "conftest.$ac_ext" >&5 +cf_cv_func_mkstemp=no -case $cf_gnat_version in -(3.1[1-9]*|3.[2-9]*|[4-9].*|20[0-9][0-9]) - cf_cv_prog_gnat_correct=yes - ;; -(*) - { echo "$as_me:15628: WARNING: Unsupported GNAT version $cf_gnat_version. We require 3.11 or better. Disabling Ada95 binding." >&5 -echo "$as_me: WARNING: Unsupported GNAT version $cf_gnat_version. We require 3.11 or better. Disabling Ada95 binding." >&2;} - cf_cv_prog_gnat_correct=no - ;; -esac +fi +rm -f core ./core.* ./*.core "conftest$ac_exeext" "conftest.$ac_objext" "conftest.$ac_ext" +fi - # Extract the first word of "m4", so it can be a program name with args. -set dummy m4; ac_word=$2 -echo "$as_me:15636: 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 +fi +echo "$as_me:17888: 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:17891: 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 - if test -n "$M4_exists"; then - ac_cv_prog_M4_exists="$M4_exists" # Let the user override the test. -else - ac_save_IFS=$IFS; IFS=$ac_path_separator -ac_dummy="$PATH" -for ac_dir in $ac_dummy; do - IFS=$ac_save_IFS - test -z "$ac_dir" && ac_dir=. - $as_executable_p "$ac_dir/$ac_word" || continue -ac_cv_prog_M4_exists="yes" -echo "$as_me:15651: found $ac_dir/$ac_word" >&5 -break -done + cat >"conftest.$ac_ext" <<_ACEOF +#line 17897 "configure" +#include "confdefs.h" +#define mkstemp autoconf_temporary +#include /* least-intrusive standard header which defines gcc2 __stub macros */ +#undef mkstemp - test -z "$ac_cv_prog_M4_exists" && ac_cv_prog_M4_exists="no" +#ifdef __cplusplus +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 mkstemp (void); + +int +main (void) +{ + +/* The GNU C library defines stubs for functions which it implements + to always fail with ENOSYS. Some functions are actually named + something starting with __ and the normal name is an alias. */ +#if defined (__stub_mkstemp) || defined (__stub___mkstemp) +#error found stub for mkstemp +#endif + + return mkstemp (); + ; + return 0; +} +_ACEOF +rm -f "conftest.$ac_objext" "conftest$ac_exeext" +if { (eval echo "$as_me:17928: \"$ac_link\"") >&5 + (eval $ac_link) 2>&5 + ac_status=$? + echo "$as_me:17931: \$? = $ac_status" >&5 + (exit "$ac_status"); } && + { ac_try='test -s "conftest$ac_exeext"' + { (eval echo "$as_me:17934: \"$ac_try\"") >&5 + (eval $ac_try) 2>&5 + ac_status=$? + echo "$as_me:17937: \$? = $ac_status" >&5 + (exit "$ac_status"); }; }; then + ac_cv_func_mkstemp=yes +else + echo "$as_me: failed program was:" >&5 +cat "conftest.$ac_ext" >&5 +ac_cv_func_mkstemp=no fi +rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext" fi -M4_exists=$ac_cv_prog_M4_exists -if test -n "$M4_exists"; then - echo "$as_me:15660: result: $M4_exists" >&5 -echo "${ECHO_T}$M4_exists" >&6 -else - echo "$as_me:15663: result: no" >&5 -echo "${ECHO_T}no" >&6 +echo "$as_me:17947: result: $ac_cv_func_mkstemp" >&5 +echo "${ECHO_T}$ac_cv_func_mkstemp" >&6 + fi +if test "x$cf_cv_func_mkstemp" = xyes || test "x$ac_cv_func_mkstemp" = xyes ; then - if test "$ac_cv_prog_M4_exists" = no; then - cf_cv_prog_gnat_correct=no - echo Ada95 binding required program m4 not found. Ada95 binding disabled. - fi - if test "$cf_cv_prog_gnat_correct" = yes; then - echo "$as_me:15672: checking if GNAT works" >&5 -echo $ECHO_N "checking if GNAT works... $ECHO_C" >&6 +cat >>confdefs.h <<\EOF +#define HAVE_MKSTEMP 1 +EOF -rm -rf conftest* *~conftest* -cat >>conftest.ads <>conftest.adb <&5 2>&1 ) ; then - if ( ./conftest 1>&5 2>&1 ) ; then - cf_cv_prog_gnat_correct=yes - else - cf_cv_prog_gnat_correct=no - fi -else - cf_cv_prog_gnat_correct=no fi -rm -rf conftest* *~conftest* - echo "$as_me:15700: result: $cf_cv_prog_gnat_correct" >&5 -echo "${ECHO_T}$cf_cv_prog_gnat_correct" >&6 - fi - else - cf_cv_prog_gnat_correct=no - fi +if test -z "$cf_user_CFLAGS" && test "$with_no_leaks" = no ; then + CFLAGS=`echo "${CFLAGS}" | sed -e 's%-g %%' -e 's%-g$%%' -e 's%[ ]% %g' -e 's% [ ]*% %g' -e 's%^ %%' -e 's% $%%'` + CXXFLAGS=`echo "${CXXFLAGS}" | sed -e 's%-g %%' -e 's%-g$%%' -e 's%[ ]% %g' -e 's% [ ]*% %g' -e 's%^ %%' -e 's% $%%'` fi +cf_with_ada=yes +if test "$cf_with_ada" != "no" ; then if test "$cf_cv_prog_gnat_correct" = yes; then - echo "$as_me:15710: checking optimization options for ADAFLAGS" >&5 + echo "$as_me:17968: checking optimization options for ADAFLAGS" >&5 echo $ECHO_N "checking optimization options for ADAFLAGS... $ECHO_C" >&6 case "$CFLAGS" in (*-g*) @@ -15724,10 +17982,10 @@ echo $ECHO_N "checking optimization options for ADAFLAGS... $ECHO_C" >&6 ;; esac - echo "$as_me:15727: result: $ADAFLAGS" >&5 + echo "$as_me:17985: result: $ADAFLAGS" >&5 echo "${ECHO_T}$ADAFLAGS" >&6 -echo "$as_me:15730: checking if GNATPREP supports -T option" >&5 +echo "$as_me:17988: 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 @@ -15737,21 +17995,21 @@ cf_cv_gnatprep_opt_t=no gnatprep -T 2>/dev/null >/dev/null && cf_cv_gnatprep_opt_t=yes fi -echo "$as_me:15740: result: $cf_cv_gnatprep_opt_t" >&5 +echo "$as_me:17998: 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:15744: checking if GNAT supports generics" >&5 +echo "$as_me:18002: checking if GNAT supports generics" >&5 echo $ECHO_N "checking if GNAT supports generics... $ECHO_C" >&6 -case $cf_gnat_version in -(3.[1-9]*|[4-9].*) +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]) cf_gnat_generics=yes ;; (*) cf_gnat_generics=no ;; esac -echo "$as_me:15754: result: $cf_gnat_generics" >&5 +echo "$as_me:18012: result: $cf_gnat_generics" >&5 echo "${ECHO_T}$cf_gnat_generics" >&6 if test "$cf_gnat_generics" = yes @@ -15763,13 +18021,13 @@ else cf_generic_objects= fi -echo "$as_me:15766: checking if GNAT supports SIGINT" >&5 +echo "$as_me:18024: 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 else -rm -rf conftest* *~conftest* +rm -rf ./conftest* ./*~conftest* cat >>conftest.ads <&5 2>&1 ) ; then +if ( "$cf_ada_make" $ADAFLAGS conftest 1>&5 2>&1 ) ; then cf_cv_gnat_sigint=yes else cf_cv_gnat_sigint=no fi -rm -rf conftest* *~conftest* +rm -rf ./conftest* ./*~conftest* fi -echo "$as_me:15814: result: $cf_cv_gnat_sigint" >&5 +echo "$as_me:18072: result: $cf_cv_gnat_sigint" >&5 echo "${ECHO_T}$cf_cv_gnat_sigint" >&6 -if test $cf_cv_gnat_sigint = yes ; then +if test "$cf_cv_gnat_sigint" = yes ; then USE_GNAT_SIGINT="" else USE_GNAT_SIGINT="#" @@ -15824,21 +18082,21 @@ cf_gnat_libraries=no cf_gnat_projects=no if test "$enable_gnat_projects" != no ; then -echo "$as_me:15827: checking if GNAT supports project files" >&5 +echo "$as_me:18085: checking if GNAT supports project files" >&5 echo $ECHO_N "checking if GNAT supports project files... $ECHO_C" >&6 -case $cf_gnat_version in +case "$cf_cv_gnat_version" in (3.[0-9]*) ;; (*) - case $cf_cv_system_name in + case "$cf_cv_system_name" in (cygwin*|msys*) ;; (*) - rm -rf conftest* *~conftest* + rm -rf ./conftest* ./*~conftest* if mkdir conftest.src conftest.bin conftest.lib then cd conftest.src - rm -rf conftest* *~conftest* + rm -rf ./conftest* ./*~conftest* cat >>library.gpr <&5 2>&1 ) ; then cf_gnat_projects=yes @@ -15882,30 +18140,42 @@ CF_EOF then cf_gnat_libraries=yes fi - rm -rf conftest* *~conftest* + rm -rf ./conftest* ./*~conftest* ;; esac ;; esac -echo "$as_me:15890: result: $cf_gnat_projects" >&5 +echo "$as_me:18148: result: $cf_gnat_projects" >&5 echo "${ECHO_T}$cf_gnat_projects" >&6 fi # enable_gnat_projects -if test $cf_gnat_projects = yes +if test "$cf_gnat_projects" = yes then - echo "$as_me:15896: checking if GNAT supports libraries" >&5 + echo "$as_me:18154: checking if GNAT supports libraries" >&5 echo $ECHO_N "checking if GNAT supports libraries... $ECHO_C" >&6 - echo "$as_me:15898: result: $cf_gnat_libraries" >&5 + echo "$as_me:18156: result: $cf_gnat_libraries" >&5 echo "${ECHO_T}$cf_gnat_libraries" >&6 fi +USE_OLD_MAKERULES="" +USE_GNAT_PROJECTS="#" +USE_GNAT_MAKE_GPR="#" +USE_GNAT_GPRBUILD="#" + if test "$cf_gnat_projects" = yes then USE_OLD_MAKERULES="#" USE_GNAT_PROJECTS="" -else - USE_OLD_MAKERULES="" - USE_GNAT_PROJECTS="#" + if test "$cf_cv_VERSION_GPRBUILD" != no + then + USE_GNAT_GPRBUILD="" + elif test "$cf_cv_VERSION_GNATMAKE" != no + then + USE_GNAT_MAKE_GPR="" + else + { echo "$as_me:18176: 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 if test "$cf_gnat_libraries" = yes @@ -15915,8 +18185,8 @@ else USE_GNAT_LIBRARIES="#" fi -echo "$as_me:15918: checking for ada-compiler" >&5 -echo $ECHO_N "checking for ada-compiler... $ECHO_C" >&6 +echo "$as_me:18188: 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 @@ -15926,13 +18196,13 @@ else cf_ada_compiler=gnatmake fi; -echo "$as_me:15929: result: $cf_ada_compiler" >&5 +echo "$as_me:18199: result: $cf_ada_compiler" >&5 echo "${ECHO_T}$cf_ada_compiler" >&6 cf_ada_package=terminal_interface -echo "$as_me:15934: checking for ada-include" >&5 -echo $ECHO_N "checking for ada-include... $ECHO_C" >&6 +echo "$as_me:18204: 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 @@ -15955,19 +18225,19 @@ case ".$withval" in ;; (.[a-zA-Z]:[\\/]*) # OS/2 EMX ;; -(.\${*prefix}*|.\${*dir}*) +(.\$\{*prefix\}*|.\$\{*dir\}*) eval withval="$withval" case ".$withval" in (.NONE/*) - withval=`echo $withval | sed -e s%NONE%$cf_path_syntax%` + withval=`echo "$withval" | sed -e s%NONE%$cf_path_syntax%` ;; esac ;; (.no|.NONE/*) - withval=`echo $withval | sed -e s%NONE%$cf_path_syntax%` + withval=`echo "$withval" | sed -e s%NONE%$cf_path_syntax%` ;; (*) - { { echo "$as_me:15970: error: expected a pathname, not \"$withval\"" >&5 + { { echo "$as_me:18240: error: expected a pathname, not \"$withval\"" >&5 echo "$as_me: error: expected a pathname, not \"$withval\"" >&2;} { (exit 1); exit 1; }; } ;; @@ -15976,11 +18246,11 @@ esac fi eval ADA_INCLUDE="$withval" -echo "$as_me:15979: result: $ADA_INCLUDE" >&5 +echo "$as_me:18249: result: $ADA_INCLUDE" >&5 echo "${ECHO_T}$ADA_INCLUDE" >&6 -echo "$as_me:15982: checking for ada-objects" >&5 -echo $ECHO_N "checking for ada-objects... $ECHO_C" >&6 +echo "$as_me:18252: 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 @@ -16003,19 +18273,19 @@ case ".$withval" in ;; (.[a-zA-Z]:[\\/]*) # OS/2 EMX ;; -(.\${*prefix}*|.\${*dir}*) +(.\$\{*prefix\}*|.\$\{*dir\}*) eval withval="$withval" case ".$withval" in (.NONE/*) - withval=`echo $withval | sed -e s%NONE%$cf_path_syntax%` + withval=`echo "$withval" | sed -e s%NONE%$cf_path_syntax%` ;; esac ;; (.no|.NONE/*) - withval=`echo $withval | sed -e s%NONE%$cf_path_syntax%` + withval=`echo "$withval" | sed -e s%NONE%$cf_path_syntax%` ;; (*) - { { echo "$as_me:16018: error: expected a pathname, not \"$withval\"" >&5 + { { echo "$as_me:18288: error: expected a pathname, not \"$withval\"" >&5 echo "$as_me: error: expected a pathname, not \"$withval\"" >&2;} { (exit 1); exit 1; }; } ;; @@ -16024,11 +18294,11 @@ esac fi eval ADA_OBJECTS="$withval" -echo "$as_me:16027: result: $ADA_OBJECTS" >&5 +echo "$as_me:18297: result: $ADA_OBJECTS" >&5 echo "${ECHO_T}$ADA_OBJECTS" >&6 -echo "$as_me:16030: 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:18300: 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 @@ -16037,19 +18307,25 @@ if test "${with_ada_sharedlib+set}" = set; then else with_ada_sharedlib=no fi; -echo "$as_me:16040: 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:16047: 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:18321: result: $with_ada_sharedlib" >&5 +echo "${ECHO_T}$with_ada_sharedlib" >&6 +if test "x$cf_ada_sharedlib_warn" != xno +then + { echo "$as_me:18325: 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="#" @@ -16062,13 +18338,34 @@ then fi fi + # allow the Ada binding to be renamed + +echo "$as_me:18343: 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 + withval="$with_ada_libname" + ADA_LIBNAME=$withval +else + ADA_LIBNAME=AdaCurses +fi; +case "x$ADA_LIBNAME" in +(x|xyes|xno) + ADA_LIBNAME=AdaCurses + ;; +esac + +echo "$as_me:18359: result: $ADA_LIBNAME" >&5 +echo "${ECHO_T}$ADA_LIBNAME" >&6 + else - { { echo "$as_me:16066: error: No usable Ada compiler found" >&5 + { { echo "$as_me:18363: 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:16071: error: The Ada compiler is needed for this package" >&5 + { { echo "$as_me:18368: 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 @@ -16108,7 +18405,7 @@ elif test "$includedir" != "/usr/include"; then fi ### Build up pieces for makefile rules -echo "$as_me:16111: checking default library suffix" >&5 +echo "$as_me:18408: checking default library suffix" >&5 echo $ECHO_N "checking default library suffix... $ECHO_C" >&6 case $DFT_LWR_MODEL in @@ -16119,10 +18416,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:16122: result: $DFT_ARG_SUFFIX" >&5 +echo "$as_me:18419: result: $DFT_ARG_SUFFIX" >&5 echo "${ECHO_T}$DFT_ARG_SUFFIX" >&6 -echo "$as_me:16125: checking default library-dependency suffix" >&5 +echo "$as_me:18422: checking default library-dependency suffix" >&5 echo $ECHO_N "checking default library-dependency suffix... $ECHO_C" >&6 case X$DFT_LWR_MODEL in @@ -16131,19 +18428,37 @@ echo $ECHO_N "checking default library-dependency suffix... $ECHO_C" >&6 DFT_DEP_SUFFIX=$DFT_LIB_SUFFIX ;; (Xdebug) - DFT_LIB_SUFFIX='_g.a' + case "$cf_cv_system_name" in + (*-msvc*) + DFT_LIB_SUFFIX='_g.lib' + ;; + (*) + DFT_LIB_SUFFIX='_g.a' + ;; + esac DFT_DEP_SUFFIX=$DFT_LIB_SUFFIX ;; (Xprofile) - DFT_LIB_SUFFIX='_p.a' + case "$cf_cv_system_name" in + (*-msvc*) + DFT_LIB_SUFFIX='_p.lib' + ;; + (*) + DFT_LIB_SUFFIX='_p.a' + ;; + esac DFT_DEP_SUFFIX=$DFT_LIB_SUFFIX ;; (Xshared) - case $cf_cv_system_name in + case "$cf_cv_system_name" in (aix[5-7]*) DFT_LIB_SUFFIX='.so' DFT_DEP_SUFFIX=$DFT_LIB_SUFFIX ;; + (*-msvc*) + DFT_LIB_SUFFIX='.dll' + DFT_DEP_SUFFIX='.dll.lib' + ;; (cygwin*|msys*|mingw*) DFT_LIB_SUFFIX='.dll' DFT_DEP_SUFFIX='.dll.a' @@ -16153,7 +18468,7 @@ echo $ECHO_N "checking default library-dependency suffix... $ECHO_C" >&6 DFT_DEP_SUFFIX=$DFT_LIB_SUFFIX ;; (hpux*) - case $target in + case "$target" in (ia64*) DFT_LIB_SUFFIX='.so' DFT_DEP_SUFFIX=$DFT_LIB_SUFFIX @@ -16171,7 +18486,14 @@ echo $ECHO_N "checking default library-dependency suffix... $ECHO_C" >&6 esac ;; (*) - DFT_LIB_SUFFIX='.a' + case "$target" in + (*-msvc*) + DFT_LIB_SUFFIX='.lib' + ;; + (*) + DFT_LIB_SUFFIX='.a' + ;; + esac DFT_DEP_SUFFIX=$DFT_LIB_SUFFIX ;; esac @@ -16180,10 +18502,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:16183: result: $DFT_DEP_SUFFIX" >&5 +echo "$as_me:18505: result: $DFT_DEP_SUFFIX" >&5 echo "${ECHO_T}$DFT_DEP_SUFFIX" >&6 -echo "$as_me:16186: checking default object directory" >&5 +echo "$as_me:18508: checking default object directory" >&5 echo $ECHO_N "checking default object directory... $ECHO_C" >&6 case $DFT_LWR_MODEL in @@ -16192,14 +18514,14 @@ echo $ECHO_N "checking default object directory... $ECHO_C" >&6 (debug) DFT_OBJ_SUBDIR='obj_g' ;; (profile) DFT_OBJ_SUBDIR='obj_p' ;; (shared) - case $cf_cv_system_name in + case "$cf_cv_system_name" in (cygwin|msys) DFT_OBJ_SUBDIR='objects' ;; (*) DFT_OBJ_SUBDIR='obj_s' ;; esac esac -echo "$as_me:16202: result: $DFT_OBJ_SUBDIR" >&5 +echo "$as_me:18524: result: $DFT_OBJ_SUBDIR" >&5 echo "${ECHO_T}$DFT_OBJ_SUBDIR" >&6 ### Set up low-level terminfo dependencies for makefiles. @@ -16215,6 +18537,10 @@ if test "$DFT_LWR_MODEL" = shared ; then esac fi +USE_ARG_SUFFIX=${DFT_ARG_SUFFIX} + +USE_LIB_SUFFIX=${DFT_ARG_SUFFIX} + USE_CFG_SUFFIX=${DFT_ARG_SUFFIX} ### Construct the list of subdirectories for which we'll customize makefiles @@ -16226,106 +18552,6 @@ cat >>confdefs.h <confcache <<\_ACEOF # This file is a shell script that caches the results of configure @@ -16368,7 +18594,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. @@ -16434,25 +18660,29 @@ fi DEFS=-DHAVE_CONFIG_H -: ${CONFIG_STATUS=./config.status} +: "${CONFIG_STATUS=./config.status}" ac_clean_files_save=$ac_clean_files ac_clean_files="$ac_clean_files $CONFIG_STATUS" -{ echo "$as_me:16440: creating $CONFIG_STATUS" >&5 +{ echo "$as_me:18666: creating $CONFIG_STATUS" >&5 echo "$as_me: creating $CONFIG_STATUS" >&6;} -cat >$CONFIG_STATUS <<_ACEOF +cat >"$CONFIG_STATUS" <<_ACEOF #! $SHELL # Generated automatically by configure. # Run this file to recreate the current configuration. # 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 \$@" +CLICOLOR_FORCE= GREP_OPTIONS= +unset CLICOLOR_FORCE GREP_OPTIONS _ACEOF -cat >>$CONFIG_STATUS <<\_ACEOF +cat >>"$CONFIG_STATUS" <<\_ACEOF # Be Bourne compatible if test -n "${ZSH_VERSION+set}" && (emulate sh) >/dev/null 2>&1; then emulate sh @@ -16465,9 +18695,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 @@ -16482,7 +18712,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 @@ -16492,9 +18722,9 @@ as_executable_p="test -f" # Support unset when possible. if (FOO=FOO; unset FOO) >/dev/null 2>&1; then - as_unset=unset + as_unset="unset" else - as_unset=false + as_unset="false" fi # NLS nuisances. @@ -16522,22 +18752,22 @@ _ACEOF # Files that config.status was made for. if test -n "$ac_config_files"; then - echo "config_files=\"$ac_config_files\"" >>$CONFIG_STATUS + echo "config_files=\"$ac_config_files\"" >>"$CONFIG_STATUS" fi if test -n "$ac_config_headers"; then - echo "config_headers=\"$ac_config_headers\"" >>$CONFIG_STATUS + echo "config_headers=\"$ac_config_headers\"" >>"$CONFIG_STATUS" fi if test -n "$ac_config_links"; then - echo "config_links=\"$ac_config_links\"" >>$CONFIG_STATUS + echo "config_links=\"$ac_config_links\"" >>"$CONFIG_STATUS" fi if test -n "$ac_config_commands"; then - echo "config_commands=\"$ac_config_commands\"" >>$CONFIG_STATUS + echo "config_commands=\"$ac_config_commands\"" >>"$CONFIG_STATUS" fi -cat >>$CONFIG_STATUS <<\EOF +cat >>"$CONFIG_STATUS" <<\EOF ac_cs_usage="\ \`$as_me' instantiates files from templates according to the @@ -16566,21 +18796,22 @@ $config_commands Report bugs to ." EOF -cat >>$CONFIG_STATUS <>"$CONFIG_STATUS" <>$CONFIG_STATUS <<\EOF +cat >>"$CONFIG_STATUS" <<\EOF # If no file are specified by the user, then we need to provide default # value. By we need to know if files were specified by the user. ac_need_defaults=: @@ -16603,17 +18834,17 @@ do case $1 in # Handling of the options. EOF -cat >>$CONFIG_STATUS <>"$CONFIG_STATUS" <>$CONFIG_STATUS <<\EOF +cat >>"$CONFIG_STATUS" <<\EOF --version | --vers* | -V ) echo "$ac_cs_version"; exit 0 ;; --he | --h) # Conflict between --help and --header - { { echo "$as_me:16616: error: ambiguous option: $1 + { { echo "$as_me:18847: 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;} @@ -16632,7 +18863,7 @@ Try \`$0 --help' for more information." >&2;} ac_need_defaults=false;; # This is an error. - -*) { { echo "$as_me:16635: error: unrecognized option: $1 + -*) { { echo "$as_me:18866: 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;} @@ -16651,18 +18882,18 @@ cat >&5 << _ACEOF ## Running config.status. ## ## ----------------------- ## -This file was extended by $as_me 2.52.20170501, 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 CONFIG_COMMANDS = $CONFIG_COMMANDS - > $ac_cs_invocation + > "$ac_cs_invocation" on `(hostname || uname -n) 2>/dev/null | sed 1q` _ACEOF EOF -cat >>$CONFIG_STATUS <>"$CONFIG_STATUS" <>$CONFIG_STATUS <<\EOF +cat >>"$CONFIG_STATUS" <<\EOF for ac_config_target in $ac_config_targets do case "$ac_config_target" in # Handling of arguments. "$SUB_MAKEFILES" ) CONFIG_FILES="$CONFIG_FILES $SUB_MAKEFILES" ;; + "src/library.gpr" ) CONFIG_FILES="$CONFIG_FILES src/library.gpr:src/library.gpr.in" ;; "doc/adacurses${DFT_ARG_SUFFIX}-config.1" ) CONFIG_FILES="$CONFIG_FILES doc/adacurses${DFT_ARG_SUFFIX}-config.1:doc/MKada_config.in" ;; "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:16706: error: invalid argument: $ac_config_target" >&5 + *) { { echo "$as_me:18941: error: invalid argument: $ac_config_target" >&5 echo "$as_me: error: invalid argument: $ac_config_target" >&2;} { (exit 1); exit 1; }; };; esac @@ -16713,7 +18948,7 @@ done # then the envvar interface is used. Set only those that are not. # We use the long form for the default assignment because of an extremely # bizarre bug on SunOS 4.1.3. -if $ac_need_defaults; then +if "$ac_need_defaults"; then test "${CONFIG_FILES+set}" = set || CONFIG_FILES=$config_files test "${CONFIG_HEADERS+set}" = set || CONFIG_HEADERS=$config_headers test "${CONFIG_COMMANDS+set}" = set || CONFIG_COMMANDS=$config_commands @@ -16727,14 +18962,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 @@ -16743,7 +18978,7 @@ $debug || EOF -cat >>$CONFIG_STATUS <>"$CONFIG_STATUS" <>$CONFIG_STATUS <\$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 @@ -16767,6 +19002,7 @@ s,@datadir@,$datadir,;t t s,@sysconfdir@,$sysconfdir,;t t s,@sharedstatedir@,$sharedstatedir,;t t s,@localstatedir@,$localstatedir,;t t +s,@runstatedir@,$runstatedir,;t t s,@libdir@,$libdir,;t t s,@includedir@,$includedir,;t t s,@oldincludedir@,$oldincludedir,;t t @@ -16786,6 +19022,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 @@ -16799,6 +19036,15 @@ s,@target@,$target,;t t s,@target_cpu@,$target_cpu,;t t s,@target_vendor@,$target_vendor,;t t s,@target_os@,$target_os,;t t +s,@GREP@,$GREP,;t t +s,@FGREP@,$FGREP,;t t +s,@cf_TEMP_gnat@,$cf_TEMP_gnat,;t t +s,@M4_exists@,$M4_exists,;t t +s,@cf_ada_make@,$cf_ada_make,;t t +s,@cf_ada_config@,$cf_ada_config,;t t +s,@cf_ada_config_Ada@,$cf_ada_config_Ada,;t t +s,@cf_ada_config_C@,$cf_ada_config_C,;t t +s,@cf_cv_path_gnatgcc@,$cf_cv_path_gnatgcc,;t t s,@CC@,$CC,;t t s,@CFLAGS@,$CFLAGS,;t t s,@LDFLAGS@,$LDFLAGS,;t t @@ -16808,8 +19054,8 @@ s,@EXEEXT@,$EXEEXT,;t t s,@OBJEXT@,$OBJEXT,;t t s,@EXTRA_CPPFLAGS@,$EXTRA_CPPFLAGS,;t t s,@CPP@,$CPP,;t t -s,@AWK@,$AWK,;t t s,@EGREP@,$EGREP,;t t +s,@AWK@,$AWK,;t t s,@INSTALL_PROGRAM@,$INSTALL_PROGRAM,;t t s,@INSTALL_SCRIPT@,$INSTALL_SCRIPT,;t t s,@INSTALL_DATA@,$INSTALL_DATA,;t t @@ -16820,6 +19066,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 @@ -16882,16 +19130,11 @@ s,@ECHO_LD@,$ECHO_LD,;t t s,@RULE_CC@,$RULE_CC,;t t s,@SHOW_CC@,$SHOW_CC,;t t s,@ECHO_CC@,$ECHO_CC,;t t -s,@ADAFLAGS@,$ADAFLAGS,;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,@gnatmake_exists@,$gnatmake_exists,;t t -s,@gprconfig_exists@,$gprconfig_exists,;t t -s,@M4_exists@,$M4_exists,;t t -s,@cf_ada_make@,$cf_ada_make,;t t -s,@cf_ada_config@,$cf_ada_config,;t t -s,@cf_ada_config_Ada@,$cf_ada_config_Ada,;t t -s,@cf_ada_config_C@,$cf_ada_config_C,;t t s,@GNATPREP_OPTS@,$GNATPREP_OPTS,;t t s,@cf_compile_generics@,$cf_compile_generics,;t t s,@cf_generic_objects@,$cf_generic_objects,;t t @@ -16899,18 +19142,23 @@ s,@USE_GNAT_SIGINT@,$USE_GNAT_SIGINT,;t t s,@USE_OLD_MAKERULES@,$USE_OLD_MAKERULES,;t t s,@USE_GNAT_PROJECTS@,$USE_GNAT_PROJECTS,;t t s,@USE_GNAT_LIBRARIES@,$USE_GNAT_LIBRARIES,;t t +s,@USE_GNAT_MAKE_GPR@,$USE_GNAT_MAKE_GPR,;t t +s,@USE_GNAT_GPRBUILD@,$USE_GNAT_GPRBUILD,;t t s,@cf_ada_compiler@,$cf_ada_compiler,;t t s,@cf_ada_package@,$cf_ada_package,;t t s,@ADA_INCLUDE@,$ADA_INCLUDE,;t t s,@ADA_OBJECTS@,$ADA_OBJECTS,;t t s,@ADA_SHAREDLIB@,$ADA_SHAREDLIB,;t t s,@MAKE_ADA_SHAREDLIB@,$MAKE_ADA_SHAREDLIB,;t t +s,@ADA_LIBNAME@,$ADA_LIBNAME,;t t s,@TINFO_LDFLAGS2@,$TINFO_LDFLAGS2,;t t s,@TINFO_LIBS@,$TINFO_LIBS,;t t s,@ACPPFLAGS@,$ACPPFLAGS,;t t s,@DFT_ARG_SUFFIX@,$DFT_ARG_SUFFIX,;t t s,@DFT_DEP_SUFFIX@,$DFT_DEP_SUFFIX,;t t s,@DFT_OBJ_SUBDIR@,$DFT_OBJ_SUBDIR,;t t +s,@USE_ARG_SUFFIX@,$USE_ARG_SUFFIX,;t t +s,@USE_LIB_SUFFIX@,$USE_LIB_SUFFIX,;t t s,@USE_CFG_SUFFIX@,$USE_CFG_SUFFIX,;t t s,@TEST_ARG2@,$TEST_ARG2,;t t s,@TEST_LIBS2@,$TEST_LIBS2,;t t @@ -16924,7 +19172,7 @@ CEOF EOF - cat >>$CONFIG_STATUS <<\EOF + cat >>"$CONFIG_STATUS" <<\EOF # Split the substitutions into bite-sized pieces for seds with # small command number limits, like on Digital OSF/1 and HP-UX. ac_max_sed_lines=48 @@ -16933,13 +19181,13 @@ EOF ac_end=$ac_max_sed_lines # Line after last line for current file. ac_more_lines=: 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 + 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 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 @@ -16947,19 +19195,19 @@ 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 - if test $ac_beg -gt 1; then - ac_end=`expr $ac_end - 1` + 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 + if test "$ac_beg" -gt 1; then + ac_end=`expr "$ac_end" - 1` continue fi fi @@ -16967,27 +19215,27 @@ 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_sed_frag=`expr "$ac_sed_frag" + 1` ac_beg=$ac_end - ac_end=`expr $ac_end + $ac_max_sed_lines` + ac_end=`expr "$ac_end" + "$ac_max_sed_lines"` fi done if test -z "$ac_sed_cmds"; then - ac_sed_cmds=cat + ac_sed_cmds="cat" fi fi # test -n "$CONFIG_FILES" EOF -cat >>$CONFIG_STATUS <<\EOF +cat >>"$CONFIG_STATUS" <<\EOF 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 + 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,[^:]*:,,'` @@ -17024,26 +19272,26 @@ 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 ac_dir_suffix= ac_dots= fi - case $srcdir in + case "$srcdir" in .) ac_srcdir=. if test -z "$ac_dots"; then ac_top_srcdir=. else - ac_top_srcdir=`echo $ac_dots | sed 's,/$,,'` + ac_top_srcdir=`echo "$ac_dots" | sed 's,/$,,'` fi ;; [\\/]* | ?:[\\/]* ) - ac_srcdir=$srcdir$ac_dir_suffix; - ac_top_srcdir=$srcdir ;; + ac_srcdir="$srcdir$ac_dir_suffix"; + ac_top_srcdir="$srcdir" ;; *) # Relative path. - ac_srcdir=$ac_dots$srcdir$ac_dir_suffix - ac_top_srcdir=$ac_dots$srcdir ;; + ac_srcdir="$ac_dots$srcdir$ac_dir_suffix" + ac_top_srcdir="$ac_dots$srcdir" ;; esac case $INSTALL in @@ -17052,7 +19300,7 @@ done; } esac if test x"$ac_file" != x-; then - { echo "$as_me:17055: creating $ac_file" >&5 + { echo "$as_me:19303: creating $ac_file" >&5 echo "$as_me: creating $ac_file" >&6;} rm -f "$ac_file" fi @@ -17067,48 +19315,48 @@ 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:17073: error: cannot find input file: $f" >&5 + test -f "$f" || { { echo "$as_me:19321: 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 + echo "$srcdir/$f" else # /dev/null tree - { { echo "$as_me:17086: error: cannot find input file: $f" >&5 + { { echo "$as_me:19334: 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; } EOF -cat >>$CONFIG_STATUS <<\EOF +cat >>"$CONFIG_STATUS" <<\EOF ac_warn_datarootdir=no if test x"$ac_file" != x-; then for ac_item in $ac_file_inputs do - ac_seen=`grep '@\(datadir\|mandir\|infodir\)@' $ac_item` + ac_seen=`grep '@\(datadir\|mandir\|infodir\)@' "$ac_item"` if test -n "$ac_seen"; then - ac_used=`grep '@datarootdir@' $ac_item` + ac_used=`grep '@datarootdir@' "$ac_item"` if test -z "$ac_used"; then - { echo "$as_me:17102: WARNING: datarootdir was used implicitly but not set: + { echo "$as_me:19350: 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;} ac_warn_datarootdir=yes fi fi - ac_seen=`grep '${datarootdir}' $ac_item` + ac_seen=`grep '${datarootdir}' "$ac_item"` if test -n "$ac_seen"; then - { echo "$as_me:17111: WARNING: datarootdir was used explicitly but not set: + { echo "$as_me:19359: 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;} @@ -17122,53 +19370,61 @@ if test "x$ac_warn_datarootdir" = xyes; then fi EOF -cat >>$CONFIG_STATUS <>"$CONFIG_STATUS" <>$CONFIG_STATUS <<\EOF +cat >>"$CONFIG_STATUS" <<\EOF :t /@[a-zA-Z_][a-zA-Z_0-9]*@/!b 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" <>"$CONFIG_STATUS" <<\EOF if test x"$ac_file" != x-; then - cp $tmp/out $ac_file + cp "$tmp/out" "$ac_file" for ac_name in prefix exec_prefix datarootdir do - ac_seen=`fgrep -n '${'$ac_name'[:=].*}' $ac_file` + ac_seen=`$FGREP -n '${'$ac_name'[:=].*}' "$ac_file"` if test -n "$ac_seen"; then - ac_init=`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:17148: WARNING: Variable $ac_name is used but was not set: + ac_seen=`echo "$ac_seen" |sed -e 's,^,'"$ac_file"':,'` + { echo "$as_me:19404: 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 -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:17159: 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:19415: 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 -cat >>$CONFIG_STATUS <<\EOF +cat >>"$CONFIG_STATUS" <<\EOF # # CONFIG_HEADER section. @@ -17195,9 +19451,9 @@ ac_uD=',;t' 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 + 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,[^:]*:,,'` @@ -17205,7 +19461,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:17208: creating $ac_file" >&5 + test x"$ac_file" != x- && { echo "$as_me:19464: creating $ac_file" >&5 echo "$as_me: creating $ac_file" >&6;} # First look for the input files in the build tree, otherwise in the @@ -17213,10 +19469,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:17219: error: cannot find input file: $f" >&5 + test -f "$f" || { { echo "$as_me:19475: error: cannot find input file: $f" >&5 echo "$as_me: error: cannot find input file: $f" >&2;} { (exit 1); exit 1; }; } echo $f;; @@ -17226,17 +19482,17 @@ echo "$as_me: error: cannot find input file: $f" >&2;} echo $f elif test -f "$srcdir/$f"; then # Source tree - echo $srcdir/$f + echo "$srcdir/$f" else # /dev/null tree - { { echo "$as_me:17232: error: cannot find input file: $f" >&5 + { { echo "$as_me:19488: 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 @@ -17249,14 +19505,14 @@ cat confdefs.h | uniq >conftest.vals # the size of here documents, and old seds have small limits too. rm -f conftest.tail -echo ' rm -f conftest.frag' >> $CONFIG_STATUS +echo ' rm -f conftest.frag' >> "$CONFIG_STATUS" while grep . conftest.vals >/dev/null do # Write chunks of a limited-size here document to conftest.frag. - echo ' cat >> conftest.frag <> $CONFIG_STATUS - sed ${ac_max_here_lines}q conftest.vals | sed -e 's/#ifdef.*/#if 0/' >> $CONFIG_STATUS - echo 'CEOF' >> $CONFIG_STATUS - sed 1,${ac_max_here_lines}d conftest.vals > conftest.tail + echo ' cat >> conftest.frag <> "$CONFIG_STATUS" + sed "${ac_max_here_lines}q" conftest.vals | sed -e 's/#ifdef.*/#if 0/' >> "$CONFIG_STATUS" + echo 'CEOF' >> "$CONFIG_STATUS" + sed "1,${ac_max_here_lines}d" conftest.vals > conftest.tail rm -f conftest.vals mv conftest.tail conftest.vals done @@ -17268,26 +19524,26 @@ echo ' cat >> conftest.edit < $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 +' >> "$CONFIG_STATUS" -cat >>$CONFIG_STATUS <<\EOF +cat >>"$CONFIG_STATUS" <<\EOF # Let's still pretend it is `configure' which instantiates (i.e., don't # 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:17290: $ac_file is unchanged" >&5 + if cmp -s "$ac_file" "$tmp/config.h" 2>/dev/null; then + { echo "$as_me:19546: $ac_file is unchanged" >&5 echo "$as_me: $ac_file is unchanged" >&6;} else ac_dir=`$as_expr X"$ac_file" : 'X\(.*[^/]\)//*[^/][^/]*/*$' \| \ @@ -17319,16 +19575,16 @@ for as_mkdir_dir in `IFS='/\\'; set X $as_dummy; shift; echo "$@"`; do done; } fi - rm -f $ac_file - mv $tmp/config.h $ac_file + rm -f "$ac_file" + 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 -cat >>$CONFIG_STATUS <<\EOF +cat >>"$CONFIG_STATUS" <<\EOF # # CONFIG_COMMANDS section. # @@ -17336,8 +19592,9 @@ for ac_file in : $CONFIG_COMMANDS; do test "x$ac_file" = x: && continue ac_dest=`echo "$ac_file" | sed 's,:.*,,'` ac_source=`echo "$ac_file" | sed 's,[^:]*:,,'` - case $ac_dest in + case "$ac_dest" in default ) +$AWK -v PACKAGE=$PACKAGE -f $srcdir/mk-pkg.awk > Makefile if test -z "$USE_OLD_MAKERULES" ; then $AWK -f $srcdir/mk-1st.awk <$srcdir/src/modules >>src/Makefile fi @@ -17346,11 +19603,11 @@ fi done EOF -cat >>$CONFIG_STATUS <<\EOF +cat >>"$CONFIG_STATUS" <<\EOF { (exit 0); exit 0; } EOF -chmod +x $CONFIG_STATUS +chmod +x "$CONFIG_STATUS" ac_clean_files=$ac_clean_files_save # configure is writing to config.log, and then calls config.status. @@ -17364,10 +19621,10 @@ ac_clean_files=$ac_clean_files_save if test "$no_create" != yes; then ac_cs_success=: exec 5>/dev/null - $SHELL $CONFIG_STATUS || ac_cs_success=false + $SHELL "$CONFIG_STATUS" || ac_cs_success=false exec 5>>config.log # Use ||, not &&, to avoid exiting from the if with $? = 1, which # would make configure fail if this is the last instruction. - $ac_cs_success || { (exit 1); exit 1; } + "$ac_cs_success" || { (exit 1); exit 1; } fi ${MAKE:-make} preinstall