X-Git-Url: http://ncurses.scripts.mit.edu/?a=blobdiff_plain;f=test%2Fconfigure;h=6ada74949062f5d63f08f48fba98750642522ab6;hb=2632b47fdcf4dcd101962c92acafaac69630388f;hp=98f3ed1c08f3e9a540c8bfd681fd61f8d1e63925;hpb=31dcb6fc49a6814a67cdc21db26390752e743d7f;p=ncurses.git diff --git a/test/configure b/test/configure index 98f3ed1c..6ada7494 100755 --- a/test/configure +++ b/test/configure @@ -1,7 +1,8 @@ #! /bin/sh # Guess values for system-dependent variables and create Makefiles. -# Generated by Autoconf 2.52.20200802. +# Generated by Autoconf 2.52.20221202. # +# Copyright 2003-2021,2022 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 @@ -32,9 +33,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 @@ -49,7 +50,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 @@ -59,9 +60,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. @@ -96,13 +97,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="ncurses.c" @@ -167,7 +169,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 ;; @@ -208,7 +210,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-*) @@ -217,8 +219,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 @@ -408,8 +410,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 @@ -421,7 +423,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) @@ -455,21 +457,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 @@ -477,8 +479,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; }; };; @@ -489,8 +491,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; }; };; @@ -527,13 +529,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; }; } @@ -667,6 +669,7 @@ Optional Packages: General Options: --disable-stripping do not strip (debug info) installed executables + --enable-stdnoreturn enable C11 _Noreturn feature for diagnostics --enable-string-hacks work around bogus compiler/loader warnings --with-pkg-config{=path} enable/disable use of pkg-config --disable-echo do not display "compiling" commands @@ -719,42 +722,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-2021,2022 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 @@ -768,7 +772,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.20200802. Invocation command line was +generated by GNU Autoconf 2.52.20221202. Invocation command line was $ $0 $@ @@ -815,7 +819,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 \ @@ -872,7 +876,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 @@ -892,7 +896,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:895: loading site script $ac_site_file" >&5 + { echo "$as_me:899: 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" @@ -903,7 +907,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:906: loading cache $cache_file" >&5 + { echo "$as_me:910: loading cache $cache_file" >&5 echo "$as_me: loading cache $cache_file" >&6;} case $cache_file in [\\/]* | ?:[\\/]* ) . $cache_file;; @@ -911,7 +915,7 @@ echo "$as_me: loading cache $cache_file" >&6;} esac fi else - { echo "$as_me:914: creating cache $cache_file" >&5 + { echo "$as_me:918: creating cache $cache_file" >&5 echo "$as_me: creating cache $cache_file" >&6;} >$cache_file fi @@ -925,23 +929,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:930: error: \`$ac_var' was set to \`$ac_old_val' in the previous run" >&5 + { echo "$as_me:934: 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:934: error: \`$ac_var' was not set in the previous run" >&5 + { echo "$as_me:938: 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:940: error: \`$ac_var' has changed since the previous run:" >&5 + { echo "$as_me:944: 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:942: former value: $ac_old_val" >&5 + { echo "$as_me:946: former value: $ac_old_val" >&5 echo "$as_me: former value: $ac_old_val" >&2;} - { echo "$as_me:944: current value: $ac_new_val" >&5 + { echo "$as_me:948: current value: $ac_new_val" >&5 echo "$as_me: current value: $ac_new_val" >&2;} ac_cache_corrupted=: fi;; @@ -949,7 +953,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'" @@ -959,35 +963,43 @@ echo "$as_me: current value: $ac_new_val" >&2;} esac fi done -if $ac_cache_corrupted; then - { echo "$as_me:963: error: changes in the environment can compromise the build" >&5 +if "$ac_cache_corrupted"; then + { echo "$as_me:967: 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:965: error: run \`make distclean' and/or \`rm $cache_file' and start over" >&5 + { { echo "$as_me:969: 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:986: PATH=\".;.\"; conftest.sh") >&5 +if { (echo "$as_me:998: PATH=\".;.\"; conftest.sh") >&5 (PATH=".;."; conftest.sh) 2>&5 ac_status=$? - echo "$as_me:989: \$? = $ac_status" >&5 - (exit $ac_status); }; then + echo "$as_me:1001: \$? = $ac_status" >&5 + (exit "$ac_status"); }; then ac_path_separator=';' else ac_path_separator=: @@ -1003,22 +1015,22 @@ test -f config.sub || ( test -f ../config.sub && cp ../config.sub ./ ) 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:1021: error: cannot find install-sh or install.sh in $srcdir $srcdir/.. $srcdir/../.." >&5 + { { echo "$as_me:1033: 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 @@ -1028,11 +1040,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:1031: error: cannot run $ac_config_sub" >&5 + { { echo "$as_me:1043: error: cannot run $ac_config_sub" >&5 echo "$as_me: error: cannot run $ac_config_sub" >&2;} { (exit 1); exit 1; }; } -echo "$as_me:1035: checking build system type" >&5 +echo "$as_me:1047: 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 @@ -1041,24 +1053,24 @@ else test -z "$ac_cv_build_alias" && ac_cv_build_alias=`$ac_config_guess` test -z "$ac_cv_build_alias" && - { { echo "$as_me:1044: error: cannot guess build type; you must specify one" >&5 + { { echo "$as_me:1056: 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:1048: error: $ac_config_sub $ac_cv_build_alias failed." >&5 +ac_cv_build=`$ac_config_sub "$ac_cv_build_alias"` || + { { echo "$as_me:1060: 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:1053: result: $ac_cv_build" >&5 +echo "$as_me:1065: 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/'` -if test -f $srcdir/config.guess || test -f $ac_aux_dir/config.guess ; then - echo "$as_me:1061: checking host system type" >&5 +if test -f "$srcdir/config.guess" || test -f "$ac_aux_dir/config.guess" ; then + echo "$as_me:1073: 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 @@ -1066,18 +1078,18 @@ 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:1070: error: $ac_config_sub $ac_cv_host_alias failed" >&5 +ac_cv_host=`$ac_config_sub "$ac_cv_host_alias"` || + { { echo "$as_me:1082: 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:1075: result: $ac_cv_host" >&5 +echo "$as_me:1087: 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/'` system_name="$host_os" else @@ -1098,13 +1110,13 @@ else fi test -z "$system_name" && system_name="$cf_cv_system_name" -test -n "$cf_cv_system_name" && echo "$as_me:1101: result: Configuring for $cf_cv_system_name" >&5 +test -n "$cf_cv_system_name" && echo "$as_me:1113: 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:1105: result: Cached system name ($system_name) does not agree with actual ($cf_cv_system_name)" >&5 + echo "$as_me:1117: 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:1107: error: \"Please remove config.cache and try again.\"" >&5 + { { echo "$as_me:1119: 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 @@ -1122,7 +1134,7 @@ _ACEOF program_transform_name=`echo $program_transform_name | sed -f conftest.sed` rm conftest.sed -echo "$as_me:1125: checking whether ${MAKE-make} sets \${MAKE}" >&5 +echo "$as_me:1137: 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 @@ -1142,25 +1154,25 @@ fi rm -f conftest.make fi if eval "test \"`echo '$ac_cv_prog_make_'${ac_make}_set`\" = yes"; then - echo "$as_me:1145: result: yes" >&5 + echo "$as_me:1157: result: yes" >&5 echo "${ECHO_T}yes" >&6 SET_MAKE= else - echo "$as_me:1149: result: no" >&5 + echo "$as_me:1161: result: no" >&5 echo "${ECHO_T}no" >&6 SET_MAKE="MAKE=${MAKE-make}" 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 -n "$ac_tool_prefix"; then # Extract the first word of "${ac_tool_prefix}gcc", so it can be a program name with args. set dummy ${ac_tool_prefix}gcc; ac_word=$2 -echo "$as_me:1163: checking for $ac_word" >&5 +echo "$as_me:1175: 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 @@ -1175,7 +1187,7 @@ for ac_dir in $ac_dummy; do test -z "$ac_dir" && ac_dir=. $as_executable_p "$ac_dir/$ac_word" || continue ac_cv_prog_CC="${ac_tool_prefix}gcc" -echo "$as_me:1178: found $ac_dir/$ac_word" >&5 +echo "$as_me:1190: found $ac_dir/$ac_word" >&5 break done @@ -1183,10 +1195,10 @@ fi fi CC=$ac_cv_prog_CC if test -n "$CC"; then - echo "$as_me:1186: result: $CC" >&5 + echo "$as_me:1198: result: $CC" >&5 echo "${ECHO_T}$CC" >&6 else - echo "$as_me:1189: result: no" >&5 + echo "$as_me:1201: result: no" >&5 echo "${ECHO_T}no" >&6 fi @@ -1195,7 +1207,7 @@ if test -z "$ac_cv_prog_CC"; then ac_ct_CC=$CC # Extract the first word of "gcc", so it can be a program name with args. set dummy gcc; ac_word=$2 -echo "$as_me:1198: checking for $ac_word" >&5 +echo "$as_me:1210: 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 @@ -1210,7 +1222,7 @@ for ac_dir in $ac_dummy; do test -z "$ac_dir" && ac_dir=. $as_executable_p "$ac_dir/$ac_word" || continue ac_cv_prog_ac_ct_CC="gcc" -echo "$as_me:1213: found $ac_dir/$ac_word" >&5 +echo "$as_me:1225: found $ac_dir/$ac_word" >&5 break done @@ -1218,10 +1230,10 @@ fi fi ac_ct_CC=$ac_cv_prog_ac_ct_CC if test -n "$ac_ct_CC"; then - echo "$as_me:1221: result: $ac_ct_CC" >&5 + echo "$as_me:1233: result: $ac_ct_CC" >&5 echo "${ECHO_T}$ac_ct_CC" >&6 else - echo "$as_me:1224: result: no" >&5 + echo "$as_me:1236: result: no" >&5 echo "${ECHO_T}no" >&6 fi @@ -1234,7 +1246,7 @@ if test -z "$CC"; then if test -n "$ac_tool_prefix"; then # Extract the first word of "${ac_tool_prefix}cc", so it can be a program name with args. set dummy ${ac_tool_prefix}cc; ac_word=$2 -echo "$as_me:1237: checking for $ac_word" >&5 +echo "$as_me:1249: 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 @@ -1249,7 +1261,7 @@ for ac_dir in $ac_dummy; do test -z "$ac_dir" && ac_dir=. $as_executable_p "$ac_dir/$ac_word" || continue ac_cv_prog_CC="${ac_tool_prefix}cc" -echo "$as_me:1252: found $ac_dir/$ac_word" >&5 +echo "$as_me:1264: found $ac_dir/$ac_word" >&5 break done @@ -1257,10 +1269,10 @@ fi fi CC=$ac_cv_prog_CC if test -n "$CC"; then - echo "$as_me:1260: result: $CC" >&5 + echo "$as_me:1272: result: $CC" >&5 echo "${ECHO_T}$CC" >&6 else - echo "$as_me:1263: result: no" >&5 + echo "$as_me:1275: result: no" >&5 echo "${ECHO_T}no" >&6 fi @@ -1269,7 +1281,7 @@ if test -z "$ac_cv_prog_CC"; then ac_ct_CC=$CC # Extract the first word of "cc", so it can be a program name with args. set dummy cc; ac_word=$2 -echo "$as_me:1272: checking for $ac_word" >&5 +echo "$as_me:1284: 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 @@ -1284,7 +1296,7 @@ for ac_dir in $ac_dummy; do test -z "$ac_dir" && ac_dir=. $as_executable_p "$ac_dir/$ac_word" || continue ac_cv_prog_ac_ct_CC="cc" -echo "$as_me:1287: found $ac_dir/$ac_word" >&5 +echo "$as_me:1299: found $ac_dir/$ac_word" >&5 break done @@ -1292,10 +1304,10 @@ fi fi ac_ct_CC=$ac_cv_prog_ac_ct_CC if test -n "$ac_ct_CC"; then - echo "$as_me:1295: result: $ac_ct_CC" >&5 + echo "$as_me:1307: result: $ac_ct_CC" >&5 echo "${ECHO_T}$ac_ct_CC" >&6 else - echo "$as_me:1298: result: no" >&5 + echo "$as_me:1310: result: no" >&5 echo "${ECHO_T}no" >&6 fi @@ -1308,7 +1320,7 @@ fi if test -z "$CC"; then # Extract the first word of "cc", so it can be a program name with args. set dummy cc; ac_word=$2 -echo "$as_me:1311: checking for $ac_word" >&5 +echo "$as_me:1323: 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 @@ -1328,11 +1340,11 @@ if test "$ac_dir/$ac_word" = "/usr/ucb/cc"; then continue fi ac_cv_prog_CC="cc" -echo "$as_me:1331: found $ac_dir/$ac_word" >&5 +echo "$as_me:1343: found $ac_dir/$ac_word" >&5 break done -if test $ac_prog_rejected = yes; then +if test "$ac_prog_rejected" = yes; then # We found a bogon in the path, so make sure we never use it. set dummy $ac_cv_prog_CC shift @@ -1350,10 +1362,10 @@ fi fi CC=$ac_cv_prog_CC if test -n "$CC"; then - echo "$as_me:1353: result: $CC" >&5 + echo "$as_me:1365: result: $CC" >&5 echo "${ECHO_T}$CC" >&6 else - echo "$as_me:1356: result: no" >&5 + echo "$as_me:1368: result: no" >&5 echo "${ECHO_T}no" >&6 fi @@ -1364,7 +1376,7 @@ if test -z "$CC"; then do # Extract the first word of "$ac_tool_prefix$ac_prog", so it can be a program name with args. set dummy $ac_tool_prefix$ac_prog; ac_word=$2 -echo "$as_me:1367: checking for $ac_word" >&5 +echo "$as_me:1379: 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 @@ -1379,7 +1391,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:1382: found $ac_dir/$ac_word" >&5 +echo "$as_me:1394: found $ac_dir/$ac_word" >&5 break done @@ -1387,10 +1399,10 @@ fi fi CC=$ac_cv_prog_CC if test -n "$CC"; then - echo "$as_me:1390: result: $CC" >&5 + echo "$as_me:1402: result: $CC" >&5 echo "${ECHO_T}$CC" >&6 else - echo "$as_me:1393: result: no" >&5 + echo "$as_me:1405: result: no" >&5 echo "${ECHO_T}no" >&6 fi @@ -1403,7 +1415,7 @@ if test -z "$CC"; then do # Extract the first word of "$ac_prog", so it can be a program name with args. set dummy $ac_prog; ac_word=$2 -echo "$as_me:1406: checking for $ac_word" >&5 +echo "$as_me:1418: 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 @@ -1418,7 +1430,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:1421: found $ac_dir/$ac_word" >&5 +echo "$as_me:1433: found $ac_dir/$ac_word" >&5 break done @@ -1426,10 +1438,10 @@ fi fi ac_ct_CC=$ac_cv_prog_ac_ct_CC if test -n "$ac_ct_CC"; then - echo "$as_me:1429: result: $ac_ct_CC" >&5 + echo "$as_me:1441: result: $ac_ct_CC" >&5 echo "${ECHO_T}$ac_ct_CC" >&6 else - echo "$as_me:1432: result: no" >&5 + echo "$as_me:1444: result: no" >&5 echo "${ECHO_T}no" >&6 fi @@ -1441,32 +1453,32 @@ fi fi -test -z "$CC" && { { echo "$as_me:1444: error: no acceptable cc found in \$PATH" >&5 +test -z "$CC" && { { echo "$as_me:1456: 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:1449:" \ +echo "$as_me:1461:" \ "checking for C compiler version" >&5 -ac_compiler=`set X $ac_compile; echo $2` -{ (eval echo "$as_me:1452: \"$ac_compiler --version &5\"") >&5 +ac_compiler=`set X $ac_compile; echo "$2"` +{ (eval echo "$as_me:1464: \"$ac_compiler --version &5\"") >&5 (eval $ac_compiler --version &5) 2>&5 ac_status=$? - echo "$as_me:1455: \$? = $ac_status" >&5 - (exit $ac_status); } -{ (eval echo "$as_me:1457: \"$ac_compiler -v &5\"") >&5 + echo "$as_me:1467: \$? = $ac_status" >&5 + (exit "$ac_status"); } +{ (eval echo "$as_me:1469: \"$ac_compiler -v &5\"") >&5 (eval $ac_compiler -v &5) 2>&5 ac_status=$? - echo "$as_me:1460: \$? = $ac_status" >&5 - (exit $ac_status); } -{ (eval echo "$as_me:1462: \"$ac_compiler -V &5\"") >&5 + echo "$as_me:1472: \$? = $ac_status" >&5 + (exit "$ac_status"); } +{ (eval echo "$as_me:1474: \"$ac_compiler -V &5\"") >&5 (eval $ac_compiler -V &5) 2>&5 ac_status=$? - echo "$as_me:1465: \$? = $ac_status" >&5 - (exit $ac_status); } + echo "$as_me:1477: \$? = $ac_status" >&5 + (exit "$ac_status"); } -cat >conftest.$ac_ext <<_ACEOF -#line 1469 "configure" +cat >"conftest.$ac_ext" <<_ACEOF +#line 1481 "configure" #include "confdefs.h" int @@ -1482,14 +1494,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:1485: checking for C compiler default output" >&5 +echo "$as_me:1497: 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:1488: \"$ac_link_default\"") >&5 +ac_link_default=`echo "$ac_link" | sed 's/ -o *"conftest[^"]*"//'` +if { (eval echo "$as_me:1500: \"$ac_link_default\"") >&5 (eval $ac_link_default) 2>&5 ac_status=$? - echo "$as_me:1491: \$? = $ac_status" >&5 - (exit $ac_status); }; then + echo "$as_me:1503: \$? = $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. @@ -1510,35 +1522,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:1514: error: C compiler cannot create executables" >&5 +cat "conftest.$ac_ext" >&5 +{ { echo "$as_me:1526: 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:1520: result: $ac_file" >&5 +echo "$as_me:1532: 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:1525: checking whether the C compiler works" >&5 +echo "$as_me:1537: 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:1531: \"$ac_try\"") >&5 + { (eval echo "$as_me:1543: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? - echo "$as_me:1534: \$? = $ac_status" >&5 - (exit $ac_status); }; }; then + echo "$as_me:1546: \$? = $ac_status" >&5 + (exit "$ac_status"); }; }; then cross_compiling=no else if test "$cross_compiling" = maybe; then cross_compiling=yes else - { { echo "$as_me:1541: error: cannot run C compiled programs. + { { echo "$as_me:1553: 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;} @@ -1546,25 +1558,25 @@ If you meant to cross compile, use \`--host'." >&2;} fi fi fi -echo "$as_me:1549: result: yes" >&5 +echo "$as_me:1561: 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:1556: checking whether we are cross compiling" >&5 +echo "$as_me:1568: checking whether we are cross compiling" >&5 echo $ECHO_N "checking whether we are cross compiling... $ECHO_C" >&6 -echo "$as_me:1558: result: $cross_compiling" >&5 +echo "$as_me:1570: result: $cross_compiling" >&5 echo "${ECHO_T}$cross_compiling" >&6 -echo "$as_me:1561: checking for executable suffix" >&5 +echo "$as_me:1573: checking for executable suffix" >&5 echo $ECHO_N "checking for executable suffix... $ECHO_C" >&6 -if { (eval echo "$as_me:1563: \"$ac_link\"") >&5 +if { (eval echo "$as_me:1575: \"$ac_link\"") >&5 (eval $ac_link) 2>&5 ac_status=$? - echo "$as_me:1566: \$? = $ac_status" >&5 - (exit $ac_status); }; then + echo "$as_me:1578: \$? = $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 @@ -1579,25 +1591,25 @@ for ac_file in `(ls conftest.exe; ls conftest; ls conftest.*) 2>/dev/null`; do esac done else - { { echo "$as_me:1582: error: cannot compute EXEEXT: cannot compile and link" >&5 + { { echo "$as_me:1594: 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:1588: result: $ac_cv_exeext" >&5 +rm -f "conftest$ac_cv_exeext" +echo "$as_me:1600: 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:1594: checking for object suffix" >&5 +echo "$as_me:1606: 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 1600 "configure" + cat >"conftest.$ac_ext" <<_ACEOF +#line 1612 "configure" #include "confdefs.h" int @@ -1609,11 +1621,11 @@ main (void) } _ACEOF rm -f conftest.o conftest.obj -if { (eval echo "$as_me:1612: \"$ac_compile\"") >&5 +if { (eval echo "$as_me:1624: \"$ac_compile\"") >&5 (eval $ac_compile) 2>&5 ac_status=$? - echo "$as_me:1615: \$? = $ac_status" >&5 - (exit $ac_status); }; then + echo "$as_me:1627: \$? = $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 ) ;; @@ -1623,25 +1635,25 @@ if { (eval echo "$as_me:1612: \"$ac_compile\"") >&5 done else echo "$as_me: failed program was:" >&5 -cat conftest.$ac_ext >&5 -{ { echo "$as_me:1627: error: cannot compute OBJEXT: cannot compile" >&5 +cat "conftest.$ac_ext" >&5 +{ { echo "$as_me:1639: 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:1634: result: $ac_cv_objext" >&5 +echo "$as_me:1646: result: $ac_cv_objext" >&5 echo "${ECHO_T}$ac_cv_objext" >&6 OBJEXT=$ac_cv_objext ac_objext=$OBJEXT -echo "$as_me:1638: checking whether we are using the GNU C compiler" >&5 +echo "$as_me:1650: 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 1644 "configure" + cat >"conftest.$ac_ext" <<_ACEOF +#line 1656 "configure" #include "confdefs.h" int @@ -1655,41 +1667,41 @@ main (void) return 0; } _ACEOF -rm -f conftest.$ac_objext -if { (eval echo "$as_me:1659: \"$ac_compile\"") >&5 +rm -f "conftest.$ac_objext" +if { (eval echo "$as_me:1671: \"$ac_compile\"") >&5 (eval $ac_compile) 2>&5 ac_status=$? - echo "$as_me:1662: \$? = $ac_status" >&5 - (exit $ac_status); } && - { ac_try='test -s conftest.$ac_objext' - { (eval echo "$as_me:1665: \"$ac_try\"") >&5 + echo "$as_me:1674: \$? = $ac_status" >&5 + (exit "$ac_status"); } && + { ac_try='test -s "conftest.$ac_objext"' + { (eval echo "$as_me:1677: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? - echo "$as_me:1668: \$? = $ac_status" >&5 - (exit $ac_status); }; }; then + echo "$as_me:1680: \$? = $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:1680: result: $ac_cv_c_compiler_gnu" >&5 +echo "$as_me:1692: 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:1686: checking whether $CC accepts -g" >&5 +echo "$as_me:1698: 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 1692 "configure" + cat >"conftest.$ac_ext" <<_ACEOF +#line 1704 "configure" #include "confdefs.h" int @@ -1700,27 +1712,27 @@ main (void) return 0; } _ACEOF -rm -f conftest.$ac_objext -if { (eval echo "$as_me:1704: \"$ac_compile\"") >&5 +rm -f "conftest.$ac_objext" +if { (eval echo "$as_me:1716: \"$ac_compile\"") >&5 (eval $ac_compile) 2>&5 ac_status=$? - echo "$as_me:1707: \$? = $ac_status" >&5 - (exit $ac_status); } && - { ac_try='test -s conftest.$ac_objext' - { (eval echo "$as_me:1710: \"$ac_try\"") >&5 + echo "$as_me:1719: \$? = $ac_status" >&5 + (exit "$ac_status"); } && + { ac_try='test -s "conftest.$ac_objext"' + { (eval echo "$as_me:1722: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? - echo "$as_me:1713: \$? = $ac_status" >&5 - (exit $ac_status); }; }; then + echo "$as_me:1725: \$? = $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:1723: result: $ac_cv_prog_cc_g" >&5 +echo "$as_me:1735: 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 @@ -1741,23 +1753,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:1750: \"$ac_compile\"") >&5 +rm -f "conftest.$ac_objext" +if { (eval echo "$as_me:1762: \"$ac_compile\"") >&5 (eval $ac_compile) 2>&5 ac_status=$? - echo "$as_me:1753: \$? = $ac_status" >&5 - (exit $ac_status); } && - { ac_try='test -s conftest.$ac_objext' - { (eval echo "$as_me:1756: \"$ac_try\"") >&5 + echo "$as_me:1765: \$? = $ac_status" >&5 + (exit "$ac_status"); } && + { ac_try='test -s "conftest.$ac_objext"' + { (eval echo "$as_me:1768: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? - echo "$as_me:1759: \$? = $ac_status" >&5 - (exit $ac_status); }; }; then + echo "$as_me:1771: \$? = $ac_status" >&5 + (exit "$ac_status"); }; }; then for ac_declaration in \ ''\ '#include ' \ @@ -1767,8 +1779,8 @@ if { (eval echo "$as_me:1750: \"$ac_compile\"") >&5 'extern "C" void exit (int);' \ 'void exit (int);' do - cat >conftest.$ac_ext <<_ACEOF -#line 1771 "configure" + cat >"conftest.$ac_ext" <<_ACEOF +#line 1783 "configure" #include "confdefs.h" #include $ac_declaration @@ -1780,27 +1792,27 @@ exit (42); return 0; } _ACEOF -rm -f conftest.$ac_objext -if { (eval echo "$as_me:1784: \"$ac_compile\"") >&5 +rm -f "conftest.$ac_objext" +if { (eval echo "$as_me:1796: \"$ac_compile\"") >&5 (eval $ac_compile) 2>&5 ac_status=$? - echo "$as_me:1787: \$? = $ac_status" >&5 - (exit $ac_status); } && - { ac_try='test -s conftest.$ac_objext' - { (eval echo "$as_me:1790: \"$ac_try\"") >&5 + 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 (eval $ac_try) 2>&5 ac_status=$? - echo "$as_me:1793: \$? = $ac_status" >&5 - (exit $ac_status); }; }; then + echo "$as_me:1805: \$? = $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 1803 "configure" +rm -f "conftest.$ac_objext" "conftest.$ac_ext" + cat >"conftest.$ac_ext" <<_ACEOF +#line 1815 "configure" #include "confdefs.h" $ac_declaration int @@ -1811,65 +1823,65 @@ exit (42); return 0; } _ACEOF -rm -f conftest.$ac_objext -if { (eval echo "$as_me:1815: \"$ac_compile\"") >&5 +rm -f "conftest.$ac_objext" +if { (eval echo "$as_me:1827: \"$ac_compile\"") >&5 (eval $ac_compile) 2>&5 ac_status=$? - echo "$as_me:1818: \$? = $ac_status" >&5 - (exit $ac_status); } && - { ac_try='test -s conftest.$ac_objext' - { (eval echo "$as_me:1821: \"$ac_try\"") >&5 + echo "$as_me:1830: \$? = $ac_status" >&5 + (exit "$ac_status"); } && + { ac_try='test -s "conftest.$ac_objext"' + { (eval echo "$as_me:1833: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? - echo "$as_me:1824: \$? = $ac_status" >&5 - (exit $ac_status); }; }; then + echo "$as_me:1836: \$? = $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:1854: checking version of $CC" >&5 + echo "$as_me:1866: checking version of $CC" >&5 echo $ECHO_N "checking version of $CC... $ECHO_C" >&6 GCC_VERSION="`${CC} --version 2>/dev/null | sed -e '2,$d' -e 's/^.*(GCC[^)]*) //' -e 's/^.*(Debian[^)]*) //' -e 's/^[^0-9.]*//' -e 's/[^0-9.].*//'`" test -z "$GCC_VERSION" && GCC_VERSION=unknown - echo "$as_me:1858: result: $GCC_VERSION" >&5 + echo "$as_me:1870: result: $GCC_VERSION" >&5 echo "${ECHO_T}$GCC_VERSION" >&6 fi INTEL_COMPILER=no if test "$GCC" = yes ; then - case $host_os in + case "$host_os" in (linux*|gnu*) - echo "$as_me:1867: checking if this is really Intel C compiler" >&5 + echo "$as_me:1879: 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 1872 "configure" + cat >"conftest.$ac_ext" <<_ACEOF +#line 1884 "configure" #include "confdefs.h" int @@ -1885,28 +1897,28 @@ make an error return 0; } _ACEOF -rm -f conftest.$ac_objext -if { (eval echo "$as_me:1889: \"$ac_compile\"") >&5 +rm -f "conftest.$ac_objext" +if { (eval echo "$as_me:1901: \"$ac_compile\"") >&5 (eval $ac_compile) 2>&5 ac_status=$? - echo "$as_me:1892: \$? = $ac_status" >&5 - (exit $ac_status); } && - { ac_try='test -s conftest.$ac_objext' - { (eval echo "$as_me:1895: \"$ac_try\"") >&5 + echo "$as_me:1904: \$? = $ac_status" >&5 + (exit "$ac_status"); } && + { ac_try='test -s "conftest.$ac_objext"' + { (eval echo "$as_me:1907: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? - echo "$as_me:1898: \$? = $ac_status" >&5 - (exit $ac_status); }; }; then + echo "$as_me:1910: \$? = $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 +cat "conftest.$ac_ext" >&5 fi -rm -f conftest.$ac_objext conftest.$ac_ext +rm -f "conftest.$ac_objext" "conftest.$ac_ext" CFLAGS="$cf_save_CFLAGS" - echo "$as_me:1909: result: $INTEL_COMPILER" >&5 + echo "$as_me:1921: result: $INTEL_COMPILER" >&5 echo "${ECHO_T}$INTEL_COMPILER" >&6 ;; esac @@ -1915,11 +1927,11 @@ fi CLANG_COMPILER=no if test "$GCC" = yes ; then - echo "$as_me:1918: checking if this is really Clang C compiler" >&5 + echo "$as_me:1930: 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 1922 "configure" + cat >"conftest.$ac_ext" <<_ACEOF +#line 1934 "configure" #include "confdefs.h" int @@ -1935,27 +1947,27 @@ make an error return 0; } _ACEOF -rm -f conftest.$ac_objext -if { (eval echo "$as_me:1939: \"$ac_compile\"") >&5 +rm -f "conftest.$ac_objext" +if { (eval echo "$as_me:1951: \"$ac_compile\"") >&5 (eval $ac_compile) 2>&5 ac_status=$? - echo "$as_me:1942: \$? = $ac_status" >&5 - (exit $ac_status); } && - { ac_try='test -s conftest.$ac_objext' - { (eval echo "$as_me:1945: \"$ac_try\"") >&5 + echo "$as_me:1954: \$? = $ac_status" >&5 + (exit "$ac_status"); } && + { ac_try='test -s "conftest.$ac_objext"' + { (eval echo "$as_me:1957: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? - echo "$as_me:1948: \$? = $ac_status" >&5 - (exit $ac_status); }; }; then + echo "$as_me:1960: \$? = $ac_status" >&5 + (exit "$ac_status"); }; }; then CLANG_COMPILER=yes 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" CFLAGS="$cf_save_CFLAGS" - echo "$as_me:1958: result: $CLANG_COMPILER" >&5 + echo "$as_me:1970: result: $CLANG_COMPILER" >&5 echo "${ECHO_T}$CLANG_COMPILER" >&6 fi @@ -1964,30 +1976,30 @@ CLANG_VERSION=none if test "x$CLANG_COMPILER" = "xyes" ; then case "$CC" in (c[1-9][0-9]|*/c[1-9][0-9]) - { echo "$as_me:1967: WARNING: replacing broken compiler alias $CC" >&5 + { echo "$as_me:1979: 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:1974: checking version of $CC" >&5 + echo "$as_me:1986: 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:1978: result: $CLANG_VERSION" >&5 + echo "$as_me:1990: 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:1985: checking if option $cf_clang_opt works" >&5 + echo "$as_me:1997: 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 1990 "configure" + cat >"conftest.$ac_ext" <<_ACEOF +#line 2002 "configure" #include "confdefs.h" #include @@ -1995,39 +2007,39 @@ int main (void) { - printf("hello!\n"); + printf("hello!\\n"); ; return 0; } _ACEOF -rm -f conftest.$ac_objext conftest$ac_exeext -if { (eval echo "$as_me:2004: \"$ac_link\"") >&5 +rm -f "conftest.$ac_objext" "conftest$ac_exeext" +if { (eval echo "$as_me:2016: \"$ac_link\"") >&5 (eval $ac_link) 2>&5 ac_status=$? - echo "$as_me:2007: \$? = $ac_status" >&5 - (exit $ac_status); } && - { ac_try='test -s conftest$ac_exeext' - { (eval echo "$as_me:2010: \"$ac_try\"") >&5 + echo "$as_me:2019: \$? = $ac_status" >&5 + (exit "$ac_status"); } && + { ac_try='test -s "conftest$ac_exeext"' + { (eval echo "$as_me:2022: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? - echo "$as_me:2013: \$? = $ac_status" >&5 - (exit $ac_status); }; }; then + echo "$as_me:2025: \$? = $ac_status" >&5 + (exit "$ac_status"); }; }; then cf_clang_optok=yes else echo "$as_me: failed program was:" >&5 -cat conftest.$ac_ext >&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:2024: result: $cf_clang_optok" >&5 +rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext" + echo "$as_me:2036: result: $cf_clang_optok" >&5 echo "${ECHO_T}$cf_clang_optok" >&6 CFLAGS="$cf_save_CFLAGS" - if test $cf_clang_optok = yes; then + if test "$cf_clang_optok" = yes; then test -n "$verbose" && echo " adding option $cf_clang_opt" 1>&6 -echo "${as_me:-configure}:2030: testing adding option $cf_clang_opt ..." 1>&5 +echo "${as_me:-configure}:2042: testing adding option $cf_clang_opt ..." 1>&5 test -n "$CFLAGS" && CFLAGS="$CFLAGS " CFLAGS="${CFLAGS}$cf_clang_opt" @@ -2036,15 +2048,15 @@ echo "${as_me:-configure}:2030: testing adding option $cf_clang_opt ..." 1>&5 done fi -echo "$as_me:2039: checking for $CC option to accept ANSI C" >&5 +echo "$as_me:2051: 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 2047 "configure" +cat >"conftest.$ac_ext" <<_ACEOF +#line 2059 "configure" #include "confdefs.h" #include #include @@ -2092,51 +2104,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:2096: \"$ac_compile\"") >&5 + rm -f "conftest.$ac_objext" +if { (eval echo "$as_me:2108: \"$ac_compile\"") >&5 (eval $ac_compile) 2>&5 ac_status=$? - 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 + echo "$as_me:2111: \$? = $ac_status" >&5 + (exit "$ac_status"); } && + { ac_try='test -s "conftest.$ac_objext"' + { (eval echo "$as_me:2114: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? - echo "$as_me:2105: \$? = $ac_status" >&5 - (exit $ac_status); }; }; then + echo "$as_me:2117: \$? = $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:2122: result: none needed" >&5 + echo "$as_me:2134: result: none needed" >&5 echo "${ECHO_T}none needed" >&6 ;; *) - echo "$as_me:2125: result: $ac_cv_prog_cc_stdc" >&5 + echo "$as_me:2137: 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:2133: checking \$CFLAGS variable" >&5 +echo "$as_me:2145: checking \$CFLAGS variable" >&5 echo $ECHO_N "checking \$CFLAGS variable... $ECHO_C" >&6 case "x$CFLAGS" in (*-[IUD]*) - echo "$as_me:2137: result: broken" >&5 + echo "$as_me:2149: result: broken" >&5 echo "${ECHO_T}broken" >&6 - { echo "$as_me:2139: WARNING: your environment uses the CFLAGS variable to hold CPPFLAGS options" >&5 + { echo "$as_me:2151: 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= @@ -2150,19 +2162,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" @@ -2181,7 +2193,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/=.*//'` @@ -2211,7 +2223,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}" \ @@ -2244,18 +2256,18 @@ fi done ;; (*) - echo "$as_me:2247: result: ok" >&5 + echo "$as_me:2259: result: ok" >&5 echo "${ECHO_T}ok" >&6 ;; esac -echo "$as_me:2252: checking \$CC variable" >&5 +echo "$as_me:2264: checking \$CC variable" >&5 echo $ECHO_N "checking \$CC variable... $ECHO_C" >&6 case "$CC" in (*[\ \ ]-*) - echo "$as_me:2256: result: broken" >&5 + echo "$as_me:2268: result: broken" >&5 echo "${ECHO_T}broken" >&6 - { echo "$as_me:2258: WARNING: your environment uses the CC variable to hold CFLAGS/CPPFLAGS options" >&5 + { echo "$as_me:2270: 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/[ ]*[ ]-[^ ].*//'` @@ -2273,19 +2285,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" @@ -2304,7 +2316,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/=.*//'` @@ -2334,7 +2346,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}" \ @@ -2372,32 +2384,32 @@ fi done test -n "$verbose" && echo " resulting CC: '$CC'" 1>&6 -echo "${as_me:-configure}:2375: testing resulting CC: '$CC' ..." 1>&5 +echo "${as_me:-configure}:2387: testing resulting CC: '$CC' ..." 1>&5 test -n "$verbose" && echo " resulting CFLAGS: '$CFLAGS'" 1>&6 -echo "${as_me:-configure}:2379: testing resulting CFLAGS: '$CFLAGS' ..." 1>&5 +echo "${as_me:-configure}:2391: testing resulting CFLAGS: '$CFLAGS' ..." 1>&5 test -n "$verbose" && echo " resulting CPPFLAGS: '$CPPFLAGS'" 1>&6 -echo "${as_me:-configure}:2383: testing resulting CPPFLAGS: '$CPPFLAGS' ..." 1>&5 +echo "${as_me:-configure}:2395: testing resulting CPPFLAGS: '$CPPFLAGS' ..." 1>&5 ;; (*) - echo "$as_me:2387: result: ok" >&5 + echo "$as_me:2399: result: ok" >&5 echo "${ECHO_T}ok" >&6 ;; esac -echo "$as_me:2392: checking for inline" >&5 +echo "$as_me:2404: checking for inline" >&5 echo $ECHO_N "checking for inline... $ECHO_C" >&6 if test "${ac_cv_c_inline+set}" = set; then echo $ECHO_N "(cached) $ECHO_C" >&6 else ac_cv_c_inline=no for ac_kw in inline __inline__ __inline; do - cat >conftest.$ac_ext <<_ACEOF -#line 2400 "configure" + cat >"conftest.$ac_ext" <<_ACEOF +#line 2412 "configure" #include "confdefs.h" #ifndef __cplusplus static $ac_kw int static_foo () {return 0; } @@ -2405,28 +2417,28 @@ $ac_kw int foo () {return 0; } #endif _ACEOF -rm -f conftest.$ac_objext -if { (eval echo "$as_me:2409: \"$ac_compile\"") >&5 +rm -f "conftest.$ac_objext" +if { (eval echo "$as_me:2421: \"$ac_compile\"") >&5 (eval $ac_compile) 2>&5 ac_status=$? - echo "$as_me:2412: \$? = $ac_status" >&5 - (exit $ac_status); } && - { ac_try='test -s conftest.$ac_objext' - { (eval echo "$as_me:2415: \"$ac_try\"") >&5 + echo "$as_me:2424: \$? = $ac_status" >&5 + (exit "$ac_status"); } && + { ac_try='test -s "conftest.$ac_objext"' + { (eval echo "$as_me:2427: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? - echo "$as_me:2418: \$? = $ac_status" >&5 - (exit $ac_status); }; }; then + echo "$as_me:2430: \$? = $ac_status" >&5 + (exit "$ac_status"); }; }; then ac_cv_c_inline=$ac_kw; 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:2429: result: $ac_cv_c_inline" >&5 +echo "$as_me:2441: result: $ac_cv_c_inline" >&5 echo "${ECHO_T}$ac_cv_c_inline" >&6 case $ac_cv_c_inline in inline | yes) ;; @@ -2441,13 +2453,111 @@ EOF ;; esac +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:2460: 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:2475: found $ac_dir/$ac_word" >&5 +break +done + +fi +fi +GREP=$ac_cv_prog_GREP +if test -n "$GREP"; then + echo "$as_me:2483: result: $GREP" >&5 +echo "${ECHO_T}$GREP" >&6 +else + echo "$as_me:2486: result: no" >&5 +echo "${ECHO_T}no" >&6 +fi + + test -n "$GREP" && break +done +test -n "$GREP" || GREP=": " + +echo "$as_me:2494: 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:2506: 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:2523: found $ac_dir/$ac_word" >&5 + break +fi +done + + ;; +esac +fi +EGREP=$ac_cv_path_EGREP + +if test -n "$EGREP"; then + echo "$as_me:2534: result: $EGREP" >&5 +echo "${ECHO_T}$EGREP" >&6 +else + echo "$as_me:2537: 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:2545: error: cannot find workable egrep" >&5 +echo "$as_me: error: cannot find workable egrep" >&2;} + { (exit 1); exit 1; }; } + fi +fi +echo "$as_me:2550: 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:2450: checking how to run the C preprocessor" >&5 +ac_main_return="return" +echo "$as_me:2560: 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 @@ -2467,20 +2577,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 2471 "configure" + cat >"conftest.$ac_ext" <<_ACEOF +#line 2581 "configure" #include "confdefs.h" #include Syntax error _ACEOF -if { (eval echo "$as_me:2476: \"$ac_cpp conftest.$ac_ext\"") >&5 - (eval $ac_cpp conftest.$ac_ext) 2>conftest.er1 +if { (eval echo "$as_me:2586: \"$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:2482: \$? = $ac_status" >&5 - (exit $ac_status); } >/dev/null; then + echo "$as_me:2592: \$? = $ac_status" >&5 + (exit "$ac_status"); } >/dev/null; then if test -s conftest.err; then ac_cpp_err=$ac_c_preproc_warn_flag else @@ -2493,27 +2603,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 2505 "configure" + cat >"conftest.$ac_ext" <<_ACEOF +#line 2615 "configure" #include "confdefs.h" #include _ACEOF -if { (eval echo "$as_me:2509: \"$ac_cpp conftest.$ac_ext\"") >&5 - (eval $ac_cpp conftest.$ac_ext) 2>conftest.er1 +if { (eval echo "$as_me:2619: \"$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:2515: \$? = $ac_status" >&5 - (exit $ac_status); } >/dev/null; then + echo "$as_me:2625: \$? = $ac_status" >&5 + (exit "$ac_status"); } >/dev/null; then if test -s conftest.err; then ac_cpp_err=$ac_c_preproc_warn_flag else @@ -2527,16 +2637,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 @@ -2549,7 +2659,7 @@ fi else ac_cv_prog_CPP=$CPP fi -echo "$as_me:2552: result: $CPP" >&5 +echo "$as_me:2662: result: $CPP" >&5 echo "${ECHO_T}$CPP" >&6 ac_preproc_ok=false for ac_c_preproc_warn_flag in '' yes @@ -2558,20 +2668,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 2562 "configure" + cat >"conftest.$ac_ext" <<_ACEOF +#line 2672 "configure" #include "confdefs.h" #include Syntax error _ACEOF -if { (eval echo "$as_me:2567: \"$ac_cpp conftest.$ac_ext\"") >&5 - (eval $ac_cpp conftest.$ac_ext) 2>conftest.er1 +if { (eval echo "$as_me:2677: \"$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:2573: \$? = $ac_status" >&5 - (exit $ac_status); } >/dev/null; then + echo "$as_me:2683: \$? = $ac_status" >&5 + (exit "$ac_status"); } >/dev/null; then if test -s conftest.err; then ac_cpp_err=$ac_c_preproc_warn_flag else @@ -2584,27 +2694,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 2596 "configure" + cat >"conftest.$ac_ext" <<_ACEOF +#line 2706 "configure" #include "confdefs.h" #include _ACEOF -if { (eval echo "$as_me:2600: \"$ac_cpp conftest.$ac_ext\"") >&5 - (eval $ac_cpp conftest.$ac_ext) 2>conftest.er1 +if { (eval echo "$as_me:2710: \"$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:2606: \$? = $ac_status" >&5 - (exit $ac_status); } >/dev/null; then + echo "$as_me:2716: \$? = $ac_status" >&5 + (exit "$ac_status"); } >/dev/null; then if test -s conftest.err; then ac_cpp_err=$ac_c_preproc_warn_flag else @@ -2618,36 +2728,36 @@ 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:2634: error: C preprocessor \"$CPP\" fails sanity check" >&5 + { { echo "$as_me:2744: 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" 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:2650: checking for $ac_word" >&5 +echo "$as_me:2760: 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 @@ -2662,7 +2772,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:2665: found $ac_dir/$ac_word" >&5 +echo "$as_me:2775: found $ac_dir/$ac_word" >&5 break done @@ -2670,10 +2780,10 @@ fi fi AWK=$ac_cv_prog_AWK if test -n "$AWK"; then - echo "$as_me:2673: result: $AWK" >&5 + echo "$as_me:2783: result: $AWK" >&5 echo "${ECHO_T}$AWK" >&6 else - echo "$as_me:2676: result: no" >&5 + echo "$as_me:2786: result: no" >&5 echo "${ECHO_T}no" >&6 fi @@ -2692,7 +2802,7 @@ done # 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:2695: checking for a BSD compatible install" >&5 +echo "$as_me:2805: 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 @@ -2741,7 +2851,7 @@ fi INSTALL=$ac_install_sh fi fi -echo "$as_me:2744: result: $INSTALL" >&5 +echo "$as_me:2854: result: $INSTALL" >&5 echo "${ECHO_T}$INSTALL" >&6 # Use test -z because SunOS4 sh mishandles braces in ${var-val}. @@ -2756,13 +2866,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:2765: checking if you want to install stripped executables" >&5 +echo "$as_me:2875: 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. @@ -2770,33 +2880,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:2782: result: $with_stripping" >&5 -echo "${ECHO_T}$with_stripping" >&6 +echo "$as_me:2892: 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:2793: checking if install accepts -p option" >&5 +: "${INSTALL:=install}" +echo "$as_me:2903: 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 @@ -2818,13 +2928,13 @@ else else cf_cv_install_p=no fi - rm -rf conftest* + rm -rf ./conftest* fi -echo "$as_me:2824: result: $cf_cv_install_p" >&5 +echo "$as_me:2934: result: $cf_cv_install_p" >&5 echo "${ECHO_T}$cf_cv_install_p" >&6 -echo "$as_me:2827: checking if install needs to be told about ownership" >&5 +echo "$as_me:2937: 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) @@ -2835,11 +2945,11 @@ case `$ac_config_guess` in ;; esac -echo "$as_me:2838: result: $with_install_o" >&5 +echo "$as_me:2948: 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 @@ -2848,7 +2958,7 @@ for ac_prog in lint cppcheck splint 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:2851: checking for $ac_word" >&5 +echo "$as_me:2961: checking for $ac_word" >&5 echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6 if test "${ac_cv_prog_LINT+set}" = set; then echo $ECHO_N "(cached) $ECHO_C" >&6 @@ -2863,7 +2973,7 @@ for ac_dir in $ac_dummy; do test -z "$ac_dir" && ac_dir=. $as_executable_p "$ac_dir/$ac_word" || continue ac_cv_prog_LINT="$ac_prog" -echo "$as_me:2866: found $ac_dir/$ac_word" >&5 +echo "$as_me:2976: found $ac_dir/$ac_word" >&5 break done @@ -2871,10 +2981,10 @@ fi fi LINT=$ac_cv_prog_LINT if test -n "$LINT"; then - echo "$as_me:2874: result: $LINT" >&5 + echo "$as_me:2984: result: $LINT" >&5 echo "${ECHO_T}$LINT" >&6 else - echo "$as_me:2877: result: no" >&5 + echo "$as_me:2987: result: no" >&5 echo "${ECHO_T}no" >&6 fi @@ -2887,14 +2997,76 @@ case "x$LINT" in ;; esac -echo "$as_me:2890: checking if filesystem supports mixed-case filenames" >&5 +echo "$as_me:3000: 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:3055: 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= + +echo "$as_me:3062: 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 + case "$target_alias" in (*-os2-emx*|*-msdosdjgpp*|*-cygwin*|*-msys*|*-mingw*|*-uwin*|darwin*) cf_cv_mixedcase=no ;; @@ -2914,7 +3086,7 @@ else fi fi -echo "$as_me:2917: result: $cf_cv_mixedcase" >&5 +echo "$as_me:3089: result: $cf_cv_mixedcase" >&5 echo "${ECHO_T}$cf_cv_mixedcase" >&6 test "$cf_cv_mixedcase" = yes && cat >>confdefs.h <<\EOF @@ -2925,7 +3097,7 @@ for ac_prog in exctags ctags do # Extract the first word of "$ac_prog", so it can be a program name with args. set dummy $ac_prog; ac_word=$2 -echo "$as_me:2928: checking for $ac_word" >&5 +echo "$as_me:3100: 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 @@ -2940,7 +3112,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:2943: found $ac_dir/$ac_word" >&5 +echo "$as_me:3115: found $ac_dir/$ac_word" >&5 break done @@ -2948,10 +3120,10 @@ fi fi CTAGS=$ac_cv_prog_CTAGS if test -n "$CTAGS"; then - echo "$as_me:2951: result: $CTAGS" >&5 + echo "$as_me:3123: result: $CTAGS" >&5 echo "${ECHO_T}$CTAGS" >&6 else - echo "$as_me:2954: result: no" >&5 + echo "$as_me:3126: result: no" >&5 echo "${ECHO_T}no" >&6 fi @@ -2962,7 +3134,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:2965: checking for $ac_word" >&5 +echo "$as_me:3137: 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 @@ -2977,7 +3149,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:2980: found $ac_dir/$ac_word" >&5 +echo "$as_me:3152: found $ac_dir/$ac_word" >&5 break done @@ -2985,10 +3157,10 @@ fi fi ETAGS=$ac_cv_prog_ETAGS if test -n "$ETAGS"; then - echo "$as_me:2988: result: $ETAGS" >&5 + echo "$as_me:3160: result: $ETAGS" >&5 echo "${ECHO_T}$ETAGS" >&6 else - echo "$as_me:2991: result: no" >&5 + echo "$as_me:3163: result: no" >&5 echo "${ECHO_T}no" >&6 fi @@ -2997,7 +3169,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:3000: checking for $ac_word" >&5 +echo "$as_me:3172: 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 @@ -3012,7 +3184,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:3015: found $ac_dir/$ac_word" >&5 +echo "$as_me:3187: found $ac_dir/$ac_word" >&5 break done @@ -3021,17 +3193,17 @@ fi fi MAKE_LOWER_TAGS=$ac_cv_prog_MAKE_LOWER_TAGS if test -n "$MAKE_LOWER_TAGS"; then - echo "$as_me:3024: result: $MAKE_LOWER_TAGS" >&5 + echo "$as_me:3196: result: $MAKE_LOWER_TAGS" >&5 echo "${ECHO_T}$MAKE_LOWER_TAGS" >&6 else - echo "$as_me:3027: result: no" >&5 + echo "$as_me:3199: 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:3034: checking for $ac_word" >&5 +echo "$as_me:3206: 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 @@ -3046,7 +3218,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:3049: found $ac_dir/$ac_word" >&5 +echo "$as_me:3221: found $ac_dir/$ac_word" >&5 break done @@ -3055,10 +3227,10 @@ fi fi MAKE_UPPER_TAGS=$ac_cv_prog_MAKE_UPPER_TAGS if test -n "$MAKE_UPPER_TAGS"; then - echo "$as_me:3058: result: $MAKE_UPPER_TAGS" >&5 + echo "$as_me:3230: result: $MAKE_UPPER_TAGS" >&5 echo "${ECHO_T}$MAKE_UPPER_TAGS" >&6 else - echo "$as_me:3061: result: no" >&5 + echo "$as_me:3233: result: no" >&5 echo "${ECHO_T}no" >&6 fi @@ -3078,53 +3250,117 @@ else MAKE_LOWER_TAGS="#" fi -echo "$as_me:3081: checking if -lm needed for math functions" >&5 +echo "$as_me:3253: checking if -lm needed for math functions" >&5 echo $ECHO_N "checking if -lm needed for math functions... $ECHO_C" >&6 if test "${cf_cv_need_libm+set}" = set; then echo $ECHO_N "(cached) $ECHO_C" >&6 else - cat >conftest.$ac_ext <<_ACEOF -#line 3088 "configure" + cat >"conftest.$ac_ext" <<_ACEOF +#line 3260 "configure" #include "confdefs.h" - #include - #include - #include + #include + #include + #include int main (void) { -double x = rand(); printf("result = %g\n", pow(sin(x),x)) +double x = rand(); printf("result = %g\\n", pow(sin(x),x)) ; return 0; } _ACEOF -rm -f conftest.$ac_objext conftest$ac_exeext -if { (eval echo "$as_me:3104: \"$ac_link\"") >&5 +rm -f "conftest.$ac_objext" "conftest$ac_exeext" +if { (eval echo "$as_me:3276: \"$ac_link\"") >&5 (eval $ac_link) 2>&5 ac_status=$? - echo "$as_me:3107: \$? = $ac_status" >&5 - (exit $ac_status); } && - { ac_try='test -s conftest$ac_exeext' - { (eval echo "$as_me:3110: \"$ac_try\"") >&5 + echo "$as_me:3279: \$? = $ac_status" >&5 + (exit "$ac_status"); } && + { ac_try='test -s "conftest$ac_exeext"' + { (eval echo "$as_me:3282: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? - echo "$as_me:3113: \$? = $ac_status" >&5 - (exit $ac_status); }; }; then + echo "$as_me:3285: \$? = $ac_status" >&5 + (exit "$ac_status"); }; }; then cf_cv_need_libm=no else echo "$as_me: failed program was:" >&5 -cat conftest.$ac_ext >&5 +cat "conftest.$ac_ext" >&5 cf_cv_need_libm=yes 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:3123: result: $cf_cv_need_libm" >&5 +echo "$as_me:3295: result: $cf_cv_need_libm" >&5 echo "${ECHO_T}$cf_cv_need_libm" >&6 + if test "$cf_cv_need_libm" = yes then -MATH_LIB=-lm + + cf_save_LIBS="$LIBS" + LIBS="$LIBS -lm" + echo "$as_me:3303: checking if -lm is available for math functions" >&5 +echo $ECHO_N "checking if -lm is available for math functions... $ECHO_C" >&6 +if test "${cf_cv_have_libm+set}" = set; then + echo $ECHO_N "(cached) $ECHO_C" >&6 +else + + cat >"conftest.$ac_ext" <<_ACEOF +#line 3310 "configure" +#include "confdefs.h" + + #include + #include + #include + +int +main (void) +{ +double x = rand(); printf("result = %g\\n", pow(sin(x),x)) + ; + return 0; +} +_ACEOF +rm -f "conftest.$ac_objext" "conftest$ac_exeext" +if { (eval echo "$as_me:3326: \"$ac_link\"") >&5 + (eval $ac_link) 2>&5 + ac_status=$? + echo "$as_me:3329: \$? = $ac_status" >&5 + (exit "$ac_status"); } && + { ac_try='test -s "conftest$ac_exeext"' + { (eval echo "$as_me:3332: \"$ac_try\"") >&5 + (eval $ac_try) 2>&5 + ac_status=$? + echo "$as_me:3335: \$? = $ac_status" >&5 + (exit "$ac_status"); }; }; then + cf_cv_have_libm=yes +else + echo "$as_me: failed program was:" >&5 +cat "conftest.$ac_ext" >&5 +cf_cv_have_libm=no +fi +rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext" +fi +echo "$as_me:3345: result: $cf_cv_have_libm" >&5 +echo "${ECHO_T}$cf_cv_have_libm" >&6 + LIBS="$cf_save_LIBS" + + if test "$cf_cv_have_libm" = yes + then + MATH_LIB=-lm + fi +else + cf_cv_have_libm=yes +fi + +if test "$cf_cv_have_libm" = yes +then + +cat >>confdefs.h <<\EOF +#define HAVE_MATH_FUNCS 1 +EOF + fi top_builddir=`pwd` @@ -3161,7 +3397,152 @@ includesubdir="" cf_cv_screen=curses cf_cv_libtype= -if ( test "$GCC" = yes || test "$GXX" = yes ) +echo "$as_me:3400: 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:3412: 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:3429: found $ac_dir/$ac_word" >&5 + break +fi +done + + ;; +esac +fi +FGREP=$ac_cv_path_FGREP + +if test -n "$FGREP"; then + echo "$as_me:3440: result: $FGREP" >&5 +echo "${ECHO_T}$FGREP" >&6 +else + echo "$as_me:3443: 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:3451: error: cannot find workable fgrep" >&5 +echo "$as_me: error: cannot find workable fgrep" >&2;} + { (exit 1); exit 1; }; } + fi +fi +echo "$as_me:3456: result: $ac_cv_path_FGREP" >&5 +echo "${ECHO_T}$ac_cv_path_FGREP" >&6 + FGREP="$ac_cv_path_FGREP" + +echo "$as_me:3460: checking if you want to use C11 _Noreturn feature" >&5 +echo $ECHO_N "checking if you want to use C11 _Noreturn feature... $ECHO_C" >&6 + +# Check whether --enable-stdnoreturn or --disable-stdnoreturn was given. +if test "${enable_stdnoreturn+set}" = set; then + enableval="$enable_stdnoreturn" + test "$enableval" != yes && enableval=no + if test "$enableval" != "no" ; then + enable_stdnoreturn=yes + else + enable_stdnoreturn=no + fi +else + enableval=no + enable_stdnoreturn=no + +fi; +echo "$as_me:3477: result: $enable_stdnoreturn" >&5 +echo "${ECHO_T}$enable_stdnoreturn" >&6 + +if test $enable_stdnoreturn = yes; then +echo "$as_me:3481: 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 3487 "configure" +#include "confdefs.h" + +#include +#include +#include +static _Noreturn void giveup(void) { exit(0); } + +int +main (void) +{ +if (feof(stdin)) giveup() + ; + return 0; +} +_ACEOF +rm -f "conftest.$ac_objext" +if { (eval echo "$as_me:3504: \"$ac_compile\"") >&5 + (eval $ac_compile) 2>&5 + ac_status=$? + echo "$as_me:3507: \$? = $ac_status" >&5 + (exit "$ac_status"); } && + { ac_try='test -s "conftest.$ac_objext"' + { (eval echo "$as_me:3510: \"$ac_try\"") >&5 + (eval $ac_try) 2>&5 + ac_status=$? + echo "$as_me:3513: \$? = $ac_status" >&5 + (exit "$ac_status"); }; }; then + cf_cv_c11_noreturn=yes +else + echo "$as_me: failed program was:" >&5 +cat "conftest.$ac_ext" >&5 +cf_cv_c11_noreturn=no +fi +rm -f "conftest.$ac_objext" "conftest.$ac_ext" + +fi +echo "$as_me:3524: result: $cf_cv_c11_noreturn" >&5 +echo "${ECHO_T}$cf_cv_c11_noreturn" >&6 +else + cf_cv_c11_noreturn=no, +fi + +if test "$cf_cv_c11_noreturn" = yes; then + +cat >>confdefs.h <<\EOF +#define HAVE_STDNORETURN_H 1 +EOF + +cat >>confdefs.h < conftest.i < conftest.i <&5 + { echo "$as_me:3563: 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" @@ -3197,8 +3579,8 @@ 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:3616: \"$ac_compile\"") >&5 (eval $ac_compile) 2>&5 ac_status=$? - echo "$as_me:3237: \$? = $ac_status" >&5 - (exit $ac_status); }; then - test -n "$verbose" && echo "$as_me:3239: result: ... $cf_attribute" >&5 + echo "$as_me:3619: \$? = $ac_status" >&5 + (exit "$ac_status"); }; then + test -n "$verbose" && echo "$as_me:3621: 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 -echo "$as_me:3298: checking if you want to work around bogus compiler/loader warnings" >&5 +echo "$as_me:3680: checking if you want to work around bogus compiler/loader warnings" >&5 echo $ECHO_N "checking if you want to work around bogus compiler/loader warnings... $ECHO_C" >&6 # Check whether --enable-string-hacks or --disable-string-hacks was given. if test "${enable_string_hacks+set}" = set; then enableval="$enable_string_hacks" - with_string_hacks=$enableval + enable_string_hacks=$enableval else - with_string_hacks=no + enable_string_hacks=no fi; -echo "$as_me:3308: result: $with_string_hacks" >&5 -echo "${ECHO_T}$with_string_hacks" >&6 +echo "$as_me:3690: result: $enable_string_hacks" >&5 +echo "${ECHO_T}$enable_string_hacks" >&6 -if test "x$with_string_hacks" = "xyes"; then +if test "x$enable_string_hacks" = "xyes"; then cat >>confdefs.h <<\EOF #define USE_STRING_HACKS 1 EOF - { echo "$as_me:3317: WARNING: enabling string-hacks to work around bogus compiler/loader warnings" >&5 + { echo "$as_me:3699: WARNING: enabling string-hacks to work around bogus compiler/loader warnings" >&5 echo "$as_me: WARNING: enabling string-hacks to work around bogus compiler/loader warnings" >&2;} - echo "$as_me:3319: checking for strlcat" >&5 + echo "$as_me:3701: checking for strlcat" >&5 echo $ECHO_N "checking for strlcat... $ECHO_C" >&6 if test "${ac_cv_func_strlcat+set}" = set; then echo $ECHO_N "(cached) $ECHO_C" >&6 else - cat >conftest.$ac_ext <<_ACEOF -#line 3325 "configure" + cat >"conftest.$ac_ext" <<_ACEOF +#line 3707 "configure" #include "confdefs.h" #define strlcat autoconf_temporary #include /* least-intrusive standard header which defines gcc2 __stub macros */ @@ -3352,29 +3734,29 @@ main (void) return 0; } _ACEOF -rm -f conftest.$ac_objext conftest$ac_exeext -if { (eval echo "$as_me:3356: \"$ac_link\"") >&5 +rm -f "conftest.$ac_objext" "conftest$ac_exeext" +if { (eval echo "$as_me:3738: \"$ac_link\"") >&5 (eval $ac_link) 2>&5 ac_status=$? - echo "$as_me:3359: \$? = $ac_status" >&5 - (exit $ac_status); } && - { ac_try='test -s conftest$ac_exeext' - { (eval echo "$as_me:3362: \"$ac_try\"") >&5 + echo "$as_me:3741: \$? = $ac_status" >&5 + (exit "$ac_status"); } && + { ac_try='test -s "conftest$ac_exeext"' + { (eval echo "$as_me:3744: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? - echo "$as_me:3365: \$? = $ac_status" >&5 - (exit $ac_status); }; }; then + echo "$as_me:3747: \$? = $ac_status" >&5 + (exit "$ac_status"); }; }; then ac_cv_func_strlcat=yes else echo "$as_me: failed program was:" >&5 -cat conftest.$ac_ext >&5 +cat "conftest.$ac_ext" >&5 ac_cv_func_strlcat=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:3375: result: $ac_cv_func_strlcat" >&5 +echo "$as_me:3757: result: $ac_cv_func_strlcat" >&5 echo "${ECHO_T}$ac_cv_func_strlcat" >&6 -if test $ac_cv_func_strlcat = yes; then +if test "$ac_cv_func_strlcat" = yes; then cat >>confdefs.h <<\EOF #define HAVE_STRLCAT 1 @@ -3382,15 +3764,15 @@ EOF else - echo "$as_me:3385: checking for strlcat in -lbsd" >&5 + echo "$as_me:3767: checking for strlcat in -lbsd" >&5 echo $ECHO_N "checking for strlcat in -lbsd... $ECHO_C" >&6 if test "${ac_cv_lib_bsd_strlcat+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 3393 "configure" +cat >"conftest.$ac_ext" <<_ACEOF +#line 3775 "configure" #include "confdefs.h" /* Override any gcc2 internal prototype to avoid an error. */ @@ -3408,30 +3790,30 @@ strlcat (); return 0; } _ACEOF -rm -f conftest.$ac_objext conftest$ac_exeext -if { (eval echo "$as_me:3412: \"$ac_link\"") >&5 +rm -f "conftest.$ac_objext" "conftest$ac_exeext" +if { (eval echo "$as_me:3794: \"$ac_link\"") >&5 (eval $ac_link) 2>&5 ac_status=$? - echo "$as_me:3415: \$? = $ac_status" >&5 - (exit $ac_status); } && - { ac_try='test -s conftest$ac_exeext' - { (eval echo "$as_me:3418: \"$ac_try\"") >&5 + echo "$as_me:3797: \$? = $ac_status" >&5 + (exit "$ac_status"); } && + { ac_try='test -s "conftest$ac_exeext"' + { (eval echo "$as_me:3800: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? - echo "$as_me:3421: \$? = $ac_status" >&5 - (exit $ac_status); }; }; then + echo "$as_me:3803: \$? = $ac_status" >&5 + (exit "$ac_status"); }; }; then ac_cv_lib_bsd_strlcat=yes else echo "$as_me: failed program was:" >&5 -cat conftest.$ac_ext >&5 +cat "conftest.$ac_ext" >&5 ac_cv_lib_bsd_strlcat=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:3432: result: $ac_cv_lib_bsd_strlcat" >&5 +echo "$as_me:3814: result: $ac_cv_lib_bsd_strlcat" >&5 echo "${ECHO_T}$ac_cv_lib_bsd_strlcat" >&6 -if test $ac_cv_lib_bsd_strlcat = yes; then +if test "$ac_cv_lib_bsd_strlcat" = yes; then cf_add_libs="$LIBS" # reverse order @@ -3452,24 +3834,24 @@ LIBS="$cf_add_libs" for ac_header in bsd/string.h do as_ac_Header=`echo "ac_cv_header_$ac_header" | $as_tr_sh` -echo "$as_me:3455: checking for $ac_header" >&5 +echo "$as_me:3837: 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 3461 "configure" + cat >"conftest.$ac_ext" <<_ACEOF +#line 3843 "configure" #include "confdefs.h" #include <$ac_header> _ACEOF -if { (eval echo "$as_me:3465: \"$ac_cpp conftest.$ac_ext\"") >&5 - (eval $ac_cpp conftest.$ac_ext) 2>conftest.er1 +if { (eval echo "$as_me:3847: \"$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:3471: \$? = $ac_status" >&5 - (exit $ac_status); } >/dev/null; then + echo "$as_me:3853: \$? = $ac_status" >&5 + (exit "$ac_status"); } >/dev/null; then if test -s conftest.err; then ac_cpp_err=$ac_c_preproc_warn_flag else @@ -3482,14 +3864,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:3490: 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:3872: 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:3893: checking for $ac_func" >&5 echo $ECHO_N "checking for $ac_func... $ECHO_C" >&6 if eval "test \"\${$as_ac_var+set}\" = set"; then echo $ECHO_N "(cached) $ECHO_C" >&6 else - cat >conftest.$ac_ext <<_ACEOF -#line 3517 "configure" + cat >"conftest.$ac_ext" <<_ACEOF +#line 3899 "configure" #include "confdefs.h" #define $ac_func autoconf_temporary #include /* least-intrusive standard header which defines gcc2 __stub macros */ @@ -3544,29 +3926,29 @@ main (void) return 0; } _ACEOF -rm -f conftest.$ac_objext conftest$ac_exeext -if { (eval echo "$as_me:3548: \"$ac_link\"") >&5 +rm -f "conftest.$ac_objext" "conftest$ac_exeext" +if { (eval echo "$as_me:3930: \"$ac_link\"") >&5 (eval $ac_link) 2>&5 ac_status=$? - echo "$as_me:3551: \$? = $ac_status" >&5 - (exit $ac_status); } && - { ac_try='test -s conftest$ac_exeext' - { (eval echo "$as_me:3554: \"$ac_try\"") >&5 + echo "$as_me:3933: \$? = $ac_status" >&5 + (exit "$ac_status"); } && + { ac_try='test -s "conftest$ac_exeext"' + { (eval echo "$as_me:3936: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? - echo "$as_me:3557: \$? = $ac_status" >&5 - (exit $ac_status); }; }; then + echo "$as_me:3939: \$? = $ac_status" >&5 + (exit "$ac_status"); }; }; then eval "$as_ac_var=yes" else echo "$as_me: failed program was:" >&5 -cat conftest.$ac_ext >&5 +cat "conftest.$ac_ext" >&5 eval "$as_ac_var=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:3567: result: `eval echo '${'$as_ac_var'}'`" >&5 -echo "${ECHO_T}`eval echo '${'$as_ac_var'}'`" >&6 -if test `eval echo '${'$as_ac_var'}'` = yes; then +echo "$as_me:3949: result: `eval echo '${'"$as_ac_var"'}'`" >&5 +echo "${ECHO_T}`eval echo '${'"$as_ac_var"'}'`" >&6 +if test "`eval echo '${'"$as_ac_var"'}'`" = yes; then cat >>confdefs.h <&5 +echo "$as_me:3961: checking if the POSIX test-macros are already defined" >&5 echo $ECHO_N "checking if the POSIX test-macros are already defined... $ECHO_C" >&6 if test "${cf_cv_posix_visible+set}" = set; then echo $ECHO_N "(cached) $ECHO_C" >&6 else -cat >conftest.$ac_ext <<_ACEOF -#line 3586 "configure" +cat >"conftest.$ac_ext" <<_ACEOF +#line 3968 "configure" #include "confdefs.h" #include int @@ -3601,28 +3983,28 @@ main (void) return 0; } _ACEOF -rm -f conftest.$ac_objext -if { (eval echo "$as_me:3605: \"$ac_compile\"") >&5 +rm -f "conftest.$ac_objext" +if { (eval echo "$as_me:3987: \"$ac_compile\"") >&5 (eval $ac_compile) 2>&5 ac_status=$? - echo "$as_me:3608: \$? = $ac_status" >&5 - (exit $ac_status); } && - { ac_try='test -s conftest.$ac_objext' - { (eval echo "$as_me:3611: \"$ac_try\"") >&5 + echo "$as_me:3990: \$? = $ac_status" >&5 + (exit "$ac_status"); } && + { ac_try='test -s "conftest.$ac_objext"' + { (eval echo "$as_me:3993: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? - echo "$as_me:3614: \$? = $ac_status" >&5 - (exit $ac_status); }; }; then + echo "$as_me:3996: \$? = $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 +cat "conftest.$ac_ext" >&5 cf_cv_posix_visible=yes fi -rm -f conftest.$ac_objext conftest.$ac_ext +rm -f "conftest.$ac_objext" "conftest.$ac_ext" fi -echo "$as_me:3625: result: $cf_cv_posix_visible" >&5 +echo "$as_me:4007: result: $cf_cv_posix_visible" >&5 echo "${ECHO_T}$cf_cv_posix_visible" >&6 if test "$cf_cv_posix_visible" = no; then @@ -3631,7 +4013,7 @@ 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" ;; @@ -3663,18 +4045,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) cf_gnu_xopen_source=$cf_XOPEN_SOURCE -echo "$as_me:3670: checking if this is the GNU C library" >&5 +echo "$as_me:4052: 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 3677 "configure" +cat >"conftest.$ac_ext" <<_ACEOF +#line 4059 "configure" #include "confdefs.h" #include int @@ -3692,28 +4074,28 @@ main (void) return 0; } _ACEOF -rm -f conftest.$ac_objext -if { (eval echo "$as_me:3696: \"$ac_compile\"") >&5 +rm -f "conftest.$ac_objext" +if { (eval echo "$as_me:4078: \"$ac_compile\"") >&5 (eval $ac_compile) 2>&5 ac_status=$? - echo "$as_me:3699: \$? = $ac_status" >&5 - (exit $ac_status); } && - { ac_try='test -s conftest.$ac_objext' - { (eval echo "$as_me:3702: \"$ac_try\"") >&5 + echo "$as_me:4081: \$? = $ac_status" >&5 + (exit "$ac_status"); } && + { ac_try='test -s "conftest.$ac_objext"' + { (eval echo "$as_me:4084: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? - echo "$as_me:3705: \$? = $ac_status" >&5 - (exit $ac_status); }; }; then + echo "$as_me:4087: \$? = $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:3716: result: $cf_cv_gnu_library" >&5 +echo "$as_me:4098: result: $cf_cv_gnu_library" >&5 echo "${ECHO_T}$cf_cv_gnu_library" >&6 if test x$cf_cv_gnu_library = xyes; then @@ -3721,7 +4103,7 @@ if test x$cf_cv_gnu_library = xyes; then # With glibc 2.19 (13 years after this check was begun), _DEFAULT_SOURCE # was changed to help a little. newlib incorporated the change about 4 # years later. - echo "$as_me:3724: checking if _DEFAULT_SOURCE can be used as a basis" >&5 + echo "$as_me:4106: 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 @@ -3732,8 +4114,8 @@ else test -n "$CPPFLAGS" && CPPFLAGS="$CPPFLAGS " CPPFLAGS="${CPPFLAGS}-D_DEFAULT_SOURCE" - cat >conftest.$ac_ext <<_ACEOF -#line 3736 "configure" + cat >"conftest.$ac_ext" <<_ACEOF +#line 4118 "configure" #include "confdefs.h" #include int @@ -3751,34 +4133,34 @@ main (void) return 0; } _ACEOF -rm -f conftest.$ac_objext -if { (eval echo "$as_me:3755: \"$ac_compile\"") >&5 +rm -f "conftest.$ac_objext" +if { (eval echo "$as_me:4137: \"$ac_compile\"") >&5 (eval $ac_compile) 2>&5 ac_status=$? - echo "$as_me:3758: \$? = $ac_status" >&5 - (exit $ac_status); } && - { ac_try='test -s conftest.$ac_objext' - { (eval echo "$as_me:3761: \"$ac_try\"") >&5 + echo "$as_me:4140: \$? = $ac_status" >&5 + (exit "$ac_status"); } && + { ac_try='test -s "conftest.$ac_objext"' + { (eval echo "$as_me:4143: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? - echo "$as_me:3764: \$? = $ac_status" >&5 - (exit $ac_status); }; }; then + echo "$as_me:4146: \$? = $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:3776: result: $cf_cv_gnu_library_219" >&5 +echo "$as_me:4158: 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:3781: checking if _XOPEN_SOURCE=$cf_gnu_xopen_source works with _DEFAULT_SOURCE" >&5 + echo "$as_me:4163: 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 @@ -3791,19 +4173,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" @@ -3822,7 +4204,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/=.*//'` @@ -3852,7 +4234,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}" \ @@ -3882,8 +4264,8 @@ if test -n "$cf_new_extra_cppflags" ; then fi - cat >conftest.$ac_ext <<_ACEOF -#line 3886 "configure" + cat >"conftest.$ac_ext" <<_ACEOF +#line 4268 "configure" #include "confdefs.h" #include @@ -3902,28 +4284,28 @@ main (void) return 0; } _ACEOF -rm -f conftest.$ac_objext -if { (eval echo "$as_me:3906: \"$ac_compile\"") >&5 +rm -f "conftest.$ac_objext" +if { (eval echo "$as_me:4288: \"$ac_compile\"") >&5 (eval $ac_compile) 2>&5 ac_status=$? - echo "$as_me:3909: \$? = $ac_status" >&5 - (exit $ac_status); } && - { ac_try='test -s conftest.$ac_objext' - { (eval echo "$as_me:3912: \"$ac_try\"") >&5 + echo "$as_me:4291: \$? = $ac_status" >&5 + (exit "$ac_status"); } && + { ac_try='test -s "conftest.$ac_objext"' + { (eval echo "$as_me:4294: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? - echo "$as_me:3915: \$? = $ac_status" >&5 - (exit $ac_status); }; }; then + echo "$as_me:4297: \$? = $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:3926: result: $cf_cv_gnu_dftsrc_219" >&5 +echo "$as_me:4308: 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 @@ -3932,14 +4314,14 @@ echo "${ECHO_T}$cf_cv_gnu_dftsrc_219" >&6 if test "x$cf_cv_gnu_dftsrc_219" != xyes; then - echo "$as_me:3935: checking if we must define _GNU_SOURCE" >&5 + echo "$as_me:4317: 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 3942 "configure" + cat >"conftest.$ac_ext" <<_ACEOF +#line 4324 "configure" #include "confdefs.h" #include int @@ -3953,22 +4335,22 @@ main (void) return 0; } _ACEOF -rm -f conftest.$ac_objext -if { (eval echo "$as_me:3957: \"$ac_compile\"") >&5 +rm -f "conftest.$ac_objext" +if { (eval echo "$as_me:4339: \"$ac_compile\"") >&5 (eval $ac_compile) 2>&5 ac_status=$? - echo "$as_me:3960: \$? = $ac_status" >&5 - (exit $ac_status); } && - { ac_try='test -s conftest.$ac_objext' - { (eval echo "$as_me:3963: \"$ac_try\"") >&5 + echo "$as_me:4342: \$? = $ac_status" >&5 + (exit "$ac_status"); } && + { ac_try='test -s "conftest.$ac_objext"' + { (eval echo "$as_me:4345: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? - echo "$as_me:3966: \$? = $ac_status" >&5 - (exit $ac_status); }; }; then + echo "$as_me:4348: \$? = $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 @@ -3978,19 +4360,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" @@ -4009,7 +4391,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/=.*//'` @@ -4039,7 +4421,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}" \ @@ -4069,8 +4451,8 @@ if test -n "$cf_new_extra_cppflags" ; then fi - cat >conftest.$ac_ext <<_ACEOF -#line 4073 "configure" + cat >"conftest.$ac_ext" <<_ACEOF +#line 4455 "configure" #include "confdefs.h" #include int @@ -4084,37 +4466,37 @@ main (void) return 0; } _ACEOF -rm -f conftest.$ac_objext -if { (eval echo "$as_me:4088: \"$ac_compile\"") >&5 +rm -f "conftest.$ac_objext" +if { (eval echo "$as_me:4470: \"$ac_compile\"") >&5 (eval $ac_compile) 2>&5 ac_status=$? - echo "$as_me:4091: \$? = $ac_status" >&5 - (exit $ac_status); } && - { ac_try='test -s conftest.$ac_objext' - { (eval echo "$as_me:4094: \"$ac_try\"") >&5 + echo "$as_me:4473: \$? = $ac_status" >&5 + (exit "$ac_status"); } && + { ac_try='test -s "conftest.$ac_objext"' + { (eval echo "$as_me:4476: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? - echo "$as_me:4097: \$? = $ac_status" >&5 - (exit $ac_status); }; }; then + echo "$as_me:4479: \$? = $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:4112: result: $cf_cv_gnu_source" >&5 +echo "$as_me:4494: 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:4117: checking if we should also define _DEFAULT_SOURCE" >&5 + echo "$as_me:4499: 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 @@ -4123,8 +4505,8 @@ else test -n "$CPPFLAGS" && CPPFLAGS="$CPPFLAGS " CPPFLAGS="${CPPFLAGS}-D_GNU_SOURCE" - cat >conftest.$ac_ext <<_ACEOF -#line 4127 "configure" + cat >"conftest.$ac_ext" <<_ACEOF +#line 4509 "configure" #include "confdefs.h" #include int @@ -4138,28 +4520,28 @@ main (void) return 0; } _ACEOF -rm -f conftest.$ac_objext -if { (eval echo "$as_me:4142: \"$ac_compile\"") >&5 +rm -f "conftest.$ac_objext" +if { (eval echo "$as_me:4524: \"$ac_compile\"") >&5 (eval $ac_compile) 2>&5 ac_status=$? - echo "$as_me:4145: \$? = $ac_status" >&5 - (exit $ac_status); } && - { ac_try='test -s conftest.$ac_objext' - { (eval echo "$as_me:4148: \"$ac_try\"") >&5 + echo "$as_me:4527: \$? = $ac_status" >&5 + (exit "$ac_status"); } && + { ac_try='test -s "conftest.$ac_objext"' + { (eval echo "$as_me:4530: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? - echo "$as_me:4151: \$? = $ac_status" >&5 - (exit $ac_status); }; }; then + echo "$as_me:4533: \$? = $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:4162: result: $cf_cv_default_source" >&5 +echo "$as_me:4544: result: $cf_cv_default_source" >&5 echo "${ECHO_T}$cf_cv_default_source" >&6 if test "$cf_cv_default_source" = yes then @@ -4196,16 +4578,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:4199: checking if we should define _POSIX_C_SOURCE" >&5 +echo "$as_me:4581: 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}:4205: testing if the symbol is already defined go no further ..." 1>&5 +echo "${as_me:-configure}:4587: testing if the symbol is already defined go no further ..." 1>&5 - cat >conftest.$ac_ext <<_ACEOF -#line 4208 "configure" + cat >"conftest.$ac_ext" <<_ACEOF +#line 4590 "configure" #include "confdefs.h" #include int @@ -4219,22 +4601,22 @@ make an error return 0; } _ACEOF -rm -f conftest.$ac_objext -if { (eval echo "$as_me:4223: \"$ac_compile\"") >&5 +rm -f "conftest.$ac_objext" +if { (eval echo "$as_me:4605: \"$ac_compile\"") >&5 (eval $ac_compile) 2>&5 ac_status=$? - echo "$as_me:4226: \$? = $ac_status" >&5 - (exit $ac_status); } && - { ac_try='test -s conftest.$ac_objext' - { (eval echo "$as_me:4229: \"$ac_try\"") >&5 + echo "$as_me:4608: \$? = $ac_status" >&5 + (exit "$ac_status"); } && + { ac_try='test -s "conftest.$ac_objext"' + { (eval echo "$as_me:4611: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? - echo "$as_me:4232: \$? = $ac_status" >&5 - (exit $ac_status); }; }; then + echo "$as_me:4614: \$? = $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]??*) @@ -4249,8 +4631,8 @@ cf_want_posix_source=no ;; esac if test "$cf_want_posix_source" = yes ; then - cat >conftest.$ac_ext <<_ACEOF -#line 4253 "configure" + cat >"conftest.$ac_ext" <<_ACEOF +#line 4635 "configure" #include "confdefs.h" #include int @@ -4264,28 +4646,28 @@ make an error return 0; } _ACEOF -rm -f conftest.$ac_objext -if { (eval echo "$as_me:4268: \"$ac_compile\"") >&5 +rm -f "conftest.$ac_objext" +if { (eval echo "$as_me:4650: \"$ac_compile\"") >&5 (eval $ac_compile) 2>&5 ac_status=$? - echo "$as_me:4271: \$? = $ac_status" >&5 - (exit $ac_status); } && - { ac_try='test -s conftest.$ac_objext' - { (eval echo "$as_me:4274: \"$ac_try\"") >&5 + echo "$as_me:4653: \$? = $ac_status" >&5 + (exit "$ac_status"); } && + { ac_try='test -s "conftest.$ac_objext"' + { (eval echo "$as_me:4656: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? - echo "$as_me:4277: \$? = $ac_status" >&5 - (exit $ac_status); }; }; then + echo "$as_me:4659: \$? = $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}:4288: testing ifdef from value $cf_POSIX_C_SOURCE ..." 1>&5 +echo "${as_me:-configure}:4670: testing ifdef from value $cf_POSIX_C_SOURCE ..." 1>&5 CFLAGS="$cf_trim_CFLAGS" CPPFLAGS="$cf_trim_CPPFLAGS" @@ -4293,10 +4675,10 @@ echo "${as_me:-configure}:4288: testing ifdef from value $cf_POSIX_C_SOURCE ..." test -n "$CPPFLAGS" && CPPFLAGS="$CPPFLAGS " CPPFLAGS="${CPPFLAGS}$cf_cv_posix_c_source" -echo "${as_me:-configure}:4296: testing if the second compile does not leave our definition intact error ..." 1>&5 +echo "${as_me:-configure}:4678: testing if the second compile does not leave our definition intact error ..." 1>&5 - cat >conftest.$ac_ext <<_ACEOF -#line 4299 "configure" + cat >"conftest.$ac_ext" <<_ACEOF +#line 4681 "configure" #include "confdefs.h" #include int @@ -4310,33 +4692,33 @@ make an error return 0; } _ACEOF -rm -f conftest.$ac_objext -if { (eval echo "$as_me:4314: \"$ac_compile\"") >&5 +rm -f "conftest.$ac_objext" +if { (eval echo "$as_me:4696: \"$ac_compile\"") >&5 (eval $ac_compile) 2>&5 ac_status=$? - echo "$as_me:4317: \$? = $ac_status" >&5 - (exit $ac_status); } && - { ac_try='test -s conftest.$ac_objext' - { (eval echo "$as_me:4320: \"$ac_try\"") >&5 + echo "$as_me:4699: \$? = $ac_status" >&5 + (exit "$ac_status"); } && + { ac_try='test -s "conftest.$ac_objext"' + { (eval echo "$as_me:4702: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? - echo "$as_me:4323: \$? = $ac_status" >&5 - (exit $ac_status); }; }; then + echo "$as_me:4705: \$? = $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:4339: result: $cf_cv_posix_c_source" >&5 +echo "$as_me:4721: 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 @@ -4350,19 +4732,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" @@ -4381,7 +4763,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/=.*//'` @@ -4411,7 +4793,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}" \ @@ -4449,7 +4831,16 @@ fi # cf_cv_posix_visible (netbsd*) cf_xopen_source="-D_NETBSD_SOURCE" # setting _XOPEN_SOURCE breaks IPv6 for lynx on NetBSD 1.6, breaks xterm, is not needed for ncursesw ;; -(openbsd[4-9]*) +(openbsd[6-9]*) + # OpenBSD 6.x has broken locale support, both compile-time and runtime. + # see https://www.mail-archive.com/bugs@openbsd.org/msg13200.html + # Abusing the conformance level is a workaround. + { echo "$as_me:4838: 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 @@ -4476,14 +4867,14 @@ fi # cf_cv_posix_visible ;; (*) -echo "$as_me:4479: checking if we should define _XOPEN_SOURCE" >&5 +echo "$as_me:4870: 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 4486 "configure" + cat >"conftest.$ac_ext" <<_ACEOF +#line 4877 "configure" #include "confdefs.h" #include @@ -4497,33 +4888,34 @@ main (void) #ifndef _XOPEN_SOURCE make an error #endif + ; return 0; } _ACEOF -rm -f conftest.$ac_objext -if { (eval echo "$as_me:4505: \"$ac_compile\"") >&5 +rm -f "conftest.$ac_objext" +if { (eval echo "$as_me:4897: \"$ac_compile\"") >&5 (eval $ac_compile) 2>&5 ac_status=$? - echo "$as_me:4508: \$? = $ac_status" >&5 - (exit $ac_status); } && - { ac_try='test -s conftest.$ac_objext' - { (eval echo "$as_me:4511: \"$ac_try\"") >&5 + echo "$as_me:4900: \$? = $ac_status" >&5 + (exit "$ac_status"); } && + { ac_try='test -s "conftest.$ac_objext"' + { (eval echo "$as_me:4903: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? - echo "$as_me:4514: \$? = $ac_status" >&5 - (exit $ac_status); }; }; then + echo "$as_me:4906: \$? = $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 4526 "configure" + cat >"conftest.$ac_ext" <<_ACEOF +#line 4918 "configure" #include "confdefs.h" #include @@ -4534,39 +4926,40 @@ int main (void) { -#ifdef _XOPEN_SOURCE +#ifndef _XOPEN_SOURCE make an error #endif + ; return 0; } _ACEOF -rm -f conftest.$ac_objext -if { (eval echo "$as_me:4545: \"$ac_compile\"") >&5 +rm -f "conftest.$ac_objext" +if { (eval echo "$as_me:4938: \"$ac_compile\"") >&5 (eval $ac_compile) 2>&5 ac_status=$? - echo "$as_me:4548: \$? = $ac_status" >&5 - (exit $ac_status); } && - { ac_try='test -s conftest.$ac_objext' - { (eval echo "$as_me:4551: \"$ac_try\"") >&5 + echo "$as_me:4941: \$? = $ac_status" >&5 + (exit "$ac_status"); } && + { ac_try='test -s "conftest.$ac_objext"' + { (eval echo "$as_me:4944: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? - echo "$as_me:4554: \$? = $ac_status" >&5 - (exit $ac_status); }; }; then + echo "$as_me:4947: \$? = $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:4569: result: $cf_cv_xopen_source" >&5 +echo "$as_me:4962: result: $cf_cv_xopen_source" >&5 echo "${ECHO_T}$cf_cv_xopen_source" >&6 if test "$cf_cv_xopen_source" != no ; then @@ -4581,26 +4974,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" @@ -4619,7 +5038,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/=.*//'` @@ -4649,7 +5068,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}" \ @@ -4679,8 +5098,12 @@ if test -n "$cf_new_extra_cppflags" ; then fi +done + fi + cf_save_xopen_cppflags="$CPPFLAGS" + if test "$cf_cv_posix_visible" = no; then cf_POSIX_C_SOURCE=$cf_POSIX_C_SOURCE @@ -4696,16 +5119,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:4699: checking if we should define _POSIX_C_SOURCE" >&5 +echo "$as_me:5122: 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}:4705: testing if the symbol is already defined go no further ..." 1>&5 +echo "${as_me:-configure}:5128: testing if the symbol is already defined go no further ..." 1>&5 - cat >conftest.$ac_ext <<_ACEOF -#line 4708 "configure" + cat >"conftest.$ac_ext" <<_ACEOF +#line 5131 "configure" #include "confdefs.h" #include int @@ -4719,22 +5142,22 @@ make an error return 0; } _ACEOF -rm -f conftest.$ac_objext -if { (eval echo "$as_me:4723: \"$ac_compile\"") >&5 +rm -f "conftest.$ac_objext" +if { (eval echo "$as_me:5146: \"$ac_compile\"") >&5 (eval $ac_compile) 2>&5 ac_status=$? - echo "$as_me:4726: \$? = $ac_status" >&5 - (exit $ac_status); } && - { ac_try='test -s conftest.$ac_objext' - { (eval echo "$as_me:4729: \"$ac_try\"") >&5 + echo "$as_me:5149: \$? = $ac_status" >&5 + (exit "$ac_status"); } && + { ac_try='test -s "conftest.$ac_objext"' + { (eval echo "$as_me:5152: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? - echo "$as_me:4732: \$? = $ac_status" >&5 - (exit $ac_status); }; }; then + echo "$as_me:5155: \$? = $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]??*) @@ -4749,8 +5172,8 @@ cf_want_posix_source=no ;; esac if test "$cf_want_posix_source" = yes ; then - cat >conftest.$ac_ext <<_ACEOF -#line 4753 "configure" + cat >"conftest.$ac_ext" <<_ACEOF +#line 5176 "configure" #include "confdefs.h" #include int @@ -4764,28 +5187,28 @@ make an error return 0; } _ACEOF -rm -f conftest.$ac_objext -if { (eval echo "$as_me:4768: \"$ac_compile\"") >&5 +rm -f "conftest.$ac_objext" +if { (eval echo "$as_me:5191: \"$ac_compile\"") >&5 (eval $ac_compile) 2>&5 ac_status=$? - echo "$as_me:4771: \$? = $ac_status" >&5 - (exit $ac_status); } && - { ac_try='test -s conftest.$ac_objext' - { (eval echo "$as_me:4774: \"$ac_try\"") >&5 + echo "$as_me:5194: \$? = $ac_status" >&5 + (exit "$ac_status"); } && + { ac_try='test -s "conftest.$ac_objext"' + { (eval echo "$as_me:5197: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? - echo "$as_me:4777: \$? = $ac_status" >&5 - (exit $ac_status); }; }; then + echo "$as_me:5200: \$? = $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}:4788: testing ifdef from value $cf_POSIX_C_SOURCE ..." 1>&5 +echo "${as_me:-configure}:5211: testing ifdef from value $cf_POSIX_C_SOURCE ..." 1>&5 CFLAGS="$cf_trim_CFLAGS" CPPFLAGS="$cf_trim_CPPFLAGS" @@ -4793,10 +5216,10 @@ echo "${as_me:-configure}:4788: testing ifdef from value $cf_POSIX_C_SOURCE ..." test -n "$CPPFLAGS" && CPPFLAGS="$CPPFLAGS " CPPFLAGS="${CPPFLAGS}$cf_cv_posix_c_source" -echo "${as_me:-configure}:4796: testing if the second compile does not leave our definition intact error ..." 1>&5 +echo "${as_me:-configure}:5219: testing if the second compile does not leave our definition intact error ..." 1>&5 - cat >conftest.$ac_ext <<_ACEOF -#line 4799 "configure" + cat >"conftest.$ac_ext" <<_ACEOF +#line 5222 "configure" #include "confdefs.h" #include int @@ -4810,33 +5233,33 @@ make an error return 0; } _ACEOF -rm -f conftest.$ac_objext -if { (eval echo "$as_me:4814: \"$ac_compile\"") >&5 +rm -f "conftest.$ac_objext" +if { (eval echo "$as_me:5237: \"$ac_compile\"") >&5 (eval $ac_compile) 2>&5 ac_status=$? - echo "$as_me:4817: \$? = $ac_status" >&5 - (exit $ac_status); } && - { ac_try='test -s conftest.$ac_objext' - { (eval echo "$as_me:4820: \"$ac_try\"") >&5 + echo "$as_me:5240: \$? = $ac_status" >&5 + (exit "$ac_status"); } && + { ac_try='test -s "conftest.$ac_objext"' + { (eval echo "$as_me:5243: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? - echo "$as_me:4823: \$? = $ac_status" >&5 - (exit $ac_status); }; }; then + echo "$as_me:5246: \$? = $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:4839: result: $cf_cv_posix_c_source" >&5 +echo "$as_me:5262: 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 @@ -4850,19 +5273,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" @@ -4881,7 +5304,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/=.*//'` @@ -4911,7 +5334,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}" \ @@ -4945,31 +5368,112 @@ 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 inteferes" 1>&6 + +echo "${as_me:-configure}:5375: testing checking if _POSIX_C_SOURCE inteferes ..." 1>&5 + + cat >"conftest.$ac_ext" <<_ACEOF +#line 5378 "configure" +#include "confdefs.h" + +#include +#include +#include + +int +main (void) +{ + +#ifndef _XOPEN_SOURCE +make an error +#endif + + ; + return 0; +} +_ACEOF +rm -f "conftest.$ac_objext" +if { (eval echo "$as_me:5398: \"$ac_compile\"") >&5 + (eval $ac_compile) 2>&5 + ac_status=$? + echo "$as_me:5401: \$? = $ac_status" >&5 + (exit "$ac_status"); } && + { ac_try='test -s "conftest.$ac_objext"' + { (eval echo "$as_me:5404: \"$ac_try\"") >&5 + (eval $ac_try) 2>&5 + ac_status=$? + echo "$as_me:5407: \$? = $ac_status" >&5 + (exit "$ac_status"); }; }; then + : +else + echo "$as_me: failed program was:" >&5 +cat "conftest.$ac_ext" >&5 + + { echo "$as_me:5414: 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}:5437: 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}:5449: 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" @@ -4988,7 +5492,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/=.*//'` @@ -5018,7 +5522,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}" \ @@ -5030,7 +5534,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}:5033: testing add to \$CFLAGS $cf_new_cflags ..." 1>&5 +echo "${as_me:-configure}:5537: testing add to \$CFLAGS $cf_new_cflags ..." 1>&5 test -n "$CFLAGS" && CFLAGS="$CFLAGS " CFLAGS="${CFLAGS}$cf_new_cflags" @@ -5040,7 +5544,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}:5043: testing add to \$CPPFLAGS $cf_new_cppflags ..." 1>&5 +echo "${as_me:-configure}:5547: testing add to \$CPPFLAGS $cf_new_cppflags ..." 1>&5 test -n "$CPPFLAGS" && CPPFLAGS="$CPPFLAGS " CPPFLAGS="${CPPFLAGS}$cf_new_cppflags" @@ -5050,20 +5554,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}:5053: testing add to \$EXTRA_CPPFLAGS $cf_new_extra_cppflags ..." 1>&5 +echo "${as_me:-configure}:5557: 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:5063: checking if _XOPEN_SOURCE really is set" >&5 + echo "$as_me:5569: 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 5066 "configure" + cat >"conftest.$ac_ext" <<_ACEOF +#line 5572 "configure" #include "confdefs.h" #include int @@ -5077,31 +5583,31 @@ make an error return 0; } _ACEOF -rm -f conftest.$ac_objext -if { (eval echo "$as_me:5081: \"$ac_compile\"") >&5 +rm -f "conftest.$ac_objext" +if { (eval echo "$as_me:5587: \"$ac_compile\"") >&5 (eval $ac_compile) 2>&5 ac_status=$? - echo "$as_me:5084: \$? = $ac_status" >&5 - (exit $ac_status); } && - { ac_try='test -s conftest.$ac_objext' - { (eval echo "$as_me:5087: \"$ac_try\"") >&5 + echo "$as_me:5590: \$? = $ac_status" >&5 + (exit "$ac_status"); } && + { ac_try='test -s "conftest.$ac_objext"' + { (eval echo "$as_me:5593: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? - echo "$as_me:5090: \$? = $ac_status" >&5 - (exit $ac_status); }; }; then + echo "$as_me:5596: \$? = $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:5099: result: $cf_XOPEN_SOURCE_set" >&5 +rm -f "conftest.$ac_objext" "conftest.$ac_ext" + echo "$as_me:5605: 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 5104 "configure" + cat >"conftest.$ac_ext" <<_ACEOF +#line 5610 "configure" #include "confdefs.h" #include int @@ -5115,40 +5621,40 @@ make an error return 0; } _ACEOF -rm -f conftest.$ac_objext -if { (eval echo "$as_me:5119: \"$ac_compile\"") >&5 +rm -f "conftest.$ac_objext" +if { (eval echo "$as_me:5625: \"$ac_compile\"") >&5 (eval $ac_compile) 2>&5 ac_status=$? - echo "$as_me:5122: \$? = $ac_status" >&5 - (exit $ac_status); } && - { ac_try='test -s conftest.$ac_objext' - { (eval echo "$as_me:5125: \"$ac_try\"") >&5 + echo "$as_me:5628: \$? = $ac_status" >&5 + (exit "$ac_status"); } && + { ac_try='test -s "conftest.$ac_objext"' + { (eval echo "$as_me:5631: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? - echo "$as_me:5128: \$? = $ac_status" >&5 - (exit $ac_status); }; }; then + echo "$as_me:5634: \$? = $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:5139: WARNING: _XOPEN_SOURCE is lower than requested" >&5 + { echo "$as_me:5645: WARNING: _XOPEN_SOURCE is lower than requested" >&5 echo "$as_me: WARNING: _XOPEN_SOURCE is lower than requested" >&2;} fi else -echo "$as_me:5144: checking if we should define _XOPEN_SOURCE" >&5 +echo "$as_me:5650: 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 5151 "configure" + cat >"conftest.$ac_ext" <<_ACEOF +#line 5657 "configure" #include "confdefs.h" #include @@ -5162,33 +5668,34 @@ main (void) #ifndef _XOPEN_SOURCE make an error #endif + ; return 0; } _ACEOF -rm -f conftest.$ac_objext -if { (eval echo "$as_me:5170: \"$ac_compile\"") >&5 +rm -f "conftest.$ac_objext" +if { (eval echo "$as_me:5677: \"$ac_compile\"") >&5 (eval $ac_compile) 2>&5 ac_status=$? - echo "$as_me:5173: \$? = $ac_status" >&5 - (exit $ac_status); } && - { ac_try='test -s conftest.$ac_objext' - { (eval echo "$as_me:5176: \"$ac_try\"") >&5 + echo "$as_me:5680: \$? = $ac_status" >&5 + (exit "$ac_status"); } && + { ac_try='test -s "conftest.$ac_objext"' + { (eval echo "$as_me:5683: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? - echo "$as_me:5179: \$? = $ac_status" >&5 - (exit $ac_status); }; }; then + echo "$as_me:5686: \$? = $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 5191 "configure" + cat >"conftest.$ac_ext" <<_ACEOF +#line 5698 "configure" #include "confdefs.h" #include @@ -5199,39 +5706,40 @@ int main (void) { -#ifdef _XOPEN_SOURCE +#ifndef _XOPEN_SOURCE make an error #endif + ; return 0; } _ACEOF -rm -f conftest.$ac_objext -if { (eval echo "$as_me:5210: \"$ac_compile\"") >&5 +rm -f "conftest.$ac_objext" +if { (eval echo "$as_me:5718: \"$ac_compile\"") >&5 (eval $ac_compile) 2>&5 ac_status=$? - echo "$as_me:5213: \$? = $ac_status" >&5 - (exit $ac_status); } && - { ac_try='test -s conftest.$ac_objext' - { (eval echo "$as_me:5216: \"$ac_try\"") >&5 + echo "$as_me:5721: \$? = $ac_status" >&5 + (exit "$ac_status"); } && + { ac_try='test -s "conftest.$ac_objext"' + { (eval echo "$as_me:5724: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? - echo "$as_me:5219: \$? = $ac_status" >&5 - (exit $ac_status); }; }; then + echo "$as_me:5727: \$? = $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:5234: result: $cf_cv_xopen_source" >&5 +echo "$as_me:5742: result: $cf_cv_xopen_source" >&5 echo "${ECHO_T}$cf_cv_xopen_source" >&6 if test "$cf_cv_xopen_source" != no ; then @@ -5246,26 +5754,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" @@ -5284,7 +5818,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/=.*//'` @@ -5314,7 +5848,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}" \ @@ -5344,13 +5878,15 @@ if test -n "$cf_new_extra_cppflags" ; then fi +done + fi fi fi fi # cf_cv_posix_visible -echo "$as_me:5353: checking for signal global datatype" >&5 +echo "$as_me:5889: checking for signal global datatype" >&5 echo $ECHO_N "checking for signal global datatype... $ECHO_C" >&6 if test "${cf_cv_sig_atomic_t+set}" = set; then echo $ECHO_N "(cached) $ECHO_C" >&6 @@ -5361,8 +5897,8 @@ else "sig_atomic_t" \ "int" do - cat >conftest.$ac_ext <<_ACEOF -#line 5365 "configure" + cat >"conftest.$ac_ext" <<_ACEOF +#line 5901 "configure" #include "confdefs.h" #include @@ -5385,31 +5921,31 @@ signal(SIGINT, handler); return 0; } _ACEOF -rm -f conftest.$ac_objext -if { (eval echo "$as_me:5389: \"$ac_compile\"") >&5 +rm -f "conftest.$ac_objext" +if { (eval echo "$as_me:5925: \"$ac_compile\"") >&5 (eval $ac_compile) 2>&5 ac_status=$? - echo "$as_me:5392: \$? = $ac_status" >&5 - (exit $ac_status); } && - { ac_try='test -s conftest.$ac_objext' - { (eval echo "$as_me:5395: \"$ac_try\"") >&5 + echo "$as_me:5928: \$? = $ac_status" >&5 + (exit "$ac_status"); } && + { ac_try='test -s "conftest.$ac_objext"' + { (eval echo "$as_me:5931: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? - echo "$as_me:5398: \$? = $ac_status" >&5 - (exit $ac_status); }; }; then + echo "$as_me:5934: \$? = $ac_status" >&5 + (exit "$ac_status"); }; }; then cf_cv_sig_atomic_t=$cf_type else echo "$as_me: failed program was:" >&5 -cat conftest.$ac_ext >&5 +cat "conftest.$ac_ext" >&5 cf_cv_sig_atomic_t=no fi -rm -f conftest.$ac_objext conftest.$ac_ext +rm -f "conftest.$ac_objext" "conftest.$ac_ext" test "$cf_cv_sig_atomic_t" != no && break done fi -echo "$as_me:5412: result: $cf_cv_sig_atomic_t" >&5 +echo "$as_me:5948: result: $cf_cv_sig_atomic_t" >&5 echo "${ECHO_T}$cf_cv_sig_atomic_t" >&6 test "$cf_cv_sig_atomic_t" != no && cat >>confdefs.h <&5 +echo "$as_me:5957: checking if SIGWINCH is defined" >&5 echo $ECHO_N "checking if SIGWINCH is defined... $ECHO_C" >&6 if test "${cf_cv_define_sigwinch+set}" = set; then echo $ECHO_N "(cached) $ECHO_C" >&6 else - cat >conftest.$ac_ext <<_ACEOF -#line 5428 "configure" + cat >"conftest.$ac_ext" <<_ACEOF +#line 5964 "configure" #include "confdefs.h" #include @@ -5439,24 +5975,24 @@ int x = SIGWINCH; (void)x return 0; } _ACEOF -rm -f conftest.$ac_objext -if { (eval echo "$as_me:5443: \"$ac_compile\"") >&5 +rm -f "conftest.$ac_objext" +if { (eval echo "$as_me:5979: \"$ac_compile\"") >&5 (eval $ac_compile) 2>&5 ac_status=$? - echo "$as_me:5446: \$? = $ac_status" >&5 - (exit $ac_status); } && - { ac_try='test -s conftest.$ac_objext' - { (eval echo "$as_me:5449: \"$ac_try\"") >&5 + echo "$as_me:5982: \$? = $ac_status" >&5 + (exit "$ac_status"); } && + { ac_try='test -s "conftest.$ac_objext"' + { (eval echo "$as_me:5985: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? - echo "$as_me:5452: \$? = $ac_status" >&5 - (exit $ac_status); }; }; then + echo "$as_me:5988: \$? = $ac_status" >&5 + (exit "$ac_status"); }; }; then cf_cv_define_sigwinch=yes else echo "$as_me: failed program was:" >&5 -cat conftest.$ac_ext >&5 -cat >conftest.$ac_ext <<_ACEOF -#line 5459 "configure" +cat "conftest.$ac_ext" >&5 +cat >"conftest.$ac_ext" <<_ACEOF +#line 5995 "configure" #include "confdefs.h" #undef _XOPEN_SOURCE @@ -5473,35 +6009,35 @@ int x = SIGWINCH; (void)x return 0; } _ACEOF -rm -f conftest.$ac_objext -if { (eval echo "$as_me:5477: \"$ac_compile\"") >&5 +rm -f "conftest.$ac_objext" +if { (eval echo "$as_me:6013: \"$ac_compile\"") >&5 (eval $ac_compile) 2>&5 ac_status=$? - echo "$as_me:5480: \$? = $ac_status" >&5 - (exit $ac_status); } && - { ac_try='test -s conftest.$ac_objext' - { (eval echo "$as_me:5483: \"$ac_try\"") >&5 + echo "$as_me:6016: \$? = $ac_status" >&5 + (exit "$ac_status"); } && + { ac_try='test -s "conftest.$ac_objext"' + { (eval echo "$as_me:6019: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? - echo "$as_me:5486: \$? = $ac_status" >&5 - (exit $ac_status); }; }; then + echo "$as_me:6022: \$? = $ac_status" >&5 + (exit "$ac_status"); }; }; then cf_cv_define_sigwinch=maybe else echo "$as_me: failed program was:" >&5 -cat conftest.$ac_ext >&5 +cat "conftest.$ac_ext" >&5 cf_cv_define_sigwinch=no fi -rm -f conftest.$ac_objext conftest.$ac_ext +rm -f "conftest.$ac_objext" "conftest.$ac_ext" fi -rm -f conftest.$ac_objext conftest.$ac_ext +rm -f "conftest.$ac_objext" "conftest.$ac_ext" fi -echo "$as_me:5500: result: $cf_cv_define_sigwinch" >&5 +echo "$as_me:6036: result: $cf_cv_define_sigwinch" >&5 echo "${ECHO_T}$cf_cv_define_sigwinch" >&6 if test "$cf_cv_define_sigwinch" = maybe ; then -echo "$as_me:5504: checking for actual SIGWINCH definition" >&5 +echo "$as_me:6040: checking for actual SIGWINCH definition" >&5 echo $ECHO_N "checking for actual SIGWINCH definition... $ECHO_C" >&6 if test "${cf_cv_fixup_sigwinch+set}" = set; then echo $ECHO_N "(cached) $ECHO_C" >&6 @@ -5509,10 +6045,10 @@ else cf_cv_fixup_sigwinch=unknown cf_sigwinch=32 -while test $cf_sigwinch != 1 +while test "$cf_sigwinch" != 1 do - cat >conftest.$ac_ext <<_ACEOF -#line 5515 "configure" + cat >"conftest.$ac_ext" <<_ACEOF +#line 6051 "configure" #include "confdefs.h" #undef _XOPEN_SOURCE @@ -5533,31 +6069,31 @@ int x = SIGWINCH; (void)x return 0; } _ACEOF -rm -f conftest.$ac_objext -if { (eval echo "$as_me:5537: \"$ac_compile\"") >&5 +rm -f "conftest.$ac_objext" +if { (eval echo "$as_me:6073: \"$ac_compile\"") >&5 (eval $ac_compile) 2>&5 ac_status=$? - echo "$as_me:5540: \$? = $ac_status" >&5 - (exit $ac_status); } && - { ac_try='test -s conftest.$ac_objext' - { (eval echo "$as_me:5543: \"$ac_try\"") >&5 + echo "$as_me:6076: \$? = $ac_status" >&5 + (exit "$ac_status"); } && + { ac_try='test -s "conftest.$ac_objext"' + { (eval echo "$as_me:6079: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? - echo "$as_me:5546: \$? = $ac_status" >&5 - (exit $ac_status); }; }; then + echo "$as_me:6082: \$? = $ac_status" >&5 + (exit "$ac_status"); }; }; then cf_cv_fixup_sigwinch=$cf_sigwinch 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" -cf_sigwinch=`expr $cf_sigwinch - 1` +cf_sigwinch="`expr "$cf_sigwinch" - 1`" done fi -echo "$as_me:5560: result: $cf_cv_fixup_sigwinch" >&5 +echo "$as_me:6096: result: $cf_cv_fixup_sigwinch" >&5 echo "${ECHO_T}$cf_cv_fixup_sigwinch" >&6 if test "$cf_cv_fixup_sigwinch" != unknown ; then @@ -5567,13 +6103,13 @@ fi # Checks for CODESET support. -echo "$as_me:5570: checking for nl_langinfo and CODESET" >&5 +echo "$as_me:6106: checking for nl_langinfo and CODESET" >&5 echo $ECHO_N "checking for nl_langinfo and CODESET... $ECHO_C" >&6 if test "${am_cv_langinfo_codeset+set}" = set; then echo $ECHO_N "(cached) $ECHO_C" >&6 else - cat >conftest.$ac_ext <<_ACEOF -#line 5576 "configure" + cat >"conftest.$ac_ext" <<_ACEOF +#line 6112 "configure" #include "confdefs.h" #include int @@ -5584,30 +6120,30 @@ char* cs = nl_langinfo(CODESET); (void)cs return 0; } _ACEOF -rm -f conftest.$ac_objext conftest$ac_exeext -if { (eval echo "$as_me:5588: \"$ac_link\"") >&5 +rm -f "conftest.$ac_objext" "conftest$ac_exeext" +if { (eval echo "$as_me:6124: \"$ac_link\"") >&5 (eval $ac_link) 2>&5 ac_status=$? - echo "$as_me:5591: \$? = $ac_status" >&5 - (exit $ac_status); } && - { ac_try='test -s conftest$ac_exeext' - { (eval echo "$as_me:5594: \"$ac_try\"") >&5 + echo "$as_me:6127: \$? = $ac_status" >&5 + (exit "$ac_status"); } && + { ac_try='test -s "conftest$ac_exeext"' + { (eval echo "$as_me:6130: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? - echo "$as_me:5597: \$? = $ac_status" >&5 - (exit $ac_status); }; }; then + echo "$as_me:6133: \$? = $ac_status" >&5 + (exit "$ac_status"); }; }; then am_cv_langinfo_codeset=yes else echo "$as_me: failed program was:" >&5 -cat conftest.$ac_ext >&5 +cat "conftest.$ac_ext" >&5 am_cv_langinfo_codeset=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:5608: result: $am_cv_langinfo_codeset" >&5 +echo "$as_me:6144: result: $am_cv_langinfo_codeset" >&5 echo "${ECHO_T}$am_cv_langinfo_codeset" >&6 - if test $am_cv_langinfo_codeset = yes; then + if test "$am_cv_langinfo_codeset" = yes; then cat >>confdefs.h <<\EOF #define HAVE_LANGINFO_CODESET 1 @@ -5615,7 +6151,7 @@ EOF fi -echo "$as_me:5618: checking if you want to use pkg-config" >&5 +echo "$as_me:6154: 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. @@ -5625,10 +6161,10 @@ if test "${with_pkg_config+set}" = set; then else cf_pkg_config=yes fi; -echo "$as_me:5628: result: $cf_pkg_config" >&5 +echo "$as_me:6164: 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 ;; @@ -5637,7 +6173,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:5640: checking for $ac_word" >&5 +echo "$as_me:6176: 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 @@ -5654,7 +6190,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:5657: found $ac_dir/$ac_word" >&5 + echo "$as_me:6193: found $ac_dir/$ac_word" >&5 break fi done @@ -5665,10 +6201,10 @@ fi PKG_CONFIG=$ac_cv_path_PKG_CONFIG if test -n "$PKG_CONFIG"; then - echo "$as_me:5668: result: $PKG_CONFIG" >&5 + echo "$as_me:6204: result: $PKG_CONFIG" >&5 echo "${ECHO_T}$PKG_CONFIG" >&6 else - echo "$as_me:5671: result: no" >&5 + echo "$as_me:6207: result: no" >&5 echo "${ECHO_T}no" >&6 fi @@ -5677,7 +6213,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:5680: checking for $ac_word" >&5 +echo "$as_me:6216: 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 @@ -5694,7 +6230,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:5697: found $ac_dir/$ac_word" >&5 + echo "$as_me:6233: found $ac_dir/$ac_word" >&5 break fi done @@ -5706,10 +6242,10 @@ fi ac_pt_PKG_CONFIG=$ac_cv_path_ac_pt_PKG_CONFIG if test -n "$ac_pt_PKG_CONFIG"; then - echo "$as_me:5709: result: $ac_pt_PKG_CONFIG" >&5 + echo "$as_me:6245: result: $ac_pt_PKG_CONFIG" >&5 echo "${ECHO_T}$ac_pt_PKG_CONFIG" >&6 else - echo "$as_me:5712: result: no" >&5 + echo "$as_me:6248: result: no" >&5 echo "${ECHO_T}no" >&6 fi @@ -5740,30 +6276,30 @@ 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:5755: error: expected a pathname, not \"$PKG_CONFIG\"" >&5 + { { echo "$as_me:6291: 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:5762: WARNING: pkg-config is not installed" >&5 + { echo "$as_me:6298: WARNING: pkg-config is not installed" >&5 echo "$as_me: WARNING: pkg-config is not installed" >&2;} fi -echo "$as_me:5766: checking if you want to see long compiling messages" >&5 +echo "$as_me:6302: 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. @@ -5797,10 +6333,10 @@ else ECHO_CC='' fi; -echo "$as_me:5800: result: $enableval" >&5 +echo "$as_me:6336: result: $enableval" >&5 echo "${ECHO_T}$enableval" >&6 -echo "$as_me:5803: checking for ncurses wrap-prefix" >&5 +echo "$as_me:6339: checking for ncurses wrap-prefix" >&5 echo $ECHO_N "checking for ncurses wrap-prefix... $ECHO_C" >&6 # Check whether --with-ncurses-wrap-prefix or --without-ncurses-wrap-prefix was given. @@ -5810,10 +6346,10 @@ if test "${with_ncurses_wrap_prefix+set}" = set; then else NCURSES_WRAP_PREFIX=_nc_ fi; -echo "$as_me:5813: result: $NCURSES_WRAP_PREFIX" >&5 +echo "$as_me:6349: result: $NCURSES_WRAP_PREFIX" >&5 echo "${ECHO_T}$NCURSES_WRAP_PREFIX" >&6 -echo "$as_me:5816: checking if you want to check for wide-character functions" >&5 +echo "$as_me:6352: checking if you want to check for wide-character functions" >&5 echo $ECHO_N "checking if you want to check for wide-character functions... $ECHO_C" >&6 # Check whether --enable-widec or --disable-widec was given. @@ -5830,10 +6366,10 @@ else cf_enable_widec=yes fi; -echo "$as_me:5833: result: $cf_enable_widec" >&5 +echo "$as_me:6369: result: $cf_enable_widec" >&5 echo "${ECHO_T}$cf_enable_widec" >&6 -echo "$as_me:5836: checking for specific curses-directory" >&5 +echo "$as_me:6372: 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. @@ -5843,10 +6379,10 @@ if test "${with_curses_dir+set}" = set; then else cf_cv_curses_dir=no fi; -echo "$as_me:5846: result: $cf_cv_curses_dir" >&5 +echo "$as_me:6382: 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 @@ -5862,19 +6398,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:5877: error: expected a pathname, not \"$withval\"" >&5 + { { echo "$as_me:6413: error: expected a pathname, not \"$withval\"" >&5 echo "$as_me: error: expected a pathname, not \"$withval\"" >&2;} { (exit 1); exit 1; }; } ;; @@ -5886,9 +6422,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 @@ -5909,8 +6445,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 5913 "configure" + cat >"conftest.$ac_ext" <<_ACEOF +#line 6449 "configure" #include "confdefs.h" #include int @@ -5921,25 +6457,25 @@ printf("Hello") return 0; } _ACEOF -rm -f conftest.$ac_objext -if { (eval echo "$as_me:5925: \"$ac_compile\"") >&5 +rm -f "conftest.$ac_objext" +if { (eval echo "$as_me:6461: \"$ac_compile\"") >&5 (eval $ac_compile) 2>&5 ac_status=$? - echo "$as_me:5928: \$? = $ac_status" >&5 - (exit $ac_status); } && - { ac_try='test -s conftest.$ac_objext' - { (eval echo "$as_me:5931: \"$ac_try\"") >&5 + echo "$as_me:6464: \$? = $ac_status" >&5 + (exit "$ac_status"); } && + { ac_try='test -s "conftest.$ac_objext"' + { (eval echo "$as_me:6467: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? - echo "$as_me:5934: \$? = $ac_status" >&5 - (exit $ac_status); }; }; then + echo "$as_me:6470: \$? = $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 @@ -5948,11 +6484,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}:5951: testing adding $cf_add_incdir to include-path ..." 1>&5 +echo "${as_me:-configure}:6487: 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 @@ -5968,9 +6504,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 @@ -5984,7 +6520,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}:5987: testing adding $cf_add_libdir to library-path ..." 1>&5 +echo "${as_me:-configure}:6523: testing adding $cf_add_libdir to library-path ..." 1>&5 LDFLAGS="-L$cf_add_libdir $LDFLAGS" fi @@ -5997,7 +6533,7 @@ fi cf_cv_screen=curses -echo "$as_me:6000: checking for specified curses library type" >&5 +echo "$as_me:6536: checking for specified curses library type" >&5 echo $ECHO_N "checking for specified curses library type... $ECHO_C" >&6 # Check whether --with-screen or --without-screen was given. @@ -6041,20 +6577,20 @@ fi; fi; fi; -echo "$as_me:6044: result: $cf_cv_screen" >&5 +echo "$as_me:6580: result: $cf_cv_screen" >&5 echo "${ECHO_T}$cf_cv_screen" >&6 case $cf_cv_screen in (curses|curses_*) -echo "$as_me:6050: checking for extra include directories" >&5 +echo "$as_me:6586: checking for extra include directories" >&5 echo $ECHO_N "checking for extra include directories... $ECHO_C" >&6 if test "${cf_cv_curses_incdir+set}" = set; then echo $ECHO_N "(cached) $ECHO_C" >&6 else cf_cv_curses_incdir=no -case $host_os in +case "$host_os" in (hpux10.*) if test "x$cf_cv_screen" = "xcurses_colr" then @@ -6073,7 +6609,7 @@ case $host_os in esac fi -echo "$as_me:6076: result: $cf_cv_curses_incdir" >&5 +echo "$as_me:6612: result: $cf_cv_curses_incdir" >&5 echo "${ECHO_T}$cf_cv_curses_incdir" >&6 if test "$cf_cv_curses_incdir" != no then @@ -6083,7 +6619,7 @@ then fi -echo "$as_me:6086: checking if we have identified curses headers" >&5 +echo "$as_me:6622: 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 @@ -6094,44 +6630,44 @@ for cf_header in \ ncurses.h \ curses.h ncurses/ncurses.h ncurses/curses.h do -cat >conftest.$ac_ext <<_ACEOF -#line 6098 "configure" +cat >"conftest.$ac_ext" <<_ACEOF +#line 6634 "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:6110: \"$ac_compile\"") >&5 +rm -f "conftest.$ac_objext" +if { (eval echo "$as_me:6646: \"$ac_compile\"") >&5 (eval $ac_compile) 2>&5 ac_status=$? - echo "$as_me:6113: \$? = $ac_status" >&5 - (exit $ac_status); } && - { ac_try='test -s conftest.$ac_objext' - { (eval echo "$as_me:6116: \"$ac_try\"") >&5 + echo "$as_me:6649: \$? = $ac_status" >&5 + (exit "$ac_status"); } && + { ac_try='test -s "conftest.$ac_objext"' + { (eval echo "$as_me:6652: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? - echo "$as_me:6119: \$? = $ac_status" >&5 - (exit $ac_status); }; }; then + echo "$as_me:6655: \$? = $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:6130: result: $cf_cv_ncurses_header" >&5 +echo "$as_me:6666: 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:6134: error: No curses header-files found" >&5 + { { echo "$as_me:6670: error: No curses header-files found" >&5 echo "$as_me: error: No curses header-files found" >&2;} { (exit 1); exit 1; }; } fi @@ -6141,24 +6677,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:6144: checking for $ac_header" >&5 +echo "$as_me:6680: 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 6150 "configure" + cat >"conftest.$ac_ext" <<_ACEOF +#line 6686 "configure" #include "confdefs.h" #include <$ac_header> _ACEOF -if { (eval echo "$as_me:6154: \"$ac_cpp conftest.$ac_ext\"") >&5 - (eval $ac_cpp conftest.$ac_ext) 2>conftest.er1 +if { (eval echo "$as_me:6690: \"$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:6160: \$? = $ac_status" >&5 - (exit $ac_status); } >/dev/null; then + echo "$as_me:6696: \$? = $ac_status" >&5 + (exit "$ac_status"); } >/dev/null; then if test -s conftest.err; then ac_cpp_err=$ac_c_preproc_warn_flag else @@ -6171,14 +6707,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:6179: 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:6715: 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:6725: 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%'` ;; @@ -6203,8 +6739,8 @@ esac for cf_test in $cf_term_header "ncurses/term.h" "ncursesw/term.h" do -cat >conftest.$ac_ext <<_ACEOF -#line 6207 "configure" +cat >"conftest.$ac_ext" <<_ACEOF +#line 6743 "configure" #include "confdefs.h" #include #include <${cf_cv_ncurses_header:-curses.h}> @@ -6218,38 +6754,38 @@ int x = auto_left_margin; (void)x return 0; } _ACEOF -rm -f conftest.$ac_objext -if { (eval echo "$as_me:6222: \"$ac_compile\"") >&5 +rm -f "conftest.$ac_objext" +if { (eval echo "$as_me:6758: \"$ac_compile\"") >&5 (eval $ac_compile) 2>&5 ac_status=$? - echo "$as_me:6225: \$? = $ac_status" >&5 - (exit $ac_status); } && - { ac_try='test -s conftest.$ac_objext' - { (eval echo "$as_me:6228: \"$ac_try\"") >&5 + echo "$as_me:6761: \$? = $ac_status" >&5 + (exit "$ac_status"); } && + { ac_try='test -s "conftest.$ac_objext"' + { (eval echo "$as_me:6764: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? - echo "$as_me:6231: \$? = $ac_status" >&5 - (exit $ac_status); }; }; then + echo "$as_me:6767: \$? = $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:6247: result: $cf_cv_term_header" >&5 +echo "$as_me:6783: 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 @@ -6259,7 +6795,7 @@ EOF ;; esac -case $cf_cv_term_header in +case "$cf_cv_term_header" in (ncurses/term.h) cat >>confdefs.h <<\EOF @@ -6276,7 +6812,7 @@ EOF ;; esac -echo "$as_me:6279: checking for ncurses version" >&5 +echo "$as_me:6815: 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 @@ -6284,12 +6820,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 @@ -6302,36 +6838,38 @@ Autoconf "old" #endif EOF cf_try="$ac_cpp conftest.$ac_ext 2>&5 | grep '^Autoconf ' >conftest.out" - { (eval echo "$as_me:6305: \"$cf_try\"") >&5 + { (eval echo "$as_me:6841: \"$cf_try\"") >&5 (eval $cf_try) 2>&5 ac_status=$? - echo "$as_me:6308: \$? = $ac_status" >&5 - (exit $ac_status); } + echo "$as_me:6844: \$? = $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 6318 "configure" + cat >"conftest.$ac_ext" <<_ACEOF +#line 6854 "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 # endif @@ -6339,84 +6877,84 @@ int main(void) ${cf_cv_main_return:-return}(0); } _ACEOF -rm -f conftest$ac_exeext -if { (eval echo "$as_me:6343: \"$ac_link\"") >&5 +rm -f "conftest$ac_exeext" +if { (eval echo "$as_me:6881: \"$ac_link\"") >&5 (eval $ac_link) 2>&5 ac_status=$? - echo "$as_me:6346: \$? = $ac_status" >&5 - (exit $ac_status); } && { ac_try='./conftest$ac_exeext' - { (eval echo "$as_me:6348: \"$ac_try\"") >&5 + echo "$as_me:6884: \$? = $ac_status" >&5 + (exit "$ac_status"); } && { ac_try='"./conftest$ac_exeext"' + { (eval echo "$as_me:6886: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? - echo "$as_me:6351: \$? = $ac_status" >&5 - (exit $ac_status); }; }; then + echo "$as_me:6889: \$? = $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:6365: result: $cf_cv_ncurses_version" >&5 +echo "$as_me:6903: result: $cf_cv_ncurses_version" >&5 echo "${ECHO_T}$cf_cv_ncurses_version" >&6 test "$cf_cv_ncurses_version" = no || cat >>confdefs.h <<\EOF #define NCURSES 1 EOF -echo "$as_me:6372: checking if we have identified curses libraries" >&5 +echo "$as_me:6910: checking if we have identified curses libraries" >&5 echo $ECHO_N "checking if we have identified curses libraries... $ECHO_C" >&6 -cat >conftest.$ac_ext <<_ACEOF -#line 6375 "configure" +cat >"conftest.$ac_ext" <<_ACEOF +#line 6913 "configure" #include "confdefs.h" #include <${cf_cv_ncurses_header:-curses.h}> int main (void) { -initscr(); tgoto("?", 0,0) +initscr(); endwin() ; return 0; } _ACEOF -rm -f conftest.$ac_objext conftest$ac_exeext -if { (eval echo "$as_me:6387: \"$ac_link\"") >&5 +rm -f "conftest.$ac_objext" "conftest$ac_exeext" +if { (eval echo "$as_me:6925: \"$ac_link\"") >&5 (eval $ac_link) 2>&5 ac_status=$? - echo "$as_me:6390: \$? = $ac_status" >&5 - (exit $ac_status); } && - { ac_try='test -s conftest$ac_exeext' - { (eval echo "$as_me:6393: \"$ac_try\"") >&5 + echo "$as_me:6928: \$? = $ac_status" >&5 + (exit "$ac_status"); } && + { ac_try='test -s "conftest$ac_exeext"' + { (eval echo "$as_me:6931: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? - echo "$as_me:6396: \$? = $ac_status" >&5 - (exit $ac_status); }; }; then + echo "$as_me:6934: \$? = $ac_status" >&5 + (exit "$ac_status"); }; }; then cf_result=yes else echo "$as_me: failed program was:" >&5 -cat conftest.$ac_ext >&5 +cat "conftest.$ac_ext" >&5 cf_result=no fi -rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext -echo "$as_me:6405: result: $cf_result" >&5 +rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext" +echo "$as_me:6943: result: $cf_result" >&5 echo "${ECHO_T}$cf_result" >&6 if test "$cf_result" = no ; then -case $host_os in +case "$host_os" in (freebsd*) - echo "$as_me:6411: checking for tgoto in -lmytinfo" >&5 + echo "$as_me:6949: 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 6419 "configure" +cat >"conftest.$ac_ext" <<_ACEOF +#line 6957 "configure" #include "confdefs.h" /* Override any gcc2 internal prototype to avoid an error. */ @@ -6434,30 +6972,30 @@ tgoto (); return 0; } _ACEOF -rm -f conftest.$ac_objext conftest$ac_exeext -if { (eval echo "$as_me:6438: \"$ac_link\"") >&5 +rm -f "conftest.$ac_objext" "conftest$ac_exeext" +if { (eval echo "$as_me:6976: \"$ac_link\"") >&5 (eval $ac_link) 2>&5 ac_status=$? - echo "$as_me:6441: \$? = $ac_status" >&5 - (exit $ac_status); } && - { ac_try='test -s conftest$ac_exeext' - { (eval echo "$as_me:6444: \"$ac_try\"") >&5 + echo "$as_me:6979: \$? = $ac_status" >&5 + (exit "$ac_status"); } && + { ac_try='test -s "conftest$ac_exeext"' + { (eval echo "$as_me:6982: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? - echo "$as_me:6447: \$? = $ac_status" >&5 - (exit $ac_status); }; }; then + echo "$as_me:6985: \$? = $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:6458: result: $ac_cv_lib_mytinfo_tgoto" >&5 +echo "$as_me:6996: 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_add_libs="$LIBS" # reverse order @@ -6485,15 +7023,15 @@ fi # term.h) for cur_colr if test "x$cf_cv_screen" = "xcurses_colr" then - echo "$as_me:6488: checking for initscr in -lcur_colr" >&5 + echo "$as_me:7026: checking for initscr in -lcur_colr" >&5 echo $ECHO_N "checking for initscr in -lcur_colr... $ECHO_C" >&6 if test "${ac_cv_lib_cur_colr_initscr+set}" = set; then echo $ECHO_N "(cached) $ECHO_C" >&6 else ac_check_lib_save_LIBS=$LIBS LIBS="-lcur_colr $LIBS" -cat >conftest.$ac_ext <<_ACEOF -#line 6496 "configure" +cat >"conftest.$ac_ext" <<_ACEOF +#line 7034 "configure" #include "confdefs.h" /* Override any gcc2 internal prototype to avoid an error. */ @@ -6511,30 +7049,30 @@ initscr (); return 0; } _ACEOF -rm -f conftest.$ac_objext conftest$ac_exeext -if { (eval echo "$as_me:6515: \"$ac_link\"") >&5 +rm -f "conftest.$ac_objext" "conftest$ac_exeext" +if { (eval echo "$as_me:7053: \"$ac_link\"") >&5 (eval $ac_link) 2>&5 ac_status=$? - echo "$as_me:6518: \$? = $ac_status" >&5 - (exit $ac_status); } && - { ac_try='test -s conftest$ac_exeext' - { (eval echo "$as_me:6521: \"$ac_try\"") >&5 + echo "$as_me:7056: \$? = $ac_status" >&5 + (exit "$ac_status"); } && + { ac_try='test -s "conftest$ac_exeext"' + { (eval echo "$as_me:7059: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? - echo "$as_me:6524: \$? = $ac_status" >&5 - (exit $ac_status); }; }; then + echo "$as_me:7062: \$? = $ac_status" >&5 + (exit "$ac_status"); }; }; then ac_cv_lib_cur_colr_initscr=yes else echo "$as_me: failed program was:" >&5 -cat conftest.$ac_ext >&5 +cat "conftest.$ac_ext" >&5 ac_cv_lib_cur_colr_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:6535: result: $ac_cv_lib_cur_colr_initscr" >&5 +echo "$as_me:7073: result: $ac_cv_lib_cur_colr_initscr" >&5 echo "${ECHO_T}$ac_cv_lib_cur_colr_initscr" >&6 -if test $ac_cv_lib_cur_colr_initscr = yes; then +if test "$ac_cv_lib_cur_colr_initscr" = yes; then cf_add_libs="$LIBS" # reverse order @@ -6556,15 +7094,15 @@ LIBS="$cf_add_libs" else - echo "$as_me:6559: checking for initscr in -lHcurses" >&5 + echo "$as_me:7097: checking for initscr in -lHcurses" >&5 echo $ECHO_N "checking for initscr in -lHcurses... $ECHO_C" >&6 if test "${ac_cv_lib_Hcurses_initscr+set}" = set; then echo $ECHO_N "(cached) $ECHO_C" >&6 else ac_check_lib_save_LIBS=$LIBS LIBS="-lHcurses $LIBS" -cat >conftest.$ac_ext <<_ACEOF -#line 6567 "configure" +cat >"conftest.$ac_ext" <<_ACEOF +#line 7105 "configure" #include "confdefs.h" /* Override any gcc2 internal prototype to avoid an error. */ @@ -6582,30 +7120,30 @@ initscr (); return 0; } _ACEOF -rm -f conftest.$ac_objext conftest$ac_exeext -if { (eval echo "$as_me:6586: \"$ac_link\"") >&5 +rm -f "conftest.$ac_objext" "conftest$ac_exeext" +if { (eval echo "$as_me:7124: \"$ac_link\"") >&5 (eval $ac_link) 2>&5 ac_status=$? - echo "$as_me:6589: \$? = $ac_status" >&5 - (exit $ac_status); } && - { ac_try='test -s conftest$ac_exeext' - { (eval echo "$as_me:6592: \"$ac_try\"") >&5 + echo "$as_me:7127: \$? = $ac_status" >&5 + (exit "$ac_status"); } && + { ac_try='test -s "conftest$ac_exeext"' + { (eval echo "$as_me:7130: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? - echo "$as_me:6595: \$? = $ac_status" >&5 - (exit $ac_status); }; }; then + echo "$as_me:7133: \$? = $ac_status" >&5 + (exit "$ac_status"); }; }; then ac_cv_lib_Hcurses_initscr=yes else echo "$as_me: failed program was:" >&5 -cat conftest.$ac_ext >&5 +cat "conftest.$ac_ext" >&5 ac_cv_lib_Hcurses_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:6606: result: $ac_cv_lib_Hcurses_initscr" >&5 +echo "$as_me:7144: result: $ac_cv_lib_Hcurses_initscr" >&5 echo "${ECHO_T}$ac_cv_lib_Hcurses_initscr" >&6 -if test $ac_cv_lib_Hcurses_initscr = yes; then +if test "$ac_cv_lib_Hcurses_initscr" = yes; then # HP's header uses __HP_CURSES, but user claims _HP_CURSES. @@ -6645,9 +7183,9 @@ fi if test -n "/lib64" ; then for cf_add_libdir in /lib64 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 @@ -6661,7 +7199,7 @@ if test -n "/lib64" ; then if test "$cf_have_libdir" = no ; then test -n "$verbose" && echo " adding $cf_add_libdir to library-path" 1>&6 -echo "${as_me:-configure}:6664: testing adding $cf_add_libdir to library-path ..." 1>&5 +echo "${as_me:-configure}:7202: testing adding $cf_add_libdir to library-path ..." 1>&5 LDFLAGS="-L$cf_add_libdir $LDFLAGS" fi @@ -6674,9 +7212,9 @@ fi if test -n "/lib" ; then for cf_add_libdir in /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 @@ -6690,7 +7228,7 @@ if test -n "/lib" ; then if test "$cf_have_libdir" = no ; then test -n "$verbose" && echo " adding $cf_add_libdir to library-path" 1>&6 -echo "${as_me:-configure}:6693: testing adding $cf_add_libdir to library-path ..." 1>&5 +echo "${as_me:-configure}:7231: testing adding $cf_add_libdir to library-path ..." 1>&5 LDFLAGS="-L$cf_add_libdir $LDFLAGS" fi @@ -6705,9 +7243,9 @@ fi if test -n "/lib" ; then for cf_add_libdir in /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 @@ -6721,7 +7259,7 @@ if test -n "/lib" ; then if test "$cf_have_libdir" = no ; then test -n "$verbose" && echo " adding $cf_add_libdir to library-path" 1>&6 -echo "${as_me:-configure}:6724: testing adding $cf_add_libdir to library-path ..." 1>&5 +echo "${as_me:-configure}:7262: testing adding $cf_add_libdir to library-path ..." 1>&5 LDFLAGS="-L$cf_add_libdir $LDFLAGS" fi @@ -6740,9 +7278,9 @@ fi if test -n "/usr/5lib" ; then for cf_add_libdir in /usr/5lib 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 @@ -6756,7 +7294,7 @@ if test -n "/usr/5lib" ; then if test "$cf_have_libdir" = no ; then test -n "$verbose" && echo " adding $cf_add_libdir to library-path" 1>&6 -echo "${as_me:-configure}:6759: testing adding $cf_add_libdir to library-path ..." 1>&5 +echo "${as_me:-configure}:7297: testing adding $cf_add_libdir to library-path ..." 1>&5 LDFLAGS="-L$cf_add_libdir $LDFLAGS" fi @@ -6800,13 +7338,13 @@ if test ".$ac_cv_func_initscr" != .yes ; then # because it may be needed to link the test-case for initscr. if test "x$cf_term_lib" = x then - echo "$as_me:6803: checking for tgoto" >&5 + echo "$as_me:7341: checking for tgoto" >&5 echo $ECHO_N "checking for tgoto... $ECHO_C" >&6 if test "${ac_cv_func_tgoto+set}" = set; then echo $ECHO_N "(cached) $ECHO_C" >&6 else - cat >conftest.$ac_ext <<_ACEOF -#line 6809 "configure" + cat >"conftest.$ac_ext" <<_ACEOF +#line 7347 "configure" #include "confdefs.h" #define tgoto autoconf_temporary #include /* least-intrusive standard header which defines gcc2 __stub macros */ @@ -6836,44 +7374,44 @@ main (void) return 0; } _ACEOF -rm -f conftest.$ac_objext conftest$ac_exeext -if { (eval echo "$as_me:6840: \"$ac_link\"") >&5 +rm -f "conftest.$ac_objext" "conftest$ac_exeext" +if { (eval echo "$as_me:7378: \"$ac_link\"") >&5 (eval $ac_link) 2>&5 ac_status=$? - echo "$as_me:6843: \$? = $ac_status" >&5 - (exit $ac_status); } && - { ac_try='test -s conftest$ac_exeext' - { (eval echo "$as_me:6846: \"$ac_try\"") >&5 + echo "$as_me:7381: \$? = $ac_status" >&5 + (exit "$ac_status"); } && + { ac_try='test -s "conftest$ac_exeext"' + { (eval echo "$as_me:7384: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? - echo "$as_me:6849: \$? = $ac_status" >&5 - (exit $ac_status); }; }; then + echo "$as_me:7387: \$? = $ac_status" >&5 + (exit "$ac_status"); }; }; then ac_cv_func_tgoto=yes else echo "$as_me: failed program was:" >&5 -cat conftest.$ac_ext >&5 +cat "conftest.$ac_ext" >&5 ac_cv_func_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" fi -echo "$as_me:6859: result: $ac_cv_func_tgoto" >&5 +echo "$as_me:7397: result: $ac_cv_func_tgoto" >&5 echo "${ECHO_T}$ac_cv_func_tgoto" >&6 -if test $ac_cv_func_tgoto = yes; then +if test "$ac_cv_func_tgoto" = yes; then cf_term_lib=predefined else for cf_term_lib in $cf_check_list otermcap termcap tinfo termlib unknown do as_ac_Lib=`echo "ac_cv_lib_$cf_term_lib''_tgoto" | $as_tr_sh` -echo "$as_me:6868: checking for tgoto in -l$cf_term_lib" >&5 +echo "$as_me:7406: checking for tgoto in -l$cf_term_lib" >&5 echo $ECHO_N "checking for tgoto in -l$cf_term_lib... $ECHO_C" >&6 if eval "test \"\${$as_ac_Lib+set}\" = set"; then echo $ECHO_N "(cached) $ECHO_C" >&6 else ac_check_lib_save_LIBS=$LIBS LIBS="-l$cf_term_lib $LIBS" -cat >conftest.$ac_ext <<_ACEOF -#line 6876 "configure" +cat >"conftest.$ac_ext" <<_ACEOF +#line 7414 "configure" #include "confdefs.h" /* Override any gcc2 internal prototype to avoid an error. */ @@ -6891,32 +7429,32 @@ tgoto (); return 0; } _ACEOF -rm -f conftest.$ac_objext conftest$ac_exeext -if { (eval echo "$as_me:6895: \"$ac_link\"") >&5 +rm -f "conftest.$ac_objext" "conftest$ac_exeext" +if { (eval echo "$as_me:7433: \"$ac_link\"") >&5 (eval $ac_link) 2>&5 ac_status=$? - echo "$as_me:6898: \$? = $ac_status" >&5 - (exit $ac_status); } && - { ac_try='test -s conftest$ac_exeext' - { (eval echo "$as_me:6901: \"$ac_try\"") >&5 + echo "$as_me:7436: \$? = $ac_status" >&5 + (exit "$ac_status"); } && + { ac_try='test -s "conftest$ac_exeext"' + { (eval echo "$as_me:7439: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? - echo "$as_me:6904: \$? = $ac_status" >&5 - (exit $ac_status); }; }; then + echo "$as_me:7442: \$? = $ac_status" >&5 + (exit "$ac_status"); }; }; then eval "$as_ac_Lib=yes" else echo "$as_me: failed program was:" >&5 -cat conftest.$ac_ext >&5 +cat "conftest.$ac_ext" >&5 eval "$as_ac_Lib=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:6915: result: `eval echo '${'$as_ac_Lib'}'`" >&5 -echo "${ECHO_T}`eval echo '${'$as_ac_Lib'}'`" >&6 -if test `eval echo '${'$as_ac_Lib'}'` = yes; then +echo "$as_me:7453: result: `eval echo '${'"$as_ac_Lib"'}'`" >&5 +echo "${ECHO_T}`eval echo '${'"$as_ac_Lib"'}'`" >&6 +if test "`eval echo '${'"$as_ac_Lib"'}'`" = yes; then - : ${cf_nculib_root:=$cf_term_lib} + : "${cf_nculib_root:=$cf_term_lib}" break fi @@ -6935,10 +7473,10 @@ fi do LIBS="-l$cf_curs_lib $cf_save_LIBS" if test "$cf_term_lib" = unknown || test "$cf_term_lib" = "$cf_curs_lib" ; then - echo "$as_me:6938: checking if we can link with $cf_curs_lib library" >&5 + echo "$as_me:7476: checking if we can link with $cf_curs_lib library" >&5 echo $ECHO_N "checking if we can link with $cf_curs_lib library... $ECHO_C" >&6 - cat >conftest.$ac_ext <<_ACEOF -#line 6941 "configure" + cat >"conftest.$ac_ext" <<_ACEOF +#line 7479 "configure" #include "confdefs.h" #include <${cf_cv_ncurses_header:-curses.h}> int @@ -6949,65 +7487,65 @@ initscr() return 0; } _ACEOF -rm -f conftest.$ac_objext conftest$ac_exeext -if { (eval echo "$as_me:6953: \"$ac_link\"") >&5 +rm -f "conftest.$ac_objext" "conftest$ac_exeext" +if { (eval echo "$as_me:7491: \"$ac_link\"") >&5 (eval $ac_link) 2>&5 ac_status=$? - echo "$as_me:6956: \$? = $ac_status" >&5 - (exit $ac_status); } && - { ac_try='test -s conftest$ac_exeext' - { (eval echo "$as_me:6959: \"$ac_try\"") >&5 + echo "$as_me:7494: \$? = $ac_status" >&5 + (exit "$ac_status"); } && + { ac_try='test -s "conftest$ac_exeext"' + { (eval echo "$as_me:7497: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? - echo "$as_me:6962: \$? = $ac_status" >&5 - (exit $ac_status); }; }; then + echo "$as_me:7500: \$? = $ac_status" >&5 + (exit "$ac_status"); }; }; then cf_result=yes else echo "$as_me: failed program was:" >&5 -cat conftest.$ac_ext >&5 +cat "conftest.$ac_ext" >&5 cf_result=no fi -rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext - echo "$as_me:6971: result: $cf_result" >&5 +rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext" + echo "$as_me:7509: result: $cf_result" >&5 echo "${ECHO_T}$cf_result" >&6 - test $cf_result = yes && break + test "$cf_result" = yes && break elif test "$cf_curs_lib" = "$cf_term_lib" ; then cf_result=no elif test "$cf_term_lib" != predefined ; then - echo "$as_me:6977: checking if we need both $cf_curs_lib and $cf_term_lib libraries" >&5 + echo "$as_me:7515: checking if we need both $cf_curs_lib and $cf_term_lib libraries" >&5 echo $ECHO_N "checking if we need both $cf_curs_lib and $cf_term_lib libraries... $ECHO_C" >&6 - cat >conftest.$ac_ext <<_ACEOF -#line 6980 "configure" + cat >"conftest.$ac_ext" <<_ACEOF +#line 7518 "configure" #include "confdefs.h" #include <${cf_cv_ncurses_header:-curses.h}> int main (void) { -initscr(); tgoto((char *)0, 0, 0); +initscr(); endwin(); ; return 0; } _ACEOF -rm -f conftest.$ac_objext conftest$ac_exeext -if { (eval echo "$as_me:6992: \"$ac_link\"") >&5 +rm -f "conftest.$ac_objext" "conftest$ac_exeext" +if { (eval echo "$as_me:7530: \"$ac_link\"") >&5 (eval $ac_link) 2>&5 ac_status=$? - echo "$as_me:6995: \$? = $ac_status" >&5 - (exit $ac_status); } && - { ac_try='test -s conftest$ac_exeext' - { (eval echo "$as_me:6998: \"$ac_try\"") >&5 + echo "$as_me:7533: \$? = $ac_status" >&5 + (exit "$ac_status"); } && + { ac_try='test -s "conftest$ac_exeext"' + { (eval echo "$as_me:7536: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? - echo "$as_me:7001: \$? = $ac_status" >&5 - (exit $ac_status); }; }; then + echo "$as_me:7539: \$? = $ac_status" >&5 + (exit "$ac_status"); }; }; then cf_result=no else echo "$as_me: failed program was:" >&5 -cat conftest.$ac_ext >&5 +cat "conftest.$ac_ext" >&5 LIBS="-l$cf_curs_lib -l$cf_term_lib $cf_save_LIBS" - cat >conftest.$ac_ext <<_ACEOF -#line 7010 "configure" + cat >"conftest.$ac_ext" <<_ACEOF +#line 7548 "configure" #include "confdefs.h" #include <${cf_cv_ncurses_header:-curses.h}> int @@ -7018,35 +7556,35 @@ initscr() return 0; } _ACEOF -rm -f conftest.$ac_objext conftest$ac_exeext -if { (eval echo "$as_me:7022: \"$ac_link\"") >&5 +rm -f "conftest.$ac_objext" "conftest$ac_exeext" +if { (eval echo "$as_me:7560: \"$ac_link\"") >&5 (eval $ac_link) 2>&5 ac_status=$? - echo "$as_me:7025: \$? = $ac_status" >&5 - (exit $ac_status); } && - { ac_try='test -s conftest$ac_exeext' - { (eval echo "$as_me:7028: \"$ac_try\"") >&5 + echo "$as_me:7563: \$? = $ac_status" >&5 + (exit "$ac_status"); } && + { ac_try='test -s "conftest$ac_exeext"' + { (eval echo "$as_me:7566: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? - echo "$as_me:7031: \$? = $ac_status" >&5 - (exit $ac_status); }; }; then + echo "$as_me:7569: \$? = $ac_status" >&5 + (exit "$ac_status"); }; }; then cf_result=yes else echo "$as_me: failed program was:" >&5 -cat conftest.$ac_ext >&5 +cat "conftest.$ac_ext" >&5 cf_result=error 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 - echo "$as_me:7043: result: $cf_result" >&5 +rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext" + echo "$as_me:7581: result: $cf_result" >&5 echo "${ECHO_T}$cf_result" >&6 - test $cf_result != error && break + test "$cf_result" != error && break fi done fi - test $cf_curs_lib = unknown && { { echo "$as_me:7049: error: no curses library found" >&5 + test "$cf_curs_lib" = unknown && { { echo "$as_me:7587: error: no curses library found" >&5 echo "$as_me: error: no curses library found" >&2;} { (exit 1); exit 1; }; } fi @@ -7055,18 +7593,71 @@ fi ;; (ncursesw*) -echo "$as_me:7058: 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:7599: 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 7605 "configure" +#include "confdefs.h" +#include <$ac_header> +_ACEOF +if { (eval echo "$as_me:7609: \"$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:7615: \$? = $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:7634: 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 7066 "configure" + cat >"conftest.$ac_ext" <<_ACEOF +#line 7652 "configure" #include "confdefs.h" #include +#include +#ifdef HAVE_WCHAR_H +#include +#endif + int main (void) { @@ -7075,34 +7666,34 @@ putwc(0,0); return 0; } _ACEOF -rm -f conftest.$ac_objext conftest$ac_exeext -if { (eval echo "$as_me:7079: \"$ac_link\"") >&5 +rm -f "conftest.$ac_objext" "conftest$ac_exeext" +if { (eval echo "$as_me:7670: \"$ac_link\"") >&5 (eval $ac_link) 2>&5 ac_status=$? - echo "$as_me:7082: \$? = $ac_status" >&5 - (exit $ac_status); } && - { ac_try='test -s conftest$ac_exeext' - { (eval echo "$as_me:7085: \"$ac_try\"") >&5 + echo "$as_me:7673: \$? = $ac_status" >&5 + (exit "$ac_status"); } && + { ac_try='test -s "conftest$ac_exeext"' + { (eval echo "$as_me:7676: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? - echo "$as_me:7088: \$? = $ac_status" >&5 - (exit $ac_status); }; }; then + echo "$as_me:7679: \$? = $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}:7100: testing Starting FIND_LINKAGE(utf8,) ..." 1>&5 +echo "${as_me:-configure}:7691: testing Starting FIND_LINKAGE(utf8,) ..." 1>&5 cf_save_LIBS="$LIBS" -cat >conftest.$ac_ext <<_ACEOF -#line 7105 "configure" +cat >"conftest.$ac_ext" <<_ACEOF +#line 7696 "configure" #include "confdefs.h" #include @@ -7114,18 +7705,18 @@ putwc(0,0); return 0; } _ACEOF -rm -f conftest.$ac_objext conftest$ac_exeext -if { (eval echo "$as_me:7118: \"$ac_link\"") >&5 +rm -f "conftest.$ac_objext" "conftest$ac_exeext" +if { (eval echo "$as_me:7709: \"$ac_link\"") >&5 (eval $ac_link) 2>&5 ac_status=$? - echo "$as_me:7121: \$? = $ac_status" >&5 - (exit $ac_status); } && - { ac_try='test -s conftest$ac_exeext' - { (eval echo "$as_me:7124: \"$ac_try\"") >&5 + echo "$as_me:7712: \$? = $ac_status" >&5 + (exit "$ac_status"); } && + { ac_try='test -s "conftest$ac_exeext"' + { (eval echo "$as_me:7715: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? - echo "$as_me:7127: \$? = $ac_status" >&5 - (exit $ac_status); }; }; then + echo "$as_me:7718: \$? = $ac_status" >&5 + (exit "$ac_status"); }; }; then cf_cv_find_linkage_utf8=yes cf_cv_header_path_utf8=/usr/include @@ -7133,12 +7724,12 @@ if { (eval echo "$as_me:7118: \"$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 7141 "configure" +cat >"conftest.$ac_ext" <<_ACEOF +#line 7732 "configure" #include "confdefs.h" #include @@ -7150,18 +7741,18 @@ putwc(0,0); return 0; } _ACEOF -rm -f conftest.$ac_objext conftest$ac_exeext -if { (eval echo "$as_me:7154: \"$ac_link\"") >&5 +rm -f "conftest.$ac_objext" "conftest$ac_exeext" +if { (eval echo "$as_me:7745: \"$ac_link\"") >&5 (eval $ac_link) 2>&5 ac_status=$? - echo "$as_me:7157: \$? = $ac_status" >&5 - (exit $ac_status); } && - { ac_try='test -s conftest$ac_exeext' - { (eval echo "$as_me:7160: \"$ac_try\"") >&5 + echo "$as_me:7748: \$? = $ac_status" >&5 + (exit "$ac_status"); } && + { ac_try='test -s "conftest$ac_exeext"' + { (eval echo "$as_me:7751: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? - echo "$as_me:7163: \$? = $ac_status" >&5 - (exit $ac_status); }; }; then + echo "$as_me:7754: \$? = $ac_status" >&5 + (exit "$ac_status"); }; }; then cf_cv_find_linkage_utf8=yes cf_cv_header_path_utf8=/usr/include @@ -7170,16 +7761,16 @@ if { (eval echo "$as_me:7154: \"$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}:7180: testing find linkage for utf8 library ..." 1>&5 +echo "${as_me:-configure}:7771: testing find linkage for utf8 library ..." 1>&5 -echo "${as_me:-configure}:7182: testing Searching for headers in FIND_LINKAGE(utf8,) ..." 1>&5 +echo "${as_me:-configure}:7773: testing Searching for headers in FIND_LINKAGE(utf8,) ..." 1>&5 cf_save_CPPFLAGS="$CPPFLAGS" cf_test_CPPFLAGS="$CPPFLAGS" @@ -7191,7 +7782,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$,,'` @@ -7199,11 +7790,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" @@ -7220,11 +7811,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 \ @@ -7238,13 +7829,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 @@ -7252,33 +7843,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}:7273: testing ... testing $cf_cv_header_path_utf8 ..." 1>&5 +echo "${as_me:-configure}:7864: 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 7281 "configure" + cat >"conftest.$ac_ext" <<_ACEOF +#line 7872 "configure" #include "confdefs.h" #include @@ -7290,40 +7881,40 @@ putwc(0,0); return 0; } _ACEOF -rm -f conftest.$ac_objext -if { (eval echo "$as_me:7294: \"$ac_compile\"") >&5 +rm -f "conftest.$ac_objext" +if { (eval echo "$as_me:7885: \"$ac_compile\"") >&5 (eval $ac_compile) 2>&5 ac_status=$? - echo "$as_me:7297: \$? = $ac_status" >&5 - (exit $ac_status); } && - { ac_try='test -s conftest.$ac_objext' - { (eval echo "$as_me:7300: \"$ac_try\"") >&5 + echo "$as_me:7888: \$? = $ac_status" >&5 + (exit "$ac_status"); } && + { ac_try='test -s "conftest.$ac_objext"' + { (eval echo "$as_me:7891: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? - echo "$as_me:7303: \$? = $ac_status" >&5 - (exit $ac_status); }; }; then + echo "$as_me:7894: \$? = $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}:7308: testing ... found utf8 headers in $cf_cv_header_path_utf8 ..." 1>&5 +echo "${as_me:-configure}:7899: 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}:7326: testing Searching for utf8 library in FIND_LINKAGE(utf8,) ..." 1>&5 +echo "${as_me:-configure}:7917: testing Searching for utf8 library in FIND_LINKAGE(utf8,) ..." 1>&5 cf_save_LIBS="$LIBS" cf_save_LDFLAGS="$LDFLAGS" @@ -7335,7 +7926,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$,,'` @@ -7343,11 +7934,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" @@ -7362,11 +7953,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 \ @@ -7380,13 +7971,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 @@ -7395,16 +7986,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}:7401: testing ... testing $cf_cv_library_path_utf8 ..." 1>&5 +echo "${as_me:-configure}:7992: 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 7407 "configure" + cat >"conftest.$ac_ext" <<_ACEOF +#line 7998 "configure" #include "confdefs.h" #include @@ -7416,36 +8007,36 @@ putwc(0,0); return 0; } _ACEOF -rm -f conftest.$ac_objext conftest$ac_exeext -if { (eval echo "$as_me:7420: \"$ac_link\"") >&5 +rm -f "conftest.$ac_objext" "conftest$ac_exeext" +if { (eval echo "$as_me:8011: \"$ac_link\"") >&5 (eval $ac_link) 2>&5 ac_status=$? - echo "$as_me:7423: \$? = $ac_status" >&5 - (exit $ac_status); } && - { ac_try='test -s conftest$ac_exeext' - { (eval echo "$as_me:7426: \"$ac_try\"") >&5 + echo "$as_me:8014: \$? = $ac_status" >&5 + (exit "$ac_status"); } && + { ac_try='test -s "conftest$ac_exeext"' + { (eval echo "$as_me:8017: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? - echo "$as_me:7429: \$? = $ac_status" >&5 - (exit $ac_status); }; }; then + echo "$as_me:8020: \$? = $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}:7434: testing ... found utf8 library in $cf_cv_library_path_utf8 ..." 1>&5 +echo "${as_me:-configure}:8025: 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" @@ -7457,10 +8048,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" @@ -7471,9 +8062,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:7476: result: $cf_cv_utf8_lib" >&5 +echo "$as_me:8067: 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 @@ -7487,9 +8078,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 @@ -7510,8 +8101,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 7514 "configure" + cat >"conftest.$ac_ext" <<_ACEOF +#line 8105 "configure" #include "confdefs.h" #include int @@ -7522,25 +8113,25 @@ printf("Hello") return 0; } _ACEOF -rm -f conftest.$ac_objext -if { (eval echo "$as_me:7526: \"$ac_compile\"") >&5 +rm -f "conftest.$ac_objext" +if { (eval echo "$as_me:8117: \"$ac_compile\"") >&5 (eval $ac_compile) 2>&5 ac_status=$? - echo "$as_me:7529: \$? = $ac_status" >&5 - (exit $ac_status); } && - { ac_try='test -s conftest.$ac_objext' - { (eval echo "$as_me:7532: \"$ac_try\"") >&5 + echo "$as_me:8120: \$? = $ac_status" >&5 + (exit "$ac_status"); } && + { ac_try='test -s "conftest.$ac_objext"' + { (eval echo "$as_me:8123: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? - echo "$as_me:7535: \$? = $ac_status" >&5 - (exit $ac_status); }; }; then + echo "$as_me:8126: \$? = $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 @@ -7549,11 +8140,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}:7552: testing adding $cf_add_incdir to include-path ..." 1>&5 +echo "${as_me:-configure}:8143: 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 @@ -7569,9 +8160,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 @@ -7585,7 +8176,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}:7588: testing adding $cf_add_libdir to library-path ..." 1>&5 +echo "${as_me:-configure}:8179: testing adding $cf_add_libdir to library-path ..." 1>&5 LDFLAGS="-L$cf_add_libdir $LDFLAGS" fi @@ -7615,13 +8206,13 @@ cf_ncuconfig_root=$cf_cv_screen cf_have_ncuconfig=no if test "x${PKG_CONFIG:=none}" != xnone; then - echo "$as_me:7618: checking pkg-config for $cf_ncuconfig_root" >&5 + echo "$as_me:8209: 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:7621: result: yes" >&5 + echo "$as_me:8212: result: yes" >&5 echo "${ECHO_T}yes" >&6 - echo "$as_me:7624: checking if the $cf_ncuconfig_root package files work" >&5 + echo "$as_me:8215: 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 @@ -7629,8 +8220,8 @@ echo $ECHO_N "checking if the $cf_ncuconfig_root package files work... $ECHO_C" 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` + 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 @@ -7646,19 +8237,19 @@ cf_new_extra_cppflags= 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" @@ -7677,7 +8268,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/=.*//'` @@ -7707,7 +8298,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}" \ @@ -7753,66 +8344,66 @@ for cf_add_1lib in $cf_add_0lib; do done LIBS="$cf_add_libs" - cat >conftest.$ac_ext <<_ACEOF -#line 7757 "configure" + cat >"conftest.$ac_ext" <<_ACEOF +#line 8348 "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:7769: \"$ac_link\"") >&5 +rm -f "conftest.$ac_objext" "conftest$ac_exeext" +if { (eval echo "$as_me:8360: \"$ac_link\"") >&5 (eval $ac_link) 2>&5 ac_status=$? - echo "$as_me:7772: \$? = $ac_status" >&5 - (exit $ac_status); } && - { ac_try='test -s conftest$ac_exeext' - { (eval echo "$as_me:7775: \"$ac_try\"") >&5 + echo "$as_me:8363: \$? = $ac_status" >&5 + (exit "$ac_status"); } && + { ac_try='test -s "conftest$ac_exeext"' + { (eval echo "$as_me:8366: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? - echo "$as_me:7778: \$? = $ac_status" >&5 - (exit $ac_status); }; }; then + echo "$as_me:8369: \$? = $ac_status" >&5 + (exit "$ac_status"); }; }; then if test "$cross_compiling" = yes; then cf_test_ncuconfig=maybe else - cat >conftest.$ac_ext <<_ACEOF -#line 7784 "configure" + cat >"conftest.$ac_ext" <<_ACEOF +#line 8375 "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:7791: \"$ac_link\"") >&5 +rm -f "conftest$ac_exeext" +if { (eval echo "$as_me:8382: \"$ac_link\"") >&5 (eval $ac_link) 2>&5 ac_status=$? - echo "$as_me:7794: \$? = $ac_status" >&5 - (exit $ac_status); } && { ac_try='./conftest$ac_exeext' - { (eval echo "$as_me:7796: \"$ac_try\"") >&5 + echo "$as_me:8385: \$? = $ac_status" >&5 + (exit "$ac_status"); } && { ac_try='"./conftest$ac_exeext"' + { (eval echo "$as_me:8387: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? - echo "$as_me:7799: \$? = $ac_status" >&5 - (exit $ac_status); }; }; then + echo "$as_me:8390: \$? = $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 +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 +cat "conftest.$ac_ext" >&5 cf_test_ncuconfig=no fi -rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext +rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext" CFLAGS="$cf_save_CFLAGS" CPPFLAGS="$cf_save_CPPFLAGS" @@ -7827,26 +8418,52 @@ rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext ;; esac +for cf_add_cflags in $cf_pkg_cflags +do + case "x$cf_add_cflags" in + (x-[DU]*) + +cf_tmp_cflag=`echo "x$cf_add_cflags" | sed -e 's/^.//' -e 's/=.*//'` +while true +do + cf_old_cflag=`echo "x$CFLAGS" | sed -e 's/^.//' -e 's/[ ][ ]*-/ -/g' -e "s%$cf_tmp_cflag\\(=[^ ][^ ]*\\)\?%%" -e 's/^[ ]*//' -e 's%[ ][ ]*-D% -D%g' -e 's%[ ][ ]*-I% -I%g'` + test "$CFLAGS" != "$cf_old_cflag" || break + + CFLAGS="$cf_old_cflag" +done + +cf_tmp_cflag=`echo "x$cf_add_cflags" | sed -e 's/^.//' -e 's/=.*//'` +while true +do + cf_old_cflag=`echo "x$CPPFLAGS" | sed -e 's/^.//' -e 's/[ ][ ]*-/ -/g' -e "s%$cf_tmp_cflag\\(=[^ ][^ ]*\\)\?%%" -e 's/^[ ]*//' -e 's%[ ][ ]*-D% -D%g' -e 's%[ ][ ]*-I% -I%g'` + test "$CPPFLAGS" != "$cf_old_cflag" || break + + CPPFLAGS="$cf_old_cflag" +done + + ;; + esac + cf_fix_cppflags=no cf_new_cflags= cf_new_cppflags= cf_new_extra_cppflags= -for cf_add_cflags in $cf_pkg_cflags +for cf_add_cflags in $cf_add_cflags do -case $cf_fix_cppflags in +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" @@ -7865,7 +8482,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/=.*//'` @@ -7895,7 +8512,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}" \ @@ -7925,6 +8542,8 @@ if test -n "$cf_new_extra_cppflags" ; then fi +done + cf_add_libs="$LIBS" # reverse order cf_add_0lib= @@ -7941,67 +8560,67 @@ for cf_add_1lib in $cf_add_0lib; do done LIBS="$cf_add_libs" - cat >conftest.$ac_ext <<_ACEOF -#line 7945 "configure" + cat >"conftest.$ac_ext" <<_ACEOF +#line 8564 "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:7957: \"$ac_link\"") >&5 +rm -f "conftest.$ac_objext" "conftest$ac_exeext" +if { (eval echo "$as_me:8576: \"$ac_link\"") >&5 (eval $ac_link) 2>&5 ac_status=$? - echo "$as_me:7960: \$? = $ac_status" >&5 - (exit $ac_status); } && - { ac_try='test -s conftest$ac_exeext' - { (eval echo "$as_me:7963: \"$ac_try\"") >&5 + echo "$as_me:8579: \$? = $ac_status" >&5 + (exit "$ac_status"); } && + { ac_try='test -s "conftest$ac_exeext"' + { (eval echo "$as_me:8582: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? - echo "$as_me:7966: \$? = $ac_status" >&5 - (exit $ac_status); }; }; then + echo "$as_me:8585: \$? = $ac_status" >&5 + (exit "$ac_status"); }; }; then if test "$cross_compiling" = yes; then cf_have_ncuconfig=maybe else - cat >conftest.$ac_ext <<_ACEOF -#line 7972 "configure" + cat >"conftest.$ac_ext" <<_ACEOF +#line 8591 "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:7979: \"$ac_link\"") >&5 +rm -f "conftest$ac_exeext" +if { (eval echo "$as_me:8598: \"$ac_link\"") >&5 (eval $ac_link) 2>&5 ac_status=$? - echo "$as_me:7982: \$? = $ac_status" >&5 - (exit $ac_status); } && { ac_try='./conftest$ac_exeext' - { (eval echo "$as_me:7984: \"$ac_try\"") >&5 + echo "$as_me:8601: \$? = $ac_status" >&5 + (exit "$ac_status"); } && { ac_try='"./conftest$ac_exeext"' + { (eval echo "$as_me:8603: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? - echo "$as_me:7987: \$? = $ac_status" >&5 - (exit $ac_status); }; }; then + echo "$as_me:8606: \$? = $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:8004: result: $cf_have_ncuconfig" >&5 +rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext" + echo "$as_me:8623: 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" @@ -8017,13 +8636,13 @@ EOF NCURSES_CONFIG_PKG=$cf_ncuconfig_root -echo "$as_me:8020: checking for terminfo header" >&5 +echo "$as_me:8639: 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%'` ;; @@ -8034,8 +8653,8 @@ esac for cf_test in $cf_term_header "ncurses/term.h" "ncursesw/term.h" do -cat >conftest.$ac_ext <<_ACEOF -#line 8038 "configure" +cat >"conftest.$ac_ext" <<_ACEOF +#line 8657 "configure" #include "confdefs.h" #include #include <${cf_cv_ncurses_header:-curses.h}> @@ -8049,38 +8668,38 @@ int x = auto_left_margin; (void)x return 0; } _ACEOF -rm -f conftest.$ac_objext -if { (eval echo "$as_me:8053: \"$ac_compile\"") >&5 +rm -f "conftest.$ac_objext" +if { (eval echo "$as_me:8672: \"$ac_compile\"") >&5 (eval $ac_compile) 2>&5 ac_status=$? - echo "$as_me:8056: \$? = $ac_status" >&5 - (exit $ac_status); } && - { ac_try='test -s conftest.$ac_objext' - { (eval echo "$as_me:8059: \"$ac_try\"") >&5 + echo "$as_me:8675: \$? = $ac_status" >&5 + (exit "$ac_status"); } && + { ac_try='test -s "conftest.$ac_objext"' + { (eval echo "$as_me:8678: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? - echo "$as_me:8062: \$? = $ac_status" >&5 - (exit $ac_status); }; }; then + echo "$as_me:8681: \$? = $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:8078: result: $cf_cv_term_header" >&5 +echo "$as_me:8697: 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 @@ -8090,7 +8709,7 @@ EOF ;; esac -case $cf_cv_term_header in +case "$cf_cv_term_header" in (ncurses/term.h) cat >>confdefs.h <<\EOF @@ -8110,7 +8729,7 @@ esac fi else - echo "$as_me:8113: result: no" >&5 + echo "$as_me:8732: result: no" >&5 echo "${ECHO_T}no" >&6 NCURSES_CONFIG_PKG=none fi @@ -8126,7 +8745,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:8129: checking for $ac_word" >&5 +echo "$as_me:8748: 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 @@ -8141,7 +8760,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:8144: found $ac_dir/$ac_word" >&5 +echo "$as_me:8763: found $ac_dir/$ac_word" >&5 break done @@ -8149,10 +8768,10 @@ fi fi NCURSES_CONFIG=$ac_cv_prog_NCURSES_CONFIG if test -n "$NCURSES_CONFIG"; then - echo "$as_me:8152: result: $NCURSES_CONFIG" >&5 + echo "$as_me:8771: result: $NCURSES_CONFIG" >&5 echo "${ECHO_T}$NCURSES_CONFIG" >&6 else - echo "$as_me:8155: result: no" >&5 + echo "$as_me:8774: result: no" >&5 echo "${ECHO_T}no" >&6 fi @@ -8165,7 +8784,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:8168: checking for $ac_word" >&5 +echo "$as_me:8787: 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 @@ -8180,7 +8799,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:8183: found $ac_dir/$ac_word" >&5 +echo "$as_me:8802: found $ac_dir/$ac_word" >&5 break done @@ -8188,10 +8807,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:8191: result: $ac_ct_NCURSES_CONFIG" >&5 + echo "$as_me:8810: result: $ac_ct_NCURSES_CONFIG" >&5 echo "${ECHO_T}$ac_ct_NCURSES_CONFIG" >&6 else - echo "$as_me:8194: result: no" >&5 + echo "$as_me:8813: result: no" >&5 echo "${ECHO_T}no" >&6 fi @@ -8204,26 +8823,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" @@ -8242,7 +8887,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/=.*//'` @@ -8272,7 +8917,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}" \ @@ -8302,6 +8947,8 @@ if test -n "$cf_new_extra_cppflags" ; then fi +done + cf_add_libs="$LIBS" # reverse order cf_add_0lib= @@ -8320,7 +8967,7 @@ LIBS="$cf_add_libs" # even with config script, some packages use no-override for curses.h -echo "$as_me:8323: checking if we have identified curses headers" >&5 +echo "$as_me:8970: 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 @@ -8331,44 +8978,44 @@ for cf_header in \ ncurses.h $cf_cv_screen/ncurses.h \ curses.h $cf_cv_screen/curses.h do -cat >conftest.$ac_ext <<_ACEOF -#line 8335 "configure" +cat >"conftest.$ac_ext" <<_ACEOF +#line 8982 "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:8347: \"$ac_compile\"") >&5 +rm -f "conftest.$ac_objext" +if { (eval echo "$as_me:8994: \"$ac_compile\"") >&5 (eval $ac_compile) 2>&5 ac_status=$? - echo "$as_me:8350: \$? = $ac_status" >&5 - (exit $ac_status); } && - { ac_try='test -s conftest.$ac_objext' - { (eval echo "$as_me:8353: \"$ac_try\"") >&5 + echo "$as_me:8997: \$? = $ac_status" >&5 + (exit "$ac_status"); } && + { ac_try='test -s "conftest.$ac_objext"' + { (eval echo "$as_me:9000: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? - echo "$as_me:8356: \$? = $ac_status" >&5 - (exit $ac_status); }; }; then + echo "$as_me:9003: \$? = $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:8367: result: $cf_cv_ncurses_header" >&5 +echo "$as_me:9014: 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:8371: error: No curses header-files found" >&5 + { { echo "$as_me:9018: error: No curses header-files found" >&5 echo "$as_me: error: No curses header-files found" >&2;} { (exit 1); exit 1; }; } fi @@ -8378,24 +9025,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:8381: checking for $ac_header" >&5 +echo "$as_me:9028: 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 8387 "configure" + cat >"conftest.$ac_ext" <<_ACEOF +#line 9034 "configure" #include "confdefs.h" #include <$ac_header> _ACEOF -if { (eval echo "$as_me:8391: \"$ac_cpp conftest.$ac_ext\"") >&5 - (eval $ac_cpp conftest.$ac_ext) 2>conftest.er1 +if { (eval echo "$as_me:9038: \"$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:8397: \$? = $ac_status" >&5 - (exit $ac_status); } >/dev/null; then + echo "$as_me:9044: \$? = $ac_status" >&5 + (exit "$ac_status"); } >/dev/null; then if test -s conftest.err; then ac_cpp_err=$ac_c_preproc_warn_flag else @@ -8408,14 +9055,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:8416: 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:9063: 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 8472 "configure" + cat >"conftest.$ac_ext" <<_ACEOF +#line 9119 "configure" #include "confdefs.h" #include int @@ -8480,25 +9127,25 @@ printf("Hello") return 0; } _ACEOF -rm -f conftest.$ac_objext -if { (eval echo "$as_me:8484: \"$ac_compile\"") >&5 +rm -f "conftest.$ac_objext" +if { (eval echo "$as_me:9131: \"$ac_compile\"") >&5 (eval $ac_compile) 2>&5 ac_status=$? - echo "$as_me:8487: \$? = $ac_status" >&5 - (exit $ac_status); } && - { ac_try='test -s conftest.$ac_objext' - { (eval echo "$as_me:8490: \"$ac_try\"") >&5 + echo "$as_me:9134: \$? = $ac_status" >&5 + (exit "$ac_status"); } && + { ac_try='test -s "conftest.$ac_objext"' + { (eval echo "$as_me:9137: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? - echo "$as_me:8493: \$? = $ac_status" >&5 - (exit $ac_status); }; }; then + echo "$as_me:9140: \$? = $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 @@ -8507,11 +9154,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}:8510: testing adding $cf_add_incdir to include-path ..." 1>&5 +echo "${as_me:-configure}:9157: 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 @@ -8526,19 +9173,19 @@ fi } -echo "$as_me:8529: checking for $cf_ncuhdr_root header in include-path" >&5 +echo "$as_me:9176: 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 8541 "configure" + cat >"conftest.$ac_ext" <<_ACEOF +#line 9188 "configure" #include "confdefs.h" #include <$cf_header> @@ -8548,10 +9195,10 @@ 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 #endif @@ -8561,39 +9208,39 @@ printf("old\n"); return 0; } _ACEOF -rm -f conftest.$ac_objext -if { (eval echo "$as_me:8565: \"$ac_compile\"") >&5 +rm -f "conftest.$ac_objext" +if { (eval echo "$as_me:9212: \"$ac_compile\"") >&5 (eval $ac_compile) 2>&5 ac_status=$? - echo "$as_me:8568: \$? = $ac_status" >&5 - (exit $ac_status); } && - { ac_try='test -s conftest.$ac_objext' - { (eval echo "$as_me:8571: \"$ac_try\"") >&5 + echo "$as_me:9215: \$? = $ac_status" >&5 + (exit "$ac_status"); } && + { ac_try='test -s "conftest.$ac_objext"' + { (eval echo "$as_me:9218: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? - echo "$as_me:8574: \$? = $ac_status" >&5 - (exit $ac_status); }; }; then + echo "$as_me:9221: \$? = $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:8589: result: $cf_cv_ncurses_h" >&5 +echo "$as_me:9236: 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:8596: checking for $cf_ncuhdr_root include-path" >&5 +echo "$as_me:9243: 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 @@ -8608,7 +9255,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$,,'` @@ -8616,11 +9263,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" @@ -8637,11 +9284,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 \ @@ -8655,13 +9302,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 @@ -8669,20 +9316,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 @@ -8690,9 +9337,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 @@ -8713,8 +9360,8 @@ if test -n "$cf_incdir" ; then test -n "$CPPFLAGS" && CPPFLAGS="$CPPFLAGS " CPPFLAGS="${CPPFLAGS}-I$cf_add_incdir" - cat >conftest.$ac_ext <<_ACEOF -#line 8717 "configure" + cat >"conftest.$ac_ext" <<_ACEOF +#line 9364 "configure" #include "confdefs.h" #include int @@ -8725,25 +9372,25 @@ printf("Hello") return 0; } _ACEOF -rm -f conftest.$ac_objext -if { (eval echo "$as_me:8729: \"$ac_compile\"") >&5 +rm -f "conftest.$ac_objext" +if { (eval echo "$as_me:9376: \"$ac_compile\"") >&5 (eval $ac_compile) 2>&5 ac_status=$? - echo "$as_me:8732: \$? = $ac_status" >&5 - (exit $ac_status); } && - { ac_try='test -s conftest.$ac_objext' - { (eval echo "$as_me:8735: \"$ac_try\"") >&5 + echo "$as_me:9379: \$? = $ac_status" >&5 + (exit "$ac_status"); } && + { ac_try='test -s "conftest.$ac_objext"' + { (eval echo "$as_me:9382: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? - echo "$as_me:8738: \$? = $ac_status" >&5 - (exit $ac_status); }; }; then + echo "$as_me:9385: \$? = $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 @@ -8752,11 +9399,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}:8755: testing adding $cf_add_incdir to include-path ..." 1>&5 +echo "${as_me:-configure}:9402: 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 @@ -8774,8 +9421,8 @@ fi curses.h do - cat >conftest.$ac_ext <<_ACEOF -#line 8778 "configure" + cat >"conftest.$ac_ext" <<_ACEOF +#line 9425 "configure" #include "confdefs.h" #include <$cf_header> @@ -8785,10 +9432,10 @@ 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 #endif @@ -8798,30 +9445,30 @@ printf("old\n"); return 0; } _ACEOF -rm -f conftest.$ac_objext -if { (eval echo "$as_me:8802: \"$ac_compile\"") >&5 +rm -f "conftest.$ac_objext" +if { (eval echo "$as_me:9449: \"$ac_compile\"") >&5 (eval $ac_compile) 2>&5 ac_status=$? - echo "$as_me:8805: \$? = $ac_status" >&5 - (exit $ac_status); } && - { ac_try='test -s conftest.$ac_objext' - { (eval echo "$as_me:8808: \"$ac_try\"") >&5 + echo "$as_me:9452: \$? = $ac_status" >&5 + (exit "$ac_status"); } && + { ac_try='test -s "conftest.$ac_objext"' + { (eval echo "$as_me:9455: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? - echo "$as_me:8811: \$? = $ac_status" >&5 - (exit $ac_status); }; }; then + echo "$as_me:9458: \$? = $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 @@ -8829,26 +9476,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:8832: error: not found" >&5 + test "$cf_cv_ncurses_h2" = no && { { echo "$as_me:9479: error: not found" >&5 echo "$as_me: error: not found" >&2;} { (exit 1); exit 1; }; } fi -echo "$as_me:8837: result: $cf_cv_ncurses_h2" >&5 +echo "$as_me:9484: 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 @@ -8869,8 +9516,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 8873 "configure" + cat >"conftest.$ac_ext" <<_ACEOF +#line 9520 "configure" #include "confdefs.h" #include int @@ -8881,25 +9528,25 @@ printf("Hello") return 0; } _ACEOF -rm -f conftest.$ac_objext -if { (eval echo "$as_me:8885: \"$ac_compile\"") >&5 +rm -f "conftest.$ac_objext" +if { (eval echo "$as_me:9532: \"$ac_compile\"") >&5 (eval $ac_compile) 2>&5 ac_status=$? - echo "$as_me:8888: \$? = $ac_status" >&5 - (exit $ac_status); } && - { ac_try='test -s conftest.$ac_objext' - { (eval echo "$as_me:8891: \"$ac_try\"") >&5 + echo "$as_me:9535: \$? = $ac_status" >&5 + (exit "$ac_status"); } && + { ac_try='test -s "conftest.$ac_objext"' + { (eval echo "$as_me:9538: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? - echo "$as_me:8894: \$? = $ac_status" >&5 - (exit $ac_status); }; }; then + echo "$as_me:9541: \$? = $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 @@ -8908,11 +9555,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}:8911: testing adding $cf_add_incdir to include-path ..." 1>&5 +echo "${as_me:-configure}:9558: 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 @@ -8929,7 +9576,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 @@ -8939,7 +9586,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 @@ -8956,13 +9603,13 @@ EOF ;; esac -echo "$as_me:8959: checking for terminfo header" >&5 +echo "$as_me:9606: 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%'` ;; @@ -8973,8 +9620,8 @@ esac for cf_test in $cf_term_header "ncurses/term.h" "ncursesw/term.h" do -cat >conftest.$ac_ext <<_ACEOF -#line 8977 "configure" +cat >"conftest.$ac_ext" <<_ACEOF +#line 9624 "configure" #include "confdefs.h" #include #include <${cf_cv_ncurses_header:-curses.h}> @@ -8988,38 +9635,38 @@ int x = auto_left_margin; (void)x return 0; } _ACEOF -rm -f conftest.$ac_objext -if { (eval echo "$as_me:8992: \"$ac_compile\"") >&5 +rm -f "conftest.$ac_objext" +if { (eval echo "$as_me:9639: \"$ac_compile\"") >&5 (eval $ac_compile) 2>&5 ac_status=$? - echo "$as_me:8995: \$? = $ac_status" >&5 - (exit $ac_status); } && - { ac_try='test -s conftest.$ac_objext' - { (eval echo "$as_me:8998: \"$ac_try\"") >&5 + echo "$as_me:9642: \$? = $ac_status" >&5 + (exit "$ac_status"); } && + { ac_try='test -s "conftest.$ac_objext"' + { (eval echo "$as_me:9645: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? - echo "$as_me:9001: \$? = $ac_status" >&5 - (exit $ac_status); }; }; then + echo "$as_me:9648: \$? = $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:9017: result: $cf_cv_term_header" >&5 +echo "$as_me:9664: 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 @@ -9029,7 +9676,7 @@ EOF ;; esac -case $cf_cv_term_header in +case "$cf_cv_term_header" in (ncurses/term.h) cat >>confdefs.h <<\EOF @@ -9052,7 +9699,7 @@ cat >>confdefs.h <<\EOF #define NCURSES 1 EOF -echo "$as_me:9055: checking for ncurses version" >&5 +echo "$as_me:9702: 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 @@ -9060,12 +9707,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 @@ -9078,36 +9725,38 @@ Autoconf "old" #endif EOF cf_try="$ac_cpp conftest.$ac_ext 2>&5 | grep '^Autoconf ' >conftest.out" - { (eval echo "$as_me:9081: \"$cf_try\"") >&5 + { (eval echo "$as_me:9728: \"$cf_try\"") >&5 (eval $cf_try) 2>&5 ac_status=$? - echo "$as_me:9084: \$? = $ac_status" >&5 - (exit $ac_status); } + echo "$as_me:9731: \$? = $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 9094 "configure" + cat >"conftest.$ac_ext" <<_ACEOF +#line 9741 "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 # endif @@ -9115,30 +9764,30 @@ int main(void) ${cf_cv_main_return:-return}(0); } _ACEOF -rm -f conftest$ac_exeext -if { (eval echo "$as_me:9119: \"$ac_link\"") >&5 +rm -f "conftest$ac_exeext" +if { (eval echo "$as_me:9768: \"$ac_link\"") >&5 (eval $ac_link) 2>&5 ac_status=$? - echo "$as_me:9122: \$? = $ac_status" >&5 - (exit $ac_status); } && { ac_try='./conftest$ac_exeext' - { (eval echo "$as_me:9124: \"$ac_try\"") >&5 + echo "$as_me:9771: \$? = $ac_status" >&5 + (exit "$ac_status"); } && { ac_try='"./conftest$ac_exeext"' + { (eval echo "$as_me:9773: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? - echo "$as_me:9127: \$? = $ac_status" >&5 - (exit $ac_status); }; }; then + echo "$as_me:9776: \$? = $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:9141: result: $cf_cv_ncurses_version" >&5 +echo "$as_me:9790: result: $cf_cv_ncurses_version" >&5 echo "${ECHO_T}$cf_cv_ncurses_version" >&6 test "$cf_cv_ncurses_version" = no || cat >>confdefs.h <<\EOF @@ -9151,15 +9800,15 @@ cf_nculib_root=$cf_cv_screen # to link gpm. cf_ncurses_LIBS="" cf_ncurses_SAVE="$LIBS" -echo "$as_me:9154: checking for Gpm_Open in -lgpm" >&5 +echo "$as_me:9803: 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 9162 "configure" +cat >"conftest.$ac_ext" <<_ACEOF +#line 9811 "configure" #include "confdefs.h" /* Override any gcc2 internal prototype to avoid an error. */ @@ -9177,39 +9826,39 @@ Gpm_Open (); return 0; } _ACEOF -rm -f conftest.$ac_objext conftest$ac_exeext -if { (eval echo "$as_me:9181: \"$ac_link\"") >&5 +rm -f "conftest.$ac_objext" "conftest$ac_exeext" +if { (eval echo "$as_me:9830: \"$ac_link\"") >&5 (eval $ac_link) 2>&5 ac_status=$? - echo "$as_me:9184: \$? = $ac_status" >&5 - (exit $ac_status); } && - { ac_try='test -s conftest$ac_exeext' - { (eval echo "$as_me:9187: \"$ac_try\"") >&5 + echo "$as_me:9833: \$? = $ac_status" >&5 + (exit "$ac_status"); } && + { ac_try='test -s "conftest$ac_exeext"' + { (eval echo "$as_me:9836: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? - echo "$as_me:9190: \$? = $ac_status" >&5 - (exit $ac_status); }; }; then + echo "$as_me:9839: \$? = $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:9201: result: $ac_cv_lib_gpm_Gpm_Open" >&5 +echo "$as_me:9850: 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:9204: checking for initscr in -lgpm" >&5 +if test "$ac_cv_lib_gpm_Gpm_Open" = yes; then + echo "$as_me:9853: 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 9212 "configure" +cat >"conftest.$ac_ext" <<_ACEOF +#line 9861 "configure" #include "confdefs.h" /* Override any gcc2 internal prototype to avoid an error. */ @@ -9227,30 +9876,30 @@ initscr (); return 0; } _ACEOF -rm -f conftest.$ac_objext conftest$ac_exeext -if { (eval echo "$as_me:9231: \"$ac_link\"") >&5 +rm -f "conftest.$ac_objext" "conftest$ac_exeext" +if { (eval echo "$as_me:9880: \"$ac_link\"") >&5 (eval $ac_link) 2>&5 ac_status=$? - echo "$as_me:9234: \$? = $ac_status" >&5 - (exit $ac_status); } && - { ac_try='test -s conftest$ac_exeext' - { (eval echo "$as_me:9237: \"$ac_try\"") >&5 + echo "$as_me:9883: \$? = $ac_status" >&5 + (exit "$ac_status"); } && + { ac_try='test -s "conftest$ac_exeext"' + { (eval echo "$as_me:9886: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? - echo "$as_me:9240: \$? = $ac_status" >&5 - (exit $ac_status); }; }; then + echo "$as_me:9889: \$? = $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:9251: result: $ac_cv_lib_gpm_initscr" >&5 +echo "$as_me:9900: 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" @@ -9258,20 +9907,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:9266: checking for tgoto in -lmytinfo" >&5 + echo "$as_me:9915: 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 9274 "configure" +cat >"conftest.$ac_ext" <<_ACEOF +#line 9923 "configure" #include "confdefs.h" /* Override any gcc2 internal prototype to avoid an error. */ @@ -9289,30 +9938,30 @@ tgoto (); return 0; } _ACEOF -rm -f conftest.$ac_objext conftest$ac_exeext -if { (eval echo "$as_me:9293: \"$ac_link\"") >&5 +rm -f "conftest.$ac_objext" "conftest$ac_exeext" +if { (eval echo "$as_me:9942: \"$ac_link\"") >&5 (eval $ac_link) 2>&5 ac_status=$? - echo "$as_me:9296: \$? = $ac_status" >&5 - (exit $ac_status); } && - { ac_try='test -s conftest$ac_exeext' - { (eval echo "$as_me:9299: \"$ac_try\"") >&5 + echo "$as_me:9945: \$? = $ac_status" >&5 + (exit "$ac_status"); } && + { ac_try='test -s "conftest$ac_exeext"' + { (eval echo "$as_me:9948: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? - echo "$as_me:9302: \$? = $ac_status" >&5 - (exit $ac_status); }; }; then + echo "$as_me:9951: \$? = $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:9313: result: $ac_cv_lib_mytinfo_tgoto" >&5 +echo "$as_me:9962: 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 @@ -9336,7 +9985,7 @@ for cf_add_1lib in $cf_add_0lib; do 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="$LIBS" @@ -9357,15 +10006,15 @@ 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:9362: checking for initscr" >&5 + echo "$as_me:10011: 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 9368 "configure" + cat >"conftest.$ac_ext" <<_ACEOF +#line 10017 "configure" #include "confdefs.h" #define initscr autoconf_temporary #include /* least-intrusive standard header which defines gcc2 __stub macros */ @@ -9395,38 +10044,38 @@ main (void) return 0; } _ACEOF -rm -f conftest.$ac_objext conftest$ac_exeext -if { (eval echo "$as_me:9399: \"$ac_link\"") >&5 +rm -f "conftest.$ac_objext" "conftest$ac_exeext" +if { (eval echo "$as_me:10048: \"$ac_link\"") >&5 (eval $ac_link) 2>&5 ac_status=$? - 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 + echo "$as_me:10051: \$? = $ac_status" >&5 + (exit "$ac_status"); } && + { ac_try='test -s "conftest$ac_exeext"' + { (eval echo "$as_me:10054: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? - echo "$as_me:9408: \$? = $ac_status" >&5 - (exit $ac_status); }; }; then + echo "$as_me:10057: \$? = $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:9418: result: $ac_cv_func_initscr" >&5 +echo "$as_me:10067: 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:9425: checking for initscr in -l$cf_nculib_root" >&5 + echo "$as_me:10074: 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 9429 "configure" + cat >"conftest.$ac_ext" <<_ACEOF +#line 10078 "configure" #include "confdefs.h" #include <${cf_cv_ncurses_header:-curses.h}> int @@ -9437,26 +10086,26 @@ initscr() return 0; } _ACEOF -rm -f conftest.$ac_objext conftest$ac_exeext -if { (eval echo "$as_me:9441: \"$ac_link\"") >&5 +rm -f "conftest.$ac_objext" "conftest$ac_exeext" +if { (eval echo "$as_me:10090: \"$ac_link\"") >&5 (eval $ac_link) 2>&5 ac_status=$? - echo "$as_me:9444: \$? = $ac_status" >&5 - (exit $ac_status); } && - { ac_try='test -s conftest$ac_exeext' - { (eval echo "$as_me:9447: \"$ac_try\"") >&5 + echo "$as_me:10093: \$? = $ac_status" >&5 + (exit "$ac_status"); } && + { ac_try='test -s "conftest$ac_exeext"' + { (eval echo "$as_me:10096: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? - echo "$as_me:9450: \$? = $ac_status" >&5 - (exit $ac_status); }; }; then - echo "$as_me:9452: result: yes" >&5 + echo "$as_me:10099: \$? = $ac_status" >&5 + (exit "$ac_status"); }; }; then + echo "$as_me:10101: 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:9459: result: no" >&5 +cat "conftest.$ac_ext" >&5 +echo "$as_me:10108: result: no" >&5 echo "${ECHO_T}no" >&6 cf_search= @@ -9464,7 +10113,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$,,'` @@ -9472,11 +10121,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" @@ -9491,11 +10140,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 \ @@ -9509,13 +10158,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 @@ -9524,11 +10173,11 @@ cf_search="$cf_library_path_list $cf_search" for cf_libdir in $cf_search do - echo "$as_me:9527: checking for -l$cf_nculib_root in $cf_libdir" >&5 + echo "$as_me:10176: 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 9531 "configure" + cat >"conftest.$ac_ext" <<_ACEOF +#line 10180 "configure" #include "confdefs.h" #include <${cf_cv_ncurses_header:-curses.h}> int @@ -9539,41 +10188,41 @@ initscr() return 0; } _ACEOF -rm -f conftest.$ac_objext conftest$ac_exeext -if { (eval echo "$as_me:9543: \"$ac_link\"") >&5 +rm -f "conftest.$ac_objext" "conftest$ac_exeext" +if { (eval echo "$as_me:10192: \"$ac_link\"") >&5 (eval $ac_link) 2>&5 ac_status=$? - echo "$as_me:9546: \$? = $ac_status" >&5 - (exit $ac_status); } && - { ac_try='test -s conftest$ac_exeext' - { (eval echo "$as_me:9549: \"$ac_try\"") >&5 + echo "$as_me:10195: \$? = $ac_status" >&5 + (exit "$ac_status"); } && + { ac_try='test -s "conftest$ac_exeext"' + { (eval echo "$as_me:10198: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? - echo "$as_me:9552: \$? = $ac_status" >&5 - (exit $ac_status); }; }; then - echo "$as_me:9554: result: yes" >&5 + echo "$as_me:10201: \$? = $ac_status" >&5 + (exit "$ac_status"); }; }; then + echo "$as_me:10203: 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:9561: result: no" >&5 +cat "conftest.$ac_ext" >&5 +echo "$as_me:10210: 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:9576: error: Cannot link $cf_nculib_root library" >&5 +if test "$cf_found_library" = no ; then + { { echo "$as_me:10225: error: Cannot link $cf_nculib_root library" >&5 echo "$as_me: error: Cannot link $cf_nculib_root library" >&2;} { (exit 1); exit 1; }; } fi @@ -9581,49 +10230,49 @@ fi fi if test -n "$cf_ncurses_LIBS" ; then - echo "$as_me:9584: checking if we can link $cf_nculib_root without $cf_ncurses_LIBS" >&5 + echo "$as_me:10233: 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 9594 "configure" + cat >"conftest.$ac_ext" <<_ACEOF +#line 10243 "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:9606: \"$ac_link\"") >&5 +rm -f "conftest.$ac_objext" "conftest$ac_exeext" +if { (eval echo "$as_me:10255: \"$ac_link\"") >&5 (eval $ac_link) 2>&5 ac_status=$? - echo "$as_me:9609: \$? = $ac_status" >&5 - (exit $ac_status); } && - { ac_try='test -s conftest$ac_exeext' - { (eval echo "$as_me:9612: \"$ac_try\"") >&5 + echo "$as_me:10258: \$? = $ac_status" >&5 + (exit "$ac_status"); } && + { ac_try='test -s "conftest$ac_exeext"' + { (eval echo "$as_me:10261: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? - echo "$as_me:9615: \$? = $ac_status" >&5 - (exit $ac_status); }; }; then - echo "$as_me:9617: result: yes" >&5 + echo "$as_me:10264: \$? = $ac_status" >&5 + (exit "$ac_status"); }; }; then + echo "$as_me:10266: result: yes" >&5 echo "${ECHO_T}yes" >&6 else echo "$as_me: failed program was:" >&5 -cat conftest.$ac_ext >&5 -echo "$as_me:9622: result: no" >&5 +cat "conftest.$ac_ext" >&5 +echo "$as_me:10271: 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___%` @@ -9644,13 +10293,13 @@ cf_ncuconfig_root=$cf_cv_screen cf_have_ncuconfig=no if test "x${PKG_CONFIG:=none}" != xnone; then - echo "$as_me:9647: checking pkg-config for $cf_ncuconfig_root" >&5 + echo "$as_me:10296: 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:9650: result: yes" >&5 + echo "$as_me:10299: result: yes" >&5 echo "${ECHO_T}yes" >&6 - echo "$as_me:9653: checking if the $cf_ncuconfig_root package files work" >&5 + echo "$as_me:10302: 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 @@ -9658,8 +10307,8 @@ echo $ECHO_N "checking if the $cf_ncuconfig_root package files work... $ECHO_C" 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` + 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 @@ -9675,19 +10324,19 @@ cf_new_extra_cppflags= 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" @@ -9706,7 +10355,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/=.*//'` @@ -9736,7 +10385,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}" \ @@ -9782,66 +10431,66 @@ for cf_add_1lib in $cf_add_0lib; do done LIBS="$cf_add_libs" - cat >conftest.$ac_ext <<_ACEOF -#line 9786 "configure" + cat >"conftest.$ac_ext" <<_ACEOF +#line 10435 "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:9798: \"$ac_link\"") >&5 +rm -f "conftest.$ac_objext" "conftest$ac_exeext" +if { (eval echo "$as_me:10447: \"$ac_link\"") >&5 (eval $ac_link) 2>&5 ac_status=$? - echo "$as_me:9801: \$? = $ac_status" >&5 - (exit $ac_status); } && - { ac_try='test -s conftest$ac_exeext' - { (eval echo "$as_me:9804: \"$ac_try\"") >&5 + echo "$as_me:10450: \$? = $ac_status" >&5 + (exit "$ac_status"); } && + { ac_try='test -s "conftest$ac_exeext"' + { (eval echo "$as_me:10453: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? - echo "$as_me:9807: \$? = $ac_status" >&5 - (exit $ac_status); }; }; then + echo "$as_me:10456: \$? = $ac_status" >&5 + (exit "$ac_status"); }; }; then if test "$cross_compiling" = yes; then cf_test_ncuconfig=maybe else - cat >conftest.$ac_ext <<_ACEOF -#line 9813 "configure" + cat >"conftest.$ac_ext" <<_ACEOF +#line 10462 "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:9820: \"$ac_link\"") >&5 +rm -f "conftest$ac_exeext" +if { (eval echo "$as_me:10469: \"$ac_link\"") >&5 (eval $ac_link) 2>&5 ac_status=$? - echo "$as_me:9823: \$? = $ac_status" >&5 - (exit $ac_status); } && { ac_try='./conftest$ac_exeext' - { (eval echo "$as_me:9825: \"$ac_try\"") >&5 + echo "$as_me:10472: \$? = $ac_status" >&5 + (exit "$ac_status"); } && { ac_try='"./conftest$ac_exeext"' + { (eval echo "$as_me:10474: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? - echo "$as_me:9828: \$? = $ac_status" >&5 - (exit $ac_status); }; }; then + echo "$as_me:10477: \$? = $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 +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 +cat "conftest.$ac_ext" >&5 cf_test_ncuconfig=no fi -rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext +rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext" CFLAGS="$cf_save_CFLAGS" CPPFLAGS="$cf_save_CPPFLAGS" @@ -9856,26 +10505,52 @@ rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext ;; esac +for cf_add_cflags in $cf_pkg_cflags +do + case "x$cf_add_cflags" in + (x-[DU]*) + +cf_tmp_cflag=`echo "x$cf_add_cflags" | sed -e 's/^.//' -e 's/=.*//'` +while true +do + cf_old_cflag=`echo "x$CFLAGS" | sed -e 's/^.//' -e 's/[ ][ ]*-/ -/g' -e "s%$cf_tmp_cflag\\(=[^ ][^ ]*\\)\?%%" -e 's/^[ ]*//' -e 's%[ ][ ]*-D% -D%g' -e 's%[ ][ ]*-I% -I%g'` + test "$CFLAGS" != "$cf_old_cflag" || break + + CFLAGS="$cf_old_cflag" +done + +cf_tmp_cflag=`echo "x$cf_add_cflags" | sed -e 's/^.//' -e 's/=.*//'` +while true +do + cf_old_cflag=`echo "x$CPPFLAGS" | sed -e 's/^.//' -e 's/[ ][ ]*-/ -/g' -e "s%$cf_tmp_cflag\\(=[^ ][^ ]*\\)\?%%" -e 's/^[ ]*//' -e 's%[ ][ ]*-D% -D%g' -e 's%[ ][ ]*-I% -I%g'` + test "$CPPFLAGS" != "$cf_old_cflag" || break + + CPPFLAGS="$cf_old_cflag" +done + + ;; + esac + cf_fix_cppflags=no cf_new_cflags= cf_new_cppflags= cf_new_extra_cppflags= -for cf_add_cflags in $cf_pkg_cflags +for cf_add_cflags in $cf_add_cflags do -case $cf_fix_cppflags in +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" @@ -9894,7 +10569,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/=.*//'` @@ -9924,7 +10599,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}" \ @@ -9954,6 +10629,8 @@ if test -n "$cf_new_extra_cppflags" ; then fi +done + cf_add_libs="$LIBS" # reverse order cf_add_0lib= @@ -9970,67 +10647,67 @@ for cf_add_1lib in $cf_add_0lib; do done LIBS="$cf_add_libs" - cat >conftest.$ac_ext <<_ACEOF -#line 9974 "configure" + cat >"conftest.$ac_ext" <<_ACEOF +#line 10651 "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:9986: \"$ac_link\"") >&5 +rm -f "conftest.$ac_objext" "conftest$ac_exeext" +if { (eval echo "$as_me:10663: \"$ac_link\"") >&5 (eval $ac_link) 2>&5 ac_status=$? - echo "$as_me:9989: \$? = $ac_status" >&5 - (exit $ac_status); } && - { ac_try='test -s conftest$ac_exeext' - { (eval echo "$as_me:9992: \"$ac_try\"") >&5 + echo "$as_me:10666: \$? = $ac_status" >&5 + (exit "$ac_status"); } && + { ac_try='test -s "conftest$ac_exeext"' + { (eval echo "$as_me:10669: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? - echo "$as_me:9995: \$? = $ac_status" >&5 - (exit $ac_status); }; }; then + echo "$as_me:10672: \$? = $ac_status" >&5 + (exit "$ac_status"); }; }; then if test "$cross_compiling" = yes; then cf_have_ncuconfig=maybe else - cat >conftest.$ac_ext <<_ACEOF -#line 10001 "configure" + cat >"conftest.$ac_ext" <<_ACEOF +#line 10678 "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:10008: \"$ac_link\"") >&5 +rm -f "conftest$ac_exeext" +if { (eval echo "$as_me:10685: \"$ac_link\"") >&5 (eval $ac_link) 2>&5 ac_status=$? - echo "$as_me:10011: \$? = $ac_status" >&5 - (exit $ac_status); } && { ac_try='./conftest$ac_exeext' - { (eval echo "$as_me:10013: \"$ac_try\"") >&5 + echo "$as_me:10688: \$? = $ac_status" >&5 + (exit "$ac_status"); } && { ac_try='"./conftest$ac_exeext"' + { (eval echo "$as_me:10690: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? - echo "$as_me:10016: \$? = $ac_status" >&5 - (exit $ac_status); }; }; then + echo "$as_me:10693: \$? = $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:10033: result: $cf_have_ncuconfig" >&5 +rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext" + echo "$as_me:10710: 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" @@ -10046,13 +10723,13 @@ EOF NCURSES_CONFIG_PKG=$cf_ncuconfig_root -echo "$as_me:10049: checking for terminfo header" >&5 +echo "$as_me:10726: 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%'` ;; @@ -10063,8 +10740,8 @@ esac for cf_test in $cf_term_header "ncurses/term.h" "ncursesw/term.h" do -cat >conftest.$ac_ext <<_ACEOF -#line 10067 "configure" +cat >"conftest.$ac_ext" <<_ACEOF +#line 10744 "configure" #include "confdefs.h" #include #include <${cf_cv_ncurses_header:-curses.h}> @@ -10078,38 +10755,38 @@ int x = auto_left_margin; (void)x return 0; } _ACEOF -rm -f conftest.$ac_objext -if { (eval echo "$as_me:10082: \"$ac_compile\"") >&5 +rm -f "conftest.$ac_objext" +if { (eval echo "$as_me:10759: \"$ac_compile\"") >&5 (eval $ac_compile) 2>&5 ac_status=$? - echo "$as_me:10085: \$? = $ac_status" >&5 - (exit $ac_status); } && - { ac_try='test -s conftest.$ac_objext' - { (eval echo "$as_me:10088: \"$ac_try\"") >&5 + echo "$as_me:10762: \$? = $ac_status" >&5 + (exit "$ac_status"); } && + { ac_try='test -s "conftest.$ac_objext"' + { (eval echo "$as_me:10765: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? - echo "$as_me:10091: \$? = $ac_status" >&5 - (exit $ac_status); }; }; then + echo "$as_me:10768: \$? = $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:10107: result: $cf_cv_term_header" >&5 +echo "$as_me:10784: 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 @@ -10119,7 +10796,7 @@ EOF ;; esac -case $cf_cv_term_header in +case "$cf_cv_term_header" in (ncurses/term.h) cat >>confdefs.h <<\EOF @@ -10139,7 +10816,7 @@ esac fi else - echo "$as_me:10142: result: no" >&5 + echo "$as_me:10819: result: no" >&5 echo "${ECHO_T}no" >&6 NCURSES_CONFIG_PKG=none fi @@ -10155,7 +10832,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:10158: checking for $ac_word" >&5 +echo "$as_me:10835: 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 @@ -10170,7 +10847,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:10173: found $ac_dir/$ac_word" >&5 +echo "$as_me:10850: found $ac_dir/$ac_word" >&5 break done @@ -10178,10 +10855,10 @@ fi fi NCURSES_CONFIG=$ac_cv_prog_NCURSES_CONFIG if test -n "$NCURSES_CONFIG"; then - echo "$as_me:10181: result: $NCURSES_CONFIG" >&5 + echo "$as_me:10858: result: $NCURSES_CONFIG" >&5 echo "${ECHO_T}$NCURSES_CONFIG" >&6 else - echo "$as_me:10184: result: no" >&5 + echo "$as_me:10861: result: no" >&5 echo "${ECHO_T}no" >&6 fi @@ -10194,7 +10871,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:10197: checking for $ac_word" >&5 +echo "$as_me:10874: 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 @@ -10209,7 +10886,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:10212: found $ac_dir/$ac_word" >&5 +echo "$as_me:10889: found $ac_dir/$ac_word" >&5 break done @@ -10217,10 +10894,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:10220: result: $ac_ct_NCURSES_CONFIG" >&5 + echo "$as_me:10897: result: $ac_ct_NCURSES_CONFIG" >&5 echo "${ECHO_T}$ac_ct_NCURSES_CONFIG" >&6 else - echo "$as_me:10223: result: no" >&5 + echo "$as_me:10900: result: no" >&5 echo "${ECHO_T}no" >&6 fi @@ -10233,26 +10910,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" @@ -10271,7 +10974,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/=.*//'` @@ -10301,7 +11004,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}" \ @@ -10331,6 +11034,8 @@ if test -n "$cf_new_extra_cppflags" ; then fi +done + cf_add_libs="$LIBS" # reverse order cf_add_0lib= @@ -10349,7 +11054,7 @@ LIBS="$cf_add_libs" # even with config script, some packages use no-override for curses.h -echo "$as_me:10352: checking if we have identified curses headers" >&5 +echo "$as_me:11057: 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 @@ -10360,44 +11065,44 @@ for cf_header in \ ncurses.h $cf_cv_screen/ncurses.h \ curses.h $cf_cv_screen/curses.h do -cat >conftest.$ac_ext <<_ACEOF -#line 10364 "configure" +cat >"conftest.$ac_ext" <<_ACEOF +#line 11069 "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:10376: \"$ac_compile\"") >&5 +rm -f "conftest.$ac_objext" +if { (eval echo "$as_me:11081: \"$ac_compile\"") >&5 (eval $ac_compile) 2>&5 ac_status=$? - echo "$as_me:10379: \$? = $ac_status" >&5 - (exit $ac_status); } && - { ac_try='test -s conftest.$ac_objext' - { (eval echo "$as_me:10382: \"$ac_try\"") >&5 + echo "$as_me:11084: \$? = $ac_status" >&5 + (exit "$ac_status"); } && + { ac_try='test -s "conftest.$ac_objext"' + { (eval echo "$as_me:11087: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? - echo "$as_me:10385: \$? = $ac_status" >&5 - (exit $ac_status); }; }; then + echo "$as_me:11090: \$? = $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:10396: result: $cf_cv_ncurses_header" >&5 +echo "$as_me:11101: 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:10400: error: No curses header-files found" >&5 + { { echo "$as_me:11105: error: No curses header-files found" >&5 echo "$as_me: error: No curses header-files found" >&2;} { (exit 1); exit 1; }; } fi @@ -10407,24 +11112,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:10410: checking for $ac_header" >&5 +echo "$as_me:11115: 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 10416 "configure" + cat >"conftest.$ac_ext" <<_ACEOF +#line 11121 "configure" #include "confdefs.h" #include <$ac_header> _ACEOF -if { (eval echo "$as_me:10420: \"$ac_cpp conftest.$ac_ext\"") >&5 - (eval $ac_cpp conftest.$ac_ext) 2>conftest.er1 +if { (eval echo "$as_me:11125: \"$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:10426: \$? = $ac_status" >&5 - (exit $ac_status); } >/dev/null; then + echo "$as_me:11131: \$? = $ac_status" >&5 + (exit "$ac_status"); } >/dev/null; then if test -s conftest.err; then ac_cpp_err=$ac_c_preproc_warn_flag else @@ -10437,14 +11142,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:10445: 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:11150: 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 10501 "configure" + cat >"conftest.$ac_ext" <<_ACEOF +#line 11206 "configure" #include "confdefs.h" #include int @@ -10509,25 +11214,25 @@ printf("Hello") return 0; } _ACEOF -rm -f conftest.$ac_objext -if { (eval echo "$as_me:10513: \"$ac_compile\"") >&5 +rm -f "conftest.$ac_objext" +if { (eval echo "$as_me:11218: \"$ac_compile\"") >&5 (eval $ac_compile) 2>&5 ac_status=$? - echo "$as_me:10516: \$? = $ac_status" >&5 - (exit $ac_status); } && - { ac_try='test -s conftest.$ac_objext' - { (eval echo "$as_me:10519: \"$ac_try\"") >&5 + echo "$as_me:11221: \$? = $ac_status" >&5 + (exit "$ac_status"); } && + { ac_try='test -s "conftest.$ac_objext"' + { (eval echo "$as_me:11224: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? - echo "$as_me:10522: \$? = $ac_status" >&5 - (exit $ac_status); }; }; then + echo "$as_me:11227: \$? = $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 @@ -10536,11 +11241,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}:10539: testing adding $cf_add_incdir to include-path ..." 1>&5 +echo "${as_me:-configure}:11244: 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 @@ -10555,19 +11260,19 @@ fi } -echo "$as_me:10558: checking for $cf_ncuhdr_root header in include-path" >&5 +echo "$as_me:11263: 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 10570 "configure" + cat >"conftest.$ac_ext" <<_ACEOF +#line 11275 "configure" #include "confdefs.h" #include <$cf_header> @@ -10577,10 +11282,10 @@ 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 #endif @@ -10590,39 +11295,39 @@ printf("old\n"); return 0; } _ACEOF -rm -f conftest.$ac_objext -if { (eval echo "$as_me:10594: \"$ac_compile\"") >&5 +rm -f "conftest.$ac_objext" +if { (eval echo "$as_me:11299: \"$ac_compile\"") >&5 (eval $ac_compile) 2>&5 ac_status=$? - echo "$as_me:10597: \$? = $ac_status" >&5 - (exit $ac_status); } && - { ac_try='test -s conftest.$ac_objext' - { (eval echo "$as_me:10600: \"$ac_try\"") >&5 + echo "$as_me:11302: \$? = $ac_status" >&5 + (exit "$ac_status"); } && + { ac_try='test -s "conftest.$ac_objext"' + { (eval echo "$as_me:11305: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? - echo "$as_me:10603: \$? = $ac_status" >&5 - (exit $ac_status); }; }; then + echo "$as_me:11308: \$? = $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:10618: result: $cf_cv_ncurses_h" >&5 +echo "$as_me:11323: 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:10625: checking for $cf_ncuhdr_root include-path" >&5 +echo "$as_me:11330: 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 @@ -10637,7 +11342,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$,,'` @@ -10645,11 +11350,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" @@ -10666,11 +11371,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 \ @@ -10684,13 +11389,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 @@ -10698,20 +11403,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 @@ -10719,9 +11424,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 @@ -10742,8 +11447,8 @@ if test -n "$cf_incdir" ; then test -n "$CPPFLAGS" && CPPFLAGS="$CPPFLAGS " CPPFLAGS="${CPPFLAGS}-I$cf_add_incdir" - cat >conftest.$ac_ext <<_ACEOF -#line 10746 "configure" + cat >"conftest.$ac_ext" <<_ACEOF +#line 11451 "configure" #include "confdefs.h" #include int @@ -10754,25 +11459,25 @@ printf("Hello") return 0; } _ACEOF -rm -f conftest.$ac_objext -if { (eval echo "$as_me:10758: \"$ac_compile\"") >&5 +rm -f "conftest.$ac_objext" +if { (eval echo "$as_me:11463: \"$ac_compile\"") >&5 (eval $ac_compile) 2>&5 ac_status=$? - echo "$as_me:10761: \$? = $ac_status" >&5 - (exit $ac_status); } && - { ac_try='test -s conftest.$ac_objext' - { (eval echo "$as_me:10764: \"$ac_try\"") >&5 + echo "$as_me:11466: \$? = $ac_status" >&5 + (exit "$ac_status"); } && + { ac_try='test -s "conftest.$ac_objext"' + { (eval echo "$as_me:11469: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? - echo "$as_me:10767: \$? = $ac_status" >&5 - (exit $ac_status); }; }; then + echo "$as_me:11472: \$? = $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 @@ -10781,11 +11486,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}:10784: testing adding $cf_add_incdir to include-path ..." 1>&5 +echo "${as_me:-configure}:11489: 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 @@ -10803,8 +11508,8 @@ fi curses.h do - cat >conftest.$ac_ext <<_ACEOF -#line 10807 "configure" + cat >"conftest.$ac_ext" <<_ACEOF +#line 11512 "configure" #include "confdefs.h" #include <$cf_header> @@ -10814,10 +11519,10 @@ 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 #endif @@ -10827,30 +11532,30 @@ printf("old\n"); return 0; } _ACEOF -rm -f conftest.$ac_objext -if { (eval echo "$as_me:10831: \"$ac_compile\"") >&5 +rm -f "conftest.$ac_objext" +if { (eval echo "$as_me:11536: \"$ac_compile\"") >&5 (eval $ac_compile) 2>&5 ac_status=$? - echo "$as_me:10834: \$? = $ac_status" >&5 - (exit $ac_status); } && - { ac_try='test -s conftest.$ac_objext' - { (eval echo "$as_me:10837: \"$ac_try\"") >&5 + echo "$as_me:11539: \$? = $ac_status" >&5 + (exit "$ac_status"); } && + { ac_try='test -s "conftest.$ac_objext"' + { (eval echo "$as_me:11542: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? - echo "$as_me:10840: \$? = $ac_status" >&5 - (exit $ac_status); }; }; then + echo "$as_me:11545: \$? = $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 @@ -10858,26 +11563,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:10861: error: not found" >&5 + test "$cf_cv_ncurses_h2" = no && { { echo "$as_me:11566: error: not found" >&5 echo "$as_me: error: not found" >&2;} { (exit 1); exit 1; }; } fi -echo "$as_me:10866: result: $cf_cv_ncurses_h2" >&5 +echo "$as_me:11571: 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 @@ -10898,8 +11603,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 10902 "configure" + cat >"conftest.$ac_ext" <<_ACEOF +#line 11607 "configure" #include "confdefs.h" #include int @@ -10910,25 +11615,25 @@ printf("Hello") return 0; } _ACEOF -rm -f conftest.$ac_objext -if { (eval echo "$as_me:10914: \"$ac_compile\"") >&5 +rm -f "conftest.$ac_objext" +if { (eval echo "$as_me:11619: \"$ac_compile\"") >&5 (eval $ac_compile) 2>&5 ac_status=$? - echo "$as_me:10917: \$? = $ac_status" >&5 - (exit $ac_status); } && - { ac_try='test -s conftest.$ac_objext' - { (eval echo "$as_me:10920: \"$ac_try\"") >&5 + echo "$as_me:11622: \$? = $ac_status" >&5 + (exit "$ac_status"); } && + { ac_try='test -s "conftest.$ac_objext"' + { (eval echo "$as_me:11625: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? - echo "$as_me:10923: \$? = $ac_status" >&5 - (exit $ac_status); }; }; then + echo "$as_me:11628: \$? = $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 @@ -10937,11 +11642,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}:10940: testing adding $cf_add_incdir to include-path ..." 1>&5 +echo "${as_me:-configure}:11645: 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 @@ -10958,7 +11663,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 @@ -10968,7 +11673,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 @@ -10985,13 +11690,13 @@ EOF ;; esac -echo "$as_me:10988: checking for terminfo header" >&5 +echo "$as_me:11693: 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%'` ;; @@ -11002,8 +11707,8 @@ esac for cf_test in $cf_term_header "ncurses/term.h" "ncursesw/term.h" do -cat >conftest.$ac_ext <<_ACEOF -#line 11006 "configure" +cat >"conftest.$ac_ext" <<_ACEOF +#line 11711 "configure" #include "confdefs.h" #include #include <${cf_cv_ncurses_header:-curses.h}> @@ -11017,38 +11722,38 @@ int x = auto_left_margin; (void)x return 0; } _ACEOF -rm -f conftest.$ac_objext -if { (eval echo "$as_me:11021: \"$ac_compile\"") >&5 +rm -f "conftest.$ac_objext" +if { (eval echo "$as_me:11726: \"$ac_compile\"") >&5 (eval $ac_compile) 2>&5 ac_status=$? - echo "$as_me:11024: \$? = $ac_status" >&5 - (exit $ac_status); } && - { ac_try='test -s conftest.$ac_objext' - { (eval echo "$as_me:11027: \"$ac_try\"") >&5 + echo "$as_me:11729: \$? = $ac_status" >&5 + (exit "$ac_status"); } && + { ac_try='test -s "conftest.$ac_objext"' + { (eval echo "$as_me:11732: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? - echo "$as_me:11030: \$? = $ac_status" >&5 - (exit $ac_status); }; }; then + echo "$as_me:11735: \$? = $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:11046: result: $cf_cv_term_header" >&5 +echo "$as_me:11751: 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 @@ -11058,7 +11763,7 @@ EOF ;; esac -case $cf_cv_term_header in +case "$cf_cv_term_header" in (ncurses/term.h) cat >>confdefs.h <<\EOF @@ -11081,7 +11786,7 @@ cat >>confdefs.h <<\EOF #define NCURSES 1 EOF -echo "$as_me:11084: checking for ncurses version" >&5 +echo "$as_me:11789: 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 @@ -11089,12 +11794,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 @@ -11107,36 +11812,38 @@ Autoconf "old" #endif EOF cf_try="$ac_cpp conftest.$ac_ext 2>&5 | grep '^Autoconf ' >conftest.out" - { (eval echo "$as_me:11110: \"$cf_try\"") >&5 + { (eval echo "$as_me:11815: \"$cf_try\"") >&5 (eval $cf_try) 2>&5 ac_status=$? - echo "$as_me:11113: \$? = $ac_status" >&5 - (exit $ac_status); } + echo "$as_me:11818: \$? = $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 11123 "configure" + cat >"conftest.$ac_ext" <<_ACEOF +#line 11828 "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 # endif @@ -11144,30 +11851,30 @@ int main(void) ${cf_cv_main_return:-return}(0); } _ACEOF -rm -f conftest$ac_exeext -if { (eval echo "$as_me:11148: \"$ac_link\"") >&5 +rm -f "conftest$ac_exeext" +if { (eval echo "$as_me:11855: \"$ac_link\"") >&5 (eval $ac_link) 2>&5 ac_status=$? - echo "$as_me:11151: \$? = $ac_status" >&5 - (exit $ac_status); } && { ac_try='./conftest$ac_exeext' - { (eval echo "$as_me:11153: \"$ac_try\"") >&5 + echo "$as_me:11858: \$? = $ac_status" >&5 + (exit "$ac_status"); } && { ac_try='"./conftest$ac_exeext"' + { (eval echo "$as_me:11860: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? - echo "$as_me:11156: \$? = $ac_status" >&5 - (exit $ac_status); }; }; then + echo "$as_me:11863: \$? = $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:11170: result: $cf_cv_ncurses_version" >&5 +echo "$as_me:11877: result: $cf_cv_ncurses_version" >&5 echo "${ECHO_T}$cf_cv_ncurses_version" >&6 test "$cf_cv_ncurses_version" = no || cat >>confdefs.h <<\EOF @@ -11180,15 +11887,15 @@ cf_nculib_root=$cf_cv_screen # to link gpm. cf_ncurses_LIBS="" cf_ncurses_SAVE="$LIBS" -echo "$as_me:11183: checking for Gpm_Open in -lgpm" >&5 +echo "$as_me:11890: 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 11191 "configure" +cat >"conftest.$ac_ext" <<_ACEOF +#line 11898 "configure" #include "confdefs.h" /* Override any gcc2 internal prototype to avoid an error. */ @@ -11206,39 +11913,39 @@ Gpm_Open (); return 0; } _ACEOF -rm -f conftest.$ac_objext conftest$ac_exeext -if { (eval echo "$as_me:11210: \"$ac_link\"") >&5 +rm -f "conftest.$ac_objext" "conftest$ac_exeext" +if { (eval echo "$as_me:11917: \"$ac_link\"") >&5 (eval $ac_link) 2>&5 ac_status=$? - echo "$as_me:11213: \$? = $ac_status" >&5 - (exit $ac_status); } && - { ac_try='test -s conftest$ac_exeext' - { (eval echo "$as_me:11216: \"$ac_try\"") >&5 + echo "$as_me:11920: \$? = $ac_status" >&5 + (exit "$ac_status"); } && + { ac_try='test -s "conftest$ac_exeext"' + { (eval echo "$as_me:11923: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? - echo "$as_me:11219: \$? = $ac_status" >&5 - (exit $ac_status); }; }; then + echo "$as_me:11926: \$? = $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:11230: result: $ac_cv_lib_gpm_Gpm_Open" >&5 +echo "$as_me:11937: 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:11233: checking for initscr in -lgpm" >&5 +if test "$ac_cv_lib_gpm_Gpm_Open" = yes; then + echo "$as_me:11940: 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 11241 "configure" +cat >"conftest.$ac_ext" <<_ACEOF +#line 11948 "configure" #include "confdefs.h" /* Override any gcc2 internal prototype to avoid an error. */ @@ -11256,30 +11963,30 @@ initscr (); return 0; } _ACEOF -rm -f conftest.$ac_objext conftest$ac_exeext -if { (eval echo "$as_me:11260: \"$ac_link\"") >&5 +rm -f "conftest.$ac_objext" "conftest$ac_exeext" +if { (eval echo "$as_me:11967: \"$ac_link\"") >&5 (eval $ac_link) 2>&5 ac_status=$? - echo "$as_me:11263: \$? = $ac_status" >&5 - (exit $ac_status); } && - { ac_try='test -s conftest$ac_exeext' - { (eval echo "$as_me:11266: \"$ac_try\"") >&5 + echo "$as_me:11970: \$? = $ac_status" >&5 + (exit "$ac_status"); } && + { ac_try='test -s "conftest$ac_exeext"' + { (eval echo "$as_me:11973: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? - echo "$as_me:11269: \$? = $ac_status" >&5 - (exit $ac_status); }; }; then + echo "$as_me:11976: \$? = $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:11280: result: $ac_cv_lib_gpm_initscr" >&5 +echo "$as_me:11987: 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" @@ -11287,20 +11994,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:11295: checking for tgoto in -lmytinfo" >&5 + echo "$as_me:12002: 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 11303 "configure" +cat >"conftest.$ac_ext" <<_ACEOF +#line 12010 "configure" #include "confdefs.h" /* Override any gcc2 internal prototype to avoid an error. */ @@ -11318,30 +12025,30 @@ tgoto (); return 0; } _ACEOF -rm -f conftest.$ac_objext conftest$ac_exeext -if { (eval echo "$as_me:11322: \"$ac_link\"") >&5 +rm -f "conftest.$ac_objext" "conftest$ac_exeext" +if { (eval echo "$as_me:12029: \"$ac_link\"") >&5 (eval $ac_link) 2>&5 ac_status=$? - echo "$as_me:11325: \$? = $ac_status" >&5 - (exit $ac_status); } && - { ac_try='test -s conftest$ac_exeext' - { (eval echo "$as_me:11328: \"$ac_try\"") >&5 + echo "$as_me:12032: \$? = $ac_status" >&5 + (exit "$ac_status"); } && + { ac_try='test -s "conftest$ac_exeext"' + { (eval echo "$as_me:12035: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? - echo "$as_me:11331: \$? = $ac_status" >&5 - (exit $ac_status); }; }; then + echo "$as_me:12038: \$? = $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:11342: result: $ac_cv_lib_mytinfo_tgoto" >&5 +echo "$as_me:12049: 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 @@ -11365,7 +12072,7 @@ for cf_add_1lib in $cf_add_0lib; do 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="$LIBS" @@ -11386,15 +12093,15 @@ 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:11391: checking for initscr" >&5 + echo "$as_me:12098: 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 11397 "configure" + cat >"conftest.$ac_ext" <<_ACEOF +#line 12104 "configure" #include "confdefs.h" #define initscr autoconf_temporary #include /* least-intrusive standard header which defines gcc2 __stub macros */ @@ -11424,38 +12131,38 @@ main (void) return 0; } _ACEOF -rm -f conftest.$ac_objext conftest$ac_exeext -if { (eval echo "$as_me:11428: \"$ac_link\"") >&5 +rm -f "conftest.$ac_objext" "conftest$ac_exeext" +if { (eval echo "$as_me:12135: \"$ac_link\"") >&5 (eval $ac_link) 2>&5 ac_status=$? - echo "$as_me:11431: \$? = $ac_status" >&5 - (exit $ac_status); } && - { ac_try='test -s conftest$ac_exeext' - { (eval echo "$as_me:11434: \"$ac_try\"") >&5 + echo "$as_me:12138: \$? = $ac_status" >&5 + (exit "$ac_status"); } && + { ac_try='test -s "conftest$ac_exeext"' + { (eval echo "$as_me:12141: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? - echo "$as_me:11437: \$? = $ac_status" >&5 - (exit $ac_status); }; }; then + echo "$as_me:12144: \$? = $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:11447: result: $ac_cv_func_initscr" >&5 +echo "$as_me:12154: 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:11454: checking for initscr in -l$cf_nculib_root" >&5 + echo "$as_me:12161: 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 11458 "configure" + cat >"conftest.$ac_ext" <<_ACEOF +#line 12165 "configure" #include "confdefs.h" #include <${cf_cv_ncurses_header:-curses.h}> int @@ -11466,26 +12173,26 @@ initscr() return 0; } _ACEOF -rm -f conftest.$ac_objext conftest$ac_exeext -if { (eval echo "$as_me:11470: \"$ac_link\"") >&5 +rm -f "conftest.$ac_objext" "conftest$ac_exeext" +if { (eval echo "$as_me:12177: \"$ac_link\"") >&5 (eval $ac_link) 2>&5 ac_status=$? - echo "$as_me:11473: \$? = $ac_status" >&5 - (exit $ac_status); } && - { ac_try='test -s conftest$ac_exeext' - { (eval echo "$as_me:11476: \"$ac_try\"") >&5 + echo "$as_me:12180: \$? = $ac_status" >&5 + (exit "$ac_status"); } && + { ac_try='test -s "conftest$ac_exeext"' + { (eval echo "$as_me:12183: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? - echo "$as_me:11479: \$? = $ac_status" >&5 - (exit $ac_status); }; }; then - echo "$as_me:11481: result: yes" >&5 + echo "$as_me:12186: \$? = $ac_status" >&5 + (exit "$ac_status"); }; }; then + echo "$as_me:12188: 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:11488: result: no" >&5 +cat "conftest.$ac_ext" >&5 +echo "$as_me:12195: result: no" >&5 echo "${ECHO_T}no" >&6 cf_search= @@ -11493,7 +12200,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$,,'` @@ -11501,11 +12208,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" @@ -11520,11 +12227,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 \ @@ -11538,13 +12245,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 @@ -11553,11 +12260,11 @@ cf_search="$cf_library_path_list $cf_search" for cf_libdir in $cf_search do - echo "$as_me:11556: checking for -l$cf_nculib_root in $cf_libdir" >&5 + echo "$as_me:12263: 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 11560 "configure" + cat >"conftest.$ac_ext" <<_ACEOF +#line 12267 "configure" #include "confdefs.h" #include <${cf_cv_ncurses_header:-curses.h}> int @@ -11568,41 +12275,41 @@ initscr() return 0; } _ACEOF -rm -f conftest.$ac_objext conftest$ac_exeext -if { (eval echo "$as_me:11572: \"$ac_link\"") >&5 +rm -f "conftest.$ac_objext" "conftest$ac_exeext" +if { (eval echo "$as_me:12279: \"$ac_link\"") >&5 (eval $ac_link) 2>&5 ac_status=$? - echo "$as_me:11575: \$? = $ac_status" >&5 - (exit $ac_status); } && - { ac_try='test -s conftest$ac_exeext' - { (eval echo "$as_me:11578: \"$ac_try\"") >&5 + echo "$as_me:12282: \$? = $ac_status" >&5 + (exit "$ac_status"); } && + { ac_try='test -s "conftest$ac_exeext"' + { (eval echo "$as_me:12285: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? - echo "$as_me:11581: \$? = $ac_status" >&5 - (exit $ac_status); }; }; then - echo "$as_me:11583: result: yes" >&5 + echo "$as_me:12288: \$? = $ac_status" >&5 + (exit "$ac_status"); }; }; then + echo "$as_me:12290: 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:11590: result: no" >&5 +cat "conftest.$ac_ext" >&5 +echo "$as_me:12297: 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:11605: error: Cannot link $cf_nculib_root library" >&5 +if test "$cf_found_library" = no ; then + { { echo "$as_me:12312: error: Cannot link $cf_nculib_root library" >&5 echo "$as_me: error: Cannot link $cf_nculib_root library" >&2;} { (exit 1); exit 1; }; } fi @@ -11610,49 +12317,49 @@ fi fi if test -n "$cf_ncurses_LIBS" ; then - echo "$as_me:11613: checking if we can link $cf_nculib_root without $cf_ncurses_LIBS" >&5 + echo "$as_me:12320: 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 11623 "configure" + cat >"conftest.$ac_ext" <<_ACEOF +#line 12330 "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:11635: \"$ac_link\"") >&5 +rm -f "conftest.$ac_objext" "conftest$ac_exeext" +if { (eval echo "$as_me:12342: \"$ac_link\"") >&5 (eval $ac_link) 2>&5 ac_status=$? - echo "$as_me:11638: \$? = $ac_status" >&5 - (exit $ac_status); } && - { ac_try='test -s conftest$ac_exeext' - { (eval echo "$as_me:11641: \"$ac_try\"") >&5 + echo "$as_me:12345: \$? = $ac_status" >&5 + (exit "$ac_status"); } && + { ac_try='test -s "conftest$ac_exeext"' + { (eval echo "$as_me:12348: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? - echo "$as_me:11644: \$? = $ac_status" >&5 - (exit $ac_status); }; }; then - echo "$as_me:11646: result: yes" >&5 + echo "$as_me:12351: \$? = $ac_status" >&5 + (exit "$ac_status"); }; }; then + echo "$as_me:12353: result: yes" >&5 echo "${ECHO_T}yes" >&6 else echo "$as_me: failed program was:" >&5 -cat conftest.$ac_ext >&5 -echo "$as_me:11651: result: no" >&5 +cat "conftest.$ac_ext" >&5 +echo "$as_me:12358: 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___%` @@ -11668,7 +12375,7 @@ fi ;; (pdcurses) - echo "$as_me:11671: checking for X" >&5 + echo "$as_me:12378: checking for X" >&5 echo $ECHO_N "checking for X... $ECHO_C" >&6 # Check whether --with-x or --without-x was given. @@ -11700,11 +12407,11 @@ acfindx: EOF if (xmkmf) >/dev/null 2>/dev/null && test -f Makefile; then # GNU make sometimes prints "make[1]: Entering...", which would confuse us. - eval `${MAKE-make} acfindx 2>/dev/null | grep -v make` + eval "`${MAKE-make} acfindx 2>/dev/null | grep -v make`" # Open Windows xmkmf reportedly sets LIBDIR instead of USRLIBDIR. for ac_extension in a so sl dylib dll; do - if test ! -f $ac_im_usrlibdir/libX11.$ac_extension && - test -f $ac_im_libdir/libX11.$ac_extension; then + if test ! -f "$ac_im_usrlibdir/libX11.$ac_extension" && + test -f "$ac_im_libdir/libX11.$ac_extension"; then ac_im_usrlibdir=$ac_im_libdir; break fi done @@ -11771,19 +12478,19 @@ ac_x_header_dirs=' if test "$ac_x_includes" = no; then # Guess where to find include files, by looking for Intrinsic.h. # First, try using that file with no special directory specified. - cat >conftest.$ac_ext <<_ACEOF -#line 11775 "configure" + cat >"conftest.$ac_ext" <<_ACEOF +#line 12482 "configure" #include "confdefs.h" #include _ACEOF -if { (eval echo "$as_me:11779: \"$ac_cpp conftest.$ac_ext\"") >&5 - (eval $ac_cpp conftest.$ac_ext) 2>conftest.er1 +if { (eval echo "$as_me:12486: \"$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:11785: \$? = $ac_status" >&5 - (exit $ac_status); } >/dev/null; then + echo "$as_me:12492: \$? = $ac_status" >&5 + (exit "$ac_status"); } >/dev/null; then if test -s conftest.err; then ac_cpp_err=$ac_c_preproc_warn_flag else @@ -11797,7 +12504,7 @@ if test -z "$ac_cpp_err"; then ac_x_includes= else echo "$as_me: failed program was:" >&5 - cat conftest.$ac_ext >&5 + cat "conftest.$ac_ext" >&5 for ac_dir in $ac_x_header_dirs; do if test -r "$ac_dir/X11/Intrinsic.h"; then ac_x_includes=$ac_dir @@ -11805,7 +12512,7 @@ else fi done fi -rm -f conftest.err conftest.$ac_ext +rm -f conftest.err "conftest.$ac_ext" fi # $ac_x_includes = no if test "$ac_x_libraries" = no; then @@ -11814,8 +12521,8 @@ if test "$ac_x_libraries" = no; then # Don't add to $LIBS permanently. ac_save_LIBS=$LIBS LIBS="-lXt $LIBS" - cat >conftest.$ac_ext <<_ACEOF -#line 11818 "configure" + cat >"conftest.$ac_ext" <<_ACEOF +#line 12525 "configure" #include "confdefs.h" #include int @@ -11826,37 +12533,37 @@ XtMalloc (0) return 0; } _ACEOF -rm -f conftest.$ac_objext conftest$ac_exeext -if { (eval echo "$as_me:11830: \"$ac_link\"") >&5 +rm -f "conftest.$ac_objext" "conftest$ac_exeext" +if { (eval echo "$as_me:12537: \"$ac_link\"") >&5 (eval $ac_link) 2>&5 ac_status=$? - echo "$as_me:11833: \$? = $ac_status" >&5 - (exit $ac_status); } && - { ac_try='test -s conftest$ac_exeext' - { (eval echo "$as_me:11836: \"$ac_try\"") >&5 + echo "$as_me:12540: \$? = $ac_status" >&5 + (exit "$ac_status"); } && + { ac_try='test -s "conftest$ac_exeext"' + { (eval echo "$as_me:12543: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? - echo "$as_me:11839: \$? = $ac_status" >&5 - (exit $ac_status); }; }; then + echo "$as_me:12546: \$? = $ac_status" >&5 + (exit "$ac_status"); }; }; then LIBS=$ac_save_LIBS # We can link X programs with no special library path. ac_x_libraries= else echo "$as_me: failed program was:" >&5 -cat conftest.$ac_ext >&5 +cat "conftest.$ac_ext" >&5 LIBS=$ac_save_LIBS for ac_dir in `echo "$ac_x_includes $ac_x_header_dirs" | sed s/include/lib/g` do # Don't even attempt the hair of trying to link an X program! for ac_extension in a so sl dylib dll; do - if test -r $ac_dir/libXt.$ac_extension; then + if test -r "$ac_dir/libXt.$ac_extension"; then ac_x_libraries=$ac_dir break 2 fi done 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 # $ac_x_libraries = no if test "$ac_x_includes" = no || test "$ac_x_libraries" = no; then @@ -11874,7 +12581,7 @@ fi fi # $with_x != no if test "$have_x" != yes; then - echo "$as_me:11877: result: $have_x" >&5 + echo "$as_me:12584: result: $have_x" >&5 echo "${ECHO_T}$have_x" >&6 no_x=yes else @@ -11884,7 +12591,7 @@ else # Update the cache value to reflect the command line values. ac_cv_have_x="have_x=yes \ ac_x_includes=$x_includes ac_x_libraries=$x_libraries" - echo "$as_me:11887: result: libraries $x_libraries, headers $x_includes" >&5 + echo "$as_me:12594: result: libraries $x_libraries, headers $x_includes" >&5 echo "${ECHO_T}libraries $x_libraries, headers $x_includes" >&6 fi @@ -11895,7 +12602,10 @@ cat >>confdefs.h <<\EOF #define X_DISPLAY_MISSING 1 EOF - X_CFLAGS= X_PRE_LIBS= X_LIBS= X_EXTRA_LIBS= + X_CFLAGS= + X_PRE_LIBS= + X_LIBS= + X_EXTRA_LIBS= else if test -n "$x_includes"; then X_CFLAGS="$X_CFLAGS -I$x_includes" @@ -11908,11 +12618,11 @@ else # others require no space. Words are not sufficient . . . . case `(uname -sr) 2>/dev/null` in "SunOS 5"*) - echo "$as_me:11911: checking whether -R must be followed by a space" >&5 + echo "$as_me:12621: checking whether -R must be followed by a space" >&5 echo $ECHO_N "checking whether -R must be followed by a space... $ECHO_C" >&6 ac_xsave_LIBS=$LIBS; LIBS="$LIBS -R$x_libraries" - cat >conftest.$ac_ext <<_ACEOF -#line 11915 "configure" + cat >"conftest.$ac_ext" <<_ACEOF +#line 12625 "configure" #include "confdefs.h" int @@ -11923,33 +12633,33 @@ main (void) return 0; } _ACEOF -rm -f conftest.$ac_objext conftest$ac_exeext -if { (eval echo "$as_me:11927: \"$ac_link\"") >&5 +rm -f "conftest.$ac_objext" "conftest$ac_exeext" +if { (eval echo "$as_me:12637: \"$ac_link\"") >&5 (eval $ac_link) 2>&5 ac_status=$? - echo "$as_me:11930: \$? = $ac_status" >&5 - (exit $ac_status); } && - { ac_try='test -s conftest$ac_exeext' - { (eval echo "$as_me:11933: \"$ac_try\"") >&5 + echo "$as_me:12640: \$? = $ac_status" >&5 + (exit "$ac_status"); } && + { ac_try='test -s "conftest$ac_exeext"' + { (eval echo "$as_me:12643: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? - echo "$as_me:11936: \$? = $ac_status" >&5 - (exit $ac_status); }; }; then + echo "$as_me:12646: \$? = $ac_status" >&5 + (exit "$ac_status"); }; }; then ac_R_nospace=yes else echo "$as_me: failed program was:" >&5 -cat conftest.$ac_ext >&5 +cat "conftest.$ac_ext" >&5 ac_R_nospace=no fi -rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext +rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext" if test $ac_R_nospace = yes; then - echo "$as_me:11946: result: no" >&5 + echo "$as_me:12656: result: no" >&5 echo "${ECHO_T}no" >&6 X_LIBS="$X_LIBS -R$x_libraries" else LIBS="$ac_xsave_LIBS -R $x_libraries" - cat >conftest.$ac_ext <<_ACEOF -#line 11952 "configure" + cat >"conftest.$ac_ext" <<_ACEOF +#line 12662 "configure" #include "confdefs.h" int @@ -11960,31 +12670,31 @@ main (void) return 0; } _ACEOF -rm -f conftest.$ac_objext conftest$ac_exeext -if { (eval echo "$as_me:11964: \"$ac_link\"") >&5 +rm -f "conftest.$ac_objext" "conftest$ac_exeext" +if { (eval echo "$as_me:12674: \"$ac_link\"") >&5 (eval $ac_link) 2>&5 ac_status=$? - echo "$as_me:11967: \$? = $ac_status" >&5 - (exit $ac_status); } && - { ac_try='test -s conftest$ac_exeext' - { (eval echo "$as_me:11970: \"$ac_try\"") >&5 + echo "$as_me:12677: \$? = $ac_status" >&5 + (exit "$ac_status"); } && + { ac_try='test -s "conftest$ac_exeext"' + { (eval echo "$as_me:12680: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? - echo "$as_me:11973: \$? = $ac_status" >&5 - (exit $ac_status); }; }; then + echo "$as_me:12683: \$? = $ac_status" >&5 + (exit "$ac_status"); }; }; then ac_R_space=yes else echo "$as_me: failed program was:" >&5 -cat conftest.$ac_ext >&5 +cat "conftest.$ac_ext" >&5 ac_R_space=no fi -rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext +rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext" if test $ac_R_space = yes; then - echo "$as_me:11983: result: yes" >&5 + echo "$as_me:12693: result: yes" >&5 echo "${ECHO_T}yes" >&6 X_LIBS="$X_LIBS -R $x_libraries" else - echo "$as_me:11987: result: neither works" >&5 + echo "$as_me:12697: result: neither works" >&5 echo "${ECHO_T}neither works" >&6 fi fi @@ -12003,8 +12713,8 @@ echo "${ECHO_T}neither works" >&6 # libraries were built with DECnet support. And Karl Berry says # the Alpha needs dnet_stub (dnet does not exist). ac_xsave_LIBS="$LIBS"; LIBS="$LIBS $X_LIBS -lX11" - cat >conftest.$ac_ext <<_ACEOF -#line 12007 "configure" + cat >"conftest.$ac_ext" <<_ACEOF +#line 12717 "configure" #include "confdefs.h" /* Override any gcc2 internal prototype to avoid an error. */ @@ -12022,31 +12732,31 @@ XOpenDisplay (); return 0; } _ACEOF -rm -f conftest.$ac_objext conftest$ac_exeext -if { (eval echo "$as_me:12026: \"$ac_link\"") >&5 +rm -f "conftest.$ac_objext" "conftest$ac_exeext" +if { (eval echo "$as_me:12736: \"$ac_link\"") >&5 (eval $ac_link) 2>&5 ac_status=$? - echo "$as_me:12029: \$? = $ac_status" >&5 - (exit $ac_status); } && - { ac_try='test -s conftest$ac_exeext' - { (eval echo "$as_me:12032: \"$ac_try\"") >&5 + echo "$as_me:12739: \$? = $ac_status" >&5 + (exit "$ac_status"); } && + { ac_try='test -s "conftest$ac_exeext"' + { (eval echo "$as_me:12742: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? - echo "$as_me:12035: \$? = $ac_status" >&5 - (exit $ac_status); }; }; then + echo "$as_me:12745: \$? = $ac_status" >&5 + (exit "$ac_status"); }; }; then : else echo "$as_me: failed program was:" >&5 -cat conftest.$ac_ext >&5 -echo "$as_me:12041: checking for dnet_ntoa in -ldnet" >&5 +cat "conftest.$ac_ext" >&5 +echo "$as_me:12751: checking for dnet_ntoa in -ldnet" >&5 echo $ECHO_N "checking for dnet_ntoa in -ldnet... $ECHO_C" >&6 if test "${ac_cv_lib_dnet_dnet_ntoa+set}" = set; then echo $ECHO_N "(cached) $ECHO_C" >&6 else ac_check_lib_save_LIBS=$LIBS LIBS="-ldnet $LIBS" -cat >conftest.$ac_ext <<_ACEOF -#line 12049 "configure" +cat >"conftest.$ac_ext" <<_ACEOF +#line 12759 "configure" #include "confdefs.h" /* Override any gcc2 internal prototype to avoid an error. */ @@ -12064,43 +12774,43 @@ dnet_ntoa (); return 0; } _ACEOF -rm -f conftest.$ac_objext conftest$ac_exeext -if { (eval echo "$as_me:12068: \"$ac_link\"") >&5 +rm -f "conftest.$ac_objext" "conftest$ac_exeext" +if { (eval echo "$as_me:12778: \"$ac_link\"") >&5 (eval $ac_link) 2>&5 ac_status=$? - echo "$as_me:12071: \$? = $ac_status" >&5 - (exit $ac_status); } && - { ac_try='test -s conftest$ac_exeext' - { (eval echo "$as_me:12074: \"$ac_try\"") >&5 + echo "$as_me:12781: \$? = $ac_status" >&5 + (exit "$ac_status"); } && + { ac_try='test -s "conftest$ac_exeext"' + { (eval echo "$as_me:12784: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? - echo "$as_me:12077: \$? = $ac_status" >&5 - (exit $ac_status); }; }; then + echo "$as_me:12787: \$? = $ac_status" >&5 + (exit "$ac_status"); }; }; then ac_cv_lib_dnet_dnet_ntoa=yes else echo "$as_me: failed program was:" >&5 -cat conftest.$ac_ext >&5 +cat "conftest.$ac_ext" >&5 ac_cv_lib_dnet_dnet_ntoa=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:12088: result: $ac_cv_lib_dnet_dnet_ntoa" >&5 +echo "$as_me:12798: result: $ac_cv_lib_dnet_dnet_ntoa" >&5 echo "${ECHO_T}$ac_cv_lib_dnet_dnet_ntoa" >&6 -if test $ac_cv_lib_dnet_dnet_ntoa = yes; then +if test "$ac_cv_lib_dnet_dnet_ntoa" = yes; then X_EXTRA_LIBS="$X_EXTRA_LIBS -ldnet" fi if test $ac_cv_lib_dnet_dnet_ntoa = no; then - echo "$as_me:12095: checking for dnet_ntoa in -ldnet_stub" >&5 + echo "$as_me:12805: checking for dnet_ntoa in -ldnet_stub" >&5 echo $ECHO_N "checking for dnet_ntoa in -ldnet_stub... $ECHO_C" >&6 if test "${ac_cv_lib_dnet_stub_dnet_ntoa+set}" = set; then echo $ECHO_N "(cached) $ECHO_C" >&6 else ac_check_lib_save_LIBS=$LIBS LIBS="-ldnet_stub $LIBS" -cat >conftest.$ac_ext <<_ACEOF -#line 12103 "configure" +cat >"conftest.$ac_ext" <<_ACEOF +#line 12813 "configure" #include "confdefs.h" /* Override any gcc2 internal prototype to avoid an error. */ @@ -12118,36 +12828,36 @@ dnet_ntoa (); return 0; } _ACEOF -rm -f conftest.$ac_objext conftest$ac_exeext -if { (eval echo "$as_me:12122: \"$ac_link\"") >&5 +rm -f "conftest.$ac_objext" "conftest$ac_exeext" +if { (eval echo "$as_me:12832: \"$ac_link\"") >&5 (eval $ac_link) 2>&5 ac_status=$? - echo "$as_me:12125: \$? = $ac_status" >&5 - (exit $ac_status); } && - { ac_try='test -s conftest$ac_exeext' - { (eval echo "$as_me:12128: \"$ac_try\"") >&5 + echo "$as_me:12835: \$? = $ac_status" >&5 + (exit "$ac_status"); } && + { ac_try='test -s "conftest$ac_exeext"' + { (eval echo "$as_me:12838: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? - echo "$as_me:12131: \$? = $ac_status" >&5 - (exit $ac_status); }; }; then + echo "$as_me:12841: \$? = $ac_status" >&5 + (exit "$ac_status"); }; }; then ac_cv_lib_dnet_stub_dnet_ntoa=yes else echo "$as_me: failed program was:" >&5 -cat conftest.$ac_ext >&5 +cat "conftest.$ac_ext" >&5 ac_cv_lib_dnet_stub_dnet_ntoa=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:12142: result: $ac_cv_lib_dnet_stub_dnet_ntoa" >&5 +echo "$as_me:12852: result: $ac_cv_lib_dnet_stub_dnet_ntoa" >&5 echo "${ECHO_T}$ac_cv_lib_dnet_stub_dnet_ntoa" >&6 -if test $ac_cv_lib_dnet_stub_dnet_ntoa = yes; then +if test "$ac_cv_lib_dnet_stub_dnet_ntoa" = yes; then X_EXTRA_LIBS="$X_EXTRA_LIBS -ldnet_stub" fi fi 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_xsave_LIBS" # msh@cis.ufl.edu says -lnsl (and -lsocket) are needed for his 386/AT, @@ -12158,13 +12868,13 @@ rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext # on Irix 5.2, according to T.E. Dickey. # The functions gethostbyname, getservbyname, and inet_addr are # in -lbsd on LynxOS 3.0.1/i386, according to Lars Hecking. - echo "$as_me:12161: checking for gethostbyname" >&5 + echo "$as_me:12871: checking for gethostbyname" >&5 echo $ECHO_N "checking for gethostbyname... $ECHO_C" >&6 if test "${ac_cv_func_gethostbyname+set}" = set; then echo $ECHO_N "(cached) $ECHO_C" >&6 else - cat >conftest.$ac_ext <<_ACEOF -#line 12167 "configure" + cat >"conftest.$ac_ext" <<_ACEOF +#line 12877 "configure" #include "confdefs.h" #define gethostbyname autoconf_temporary #include /* least-intrusive standard header which defines gcc2 __stub macros */ @@ -12194,39 +12904,39 @@ main (void) return 0; } _ACEOF -rm -f conftest.$ac_objext conftest$ac_exeext -if { (eval echo "$as_me:12198: \"$ac_link\"") >&5 +rm -f "conftest.$ac_objext" "conftest$ac_exeext" +if { (eval echo "$as_me:12908: \"$ac_link\"") >&5 (eval $ac_link) 2>&5 ac_status=$? - echo "$as_me:12201: \$? = $ac_status" >&5 - (exit $ac_status); } && - { ac_try='test -s conftest$ac_exeext' - { (eval echo "$as_me:12204: \"$ac_try\"") >&5 + echo "$as_me:12911: \$? = $ac_status" >&5 + (exit "$ac_status"); } && + { ac_try='test -s "conftest$ac_exeext"' + { (eval echo "$as_me:12914: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? - echo "$as_me:12207: \$? = $ac_status" >&5 - (exit $ac_status); }; }; then + echo "$as_me:12917: \$? = $ac_status" >&5 + (exit "$ac_status"); }; }; then ac_cv_func_gethostbyname=yes else echo "$as_me: failed program was:" >&5 -cat conftest.$ac_ext >&5 +cat "conftest.$ac_ext" >&5 ac_cv_func_gethostbyname=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:12217: result: $ac_cv_func_gethostbyname" >&5 +echo "$as_me:12927: result: $ac_cv_func_gethostbyname" >&5 echo "${ECHO_T}$ac_cv_func_gethostbyname" >&6 if test $ac_cv_func_gethostbyname = no; then - echo "$as_me:12221: checking for gethostbyname in -lnsl" >&5 + echo "$as_me:12931: checking for gethostbyname in -lnsl" >&5 echo $ECHO_N "checking for gethostbyname in -lnsl... $ECHO_C" >&6 if test "${ac_cv_lib_nsl_gethostbyname+set}" = set; then echo $ECHO_N "(cached) $ECHO_C" >&6 else ac_check_lib_save_LIBS=$LIBS LIBS="-lnsl $LIBS" -cat >conftest.$ac_ext <<_ACEOF -#line 12229 "configure" +cat >"conftest.$ac_ext" <<_ACEOF +#line 12939 "configure" #include "confdefs.h" /* Override any gcc2 internal prototype to avoid an error. */ @@ -12244,43 +12954,43 @@ gethostbyname (); return 0; } _ACEOF -rm -f conftest.$ac_objext conftest$ac_exeext -if { (eval echo "$as_me:12248: \"$ac_link\"") >&5 +rm -f "conftest.$ac_objext" "conftest$ac_exeext" +if { (eval echo "$as_me:12958: \"$ac_link\"") >&5 (eval $ac_link) 2>&5 ac_status=$? - echo "$as_me:12251: \$? = $ac_status" >&5 - (exit $ac_status); } && - { ac_try='test -s conftest$ac_exeext' - { (eval echo "$as_me:12254: \"$ac_try\"") >&5 + echo "$as_me:12961: \$? = $ac_status" >&5 + (exit "$ac_status"); } && + { ac_try='test -s "conftest$ac_exeext"' + { (eval echo "$as_me:12964: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? - echo "$as_me:12257: \$? = $ac_status" >&5 - (exit $ac_status); }; }; then + echo "$as_me:12967: \$? = $ac_status" >&5 + (exit "$ac_status"); }; }; then ac_cv_lib_nsl_gethostbyname=yes else echo "$as_me: failed program was:" >&5 -cat conftest.$ac_ext >&5 +cat "conftest.$ac_ext" >&5 ac_cv_lib_nsl_gethostbyname=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:12268: result: $ac_cv_lib_nsl_gethostbyname" >&5 +echo "$as_me:12978: result: $ac_cv_lib_nsl_gethostbyname" >&5 echo "${ECHO_T}$ac_cv_lib_nsl_gethostbyname" >&6 -if test $ac_cv_lib_nsl_gethostbyname = yes; then +if test "$ac_cv_lib_nsl_gethostbyname" = yes; then X_EXTRA_LIBS="$X_EXTRA_LIBS -lnsl" fi if test $ac_cv_lib_nsl_gethostbyname = no; then - echo "$as_me:12275: checking for gethostbyname in -lbsd" >&5 + echo "$as_me:12985: checking for gethostbyname in -lbsd" >&5 echo $ECHO_N "checking for gethostbyname in -lbsd... $ECHO_C" >&6 if test "${ac_cv_lib_bsd_gethostbyname+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 12283 "configure" +cat >"conftest.$ac_ext" <<_ACEOF +#line 12993 "configure" #include "confdefs.h" /* Override any gcc2 internal prototype to avoid an error. */ @@ -12298,30 +13008,30 @@ gethostbyname (); return 0; } _ACEOF -rm -f conftest.$ac_objext conftest$ac_exeext -if { (eval echo "$as_me:12302: \"$ac_link\"") >&5 +rm -f "conftest.$ac_objext" "conftest$ac_exeext" +if { (eval echo "$as_me:13012: \"$ac_link\"") >&5 (eval $ac_link) 2>&5 ac_status=$? - echo "$as_me:12305: \$? = $ac_status" >&5 - (exit $ac_status); } && - { ac_try='test -s conftest$ac_exeext' - { (eval echo "$as_me:12308: \"$ac_try\"") >&5 + echo "$as_me:13015: \$? = $ac_status" >&5 + (exit "$ac_status"); } && + { ac_try='test -s "conftest$ac_exeext"' + { (eval echo "$as_me:13018: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? - echo "$as_me:12311: \$? = $ac_status" >&5 - (exit $ac_status); }; }; then + echo "$as_me:13021: \$? = $ac_status" >&5 + (exit "$ac_status"); }; }; then ac_cv_lib_bsd_gethostbyname=yes else echo "$as_me: failed program was:" >&5 -cat conftest.$ac_ext >&5 +cat "conftest.$ac_ext" >&5 ac_cv_lib_bsd_gethostbyname=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:12322: result: $ac_cv_lib_bsd_gethostbyname" >&5 +echo "$as_me:13032: result: $ac_cv_lib_bsd_gethostbyname" >&5 echo "${ECHO_T}$ac_cv_lib_bsd_gethostbyname" >&6 -if test $ac_cv_lib_bsd_gethostbyname = yes; then +if test "$ac_cv_lib_bsd_gethostbyname" = yes; then X_EXTRA_LIBS="$X_EXTRA_LIBS -lbsd" fi @@ -12335,13 +13045,13 @@ fi # variants that don't use the nameserver (or something). -lsocket # must be given before -lnsl if both are needed. We assume that # if connect needs -lnsl, so does gethostbyname. - echo "$as_me:12338: checking for connect" >&5 + echo "$as_me:13048: checking for connect" >&5 echo $ECHO_N "checking for connect... $ECHO_C" >&6 if test "${ac_cv_func_connect+set}" = set; then echo $ECHO_N "(cached) $ECHO_C" >&6 else - cat >conftest.$ac_ext <<_ACEOF -#line 12344 "configure" + cat >"conftest.$ac_ext" <<_ACEOF +#line 13054 "configure" #include "confdefs.h" #define connect autoconf_temporary #include /* least-intrusive standard header which defines gcc2 __stub macros */ @@ -12371,39 +13081,39 @@ main (void) return 0; } _ACEOF -rm -f conftest.$ac_objext conftest$ac_exeext -if { (eval echo "$as_me:12375: \"$ac_link\"") >&5 +rm -f "conftest.$ac_objext" "conftest$ac_exeext" +if { (eval echo "$as_me:13085: \"$ac_link\"") >&5 (eval $ac_link) 2>&5 ac_status=$? - echo "$as_me:12378: \$? = $ac_status" >&5 - (exit $ac_status); } && - { ac_try='test -s conftest$ac_exeext' - { (eval echo "$as_me:12381: \"$ac_try\"") >&5 + echo "$as_me:13088: \$? = $ac_status" >&5 + (exit "$ac_status"); } && + { ac_try='test -s "conftest$ac_exeext"' + { (eval echo "$as_me:13091: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? - echo "$as_me:12384: \$? = $ac_status" >&5 - (exit $ac_status); }; }; then + echo "$as_me:13094: \$? = $ac_status" >&5 + (exit "$ac_status"); }; }; then ac_cv_func_connect=yes else echo "$as_me: failed program was:" >&5 -cat conftest.$ac_ext >&5 +cat "conftest.$ac_ext" >&5 ac_cv_func_connect=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:12394: result: $ac_cv_func_connect" >&5 +echo "$as_me:13104: result: $ac_cv_func_connect" >&5 echo "${ECHO_T}$ac_cv_func_connect" >&6 if test $ac_cv_func_connect = no; then - echo "$as_me:12398: checking for connect in -lsocket" >&5 + echo "$as_me:13108: checking for connect in -lsocket" >&5 echo $ECHO_N "checking for connect in -lsocket... $ECHO_C" >&6 if test "${ac_cv_lib_socket_connect+set}" = set; then echo $ECHO_N "(cached) $ECHO_C" >&6 else ac_check_lib_save_LIBS=$LIBS LIBS="-lsocket $X_EXTRA_LIBS $LIBS" -cat >conftest.$ac_ext <<_ACEOF -#line 12406 "configure" +cat >"conftest.$ac_ext" <<_ACEOF +#line 13116 "configure" #include "confdefs.h" /* Override any gcc2 internal prototype to avoid an error. */ @@ -12421,43 +13131,43 @@ connect (); return 0; } _ACEOF -rm -f conftest.$ac_objext conftest$ac_exeext -if { (eval echo "$as_me:12425: \"$ac_link\"") >&5 +rm -f "conftest.$ac_objext" "conftest$ac_exeext" +if { (eval echo "$as_me:13135: \"$ac_link\"") >&5 (eval $ac_link) 2>&5 ac_status=$? - echo "$as_me:12428: \$? = $ac_status" >&5 - (exit $ac_status); } && - { ac_try='test -s conftest$ac_exeext' - { (eval echo "$as_me:12431: \"$ac_try\"") >&5 + echo "$as_me:13138: \$? = $ac_status" >&5 + (exit "$ac_status"); } && + { ac_try='test -s "conftest$ac_exeext"' + { (eval echo "$as_me:13141: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? - echo "$as_me:12434: \$? = $ac_status" >&5 - (exit $ac_status); }; }; then + echo "$as_me:13144: \$? = $ac_status" >&5 + (exit "$ac_status"); }; }; then ac_cv_lib_socket_connect=yes else echo "$as_me: failed program was:" >&5 -cat conftest.$ac_ext >&5 +cat "conftest.$ac_ext" >&5 ac_cv_lib_socket_connect=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:12445: result: $ac_cv_lib_socket_connect" >&5 +echo "$as_me:13155: result: $ac_cv_lib_socket_connect" >&5 echo "${ECHO_T}$ac_cv_lib_socket_connect" >&6 -if test $ac_cv_lib_socket_connect = yes; then +if test "$ac_cv_lib_socket_connect" = yes; then X_EXTRA_LIBS="-lsocket $X_EXTRA_LIBS" fi fi # Guillermo Gomez says -lposix is necessary on A/UX. - echo "$as_me:12454: checking for remove" >&5 + echo "$as_me:13164: checking for remove" >&5 echo $ECHO_N "checking for remove... $ECHO_C" >&6 if test "${ac_cv_func_remove+set}" = set; then echo $ECHO_N "(cached) $ECHO_C" >&6 else - cat >conftest.$ac_ext <<_ACEOF -#line 12460 "configure" + cat >"conftest.$ac_ext" <<_ACEOF +#line 13170 "configure" #include "confdefs.h" #define remove autoconf_temporary #include /* least-intrusive standard header which defines gcc2 __stub macros */ @@ -12487,39 +13197,39 @@ main (void) return 0; } _ACEOF -rm -f conftest.$ac_objext conftest$ac_exeext -if { (eval echo "$as_me:12491: \"$ac_link\"") >&5 +rm -f "conftest.$ac_objext" "conftest$ac_exeext" +if { (eval echo "$as_me:13201: \"$ac_link\"") >&5 (eval $ac_link) 2>&5 ac_status=$? - echo "$as_me:12494: \$? = $ac_status" >&5 - (exit $ac_status); } && - { ac_try='test -s conftest$ac_exeext' - { (eval echo "$as_me:12497: \"$ac_try\"") >&5 + echo "$as_me:13204: \$? = $ac_status" >&5 + (exit "$ac_status"); } && + { ac_try='test -s "conftest$ac_exeext"' + { (eval echo "$as_me:13207: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? - echo "$as_me:12500: \$? = $ac_status" >&5 - (exit $ac_status); }; }; then + echo "$as_me:13210: \$? = $ac_status" >&5 + (exit "$ac_status"); }; }; then ac_cv_func_remove=yes else echo "$as_me: failed program was:" >&5 -cat conftest.$ac_ext >&5 +cat "conftest.$ac_ext" >&5 ac_cv_func_remove=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:12510: result: $ac_cv_func_remove" >&5 +echo "$as_me:13220: result: $ac_cv_func_remove" >&5 echo "${ECHO_T}$ac_cv_func_remove" >&6 if test $ac_cv_func_remove = no; then - echo "$as_me:12514: checking for remove in -lposix" >&5 + echo "$as_me:13224: checking for remove in -lposix" >&5 echo $ECHO_N "checking for remove in -lposix... $ECHO_C" >&6 if test "${ac_cv_lib_posix_remove+set}" = set; then echo $ECHO_N "(cached) $ECHO_C" >&6 else ac_check_lib_save_LIBS=$LIBS LIBS="-lposix $LIBS" -cat >conftest.$ac_ext <<_ACEOF -#line 12522 "configure" +cat >"conftest.$ac_ext" <<_ACEOF +#line 13232 "configure" #include "confdefs.h" /* Override any gcc2 internal prototype to avoid an error. */ @@ -12537,43 +13247,43 @@ remove (); return 0; } _ACEOF -rm -f conftest.$ac_objext conftest$ac_exeext -if { (eval echo "$as_me:12541: \"$ac_link\"") >&5 +rm -f "conftest.$ac_objext" "conftest$ac_exeext" +if { (eval echo "$as_me:13251: \"$ac_link\"") >&5 (eval $ac_link) 2>&5 ac_status=$? - echo "$as_me:12544: \$? = $ac_status" >&5 - (exit $ac_status); } && - { ac_try='test -s conftest$ac_exeext' - { (eval echo "$as_me:12547: \"$ac_try\"") >&5 + echo "$as_me:13254: \$? = $ac_status" >&5 + (exit "$ac_status"); } && + { ac_try='test -s "conftest$ac_exeext"' + { (eval echo "$as_me:13257: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? - echo "$as_me:12550: \$? = $ac_status" >&5 - (exit $ac_status); }; }; then + echo "$as_me:13260: \$? = $ac_status" >&5 + (exit "$ac_status"); }; }; then ac_cv_lib_posix_remove=yes else echo "$as_me: failed program was:" >&5 -cat conftest.$ac_ext >&5 +cat "conftest.$ac_ext" >&5 ac_cv_lib_posix_remove=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:12561: result: $ac_cv_lib_posix_remove" >&5 +echo "$as_me:13271: result: $ac_cv_lib_posix_remove" >&5 echo "${ECHO_T}$ac_cv_lib_posix_remove" >&6 -if test $ac_cv_lib_posix_remove = yes; then +if test "$ac_cv_lib_posix_remove" = yes; then X_EXTRA_LIBS="$X_EXTRA_LIBS -lposix" fi fi # BSDI BSD/OS 2.1 needs -lipc for XOpenDisplay. - echo "$as_me:12570: checking for shmat" >&5 + echo "$as_me:13280: checking for shmat" >&5 echo $ECHO_N "checking for shmat... $ECHO_C" >&6 if test "${ac_cv_func_shmat+set}" = set; then echo $ECHO_N "(cached) $ECHO_C" >&6 else - cat >conftest.$ac_ext <<_ACEOF -#line 12576 "configure" + cat >"conftest.$ac_ext" <<_ACEOF +#line 13286 "configure" #include "confdefs.h" #define shmat autoconf_temporary #include /* least-intrusive standard header which defines gcc2 __stub macros */ @@ -12603,39 +13313,39 @@ main (void) return 0; } _ACEOF -rm -f conftest.$ac_objext conftest$ac_exeext -if { (eval echo "$as_me:12607: \"$ac_link\"") >&5 +rm -f "conftest.$ac_objext" "conftest$ac_exeext" +if { (eval echo "$as_me:13317: \"$ac_link\"") >&5 (eval $ac_link) 2>&5 ac_status=$? - echo "$as_me:12610: \$? = $ac_status" >&5 - (exit $ac_status); } && - { ac_try='test -s conftest$ac_exeext' - { (eval echo "$as_me:12613: \"$ac_try\"") >&5 + echo "$as_me:13320: \$? = $ac_status" >&5 + (exit "$ac_status"); } && + { ac_try='test -s "conftest$ac_exeext"' + { (eval echo "$as_me:13323: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? - echo "$as_me:12616: \$? = $ac_status" >&5 - (exit $ac_status); }; }; then + echo "$as_me:13326: \$? = $ac_status" >&5 + (exit "$ac_status"); }; }; then ac_cv_func_shmat=yes else echo "$as_me: failed program was:" >&5 -cat conftest.$ac_ext >&5 +cat "conftest.$ac_ext" >&5 ac_cv_func_shmat=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:12626: result: $ac_cv_func_shmat" >&5 +echo "$as_me:13336: result: $ac_cv_func_shmat" >&5 echo "${ECHO_T}$ac_cv_func_shmat" >&6 if test $ac_cv_func_shmat = no; then - echo "$as_me:12630: checking for shmat in -lipc" >&5 + echo "$as_me:13340: checking for shmat in -lipc" >&5 echo $ECHO_N "checking for shmat in -lipc... $ECHO_C" >&6 if test "${ac_cv_lib_ipc_shmat+set}" = set; then echo $ECHO_N "(cached) $ECHO_C" >&6 else ac_check_lib_save_LIBS=$LIBS LIBS="-lipc $LIBS" -cat >conftest.$ac_ext <<_ACEOF -#line 12638 "configure" +cat >"conftest.$ac_ext" <<_ACEOF +#line 13348 "configure" #include "confdefs.h" /* Override any gcc2 internal prototype to avoid an error. */ @@ -12653,30 +13363,30 @@ shmat (); return 0; } _ACEOF -rm -f conftest.$ac_objext conftest$ac_exeext -if { (eval echo "$as_me:12657: \"$ac_link\"") >&5 +rm -f "conftest.$ac_objext" "conftest$ac_exeext" +if { (eval echo "$as_me:13367: \"$ac_link\"") >&5 (eval $ac_link) 2>&5 ac_status=$? - echo "$as_me:12660: \$? = $ac_status" >&5 - (exit $ac_status); } && - { ac_try='test -s conftest$ac_exeext' - { (eval echo "$as_me:12663: \"$ac_try\"") >&5 + echo "$as_me:13370: \$? = $ac_status" >&5 + (exit "$ac_status"); } && + { ac_try='test -s "conftest$ac_exeext"' + { (eval echo "$as_me:13373: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? - echo "$as_me:12666: \$? = $ac_status" >&5 - (exit $ac_status); }; }; then + echo "$as_me:13376: \$? = $ac_status" >&5 + (exit "$ac_status"); }; }; then ac_cv_lib_ipc_shmat=yes else echo "$as_me: failed program was:" >&5 -cat conftest.$ac_ext >&5 +cat "conftest.$ac_ext" >&5 ac_cv_lib_ipc_shmat=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:12677: result: $ac_cv_lib_ipc_shmat" >&5 +echo "$as_me:13387: result: $ac_cv_lib_ipc_shmat" >&5 echo "${ECHO_T}$ac_cv_lib_ipc_shmat" >&6 -if test $ac_cv_lib_ipc_shmat = yes; then +if test "$ac_cv_lib_ipc_shmat" = yes; then X_EXTRA_LIBS="$X_EXTRA_LIBS -lipc" fi @@ -12692,15 +13402,15 @@ fi # These have to be linked with before -lX11, unlike the other # libraries we check for below, so use a different variable. # John Interrante, Karl Berry - echo "$as_me:12695: checking for IceConnectionNumber in -lICE" >&5 + echo "$as_me:13405: checking for IceConnectionNumber in -lICE" >&5 echo $ECHO_N "checking for IceConnectionNumber in -lICE... $ECHO_C" >&6 if test "${ac_cv_lib_ICE_IceConnectionNumber+set}" = set; then echo $ECHO_N "(cached) $ECHO_C" >&6 else ac_check_lib_save_LIBS=$LIBS LIBS="-lICE $X_EXTRA_LIBS $LIBS" -cat >conftest.$ac_ext <<_ACEOF -#line 12703 "configure" +cat >"conftest.$ac_ext" <<_ACEOF +#line 13413 "configure" #include "confdefs.h" /* Override any gcc2 internal prototype to avoid an error. */ @@ -12718,30 +13428,30 @@ IceConnectionNumber (); return 0; } _ACEOF -rm -f conftest.$ac_objext conftest$ac_exeext -if { (eval echo "$as_me:12722: \"$ac_link\"") >&5 +rm -f "conftest.$ac_objext" "conftest$ac_exeext" +if { (eval echo "$as_me:13432: \"$ac_link\"") >&5 (eval $ac_link) 2>&5 ac_status=$? - echo "$as_me:12725: \$? = $ac_status" >&5 - (exit $ac_status); } && - { ac_try='test -s conftest$ac_exeext' - { (eval echo "$as_me:12728: \"$ac_try\"") >&5 + echo "$as_me:13435: \$? = $ac_status" >&5 + (exit "$ac_status"); } && + { ac_try='test -s "conftest$ac_exeext"' + { (eval echo "$as_me:13438: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? - echo "$as_me:12731: \$? = $ac_status" >&5 - (exit $ac_status); }; }; then + echo "$as_me:13441: \$? = $ac_status" >&5 + (exit "$ac_status"); }; }; then ac_cv_lib_ICE_IceConnectionNumber=yes else echo "$as_me: failed program was:" >&5 -cat conftest.$ac_ext >&5 +cat "conftest.$ac_ext" >&5 ac_cv_lib_ICE_IceConnectionNumber=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:12742: result: $ac_cv_lib_ICE_IceConnectionNumber" >&5 +echo "$as_me:13452: result: $ac_cv_lib_ICE_IceConnectionNumber" >&5 echo "${ECHO_T}$ac_cv_lib_ICE_IceConnectionNumber" >&6 -if test $ac_cv_lib_ICE_IceConnectionNumber = yes; then +if test "$ac_cv_lib_ICE_IceConnectionNumber" = yes; then X_PRE_LIBS="$X_PRE_LIBS -lSM -lICE" fi @@ -12751,7 +13461,7 @@ fi cf_x_athena=${cf_x_athena:-Xaw} -echo "$as_me:12754: checking if you want to link with Xaw 3d library" >&5 +echo "$as_me:13464: checking if you want to link with Xaw 3d library" >&5 echo $ECHO_N "checking if you want to link with Xaw 3d library... $ECHO_C" >&6 withval= @@ -12762,14 +13472,14 @@ if test "${with_Xaw3d+set}" = set; then fi; if test "$withval" = yes ; then cf_x_athena=Xaw3d - echo "$as_me:12765: result: yes" >&5 + echo "$as_me:13475: result: yes" >&5 echo "${ECHO_T}yes" >&6 else - echo "$as_me:12768: result: no" >&5 + echo "$as_me:13478: result: no" >&5 echo "${ECHO_T}no" >&6 fi -echo "$as_me:12772: checking if you want to link with Xaw 3d xft library" >&5 +echo "$as_me:13482: checking if you want to link with Xaw 3d xft library" >&5 echo $ECHO_N "checking if you want to link with Xaw 3d xft library... $ECHO_C" >&6 withval= @@ -12780,14 +13490,14 @@ if test "${with_Xaw3dxft+set}" = set; then fi; if test "$withval" = yes ; then cf_x_athena=Xaw3dxft - echo "$as_me:12783: result: yes" >&5 + echo "$as_me:13493: result: yes" >&5 echo "${ECHO_T}yes" >&6 else - echo "$as_me:12786: result: no" >&5 + echo "$as_me:13496: result: no" >&5 echo "${ECHO_T}no" >&6 fi -echo "$as_me:12790: checking if you want to link with neXT Athena library" >&5 +echo "$as_me:13500: checking if you want to link with neXT Athena library" >&5 echo $ECHO_N "checking if you want to link with neXT Athena library... $ECHO_C" >&6 withval= @@ -12798,14 +13508,14 @@ if test "${with_neXtaw+set}" = set; then fi; if test "$withval" = yes ; then cf_x_athena=neXtaw - echo "$as_me:12801: result: yes" >&5 + echo "$as_me:13511: result: yes" >&5 echo "${ECHO_T}yes" >&6 else - echo "$as_me:12804: result: no" >&5 + echo "$as_me:13514: result: no" >&5 echo "${ECHO_T}no" >&6 fi -echo "$as_me:12808: checking if you want to link with Athena-Plus library" >&5 +echo "$as_me:13518: checking if you want to link with Athena-Plus library" >&5 echo $ECHO_N "checking if you want to link with Athena-Plus library... $ECHO_C" >&6 withval= @@ -12816,10 +13526,10 @@ if test "${with_XawPlus+set}" = set; then fi; if test "$withval" = yes ; then cf_x_athena=XawPlus - echo "$as_me:12819: result: yes" >&5 + echo "$as_me:13529: result: yes" >&5 echo "${ECHO_T}yes" >&6 else - echo "$as_me:12822: result: no" >&5 + echo "$as_me:13532: result: no" >&5 echo "${ECHO_T}no" >&6 fi @@ -12836,20 +13546,20 @@ if test "$PKG_CONFIG" != none ; then lib${cf_x_athena}-devel do -if test "$PKG_CONFIG" != none && "$PKG_CONFIG" --exists $cf_athena_pkg; then +if test "$PKG_CONFIG" != none && "$PKG_CONFIG" --exists "$cf_athena_pkg"; then test -n "$verbose" && echo " found package $cf_athena_pkg" 1>&6 -echo "${as_me:-configure}:12842: testing found package $cf_athena_pkg ..." 1>&5 +echo "${as_me:-configure}:13552: testing found package $cf_athena_pkg ..." 1>&5 - cf_pkgconfig_incs="`$PKG_CONFIG --cflags $cf_athena_pkg 2>/dev/null`" - cf_pkgconfig_libs="`$PKG_CONFIG --libs $cf_athena_pkg 2>/dev/null`" + cf_pkgconfig_incs="`$PKG_CONFIG --cflags "$cf_athena_pkg" 2>/dev/null`" + cf_pkgconfig_libs="`$PKG_CONFIG --libs "$cf_athena_pkg" 2>/dev/null`" test -n "$verbose" && echo " package $cf_athena_pkg CFLAGS: $cf_pkgconfig_incs" 1>&6 -echo "${as_me:-configure}:12848: testing package $cf_athena_pkg CFLAGS: $cf_pkgconfig_incs ..." 1>&5 +echo "${as_me:-configure}:13558: testing package $cf_athena_pkg CFLAGS: $cf_pkgconfig_incs ..." 1>&5 test -n "$verbose" && echo " package $cf_athena_pkg LIBS: $cf_pkgconfig_libs" 1>&6 -echo "${as_me:-configure}:12852: testing package $cf_athena_pkg LIBS: $cf_pkgconfig_libs ..." 1>&5 +echo "${as_me:-configure}:13562: testing package $cf_athena_pkg LIBS: $cf_pkgconfig_libs ..." 1>&5 cf_fix_cppflags=no cf_new_cflags= @@ -12858,19 +13568,19 @@ cf_new_extra_cppflags= for cf_add_cflags in $cf_pkgconfig_incs 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" @@ -12889,7 +13599,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/=.*//'` @@ -12919,7 +13629,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}" \ @@ -12980,20 +13690,20 @@ EOF LIBS=`echo "$LIBS " | sed -e 's/ / /g' -e 's%-l'"$cf_trim_lib"' %%' -e 's/ $//'` test -n "$verbose" && echo " ..trimmed $LIBS" 1>&6 -echo "${as_me:-configure}:12983: testing ..trimmed $LIBS ..." 1>&5 +echo "${as_me:-configure}:13693: testing ..trimmed $LIBS ..." 1>&5 ;; esac done -echo "$as_me:12989: checking for usable $cf_x_athena/Xmu package" >&5 +echo "$as_me:13699: checking for usable $cf_x_athena/Xmu package" >&5 echo $ECHO_N "checking for usable $cf_x_athena/Xmu package... $ECHO_C" >&6 if test "${cf_cv_xaw_compat+set}" = set; then echo $ECHO_N "(cached) $ECHO_C" >&6 else -cat >conftest.$ac_ext <<_ACEOF -#line 12996 "configure" +cat >"conftest.$ac_ext" <<_ACEOF +#line 13706 "configure" #include "confdefs.h" #include @@ -13009,27 +13719,27 @@ int check = XmuCompareISOLatin1("big", "small"); return 0; } _ACEOF -rm -f conftest.$ac_objext conftest$ac_exeext -if { (eval echo "$as_me:13013: \"$ac_link\"") >&5 +rm -f "conftest.$ac_objext" "conftest$ac_exeext" +if { (eval echo "$as_me:13723: \"$ac_link\"") >&5 (eval $ac_link) 2>&5 ac_status=$? - echo "$as_me:13016: \$? = $ac_status" >&5 - (exit $ac_status); } && - { ac_try='test -s conftest$ac_exeext' - { (eval echo "$as_me:13019: \"$ac_try\"") >&5 + echo "$as_me:13726: \$? = $ac_status" >&5 + (exit "$ac_status"); } && + { ac_try='test -s "conftest$ac_exeext"' + { (eval echo "$as_me:13729: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? - echo "$as_me:13022: \$? = $ac_status" >&5 - (exit $ac_status); }; }; then + echo "$as_me:13732: \$? = $ac_status" >&5 + (exit "$ac_status"); }; }; then cf_cv_xaw_compat=yes else echo "$as_me: failed program was:" >&5 -cat conftest.$ac_ext >&5 +cat "conftest.$ac_ext" >&5 cf_cv_xaw_compat=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:13032: result: $cf_cv_xaw_compat" >&5 +echo "$as_me:13742: result: $cf_cv_xaw_compat" >&5 echo "${ECHO_T}$cf_cv_xaw_compat" >&6 if test "$cf_cv_xaw_compat" = no @@ -13041,25 +13751,25 @@ echo "${ECHO_T}$cf_cv_xaw_compat" >&6 (*) test -n "$verbose" && echo " work around broken package" 1>&6 -echo "${as_me:-configure}:13044: testing work around broken package ..." 1>&5 +echo "${as_me:-configure}:13754: testing work around broken package ..." 1>&5 cf_save_xmu="$LIBS" cf_first_lib=`echo "$cf_save_xmu" | sed -e 's/^ *//' -e 's/ .*//'` -if test "$PKG_CONFIG" != none && "$PKG_CONFIG" --exists xmu; then +if test "$PKG_CONFIG" != none && "$PKG_CONFIG" --exists "xmu"; then test -n "$verbose" && echo " found package xmu" 1>&6 -echo "${as_me:-configure}:13052: testing found package xmu ..." 1>&5 +echo "${as_me:-configure}:13762: testing found package xmu ..." 1>&5 - cf_pkgconfig_incs="`$PKG_CONFIG --cflags xmu 2>/dev/null`" - cf_pkgconfig_libs="`$PKG_CONFIG --libs xmu 2>/dev/null`" + cf_pkgconfig_incs="`$PKG_CONFIG --cflags "xmu" 2>/dev/null`" + cf_pkgconfig_libs="`$PKG_CONFIG --libs "xmu" 2>/dev/null`" test -n "$verbose" && echo " package xmu CFLAGS: $cf_pkgconfig_incs" 1>&6 -echo "${as_me:-configure}:13058: testing package xmu CFLAGS: $cf_pkgconfig_incs ..." 1>&5 +echo "${as_me:-configure}:13768: testing package xmu CFLAGS: $cf_pkgconfig_incs ..." 1>&5 test -n "$verbose" && echo " package xmu LIBS: $cf_pkgconfig_libs" 1>&6 -echo "${as_me:-configure}:13062: testing package xmu LIBS: $cf_pkgconfig_libs ..." 1>&5 +echo "${as_me:-configure}:13772: testing package xmu LIBS: $cf_pkgconfig_libs ..." 1>&5 cf_fix_cppflags=no cf_new_cflags= @@ -13068,19 +13778,19 @@ cf_new_extra_cppflags= for cf_add_cflags in $cf_pkgconfig_incs 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" @@ -13099,7 +13809,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/=.*//'` @@ -13129,7 +13839,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}" \ @@ -13179,12 +13889,12 @@ LIBS="$cf_add_libs" test -n "$verbose" && echo " ...before $LIBS" 1>&6 -echo "${as_me:-configure}:13182: testing ...before $LIBS ..." 1>&5 +echo "${as_me:-configure}:13892: testing ...before $LIBS ..." 1>&5 LIBS=`echo "$LIBS" | sed -e "s/[ ][ ]*/ /g" -e "s%$cf_first_lib %$cf_first_lib $cf_pkgconfig_libs %" -e 's% % %g'` test -n "$verbose" && echo " ...after $LIBS" 1>&6 -echo "${as_me:-configure}:13187: testing ...after $LIBS ..." 1>&5 +echo "${as_me:-configure}:13897: testing ...after $LIBS ..." 1>&5 else cf_pkgconfig_incs= @@ -13192,12 +13902,12 @@ else test -n "$verbose" && echo " ...before $LIBS" 1>&6 -echo "${as_me:-configure}:13195: testing ...before $LIBS ..." 1>&5 +echo "${as_me:-configure}:13905: testing ...before $LIBS ..." 1>&5 LIBS=`echo "$LIBS" | sed -e "s/[ ][ ]*/ /g" -e "s%$cf_first_lib %$cf_first_lib -lXmu %" -e 's% % %g'` test -n "$verbose" && echo " ...after $LIBS" 1>&6 -echo "${as_me:-configure}:13200: testing ...after $LIBS ..." 1>&5 +echo "${as_me:-configure}:13910: testing ...after $LIBS ..." 1>&5 fi @@ -13208,7 +13918,7 @@ fi LIBS=`echo "$LIBS " | sed -e 's/ / /g' -e 's%-l'"$cf_trim_lib"' %%' -e 's/ $//'` test -n "$verbose" && echo " ..trimmed $LIBS" 1>&6 -echo "${as_me:-configure}:13211: testing ..trimmed $LIBS ..." 1>&5 +echo "${as_me:-configure}:13921: testing ..trimmed $LIBS ..." 1>&5 ;; esac @@ -13230,20 +13940,20 @@ fi if test -z "$cf_x_athena_lib" ; then -if test "$PKG_CONFIG" != none && "$PKG_CONFIG" --exists Xext; then +if test "$PKG_CONFIG" != none && "$PKG_CONFIG" --exists "Xext"; then test -n "$verbose" && echo " found package Xext" 1>&6 -echo "${as_me:-configure}:13236: testing found package Xext ..." 1>&5 +echo "${as_me:-configure}:13946: testing found package Xext ..." 1>&5 - cf_pkgconfig_incs="`$PKG_CONFIG --cflags Xext 2>/dev/null`" - cf_pkgconfig_libs="`$PKG_CONFIG --libs Xext 2>/dev/null`" + cf_pkgconfig_incs="`$PKG_CONFIG --cflags "Xext" 2>/dev/null`" + cf_pkgconfig_libs="`$PKG_CONFIG --libs "Xext" 2>/dev/null`" test -n "$verbose" && echo " package Xext CFLAGS: $cf_pkgconfig_incs" 1>&6 -echo "${as_me:-configure}:13242: testing package Xext CFLAGS: $cf_pkgconfig_incs ..." 1>&5 +echo "${as_me:-configure}:13952: testing package Xext CFLAGS: $cf_pkgconfig_incs ..." 1>&5 test -n "$verbose" && echo " package Xext LIBS: $cf_pkgconfig_libs" 1>&6 -echo "${as_me:-configure}:13246: testing package Xext LIBS: $cf_pkgconfig_libs ..." 1>&5 +echo "${as_me:-configure}:13956: testing package Xext LIBS: $cf_pkgconfig_libs ..." 1>&5 cf_fix_cppflags=no cf_new_cflags= @@ -13252,19 +13962,19 @@ cf_new_extra_cppflags= for cf_add_cflags in $cf_pkgconfig_incs 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" @@ -13283,7 +13993,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/=.*//'` @@ -13313,7 +14023,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}" \ @@ -13364,15 +14074,15 @@ else cf_pkgconfig_incs= cf_pkgconfig_libs= - echo "$as_me:13367: checking for XextCreateExtension in -lXext" >&5 + echo "$as_me:14077: checking for XextCreateExtension in -lXext" >&5 echo $ECHO_N "checking for XextCreateExtension in -lXext... $ECHO_C" >&6 if test "${ac_cv_lib_Xext_XextCreateExtension+set}" = set; then echo $ECHO_N "(cached) $ECHO_C" >&6 else ac_check_lib_save_LIBS=$LIBS LIBS="-lXext $LIBS" -cat >conftest.$ac_ext <<_ACEOF -#line 13375 "configure" +cat >"conftest.$ac_ext" <<_ACEOF +#line 14085 "configure" #include "confdefs.h" /* Override any gcc2 internal prototype to avoid an error. */ @@ -13390,30 +14100,30 @@ XextCreateExtension (); return 0; } _ACEOF -rm -f conftest.$ac_objext conftest$ac_exeext -if { (eval echo "$as_me:13394: \"$ac_link\"") >&5 +rm -f "conftest.$ac_objext" "conftest$ac_exeext" +if { (eval echo "$as_me:14104: \"$ac_link\"") >&5 (eval $ac_link) 2>&5 ac_status=$? - echo "$as_me:13397: \$? = $ac_status" >&5 - (exit $ac_status); } && - { ac_try='test -s conftest$ac_exeext' - { (eval echo "$as_me:13400: \"$ac_try\"") >&5 + echo "$as_me:14107: \$? = $ac_status" >&5 + (exit "$ac_status"); } && + { ac_try='test -s "conftest$ac_exeext"' + { (eval echo "$as_me:14110: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? - echo "$as_me:13403: \$? = $ac_status" >&5 - (exit $ac_status); }; }; then + echo "$as_me:14113: \$? = $ac_status" >&5 + (exit "$ac_status"); }; }; then ac_cv_lib_Xext_XextCreateExtension=yes else echo "$as_me: failed program was:" >&5 -cat conftest.$ac_ext >&5 +cat "conftest.$ac_ext" >&5 ac_cv_lib_Xext_XextCreateExtension=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:13414: result: $ac_cv_lib_Xext_XextCreateExtension" >&5 +echo "$as_me:14124: result: $ac_cv_lib_Xext_XextCreateExtension" >&5 echo "${ECHO_T}$ac_cv_lib_Xext_XextCreateExtension" >&6 -if test $ac_cv_lib_Xext_XextCreateExtension = yes; then +if test "$ac_cv_lib_Xext_XextCreateExtension" = yes; then cf_add_libs="$LIBS" # reverse order @@ -13444,20 +14154,20 @@ fi if test -z "${X_CFLAGS}${X_PRE_LIBS}${X_LIBS}${X_EXTRA_LIBS}" then -if test "$PKG_CONFIG" != none && "$PKG_CONFIG" --exists x11; then +if test "$PKG_CONFIG" != none && "$PKG_CONFIG" --exists "x11"; then test -n "$verbose" && echo " found package x11" 1>&6 -echo "${as_me:-configure}:13450: testing found package x11 ..." 1>&5 +echo "${as_me:-configure}:14160: testing found package x11 ..." 1>&5 - cf_pkgconfig_incs="`$PKG_CONFIG --cflags x11 2>/dev/null`" - cf_pkgconfig_libs="`$PKG_CONFIG --libs x11 2>/dev/null`" + cf_pkgconfig_incs="`$PKG_CONFIG --cflags "x11" 2>/dev/null`" + cf_pkgconfig_libs="`$PKG_CONFIG --libs "x11" 2>/dev/null`" test -n "$verbose" && echo " package x11 CFLAGS: $cf_pkgconfig_incs" 1>&6 -echo "${as_me:-configure}:13456: testing package x11 CFLAGS: $cf_pkgconfig_incs ..." 1>&5 +echo "${as_me:-configure}:14166: testing package x11 CFLAGS: $cf_pkgconfig_incs ..." 1>&5 test -n "$verbose" && echo " package x11 LIBS: $cf_pkgconfig_libs" 1>&6 -echo "${as_me:-configure}:13460: testing package x11 LIBS: $cf_pkgconfig_libs ..." 1>&5 +echo "${as_me:-configure}:14170: testing package x11 LIBS: $cf_pkgconfig_libs ..." 1>&5 cf_fix_cppflags=no cf_new_cflags= @@ -13466,19 +14176,19 @@ cf_new_extra_cppflags= for cf_add_cflags in $cf_pkgconfig_incs 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" @@ -13497,7 +14207,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/=.*//'` @@ -13527,7 +14237,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}" \ @@ -13577,24 +14287,24 @@ LIBS="$cf_add_libs" else cf_pkgconfig_incs= cf_pkgconfig_libs= - { echo "$as_me:13580: WARNING: unable to find X11 library" >&5 + { echo "$as_me:14290: WARNING: unable to find X11 library" >&5 echo "$as_me: WARNING: unable to find X11 library" >&2;} fi -if test "$PKG_CONFIG" != none && "$PKG_CONFIG" --exists ice; then +if test "$PKG_CONFIG" != none && "$PKG_CONFIG" --exists "ice"; then test -n "$verbose" && echo " found package ice" 1>&6 -echo "${as_me:-configure}:13587: testing found package ice ..." 1>&5 +echo "${as_me:-configure}:14297: testing found package ice ..." 1>&5 - cf_pkgconfig_incs="`$PKG_CONFIG --cflags ice 2>/dev/null`" - cf_pkgconfig_libs="`$PKG_CONFIG --libs ice 2>/dev/null`" + cf_pkgconfig_incs="`$PKG_CONFIG --cflags "ice" 2>/dev/null`" + cf_pkgconfig_libs="`$PKG_CONFIG --libs "ice" 2>/dev/null`" test -n "$verbose" && echo " package ice CFLAGS: $cf_pkgconfig_incs" 1>&6 -echo "${as_me:-configure}:13593: testing package ice CFLAGS: $cf_pkgconfig_incs ..." 1>&5 +echo "${as_me:-configure}:14303: testing package ice CFLAGS: $cf_pkgconfig_incs ..." 1>&5 test -n "$verbose" && echo " package ice LIBS: $cf_pkgconfig_libs" 1>&6 -echo "${as_me:-configure}:13597: testing package ice LIBS: $cf_pkgconfig_libs ..." 1>&5 +echo "${as_me:-configure}:14307: testing package ice LIBS: $cf_pkgconfig_libs ..." 1>&5 cf_fix_cppflags=no cf_new_cflags= @@ -13603,19 +14313,19 @@ cf_new_extra_cppflags= for cf_add_cflags in $cf_pkgconfig_incs 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" @@ -13634,7 +14344,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/=.*//'` @@ -13664,7 +14374,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}" \ @@ -13714,24 +14424,24 @@ LIBS="$cf_add_libs" else cf_pkgconfig_incs= cf_pkgconfig_libs= - { echo "$as_me:13717: WARNING: unable to find ICE library" >&5 + { echo "$as_me:14427: WARNING: unable to find ICE library" >&5 echo "$as_me: WARNING: unable to find ICE library" >&2;} fi -if test "$PKG_CONFIG" != none && "$PKG_CONFIG" --exists sm; then +if test "$PKG_CONFIG" != none && "$PKG_CONFIG" --exists "sm"; then test -n "$verbose" && echo " found package sm" 1>&6 -echo "${as_me:-configure}:13724: testing found package sm ..." 1>&5 +echo "${as_me:-configure}:14434: testing found package sm ..." 1>&5 - cf_pkgconfig_incs="`$PKG_CONFIG --cflags sm 2>/dev/null`" - cf_pkgconfig_libs="`$PKG_CONFIG --libs sm 2>/dev/null`" + cf_pkgconfig_incs="`$PKG_CONFIG --cflags "sm" 2>/dev/null`" + cf_pkgconfig_libs="`$PKG_CONFIG --libs "sm" 2>/dev/null`" test -n "$verbose" && echo " package sm CFLAGS: $cf_pkgconfig_incs" 1>&6 -echo "${as_me:-configure}:13730: testing package sm CFLAGS: $cf_pkgconfig_incs ..." 1>&5 +echo "${as_me:-configure}:14440: testing package sm CFLAGS: $cf_pkgconfig_incs ..." 1>&5 test -n "$verbose" && echo " package sm LIBS: $cf_pkgconfig_libs" 1>&6 -echo "${as_me:-configure}:13734: testing package sm LIBS: $cf_pkgconfig_libs ..." 1>&5 +echo "${as_me:-configure}:14444: testing package sm LIBS: $cf_pkgconfig_libs ..." 1>&5 cf_fix_cppflags=no cf_new_cflags= @@ -13740,19 +14450,19 @@ cf_new_extra_cppflags= for cf_add_cflags in $cf_pkgconfig_incs 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" @@ -13771,7 +14481,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/=.*//'` @@ -13801,7 +14511,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}" \ @@ -13851,24 +14561,24 @@ LIBS="$cf_add_libs" else cf_pkgconfig_incs= cf_pkgconfig_libs= - { echo "$as_me:13854: WARNING: unable to find SM library" >&5 + { echo "$as_me:14564: WARNING: unable to find SM library" >&5 echo "$as_me: WARNING: unable to find SM library" >&2;} fi -if test "$PKG_CONFIG" != none && "$PKG_CONFIG" --exists xt; then +if test "$PKG_CONFIG" != none && "$PKG_CONFIG" --exists "xt"; then test -n "$verbose" && echo " found package xt" 1>&6 -echo "${as_me:-configure}:13861: testing found package xt ..." 1>&5 +echo "${as_me:-configure}:14571: testing found package xt ..." 1>&5 - cf_pkgconfig_incs="`$PKG_CONFIG --cflags xt 2>/dev/null`" - cf_pkgconfig_libs="`$PKG_CONFIG --libs xt 2>/dev/null`" + cf_pkgconfig_incs="`$PKG_CONFIG --cflags "xt" 2>/dev/null`" + cf_pkgconfig_libs="`$PKG_CONFIG --libs "xt" 2>/dev/null`" test -n "$verbose" && echo " package xt CFLAGS: $cf_pkgconfig_incs" 1>&6 -echo "${as_me:-configure}:13867: testing package xt CFLAGS: $cf_pkgconfig_incs ..." 1>&5 +echo "${as_me:-configure}:14577: testing package xt CFLAGS: $cf_pkgconfig_incs ..." 1>&5 test -n "$verbose" && echo " package xt LIBS: $cf_pkgconfig_libs" 1>&6 -echo "${as_me:-configure}:13871: testing package xt LIBS: $cf_pkgconfig_libs ..." 1>&5 +echo "${as_me:-configure}:14581: testing package xt LIBS: $cf_pkgconfig_libs ..." 1>&5 cf_fix_cppflags=no cf_new_cflags= @@ -13877,19 +14587,19 @@ cf_new_extra_cppflags= for cf_add_cflags in $cf_pkgconfig_incs 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" @@ -13908,7 +14618,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/=.*//'` @@ -13938,7 +14648,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}" \ @@ -13988,7 +14698,7 @@ LIBS="$cf_add_libs" else cf_pkgconfig_incs= cf_pkgconfig_libs= - { echo "$as_me:13991: WARNING: unable to find Xt library" >&5 + { echo "$as_me:14701: WARNING: unable to find Xt library" >&5 echo "$as_me: WARNING: unable to find Xt library" >&2;} fi @@ -13998,20 +14708,20 @@ fi cf_have_X_LIBS=no -if test "$PKG_CONFIG" != none && "$PKG_CONFIG" --exists xt; then +if test "$PKG_CONFIG" != none && "$PKG_CONFIG" --exists "xt"; then test -n "$verbose" && echo " found package xt" 1>&6 -echo "${as_me:-configure}:14004: testing found package xt ..." 1>&5 +echo "${as_me:-configure}:14714: testing found package xt ..." 1>&5 - cf_pkgconfig_incs="`$PKG_CONFIG --cflags xt 2>/dev/null`" - cf_pkgconfig_libs="`$PKG_CONFIG --libs xt 2>/dev/null`" + cf_pkgconfig_incs="`$PKG_CONFIG --cflags "xt" 2>/dev/null`" + cf_pkgconfig_libs="`$PKG_CONFIG --libs "xt" 2>/dev/null`" test -n "$verbose" && echo " package xt CFLAGS: $cf_pkgconfig_incs" 1>&6 -echo "${as_me:-configure}:14010: testing package xt CFLAGS: $cf_pkgconfig_incs ..." 1>&5 +echo "${as_me:-configure}:14720: testing package xt CFLAGS: $cf_pkgconfig_incs ..." 1>&5 test -n "$verbose" && echo " package xt LIBS: $cf_pkgconfig_libs" 1>&6 -echo "${as_me:-configure}:14014: testing package xt LIBS: $cf_pkgconfig_libs ..." 1>&5 +echo "${as_me:-configure}:14724: testing package xt LIBS: $cf_pkgconfig_libs ..." 1>&5 cf_fix_cppflags=no cf_new_cflags= @@ -14020,19 +14730,19 @@ cf_new_extra_cppflags= for cf_add_cflags in $cf_pkgconfig_incs 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" @@ -14051,7 +14761,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/=.*//'` @@ -14081,7 +14791,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}" \ @@ -14132,14 +14842,14 @@ LIBS="$cf_add_libs" ;; (*) # we have an "xt" package, but it may omit Xt's dependency on X11 -echo "$as_me:14135: checking for usable X dependency" >&5 +echo "$as_me:14845: checking for usable X dependency" >&5 echo $ECHO_N "checking for usable X dependency... $ECHO_C" >&6 if test "${cf_cv_xt_x11_compat+set}" = set; then echo $ECHO_N "(cached) $ECHO_C" >&6 else -cat >conftest.$ac_ext <<_ACEOF -#line 14142 "configure" +cat >"conftest.$ac_ext" <<_ACEOF +#line 14852 "configure" #include "confdefs.h" #include @@ -14157,50 +14867,50 @@ main (void) return 0; } _ACEOF -rm -f conftest.$ac_objext conftest$ac_exeext -if { (eval echo "$as_me:14161: \"$ac_link\"") >&5 +rm -f "conftest.$ac_objext" "conftest$ac_exeext" +if { (eval echo "$as_me:14871: \"$ac_link\"") >&5 (eval $ac_link) 2>&5 ac_status=$? - echo "$as_me:14164: \$? = $ac_status" >&5 - (exit $ac_status); } && - { ac_try='test -s conftest$ac_exeext' - { (eval echo "$as_me:14167: \"$ac_try\"") >&5 + echo "$as_me:14874: \$? = $ac_status" >&5 + (exit "$ac_status"); } && + { ac_try='test -s "conftest$ac_exeext"' + { (eval echo "$as_me:14877: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? - echo "$as_me:14170: \$? = $ac_status" >&5 - (exit $ac_status); }; }; then + echo "$as_me:14880: \$? = $ac_status" >&5 + (exit "$ac_status"); }; }; then cf_cv_xt_x11_compat=yes else echo "$as_me: failed program was:" >&5 -cat conftest.$ac_ext >&5 +cat "conftest.$ac_ext" >&5 cf_cv_xt_x11_compat=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:14180: result: $cf_cv_xt_x11_compat" >&5 +echo "$as_me:14890: result: $cf_cv_xt_x11_compat" >&5 echo "${ECHO_T}$cf_cv_xt_x11_compat" >&6 if test "$cf_cv_xt_x11_compat" = no then test -n "$verbose" && echo " work around broken X11 dependency" 1>&6 -echo "${as_me:-configure}:14186: testing work around broken X11 dependency ..." 1>&5 +echo "${as_me:-configure}:14896: testing work around broken X11 dependency ..." 1>&5 # 2010/11/19 - good enough until a working Xt on Xcb is delivered. -if test "$PKG_CONFIG" != none && "$PKG_CONFIG" --exists x11; then +if test "$PKG_CONFIG" != none && "$PKG_CONFIG" --exists "x11"; then test -n "$verbose" && echo " found package x11" 1>&6 -echo "${as_me:-configure}:14193: testing found package x11 ..." 1>&5 +echo "${as_me:-configure}:14903: testing found package x11 ..." 1>&5 - cf_pkgconfig_incs="`$PKG_CONFIG --cflags x11 2>/dev/null`" - cf_pkgconfig_libs="`$PKG_CONFIG --libs x11 2>/dev/null`" + cf_pkgconfig_incs="`$PKG_CONFIG --cflags "x11" 2>/dev/null`" + cf_pkgconfig_libs="`$PKG_CONFIG --libs "x11" 2>/dev/null`" test -n "$verbose" && echo " package x11 CFLAGS: $cf_pkgconfig_incs" 1>&6 -echo "${as_me:-configure}:14199: testing package x11 CFLAGS: $cf_pkgconfig_incs ..." 1>&5 +echo "${as_me:-configure}:14909: testing package x11 CFLAGS: $cf_pkgconfig_incs ..." 1>&5 test -n "$verbose" && echo " package x11 LIBS: $cf_pkgconfig_libs" 1>&6 -echo "${as_me:-configure}:14203: testing package x11 LIBS: $cf_pkgconfig_libs ..." 1>&5 +echo "${as_me:-configure}:14913: testing package x11 LIBS: $cf_pkgconfig_libs ..." 1>&5 cf_fix_cppflags=no cf_new_cflags= @@ -14209,19 +14919,19 @@ cf_new_extra_cppflags= for cf_add_cflags in $cf_pkgconfig_incs 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" @@ -14240,7 +14950,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/=.*//'` @@ -14270,7 +14980,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}" \ @@ -14323,12 +15033,12 @@ else test -n "$verbose" && echo " ...before $LIBS" 1>&6 -echo "${as_me:-configure}:14326: testing ...before $LIBS ..." 1>&5 +echo "${as_me:-configure}:15036: testing ...before $LIBS ..." 1>&5 LIBS=`echo "$LIBS" | sed -e "s/[ ][ ]*/ /g" -e "s%-lXt %-lXt -lX11 %" -e 's% % %g'` test -n "$verbose" && echo " ...after $LIBS" 1>&6 -echo "${as_me:-configure}:14331: testing ...after $LIBS ..." 1>&5 +echo "${as_me:-configure}:15041: testing ...after $LIBS ..." 1>&5 fi @@ -14336,14 +15046,14 @@ fi ;; esac -echo "$as_me:14339: checking for usable X Toolkit package" >&5 +echo "$as_me:15049: checking for usable X Toolkit package" >&5 echo $ECHO_N "checking for usable X Toolkit package... $ECHO_C" >&6 if test "${cf_cv_xt_ice_compat+set}" = set; then echo $ECHO_N "(cached) $ECHO_C" >&6 else -cat >conftest.$ac_ext <<_ACEOF -#line 14346 "configure" +cat >"conftest.$ac_ext" <<_ACEOF +#line 15056 "configure" #include "confdefs.h" #include @@ -14357,27 +15067,27 @@ int num = IceConnectionNumber(0); (void) num return 0; } _ACEOF -rm -f conftest.$ac_objext conftest$ac_exeext -if { (eval echo "$as_me:14361: \"$ac_link\"") >&5 +rm -f "conftest.$ac_objext" "conftest$ac_exeext" +if { (eval echo "$as_me:15071: \"$ac_link\"") >&5 (eval $ac_link) 2>&5 ac_status=$? - echo "$as_me:14364: \$? = $ac_status" >&5 - (exit $ac_status); } && - { ac_try='test -s conftest$ac_exeext' - { (eval echo "$as_me:14367: \"$ac_try\"") >&5 + echo "$as_me:15074: \$? = $ac_status" >&5 + (exit "$ac_status"); } && + { ac_try='test -s "conftest$ac_exeext"' + { (eval echo "$as_me:15077: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? - echo "$as_me:14370: \$? = $ac_status" >&5 - (exit $ac_status); }; }; then + echo "$as_me:15080: \$? = $ac_status" >&5 + (exit "$ac_status"); }; }; then cf_cv_xt_ice_compat=yes else echo "$as_me: failed program was:" >&5 -cat conftest.$ac_ext >&5 +cat "conftest.$ac_ext" >&5 cf_cv_xt_ice_compat=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:14380: result: $cf_cv_xt_ice_compat" >&5 +echo "$as_me:15090: result: $cf_cv_xt_ice_compat" >&5 echo "${ECHO_T}$cf_cv_xt_ice_compat" >&6 if test "$cf_cv_xt_ice_compat" = no @@ -14391,22 +15101,22 @@ echo "${ECHO_T}$cf_cv_xt_ice_compat" >&6 (*) test -n "$verbose" && echo " work around broken ICE dependency" 1>&6 -echo "${as_me:-configure}:14394: testing work around broken ICE dependency ..." 1>&5 +echo "${as_me:-configure}:15104: testing work around broken ICE dependency ..." 1>&5 -if test "$PKG_CONFIG" != none && "$PKG_CONFIG" --exists ice; then +if test "$PKG_CONFIG" != none && "$PKG_CONFIG" --exists "ice"; then test -n "$verbose" && echo " found package ice" 1>&6 -echo "${as_me:-configure}:14399: testing found package ice ..." 1>&5 +echo "${as_me:-configure}:15109: testing found package ice ..." 1>&5 - cf_pkgconfig_incs="`$PKG_CONFIG --cflags ice 2>/dev/null`" - cf_pkgconfig_libs="`$PKG_CONFIG --libs ice 2>/dev/null`" + cf_pkgconfig_incs="`$PKG_CONFIG --cflags "ice" 2>/dev/null`" + cf_pkgconfig_libs="`$PKG_CONFIG --libs "ice" 2>/dev/null`" test -n "$verbose" && echo " package ice CFLAGS: $cf_pkgconfig_incs" 1>&6 -echo "${as_me:-configure}:14405: testing package ice CFLAGS: $cf_pkgconfig_incs ..." 1>&5 +echo "${as_me:-configure}:15115: testing package ice CFLAGS: $cf_pkgconfig_incs ..." 1>&5 test -n "$verbose" && echo " package ice LIBS: $cf_pkgconfig_libs" 1>&6 -echo "${as_me:-configure}:14409: testing package ice LIBS: $cf_pkgconfig_libs ..." 1>&5 +echo "${as_me:-configure}:15119: testing package ice LIBS: $cf_pkgconfig_libs ..." 1>&5 cf_fix_cppflags=no cf_new_cflags= @@ -14415,19 +15125,19 @@ cf_new_extra_cppflags= for cf_add_cflags in $cf_pkgconfig_incs 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" @@ -14446,7 +15156,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/=.*//'` @@ -14476,7 +15186,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}" \ @@ -14522,20 +15232,20 @@ for cf_add_1lib in $cf_add_0lib; do done LIBS="$cf_add_libs" -if test "$PKG_CONFIG" != none && "$PKG_CONFIG" --exists sm; then +if test "$PKG_CONFIG" != none && "$PKG_CONFIG" --exists "sm"; then test -n "$verbose" && echo " found package sm" 1>&6 -echo "${as_me:-configure}:14528: testing found package sm ..." 1>&5 +echo "${as_me:-configure}:15238: testing found package sm ..." 1>&5 - cf_pkgconfig_incs="`$PKG_CONFIG --cflags sm 2>/dev/null`" - cf_pkgconfig_libs="`$PKG_CONFIG --libs sm 2>/dev/null`" + cf_pkgconfig_incs="`$PKG_CONFIG --cflags "sm" 2>/dev/null`" + cf_pkgconfig_libs="`$PKG_CONFIG --libs "sm" 2>/dev/null`" test -n "$verbose" && echo " package sm CFLAGS: $cf_pkgconfig_incs" 1>&6 -echo "${as_me:-configure}:14534: testing package sm CFLAGS: $cf_pkgconfig_incs ..." 1>&5 +echo "${as_me:-configure}:15244: testing package sm CFLAGS: $cf_pkgconfig_incs ..." 1>&5 test -n "$verbose" && echo " package sm LIBS: $cf_pkgconfig_libs" 1>&6 -echo "${as_me:-configure}:14538: testing package sm LIBS: $cf_pkgconfig_libs ..." 1>&5 +echo "${as_me:-configure}:15248: testing package sm LIBS: $cf_pkgconfig_libs ..." 1>&5 cf_fix_cppflags=no cf_new_cflags= @@ -14544,19 +15254,19 @@ cf_new_extra_cppflags= for cf_add_cflags in $cf_pkgconfig_incs 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" @@ -14575,7 +15285,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/=.*//'` @@ -14605,7 +15315,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}" \ @@ -14664,12 +15374,12 @@ else test -n "$verbose" && echo " ...before $LIBS" 1>&6 -echo "${as_me:-configure}:14667: testing ...before $LIBS ..." 1>&5 +echo "${as_me:-configure}:15377: testing ...before $LIBS ..." 1>&5 LIBS=`echo "$LIBS" | sed -e "s/[ ][ ]*/ /g" -e "s%-lXt %-lXt $X_PRE_LIBS %" -e 's% % %g'` test -n "$verbose" && echo " ...after $LIBS" 1>&6 -echo "${as_me:-configure}:14672: testing ...after $LIBS ..." 1>&5 +echo "${as_me:-configure}:15382: testing ...after $LIBS ..." 1>&5 fi @@ -14689,7 +15399,7 @@ else test -n "$verbose" && echo " checking additions to CFLAGS" 1>&6 -echo "${as_me:-configure}:14692: testing checking additions to CFLAGS ..." 1>&5 +echo "${as_me:-configure}:15402: testing checking additions to CFLAGS ..." 1>&5 cf_check_cflags="$CFLAGS" cf_check_cppflags="$CPPFLAGS" @@ -14701,19 +15411,19 @@ cf_new_extra_cppflags= for cf_add_cflags in $X_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" @@ -14732,7 +15442,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/=.*//'` @@ -14762,7 +15472,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}" \ @@ -14774,7 +15484,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}:14777: testing add to \$CFLAGS $cf_new_cflags ..." 1>&5 +echo "${as_me:-configure}:15487: testing add to \$CFLAGS $cf_new_cflags ..." 1>&5 test -n "$CFLAGS" && CFLAGS="$CFLAGS " CFLAGS="${CFLAGS}$cf_new_cflags" @@ -14784,7 +15494,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}:14787: testing add to \$CPPFLAGS $cf_new_cppflags ..." 1>&5 +echo "${as_me:-configure}:15497: testing add to \$CPPFLAGS $cf_new_cppflags ..." 1>&5 test -n "$CPPFLAGS" && CPPFLAGS="$CPPFLAGS " CPPFLAGS="${CPPFLAGS}$cf_new_cppflags" @@ -14794,7 +15504,7 @@ 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}:14797: testing add to \$EXTRA_CPPFLAGS $cf_new_extra_cppflags ..." 1>&5 +echo "${as_me:-configure}:15507: 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" @@ -14802,8 +15512,8 @@ echo "${as_me:-configure}:14797: testing add to \$EXTRA_CPPFLAGS $cf_new_extra_c fi if test "x$cf_check_cflags" != "x$CFLAGS" ; then -cat >conftest.$ac_ext <<_ACEOF -#line 14806 "configure" +cat >"conftest.$ac_ext" <<_ACEOF +#line 15516 "configure" #include "confdefs.h" #include int @@ -14814,44 +15524,44 @@ printf("Hello world"); return 0; } _ACEOF -rm -f conftest.$ac_objext conftest$ac_exeext -if { (eval echo "$as_me:14818: \"$ac_link\"") >&5 +rm -f "conftest.$ac_objext" "conftest$ac_exeext" +if { (eval echo "$as_me:15528: \"$ac_link\"") >&5 (eval $ac_link) 2>&5 ac_status=$? - echo "$as_me:14821: \$? = $ac_status" >&5 - (exit $ac_status); } && - { ac_try='test -s conftest$ac_exeext' - { (eval echo "$as_me:14824: \"$ac_try\"") >&5 + echo "$as_me:15531: \$? = $ac_status" >&5 + (exit "$ac_status"); } && + { ac_try='test -s "conftest$ac_exeext"' + { (eval echo "$as_me:15534: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? - echo "$as_me:14827: \$? = $ac_status" >&5 - (exit $ac_status); }; }; then + echo "$as_me:15537: \$? = $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 test -n "$verbose" && echo " test-compile failed. Undoing change to \$CFLAGS" 1>&6 -echo "${as_me:-configure}:14835: testing test-compile failed. Undoing change to \$CFLAGS ..." 1>&5 +echo "${as_me:-configure}:15545: testing test-compile failed. Undoing change to \$CFLAGS ..." 1>&5 if test "x$cf_check_cppflags" != "x$CPPFLAGS" ; then test -n "$verbose" && echo " but keeping change to \$CPPFLAGS" 1>&6 -echo "${as_me:-configure}:14840: testing but keeping change to \$CPPFLAGS ..." 1>&5 +echo "${as_me:-configure}:15550: testing but keeping change to \$CPPFLAGS ..." 1>&5 fi - CFLAGS="$cf_check_flags" + CFLAGS="$cf_check_cflags" 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:14848: checking for XOpenDisplay" >&5 + echo "$as_me:15558: checking for XOpenDisplay" >&5 echo $ECHO_N "checking for XOpenDisplay... $ECHO_C" >&6 if test "${ac_cv_func_XOpenDisplay+set}" = set; then echo $ECHO_N "(cached) $ECHO_C" >&6 else - cat >conftest.$ac_ext <<_ACEOF -#line 14854 "configure" + cat >"conftest.$ac_ext" <<_ACEOF +#line 15564 "configure" #include "confdefs.h" #define XOpenDisplay autoconf_temporary #include /* least-intrusive standard header which defines gcc2 __stub macros */ @@ -14881,41 +15591,41 @@ main (void) return 0; } _ACEOF -rm -f conftest.$ac_objext conftest$ac_exeext -if { (eval echo "$as_me:14885: \"$ac_link\"") >&5 +rm -f "conftest.$ac_objext" "conftest$ac_exeext" +if { (eval echo "$as_me:15595: \"$ac_link\"") >&5 (eval $ac_link) 2>&5 ac_status=$? - echo "$as_me:14888: \$? = $ac_status" >&5 - (exit $ac_status); } && - { ac_try='test -s conftest$ac_exeext' - { (eval echo "$as_me:14891: \"$ac_try\"") >&5 + echo "$as_me:15598: \$? = $ac_status" >&5 + (exit "$ac_status"); } && + { ac_try='test -s "conftest$ac_exeext"' + { (eval echo "$as_me:15601: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? - echo "$as_me:14894: \$? = $ac_status" >&5 - (exit $ac_status); }; }; then + echo "$as_me:15604: \$? = $ac_status" >&5 + (exit "$ac_status"); }; }; then ac_cv_func_XOpenDisplay=yes else echo "$as_me: failed program was:" >&5 -cat conftest.$ac_ext >&5 +cat "conftest.$ac_ext" >&5 ac_cv_func_XOpenDisplay=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:14904: result: $ac_cv_func_XOpenDisplay" >&5 +echo "$as_me:15614: result: $ac_cv_func_XOpenDisplay" >&5 echo "${ECHO_T}$ac_cv_func_XOpenDisplay" >&6 -if test $ac_cv_func_XOpenDisplay = yes; then +if test "$ac_cv_func_XOpenDisplay" = yes; then : else - echo "$as_me:14910: checking for XOpenDisplay in -lX11" >&5 + echo "$as_me:15620: checking for XOpenDisplay in -lX11" >&5 echo $ECHO_N "checking for XOpenDisplay in -lX11... $ECHO_C" >&6 if test "${ac_cv_lib_X11_XOpenDisplay+set}" = set; then echo $ECHO_N "(cached) $ECHO_C" >&6 else ac_check_lib_save_LIBS=$LIBS LIBS="-lX11 $LIBS" -cat >conftest.$ac_ext <<_ACEOF -#line 14918 "configure" +cat >"conftest.$ac_ext" <<_ACEOF +#line 15628 "configure" #include "confdefs.h" /* Override any gcc2 internal prototype to avoid an error. */ @@ -14933,30 +15643,30 @@ XOpenDisplay (); return 0; } _ACEOF -rm -f conftest.$ac_objext conftest$ac_exeext -if { (eval echo "$as_me:14937: \"$ac_link\"") >&5 +rm -f "conftest.$ac_objext" "conftest$ac_exeext" +if { (eval echo "$as_me:15647: \"$ac_link\"") >&5 (eval $ac_link) 2>&5 ac_status=$? - echo "$as_me:14940: \$? = $ac_status" >&5 - (exit $ac_status); } && - { ac_try='test -s conftest$ac_exeext' - { (eval echo "$as_me:14943: \"$ac_try\"") >&5 + echo "$as_me:15650: \$? = $ac_status" >&5 + (exit "$ac_status"); } && + { ac_try='test -s "conftest$ac_exeext"' + { (eval echo "$as_me:15653: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? - echo "$as_me:14946: \$? = $ac_status" >&5 - (exit $ac_status); }; }; then + echo "$as_me:15656: \$? = $ac_status" >&5 + (exit "$ac_status"); }; }; then ac_cv_lib_X11_XOpenDisplay=yes else echo "$as_me: failed program was:" >&5 -cat conftest.$ac_ext >&5 +cat "conftest.$ac_ext" >&5 ac_cv_lib_X11_XOpenDisplay=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:14957: result: $ac_cv_lib_X11_XOpenDisplay" >&5 +echo "$as_me:15667: result: $ac_cv_lib_X11_XOpenDisplay" >&5 echo "${ECHO_T}$ac_cv_lib_X11_XOpenDisplay" >&6 -if test $ac_cv_lib_X11_XOpenDisplay = yes; then +if test "$ac_cv_lib_X11_XOpenDisplay" = yes; then cf_add_libs="$LIBS" # reverse order @@ -14978,13 +15688,13 @@ fi fi - echo "$as_me:14981: checking for XtAppInitialize" >&5 + echo "$as_me:15691: checking for XtAppInitialize" >&5 echo $ECHO_N "checking for XtAppInitialize... $ECHO_C" >&6 if test "${ac_cv_func_XtAppInitialize+set}" = set; then echo $ECHO_N "(cached) $ECHO_C" >&6 else - cat >conftest.$ac_ext <<_ACEOF -#line 14987 "configure" + cat >"conftest.$ac_ext" <<_ACEOF +#line 15697 "configure" #include "confdefs.h" #define XtAppInitialize autoconf_temporary #include /* least-intrusive standard header which defines gcc2 __stub macros */ @@ -15014,41 +15724,41 @@ main (void) return 0; } _ACEOF -rm -f conftest.$ac_objext conftest$ac_exeext -if { (eval echo "$as_me:15018: \"$ac_link\"") >&5 +rm -f "conftest.$ac_objext" "conftest$ac_exeext" +if { (eval echo "$as_me:15728: \"$ac_link\"") >&5 (eval $ac_link) 2>&5 ac_status=$? - echo "$as_me:15021: \$? = $ac_status" >&5 - (exit $ac_status); } && - { ac_try='test -s conftest$ac_exeext' - { (eval echo "$as_me:15024: \"$ac_try\"") >&5 + echo "$as_me:15731: \$? = $ac_status" >&5 + (exit "$ac_status"); } && + { ac_try='test -s "conftest$ac_exeext"' + { (eval echo "$as_me:15734: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? - echo "$as_me:15027: \$? = $ac_status" >&5 - (exit $ac_status); }; }; then + echo "$as_me:15737: \$? = $ac_status" >&5 + (exit "$ac_status"); }; }; then ac_cv_func_XtAppInitialize=yes else echo "$as_me: failed program was:" >&5 -cat conftest.$ac_ext >&5 +cat "conftest.$ac_ext" >&5 ac_cv_func_XtAppInitialize=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:15037: result: $ac_cv_func_XtAppInitialize" >&5 +echo "$as_me:15747: result: $ac_cv_func_XtAppInitialize" >&5 echo "${ECHO_T}$ac_cv_func_XtAppInitialize" >&6 -if test $ac_cv_func_XtAppInitialize = yes; then +if test "$ac_cv_func_XtAppInitialize" = yes; then : else - echo "$as_me:15043: checking for XtAppInitialize in -lXt" >&5 + echo "$as_me:15753: checking for XtAppInitialize in -lXt" >&5 echo $ECHO_N "checking for XtAppInitialize in -lXt... $ECHO_C" >&6 if test "${ac_cv_lib_Xt_XtAppInitialize+set}" = set; then echo $ECHO_N "(cached) $ECHO_C" >&6 else ac_check_lib_save_LIBS=$LIBS LIBS="-lXt $LIBS" -cat >conftest.$ac_ext <<_ACEOF -#line 15051 "configure" +cat >"conftest.$ac_ext" <<_ACEOF +#line 15761 "configure" #include "confdefs.h" /* Override any gcc2 internal prototype to avoid an error. */ @@ -15066,30 +15776,30 @@ XtAppInitialize (); return 0; } _ACEOF -rm -f conftest.$ac_objext conftest$ac_exeext -if { (eval echo "$as_me:15070: \"$ac_link\"") >&5 +rm -f "conftest.$ac_objext" "conftest$ac_exeext" +if { (eval echo "$as_me:15780: \"$ac_link\"") >&5 (eval $ac_link) 2>&5 ac_status=$? - echo "$as_me:15073: \$? = $ac_status" >&5 - (exit $ac_status); } && - { ac_try='test -s conftest$ac_exeext' - { (eval echo "$as_me:15076: \"$ac_try\"") >&5 + echo "$as_me:15783: \$? = $ac_status" >&5 + (exit "$ac_status"); } && + { ac_try='test -s "conftest$ac_exeext"' + { (eval echo "$as_me:15786: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? - echo "$as_me:15079: \$? = $ac_status" >&5 - (exit $ac_status); }; }; then + echo "$as_me:15789: \$? = $ac_status" >&5 + (exit "$ac_status"); }; }; then ac_cv_lib_Xt_XtAppInitialize=yes else echo "$as_me: failed program was:" >&5 -cat conftest.$ac_ext >&5 +cat "conftest.$ac_ext" >&5 ac_cv_lib_Xt_XtAppInitialize=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:15090: result: $ac_cv_lib_Xt_XtAppInitialize" >&5 +echo "$as_me:15800: result: $ac_cv_lib_Xt_XtAppInitialize" >&5 echo "${ECHO_T}$ac_cv_lib_Xt_XtAppInitialize" >&6 -if test $ac_cv_lib_Xt_XtAppInitialize = yes; then +if test "$ac_cv_lib_Xt_XtAppInitialize" = yes; then cat >>confdefs.h <<\EOF #define HAVE_LIBXT 1 @@ -15103,8 +15813,8 @@ fi fi -if test $cf_have_X_LIBS = no ; then - { echo "$as_me:15107: WARNING: Unable to successfully link X Toolkit library (-lXt) with +if test "$cf_have_X_LIBS" = no ; then + { echo "$as_me:15817: WARNING: Unable to successfully link X Toolkit library (-lXt) with test program. You will have to check and add the proper libraries by hand to makefile." >&5 echo "$as_me: WARNING: Unable to successfully link X Toolkit library (-lXt) with @@ -15140,19 +15850,19 @@ do done cf_test=X11/$cf_x_athena_root/SimpleMenu.h - if test $cf_path != default ; then + if test "$cf_path" != default ; then test -n "$CPPFLAGS" && CPPFLAGS="$CPPFLAGS " CPPFLAGS="${CPPFLAGS}-I$cf_path/include" - echo "$as_me:15148: checking for $cf_test in $cf_path" >&5 + echo "$as_me:15858: checking for $cf_test in $cf_path" >&5 echo $ECHO_N "checking for $cf_test in $cf_path... $ECHO_C" >&6 else - echo "$as_me:15151: checking for $cf_test" >&5 + echo "$as_me:15861: checking for $cf_test" >&5 echo $ECHO_N "checking for $cf_test... $ECHO_C" >&6 fi - cat >conftest.$ac_ext <<_ACEOF -#line 15155 "configure" + cat >"conftest.$ac_ext" <<_ACEOF +#line 15865 "configure" #include "confdefs.h" #include @@ -15165,26 +15875,26 @@ main (void) return 0; } _ACEOF -rm -f conftest.$ac_objext -if { (eval echo "$as_me:15169: \"$ac_compile\"") >&5 +rm -f "conftest.$ac_objext" +if { (eval echo "$as_me:15879: \"$ac_compile\"") >&5 (eval $ac_compile) 2>&5 ac_status=$? - 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 + echo "$as_me:15882: \$? = $ac_status" >&5 + (exit "$ac_status"); } && + { ac_try='test -s "conftest.$ac_objext"' + { (eval echo "$as_me:15885: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? - echo "$as_me:15178: \$? = $ac_status" >&5 - (exit $ac_status); }; }; then + echo "$as_me:15888: \$? = $ac_status" >&5 + (exit "$ac_status"); }; }; then cf_result=yes else echo "$as_me: failed program was:" >&5 -cat conftest.$ac_ext >&5 +cat "conftest.$ac_ext" >&5 cf_result=no fi -rm -f conftest.$ac_objext conftest.$ac_ext - echo "$as_me:15187: result: $cf_result" >&5 +rm -f "conftest.$ac_objext" "conftest.$ac_ext" + echo "$as_me:15897: result: $cf_result" >&5 echo "${ECHO_T}$cf_result" >&6 LIBS="$cf_save_LIBS_CF_X_ATHENA_CPPFLAGS" @@ -15193,14 +15903,14 @@ CPPFLAGS="$cf_save_CPPFLAGS_CF_X_ATHENA_CPPFLAGS" if test "$cf_result" = yes ; then test "$cf_path" = default && cf_x_athena_inc=default - test "$cf_path" != default && cf_x_athena_inc=$cf_path/include + test "$cf_path" != default && cf_x_athena_inc="$cf_path/include" break fi fi done if test -z "$cf_x_athena_inc" ; then - { echo "$as_me:15203: WARNING: Unable to find Athena header files" >&5 + { echo "$as_me:15913: WARNING: Unable to find Athena header files" >&5 echo "$as_me: WARNING: Unable to find Athena header files" >&2;} elif test "$cf_x_athena_inc" != default ; then @@ -15265,10 +15975,10 @@ for cf_add_1lib in $cf_add_0lib; do done LIBS="$cf_add_libs" - echo "$as_me:15268: checking for $cf_test in $cf_libs" >&5 + echo "$as_me:15978: checking for $cf_test in $cf_libs" >&5 echo $ECHO_N "checking for $cf_test in $cf_libs... $ECHO_C" >&6 - cat >conftest.$ac_ext <<_ACEOF -#line 15271 "configure" + cat >"conftest.$ac_ext" <<_ACEOF +#line 15981 "configure" #include "confdefs.h" #include @@ -15283,26 +15993,26 @@ $cf_test((XtAppContext) 0) return 0; } _ACEOF -rm -f conftest.$ac_objext conftest$ac_exeext -if { (eval echo "$as_me:15287: \"$ac_link\"") >&5 +rm -f "conftest.$ac_objext" "conftest$ac_exeext" +if { (eval echo "$as_me:15997: \"$ac_link\"") >&5 (eval $ac_link) 2>&5 ac_status=$? - echo "$as_me:15290: \$? = $ac_status" >&5 - (exit $ac_status); } && - { ac_try='test -s conftest$ac_exeext' - { (eval echo "$as_me:15293: \"$ac_try\"") >&5 + echo "$as_me:16000: \$? = $ac_status" >&5 + (exit "$ac_status"); } && + { ac_try='test -s "conftest$ac_exeext"' + { (eval echo "$as_me:16003: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? - echo "$as_me:15296: \$? = $ac_status" >&5 - (exit $ac_status); }; }; then + echo "$as_me:16006: \$? = $ac_status" >&5 + (exit "$ac_status"); }; }; then cf_result=yes else echo "$as_me: failed program was:" >&5 -cat conftest.$ac_ext >&5 +cat "conftest.$ac_ext" >&5 cf_result=no fi -rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext - echo "$as_me:15305: result: $cf_result" >&5 +rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext" + echo "$as_me:16015: result: $cf_result" >&5 echo "${ECHO_T}$cf_result" >&6 LIBS="$cf_save_LIBS_CF_X_ATHENA_LIBS" @@ -15319,7 +16029,7 @@ CPPFLAGS="$cf_save_CPPFLAGS_CF_X_ATHENA_LIBS" done if test -z "$cf_x_athena_lib" ; then - { { echo "$as_me:15322: error: Unable to successfully link Athena library (-l$cf_x_athena_root) with test program" >&5 + { { echo "$as_me:16032: error: Unable to successfully link Athena library (-l$cf_x_athena_root) with test program" >&5 echo "$as_me: error: Unable to successfully link Athena library (-l$cf_x_athena_root) with test program" >&2;} { (exit 1); exit 1; }; } fi @@ -15353,7 +16063,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:15356: checking for $ac_word" >&5 +echo "$as_me:16066: checking for $ac_word" >&5 echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6 if test "${ac_cv_prog_XCURSES_CONFIG+set}" = set; then echo $ECHO_N "(cached) $ECHO_C" >&6 @@ -15368,7 +16078,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_XCURSES_CONFIG="$ac_tool_prefix$ac_prog" -echo "$as_me:15371: found $ac_dir/$ac_word" >&5 +echo "$as_me:16081: found $ac_dir/$ac_word" >&5 break done @@ -15376,10 +16086,10 @@ fi fi XCURSES_CONFIG=$ac_cv_prog_XCURSES_CONFIG if test -n "$XCURSES_CONFIG"; then - echo "$as_me:15379: result: $XCURSES_CONFIG" >&5 + echo "$as_me:16089: result: $XCURSES_CONFIG" >&5 echo "${ECHO_T}$XCURSES_CONFIG" >&6 else - echo "$as_me:15382: result: no" >&5 + echo "$as_me:16092: result: no" >&5 echo "${ECHO_T}no" >&6 fi @@ -15392,7 +16102,7 @@ if test -z "$XCURSES_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:15395: checking for $ac_word" >&5 +echo "$as_me:16105: checking for $ac_word" >&5 echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6 if test "${ac_cv_prog_ac_ct_XCURSES_CONFIG+set}" = set; then echo $ECHO_N "(cached) $ECHO_C" >&6 @@ -15407,7 +16117,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_XCURSES_CONFIG="$ac_prog" -echo "$as_me:15410: found $ac_dir/$ac_word" >&5 +echo "$as_me:16120: found $ac_dir/$ac_word" >&5 break done @@ -15415,10 +16125,10 @@ fi fi ac_ct_XCURSES_CONFIG=$ac_cv_prog_ac_ct_XCURSES_CONFIG if test -n "$ac_ct_XCURSES_CONFIG"; then - echo "$as_me:15418: result: $ac_ct_XCURSES_CONFIG" >&5 + echo "$as_me:16128: result: $ac_ct_XCURSES_CONFIG" >&5 echo "${ECHO_T}$ac_ct_XCURSES_CONFIG" >&6 else - echo "$as_me:15421: result: no" >&5 + echo "$as_me:16131: result: no" >&5 echo "${ECHO_T}no" >&6 fi @@ -15438,19 +16148,19 @@ cf_new_extra_cppflags= for cf_add_cflags in `$XCURSES_CONFIG --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" @@ -15469,7 +16179,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/=.*//'` @@ -15499,7 +16209,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}" \ @@ -15553,7 +16263,7 @@ LDFLAGS="$LDFLAGS $X_LIBS" test -n "$verbose" && echo " checking additions to CFLAGS" 1>&6 -echo "${as_me:-configure}:15556: testing checking additions to CFLAGS ..." 1>&5 +echo "${as_me:-configure}:16266: testing checking additions to CFLAGS ..." 1>&5 cf_check_cflags="$CFLAGS" cf_check_cppflags="$CPPFLAGS" @@ -15565,19 +16275,19 @@ cf_new_extra_cppflags= for cf_add_cflags in $X_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" @@ -15596,7 +16306,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/=.*//'` @@ -15626,7 +16336,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}" \ @@ -15638,7 +16348,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}:15641: testing add to \$CFLAGS $cf_new_cflags ..." 1>&5 +echo "${as_me:-configure}:16351: testing add to \$CFLAGS $cf_new_cflags ..." 1>&5 test -n "$CFLAGS" && CFLAGS="$CFLAGS " CFLAGS="${CFLAGS}$cf_new_cflags" @@ -15648,7 +16358,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}:15651: testing add to \$CPPFLAGS $cf_new_cppflags ..." 1>&5 +echo "${as_me:-configure}:16361: testing add to \$CPPFLAGS $cf_new_cppflags ..." 1>&5 test -n "$CPPFLAGS" && CPPFLAGS="$CPPFLAGS " CPPFLAGS="${CPPFLAGS}$cf_new_cppflags" @@ -15658,7 +16368,7 @@ 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}:15661: testing add to \$EXTRA_CPPFLAGS $cf_new_extra_cppflags ..." 1>&5 +echo "${as_me:-configure}:16371: 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" @@ -15666,8 +16376,8 @@ echo "${as_me:-configure}:15661: testing add to \$EXTRA_CPPFLAGS $cf_new_extra_c fi if test "x$cf_check_cflags" != "x$CFLAGS" ; then -cat >conftest.$ac_ext <<_ACEOF -#line 15670 "configure" +cat >"conftest.$ac_ext" <<_ACEOF +#line 16380 "configure" #include "confdefs.h" #include int @@ -15678,46 +16388,46 @@ printf("Hello world"); return 0; } _ACEOF -rm -f conftest.$ac_objext conftest$ac_exeext -if { (eval echo "$as_me:15682: \"$ac_link\"") >&5 +rm -f "conftest.$ac_objext" "conftest$ac_exeext" +if { (eval echo "$as_me:16392: \"$ac_link\"") >&5 (eval $ac_link) 2>&5 ac_status=$? - echo "$as_me:15685: \$? = $ac_status" >&5 - (exit $ac_status); } && - { ac_try='test -s conftest$ac_exeext' - { (eval echo "$as_me:15688: \"$ac_try\"") >&5 + echo "$as_me:16395: \$? = $ac_status" >&5 + (exit "$ac_status"); } && + { ac_try='test -s "conftest$ac_exeext"' + { (eval echo "$as_me:16398: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? - echo "$as_me:15691: \$? = $ac_status" >&5 - (exit $ac_status); }; }; then + echo "$as_me:16401: \$? = $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 test -n "$verbose" && echo " test-compile failed. Undoing change to \$CFLAGS" 1>&6 -echo "${as_me:-configure}:15699: testing test-compile failed. Undoing change to \$CFLAGS ..." 1>&5 +echo "${as_me:-configure}:16409: testing test-compile failed. Undoing change to \$CFLAGS ..." 1>&5 if test "x$cf_check_cppflags" != "x$CPPFLAGS" ; then test -n "$verbose" && echo " but keeping change to \$CPPFLAGS" 1>&6 -echo "${as_me:-configure}:15704: testing but keeping change to \$CPPFLAGS ..." 1>&5 +echo "${as_me:-configure}:16414: testing but keeping change to \$CPPFLAGS ..." 1>&5 fi - CFLAGS="$cf_check_flags" + CFLAGS="$cf_check_cflags" 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:15712: checking for XOpenDisplay in -lX11" >&5 +echo "$as_me:16422: checking for XOpenDisplay in -lX11" >&5 echo $ECHO_N "checking for XOpenDisplay in -lX11... $ECHO_C" >&6 if test "${ac_cv_lib_X11_XOpenDisplay+set}" = set; then echo $ECHO_N "(cached) $ECHO_C" >&6 else ac_check_lib_save_LIBS=$LIBS LIBS="-lX11 $X_PRE_LIBS $LIBS $X_EXTRA_LIBS $LIBS" -cat >conftest.$ac_ext <<_ACEOF -#line 15720 "configure" +cat >"conftest.$ac_ext" <<_ACEOF +#line 16430 "configure" #include "confdefs.h" /* Override any gcc2 internal prototype to avoid an error. */ @@ -15735,30 +16445,30 @@ XOpenDisplay (); return 0; } _ACEOF -rm -f conftest.$ac_objext conftest$ac_exeext -if { (eval echo "$as_me:15739: \"$ac_link\"") >&5 +rm -f "conftest.$ac_objext" "conftest$ac_exeext" +if { (eval echo "$as_me:16449: \"$ac_link\"") >&5 (eval $ac_link) 2>&5 ac_status=$? - echo "$as_me:15742: \$? = $ac_status" >&5 - (exit $ac_status); } && - { ac_try='test -s conftest$ac_exeext' - { (eval echo "$as_me:15745: \"$ac_try\"") >&5 + echo "$as_me:16452: \$? = $ac_status" >&5 + (exit "$ac_status"); } && + { ac_try='test -s "conftest$ac_exeext"' + { (eval echo "$as_me:16455: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? - echo "$as_me:15748: \$? = $ac_status" >&5 - (exit $ac_status); }; }; then + echo "$as_me:16458: \$? = $ac_status" >&5 + (exit "$ac_status"); }; }; then ac_cv_lib_X11_XOpenDisplay=yes else echo "$as_me: failed program was:" >&5 -cat conftest.$ac_ext >&5 +cat "conftest.$ac_ext" >&5 ac_cv_lib_X11_XOpenDisplay=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:15759: result: $ac_cv_lib_X11_XOpenDisplay" >&5 +echo "$as_me:16469: result: $ac_cv_lib_X11_XOpenDisplay" >&5 echo "${ECHO_T}$ac_cv_lib_X11_XOpenDisplay" >&6 -if test $ac_cv_lib_X11_XOpenDisplay = yes; then +if test "$ac_cv_lib_X11_XOpenDisplay" = yes; then cf_add_libs="$LIBS" # reverse order @@ -15778,7 +16488,7 @@ LIBS="$cf_add_libs" fi -echo "$as_me:15781: checking for XCurses library" >&5 +echo "$as_me:16491: checking for XCurses library" >&5 echo $ECHO_N "checking for XCurses library... $ECHO_C" >&6 if test "${cf_cv_lib_XCurses+set}" = set; then echo $ECHO_N "(cached) $ECHO_C" >&6 @@ -15800,8 +16510,8 @@ for cf_add_1lib in $cf_add_0lib; do done LIBS="$cf_add_libs" -cat >conftest.$ac_ext <<_ACEOF -#line 15804 "configure" +cat >"conftest.$ac_ext" <<_ACEOF +#line 16514 "configure" #include "confdefs.h" #include @@ -15815,33 +16525,33 @@ XCursesExit(); return 0; } _ACEOF -rm -f conftest.$ac_objext conftest$ac_exeext -if { (eval echo "$as_me:15819: \"$ac_link\"") >&5 +rm -f "conftest.$ac_objext" "conftest$ac_exeext" +if { (eval echo "$as_me:16529: \"$ac_link\"") >&5 (eval $ac_link) 2>&5 ac_status=$? - echo "$as_me:15822: \$? = $ac_status" >&5 - (exit $ac_status); } && - { ac_try='test -s conftest$ac_exeext' - { (eval echo "$as_me:15825: \"$ac_try\"") >&5 + echo "$as_me:16532: \$? = $ac_status" >&5 + (exit "$ac_status"); } && + { ac_try='test -s "conftest$ac_exeext"' + { (eval echo "$as_me:16535: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? - echo "$as_me:15828: \$? = $ac_status" >&5 - (exit $ac_status); }; }; then + echo "$as_me:16538: \$? = $ac_status" >&5 + (exit "$ac_status"); }; }; then cf_cv_lib_XCurses=yes else echo "$as_me: failed program was:" >&5 -cat conftest.$ac_ext >&5 +cat "conftest.$ac_ext" >&5 cf_cv_lib_XCurses=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:15839: result: $cf_cv_lib_XCurses" >&5 +echo "$as_me:16549: result: $cf_cv_lib_XCurses" >&5 echo "${ECHO_T}$cf_cv_lib_XCurses" >&6 fi -if test $cf_cv_lib_XCurses = yes ; then +if test "$cf_cv_lib_XCurses" = yes ; then cat >>confdefs.h <<\EOF #define UNIX 1 @@ -15851,24 +16561,24 @@ cat >>confdefs.h <<\EOF #define XCURSES 1 EOF - echo "$as_me:15854: checking for xcurses.h" >&5 + echo "$as_me:16564: checking for xcurses.h" >&5 echo $ECHO_N "checking for xcurses.h... $ECHO_C" >&6 if test "${ac_cv_header_xcurses_h+set}" = set; then echo $ECHO_N "(cached) $ECHO_C" >&6 else - cat >conftest.$ac_ext <<_ACEOF -#line 15860 "configure" + cat >"conftest.$ac_ext" <<_ACEOF +#line 16570 "configure" #include "confdefs.h" #include _ACEOF -if { (eval echo "$as_me:15864: \"$ac_cpp conftest.$ac_ext\"") >&5 - (eval $ac_cpp conftest.$ac_ext) 2>conftest.er1 +if { (eval echo "$as_me:16574: \"$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:15870: \$? = $ac_status" >&5 - (exit $ac_status); } >/dev/null; then + echo "$as_me:16580: \$? = $ac_status" >&5 + (exit "$ac_status"); } >/dev/null; then if test -s conftest.err; then ac_cpp_err=$ac_c_preproc_warn_flag else @@ -15881,14 +16591,14 @@ if test -z "$ac_cpp_err"; then ac_cv_header_xcurses_h=yes else echo "$as_me: failed program was:" >&5 - cat conftest.$ac_ext >&5 + cat "conftest.$ac_ext" >&5 ac_cv_header_xcurses_h=no fi -rm -f conftest.err conftest.$ac_ext +rm -f conftest.err "conftest.$ac_ext" fi -echo "$as_me:15889: result: $ac_cv_header_xcurses_h" >&5 +echo "$as_me:16599: result: $ac_cv_header_xcurses_h" >&5 echo "${ECHO_T}$ac_cv_header_xcurses_h" >&6 -if test $ac_cv_header_xcurses_h = yes; then +if test "$ac_cv_header_xcurses_h" = yes; then cat >>confdefs.h <<\EOF #define HAVE_XCURSES 1 @@ -15897,14 +16607,14 @@ EOF fi else - { { echo "$as_me:15900: error: Cannot link with XCurses" >&5 + { { echo "$as_me:16610: error: Cannot link with XCurses" >&5 echo "$as_me: error: Cannot link with XCurses" >&2;} { (exit 1); exit 1; }; } fi ;; (*) - { { echo "$as_me:15907: error: unexpected screen-value: $cf_cv_screen" >&5 + { { echo "$as_me:16617: error: unexpected screen-value: $cf_cv_screen" >&5 echo "$as_me: error: unexpected screen-value: $cf_cv_screen" >&2;} { (exit 1); exit 1; }; } ;; @@ -15912,15 +16622,15 @@ esac : ${cf_nculib_root:=$cf_cv_screen} as_ac_Lib=`echo "ac_cv_lib_$cf_nculib_root''__nc_init_pthreads" | $as_tr_sh` -echo "$as_me:15915: checking for _nc_init_pthreads in -l$cf_nculib_root" >&5 +echo "$as_me:16625: checking for _nc_init_pthreads in -l$cf_nculib_root" >&5 echo $ECHO_N "checking for _nc_init_pthreads in -l$cf_nculib_root... $ECHO_C" >&6 if eval "test \"\${$as_ac_Lib+set}\" = set"; then echo $ECHO_N "(cached) $ECHO_C" >&6 else ac_check_lib_save_LIBS=$LIBS LIBS="-l$cf_nculib_root $LIBS" -cat >conftest.$ac_ext <<_ACEOF -#line 15923 "configure" +cat >"conftest.$ac_ext" <<_ACEOF +#line 16633 "configure" #include "confdefs.h" /* Override any gcc2 internal prototype to avoid an error. */ @@ -15938,30 +16648,30 @@ _nc_init_pthreads (); return 0; } _ACEOF -rm -f conftest.$ac_objext conftest$ac_exeext -if { (eval echo "$as_me:15942: \"$ac_link\"") >&5 +rm -f "conftest.$ac_objext" "conftest$ac_exeext" +if { (eval echo "$as_me:16652: \"$ac_link\"") >&5 (eval $ac_link) 2>&5 ac_status=$? - echo "$as_me:15945: \$? = $ac_status" >&5 - (exit $ac_status); } && - { ac_try='test -s conftest$ac_exeext' - { (eval echo "$as_me:15948: \"$ac_try\"") >&5 + echo "$as_me:16655: \$? = $ac_status" >&5 + (exit "$ac_status"); } && + { ac_try='test -s "conftest$ac_exeext"' + { (eval echo "$as_me:16658: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? - echo "$as_me:15951: \$? = $ac_status" >&5 - (exit $ac_status); }; }; then + echo "$as_me:16661: \$? = $ac_status" >&5 + (exit "$ac_status"); }; }; then eval "$as_ac_Lib=yes" else echo "$as_me: failed program was:" >&5 -cat conftest.$ac_ext >&5 +cat "conftest.$ac_ext" >&5 eval "$as_ac_Lib=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:15962: result: `eval echo '${'$as_ac_Lib'}'`" >&5 -echo "${ECHO_T}`eval echo '${'$as_ac_Lib'}'`" >&6 -if test `eval echo '${'$as_ac_Lib'}'` = yes; then +echo "$as_me:16672: result: `eval echo '${'"$as_ac_Lib"'}'`" >&5 +echo "${ECHO_T}`eval echo '${'"$as_ac_Lib"'}'`" >&6 +if test "`eval echo '${'"$as_ac_Lib"'}'`" = yes; then cf_cv_ncurses_pthreads=yes else cf_cv_ncurses_pthreads=no @@ -15994,7 +16704,7 @@ case $cf_cv_screen in ;; esac -echo "$as_me:15997: checking for X11 rgb file" >&5 +echo "$as_me:16707: checking for X11 rgb file" >&5 echo $ECHO_N "checking for X11 rgb file... $ECHO_C" >&6 # Check whether --with-x11-rgb or --without-x11-rgb was given. @@ -16046,19 +16756,19 @@ case ".$cf_path" in ;; (.[a-zA-Z]:[\\/]*) # OS/2 EMX ;; -(.\${*prefix}*|.\${*dir}*) +(.\$\{*prefix\}*|.\$\{*dir\}*) eval cf_path="$cf_path" case ".$cf_path" in (.NONE/*) - cf_path=`echo $cf_path | sed -e s%NONE%$cf_path_syntax%` + cf_path=`echo "$cf_path" | sed -e s%NONE%$cf_path_syntax%` ;; esac ;; (.no|.NONE/*) - cf_path=`echo $cf_path | sed -e s%NONE%$cf_path_syntax%` + cf_path=`echo "$cf_path" | sed -e s%NONE%$cf_path_syntax%` ;; (*) - { { echo "$as_me:16061: error: expected a pathname, not \"$cf_path\"" >&5 + { { echo "$as_me:16771: error: expected a pathname, not \"$cf_path\"" >&5 echo "$as_me: error: expected a pathname, not \"$cf_path\"" >&2;} { (exit 1); exit 1; }; } ;; @@ -16066,7 +16776,7 @@ esac fi -echo "$as_me:16069: result: $RGB_PATH" >&5 +echo "$as_me:16779: result: $RGB_PATH" >&5 echo "${ECHO_T}$RGB_PATH" >&6 cat >>confdefs.h <&5 +echo "$as_me:16820: checking for desired basename for form library" >&5 echo $ECHO_N "checking for desired basename for form library... $ECHO_C" >&6 # Check whether --with-form-libname or --without-form-libname was given. @@ -16127,10 +16837,10 @@ case "x$FORM_NAME" in ;; esac -echo "$as_me:16130: result: $FORM_NAME" >&5 +echo "$as_me:16840: result: $FORM_NAME" >&5 echo "${ECHO_T}$FORM_NAME" >&6 -echo "$as_me:16133: checking for desired basename for menu library" >&5 +echo "$as_me:16843: checking for desired basename for menu library" >&5 echo $ECHO_N "checking for desired basename for menu library... $ECHO_C" >&6 # Check whether --with-menu-libname or --without-menu-libname was given. @@ -16150,10 +16860,10 @@ case "x$MENU_NAME" in ;; esac -echo "$as_me:16153: result: $MENU_NAME" >&5 +echo "$as_me:16863: result: $MENU_NAME" >&5 echo "${ECHO_T}$MENU_NAME" >&6 -echo "$as_me:16156: checking for desired basename for panel library" >&5 +echo "$as_me:16866: checking for desired basename for panel library" >&5 echo $ECHO_N "checking for desired basename for panel library... $ECHO_C" >&6 # Check whether --with-panel-libname or --without-panel-libname was given. @@ -16173,10 +16883,10 @@ case "x$PANEL_NAME" in ;; esac -echo "$as_me:16176: result: $PANEL_NAME" >&5 +echo "$as_me:16886: result: $PANEL_NAME" >&5 echo "${ECHO_T}$PANEL_NAME" >&6 -echo "$as_me:16179: checking if you want to check for panel functions" >&5 +echo "$as_me:16889: checking if you want to check for panel functions" >&5 echo $ECHO_N "checking if you want to check for panel functions... $ECHO_C" >&6 # Check whether --enable-panel or --disable-panel was given. @@ -16193,7 +16903,7 @@ else cf_enable_panel=$cf_default_panel fi; -echo "$as_me:16196: result: $cf_enable_panel" >&5 +echo "$as_me:16906: result: $cf_enable_panel" >&5 echo "${ECHO_T}$cf_enable_panel" >&6 if test $cf_enable_panel = yes then @@ -16204,38 +16914,65 @@ cf_have_curses_lib=no if test "x${NCURSES_CONFIG_PKG}" = xnone; then : elif test "x${PKG_CONFIG:=none}" != xnone; then - echo "$as_me:16207: checking pkg-config for $PANEL_NAME$cf_cv_libtype" >&5 + echo "$as_me:16917: checking pkg-config for $PANEL_NAME$cf_cv_libtype" >&5 echo $ECHO_N "checking pkg-config for $PANEL_NAME$cf_cv_libtype... $ECHO_C" >&6 - if "$PKG_CONFIG" --exists $PANEL_NAME$cf_cv_libtype ; then - echo "$as_me:16210: result: yes" >&5 + if "$PKG_CONFIG" --exists "$PANEL_NAME$cf_cv_libtype" ; then + echo "$as_me:16920: result: yes" >&5 echo "${ECHO_T}yes" >&6 - echo "$as_me:16213: checking if the $PANEL_NAME$cf_cv_libtype package files work" >&5 + echo "$as_me:16923: checking if the $PANEL_NAME$cf_cv_libtype package files work" >&5 echo $ECHO_N "checking if the $PANEL_NAME$cf_cv_libtype package files work... $ECHO_C" >&6 + cf_save_CFLAGS="$CFLAGS" cf_save_CPPFLAGS="$CPPFLAGS" cf_save_LIBS="$LIBS" +for cf_add_cflags in `$PKG_CONFIG --cflags "$PANEL_NAME$cf_cv_libtype"` +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 `$PKG_CONFIG --cflags $PANEL_NAME$cf_cv_libtype` +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" @@ -16254,7 +16991,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/=.*//'` @@ -16284,7 +17021,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}" \ @@ -16314,10 +17051,12 @@ if test -n "$cf_new_extra_cppflags" ; then fi +done + cf_add_libs="$LIBS" # reverse order cf_add_0lib= -for cf_add_1lib in `$PKG_CONFIG --libs $PANEL_NAME$cf_cv_libtype`; do cf_add_0lib="$cf_add_1lib $cf_add_0lib"; done +for cf_add_1lib in `$PKG_CONFIG --libs "$PANEL_NAME$cf_cv_libtype"`; 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 @@ -16330,8 +17069,8 @@ for cf_add_1lib in $cf_add_0lib; do done LIBS="$cf_add_libs" - cat >conftest.$ac_ext <<_ACEOF -#line 16334 "configure" + cat >"conftest.$ac_ext" <<_ACEOF +#line 17073 "configure" #include "confdefs.h" #include <$PANEL_NAME.h> int @@ -16342,62 +17081,59 @@ main (void) return 0; } _ACEOF -rm -f conftest.$ac_objext conftest$ac_exeext -if { (eval echo "$as_me:16346: \"$ac_link\"") >&5 +rm -f "conftest.$ac_objext" "conftest$ac_exeext" +if { (eval echo "$as_me:17085: \"$ac_link\"") >&5 (eval $ac_link) 2>&5 ac_status=$? - echo "$as_me:16349: \$? = $ac_status" >&5 - (exit $ac_status); } && - { ac_try='test -s conftest$ac_exeext' - { (eval echo "$as_me:16352: \"$ac_try\"") >&5 + echo "$as_me:17088: \$? = $ac_status" >&5 + (exit "$ac_status"); } && + { ac_try='test -s "conftest$ac_exeext"' + { (eval echo "$as_me:17091: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? - echo "$as_me:16355: \$? = $ac_status" >&5 - (exit $ac_status); }; }; then + echo "$as_me:17094: \$? = $ac_status" >&5 + (exit "$ac_status"); }; }; then if test "$cross_compiling" = yes; then cf_have_curses_lib=maybe else - cat >conftest.$ac_ext <<_ACEOF -#line 16361 "configure" + cat >"conftest.$ac_ext" <<_ACEOF +#line 17100 "configure" #include "confdefs.h" #include <$PANEL_NAME.h> int main(void) { (void) new_panel ( 0 ); return 0; } _ACEOF -rm -f conftest$ac_exeext -if { (eval echo "$as_me:16368: \"$ac_link\"") >&5 +rm -f "conftest$ac_exeext" +if { (eval echo "$as_me:17107: \"$ac_link\"") >&5 (eval $ac_link) 2>&5 ac_status=$? - echo "$as_me:16371: \$? = $ac_status" >&5 - (exit $ac_status); } && { ac_try='./conftest$ac_exeext' - { (eval echo "$as_me:16373: \"$ac_try\"") >&5 + echo "$as_me:17110: \$? = $ac_status" >&5 + (exit "$ac_status"); } && { ac_try='"./conftest$ac_exeext"' + { (eval echo "$as_me:17112: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? - echo "$as_me:16376: \$? = $ac_status" >&5 - (exit $ac_status); }; }; then + echo "$as_me:17115: \$? = $ac_status" >&5 + (exit "$ac_status"); }; }; then cf_have_curses_lib=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_curses_lib=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_curses_lib=no fi -rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext - echo "$as_me:16393: result: $cf_have_curses_lib" >&5 +rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext" + echo "$as_me:17132: result: $cf_have_curses_lib" >&5 echo "${ECHO_T}$cf_have_curses_lib" >&6 test "$cf_have_curses_lib" = maybe && cf_have_curses_lib=yes - if test "$cf_have_curses_lib" != "yes" + if test "$cf_have_curses_lib" = "yes" then - CPPFLAGS="$cf_save_CPPFLAGS" - LIBS="$cf_save_LIBS" - else cf_upper=`echo "have_lib$PANEL_NAME" | sed y%abcdefghijklmnopqrstuvwxyz./-%ABCDEFGHIJKLMNOPQRSTUVWXYZ___%` @@ -16405,20 +17141,24 @@ cf_upper=`echo "have_lib$PANEL_NAME" | sed y%abcdefghijklmnopqrstuvwxyz./-%ABCDE #define $cf_upper 1 EOF + else + CFLAGS="$cf_save_CFLAGS" + CPPFLAGS="$cf_save_CPPFLAGS" + LIBS="$cf_save_LIBS" fi fi fi if test "$cf_have_curses_lib" = no; then as_ac_Lib=`echo "ac_cv_lib_$PANEL_NAME$cf_cv_libtype''_new_panel" | $as_tr_sh` -echo "$as_me:16413: checking for new_panel in -l$PANEL_NAME$cf_cv_libtype" >&5 +echo "$as_me:17153: checking for new_panel in -l$PANEL_NAME$cf_cv_libtype" >&5 echo $ECHO_N "checking for new_panel in -l$PANEL_NAME$cf_cv_libtype... $ECHO_C" >&6 if eval "test \"\${$as_ac_Lib+set}\" = set"; then echo $ECHO_N "(cached) $ECHO_C" >&6 else ac_check_lib_save_LIBS=$LIBS LIBS="-l$PANEL_NAME$cf_cv_libtype $LIBS" -cat >conftest.$ac_ext <<_ACEOF -#line 16421 "configure" +cat >"conftest.$ac_ext" <<_ACEOF +#line 17161 "configure" #include "confdefs.h" /* Override any gcc2 internal prototype to avoid an error. */ @@ -16436,30 +17176,30 @@ new_panel (); return 0; } _ACEOF -rm -f conftest.$ac_objext conftest$ac_exeext -if { (eval echo "$as_me:16440: \"$ac_link\"") >&5 +rm -f "conftest.$ac_objext" "conftest$ac_exeext" +if { (eval echo "$as_me:17180: \"$ac_link\"") >&5 (eval $ac_link) 2>&5 ac_status=$? - echo "$as_me:16443: \$? = $ac_status" >&5 - (exit $ac_status); } && - { ac_try='test -s conftest$ac_exeext' - { (eval echo "$as_me:16446: \"$ac_try\"") >&5 + echo "$as_me:17183: \$? = $ac_status" >&5 + (exit "$ac_status"); } && + { ac_try='test -s "conftest$ac_exeext"' + { (eval echo "$as_me:17186: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? - echo "$as_me:16449: \$? = $ac_status" >&5 - (exit $ac_status); }; }; then + echo "$as_me:17189: \$? = $ac_status" >&5 + (exit "$ac_status"); }; }; then eval "$as_ac_Lib=yes" else echo "$as_me: failed program was:" >&5 -cat conftest.$ac_ext >&5 +cat "conftest.$ac_ext" >&5 eval "$as_ac_Lib=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:16460: result: `eval echo '${'$as_ac_Lib'}'`" >&5 -echo "${ECHO_T}`eval echo '${'$as_ac_Lib'}'`" >&6 -if test `eval echo '${'$as_ac_Lib'}'` = yes; then +echo "$as_me:17200: result: `eval echo '${'"$as_ac_Lib"'}'`" >&5 +echo "${ECHO_T}`eval echo '${'"$as_ac_Lib"'}'`" >&6 +if test "`eval echo '${'"$as_ac_Lib"'}'`" = yes; then cf_upper=`echo "have_lib$PANEL_NAME" | sed y%abcdefghijklmnopqrstuvwxyz./-%ABCDEFGHIJKLMNOPQRSTUVWXYZ___%` @@ -16490,7 +17230,7 @@ fi cf_curses_headers="$cf_curses_headers panel.h" fi -echo "$as_me:16493: checking if you want to check for menu functions" >&5 +echo "$as_me:17233: checking if you want to check for menu functions" >&5 echo $ECHO_N "checking if you want to check for menu functions... $ECHO_C" >&6 # Check whether --enable-menu or --disable-menu was given. @@ -16507,7 +17247,7 @@ else cf_enable_menu=$cf_default_menu fi; -echo "$as_me:16510: result: $cf_enable_menu" >&5 +echo "$as_me:17250: result: $cf_enable_menu" >&5 echo "${ECHO_T}$cf_enable_menu" >&6 if test $cf_enable_menu = yes then @@ -16516,14 +17256,14 @@ then ;; (curses*) -echo "$as_me:16519: checking for NetBSD menu.h" >&5 +echo "$as_me:17259: checking for NetBSD menu.h" >&5 echo $ECHO_N "checking for NetBSD menu.h... $ECHO_C" >&6 if test "${cf_cv_netbsd_menu_h+set}" = set; then echo $ECHO_N "(cached) $ECHO_C" >&6 else -cat >conftest.$ac_ext <<_ACEOF -#line 16526 "configure" +cat >"conftest.$ac_ext" <<_ACEOF +#line 17266 "configure" #include "confdefs.h" #include <${cf_cv_ncurses_header:-curses.h}> @@ -16540,29 +17280,29 @@ main (void) return 0; } _ACEOF -rm -f conftest.$ac_objext -if { (eval echo "$as_me:16544: \"$ac_compile\"") >&5 +rm -f "conftest.$ac_objext" +if { (eval echo "$as_me:17284: \"$ac_compile\"") >&5 (eval $ac_compile) 2>&5 ac_status=$? - echo "$as_me:16547: \$? = $ac_status" >&5 - (exit $ac_status); } && - { ac_try='test -s conftest.$ac_objext' - { (eval echo "$as_me:16550: \"$ac_try\"") >&5 + echo "$as_me:17287: \$? = $ac_status" >&5 + (exit "$ac_status"); } && + { ac_try='test -s "conftest.$ac_objext"' + { (eval echo "$as_me:17290: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? - echo "$as_me:16553: \$? = $ac_status" >&5 - (exit $ac_status); }; }; then + echo "$as_me:17293: \$? = $ac_status" >&5 + (exit "$ac_status"); }; }; then cf_cv_netbsd_menu_h=yes else echo "$as_me: failed program was:" >&5 -cat conftest.$ac_ext >&5 +cat "conftest.$ac_ext" >&5 cf_cv_netbsd_menu_h=no fi -rm -f conftest.$ac_objext conftest.$ac_ext +rm -f "conftest.$ac_objext" "conftest.$ac_ext" fi -echo "$as_me:16565: result: $cf_cv_netbsd_menu_h" >&5 +echo "$as_me:17305: result: $cf_cv_netbsd_menu_h" >&5 echo "${ECHO_T}$cf_cv_netbsd_menu_h" >&6 test "$cf_cv_netbsd_menu_h" = yes && @@ -16579,38 +17319,65 @@ cf_have_curses_lib=no if test "x${NCURSES_CONFIG_PKG}" = xnone; then : elif test "x${PKG_CONFIG:=none}" != xnone; then - echo "$as_me:16582: checking pkg-config for $MENU_NAME$cf_cv_libtype" >&5 + echo "$as_me:17322: checking pkg-config for $MENU_NAME$cf_cv_libtype" >&5 echo $ECHO_N "checking pkg-config for $MENU_NAME$cf_cv_libtype... $ECHO_C" >&6 - if "$PKG_CONFIG" --exists $MENU_NAME$cf_cv_libtype ; then - echo "$as_me:16585: result: yes" >&5 + if "$PKG_CONFIG" --exists "$MENU_NAME$cf_cv_libtype" ; then + echo "$as_me:17325: result: yes" >&5 echo "${ECHO_T}yes" >&6 - echo "$as_me:16588: checking if the $MENU_NAME$cf_cv_libtype package files work" >&5 + echo "$as_me:17328: checking if the $MENU_NAME$cf_cv_libtype package files work" >&5 echo $ECHO_N "checking if the $MENU_NAME$cf_cv_libtype package files work... $ECHO_C" >&6 + cf_save_CFLAGS="$CFLAGS" cf_save_CPPFLAGS="$CPPFLAGS" cf_save_LIBS="$LIBS" +for cf_add_cflags in `$PKG_CONFIG --cflags "$MENU_NAME$cf_cv_libtype"` +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 `$PKG_CONFIG --cflags $MENU_NAME$cf_cv_libtype` +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" @@ -16629,7 +17396,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/=.*//'` @@ -16659,7 +17426,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}" \ @@ -16689,10 +17456,12 @@ if test -n "$cf_new_extra_cppflags" ; then fi +done + cf_add_libs="$LIBS" # reverse order cf_add_0lib= -for cf_add_1lib in `$PKG_CONFIG --libs $MENU_NAME$cf_cv_libtype`; do cf_add_0lib="$cf_add_1lib $cf_add_0lib"; done +for cf_add_1lib in `$PKG_CONFIG --libs "$MENU_NAME$cf_cv_libtype"`; 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 @@ -16705,8 +17474,8 @@ for cf_add_1lib in $cf_add_0lib; do done LIBS="$cf_add_libs" - cat >conftest.$ac_ext <<_ACEOF -#line 16709 "configure" + cat >"conftest.$ac_ext" <<_ACEOF +#line 17478 "configure" #include "confdefs.h" #include <$MENU_NAME.h> int @@ -16717,62 +17486,59 @@ main (void) return 0; } _ACEOF -rm -f conftest.$ac_objext conftest$ac_exeext -if { (eval echo "$as_me:16721: \"$ac_link\"") >&5 +rm -f "conftest.$ac_objext" "conftest$ac_exeext" +if { (eval echo "$as_me:17490: \"$ac_link\"") >&5 (eval $ac_link) 2>&5 ac_status=$? - echo "$as_me:16724: \$? = $ac_status" >&5 - (exit $ac_status); } && - { ac_try='test -s conftest$ac_exeext' - { (eval echo "$as_me:16727: \"$ac_try\"") >&5 + echo "$as_me:17493: \$? = $ac_status" >&5 + (exit "$ac_status"); } && + { ac_try='test -s "conftest$ac_exeext"' + { (eval echo "$as_me:17496: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? - echo "$as_me:16730: \$? = $ac_status" >&5 - (exit $ac_status); }; }; then + echo "$as_me:17499: \$? = $ac_status" >&5 + (exit "$ac_status"); }; }; then if test "$cross_compiling" = yes; then cf_have_curses_lib=maybe else - cat >conftest.$ac_ext <<_ACEOF -#line 16736 "configure" + cat >"conftest.$ac_ext" <<_ACEOF +#line 17505 "configure" #include "confdefs.h" #include <$MENU_NAME.h> int main(void) { (void) menu_driver ( 0,0 ); return 0; } _ACEOF -rm -f conftest$ac_exeext -if { (eval echo "$as_me:16743: \"$ac_link\"") >&5 +rm -f "conftest$ac_exeext" +if { (eval echo "$as_me:17512: \"$ac_link\"") >&5 (eval $ac_link) 2>&5 ac_status=$? - echo "$as_me:16746: \$? = $ac_status" >&5 - (exit $ac_status); } && { ac_try='./conftest$ac_exeext' - { (eval echo "$as_me:16748: \"$ac_try\"") >&5 + echo "$as_me:17515: \$? = $ac_status" >&5 + (exit "$ac_status"); } && { ac_try='"./conftest$ac_exeext"' + { (eval echo "$as_me:17517: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? - echo "$as_me:16751: \$? = $ac_status" >&5 - (exit $ac_status); }; }; then + echo "$as_me:17520: \$? = $ac_status" >&5 + (exit "$ac_status"); }; }; then cf_have_curses_lib=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_curses_lib=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_curses_lib=no fi -rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext - echo "$as_me:16768: result: $cf_have_curses_lib" >&5 +rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext" + echo "$as_me:17537: result: $cf_have_curses_lib" >&5 echo "${ECHO_T}$cf_have_curses_lib" >&6 test "$cf_have_curses_lib" = maybe && cf_have_curses_lib=yes - if test "$cf_have_curses_lib" != "yes" + if test "$cf_have_curses_lib" = "yes" then - CPPFLAGS="$cf_save_CPPFLAGS" - LIBS="$cf_save_LIBS" - else cf_upper=`echo "have_lib$MENU_NAME" | sed y%abcdefghijklmnopqrstuvwxyz./-%ABCDEFGHIJKLMNOPQRSTUVWXYZ___%` @@ -16780,20 +17546,24 @@ cf_upper=`echo "have_lib$MENU_NAME" | sed y%abcdefghijklmnopqrstuvwxyz./-%ABCDEF #define $cf_upper 1 EOF + else + CFLAGS="$cf_save_CFLAGS" + CPPFLAGS="$cf_save_CPPFLAGS" + LIBS="$cf_save_LIBS" fi fi fi if test "$cf_have_curses_lib" = no; then as_ac_Lib=`echo "ac_cv_lib_$MENU_NAME$cf_cv_libtype''_menu_driver" | $as_tr_sh` -echo "$as_me:16788: checking for menu_driver in -l$MENU_NAME$cf_cv_libtype" >&5 +echo "$as_me:17558: checking for menu_driver in -l$MENU_NAME$cf_cv_libtype" >&5 echo $ECHO_N "checking for menu_driver in -l$MENU_NAME$cf_cv_libtype... $ECHO_C" >&6 if eval "test \"\${$as_ac_Lib+set}\" = set"; then echo $ECHO_N "(cached) $ECHO_C" >&6 else ac_check_lib_save_LIBS=$LIBS LIBS="-l$MENU_NAME$cf_cv_libtype $LIBS" -cat >conftest.$ac_ext <<_ACEOF -#line 16796 "configure" +cat >"conftest.$ac_ext" <<_ACEOF +#line 17566 "configure" #include "confdefs.h" /* Override any gcc2 internal prototype to avoid an error. */ @@ -16811,30 +17581,30 @@ menu_driver (); return 0; } _ACEOF -rm -f conftest.$ac_objext conftest$ac_exeext -if { (eval echo "$as_me:16815: \"$ac_link\"") >&5 +rm -f "conftest.$ac_objext" "conftest$ac_exeext" +if { (eval echo "$as_me:17585: \"$ac_link\"") >&5 (eval $ac_link) 2>&5 ac_status=$? - echo "$as_me:16818: \$? = $ac_status" >&5 - (exit $ac_status); } && - { ac_try='test -s conftest$ac_exeext' - { (eval echo "$as_me:16821: \"$ac_try\"") >&5 + echo "$as_me:17588: \$? = $ac_status" >&5 + (exit "$ac_status"); } && + { ac_try='test -s "conftest$ac_exeext"' + { (eval echo "$as_me:17591: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? - echo "$as_me:16824: \$? = $ac_status" >&5 - (exit $ac_status); }; }; then + echo "$as_me:17594: \$? = $ac_status" >&5 + (exit "$ac_status"); }; }; then eval "$as_ac_Lib=yes" else echo "$as_me: failed program was:" >&5 -cat conftest.$ac_ext >&5 +cat "conftest.$ac_ext" >&5 eval "$as_ac_Lib=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:16835: result: `eval echo '${'$as_ac_Lib'}'`" >&5 -echo "${ECHO_T}`eval echo '${'$as_ac_Lib'}'`" >&6 -if test `eval echo '${'$as_ac_Lib'}'` = yes; then +echo "$as_me:17605: result: `eval echo '${'"$as_ac_Lib"'}'`" >&5 +echo "${ECHO_T}`eval echo '${'"$as_ac_Lib"'}'`" >&6 +if test "`eval echo '${'"$as_ac_Lib"'}'`" = yes; then cf_upper=`echo "have_lib$MENU_NAME" | sed y%abcdefghijklmnopqrstuvwxyz./-%ABCDEFGHIJKLMNOPQRSTUVWXYZ___%` @@ -16865,7 +17635,7 @@ fi cf_curses_headers="$cf_curses_headers menu.h" fi -echo "$as_me:16868: checking if you want to check for form functions" >&5 +echo "$as_me:17638: checking if you want to check for form functions" >&5 echo $ECHO_N "checking if you want to check for form functions... $ECHO_C" >&6 # Check whether --enable-form or --disable-form was given. @@ -16882,7 +17652,7 @@ else cf_enable_form=$cf_default_form fi; -echo "$as_me:16885: result: $cf_enable_form" >&5 +echo "$as_me:17655: result: $cf_enable_form" >&5 echo "${ECHO_T}$cf_enable_form" >&6 if test $cf_enable_form = yes then @@ -16891,14 +17661,14 @@ then ;; (curses*) -echo "$as_me:16894: checking for NetBSD form.h" >&5 +echo "$as_me:17664: checking for NetBSD form.h" >&5 echo $ECHO_N "checking for NetBSD form.h... $ECHO_C" >&6 if test "${cf_cv_netbsd_form_h+set}" = set; then echo $ECHO_N "(cached) $ECHO_C" >&6 else -cat >conftest.$ac_ext <<_ACEOF -#line 16901 "configure" +cat >"conftest.$ac_ext" <<_ACEOF +#line 17671 "configure" #include "confdefs.h" #include <${cf_cv_ncurses_header:-curses.h}> @@ -16916,29 +17686,29 @@ main (void) return 0; } _ACEOF -rm -f conftest.$ac_objext -if { (eval echo "$as_me:16920: \"$ac_compile\"") >&5 +rm -f "conftest.$ac_objext" +if { (eval echo "$as_me:17690: \"$ac_compile\"") >&5 (eval $ac_compile) 2>&5 ac_status=$? - echo "$as_me:16923: \$? = $ac_status" >&5 - (exit $ac_status); } && - { ac_try='test -s conftest.$ac_objext' - { (eval echo "$as_me:16926: \"$ac_try\"") >&5 + echo "$as_me:17693: \$? = $ac_status" >&5 + (exit "$ac_status"); } && + { ac_try='test -s "conftest.$ac_objext"' + { (eval echo "$as_me:17696: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? - echo "$as_me:16929: \$? = $ac_status" >&5 - (exit $ac_status); }; }; then + echo "$as_me:17699: \$? = $ac_status" >&5 + (exit "$ac_status"); }; }; then cf_cv_netbsd_form_h=yes else echo "$as_me: failed program was:" >&5 -cat conftest.$ac_ext >&5 +cat "conftest.$ac_ext" >&5 cf_cv_netbsd_form_h=no fi -rm -f conftest.$ac_objext conftest.$ac_ext +rm -f "conftest.$ac_objext" "conftest.$ac_ext" fi -echo "$as_me:16941: result: $cf_cv_netbsd_form_h" >&5 +echo "$as_me:17711: result: $cf_cv_netbsd_form_h" >&5 echo "${ECHO_T}$cf_cv_netbsd_form_h" >&6 test "$cf_cv_netbsd_form_h" = yes && @@ -16955,38 +17725,65 @@ cf_have_curses_lib=no if test "x${NCURSES_CONFIG_PKG}" = xnone; then : elif test "x${PKG_CONFIG:=none}" != xnone; then - echo "$as_me:16958: checking pkg-config for $FORM_NAME$cf_cv_libtype" >&5 + echo "$as_me:17728: checking pkg-config for $FORM_NAME$cf_cv_libtype" >&5 echo $ECHO_N "checking pkg-config for $FORM_NAME$cf_cv_libtype... $ECHO_C" >&6 - if "$PKG_CONFIG" --exists $FORM_NAME$cf_cv_libtype ; then - echo "$as_me:16961: result: yes" >&5 + if "$PKG_CONFIG" --exists "$FORM_NAME$cf_cv_libtype" ; then + echo "$as_me:17731: result: yes" >&5 echo "${ECHO_T}yes" >&6 - echo "$as_me:16964: checking if the $FORM_NAME$cf_cv_libtype package files work" >&5 + echo "$as_me:17734: checking if the $FORM_NAME$cf_cv_libtype package files work" >&5 echo $ECHO_N "checking if the $FORM_NAME$cf_cv_libtype package files work... $ECHO_C" >&6 + cf_save_CFLAGS="$CFLAGS" cf_save_CPPFLAGS="$CPPFLAGS" cf_save_LIBS="$LIBS" +for cf_add_cflags in `$PKG_CONFIG --cflags "$FORM_NAME$cf_cv_libtype"` +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 `$PKG_CONFIG --cflags $FORM_NAME$cf_cv_libtype` +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" @@ -17005,7 +17802,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/=.*//'` @@ -17035,7 +17832,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}" \ @@ -17065,10 +17862,12 @@ if test -n "$cf_new_extra_cppflags" ; then fi +done + cf_add_libs="$LIBS" # reverse order cf_add_0lib= -for cf_add_1lib in `$PKG_CONFIG --libs $FORM_NAME$cf_cv_libtype`; do cf_add_0lib="$cf_add_1lib $cf_add_0lib"; done +for cf_add_1lib in `$PKG_CONFIG --libs "$FORM_NAME$cf_cv_libtype"`; 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 @@ -17081,8 +17880,8 @@ for cf_add_1lib in $cf_add_0lib; do done LIBS="$cf_add_libs" - cat >conftest.$ac_ext <<_ACEOF -#line 17085 "configure" + cat >"conftest.$ac_ext" <<_ACEOF +#line 17884 "configure" #include "confdefs.h" #include <$FORM_NAME.h> int @@ -17093,62 +17892,59 @@ main (void) return 0; } _ACEOF -rm -f conftest.$ac_objext conftest$ac_exeext -if { (eval echo "$as_me:17097: \"$ac_link\"") >&5 +rm -f "conftest.$ac_objext" "conftest$ac_exeext" +if { (eval echo "$as_me:17896: \"$ac_link\"") >&5 (eval $ac_link) 2>&5 ac_status=$? - echo "$as_me:17100: \$? = $ac_status" >&5 - (exit $ac_status); } && - { ac_try='test -s conftest$ac_exeext' - { (eval echo "$as_me:17103: \"$ac_try\"") >&5 + echo "$as_me:17899: \$? = $ac_status" >&5 + (exit "$ac_status"); } && + { ac_try='test -s "conftest$ac_exeext"' + { (eval echo "$as_me:17902: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? - echo "$as_me:17106: \$? = $ac_status" >&5 - (exit $ac_status); }; }; then + echo "$as_me:17905: \$? = $ac_status" >&5 + (exit "$ac_status"); }; }; then if test "$cross_compiling" = yes; then cf_have_curses_lib=maybe else - cat >conftest.$ac_ext <<_ACEOF -#line 17112 "configure" + cat >"conftest.$ac_ext" <<_ACEOF +#line 17911 "configure" #include "confdefs.h" #include <$FORM_NAME.h> int main(void) { (void) form_driver ( 0,0 ); return 0; } _ACEOF -rm -f conftest$ac_exeext -if { (eval echo "$as_me:17119: \"$ac_link\"") >&5 +rm -f "conftest$ac_exeext" +if { (eval echo "$as_me:17918: \"$ac_link\"") >&5 (eval $ac_link) 2>&5 ac_status=$? - echo "$as_me:17122: \$? = $ac_status" >&5 - (exit $ac_status); } && { ac_try='./conftest$ac_exeext' - { (eval echo "$as_me:17124: \"$ac_try\"") >&5 + echo "$as_me:17921: \$? = $ac_status" >&5 + (exit "$ac_status"); } && { ac_try='"./conftest$ac_exeext"' + { (eval echo "$as_me:17923: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? - echo "$as_me:17127: \$? = $ac_status" >&5 - (exit $ac_status); }; }; then + echo "$as_me:17926: \$? = $ac_status" >&5 + (exit "$ac_status"); }; }; then cf_have_curses_lib=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_curses_lib=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_curses_lib=no fi -rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext - echo "$as_me:17144: result: $cf_have_curses_lib" >&5 +rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext" + echo "$as_me:17943: result: $cf_have_curses_lib" >&5 echo "${ECHO_T}$cf_have_curses_lib" >&6 test "$cf_have_curses_lib" = maybe && cf_have_curses_lib=yes - if test "$cf_have_curses_lib" != "yes" + if test "$cf_have_curses_lib" = "yes" then - CPPFLAGS="$cf_save_CPPFLAGS" - LIBS="$cf_save_LIBS" - else cf_upper=`echo "have_lib$FORM_NAME" | sed y%abcdefghijklmnopqrstuvwxyz./-%ABCDEFGHIJKLMNOPQRSTUVWXYZ___%` @@ -17156,20 +17952,24 @@ cf_upper=`echo "have_lib$FORM_NAME" | sed y%abcdefghijklmnopqrstuvwxyz./-%ABCDEF #define $cf_upper 1 EOF + else + CFLAGS="$cf_save_CFLAGS" + CPPFLAGS="$cf_save_CPPFLAGS" + LIBS="$cf_save_LIBS" fi fi fi if test "$cf_have_curses_lib" = no; then as_ac_Lib=`echo "ac_cv_lib_$FORM_NAME$cf_cv_libtype''_form_driver" | $as_tr_sh` -echo "$as_me:17164: checking for form_driver in -l$FORM_NAME$cf_cv_libtype" >&5 +echo "$as_me:17964: checking for form_driver in -l$FORM_NAME$cf_cv_libtype" >&5 echo $ECHO_N "checking for form_driver in -l$FORM_NAME$cf_cv_libtype... $ECHO_C" >&6 if eval "test \"\${$as_ac_Lib+set}\" = set"; then echo $ECHO_N "(cached) $ECHO_C" >&6 else ac_check_lib_save_LIBS=$LIBS LIBS="-l$FORM_NAME$cf_cv_libtype $LIBS" -cat >conftest.$ac_ext <<_ACEOF -#line 17172 "configure" +cat >"conftest.$ac_ext" <<_ACEOF +#line 17972 "configure" #include "confdefs.h" /* Override any gcc2 internal prototype to avoid an error. */ @@ -17187,30 +17987,30 @@ form_driver (); return 0; } _ACEOF -rm -f conftest.$ac_objext conftest$ac_exeext -if { (eval echo "$as_me:17191: \"$ac_link\"") >&5 +rm -f "conftest.$ac_objext" "conftest$ac_exeext" +if { (eval echo "$as_me:17991: \"$ac_link\"") >&5 (eval $ac_link) 2>&5 ac_status=$? - echo "$as_me:17194: \$? = $ac_status" >&5 - (exit $ac_status); } && - { ac_try='test -s conftest$ac_exeext' - { (eval echo "$as_me:17197: \"$ac_try\"") >&5 + echo "$as_me:17994: \$? = $ac_status" >&5 + (exit "$ac_status"); } && + { ac_try='test -s "conftest$ac_exeext"' + { (eval echo "$as_me:17997: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? - echo "$as_me:17200: \$? = $ac_status" >&5 - (exit $ac_status); }; }; then + echo "$as_me:18000: \$? = $ac_status" >&5 + (exit "$ac_status"); }; }; then eval "$as_ac_Lib=yes" else echo "$as_me: failed program was:" >&5 -cat conftest.$ac_ext >&5 +cat "conftest.$ac_ext" >&5 eval "$as_ac_Lib=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:17211: result: `eval echo '${'$as_ac_Lib'}'`" >&5 -echo "${ECHO_T}`eval echo '${'$as_ac_Lib'}'`" >&6 -if test `eval echo '${'$as_ac_Lib'}'` = yes; then +echo "$as_me:18011: result: `eval echo '${'"$as_ac_Lib"'}'`" >&5 +echo "${ECHO_T}`eval echo '${'"$as_ac_Lib"'}'`" >&6 +if test "`eval echo '${'"$as_ac_Lib"'}'`" = yes; then cf_upper=`echo "have_lib$FORM_NAME" | sed y%abcdefghijklmnopqrstuvwxyz./-%ABCDEFGHIJKLMNOPQRSTUVWXYZ___%` @@ -17246,24 +18046,24 @@ fi for ac_header in $cf_curses_headers do as_ac_Header=`echo "ac_cv_header_$ac_header" | $as_tr_sh` -echo "$as_me:17249: checking for $ac_header" >&5 +echo "$as_me:18049: 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 17255 "configure" + cat >"conftest.$ac_ext" <<_ACEOF +#line 18055 "configure" #include "confdefs.h" #include <$ac_header> _ACEOF -if { (eval echo "$as_me:17259: \"$ac_cpp conftest.$ac_ext\"") >&5 - (eval $ac_cpp conftest.$ac_ext) 2>conftest.er1 +if { (eval echo "$as_me:18059: \"$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:17265: \$? = $ac_status" >&5 - (exit $ac_status); } >/dev/null; then + echo "$as_me:18065: \$? = $ac_status" >&5 + (exit "$ac_status"); } >/dev/null; then if test -s conftest.err; then ac_cpp_err=$ac_c_preproc_warn_flag else @@ -17276,14 +18076,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:17284: 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:18084: 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:18094: checking for ANSI C header files" >&5 echo $ECHO_N "checking for ANSI C header files... $ECHO_C" >&6 if test "${ac_cv_header_stdc+set}" = set; then echo $ECHO_N "(cached) $ECHO_C" >&6 else - cat >conftest.$ac_ext <<_ACEOF -#line 17300 "configure" + cat >"conftest.$ac_ext" <<_ACEOF +#line 18100 "configure" #include "confdefs.h" #include #include @@ -17305,14 +18105,14 @@ else #include _ACEOF -if { (eval echo "$as_me:17308: \"$ac_cpp conftest.$ac_ext\"") >&5 - (eval $ac_cpp conftest.$ac_ext) 2>conftest.er1 +if { (eval echo "$as_me:18108: \"$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:17314: \$? = $ac_status" >&5 - (exit $ac_status); } >/dev/null; then + echo "$as_me:18114: \$? = $ac_status" >&5 + (exit "$ac_status"); } >/dev/null; then if test -s conftest.err; then ac_cpp_err=$ac_c_preproc_warn_flag else @@ -17325,21 +18125,21 @@ 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.err conftest.$ac_ext +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 17336 "configure" + cat >"conftest.$ac_ext" <<_ACEOF +#line 18136 "configure" #include "confdefs.h" #include _ACEOF if (eval "$ac_cpp conftest.$ac_ext") 2>&5 | - egrep "memchr" >/dev/null 2>&1; then + $EGREP "memchr" >/dev/null 2>&1; then : else ac_cv_header_stdc=no @@ -17350,14 +18150,14 @@ 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 17354 "configure" + cat >"conftest.$ac_ext" <<_ACEOF +#line 18154 "configure" #include "confdefs.h" #include _ACEOF if (eval "$ac_cpp conftest.$ac_ext") 2>&5 | - egrep "free" >/dev/null 2>&1; then + $EGREP "free" >/dev/null 2>&1; then : else ac_cv_header_stdc=no @@ -17371,8 +18171,8 @@ if test $ac_cv_header_stdc = yes; then if test "$cross_compiling" = yes; then : else - cat >conftest.$ac_ext <<_ACEOF -#line 17375 "configure" + cat >"conftest.$ac_ext" <<_ACEOF +#line 18175 "configure" #include "confdefs.h" #include #if ((' ' & 0x0FF) == 0x020) @@ -17397,29 +18197,29 @@ main (void) $ac_main_return (0); } _ACEOF -rm -f conftest$ac_exeext -if { (eval echo "$as_me:17401: \"$ac_link\"") >&5 +rm -f "conftest$ac_exeext" +if { (eval echo "$as_me:18201: \"$ac_link\"") >&5 (eval $ac_link) 2>&5 ac_status=$? - echo "$as_me:17404: \$? = $ac_status" >&5 - (exit $ac_status); } && { ac_try='./conftest$ac_exeext' - { (eval echo "$as_me:17406: \"$ac_try\"") >&5 + echo "$as_me:18204: \$? = $ac_status" >&5 + (exit "$ac_status"); } && { ac_try='"./conftest$ac_exeext"' + { (eval echo "$as_me:18206: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? - echo "$as_me:17409: \$? = $ac_status" >&5 - (exit $ac_status); }; }; then + echo "$as_me:18209: \$? = $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 +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 +rm -f core ./core.* ./*.core "conftest$ac_exeext" "conftest.$ac_objext" "conftest.$ac_ext" fi fi fi -echo "$as_me:17422: result: $ac_cv_header_stdc" >&5 +echo "$as_me:18222: result: $ac_cv_header_stdc" >&5 echo "${ECHO_T}$ac_cv_header_stdc" >&6 if test $ac_cv_header_stdc = yes; then @@ -17429,13 +18229,13 @@ EOF fi -echo "$as_me:17432: checking whether time.h and sys/time.h may both be included" >&5 +echo "$as_me:18232: 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 17438 "configure" + cat >"conftest.$ac_ext" <<_ACEOF +#line 18238 "configure" #include "confdefs.h" #include #include @@ -17450,27 +18250,27 @@ return 0; return 0; } _ACEOF -rm -f conftest.$ac_objext -if { (eval echo "$as_me:17454: \"$ac_compile\"") >&5 +rm -f "conftest.$ac_objext" +if { (eval echo "$as_me:18254: \"$ac_compile\"") >&5 (eval $ac_compile) 2>&5 ac_status=$? - echo "$as_me:17457: \$? = $ac_status" >&5 - (exit $ac_status); } && - { ac_try='test -s conftest.$ac_objext' - { (eval echo "$as_me:17460: \"$ac_try\"") >&5 + echo "$as_me:18257: \$? = $ac_status" >&5 + (exit "$ac_status"); } && + { ac_try='test -s "conftest.$ac_objext"' + { (eval echo "$as_me:18260: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? - echo "$as_me:17463: \$? = $ac_status" >&5 - (exit $ac_status); }; }; then + echo "$as_me:18263: \$? = $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:17473: result: $ac_cv_header_time" >&5 +echo "$as_me:18273: result: $ac_cv_header_time" >&5 echo "${ECHO_T}$ac_cv_header_time" >&6 if test $ac_cv_header_time = yes; then @@ -17494,24 +18294,24 @@ unistd.h \ do as_ac_Header=`echo "ac_cv_header_$ac_header" | $as_tr_sh` -echo "$as_me:17497: checking for $ac_header" >&5 +echo "$as_me:18297: 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 17503 "configure" + cat >"conftest.$ac_ext" <<_ACEOF +#line 18303 "configure" #include "confdefs.h" #include <$ac_header> _ACEOF -if { (eval echo "$as_me:17507: \"$ac_cpp conftest.$ac_ext\"") >&5 - (eval $ac_cpp conftest.$ac_ext) 2>conftest.er1 +if { (eval echo "$as_me:18307: \"$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:17513: \$? = $ac_status" >&5 - (exit $ac_status); } >/dev/null; then + echo "$as_me:18313: \$? = $ac_status" >&5 + (exit "$ac_status"); } >/dev/null; then if test -s conftest.err; then ac_cpp_err=$ac_c_preproc_warn_flag else @@ -17524,14 +18324,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:17532: 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:18332: 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:18345: 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 17551 "configure" + cat >"conftest.$ac_ext" <<_ACEOF +#line 18351 "configure" #include "confdefs.h" #include <$ac_header> _ACEOF -if { (eval echo "$as_me:17555: \"$ac_cpp conftest.$ac_ext\"") >&5 - (eval $ac_cpp conftest.$ac_ext) 2>conftest.er1 +if { (eval echo "$as_me:18355: \"$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:17561: \$? = $ac_status" >&5 - (exit $ac_status); } >/dev/null; then + echo "$as_me:18361: \$? = $ac_status" >&5 + (exit "$ac_status"); } >/dev/null; then if test -s conftest.err; then ac_cpp_err=$ac_c_preproc_warn_flag else @@ -17572,14 +18372,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:17580: 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:18380: 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:18390: checking for header declaring getopt variables" >&5 echo $ECHO_N "checking for header declaring getopt variables... $ECHO_C" >&6 if test "${cf_cv_getopt_header+set}" = set; then echo $ECHO_N "(cached) $ECHO_C" >&6 @@ -17596,51 +18396,51 @@ else cf_cv_getopt_header=none for cf_header in stdio.h stdlib.h unistd.h getopt.h do -cat >conftest.$ac_ext <<_ACEOF -#line 17600 "configure" +cat >"conftest.$ac_ext" <<_ACEOF +#line 18400 "configure" #include "confdefs.h" #include <$cf_header> int main (void) { -int x = optind; char *y = optarg +int x = optind; char *y = optarg; (void)x; (void)y ; return 0; } _ACEOF -rm -f conftest.$ac_objext -if { (eval echo "$as_me:17613: \"$ac_compile\"") >&5 +rm -f "conftest.$ac_objext" +if { (eval echo "$as_me:18413: \"$ac_compile\"") >&5 (eval $ac_compile) 2>&5 ac_status=$? - echo "$as_me:17616: \$? = $ac_status" >&5 - (exit $ac_status); } && - { ac_try='test -s conftest.$ac_objext' - { (eval echo "$as_me:17619: \"$ac_try\"") >&5 + echo "$as_me:18416: \$? = $ac_status" >&5 + (exit "$ac_status"); } && + { ac_try='test -s "conftest.$ac_objext"' + { (eval echo "$as_me:18419: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? - echo "$as_me:17622: \$? = $ac_status" >&5 - (exit $ac_status); }; }; then + echo "$as_me:18422: \$? = $ac_status" >&5 + (exit "$ac_status"); }; }; then cf_cv_getopt_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:17634: result: $cf_cv_getopt_header" >&5 +echo "$as_me:18434: result: $cf_cv_getopt_header" >&5 echo "${ECHO_T}$cf_cv_getopt_header" >&6 -if test $cf_cv_getopt_header != none ; then +if test "$cf_cv_getopt_header" != none ; then cat >>confdefs.h <<\EOF #define HAVE_GETOPT_HEADER 1 EOF fi -if test $cf_cv_getopt_header = getopt.h ; then +if test "$cf_cv_getopt_header" = getopt.h ; then cat >>confdefs.h <<\EOF #define NEED_GETOPT_H 1 @@ -17649,6 +18449,7 @@ EOF fi for ac_func in \ +cfmakeraw \ getopt \ gettimeofday \ snprintf \ @@ -17658,13 +18459,13 @@ tsearch \ do as_ac_var=`echo "ac_cv_func_$ac_func" | $as_tr_sh` -echo "$as_me:17661: checking for $ac_func" >&5 +echo "$as_me:18462: checking for $ac_func" >&5 echo $ECHO_N "checking for $ac_func... $ECHO_C" >&6 if eval "test \"\${$as_ac_var+set}\" = set"; then echo $ECHO_N "(cached) $ECHO_C" >&6 else - cat >conftest.$ac_ext <<_ACEOF -#line 17667 "configure" + cat >"conftest.$ac_ext" <<_ACEOF +#line 18468 "configure" #include "confdefs.h" #define $ac_func autoconf_temporary #include /* least-intrusive standard header which defines gcc2 __stub macros */ @@ -17694,29 +18495,29 @@ main (void) return 0; } _ACEOF -rm -f conftest.$ac_objext conftest$ac_exeext -if { (eval echo "$as_me:17698: \"$ac_link\"") >&5 +rm -f "conftest.$ac_objext" "conftest$ac_exeext" +if { (eval echo "$as_me:18499: \"$ac_link\"") >&5 (eval $ac_link) 2>&5 ac_status=$? - echo "$as_me:17701: \$? = $ac_status" >&5 - (exit $ac_status); } && - { ac_try='test -s conftest$ac_exeext' - { (eval echo "$as_me:17704: \"$ac_try\"") >&5 + echo "$as_me:18502: \$? = $ac_status" >&5 + (exit "$ac_status"); } && + { ac_try='test -s "conftest$ac_exeext"' + { (eval echo "$as_me:18505: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? - echo "$as_me:17707: \$? = $ac_status" >&5 - (exit $ac_status); }; }; then + echo "$as_me:18508: \$? = $ac_status" >&5 + (exit "$ac_status"); }; }; then eval "$as_ac_var=yes" else echo "$as_me: failed program was:" >&5 -cat conftest.$ac_ext >&5 +cat "conftest.$ac_ext" >&5 eval "$as_ac_var=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:17717: result: `eval echo '${'$as_ac_var'}'`" >&5 -echo "${ECHO_T}`eval echo '${'$as_ac_var'}'`" >&6 -if test `eval echo '${'$as_ac_var'}'` = yes; then +echo "$as_me:18518: result: `eval echo '${'"$as_ac_var"'}'`" >&5 +echo "${ECHO_T}`eval echo '${'"$as_ac_var"'}'`" >&6 +if test "`eval echo '${'"$as_ac_var"'}'`" = yes; then cat >>confdefs.h <&5 +echo "$as_me:18529: checking if we can use termcap.h" >&5 echo $ECHO_N "checking if we can use termcap.h... $ECHO_C" >&6 if test "${cf_cv_have_termcap_h+set}" = set; then echo $ECHO_N "(cached) $ECHO_C" >&6 else - cat >conftest.$ac_ext <<_ACEOF -#line 17735 "configure" + cat >"conftest.$ac_ext" <<_ACEOF +#line 18536 "configure" #include "confdefs.h" #include @@ -17752,27 +18553,27 @@ return 0; return 0; } _ACEOF -rm -f conftest.$ac_objext -if { (eval echo "$as_me:17756: \"$ac_compile\"") >&5 +rm -f "conftest.$ac_objext" +if { (eval echo "$as_me:18557: \"$ac_compile\"") >&5 (eval $ac_compile) 2>&5 ac_status=$? - echo "$as_me:17759: \$? = $ac_status" >&5 - (exit $ac_status); } && - { ac_try='test -s conftest.$ac_objext' - { (eval echo "$as_me:17762: \"$ac_try\"") >&5 + echo "$as_me:18560: \$? = $ac_status" >&5 + (exit "$ac_status"); } && + { ac_try='test -s "conftest.$ac_objext"' + { (eval echo "$as_me:18563: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? - echo "$as_me:17765: \$? = $ac_status" >&5 - (exit $ac_status); }; }; then + echo "$as_me:18566: \$? = $ac_status" >&5 + (exit "$ac_status"); }; }; then cf_cv_have_termcap_h=yes else echo "$as_me: failed program was:" >&5 -cat conftest.$ac_ext >&5 +cat "conftest.$ac_ext" >&5 cf_cv_have_termcap_h=no fi -rm -f conftest.$ac_objext conftest.$ac_ext +rm -f "conftest.$ac_objext" "conftest.$ac_ext" fi -echo "$as_me:17775: result: $cf_cv_have_termcap_h" >&5 +echo "$as_me:18576: result: $cf_cv_have_termcap_h" >&5 echo "${ECHO_T}$cf_cv_have_termcap_h" >&6 if test "x$cf_cv_have_termcap_h" = xyes then @@ -17782,14 +18583,14 @@ cat >>confdefs.h <<\EOF EOF else -echo "$as_me:17785: checking if we can use ncurses/termcap.h" >&5 +echo "$as_me:18586: checking if we can use ncurses/termcap.h" >&5 echo $ECHO_N "checking if we can use ncurses/termcap.h... $ECHO_C" >&6 if test "${cf_cv_have_ncurses_termcap_h+set}" = set; then echo $ECHO_N "(cached) $ECHO_C" >&6 else - cat >conftest.$ac_ext <<_ACEOF -#line 17792 "configure" + cat >"conftest.$ac_ext" <<_ACEOF +#line 18593 "configure" #include "confdefs.h" #include @@ -17809,27 +18610,27 @@ return 0; return 0; } _ACEOF -rm -f conftest.$ac_objext -if { (eval echo "$as_me:17813: \"$ac_compile\"") >&5 +rm -f "conftest.$ac_objext" +if { (eval echo "$as_me:18614: \"$ac_compile\"") >&5 (eval $ac_compile) 2>&5 ac_status=$? - echo "$as_me:17816: \$? = $ac_status" >&5 - (exit $ac_status); } && - { ac_try='test -s conftest.$ac_objext' - { (eval echo "$as_me:17819: \"$ac_try\"") >&5 + echo "$as_me:18617: \$? = $ac_status" >&5 + (exit "$ac_status"); } && + { ac_try='test -s "conftest.$ac_objext"' + { (eval echo "$as_me:18620: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? - echo "$as_me:17822: \$? = $ac_status" >&5 - (exit $ac_status); }; }; then + echo "$as_me:18623: \$? = $ac_status" >&5 + (exit "$ac_status"); }; }; then cf_cv_have_ncurses_termcap_h=yes else echo "$as_me: failed program was:" >&5 -cat conftest.$ac_ext >&5 +cat "conftest.$ac_ext" >&5 cf_cv_have_ncurses_termcap_h=no fi -rm -f conftest.$ac_objext conftest.$ac_ext +rm -f "conftest.$ac_objext" "conftest.$ac_ext" fi -echo "$as_me:17832: result: $cf_cv_have_ncurses_termcap_h" >&5 +echo "$as_me:18633: result: $cf_cv_have_ncurses_termcap_h" >&5 echo "${ECHO_T}$cf_cv_have_ncurses_termcap_h" >&6 test "x$cf_cv_have_ncurses_termcap_h" = xyes && cat >>confdefs.h <<\EOF @@ -17839,7 +18640,7 @@ EOF fi if test "x$ac_cv_func_getopt" = xno; then - { { echo "$as_me:17842: error: getopt is required for building programs" >&5 + { { echo "$as_me:18643: error: getopt is required for building programs" >&5 echo "$as_me: error: getopt is required for building programs" >&2;} { (exit 1); exit 1; }; } fi @@ -17858,13 +18659,13 @@ wcstombs \ do as_ac_var=`echo "ac_cv_func_$ac_func" | $as_tr_sh` -echo "$as_me:17861: checking for $ac_func" >&5 +echo "$as_me:18662: checking for $ac_func" >&5 echo $ECHO_N "checking for $ac_func... $ECHO_C" >&6 if eval "test \"\${$as_ac_var+set}\" = set"; then echo $ECHO_N "(cached) $ECHO_C" >&6 else - cat >conftest.$ac_ext <<_ACEOF -#line 17867 "configure" + cat >"conftest.$ac_ext" <<_ACEOF +#line 18668 "configure" #include "confdefs.h" #define $ac_func autoconf_temporary #include /* least-intrusive standard header which defines gcc2 __stub macros */ @@ -17894,29 +18695,29 @@ main (void) return 0; } _ACEOF -rm -f conftest.$ac_objext conftest$ac_exeext -if { (eval echo "$as_me:17898: \"$ac_link\"") >&5 +rm -f "conftest.$ac_objext" "conftest$ac_exeext" +if { (eval echo "$as_me:18699: \"$ac_link\"") >&5 (eval $ac_link) 2>&5 ac_status=$? - echo "$as_me:17901: \$? = $ac_status" >&5 - (exit $ac_status); } && - { ac_try='test -s conftest$ac_exeext' - { (eval echo "$as_me:17904: \"$ac_try\"") >&5 + echo "$as_me:18702: \$? = $ac_status" >&5 + (exit "$ac_status"); } && + { ac_try='test -s "conftest$ac_exeext"' + { (eval echo "$as_me:18705: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? - echo "$as_me:17907: \$? = $ac_status" >&5 - (exit $ac_status); }; }; then + echo "$as_me:18708: \$? = $ac_status" >&5 + (exit "$ac_status"); }; }; then eval "$as_ac_var=yes" else echo "$as_me: failed program was:" >&5 -cat conftest.$ac_ext >&5 +cat "conftest.$ac_ext" >&5 eval "$as_ac_var=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:17917: result: `eval echo '${'$as_ac_var'}'`" >&5 -echo "${ECHO_T}`eval echo '${'$as_ac_var'}'`" >&6 -if test `eval echo '${'$as_ac_var'}'` = yes; then +echo "$as_me:18718: result: `eval echo '${'"$as_ac_var"'}'`" >&5 +echo "${ECHO_T}`eval echo '${'"$as_ac_var"'}'`" >&6 +if test "`eval echo '${'"$as_ac_var"'}'`" = yes; then cat >>confdefs.h <&5 +echo "$as_me:18730: checking definition to turn on extended curses functions" >&5 echo $ECHO_N "checking definition to turn on extended curses functions... $ECHO_C" >&6 if test "${cf_cv_need_xopen_extension+set}" = set; then echo $ECHO_N "(cached) $ECHO_C" >&6 else cf_cv_need_xopen_extension=unknown -cat >conftest.$ac_ext <<_ACEOF -#line 17937 "configure" +cat >"conftest.$ac_ext" <<_ACEOF +#line 18738 "configure" #include "confdefs.h" #include @@ -17948,15 +18749,14 @@ main (void) make an error #endif #endif -#ifdef NCURSES_VERSION +#ifdef NCURSES_WIDECHAR +make an error /* prefer to fall-through on the second checks */ +#endif cchar_t check; int check2 = curs_set((int)sizeof(check)); -#endif long x = winnstr(stdscr, "", 0); int x1, y1; -#ifdef NCURSES_VERSION (void)check2; -#endif getbegyx(stdscr, y1, x1); (void)x; (void)y1; @@ -17966,27 +18766,27 @@ main (void) return 0; } _ACEOF -rm -f conftest.$ac_objext conftest$ac_exeext -if { (eval echo "$as_me:17970: \"$ac_link\"") >&5 +rm -f "conftest.$ac_objext" "conftest$ac_exeext" +if { (eval echo "$as_me:18770: \"$ac_link\"") >&5 (eval $ac_link) 2>&5 ac_status=$? - echo "$as_me:17973: \$? = $ac_status" >&5 - (exit $ac_status); } && - { ac_try='test -s conftest$ac_exeext' - { (eval echo "$as_me:17976: \"$ac_try\"") >&5 + echo "$as_me:18773: \$? = $ac_status" >&5 + (exit "$ac_status"); } && + { ac_try='test -s "conftest$ac_exeext"' + { (eval echo "$as_me:18776: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? - echo "$as_me:17979: \$? = $ac_status" >&5 - (exit $ac_status); }; }; then + echo "$as_me:18779: \$? = $ac_status" >&5 + (exit "$ac_status"); }; }; then cf_cv_need_xopen_extension=none else echo "$as_me: failed program was:" >&5 -cat conftest.$ac_ext >&5 +cat "conftest.$ac_ext" >&5 for cf_try_xopen_extension in _XOPEN_SOURCE_EXTENDED NCURSES_WIDECHAR do - cat >conftest.$ac_ext <<_ACEOF -#line 17989 "configure" + cat >"conftest.$ac_ext" <<_ACEOF +#line 18789 "configure" #include "confdefs.h" #define $cf_try_xopen_extension 1 @@ -17996,16 +18796,12 @@ int main (void) { -#ifdef NCURSES_VERSION cchar_t check; int check2 = curs_set((int)sizeof(check)); -#endif long x = winnstr(stdscr, "", 0); int x1, y1; getbegyx(stdscr, y1, x1); -#ifdef NCURSES_VERSION (void)check2; -#endif (void)x; (void)y1; (void)x1; @@ -18014,34 +18810,34 @@ main (void) return 0; } _ACEOF -rm -f conftest.$ac_objext conftest$ac_exeext -if { (eval echo "$as_me:18018: \"$ac_link\"") >&5 +rm -f "conftest.$ac_objext" "conftest$ac_exeext" +if { (eval echo "$as_me:18814: \"$ac_link\"") >&5 (eval $ac_link) 2>&5 ac_status=$? - echo "$as_me:18021: \$? = $ac_status" >&5 - (exit $ac_status); } && - { ac_try='test -s conftest$ac_exeext' - { (eval echo "$as_me:18024: \"$ac_try\"") >&5 + echo "$as_me:18817: \$? = $ac_status" >&5 + (exit "$ac_status"); } && + { ac_try='test -s "conftest$ac_exeext"' + { (eval echo "$as_me:18820: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? - echo "$as_me:18027: \$? = $ac_status" >&5 - (exit $ac_status); }; }; then + echo "$as_me:18823: \$? = $ac_status" >&5 + (exit "$ac_status"); }; }; then cf_cv_need_xopen_extension=$cf_try_xopen_extension; 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_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 -echo "$as_me:18041: result: $cf_cv_need_xopen_extension" >&5 +echo "$as_me:18837: result: $cf_cv_need_xopen_extension" >&5 echo "${ECHO_T}$cf_cv_need_xopen_extension" >&6 -case $cf_cv_need_xopen_extension in +case "$cf_cv_need_xopen_extension" in (*_*) test -n "$CPPFLAGS" && CPPFLAGS="$CPPFLAGS " @@ -18050,7 +18846,7 @@ case $cf_cv_need_xopen_extension in ;; esac -echo "$as_me:18053: checking for term.h" >&5 +echo "$as_me:18849: checking for term.h" >&5 echo $ECHO_N "checking for term.h... $ECHO_C" >&6 if test "${cf_cv_term_header+set}" = set; then echo $ECHO_N "(cached) $ECHO_C" >&6 @@ -18061,17 +18857,17 @@ else cf_header_list="term.h ncurses/term.h ncursesw/term.h" -case ${cf_cv_ncurses_header:-curses.h} in +case "${cf_cv_ncurses_header:-curses.h}" in (*/*) - cf_header_item=`echo ${cf_cv_ncurses_header:-curses.h} | sed -e 's%\..*%%' -e 's%/.*%/%'`term.h + cf_header_item=`echo "${cf_cv_ncurses_header:-curses.h}" | sed -e 's%\..*%%' -e 's%/.*%/%'`term.h cf_header_list="$cf_header_item $cf_header_list" ;; esac for cf_header in $cf_header_list do - cat >conftest.$ac_ext <<_ACEOF -#line 18074 "configure" + cat >"conftest.$ac_ext" <<_ACEOF +#line 18870 "configure" #include "confdefs.h" #include <${cf_cv_ncurses_header:-curses.h}> @@ -18084,36 +18880,36 @@ WINDOW *x; (void)x return 0; } _ACEOF -rm -f conftest.$ac_objext -if { (eval echo "$as_me:18088: \"$ac_compile\"") >&5 +rm -f "conftest.$ac_objext" +if { (eval echo "$as_me:18884: \"$ac_compile\"") >&5 (eval $ac_compile) 2>&5 ac_status=$? - echo "$as_me:18091: \$? = $ac_status" >&5 - (exit $ac_status); } && - { ac_try='test -s conftest.$ac_objext' - { (eval echo "$as_me:18094: \"$ac_try\"") >&5 + echo "$as_me:18887: \$? = $ac_status" >&5 + (exit "$ac_status"); } && + { ac_try='test -s "conftest.$ac_objext"' + { (eval echo "$as_me:18890: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? - echo "$as_me:18097: \$? = $ac_status" >&5 - (exit $ac_status); }; }; then + echo "$as_me:18893: \$? = $ac_status" >&5 + (exit "$ac_status"); }; }; then cf_cv_term_header=$cf_header break else echo "$as_me: failed program was:" >&5 -cat conftest.$ac_ext >&5 +cat "conftest.$ac_ext" >&5 cf_cv_term_header=no fi -rm -f conftest.$ac_objext conftest.$ac_ext +rm -f "conftest.$ac_objext" "conftest.$ac_ext" done -case $cf_cv_term_header in +case "$cf_cv_term_header" in (no) # If curses is ncurses, some packagers still mess it up by trying to make # us use GNU termcap. This handles the most common case. for cf_header in ncurses/term.h ncursesw/term.h do - cat >conftest.$ac_ext <<_ACEOF -#line 18116 "configure" + cat >"conftest.$ac_ext" <<_ACEOF +#line 18912 "configure" #include "confdefs.h" #include <${cf_cv_ncurses_header:-curses.h}> @@ -18130,35 +18926,35 @@ WINDOW *x; (void)x return 0; } _ACEOF -rm -f conftest.$ac_objext -if { (eval echo "$as_me:18134: \"$ac_compile\"") >&5 +rm -f "conftest.$ac_objext" +if { (eval echo "$as_me:18930: \"$ac_compile\"") >&5 (eval $ac_compile) 2>&5 ac_status=$? - echo "$as_me:18137: \$? = $ac_status" >&5 - (exit $ac_status); } && - { ac_try='test -s conftest.$ac_objext' - { (eval echo "$as_me:18140: \"$ac_try\"") >&5 + echo "$as_me:18933: \$? = $ac_status" >&5 + (exit "$ac_status"); } && + { ac_try='test -s "conftest.$ac_objext"' + { (eval echo "$as_me:18936: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? - echo "$as_me:18143: \$? = $ac_status" >&5 - (exit $ac_status); }; }; then + echo "$as_me:18939: \$? = $ac_status" >&5 + (exit "$ac_status"); }; }; then cf_cv_term_header=$cf_header break else echo "$as_me: failed program was:" >&5 -cat conftest.$ac_ext >&5 +cat "conftest.$ac_ext" >&5 cf_cv_term_header=no fi -rm -f conftest.$ac_objext conftest.$ac_ext +rm -f "conftest.$ac_objext" "conftest.$ac_ext" done ;; esac fi -echo "$as_me:18158: result: $cf_cv_term_header" >&5 +echo "$as_me:18954: result: $cf_cv_term_header" >&5 echo "${ECHO_T}$cf_cv_term_header" >&6 -case $cf_cv_term_header in +case "$cf_cv_term_header" in (term.h) cat >>confdefs.h <<\EOF @@ -18182,7 +18978,7 @@ EOF ;; esac -echo "$as_me:18185: checking for unctrl.h" >&5 +echo "$as_me:18981: checking for unctrl.h" >&5 echo $ECHO_N "checking for unctrl.h... $ECHO_C" >&6 if test "${cf_cv_unctrl_header+set}" = set; then echo $ECHO_N "(cached) $ECHO_C" >&6 @@ -18193,17 +18989,17 @@ else cf_header_list="unctrl.h ncurses/unctrl.h ncursesw/unctrl.h" -case ${cf_cv_ncurses_header:-curses.h} in +case "${cf_cv_ncurses_header:-curses.h}" in (*/*) - cf_header_item=`echo ${cf_cv_ncurses_header:-curses.h} | sed -e 's%\..*%%' -e 's%/.*%/%'`unctrl.h + cf_header_item=`echo "${cf_cv_ncurses_header:-curses.h}" | sed -e 's%\..*%%' -e 's%/.*%/%'`unctrl.h cf_header_list="$cf_header_item $cf_header_list" ;; esac for cf_header in $cf_header_list do - cat >conftest.$ac_ext <<_ACEOF -#line 18206 "configure" + cat >"conftest.$ac_ext" <<_ACEOF +#line 19002 "configure" #include "confdefs.h" #include <${cf_cv_ncurses_header:-curses.h}> @@ -18216,40 +19012,40 @@ WINDOW *x; (void)x return 0; } _ACEOF -rm -f conftest.$ac_objext -if { (eval echo "$as_me:18220: \"$ac_compile\"") >&5 +rm -f "conftest.$ac_objext" +if { (eval echo "$as_me:19016: \"$ac_compile\"") >&5 (eval $ac_compile) 2>&5 ac_status=$? - echo "$as_me:18223: \$? = $ac_status" >&5 - (exit $ac_status); } && - { ac_try='test -s conftest.$ac_objext' - { (eval echo "$as_me:18226: \"$ac_try\"") >&5 + echo "$as_me:19019: \$? = $ac_status" >&5 + (exit "$ac_status"); } && + { ac_try='test -s "conftest.$ac_objext"' + { (eval echo "$as_me:19022: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? - echo "$as_me:18229: \$? = $ac_status" >&5 - (exit $ac_status); }; }; then + echo "$as_me:19025: \$? = $ac_status" >&5 + (exit "$ac_status"); }; }; then cf_cv_unctrl_header=$cf_header break else echo "$as_me: failed program was:" >&5 -cat conftest.$ac_ext >&5 +cat "conftest.$ac_ext" >&5 cf_cv_unctrl_header=no fi -rm -f conftest.$ac_objext conftest.$ac_ext +rm -f "conftest.$ac_objext" "conftest.$ac_ext" done fi -echo "$as_me:18242: result: $cf_cv_unctrl_header" >&5 +echo "$as_me:19038: result: $cf_cv_unctrl_header" >&5 echo "${ECHO_T}$cf_cv_unctrl_header" >&6 -case $cf_cv_unctrl_header in +case "$cf_cv_unctrl_header" in (no) - { echo "$as_me:18247: WARNING: unctrl.h header not found" >&5 + { echo "$as_me:19043: WARNING: unctrl.h header not found" >&5 echo "$as_me: WARNING: unctrl.h header not found" >&2;} ;; esac -case $cf_cv_unctrl_header in +case "$cf_cv_unctrl_header" in (unctrl.h) cat >>confdefs.h <<\EOF @@ -18280,6 +19076,7 @@ chgat \ color_content \ color_set \ copywin \ +curses_trace \ delscreen \ dupwin \ exit_curses \ @@ -18316,6 +19113,7 @@ tigetnum \ tigetstr \ tputs_sp \ typeahead \ +unget_wch \ use_default_colors \ use_env \ use_extended_names \ @@ -18336,10 +19134,10 @@ do cf_tr_func=`echo "$cf_func" | sed y%abcdefghijklmnopqrstuvwxyz./-%ABCDEFGHIJKLMNOPQRSTUVWXYZ___%` - echo "$as_me:18339: checking for ${cf_func}" >&5 + echo "$as_me:19137: checking for ${cf_func}" >&5 echo $ECHO_N "checking for ${cf_func}... $ECHO_C" >&6 -echo "${as_me:-configure}:18342: testing ${cf_func} ..." 1>&5 +echo "${as_me:-configure}:19140: testing ${cf_func} ..." 1>&5 if eval "test \"\${cf_cv_func_$cf_func+set}\" = set"; then echo $ECHO_N "(cached) $ECHO_C" >&6 @@ -18347,8 +19145,8 @@ else eval cf_result='$ac_cv_func_'$cf_func if test ".$cf_result" != ".no"; then - cat >conftest.$ac_ext <<_ACEOF -#line 18351 "configure" + cat >"conftest.$ac_ext" <<_ACEOF +#line 19149 "configure" #include "confdefs.h" #ifdef HAVE_XCURSES @@ -18371,7 +19169,7 @@ main (void) #ifndef ${cf_func} long foo = (long)(&${cf_func}); -fprintf(stderr, "testing linkage of $cf_func:%p\n", (void *)foo); +fprintf(stderr, "testing linkage of $cf_func:%p\\n", (void *)foo); if (foo + 1234L > 5678L) ${cf_cv_main_return:-return}(foo != 0); #endif @@ -18380,35 +19178,35 @@ if (foo + 1234L > 5678L) return 0; } _ACEOF -rm -f conftest.$ac_objext conftest$ac_exeext -if { (eval echo "$as_me:18384: \"$ac_link\"") >&5 +rm -f "conftest.$ac_objext" "conftest$ac_exeext" +if { (eval echo "$as_me:19182: \"$ac_link\"") >&5 (eval $ac_link) 2>&5 ac_status=$? - echo "$as_me:18387: \$? = $ac_status" >&5 - (exit $ac_status); } && - { ac_try='test -s conftest$ac_exeext' - { (eval echo "$as_me:18390: \"$ac_try\"") >&5 + echo "$as_me:19185: \$? = $ac_status" >&5 + (exit "$ac_status"); } && + { ac_try='test -s "conftest$ac_exeext"' + { (eval echo "$as_me:19188: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? - echo "$as_me:18393: \$? = $ac_status" >&5 - (exit $ac_status); }; }; then + echo "$as_me:19191: \$? = $ac_status" >&5 + (exit "$ac_status"); }; }; then cf_result=yes else echo "$as_me: failed program was:" >&5 -cat conftest.$ac_ext >&5 +cat "conftest.$ac_ext" >&5 cf_result=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 - eval 'cf_cv_func_'$cf_func'=$cf_result' + eval 'cf_cv_func_'$cf_func'="$cf_result"' fi # use the computed/retrieved cache-value: eval 'cf_result=$cf_cv_func_'$cf_func - echo "$as_me:18409: result: $cf_result" >&5 + echo "$as_me:19207: result: $cf_result" >&5 echo "${ECHO_T}$cf_result" >&6 - if test $cf_result != no; then + if test "$cf_result" != no; then cat >>confdefs.h <&5 + echo "$as_me:19222: checking for ${cf_func}" >&5 echo $ECHO_N "checking for ${cf_func}... $ECHO_C" >&6 -echo "${as_me:-configure}:18427: testing ${cf_func} ..." 1>&5 +echo "${as_me:-configure}:19225: testing ${cf_func} ..." 1>&5 if eval "test \"\${cf_cv_func_$cf_func+set}\" = set"; then echo $ECHO_N "(cached) $ECHO_C" >&6 @@ -18432,8 +19230,8 @@ else eval cf_result='$ac_cv_func_'$cf_func if test ".$cf_result" != ".no"; then - cat >conftest.$ac_ext <<_ACEOF -#line 18436 "configure" + cat >"conftest.$ac_ext" <<_ACEOF +#line 19234 "configure" #include "confdefs.h" #ifdef HAVE_XCURSES @@ -18456,7 +19254,7 @@ main (void) #ifndef ${cf_func} long foo = (long)(&${cf_func}); -fprintf(stderr, "testing linkage of $cf_func:%p\n", (void *)foo); +fprintf(stderr, "testing linkage of $cf_func:%p\\n", (void *)foo); if (foo + 1234L > 5678L) ${cf_cv_main_return:-return}(foo != 0); #endif @@ -18465,35 +19263,35 @@ if (foo + 1234L > 5678L) return 0; } _ACEOF -rm -f conftest.$ac_objext conftest$ac_exeext -if { (eval echo "$as_me:18469: \"$ac_link\"") >&5 +rm -f "conftest.$ac_objext" "conftest$ac_exeext" +if { (eval echo "$as_me:19267: \"$ac_link\"") >&5 (eval $ac_link) 2>&5 ac_status=$? - echo "$as_me:18472: \$? = $ac_status" >&5 - (exit $ac_status); } && - { ac_try='test -s conftest$ac_exeext' - { (eval echo "$as_me:18475: \"$ac_try\"") >&5 + echo "$as_me:19270: \$? = $ac_status" >&5 + (exit "$ac_status"); } && + { ac_try='test -s "conftest$ac_exeext"' + { (eval echo "$as_me:19273: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? - echo "$as_me:18478: \$? = $ac_status" >&5 - (exit $ac_status); }; }; then + echo "$as_me:19276: \$? = $ac_status" >&5 + (exit "$ac_status"); }; }; then cf_result=yes else echo "$as_me: failed program was:" >&5 -cat conftest.$ac_ext >&5 +cat "conftest.$ac_ext" >&5 cf_result=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 - eval 'cf_cv_func_'$cf_func'=$cf_result' + eval 'cf_cv_func_'$cf_func'="$cf_result"' fi # use the computed/retrieved cache-value: eval 'cf_result=$cf_cv_func_'$cf_func - echo "$as_me:18494: result: $cf_result" >&5 + echo "$as_me:19292: result: $cf_result" >&5 echo "${ECHO_T}$cf_result" >&6 - if test $cf_result != no; then + if test "$cf_result" != no; then cat >>confdefs.h <conftest.$ac_ext <<_ACEOF -#line 18518 "configure" + cat >"conftest.$ac_ext" <<_ACEOF +#line 19316 "configure" #include "confdefs.h" #include <${cf_cv_ncurses_header:-curses.h}> @@ -18534,22 +19332,22 @@ main (void) return 0; } _ACEOF -rm -f conftest.$ac_objext -if { (eval echo "$as_me:18538: \"$ac_compile\"") >&5 +rm -f "conftest.$ac_objext" +if { (eval echo "$as_me:19336: \"$ac_compile\"") >&5 (eval $ac_compile) 2>&5 ac_status=$? - echo "$as_me:18541: \$? = $ac_status" >&5 - (exit $ac_status); } && - { ac_try='test -s conftest.$ac_objext' - { (eval echo "$as_me:18544: \"$ac_try\"") >&5 + echo "$as_me:19339: \$? = $ac_status" >&5 + (exit "$ac_status"); } && + { ac_try='test -s "conftest.$ac_objext"' + { (eval echo "$as_me:19342: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? - echo "$as_me:18547: \$? = $ac_status" >&5 - (exit $ac_status); }; }; then + echo "$as_me:19345: \$? = $ac_status" >&5 + (exit "$ac_status"); }; }; then test -n "$verbose" && echo " prototype $cf_ret func($cf_arg value)" 1>&6 -echo "${as_me:-configure}:18552: testing prototype $cf_ret func($cf_arg value) ..." 1>&5 +echo "${as_me:-configure}:19350: testing prototype $cf_ret func($cf_arg value) ..." 1>&5 cat >>confdefs.h <&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 - test $cf_done = yes && break + test "$cf_done" = yes && break done fi -echo "$as_me:18572: checking for ncurses extended functions" >&5 +echo "$as_me:19370: checking for ncurses extended functions" >&5 echo $ECHO_N "checking for ncurses extended functions... $ECHO_C" >&6 if test "${cf_cv_ncurses_ext_funcs+set}" = set; then echo $ECHO_N "(cached) $ECHO_C" >&6 else -cat >conftest.$ac_ext <<_ACEOF -#line 18579 "configure" +cat >"conftest.$ac_ext" <<_ACEOF +#line 19377 "configure" #include "confdefs.h" #include <${cf_cv_ncurses_header:-curses.h}> @@ -18590,25 +19388,25 @@ int x = NCURSES_EXT_FUNCS return 0; } _ACEOF -rm -f conftest.$ac_objext -if { (eval echo "$as_me:18594: \"$ac_compile\"") >&5 +rm -f "conftest.$ac_objext" +if { (eval echo "$as_me:19392: \"$ac_compile\"") >&5 (eval $ac_compile) 2>&5 ac_status=$? - echo "$as_me:18597: \$? = $ac_status" >&5 - (exit $ac_status); } && - { ac_try='test -s conftest.$ac_objext' - { (eval echo "$as_me:18600: \"$ac_try\"") >&5 + echo "$as_me:19395: \$? = $ac_status" >&5 + (exit "$ac_status"); } && + { ac_try='test -s "conftest.$ac_objext"' + { (eval echo "$as_me:19398: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? - echo "$as_me:18603: \$? = $ac_status" >&5 - (exit $ac_status); }; }; then + echo "$as_me:19401: \$? = $ac_status" >&5 + (exit "$ac_status"); }; }; then cf_cv_ncurses_ext_funcs=defined else echo "$as_me: failed program was:" >&5 -cat conftest.$ac_ext >&5 +cat "conftest.$ac_ext" >&5 -cat >conftest.$ac_ext <<_ACEOF -#line 18611 "configure" +cat >"conftest.$ac_ext" <<_ACEOF +#line 19409 "configure" #include "confdefs.h" #include <${cf_cv_ncurses_header:-curses.h}> @@ -18632,31 +19430,31 @@ main (void) return 0; } _ACEOF -rm -f conftest.$ac_objext conftest$ac_exeext -if { (eval echo "$as_me:18636: \"$ac_link\"") >&5 +rm -f "conftest.$ac_objext" "conftest$ac_exeext" +if { (eval echo "$as_me:19434: \"$ac_link\"") >&5 (eval $ac_link) 2>&5 ac_status=$? - echo "$as_me:18639: \$? = $ac_status" >&5 - (exit $ac_status); } && - { ac_try='test -s conftest$ac_exeext' - { (eval echo "$as_me:18642: \"$ac_try\"") >&5 + echo "$as_me:19437: \$? = $ac_status" >&5 + (exit "$ac_status"); } && + { ac_try='test -s "conftest$ac_exeext"' + { (eval echo "$as_me:19440: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? - echo "$as_me:18645: \$? = $ac_status" >&5 - (exit $ac_status); }; }; then + echo "$as_me:19443: \$? = $ac_status" >&5 + (exit "$ac_status"); }; }; then cf_cv_ncurses_ext_funcs=yes else echo "$as_me: failed program was:" >&5 -cat conftest.$ac_ext >&5 +cat "conftest.$ac_ext" >&5 cf_cv_ncurses_ext_funcs=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 -rm -f conftest.$ac_objext conftest.$ac_ext +rm -f "conftest.$ac_objext" "conftest.$ac_ext" fi -echo "$as_me:18659: result: $cf_cv_ncurses_ext_funcs" >&5 +echo "$as_me:19457: result: $cf_cv_ncurses_ext_funcs" >&5 echo "${ECHO_T}$cf_cv_ncurses_ext_funcs" >&6 test "$cf_cv_ncurses_ext_funcs" = yes && cat >>confdefs.h <<\EOF @@ -18670,11 +19468,11 @@ then if test -n "$cf_cv_ncurses_version" && test "x$cf_cv_ncurses_version" != xno then cf_define_xpg5=no - echo "$as_me:18673: checking if _XPG5 should be defined to enable wide-characters" >&5 + echo "$as_me:19471: checking if _XPG5 should be defined to enable wide-characters" >&5 echo $ECHO_N "checking if _XPG5 should be defined to enable wide-characters... $ECHO_C" >&6 - cat >conftest.$ac_ext <<_ACEOF -#line 18677 "configure" + cat >"conftest.$ac_ext" <<_ACEOF +#line 19475 "configure" #include "confdefs.h" #include <${cf_cv_ncurses_header:-curses.h}> @@ -18686,26 +19484,26 @@ int x = _XPG5 return 0; } _ACEOF -rm -f conftest.$ac_objext -if { (eval echo "$as_me:18690: \"$ac_compile\"") >&5 +rm -f "conftest.$ac_objext" +if { (eval echo "$as_me:19488: \"$ac_compile\"") >&5 (eval $ac_compile) 2>&5 ac_status=$? - echo "$as_me:18693: \$? = $ac_status" >&5 - (exit $ac_status); } && - { ac_try='test -s conftest.$ac_objext' - { (eval echo "$as_me:18696: \"$ac_try\"") >&5 + echo "$as_me:19491: \$? = $ac_status" >&5 + (exit "$ac_status"); } && + { ac_try='test -s "conftest.$ac_objext"' + { (eval echo "$as_me:19494: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? - echo "$as_me:18699: \$? = $ac_status" >&5 - (exit $ac_status); }; }; then + echo "$as_me:19497: \$? = $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_save_cppflags="$CPPFLAGS" CPPFLAGS="$CPPFLAGS -D_XPG5" - cat >conftest.$ac_ext <<_ACEOF -#line 18708 "configure" + cat >"conftest.$ac_ext" <<_ACEOF +#line 19506 "configure" #include "confdefs.h" #include <${cf_cv_ncurses_header:-curses.h}> @@ -18717,28 +19515,28 @@ int x = _XPG5 return 0; } _ACEOF -rm -f conftest.$ac_objext -if { (eval echo "$as_me:18721: \"$ac_compile\"") >&5 +rm -f "conftest.$ac_objext" +if { (eval echo "$as_me:19519: \"$ac_compile\"") >&5 (eval $ac_compile) 2>&5 ac_status=$? - echo "$as_me:18724: \$? = $ac_status" >&5 - (exit $ac_status); } && - { ac_try='test -s conftest.$ac_objext' - { (eval echo "$as_me:18727: \"$ac_try\"") >&5 + echo "$as_me:19522: \$? = $ac_status" >&5 + (exit "$ac_status"); } && + { ac_try='test -s "conftest.$ac_objext"' + { (eval echo "$as_me:19525: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? - echo "$as_me:18730: \$? = $ac_status" >&5 - (exit $ac_status); }; }; then + echo "$as_me:19528: \$? = $ac_status" >&5 + (exit "$ac_status"); }; }; then cf_define_xpg5=yes 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" CPPFLAGS="$cf_save_cppflags" fi -rm -f conftest.$ac_objext conftest.$ac_ext - echo "$as_me:18741: result: $cf_define_xpg5" >&5 +rm -f "conftest.$ac_objext" "conftest.$ac_ext" + echo "$as_me:19539: result: $cf_define_xpg5" >&5 echo "${ECHO_T}$cf_define_xpg5" >&6 if test "$cf_define_xpg5" = yes @@ -18747,14 +19545,14 @@ echo "${ECHO_T}$cf_define_xpg5" >&6 fi fi - echo "$as_me:18750: checking for wide-character functions" >&5 + echo "$as_me:19548: checking for wide-character functions" >&5 echo $ECHO_N "checking for wide-character functions... $ECHO_C" >&6 if test "${cf_cv_widechar_funcs+set}" = set; then echo $ECHO_N "(cached) $ECHO_C" >&6 else - cat >conftest.$ac_ext <<_ACEOF -#line 18757 "configure" + cat >"conftest.$ac_ext" <<_ACEOF +#line 19555 "configure" #include "confdefs.h" #include <${cf_cv_ncurses_header:-curses.h}> @@ -18770,28 +19568,28 @@ main (void) return 0; } _ACEOF -rm -f conftest.$ac_objext conftest$ac_exeext -if { (eval echo "$as_me:18774: \"$ac_link\"") >&5 +rm -f "conftest.$ac_objext" "conftest$ac_exeext" +if { (eval echo "$as_me:19572: \"$ac_link\"") >&5 (eval $ac_link) 2>&5 ac_status=$? - echo "$as_me:18777: \$? = $ac_status" >&5 - (exit $ac_status); } && - { ac_try='test -s conftest$ac_exeext' - { (eval echo "$as_me:18780: \"$ac_try\"") >&5 + echo "$as_me:19575: \$? = $ac_status" >&5 + (exit "$ac_status"); } && + { ac_try='test -s "conftest$ac_exeext"' + { (eval echo "$as_me:19578: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? - echo "$as_me:18783: \$? = $ac_status" >&5 - (exit $ac_status); }; }; then + echo "$as_me:19581: \$? = $ac_status" >&5 + (exit "$ac_status"); }; }; then cf_cv_widechar_funcs=yes else echo "$as_me: failed program was:" >&5 -cat conftest.$ac_ext >&5 +cat "conftest.$ac_ext" >&5 cf_cv_widechar_funcs=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:18794: result: $cf_cv_widechar_funcs" >&5 +echo "$as_me:19592: result: $cf_cv_widechar_funcs" >&5 echo "${ECHO_T}$cf_cv_widechar_funcs" >&6 if test "$cf_cv_widechar_funcs" != no ; then @@ -18812,14 +19610,14 @@ EOF fi -echo "$as_me:18815: checking if $cf_cv_screen library uses pthreads" >&5 +echo "$as_me:19613: checking if $cf_cv_screen library uses pthreads" >&5 echo $ECHO_N "checking if $cf_cv_screen library uses pthreads... $ECHO_C" >&6 if test "${cf_cv_use_pthreads+set}" = set; then echo $ECHO_N "(cached) $ECHO_C" >&6 else -cat >conftest.$ac_ext <<_ACEOF -#line 18822 "configure" +cat >"conftest.$ac_ext" <<_ACEOF +#line 19620 "configure" #include "confdefs.h" #include <${cf_cv_ncurses_header:-curses.h}> @@ -18836,42 +19634,42 @@ main (void) return 0; } _ACEOF -rm -f conftest.$ac_objext conftest$ac_exeext -if { (eval echo "$as_me:18840: \"$ac_link\"") >&5 +rm -f "conftest.$ac_objext" "conftest$ac_exeext" +if { (eval echo "$as_me:19638: \"$ac_link\"") >&5 (eval $ac_link) 2>&5 ac_status=$? - echo "$as_me:18843: \$? = $ac_status" >&5 - (exit $ac_status); } && - { ac_try='test -s conftest$ac_exeext' - { (eval echo "$as_me:18846: \"$ac_try\"") >&5 + echo "$as_me:19641: \$? = $ac_status" >&5 + (exit "$ac_status"); } && + { ac_try='test -s "conftest$ac_exeext"' + { (eval echo "$as_me:19644: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? - echo "$as_me:18849: \$? = $ac_status" >&5 - (exit $ac_status); }; }; then + echo "$as_me:19647: \$? = $ac_status" >&5 + (exit "$ac_status"); }; }; then cf_cv_use_pthreads=yes else echo "$as_me: failed program was:" >&5 -cat conftest.$ac_ext >&5 +cat "conftest.$ac_ext" >&5 cf_cv_use_pthreads=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:18860: result: $cf_cv_use_pthreads" >&5 +echo "$as_me:19658: result: $cf_cv_use_pthreads" >&5 echo "${ECHO_T}$cf_cv_use_pthreads" >&6 test $cf_cv_use_pthreads = yes && cat >>confdefs.h <<\EOF #define USE_PTHREADS 1 EOF -echo "$as_me:18867: checking if sys/time.h works with sys/select.h" >&5 +echo "$as_me:19665: checking if sys/time.h works with sys/select.h" >&5 echo $ECHO_N "checking if sys/time.h works with sys/select.h... $ECHO_C" >&6 if test "${cf_cv_sys_time_select+set}" = set; then echo $ECHO_N "(cached) $ECHO_C" >&6 else -cat >conftest.$ac_ext <<_ACEOF -#line 18874 "configure" +cat >"conftest.$ac_ext" <<_ACEOF +#line 19672 "configure" #include "confdefs.h" #include @@ -18890,29 +19688,29 @@ main (void) return 0; } _ACEOF -rm -f conftest.$ac_objext -if { (eval echo "$as_me:18894: \"$ac_compile\"") >&5 +rm -f "conftest.$ac_objext" +if { (eval echo "$as_me:19692: \"$ac_compile\"") >&5 (eval $ac_compile) 2>&5 ac_status=$? - echo "$as_me:18897: \$? = $ac_status" >&5 - (exit $ac_status); } && - { ac_try='test -s conftest.$ac_objext' - { (eval echo "$as_me:18900: \"$ac_try\"") >&5 + echo "$as_me:19695: \$? = $ac_status" >&5 + (exit "$ac_status"); } && + { ac_try='test -s "conftest.$ac_objext"' + { (eval echo "$as_me:19698: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? - echo "$as_me:18903: \$? = $ac_status" >&5 - (exit $ac_status); }; }; then + echo "$as_me:19701: \$? = $ac_status" >&5 + (exit "$ac_status"); }; }; then cf_cv_sys_time_select=yes else echo "$as_me: failed program was:" >&5 -cat conftest.$ac_ext >&5 +cat "conftest.$ac_ext" >&5 cf_cv_sys_time_select=no fi -rm -f conftest.$ac_objext conftest.$ac_ext +rm -f "conftest.$ac_objext" "conftest.$ac_ext" fi -echo "$as_me:18915: result: $cf_cv_sys_time_select" >&5 +echo "$as_me:19713: result: $cf_cv_sys_time_select" >&5 echo "${ECHO_T}$cf_cv_sys_time_select" >&6 test "$cf_cv_sys_time_select" = yes && cat >>confdefs.h <<\EOF @@ -18921,15 +19719,15 @@ EOF # special check for test/ditto.c -echo "$as_me:18924: checking for openpty in -lutil" >&5 +echo "$as_me:19722: checking for openpty in -lutil" >&5 echo $ECHO_N "checking for openpty in -lutil... $ECHO_C" >&6 if test "${ac_cv_lib_util_openpty+set}" = set; then echo $ECHO_N "(cached) $ECHO_C" >&6 else ac_check_lib_save_LIBS=$LIBS LIBS="-lutil $LIBS" -cat >conftest.$ac_ext <<_ACEOF -#line 18932 "configure" +cat >"conftest.$ac_ext" <<_ACEOF +#line 19730 "configure" #include "confdefs.h" /* Override any gcc2 internal prototype to avoid an error. */ @@ -18947,43 +19745,43 @@ openpty (); return 0; } _ACEOF -rm -f conftest.$ac_objext conftest$ac_exeext -if { (eval echo "$as_me:18951: \"$ac_link\"") >&5 +rm -f "conftest.$ac_objext" "conftest$ac_exeext" +if { (eval echo "$as_me:19749: \"$ac_link\"") >&5 (eval $ac_link) 2>&5 ac_status=$? - echo "$as_me:18954: \$? = $ac_status" >&5 - (exit $ac_status); } && - { ac_try='test -s conftest$ac_exeext' - { (eval echo "$as_me:18957: \"$ac_try\"") >&5 + echo "$as_me:19752: \$? = $ac_status" >&5 + (exit "$ac_status"); } && + { ac_try='test -s "conftest$ac_exeext"' + { (eval echo "$as_me:19755: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? - echo "$as_me:18960: \$? = $ac_status" >&5 - (exit $ac_status); }; }; then + echo "$as_me:19758: \$? = $ac_status" >&5 + (exit "$ac_status"); }; }; then ac_cv_lib_util_openpty=yes else echo "$as_me: failed program was:" >&5 -cat conftest.$ac_ext >&5 +cat "conftest.$ac_ext" >&5 ac_cv_lib_util_openpty=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:18971: result: $ac_cv_lib_util_openpty" >&5 +echo "$as_me:19769: result: $ac_cv_lib_util_openpty" >&5 echo "${ECHO_T}$ac_cv_lib_util_openpty" >&6 -if test $ac_cv_lib_util_openpty = yes; then +if test "$ac_cv_lib_util_openpty" = yes; then cf_cv_lib_util=yes else cf_cv_lib_util=no fi -echo "$as_me:18979: checking for openpty header" >&5 +echo "$as_me:19777: checking for openpty header" >&5 echo $ECHO_N "checking for openpty header... $ECHO_C" >&6 if test "${cf_cv_func_openpty+set}" = set; then echo $ECHO_N "(cached) $ECHO_C" >&6 else cf_save_LIBS="$LIBS" - test $cf_cv_lib_util = yes && { + test "$cf_cv_lib_util" = yes && { cf_add_libs="$LIBS" # reverse order cf_add_0lib= @@ -19002,8 +19800,8 @@ LIBS="$cf_add_libs" } for cf_header in pty.h libutil.h util.h do - cat >conftest.$ac_ext <<_ACEOF -#line 19006 "configure" + cat >"conftest.$ac_ext" <<_ACEOF +#line 19804 "configure" #include "confdefs.h" #include <$cf_header> @@ -19019,35 +19817,35 @@ main (void) return 0; } _ACEOF -rm -f conftest.$ac_objext conftest$ac_exeext -if { (eval echo "$as_me:19023: \"$ac_link\"") >&5 +rm -f "conftest.$ac_objext" "conftest$ac_exeext" +if { (eval echo "$as_me:19821: \"$ac_link\"") >&5 (eval $ac_link) 2>&5 ac_status=$? - echo "$as_me:19026: \$? = $ac_status" >&5 - (exit $ac_status); } && - { ac_try='test -s conftest$ac_exeext' - { (eval echo "$as_me:19029: \"$ac_try\"") >&5 + echo "$as_me:19824: \$? = $ac_status" >&5 + (exit "$ac_status"); } && + { ac_try='test -s "conftest$ac_exeext"' + { (eval echo "$as_me:19827: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? - echo "$as_me:19032: \$? = $ac_status" >&5 - (exit $ac_status); }; }; then + echo "$as_me:19830: \$? = $ac_status" >&5 + (exit "$ac_status"); }; }; then cf_cv_func_openpty=$cf_header break else echo "$as_me: failed program was:" >&5 -cat conftest.$ac_ext >&5 +cat "conftest.$ac_ext" >&5 cf_cv_func_openpty=no fi -rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext +rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext" done LIBS="$cf_save_LIBS" fi -echo "$as_me:19050: result: $cf_cv_func_openpty" >&5 +echo "$as_me:19848: result: $cf_cv_func_openpty" >&5 echo "${ECHO_T}$cf_cv_func_openpty" >&6 if test "$cf_cv_func_openpty" != no ; then @@ -19081,7 +19879,7 @@ TEST_LIBS="$cf_add_libs" fi fi -echo "$as_me:19084: checking for function curses_version" >&5 +echo "$as_me:19882: checking for function curses_version" >&5 echo $ECHO_N "checking for function curses_version... $ECHO_C" >&6 if test "${cf_cv_func_curses_version+set}" = set; then echo $ECHO_N "(cached) $ECHO_C" >&6 @@ -19090,51 +19888,54 @@ else if test "$cross_compiling" = yes; then cf_cv_func_curses_version=unknown else - cat >conftest.$ac_ext <<_ACEOF -#line 19094 "configure" + cat >"conftest.$ac_ext" <<_ACEOF +#line 19892 "configure" #include "confdefs.h" +$ac_includes_default + #include <${cf_cv_ncurses_header:-curses.h}> + int main(void) { char temp[1024]; - sprintf(temp, "%s\n", curses_version()); + sprintf(temp, "%.999s\\n", curses_version()); ${cf_cv_main_return:-return}(0); } _ACEOF -rm -f conftest$ac_exeext -if { (eval echo "$as_me:19107: \"$ac_link\"") >&5 +rm -f "conftest$ac_exeext" +if { (eval echo "$as_me:19908: \"$ac_link\"") >&5 (eval $ac_link) 2>&5 ac_status=$? - echo "$as_me:19110: \$? = $ac_status" >&5 - (exit $ac_status); } && { ac_try='./conftest$ac_exeext' - { (eval echo "$as_me:19112: \"$ac_try\"") >&5 + echo "$as_me:19911: \$? = $ac_status" >&5 + (exit "$ac_status"); } && { ac_try='"./conftest$ac_exeext"' + { (eval echo "$as_me:19913: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? - echo "$as_me:19115: \$? = $ac_status" >&5 - (exit $ac_status); }; }; then + echo "$as_me:19916: \$? = $ac_status" >&5 + (exit "$ac_status"); }; }; then cf_cv_func_curses_version=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_func_curses_version=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 rm -f core fi -echo "$as_me:19130: result: $cf_cv_func_curses_version" >&5 +echo "$as_me:19931: result: $cf_cv_func_curses_version" >&5 echo "${ECHO_T}$cf_cv_func_curses_version" >&6 test "$cf_cv_func_curses_version" = yes && cat >>confdefs.h <<\EOF #define HAVE_CURSES_VERSION 1 EOF -echo "$as_me:19137: checking for alternate character set array" >&5 +echo "$as_me:19938: checking for alternate character set array" >&5 echo $ECHO_N "checking for alternate character set array... $ECHO_C" >&6 if test "${cf_cv_curses_acs_map+set}" = set; then echo $ECHO_N "(cached) $ECHO_C" >&6 @@ -19143,8 +19944,8 @@ else cf_cv_curses_acs_map=unknown for name in acs_map _acs_map __acs_map ${NCURSES_WRAP_PREFIX}acs_map do -cat >conftest.$ac_ext <<_ACEOF -#line 19147 "configure" +cat >"conftest.$ac_ext" <<_ACEOF +#line 19948 "configure" #include "confdefs.h" #include <${cf_cv_ncurses_header:-curses.h}> @@ -19153,34 +19954,34 @@ int main (void) { -$name['k'] = ACS_PLUS +${name}['k'] = ACS_PLUS ; return 0; } _ACEOF -rm -f conftest.$ac_objext conftest$ac_exeext -if { (eval echo "$as_me:19163: \"$ac_link\"") >&5 +rm -f "conftest.$ac_objext" "conftest$ac_exeext" +if { (eval echo "$as_me:19964: \"$ac_link\"") >&5 (eval $ac_link) 2>&5 ac_status=$? - echo "$as_me:19166: \$? = $ac_status" >&5 - (exit $ac_status); } && - { ac_try='test -s conftest$ac_exeext' - { (eval echo "$as_me:19169: \"$ac_try\"") >&5 + echo "$as_me:19967: \$? = $ac_status" >&5 + (exit "$ac_status"); } && + { ac_try='test -s "conftest$ac_exeext"' + { (eval echo "$as_me:19970: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? - echo "$as_me:19172: \$? = $ac_status" >&5 - (exit $ac_status); }; }; then + echo "$as_me:19973: \$? = $ac_status" >&5 + (exit "$ac_status"); }; }; then cf_cv_curses_acs_map=$name; 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_exeext conftest.$ac_ext +rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext" done fi -echo "$as_me:19183: result: $cf_cv_curses_acs_map" >&5 +echo "$as_me:19984: result: $cf_cv_curses_acs_map" >&5 echo "${ECHO_T}$cf_cv_curses_acs_map" >&6 test "$cf_cv_curses_acs_map" != unknown && @@ -19190,7 +19991,7 @@ EOF if test "$cf_enable_widec" = yes; then -echo "$as_me:19193: checking for wide alternate character set array" >&5 +echo "$as_me:19994: checking for wide alternate character set array" >&5 echo $ECHO_N "checking for wide alternate character set array... $ECHO_C" >&6 if test "${cf_cv_curses_wacs_map+set}" = set; then echo $ECHO_N "(cached) $ECHO_C" >&6 @@ -19199,8 +20000,8 @@ else cf_cv_curses_wacs_map=unknown for name in wacs_map _wacs_map __wacs_map _nc_wacs _wacs_char do - cat >conftest.$ac_ext <<_ACEOF -#line 19203 "configure" + cat >"conftest.$ac_ext" <<_ACEOF +#line 20004 "configure" #include "confdefs.h" #ifndef _XOPEN_SOURCE_EXTENDED @@ -19210,33 +20011,33 @@ else int main (void) { -void *foo = &($name['k']); (void)foo +void *foo = &(${name}['k']); (void)foo ; return 0; } _ACEOF -rm -f conftest.$ac_objext conftest$ac_exeext -if { (eval echo "$as_me:19219: \"$ac_link\"") >&5 +rm -f "conftest.$ac_objext" "conftest$ac_exeext" +if { (eval echo "$as_me:20020: \"$ac_link\"") >&5 (eval $ac_link) 2>&5 ac_status=$? - echo "$as_me:19222: \$? = $ac_status" >&5 - (exit $ac_status); } && - { ac_try='test -s conftest$ac_exeext' - { (eval echo "$as_me:19225: \"$ac_try\"") >&5 + echo "$as_me:20023: \$? = $ac_status" >&5 + (exit "$ac_status"); } && + { ac_try='test -s "conftest$ac_exeext"' + { (eval echo "$as_me:20026: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? - echo "$as_me:19228: \$? = $ac_status" >&5 - (exit $ac_status); }; }; then + echo "$as_me:20029: \$? = $ac_status" >&5 + (exit "$ac_status"); }; }; then cf_cv_curses_wacs_map=$name 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_exeext conftest.$ac_ext +rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext" done fi -echo "$as_me:19239: result: $cf_cv_curses_wacs_map" >&5 +echo "$as_me:20040: result: $cf_cv_curses_wacs_map" >&5 echo "${ECHO_T}$cf_cv_curses_wacs_map" >&6 test "$cf_cv_curses_wacs_map" != unknown && @@ -19244,7 +20045,7 @@ cat >>confdefs.h <&5 +echo "$as_me:20048: checking for wide alternate character constants" >&5 echo $ECHO_N "checking for wide alternate character constants... $ECHO_C" >&6 if test "${cf_cv_curses_wacs_symbols+set}" = set; then echo $ECHO_N "(cached) $ECHO_C" >&6 @@ -19253,8 +20054,8 @@ else cf_cv_curses_wacs_symbols=no if test "$cf_cv_curses_wacs_map" != unknown then - cat >conftest.$ac_ext <<_ACEOF -#line 19257 "configure" + cat >"conftest.$ac_ext" <<_ACEOF +#line 20058 "configure" #include "confdefs.h" #ifndef _XOPEN_SOURCE_EXTENDED @@ -19265,32 +20066,32 @@ int main (void) { cchar_t *foo = WACS_PLUS; - $cf_cv_curses_wacs_map['k'] = *WACS_PLUS; (void)foo + ${cf_cv_curses_wacs_map}['k'] = *WACS_PLUS; (void)foo ; return 0; } _ACEOF -rm -f conftest.$ac_objext conftest$ac_exeext -if { (eval echo "$as_me:19274: \"$ac_link\"") >&5 +rm -f "conftest.$ac_objext" "conftest$ac_exeext" +if { (eval echo "$as_me:20075: \"$ac_link\"") >&5 (eval $ac_link) 2>&5 ac_status=$? - echo "$as_me:19277: \$? = $ac_status" >&5 - (exit $ac_status); } && - { ac_try='test -s conftest$ac_exeext' - { (eval echo "$as_me:19280: \"$ac_try\"") >&5 + echo "$as_me:20078: \$? = $ac_status" >&5 + (exit "$ac_status"); } && + { ac_try='test -s "conftest$ac_exeext"' + { (eval echo "$as_me:20081: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? - echo "$as_me:19283: \$? = $ac_status" >&5 - (exit $ac_status); }; }; then + echo "$as_me:20084: \$? = $ac_status" >&5 + (exit "$ac_status"); }; }; then cf_cv_curses_wacs_symbols=yes 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_exeext conftest.$ac_ext +rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext" else - cat >conftest.$ac_ext <<_ACEOF -#line 19293 "configure" + cat >"conftest.$ac_ext" <<_ACEOF +#line 20094 "configure" #include "confdefs.h" #ifndef _XOPEN_SOURCE_EXTENDED @@ -19305,28 +20106,28 @@ cchar_t *foo = WACS_PLUS; (void)foo return 0; } _ACEOF -rm -f conftest.$ac_objext conftest$ac_exeext -if { (eval echo "$as_me:19309: \"$ac_link\"") >&5 +rm -f "conftest.$ac_objext" "conftest$ac_exeext" +if { (eval echo "$as_me:20110: \"$ac_link\"") >&5 (eval $ac_link) 2>&5 ac_status=$? - echo "$as_me:19312: \$? = $ac_status" >&5 - (exit $ac_status); } && - { ac_try='test -s conftest$ac_exeext' - { (eval echo "$as_me:19315: \"$ac_try\"") >&5 + echo "$as_me:20113: \$? = $ac_status" >&5 + (exit "$ac_status"); } && + { ac_try='test -s "conftest$ac_exeext"' + { (eval echo "$as_me:20116: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? - echo "$as_me:19318: \$? = $ac_status" >&5 - (exit $ac_status); }; }; then + echo "$as_me:20119: \$? = $ac_status" >&5 + (exit "$ac_status"); }; }; then cf_cv_curses_wacs_symbols=yes 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_exeext conftest.$ac_ext +rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext" fi fi -echo "$as_me:19329: result: $cf_cv_curses_wacs_symbols" >&5 +echo "$as_me:20130: result: $cf_cv_curses_wacs_symbols" >&5 echo "${ECHO_T}$cf_cv_curses_wacs_symbols" >&6 test "$cf_cv_curses_wacs_symbols" != no && @@ -19336,10 +20137,10 @@ EOF fi -echo "$as_me:19339: checking for type attr_t in ${cf_cv_ncurses_header:-curses.h}" >&5 +echo "$as_me:20140: checking for type attr_t in ${cf_cv_ncurses_header:-curses.h}" >&5 echo $ECHO_N "checking for type attr_t in ${cf_cv_ncurses_header:-curses.h}... $ECHO_C" >&6 -cat >conftest.$ac_ext <<_ACEOF -#line 19342 "configure" +cat >"conftest.$ac_ext" <<_ACEOF +#line 20143 "configure" #include "confdefs.h" #ifndef _XOPEN_SOURCE_EXTENDED @@ -19356,28 +20157,28 @@ attr_t foo return 0; } _ACEOF -rm -f conftest.$ac_objext -if { (eval echo "$as_me:19360: \"$ac_compile\"") >&5 +rm -f "conftest.$ac_objext" +if { (eval echo "$as_me:20161: \"$ac_compile\"") >&5 (eval $ac_compile) 2>&5 ac_status=$? - echo "$as_me:19363: \$? = $ac_status" >&5 - (exit $ac_status); } && - { ac_try='test -s conftest.$ac_objext' - { (eval echo "$as_me:19366: \"$ac_try\"") >&5 + echo "$as_me:20164: \$? = $ac_status" >&5 + (exit "$ac_status"); } && + { ac_try='test -s "conftest.$ac_objext"' + { (eval echo "$as_me:20167: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? - echo "$as_me:19369: \$? = $ac_status" >&5 - (exit $ac_status); }; }; then + echo "$as_me:20170: \$? = $ac_status" >&5 + (exit "$ac_status"); }; }; then cf_result=yes else echo "$as_me: failed program was:" >&5 -cat conftest.$ac_ext >&5 +cat "conftest.$ac_ext" >&5 cf_result=no fi -rm -f conftest.$ac_objext conftest.$ac_ext -echo "$as_me:19378: result: $cf_result" >&5 +rm -f "conftest.$ac_objext" "conftest.$ac_ext" +echo "$as_me:20179: result: $cf_result" >&5 echo "${ECHO_T}$cf_result" >&6 -if test $cf_result = yes ; then +if test "$cf_result" = yes ; then cf_result=`echo "have_type_attr_t" | sed y%abcdefghijklmnopqrstuvwxyz./-%ABCDEFGHIJKLMNOPQRSTUVWXYZ___%` @@ -19396,14 +20197,14 @@ fi if test "$cf_enable_widec" = yes; then # This is needed on Tru64 5.0 to declare mbstate_t -echo "$as_me:19399: checking if we must include wchar.h to declare mbstate_t" >&5 +echo "$as_me:20200: checking if we must include wchar.h to declare mbstate_t" >&5 echo $ECHO_N "checking if we must include wchar.h to declare mbstate_t... $ECHO_C" >&6 if test "${cf_cv_mbstate_t+set}" = set; then echo $ECHO_N "(cached) $ECHO_C" >&6 else -cat >conftest.$ac_ext <<_ACEOF -#line 19406 "configure" +cat >"conftest.$ac_ext" <<_ACEOF +#line 20207 "configure" #include "confdefs.h" #include @@ -19420,24 +20221,24 @@ mbstate_t state return 0; } _ACEOF -rm -f conftest.$ac_objext -if { (eval echo "$as_me:19424: \"$ac_compile\"") >&5 +rm -f "conftest.$ac_objext" +if { (eval echo "$as_me:20225: \"$ac_compile\"") >&5 (eval $ac_compile) 2>&5 ac_status=$? - echo "$as_me:19427: \$? = $ac_status" >&5 - (exit $ac_status); } && - { ac_try='test -s conftest.$ac_objext' - { (eval echo "$as_me:19430: \"$ac_try\"") >&5 + echo "$as_me:20228: \$? = $ac_status" >&5 + (exit "$ac_status"); } && + { ac_try='test -s "conftest.$ac_objext"' + { (eval echo "$as_me:20231: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? - echo "$as_me:19433: \$? = $ac_status" >&5 - (exit $ac_status); }; }; then + echo "$as_me:20234: \$? = $ac_status" >&5 + (exit "$ac_status"); }; }; then cf_cv_mbstate_t=no else echo "$as_me: failed program was:" >&5 -cat conftest.$ac_ext >&5 -cat >conftest.$ac_ext <<_ACEOF -#line 19440 "configure" +cat "conftest.$ac_ext" >&5 +cat >"conftest.$ac_ext" <<_ACEOF +#line 20241 "configure" #include "confdefs.h" #include @@ -19455,29 +20256,29 @@ mbstate_t value return 0; } _ACEOF -rm -f conftest.$ac_objext -if { (eval echo "$as_me:19459: \"$ac_compile\"") >&5 +rm -f "conftest.$ac_objext" +if { (eval echo "$as_me:20260: \"$ac_compile\"") >&5 (eval $ac_compile) 2>&5 ac_status=$? - echo "$as_me:19462: \$? = $ac_status" >&5 - (exit $ac_status); } && - { ac_try='test -s conftest.$ac_objext' - { (eval echo "$as_me:19465: \"$ac_try\"") >&5 + echo "$as_me:20263: \$? = $ac_status" >&5 + (exit "$ac_status"); } && + { ac_try='test -s "conftest.$ac_objext"' + { (eval echo "$as_me:20266: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? - echo "$as_me:19468: \$? = $ac_status" >&5 - (exit $ac_status); }; }; then + echo "$as_me:20269: \$? = $ac_status" >&5 + (exit "$ac_status"); }; }; then cf_cv_mbstate_t=yes else echo "$as_me: failed program was:" >&5 -cat conftest.$ac_ext >&5 +cat "conftest.$ac_ext" >&5 cf_cv_mbstate_t=unknown fi -rm -f conftest.$ac_objext conftest.$ac_ext +rm -f "conftest.$ac_objext" "conftest.$ac_ext" fi -rm -f conftest.$ac_objext conftest.$ac_ext +rm -f "conftest.$ac_objext" "conftest.$ac_ext" fi -echo "$as_me:19480: result: $cf_cv_mbstate_t" >&5 +echo "$as_me:20281: result: $cf_cv_mbstate_t" >&5 echo "${ECHO_T}$cf_cv_mbstate_t" >&6 if test "$cf_cv_mbstate_t" = yes ; then @@ -19500,14 +20301,14 @@ if test "$cf_cv_mbstate_t" != unknown ; then fi # This is needed on Tru64 5.0 to declare wchar_t -echo "$as_me:19503: checking if we must include wchar.h to declare wchar_t" >&5 +echo "$as_me:20304: checking if we must include wchar.h to declare wchar_t" >&5 echo $ECHO_N "checking if we must include wchar.h to declare wchar_t... $ECHO_C" >&6 if test "${cf_cv_wchar_t+set}" = set; then echo $ECHO_N "(cached) $ECHO_C" >&6 else -cat >conftest.$ac_ext <<_ACEOF -#line 19510 "configure" +cat >"conftest.$ac_ext" <<_ACEOF +#line 20311 "configure" #include "confdefs.h" #include @@ -19524,24 +20325,24 @@ wchar_t state return 0; } _ACEOF -rm -f conftest.$ac_objext -if { (eval echo "$as_me:19528: \"$ac_compile\"") >&5 +rm -f "conftest.$ac_objext" +if { (eval echo "$as_me:20329: \"$ac_compile\"") >&5 (eval $ac_compile) 2>&5 ac_status=$? - echo "$as_me:19531: \$? = $ac_status" >&5 - (exit $ac_status); } && - { ac_try='test -s conftest.$ac_objext' - { (eval echo "$as_me:19534: \"$ac_try\"") >&5 + echo "$as_me:20332: \$? = $ac_status" >&5 + (exit "$ac_status"); } && + { ac_try='test -s "conftest.$ac_objext"' + { (eval echo "$as_me:20335: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? - echo "$as_me:19537: \$? = $ac_status" >&5 - (exit $ac_status); }; }; then + echo "$as_me:20338: \$? = $ac_status" >&5 + (exit "$ac_status"); }; }; then cf_cv_wchar_t=no else echo "$as_me: failed program was:" >&5 -cat conftest.$ac_ext >&5 -cat >conftest.$ac_ext <<_ACEOF -#line 19544 "configure" +cat "conftest.$ac_ext" >&5 +cat >"conftest.$ac_ext" <<_ACEOF +#line 20345 "configure" #include "confdefs.h" #include @@ -19559,29 +20360,29 @@ wchar_t value return 0; } _ACEOF -rm -f conftest.$ac_objext -if { (eval echo "$as_me:19563: \"$ac_compile\"") >&5 +rm -f "conftest.$ac_objext" +if { (eval echo "$as_me:20364: \"$ac_compile\"") >&5 (eval $ac_compile) 2>&5 ac_status=$? - echo "$as_me:19566: \$? = $ac_status" >&5 - (exit $ac_status); } && - { ac_try='test -s conftest.$ac_objext' - { (eval echo "$as_me:19569: \"$ac_try\"") >&5 + echo "$as_me:20367: \$? = $ac_status" >&5 + (exit "$ac_status"); } && + { ac_try='test -s "conftest.$ac_objext"' + { (eval echo "$as_me:20370: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? - echo "$as_me:19572: \$? = $ac_status" >&5 - (exit $ac_status); }; }; then + echo "$as_me:20373: \$? = $ac_status" >&5 + (exit "$ac_status"); }; }; then cf_cv_wchar_t=yes else echo "$as_me: failed program was:" >&5 -cat conftest.$ac_ext >&5 +cat "conftest.$ac_ext" >&5 cf_cv_wchar_t=unknown fi -rm -f conftest.$ac_objext conftest.$ac_ext +rm -f "conftest.$ac_objext" "conftest.$ac_ext" fi -rm -f conftest.$ac_objext conftest.$ac_ext +rm -f "conftest.$ac_objext" "conftest.$ac_ext" fi -echo "$as_me:19584: result: $cf_cv_wchar_t" >&5 +echo "$as_me:20385: result: $cf_cv_wchar_t" >&5 echo "${ECHO_T}$cf_cv_wchar_t" >&6 if test "$cf_cv_wchar_t" = yes ; then @@ -19604,14 +20405,14 @@ if test "$cf_cv_wchar_t" != unknown ; then fi # This is needed on Tru64 5.0 to declare wint_t -echo "$as_me:19607: checking if we must include wchar.h to declare wint_t" >&5 +echo "$as_me:20408: checking if we must include wchar.h to declare wint_t" >&5 echo $ECHO_N "checking if we must include wchar.h to declare wint_t... $ECHO_C" >&6 if test "${cf_cv_wint_t+set}" = set; then echo $ECHO_N "(cached) $ECHO_C" >&6 else -cat >conftest.$ac_ext <<_ACEOF -#line 19614 "configure" +cat >"conftest.$ac_ext" <<_ACEOF +#line 20415 "configure" #include "confdefs.h" #include @@ -19628,24 +20429,24 @@ wint_t state return 0; } _ACEOF -rm -f conftest.$ac_objext -if { (eval echo "$as_me:19632: \"$ac_compile\"") >&5 +rm -f "conftest.$ac_objext" +if { (eval echo "$as_me:20433: \"$ac_compile\"") >&5 (eval $ac_compile) 2>&5 ac_status=$? - echo "$as_me:19635: \$? = $ac_status" >&5 - (exit $ac_status); } && - { ac_try='test -s conftest.$ac_objext' - { (eval echo "$as_me:19638: \"$ac_try\"") >&5 + echo "$as_me:20436: \$? = $ac_status" >&5 + (exit "$ac_status"); } && + { ac_try='test -s "conftest.$ac_objext"' + { (eval echo "$as_me:20439: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? - echo "$as_me:19641: \$? = $ac_status" >&5 - (exit $ac_status); }; }; then + echo "$as_me:20442: \$? = $ac_status" >&5 + (exit "$ac_status"); }; }; then cf_cv_wint_t=no else echo "$as_me: failed program was:" >&5 -cat conftest.$ac_ext >&5 -cat >conftest.$ac_ext <<_ACEOF -#line 19648 "configure" +cat "conftest.$ac_ext" >&5 +cat >"conftest.$ac_ext" <<_ACEOF +#line 20449 "configure" #include "confdefs.h" #include @@ -19663,29 +20464,29 @@ wint_t value return 0; } _ACEOF -rm -f conftest.$ac_objext -if { (eval echo "$as_me:19667: \"$ac_compile\"") >&5 +rm -f "conftest.$ac_objext" +if { (eval echo "$as_me:20468: \"$ac_compile\"") >&5 (eval $ac_compile) 2>&5 ac_status=$? - echo "$as_me:19670: \$? = $ac_status" >&5 - (exit $ac_status); } && - { ac_try='test -s conftest.$ac_objext' - { (eval echo "$as_me:19673: \"$ac_try\"") >&5 + echo "$as_me:20471: \$? = $ac_status" >&5 + (exit "$ac_status"); } && + { ac_try='test -s "conftest.$ac_objext"' + { (eval echo "$as_me:20474: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? - echo "$as_me:19676: \$? = $ac_status" >&5 - (exit $ac_status); }; }; then + echo "$as_me:20477: \$? = $ac_status" >&5 + (exit "$ac_status"); }; }; then cf_cv_wint_t=yes else echo "$as_me: failed program was:" >&5 -cat conftest.$ac_ext >&5 +cat "conftest.$ac_ext" >&5 cf_cv_wint_t=unknown fi -rm -f conftest.$ac_objext conftest.$ac_ext +rm -f "conftest.$ac_objext" "conftest.$ac_ext" fi -rm -f conftest.$ac_objext conftest.$ac_ext +rm -f "conftest.$ac_objext" "conftest.$ac_ext" fi -echo "$as_me:19688: result: $cf_cv_wint_t" >&5 +echo "$as_me:20489: result: $cf_cv_wint_t" >&5 echo "${ECHO_T}$cf_cv_wint_t" >&6 if test "$cf_cv_wint_t" = yes ; then @@ -19709,10 +20510,10 @@ fi if test "$NCURSES_OK_MBSTATE_T" = 0 ; then -echo "$as_me:19712: checking for type mbstate_t in ${cf_cv_ncurses_header:-curses.h}" >&5 +echo "$as_me:20513: checking for type mbstate_t in ${cf_cv_ncurses_header:-curses.h}" >&5 echo $ECHO_N "checking for type mbstate_t in ${cf_cv_ncurses_header:-curses.h}... $ECHO_C" >&6 -cat >conftest.$ac_ext <<_ACEOF -#line 19715 "configure" +cat >"conftest.$ac_ext" <<_ACEOF +#line 20516 "configure" #include "confdefs.h" #ifndef _XOPEN_SOURCE_EXTENDED @@ -19729,28 +20530,28 @@ mbstate_t foo return 0; } _ACEOF -rm -f conftest.$ac_objext -if { (eval echo "$as_me:19733: \"$ac_compile\"") >&5 +rm -f "conftest.$ac_objext" +if { (eval echo "$as_me:20534: \"$ac_compile\"") >&5 (eval $ac_compile) 2>&5 ac_status=$? - echo "$as_me:19736: \$? = $ac_status" >&5 - (exit $ac_status); } && - { ac_try='test -s conftest.$ac_objext' - { (eval echo "$as_me:19739: \"$ac_try\"") >&5 + echo "$as_me:20537: \$? = $ac_status" >&5 + (exit "$ac_status"); } && + { ac_try='test -s "conftest.$ac_objext"' + { (eval echo "$as_me:20540: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? - echo "$as_me:19742: \$? = $ac_status" >&5 - (exit $ac_status); }; }; then + echo "$as_me:20543: \$? = $ac_status" >&5 + (exit "$ac_status"); }; }; then cf_result=yes else echo "$as_me: failed program was:" >&5 -cat conftest.$ac_ext >&5 +cat "conftest.$ac_ext" >&5 cf_result=no fi -rm -f conftest.$ac_objext conftest.$ac_ext -echo "$as_me:19751: result: $cf_result" >&5 +rm -f "conftest.$ac_objext" "conftest.$ac_ext" +echo "$as_me:20552: result: $cf_result" >&5 echo "${ECHO_T}$cf_result" >&6 -if test $cf_result = yes ; then +if test "$cf_result" = yes ; then cf_result=`echo "have_type_mbstate_t" | sed y%abcdefghijklmnopqrstuvwxyz./-%ABCDEFGHIJKLMNOPQRSTUVWXYZ___%` @@ -19770,10 +20571,10 @@ fi if test "$NCURSES_OK_WCHAR_T" = 0 ; then -echo "$as_me:19773: checking for type wchar_t in ${cf_cv_ncurses_header:-curses.h}" >&5 +echo "$as_me:20574: checking for type wchar_t in ${cf_cv_ncurses_header:-curses.h}" >&5 echo $ECHO_N "checking for type wchar_t in ${cf_cv_ncurses_header:-curses.h}... $ECHO_C" >&6 -cat >conftest.$ac_ext <<_ACEOF -#line 19776 "configure" +cat >"conftest.$ac_ext" <<_ACEOF +#line 20577 "configure" #include "confdefs.h" #ifndef _XOPEN_SOURCE_EXTENDED @@ -19790,28 +20591,28 @@ wchar_t foo return 0; } _ACEOF -rm -f conftest.$ac_objext -if { (eval echo "$as_me:19794: \"$ac_compile\"") >&5 +rm -f "conftest.$ac_objext" +if { (eval echo "$as_me:20595: \"$ac_compile\"") >&5 (eval $ac_compile) 2>&5 ac_status=$? - echo "$as_me:19797: \$? = $ac_status" >&5 - (exit $ac_status); } && - { ac_try='test -s conftest.$ac_objext' - { (eval echo "$as_me:19800: \"$ac_try\"") >&5 + echo "$as_me:20598: \$? = $ac_status" >&5 + (exit "$ac_status"); } && + { ac_try='test -s "conftest.$ac_objext"' + { (eval echo "$as_me:20601: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? - echo "$as_me:19803: \$? = $ac_status" >&5 - (exit $ac_status); }; }; then + echo "$as_me:20604: \$? = $ac_status" >&5 + (exit "$ac_status"); }; }; then cf_result=yes else echo "$as_me: failed program was:" >&5 -cat conftest.$ac_ext >&5 +cat "conftest.$ac_ext" >&5 cf_result=no fi -rm -f conftest.$ac_objext conftest.$ac_ext -echo "$as_me:19812: result: $cf_result" >&5 +rm -f "conftest.$ac_objext" "conftest.$ac_ext" +echo "$as_me:20613: result: $cf_result" >&5 echo "${ECHO_T}$cf_result" >&6 -if test $cf_result = yes ; then +if test "$cf_result" = yes ; then cf_result=`echo "have_type_wchar_t" | sed y%abcdefghijklmnopqrstuvwxyz./-%ABCDEFGHIJKLMNOPQRSTUVWXYZ___%` @@ -19831,10 +20632,10 @@ fi if test "$NCURSES_OK_WINT_T" = 0 ; then -echo "$as_me:19834: checking for type wint_t in ${cf_cv_ncurses_header:-curses.h}" >&5 +echo "$as_me:20635: checking for type wint_t in ${cf_cv_ncurses_header:-curses.h}" >&5 echo $ECHO_N "checking for type wint_t in ${cf_cv_ncurses_header:-curses.h}... $ECHO_C" >&6 -cat >conftest.$ac_ext <<_ACEOF -#line 19837 "configure" +cat >"conftest.$ac_ext" <<_ACEOF +#line 20638 "configure" #include "confdefs.h" #ifndef _XOPEN_SOURCE_EXTENDED @@ -19851,28 +20652,28 @@ wint_t foo return 0; } _ACEOF -rm -f conftest.$ac_objext -if { (eval echo "$as_me:19855: \"$ac_compile\"") >&5 +rm -f "conftest.$ac_objext" +if { (eval echo "$as_me:20656: \"$ac_compile\"") >&5 (eval $ac_compile) 2>&5 ac_status=$? - echo "$as_me:19858: \$? = $ac_status" >&5 - (exit $ac_status); } && - { ac_try='test -s conftest.$ac_objext' - { (eval echo "$as_me:19861: \"$ac_try\"") >&5 + echo "$as_me:20659: \$? = $ac_status" >&5 + (exit "$ac_status"); } && + { ac_try='test -s "conftest.$ac_objext"' + { (eval echo "$as_me:20662: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? - echo "$as_me:19864: \$? = $ac_status" >&5 - (exit $ac_status); }; }; then + echo "$as_me:20665: \$? = $ac_status" >&5 + (exit "$ac_status"); }; }; then cf_result=yes else echo "$as_me: failed program was:" >&5 -cat conftest.$ac_ext >&5 +cat "conftest.$ac_ext" >&5 cf_result=no fi -rm -f conftest.$ac_objext conftest.$ac_ext -echo "$as_me:19873: result: $cf_result" >&5 +rm -f "conftest.$ac_objext" "conftest.$ac_ext" +echo "$as_me:20674: result: $cf_result" >&5 echo "${ECHO_T}$cf_result" >&6 -if test $cf_result = yes ; then +if test "$cf_result" = yes ; then cf_result=`echo "have_type_wint_t" | sed y%abcdefghijklmnopqrstuvwxyz./-%ABCDEFGHIJKLMNOPQRSTUVWXYZ___%` @@ -19899,11 +20700,11 @@ boolnames \ boolfnames \ ttytype do -echo "$as_me:19902: checking for data $cf_data declaration in ${cf_cv_ncurses_header:-curses.h}" >&5 +echo "$as_me:20703: checking for data $cf_data declaration in ${cf_cv_ncurses_header:-curses.h}" >&5 echo $ECHO_N "checking for data $cf_data declaration in ${cf_cv_ncurses_header:-curses.h}... $ECHO_C" >&6 -cat >conftest.$ac_ext <<_ACEOF -#line 19906 "configure" +cat >"conftest.$ac_ext" <<_ACEOF +#line 20707 "configure" #include "confdefs.h" #ifdef HAVE_XCURSES @@ -19929,36 +20730,36 @@ main (void) #else const void *foo = &($cf_data); #endif - fprintf(stderr, "testing linkage of $cf_data:%p\n", (const void *)foo); + fprintf(stderr, "testing linkage of $cf_data:%p\\n", (const void *)foo); ; return 0; } _ACEOF -rm -f conftest.$ac_objext -if { (eval echo "$as_me:19939: \"$ac_compile\"") >&5 +rm -f "conftest.$ac_objext" +if { (eval echo "$as_me:20740: \"$ac_compile\"") >&5 (eval $ac_compile) 2>&5 ac_status=$? - echo "$as_me:19942: \$? = $ac_status" >&5 - (exit $ac_status); } && - { ac_try='test -s conftest.$ac_objext' - { (eval echo "$as_me:19945: \"$ac_try\"") >&5 + echo "$as_me:20743: \$? = $ac_status" >&5 + (exit "$ac_status"); } && + { ac_try='test -s "conftest.$ac_objext"' + { (eval echo "$as_me:20746: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? - echo "$as_me:19948: \$? = $ac_status" >&5 - (exit $ac_status); }; }; then + echo "$as_me:20749: \$? = $ac_status" >&5 + (exit "$ac_status"); }; }; then cf_result=yes else echo "$as_me: failed program was:" >&5 -cat conftest.$ac_ext >&5 +cat "conftest.$ac_ext" >&5 cf_result=no fi -rm -f conftest.$ac_objext conftest.$ac_ext -echo "$as_me:19958: result: $cf_result" >&5 +rm -f "conftest.$ac_objext" "conftest.$ac_ext" +echo "$as_me:20759: result: $cf_result" >&5 echo "${ECHO_T}$cf_result" >&6 -if test $cf_result = yes ; then +if test "$cf_result" = yes ; then cf_result=`echo "have_curses_data_$cf_data" | sed y%abcdefghijklmnopqrstuvwxyz./-%ABCDEFGHIJKLMNOPQRSTUVWXYZ___%` @@ -19967,14 +20768,14 @@ cf_result=`echo "have_curses_data_$cf_data" | sed y%abcdefghijklmnopqrstuvwxyz./ EOF else - echo "$as_me:19970: checking for data $cf_data in library" >&5 + echo "$as_me:20771: checking for data $cf_data in library" >&5 echo $ECHO_N "checking for data $cf_data in library... $ECHO_C" >&6 # BSD linkers insist on making weak linkage, but resolve at runtime. if test "$cross_compiling" = yes; then # cross-compiling - cat >conftest.$ac_ext <<_ACEOF -#line 19977 "configure" + cat >"conftest.$ac_ext" <<_ACEOF +#line 20778 "configure" #include "confdefs.h" #ifdef HAVE_XCURSES @@ -20003,7 +20804,7 @@ main (void) #else const void *foo = &($cf_data); #endif - fprintf(stderr, "testing linkage of $cf_data:%p\n", (const void *)foo); + fprintf(stderr, "testing linkage of $cf_data:%p\\n", (const void *)foo); ${cf_cv_main_return:-return}(foo == 0); } while (0) @@ -20012,29 +20813,29 @@ main (void) return 0; } _ACEOF -rm -f conftest.$ac_objext conftest$ac_exeext -if { (eval echo "$as_me:20016: \"$ac_link\"") >&5 +rm -f "conftest.$ac_objext" "conftest$ac_exeext" +if { (eval echo "$as_me:20817: \"$ac_link\"") >&5 (eval $ac_link) 2>&5 ac_status=$? - echo "$as_me:20019: \$? = $ac_status" >&5 - (exit $ac_status); } && - { ac_try='test -s conftest$ac_exeext' - { (eval echo "$as_me:20022: \"$ac_try\"") >&5 + echo "$as_me:20820: \$? = $ac_status" >&5 + (exit "$ac_status"); } && + { ac_try='test -s "conftest$ac_exeext"' + { (eval echo "$as_me:20823: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? - echo "$as_me:20025: \$? = $ac_status" >&5 - (exit $ac_status); }; }; then + echo "$as_me:20826: \$? = $ac_status" >&5 + (exit "$ac_status"); }; }; then cf_result=yes else echo "$as_me: failed program was:" >&5 -cat conftest.$ac_ext >&5 +cat "conftest.$ac_ext" >&5 cf_result=no fi -rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext +rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext" else - cat >conftest.$ac_ext <<_ACEOF -#line 20037 "configure" + cat >"conftest.$ac_ext" <<_ACEOF +#line 20838 "configure" #include "confdefs.h" #ifdef HAVE_XCURSES @@ -20060,35 +20861,35 @@ int main(void) #else const void *foo = &($cf_data); #endif - fprintf(stderr, "testing linkage of $cf_data:%p\n", (const void *)foo); + fprintf(stderr, "testing linkage of $cf_data:%p\\n", (const void *)foo); ${cf_cv_main_return:-return}(foo == 0); } _ACEOF -rm -f conftest$ac_exeext -if { (eval echo "$as_me:20069: \"$ac_link\"") >&5 +rm -f "conftest$ac_exeext" +if { (eval echo "$as_me:20870: \"$ac_link\"") >&5 (eval $ac_link) 2>&5 ac_status=$? - echo "$as_me:20072: \$? = $ac_status" >&5 - (exit $ac_status); } && { ac_try='./conftest$ac_exeext' - { (eval echo "$as_me:20074: \"$ac_try\"") >&5 + echo "$as_me:20873: \$? = $ac_status" >&5 + (exit "$ac_status"); } && { ac_try='"./conftest$ac_exeext"' + { (eval echo "$as_me:20875: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? - echo "$as_me:20077: \$? = $ac_status" >&5 - (exit $ac_status); }; }; then + echo "$as_me:20878: \$? = $ac_status" >&5 + (exit "$ac_status"); }; }; then cf_result=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_result=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 - echo "$as_me:20089: result: $cf_result" >&5 + echo "$as_me:20890: result: $cf_result" >&5 echo "${ECHO_T}$cf_result" >&6 - if test $cf_result = yes ; then + if test "$cf_result" = yes ; then cf_result=`echo "decl_curses_data_$cf_data" | sed y%abcdefghijklmnopqrstuvwxyz./-%ABCDEFGHIJKLMNOPQRSTUVWXYZ___%` @@ -20103,7 +20904,7 @@ done if test -n "$with_screen" && test "x$with_screen" = "xpdcurses" then - echo "$as_me:20106: checking for X" >&5 + echo "$as_me:20907: checking for X" >&5 echo $ECHO_N "checking for X... $ECHO_C" >&6 # Check whether --with-x or --without-x was given. @@ -20135,11 +20936,11 @@ acfindx: EOF if (xmkmf) >/dev/null 2>/dev/null && test -f Makefile; then # GNU make sometimes prints "make[1]: Entering...", which would confuse us. - eval `${MAKE-make} acfindx 2>/dev/null | grep -v make` + eval "`${MAKE-make} acfindx 2>/dev/null | grep -v make`" # Open Windows xmkmf reportedly sets LIBDIR instead of USRLIBDIR. for ac_extension in a so sl dylib dll; do - if test ! -f $ac_im_usrlibdir/libX11.$ac_extension && - test -f $ac_im_libdir/libX11.$ac_extension; then + if test ! -f "$ac_im_usrlibdir/libX11.$ac_extension" && + test -f "$ac_im_libdir/libX11.$ac_extension"; then ac_im_usrlibdir=$ac_im_libdir; break fi done @@ -20206,19 +21007,19 @@ ac_x_header_dirs=' if test "$ac_x_includes" = no; then # Guess where to find include files, by looking for Intrinsic.h. # First, try using that file with no special directory specified. - cat >conftest.$ac_ext <<_ACEOF -#line 20210 "configure" + cat >"conftest.$ac_ext" <<_ACEOF +#line 21011 "configure" #include "confdefs.h" #include _ACEOF -if { (eval echo "$as_me:20214: \"$ac_cpp conftest.$ac_ext\"") >&5 - (eval $ac_cpp conftest.$ac_ext) 2>conftest.er1 +if { (eval echo "$as_me:21015: \"$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:20220: \$? = $ac_status" >&5 - (exit $ac_status); } >/dev/null; then + echo "$as_me:21021: \$? = $ac_status" >&5 + (exit "$ac_status"); } >/dev/null; then if test -s conftest.err; then ac_cpp_err=$ac_c_preproc_warn_flag else @@ -20232,7 +21033,7 @@ if test -z "$ac_cpp_err"; then ac_x_includes= else echo "$as_me: failed program was:" >&5 - cat conftest.$ac_ext >&5 + cat "conftest.$ac_ext" >&5 for ac_dir in $ac_x_header_dirs; do if test -r "$ac_dir/X11/Intrinsic.h"; then ac_x_includes=$ac_dir @@ -20240,7 +21041,7 @@ else fi done fi -rm -f conftest.err conftest.$ac_ext +rm -f conftest.err "conftest.$ac_ext" fi # $ac_x_includes = no if test "$ac_x_libraries" = no; then @@ -20249,8 +21050,8 @@ if test "$ac_x_libraries" = no; then # Don't add to $LIBS permanently. ac_save_LIBS=$LIBS LIBS="-lXt $LIBS" - cat >conftest.$ac_ext <<_ACEOF -#line 20253 "configure" + cat >"conftest.$ac_ext" <<_ACEOF +#line 21054 "configure" #include "confdefs.h" #include int @@ -20261,37 +21062,37 @@ XtMalloc (0) return 0; } _ACEOF -rm -f conftest.$ac_objext conftest$ac_exeext -if { (eval echo "$as_me:20265: \"$ac_link\"") >&5 +rm -f "conftest.$ac_objext" "conftest$ac_exeext" +if { (eval echo "$as_me:21066: \"$ac_link\"") >&5 (eval $ac_link) 2>&5 ac_status=$? - echo "$as_me:20268: \$? = $ac_status" >&5 - (exit $ac_status); } && - { ac_try='test -s conftest$ac_exeext' - { (eval echo "$as_me:20271: \"$ac_try\"") >&5 + echo "$as_me:21069: \$? = $ac_status" >&5 + (exit "$ac_status"); } && + { ac_try='test -s "conftest$ac_exeext"' + { (eval echo "$as_me:21072: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? - echo "$as_me:20274: \$? = $ac_status" >&5 - (exit $ac_status); }; }; then + echo "$as_me:21075: \$? = $ac_status" >&5 + (exit "$ac_status"); }; }; then LIBS=$ac_save_LIBS # We can link X programs with no special library path. ac_x_libraries= else echo "$as_me: failed program was:" >&5 -cat conftest.$ac_ext >&5 +cat "conftest.$ac_ext" >&5 LIBS=$ac_save_LIBS for ac_dir in `echo "$ac_x_includes $ac_x_header_dirs" | sed s/include/lib/g` do # Don't even attempt the hair of trying to link an X program! for ac_extension in a so sl dylib dll; do - if test -r $ac_dir/libXt.$ac_extension; then + if test -r "$ac_dir/libXt.$ac_extension"; then ac_x_libraries=$ac_dir break 2 fi done 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 # $ac_x_libraries = no if test "$ac_x_includes" = no || test "$ac_x_libraries" = no; then @@ -20309,7 +21110,7 @@ fi fi # $with_x != no if test "$have_x" != yes; then - echo "$as_me:20312: result: $have_x" >&5 + echo "$as_me:21113: result: $have_x" >&5 echo "${ECHO_T}$have_x" >&6 no_x=yes else @@ -20319,7 +21120,7 @@ else # Update the cache value to reflect the command line values. ac_cv_have_x="have_x=yes \ ac_x_includes=$x_includes ac_x_libraries=$x_libraries" - echo "$as_me:20322: result: libraries $x_libraries, headers $x_includes" >&5 + echo "$as_me:21123: result: libraries $x_libraries, headers $x_includes" >&5 echo "${ECHO_T}libraries $x_libraries, headers $x_includes" >&6 fi @@ -20330,7 +21131,10 @@ cat >>confdefs.h <<\EOF #define X_DISPLAY_MISSING 1 EOF - X_CFLAGS= X_PRE_LIBS= X_LIBS= X_EXTRA_LIBS= + X_CFLAGS= + X_PRE_LIBS= + X_LIBS= + X_EXTRA_LIBS= else if test -n "$x_includes"; then X_CFLAGS="$X_CFLAGS -I$x_includes" @@ -20343,11 +21147,11 @@ else # others require no space. Words are not sufficient . . . . case `(uname -sr) 2>/dev/null` in "SunOS 5"*) - echo "$as_me:20346: checking whether -R must be followed by a space" >&5 + echo "$as_me:21150: checking whether -R must be followed by a space" >&5 echo $ECHO_N "checking whether -R must be followed by a space... $ECHO_C" >&6 ac_xsave_LIBS=$LIBS; LIBS="$LIBS -R$x_libraries" - cat >conftest.$ac_ext <<_ACEOF -#line 20350 "configure" + cat >"conftest.$ac_ext" <<_ACEOF +#line 21154 "configure" #include "confdefs.h" int @@ -20358,33 +21162,33 @@ main (void) return 0; } _ACEOF -rm -f conftest.$ac_objext conftest$ac_exeext -if { (eval echo "$as_me:20362: \"$ac_link\"") >&5 +rm -f "conftest.$ac_objext" "conftest$ac_exeext" +if { (eval echo "$as_me:21166: \"$ac_link\"") >&5 (eval $ac_link) 2>&5 ac_status=$? - echo "$as_me:20365: \$? = $ac_status" >&5 - (exit $ac_status); } && - { ac_try='test -s conftest$ac_exeext' - { (eval echo "$as_me:20368: \"$ac_try\"") >&5 + echo "$as_me:21169: \$? = $ac_status" >&5 + (exit "$ac_status"); } && + { ac_try='test -s "conftest$ac_exeext"' + { (eval echo "$as_me:21172: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? - echo "$as_me:20371: \$? = $ac_status" >&5 - (exit $ac_status); }; }; then + echo "$as_me:21175: \$? = $ac_status" >&5 + (exit "$ac_status"); }; }; then ac_R_nospace=yes else echo "$as_me: failed program was:" >&5 -cat conftest.$ac_ext >&5 +cat "conftest.$ac_ext" >&5 ac_R_nospace=no fi -rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext +rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext" if test $ac_R_nospace = yes; then - echo "$as_me:20381: result: no" >&5 + echo "$as_me:21185: result: no" >&5 echo "${ECHO_T}no" >&6 X_LIBS="$X_LIBS -R$x_libraries" else LIBS="$ac_xsave_LIBS -R $x_libraries" - cat >conftest.$ac_ext <<_ACEOF -#line 20387 "configure" + cat >"conftest.$ac_ext" <<_ACEOF +#line 21191 "configure" #include "confdefs.h" int @@ -20395,31 +21199,31 @@ main (void) return 0; } _ACEOF -rm -f conftest.$ac_objext conftest$ac_exeext -if { (eval echo "$as_me:20399: \"$ac_link\"") >&5 +rm -f "conftest.$ac_objext" "conftest$ac_exeext" +if { (eval echo "$as_me:21203: \"$ac_link\"") >&5 (eval $ac_link) 2>&5 ac_status=$? - echo "$as_me:20402: \$? = $ac_status" >&5 - (exit $ac_status); } && - { ac_try='test -s conftest$ac_exeext' - { (eval echo "$as_me:20405: \"$ac_try\"") >&5 + echo "$as_me:21206: \$? = $ac_status" >&5 + (exit "$ac_status"); } && + { ac_try='test -s "conftest$ac_exeext"' + { (eval echo "$as_me:21209: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? - echo "$as_me:20408: \$? = $ac_status" >&5 - (exit $ac_status); }; }; then + echo "$as_me:21212: \$? = $ac_status" >&5 + (exit "$ac_status"); }; }; then ac_R_space=yes else echo "$as_me: failed program was:" >&5 -cat conftest.$ac_ext >&5 +cat "conftest.$ac_ext" >&5 ac_R_space=no fi -rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext +rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext" if test $ac_R_space = yes; then - echo "$as_me:20418: result: yes" >&5 + echo "$as_me:21222: result: yes" >&5 echo "${ECHO_T}yes" >&6 X_LIBS="$X_LIBS -R $x_libraries" else - echo "$as_me:20422: result: neither works" >&5 + echo "$as_me:21226: result: neither works" >&5 echo "${ECHO_T}neither works" >&6 fi fi @@ -20438,8 +21242,8 @@ echo "${ECHO_T}neither works" >&6 # libraries were built with DECnet support. And Karl Berry says # the Alpha needs dnet_stub (dnet does not exist). ac_xsave_LIBS="$LIBS"; LIBS="$LIBS $X_LIBS -lX11" - cat >conftest.$ac_ext <<_ACEOF -#line 20442 "configure" + cat >"conftest.$ac_ext" <<_ACEOF +#line 21246 "configure" #include "confdefs.h" /* Override any gcc2 internal prototype to avoid an error. */ @@ -20457,31 +21261,31 @@ XOpenDisplay (); return 0; } _ACEOF -rm -f conftest.$ac_objext conftest$ac_exeext -if { (eval echo "$as_me:20461: \"$ac_link\"") >&5 +rm -f "conftest.$ac_objext" "conftest$ac_exeext" +if { (eval echo "$as_me:21265: \"$ac_link\"") >&5 (eval $ac_link) 2>&5 ac_status=$? - echo "$as_me:20464: \$? = $ac_status" >&5 - (exit $ac_status); } && - { ac_try='test -s conftest$ac_exeext' - { (eval echo "$as_me:20467: \"$ac_try\"") >&5 + echo "$as_me:21268: \$? = $ac_status" >&5 + (exit "$ac_status"); } && + { ac_try='test -s "conftest$ac_exeext"' + { (eval echo "$as_me:21271: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? - echo "$as_me:20470: \$? = $ac_status" >&5 - (exit $ac_status); }; }; then + echo "$as_me:21274: \$? = $ac_status" >&5 + (exit "$ac_status"); }; }; then : else echo "$as_me: failed program was:" >&5 -cat conftest.$ac_ext >&5 -echo "$as_me:20476: checking for dnet_ntoa in -ldnet" >&5 +cat "conftest.$ac_ext" >&5 +echo "$as_me:21280: checking for dnet_ntoa in -ldnet" >&5 echo $ECHO_N "checking for dnet_ntoa in -ldnet... $ECHO_C" >&6 if test "${ac_cv_lib_dnet_dnet_ntoa+set}" = set; then echo $ECHO_N "(cached) $ECHO_C" >&6 else ac_check_lib_save_LIBS=$LIBS LIBS="-ldnet $LIBS" -cat >conftest.$ac_ext <<_ACEOF -#line 20484 "configure" +cat >"conftest.$ac_ext" <<_ACEOF +#line 21288 "configure" #include "confdefs.h" /* Override any gcc2 internal prototype to avoid an error. */ @@ -20499,43 +21303,43 @@ dnet_ntoa (); return 0; } _ACEOF -rm -f conftest.$ac_objext conftest$ac_exeext -if { (eval echo "$as_me:20503: \"$ac_link\"") >&5 +rm -f "conftest.$ac_objext" "conftest$ac_exeext" +if { (eval echo "$as_me:21307: \"$ac_link\"") >&5 (eval $ac_link) 2>&5 ac_status=$? - echo "$as_me:20506: \$? = $ac_status" >&5 - (exit $ac_status); } && - { ac_try='test -s conftest$ac_exeext' - { (eval echo "$as_me:20509: \"$ac_try\"") >&5 + echo "$as_me:21310: \$? = $ac_status" >&5 + (exit "$ac_status"); } && + { ac_try='test -s "conftest$ac_exeext"' + { (eval echo "$as_me:21313: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? - echo "$as_me:20512: \$? = $ac_status" >&5 - (exit $ac_status); }; }; then + echo "$as_me:21316: \$? = $ac_status" >&5 + (exit "$ac_status"); }; }; then ac_cv_lib_dnet_dnet_ntoa=yes else echo "$as_me: failed program was:" >&5 -cat conftest.$ac_ext >&5 +cat "conftest.$ac_ext" >&5 ac_cv_lib_dnet_dnet_ntoa=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:20523: result: $ac_cv_lib_dnet_dnet_ntoa" >&5 +echo "$as_me:21327: result: $ac_cv_lib_dnet_dnet_ntoa" >&5 echo "${ECHO_T}$ac_cv_lib_dnet_dnet_ntoa" >&6 -if test $ac_cv_lib_dnet_dnet_ntoa = yes; then +if test "$ac_cv_lib_dnet_dnet_ntoa" = yes; then X_EXTRA_LIBS="$X_EXTRA_LIBS -ldnet" fi if test $ac_cv_lib_dnet_dnet_ntoa = no; then - echo "$as_me:20530: checking for dnet_ntoa in -ldnet_stub" >&5 + echo "$as_me:21334: checking for dnet_ntoa in -ldnet_stub" >&5 echo $ECHO_N "checking for dnet_ntoa in -ldnet_stub... $ECHO_C" >&6 if test "${ac_cv_lib_dnet_stub_dnet_ntoa+set}" = set; then echo $ECHO_N "(cached) $ECHO_C" >&6 else ac_check_lib_save_LIBS=$LIBS LIBS="-ldnet_stub $LIBS" -cat >conftest.$ac_ext <<_ACEOF -#line 20538 "configure" +cat >"conftest.$ac_ext" <<_ACEOF +#line 21342 "configure" #include "confdefs.h" /* Override any gcc2 internal prototype to avoid an error. */ @@ -20553,36 +21357,36 @@ dnet_ntoa (); return 0; } _ACEOF -rm -f conftest.$ac_objext conftest$ac_exeext -if { (eval echo "$as_me:20557: \"$ac_link\"") >&5 +rm -f "conftest.$ac_objext" "conftest$ac_exeext" +if { (eval echo "$as_me:21361: \"$ac_link\"") >&5 (eval $ac_link) 2>&5 ac_status=$? - echo "$as_me:20560: \$? = $ac_status" >&5 - (exit $ac_status); } && - { ac_try='test -s conftest$ac_exeext' - { (eval echo "$as_me:20563: \"$ac_try\"") >&5 + echo "$as_me:21364: \$? = $ac_status" >&5 + (exit "$ac_status"); } && + { ac_try='test -s "conftest$ac_exeext"' + { (eval echo "$as_me:21367: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? - echo "$as_me:20566: \$? = $ac_status" >&5 - (exit $ac_status); }; }; then + echo "$as_me:21370: \$? = $ac_status" >&5 + (exit "$ac_status"); }; }; then ac_cv_lib_dnet_stub_dnet_ntoa=yes else echo "$as_me: failed program was:" >&5 -cat conftest.$ac_ext >&5 +cat "conftest.$ac_ext" >&5 ac_cv_lib_dnet_stub_dnet_ntoa=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:20577: result: $ac_cv_lib_dnet_stub_dnet_ntoa" >&5 +echo "$as_me:21381: result: $ac_cv_lib_dnet_stub_dnet_ntoa" >&5 echo "${ECHO_T}$ac_cv_lib_dnet_stub_dnet_ntoa" >&6 -if test $ac_cv_lib_dnet_stub_dnet_ntoa = yes; then +if test "$ac_cv_lib_dnet_stub_dnet_ntoa" = yes; then X_EXTRA_LIBS="$X_EXTRA_LIBS -ldnet_stub" fi fi 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_xsave_LIBS" # msh@cis.ufl.edu says -lnsl (and -lsocket) are needed for his 386/AT, @@ -20593,13 +21397,13 @@ rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext # on Irix 5.2, according to T.E. Dickey. # The functions gethostbyname, getservbyname, and inet_addr are # in -lbsd on LynxOS 3.0.1/i386, according to Lars Hecking. - echo "$as_me:20596: checking for gethostbyname" >&5 + echo "$as_me:21400: checking for gethostbyname" >&5 echo $ECHO_N "checking for gethostbyname... $ECHO_C" >&6 if test "${ac_cv_func_gethostbyname+set}" = set; then echo $ECHO_N "(cached) $ECHO_C" >&6 else - cat >conftest.$ac_ext <<_ACEOF -#line 20602 "configure" + cat >"conftest.$ac_ext" <<_ACEOF +#line 21406 "configure" #include "confdefs.h" #define gethostbyname autoconf_temporary #include /* least-intrusive standard header which defines gcc2 __stub macros */ @@ -20629,39 +21433,39 @@ main (void) return 0; } _ACEOF -rm -f conftest.$ac_objext conftest$ac_exeext -if { (eval echo "$as_me:20633: \"$ac_link\"") >&5 +rm -f "conftest.$ac_objext" "conftest$ac_exeext" +if { (eval echo "$as_me:21437: \"$ac_link\"") >&5 (eval $ac_link) 2>&5 ac_status=$? - echo "$as_me:20636: \$? = $ac_status" >&5 - (exit $ac_status); } && - { ac_try='test -s conftest$ac_exeext' - { (eval echo "$as_me:20639: \"$ac_try\"") >&5 + echo "$as_me:21440: \$? = $ac_status" >&5 + (exit "$ac_status"); } && + { ac_try='test -s "conftest$ac_exeext"' + { (eval echo "$as_me:21443: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? - echo "$as_me:20642: \$? = $ac_status" >&5 - (exit $ac_status); }; }; then + echo "$as_me:21446: \$? = $ac_status" >&5 + (exit "$ac_status"); }; }; then ac_cv_func_gethostbyname=yes else echo "$as_me: failed program was:" >&5 -cat conftest.$ac_ext >&5 +cat "conftest.$ac_ext" >&5 ac_cv_func_gethostbyname=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:20652: result: $ac_cv_func_gethostbyname" >&5 +echo "$as_me:21456: result: $ac_cv_func_gethostbyname" >&5 echo "${ECHO_T}$ac_cv_func_gethostbyname" >&6 if test $ac_cv_func_gethostbyname = no; then - echo "$as_me:20656: checking for gethostbyname in -lnsl" >&5 + echo "$as_me:21460: checking for gethostbyname in -lnsl" >&5 echo $ECHO_N "checking for gethostbyname in -lnsl... $ECHO_C" >&6 if test "${ac_cv_lib_nsl_gethostbyname+set}" = set; then echo $ECHO_N "(cached) $ECHO_C" >&6 else ac_check_lib_save_LIBS=$LIBS LIBS="-lnsl $LIBS" -cat >conftest.$ac_ext <<_ACEOF -#line 20664 "configure" +cat >"conftest.$ac_ext" <<_ACEOF +#line 21468 "configure" #include "confdefs.h" /* Override any gcc2 internal prototype to avoid an error. */ @@ -20679,43 +21483,43 @@ gethostbyname (); return 0; } _ACEOF -rm -f conftest.$ac_objext conftest$ac_exeext -if { (eval echo "$as_me:20683: \"$ac_link\"") >&5 +rm -f "conftest.$ac_objext" "conftest$ac_exeext" +if { (eval echo "$as_me:21487: \"$ac_link\"") >&5 (eval $ac_link) 2>&5 ac_status=$? - echo "$as_me:20686: \$? = $ac_status" >&5 - (exit $ac_status); } && - { ac_try='test -s conftest$ac_exeext' - { (eval echo "$as_me:20689: \"$ac_try\"") >&5 + echo "$as_me:21490: \$? = $ac_status" >&5 + (exit "$ac_status"); } && + { ac_try='test -s "conftest$ac_exeext"' + { (eval echo "$as_me:21493: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? - echo "$as_me:20692: \$? = $ac_status" >&5 - (exit $ac_status); }; }; then + echo "$as_me:21496: \$? = $ac_status" >&5 + (exit "$ac_status"); }; }; then ac_cv_lib_nsl_gethostbyname=yes else echo "$as_me: failed program was:" >&5 -cat conftest.$ac_ext >&5 +cat "conftest.$ac_ext" >&5 ac_cv_lib_nsl_gethostbyname=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:20703: result: $ac_cv_lib_nsl_gethostbyname" >&5 +echo "$as_me:21507: result: $ac_cv_lib_nsl_gethostbyname" >&5 echo "${ECHO_T}$ac_cv_lib_nsl_gethostbyname" >&6 -if test $ac_cv_lib_nsl_gethostbyname = yes; then +if test "$ac_cv_lib_nsl_gethostbyname" = yes; then X_EXTRA_LIBS="$X_EXTRA_LIBS -lnsl" fi if test $ac_cv_lib_nsl_gethostbyname = no; then - echo "$as_me:20710: checking for gethostbyname in -lbsd" >&5 + echo "$as_me:21514: checking for gethostbyname in -lbsd" >&5 echo $ECHO_N "checking for gethostbyname in -lbsd... $ECHO_C" >&6 if test "${ac_cv_lib_bsd_gethostbyname+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 20718 "configure" +cat >"conftest.$ac_ext" <<_ACEOF +#line 21522 "configure" #include "confdefs.h" /* Override any gcc2 internal prototype to avoid an error. */ @@ -20733,30 +21537,30 @@ gethostbyname (); return 0; } _ACEOF -rm -f conftest.$ac_objext conftest$ac_exeext -if { (eval echo "$as_me:20737: \"$ac_link\"") >&5 +rm -f "conftest.$ac_objext" "conftest$ac_exeext" +if { (eval echo "$as_me:21541: \"$ac_link\"") >&5 (eval $ac_link) 2>&5 ac_status=$? - echo "$as_me:20740: \$? = $ac_status" >&5 - (exit $ac_status); } && - { ac_try='test -s conftest$ac_exeext' - { (eval echo "$as_me:20743: \"$ac_try\"") >&5 + echo "$as_me:21544: \$? = $ac_status" >&5 + (exit "$ac_status"); } && + { ac_try='test -s "conftest$ac_exeext"' + { (eval echo "$as_me:21547: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? - echo "$as_me:20746: \$? = $ac_status" >&5 - (exit $ac_status); }; }; then + echo "$as_me:21550: \$? = $ac_status" >&5 + (exit "$ac_status"); }; }; then ac_cv_lib_bsd_gethostbyname=yes else echo "$as_me: failed program was:" >&5 -cat conftest.$ac_ext >&5 +cat "conftest.$ac_ext" >&5 ac_cv_lib_bsd_gethostbyname=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:20757: result: $ac_cv_lib_bsd_gethostbyname" >&5 +echo "$as_me:21561: result: $ac_cv_lib_bsd_gethostbyname" >&5 echo "${ECHO_T}$ac_cv_lib_bsd_gethostbyname" >&6 -if test $ac_cv_lib_bsd_gethostbyname = yes; then +if test "$ac_cv_lib_bsd_gethostbyname" = yes; then X_EXTRA_LIBS="$X_EXTRA_LIBS -lbsd" fi @@ -20770,13 +21574,13 @@ fi # variants that don't use the nameserver (or something). -lsocket # must be given before -lnsl if both are needed. We assume that # if connect needs -lnsl, so does gethostbyname. - echo "$as_me:20773: checking for connect" >&5 + echo "$as_me:21577: checking for connect" >&5 echo $ECHO_N "checking for connect... $ECHO_C" >&6 if test "${ac_cv_func_connect+set}" = set; then echo $ECHO_N "(cached) $ECHO_C" >&6 else - cat >conftest.$ac_ext <<_ACEOF -#line 20779 "configure" + cat >"conftest.$ac_ext" <<_ACEOF +#line 21583 "configure" #include "confdefs.h" #define connect autoconf_temporary #include /* least-intrusive standard header which defines gcc2 __stub macros */ @@ -20806,39 +21610,39 @@ main (void) return 0; } _ACEOF -rm -f conftest.$ac_objext conftest$ac_exeext -if { (eval echo "$as_me:20810: \"$ac_link\"") >&5 +rm -f "conftest.$ac_objext" "conftest$ac_exeext" +if { (eval echo "$as_me:21614: \"$ac_link\"") >&5 (eval $ac_link) 2>&5 ac_status=$? - echo "$as_me:20813: \$? = $ac_status" >&5 - (exit $ac_status); } && - { ac_try='test -s conftest$ac_exeext' - { (eval echo "$as_me:20816: \"$ac_try\"") >&5 + echo "$as_me:21617: \$? = $ac_status" >&5 + (exit "$ac_status"); } && + { ac_try='test -s "conftest$ac_exeext"' + { (eval echo "$as_me:21620: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? - echo "$as_me:20819: \$? = $ac_status" >&5 - (exit $ac_status); }; }; then + echo "$as_me:21623: \$? = $ac_status" >&5 + (exit "$ac_status"); }; }; then ac_cv_func_connect=yes else echo "$as_me: failed program was:" >&5 -cat conftest.$ac_ext >&5 +cat "conftest.$ac_ext" >&5 ac_cv_func_connect=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:20829: result: $ac_cv_func_connect" >&5 +echo "$as_me:21633: result: $ac_cv_func_connect" >&5 echo "${ECHO_T}$ac_cv_func_connect" >&6 if test $ac_cv_func_connect = no; then - echo "$as_me:20833: checking for connect in -lsocket" >&5 + echo "$as_me:21637: checking for connect in -lsocket" >&5 echo $ECHO_N "checking for connect in -lsocket... $ECHO_C" >&6 if test "${ac_cv_lib_socket_connect+set}" = set; then echo $ECHO_N "(cached) $ECHO_C" >&6 else ac_check_lib_save_LIBS=$LIBS LIBS="-lsocket $X_EXTRA_LIBS $LIBS" -cat >conftest.$ac_ext <<_ACEOF -#line 20841 "configure" +cat >"conftest.$ac_ext" <<_ACEOF +#line 21645 "configure" #include "confdefs.h" /* Override any gcc2 internal prototype to avoid an error. */ @@ -20856,43 +21660,43 @@ connect (); return 0; } _ACEOF -rm -f conftest.$ac_objext conftest$ac_exeext -if { (eval echo "$as_me:20860: \"$ac_link\"") >&5 +rm -f "conftest.$ac_objext" "conftest$ac_exeext" +if { (eval echo "$as_me:21664: \"$ac_link\"") >&5 (eval $ac_link) 2>&5 ac_status=$? - echo "$as_me:20863: \$? = $ac_status" >&5 - (exit $ac_status); } && - { ac_try='test -s conftest$ac_exeext' - { (eval echo "$as_me:20866: \"$ac_try\"") >&5 + echo "$as_me:21667: \$? = $ac_status" >&5 + (exit "$ac_status"); } && + { ac_try='test -s "conftest$ac_exeext"' + { (eval echo "$as_me:21670: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? - echo "$as_me:20869: \$? = $ac_status" >&5 - (exit $ac_status); }; }; then + echo "$as_me:21673: \$? = $ac_status" >&5 + (exit "$ac_status"); }; }; then ac_cv_lib_socket_connect=yes else echo "$as_me: failed program was:" >&5 -cat conftest.$ac_ext >&5 +cat "conftest.$ac_ext" >&5 ac_cv_lib_socket_connect=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:20880: result: $ac_cv_lib_socket_connect" >&5 +echo "$as_me:21684: result: $ac_cv_lib_socket_connect" >&5 echo "${ECHO_T}$ac_cv_lib_socket_connect" >&6 -if test $ac_cv_lib_socket_connect = yes; then +if test "$ac_cv_lib_socket_connect" = yes; then X_EXTRA_LIBS="-lsocket $X_EXTRA_LIBS" fi fi # Guillermo Gomez says -lposix is necessary on A/UX. - echo "$as_me:20889: checking for remove" >&5 + echo "$as_me:21693: checking for remove" >&5 echo $ECHO_N "checking for remove... $ECHO_C" >&6 if test "${ac_cv_func_remove+set}" = set; then echo $ECHO_N "(cached) $ECHO_C" >&6 else - cat >conftest.$ac_ext <<_ACEOF -#line 20895 "configure" + cat >"conftest.$ac_ext" <<_ACEOF +#line 21699 "configure" #include "confdefs.h" #define remove autoconf_temporary #include /* least-intrusive standard header which defines gcc2 __stub macros */ @@ -20922,39 +21726,39 @@ main (void) return 0; } _ACEOF -rm -f conftest.$ac_objext conftest$ac_exeext -if { (eval echo "$as_me:20926: \"$ac_link\"") >&5 +rm -f "conftest.$ac_objext" "conftest$ac_exeext" +if { (eval echo "$as_me:21730: \"$ac_link\"") >&5 (eval $ac_link) 2>&5 ac_status=$? - echo "$as_me:20929: \$? = $ac_status" >&5 - (exit $ac_status); } && - { ac_try='test -s conftest$ac_exeext' - { (eval echo "$as_me:20932: \"$ac_try\"") >&5 + echo "$as_me:21733: \$? = $ac_status" >&5 + (exit "$ac_status"); } && + { ac_try='test -s "conftest$ac_exeext"' + { (eval echo "$as_me:21736: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? - echo "$as_me:20935: \$? = $ac_status" >&5 - (exit $ac_status); }; }; then + echo "$as_me:21739: \$? = $ac_status" >&5 + (exit "$ac_status"); }; }; then ac_cv_func_remove=yes else echo "$as_me: failed program was:" >&5 -cat conftest.$ac_ext >&5 +cat "conftest.$ac_ext" >&5 ac_cv_func_remove=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:20945: result: $ac_cv_func_remove" >&5 +echo "$as_me:21749: result: $ac_cv_func_remove" >&5 echo "${ECHO_T}$ac_cv_func_remove" >&6 if test $ac_cv_func_remove = no; then - echo "$as_me:20949: checking for remove in -lposix" >&5 + echo "$as_me:21753: checking for remove in -lposix" >&5 echo $ECHO_N "checking for remove in -lposix... $ECHO_C" >&6 if test "${ac_cv_lib_posix_remove+set}" = set; then echo $ECHO_N "(cached) $ECHO_C" >&6 else ac_check_lib_save_LIBS=$LIBS LIBS="-lposix $LIBS" -cat >conftest.$ac_ext <<_ACEOF -#line 20957 "configure" +cat >"conftest.$ac_ext" <<_ACEOF +#line 21761 "configure" #include "confdefs.h" /* Override any gcc2 internal prototype to avoid an error. */ @@ -20972,43 +21776,43 @@ remove (); return 0; } _ACEOF -rm -f conftest.$ac_objext conftest$ac_exeext -if { (eval echo "$as_me:20976: \"$ac_link\"") >&5 +rm -f "conftest.$ac_objext" "conftest$ac_exeext" +if { (eval echo "$as_me:21780: \"$ac_link\"") >&5 (eval $ac_link) 2>&5 ac_status=$? - echo "$as_me:20979: \$? = $ac_status" >&5 - (exit $ac_status); } && - { ac_try='test -s conftest$ac_exeext' - { (eval echo "$as_me:20982: \"$ac_try\"") >&5 + echo "$as_me:21783: \$? = $ac_status" >&5 + (exit "$ac_status"); } && + { ac_try='test -s "conftest$ac_exeext"' + { (eval echo "$as_me:21786: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? - echo "$as_me:20985: \$? = $ac_status" >&5 - (exit $ac_status); }; }; then + echo "$as_me:21789: \$? = $ac_status" >&5 + (exit "$ac_status"); }; }; then ac_cv_lib_posix_remove=yes else echo "$as_me: failed program was:" >&5 -cat conftest.$ac_ext >&5 +cat "conftest.$ac_ext" >&5 ac_cv_lib_posix_remove=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:20996: result: $ac_cv_lib_posix_remove" >&5 +echo "$as_me:21800: result: $ac_cv_lib_posix_remove" >&5 echo "${ECHO_T}$ac_cv_lib_posix_remove" >&6 -if test $ac_cv_lib_posix_remove = yes; then +if test "$ac_cv_lib_posix_remove" = yes; then X_EXTRA_LIBS="$X_EXTRA_LIBS -lposix" fi fi # BSDI BSD/OS 2.1 needs -lipc for XOpenDisplay. - echo "$as_me:21005: checking for shmat" >&5 + echo "$as_me:21809: checking for shmat" >&5 echo $ECHO_N "checking for shmat... $ECHO_C" >&6 if test "${ac_cv_func_shmat+set}" = set; then echo $ECHO_N "(cached) $ECHO_C" >&6 else - cat >conftest.$ac_ext <<_ACEOF -#line 21011 "configure" + cat >"conftest.$ac_ext" <<_ACEOF +#line 21815 "configure" #include "confdefs.h" #define shmat autoconf_temporary #include /* least-intrusive standard header which defines gcc2 __stub macros */ @@ -21038,39 +21842,39 @@ main (void) return 0; } _ACEOF -rm -f conftest.$ac_objext conftest$ac_exeext -if { (eval echo "$as_me:21042: \"$ac_link\"") >&5 +rm -f "conftest.$ac_objext" "conftest$ac_exeext" +if { (eval echo "$as_me:21846: \"$ac_link\"") >&5 (eval $ac_link) 2>&5 ac_status=$? - echo "$as_me:21045: \$? = $ac_status" >&5 - (exit $ac_status); } && - { ac_try='test -s conftest$ac_exeext' - { (eval echo "$as_me:21048: \"$ac_try\"") >&5 + echo "$as_me:21849: \$? = $ac_status" >&5 + (exit "$ac_status"); } && + { ac_try='test -s "conftest$ac_exeext"' + { (eval echo "$as_me:21852: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? - echo "$as_me:21051: \$? = $ac_status" >&5 - (exit $ac_status); }; }; then + echo "$as_me:21855: \$? = $ac_status" >&5 + (exit "$ac_status"); }; }; then ac_cv_func_shmat=yes else echo "$as_me: failed program was:" >&5 -cat conftest.$ac_ext >&5 +cat "conftest.$ac_ext" >&5 ac_cv_func_shmat=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:21061: result: $ac_cv_func_shmat" >&5 +echo "$as_me:21865: result: $ac_cv_func_shmat" >&5 echo "${ECHO_T}$ac_cv_func_shmat" >&6 if test $ac_cv_func_shmat = no; then - echo "$as_me:21065: checking for shmat in -lipc" >&5 + echo "$as_me:21869: checking for shmat in -lipc" >&5 echo $ECHO_N "checking for shmat in -lipc... $ECHO_C" >&6 if test "${ac_cv_lib_ipc_shmat+set}" = set; then echo $ECHO_N "(cached) $ECHO_C" >&6 else ac_check_lib_save_LIBS=$LIBS LIBS="-lipc $LIBS" -cat >conftest.$ac_ext <<_ACEOF -#line 21073 "configure" +cat >"conftest.$ac_ext" <<_ACEOF +#line 21877 "configure" #include "confdefs.h" /* Override any gcc2 internal prototype to avoid an error. */ @@ -21088,30 +21892,30 @@ shmat (); return 0; } _ACEOF -rm -f conftest.$ac_objext conftest$ac_exeext -if { (eval echo "$as_me:21092: \"$ac_link\"") >&5 +rm -f "conftest.$ac_objext" "conftest$ac_exeext" +if { (eval echo "$as_me:21896: \"$ac_link\"") >&5 (eval $ac_link) 2>&5 ac_status=$? - echo "$as_me:21095: \$? = $ac_status" >&5 - (exit $ac_status); } && - { ac_try='test -s conftest$ac_exeext' - { (eval echo "$as_me:21098: \"$ac_try\"") >&5 + echo "$as_me:21899: \$? = $ac_status" >&5 + (exit "$ac_status"); } && + { ac_try='test -s "conftest$ac_exeext"' + { (eval echo "$as_me:21902: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? - echo "$as_me:21101: \$? = $ac_status" >&5 - (exit $ac_status); }; }; then + echo "$as_me:21905: \$? = $ac_status" >&5 + (exit "$ac_status"); }; }; then ac_cv_lib_ipc_shmat=yes else echo "$as_me: failed program was:" >&5 -cat conftest.$ac_ext >&5 +cat "conftest.$ac_ext" >&5 ac_cv_lib_ipc_shmat=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:21112: result: $ac_cv_lib_ipc_shmat" >&5 +echo "$as_me:21916: result: $ac_cv_lib_ipc_shmat" >&5 echo "${ECHO_T}$ac_cv_lib_ipc_shmat" >&6 -if test $ac_cv_lib_ipc_shmat = yes; then +if test "$ac_cv_lib_ipc_shmat" = yes; then X_EXTRA_LIBS="$X_EXTRA_LIBS -lipc" fi @@ -21127,15 +21931,15 @@ fi # These have to be linked with before -lX11, unlike the other # libraries we check for below, so use a different variable. # John Interrante, Karl Berry - echo "$as_me:21130: checking for IceConnectionNumber in -lICE" >&5 + echo "$as_me:21934: checking for IceConnectionNumber in -lICE" >&5 echo $ECHO_N "checking for IceConnectionNumber in -lICE... $ECHO_C" >&6 if test "${ac_cv_lib_ICE_IceConnectionNumber+set}" = set; then echo $ECHO_N "(cached) $ECHO_C" >&6 else ac_check_lib_save_LIBS=$LIBS LIBS="-lICE $X_EXTRA_LIBS $LIBS" -cat >conftest.$ac_ext <<_ACEOF -#line 21138 "configure" +cat >"conftest.$ac_ext" <<_ACEOF +#line 21942 "configure" #include "confdefs.h" /* Override any gcc2 internal prototype to avoid an error. */ @@ -21153,30 +21957,30 @@ IceConnectionNumber (); return 0; } _ACEOF -rm -f conftest.$ac_objext conftest$ac_exeext -if { (eval echo "$as_me:21157: \"$ac_link\"") >&5 +rm -f "conftest.$ac_objext" "conftest$ac_exeext" +if { (eval echo "$as_me:21961: \"$ac_link\"") >&5 (eval $ac_link) 2>&5 ac_status=$? - echo "$as_me:21160: \$? = $ac_status" >&5 - (exit $ac_status); } && - { ac_try='test -s conftest$ac_exeext' - { (eval echo "$as_me:21163: \"$ac_try\"") >&5 + echo "$as_me:21964: \$? = $ac_status" >&5 + (exit "$ac_status"); } && + { ac_try='test -s "conftest$ac_exeext"' + { (eval echo "$as_me:21967: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? - echo "$as_me:21166: \$? = $ac_status" >&5 - (exit $ac_status); }; }; then + echo "$as_me:21970: \$? = $ac_status" >&5 + (exit "$ac_status"); }; }; then ac_cv_lib_ICE_IceConnectionNumber=yes else echo "$as_me: failed program was:" >&5 -cat conftest.$ac_ext >&5 +cat "conftest.$ac_ext" >&5 ac_cv_lib_ICE_IceConnectionNumber=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:21177: result: $ac_cv_lib_ICE_IceConnectionNumber" >&5 +echo "$as_me:21981: result: $ac_cv_lib_ICE_IceConnectionNumber" >&5 echo "${ECHO_T}$ac_cv_lib_ICE_IceConnectionNumber" >&6 -if test $ac_cv_lib_ICE_IceConnectionNumber = yes; then +if test "$ac_cv_lib_ICE_IceConnectionNumber" = yes; then X_PRE_LIBS="$X_PRE_LIBS -lSM -lICE" fi @@ -21186,127 +21990,154 @@ fi fi -if ( test "$GCC" = yes || test "$GXX" = yes ) +if test "$GCC" = yes || test "$GXX" = yes then -if ( test "$GCC" = yes || test "$GXX" = yes ) +if test "$GCC" = yes || test "$GXX" = yes then case $CFLAGS in (*-Werror=*) - test -n "$verbose" && echo " repairing CFLAGS: $CFLAGS" 1>&6 - -echo "${as_me:-configure}:21198: testing repairing CFLAGS: $CFLAGS ..." 1>&5 - cf_temp_flags= for cf_temp_scan in $CFLAGS do case "x$cf_temp_scan" in + (x-Werror=format*) + + test -n "$cf_temp_flags" && cf_temp_flags="$cf_temp_flags " + cf_temp_flags="${cf_temp_flags}$cf_temp_scan" + + ;; (x-Werror=*) test -n "$EXTRA_CFLAGS" && EXTRA_CFLAGS="$EXTRA_CFLAGS " - EXTRA_CFLAGS="${EXTRA_CFLAGS}"$cf_temp_scan"" + 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"" + cf_temp_flags="${cf_temp_flags}$cf_temp_scan" ;; esac done - CFLAGS="$cf_temp_flags" - test -n "$verbose" && echo " ... fixed $CFLAGS" 1>&6 + if test "x$CFLAGS" != "x$cf_temp_flags" + then + test -n "$verbose" && echo " repairing CFLAGS: $CFLAGS" 1>&6 + +echo "${as_me:-configure}:22028: testing repairing CFLAGS: $CFLAGS ..." 1>&5 -echo "${as_me:-configure}:21221: testing ... fixed $CFLAGS ..." 1>&5 + CFLAGS="$cf_temp_flags" + test -n "$verbose" && echo " ... fixed $CFLAGS" 1>&6 - test -n "$verbose" && echo " ... extra $EXTRA_CFLAGS" 1>&6 +echo "${as_me:-configure}:22033: testing ... fixed $CFLAGS ..." 1>&5 -echo "${as_me:-configure}:21225: testing ... extra $EXTRA_CFLAGS ..." 1>&5 + test -n "$verbose" && echo " ... extra $EXTRA_CFLAGS" 1>&6 +echo "${as_me:-configure}:22037: testing ... extra $EXTRA_CFLAGS ..." 1>&5 + + fi ;; esac fi -if ( test "$GCC" = yes || test "$GXX" = yes ) +if test "$GCC" = yes || test "$GXX" = yes then case $CPPFLAGS in (*-Werror=*) - test -n "$verbose" && echo " repairing CPPFLAGS: $CPPFLAGS" 1>&6 - -echo "${as_me:-configure}:21237: testing repairing CPPFLAGS: $CPPFLAGS ..." 1>&5 - cf_temp_flags= for cf_temp_scan in $CPPFLAGS do case "x$cf_temp_scan" in + (x-Werror=format*) + + test -n "$cf_temp_flags" && cf_temp_flags="$cf_temp_flags " + cf_temp_flags="${cf_temp_flags}$cf_temp_scan" + + ;; (x-Werror=*) test -n "$EXTRA_CFLAGS" && EXTRA_CFLAGS="$EXTRA_CFLAGS " - EXTRA_CFLAGS="${EXTRA_CFLAGS}"$cf_temp_scan"" + 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"" + cf_temp_flags="${cf_temp_flags}$cf_temp_scan" ;; esac done - CPPFLAGS="$cf_temp_flags" - test -n "$verbose" && echo " ... fixed $CPPFLAGS" 1>&6 + if test "x$CPPFLAGS" != "x$cf_temp_flags" + then + test -n "$verbose" && echo " repairing CPPFLAGS: $CPPFLAGS" 1>&6 + +echo "${as_me:-configure}:22076: testing repairing CPPFLAGS: $CPPFLAGS ..." 1>&5 -echo "${as_me:-configure}:21260: testing ... fixed $CPPFLAGS ..." 1>&5 + CPPFLAGS="$cf_temp_flags" + test -n "$verbose" && echo " ... fixed $CPPFLAGS" 1>&6 - test -n "$verbose" && echo " ... extra $EXTRA_CFLAGS" 1>&6 +echo "${as_me:-configure}:22081: testing ... fixed $CPPFLAGS ..." 1>&5 -echo "${as_me:-configure}:21264: testing ... extra $EXTRA_CFLAGS ..." 1>&5 + test -n "$verbose" && echo " ... extra $EXTRA_CFLAGS" 1>&6 +echo "${as_me:-configure}:22085: testing ... extra $EXTRA_CFLAGS ..." 1>&5 + + fi ;; esac fi -if ( test "$GCC" = yes || test "$GXX" = yes ) +if test "$GCC" = yes || test "$GXX" = yes then case $LDFLAGS in (*-Werror=*) - test -n "$verbose" && echo " repairing LDFLAGS: $LDFLAGS" 1>&6 - -echo "${as_me:-configure}:21276: testing repairing LDFLAGS: $LDFLAGS ..." 1>&5 - cf_temp_flags= for cf_temp_scan in $LDFLAGS do case "x$cf_temp_scan" in + (x-Werror=format*) + + test -n "$cf_temp_flags" && cf_temp_flags="$cf_temp_flags " + cf_temp_flags="${cf_temp_flags}$cf_temp_scan" + + ;; (x-Werror=*) test -n "$EXTRA_CFLAGS" && EXTRA_CFLAGS="$EXTRA_CFLAGS " - EXTRA_CFLAGS="${EXTRA_CFLAGS}"$cf_temp_scan"" + 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"" + cf_temp_flags="${cf_temp_flags}$cf_temp_scan" ;; esac done - LDFLAGS="$cf_temp_flags" - test -n "$verbose" && echo " ... fixed $LDFLAGS" 1>&6 + if test "x$LDFLAGS" != "x$cf_temp_flags" + then + test -n "$verbose" && echo " repairing LDFLAGS: $LDFLAGS" 1>&6 + +echo "${as_me:-configure}:22124: testing repairing LDFLAGS: $LDFLAGS ..." 1>&5 -echo "${as_me:-configure}:21299: testing ... fixed $LDFLAGS ..." 1>&5 + LDFLAGS="$cf_temp_flags" + test -n "$verbose" && echo " ... fixed $LDFLAGS" 1>&6 - test -n "$verbose" && echo " ... extra $EXTRA_CFLAGS" 1>&6 +echo "${as_me:-configure}:22129: testing ... fixed $LDFLAGS ..." 1>&5 -echo "${as_me:-configure}:21303: testing ... extra $EXTRA_CFLAGS ..." 1>&5 + test -n "$verbose" && echo " ... extra $EXTRA_CFLAGS" 1>&6 +echo "${as_me:-configure}:22133: testing ... extra $EXTRA_CFLAGS ..." 1>&5 + + fi ;; esac fi -echo "$as_me:21309: checking if you want to turn on gcc warnings" >&5 +echo "$as_me:22140: 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. @@ -21314,21 +22145,21 @@ if test "${enable_warnings+set}" = set; then enableval="$enable_warnings" test "$enableval" != yes && enableval=no if test "$enableval" != "no" ; then - with_warnings=yes + enable_warnings=yes else - with_warnings=no + enable_warnings=no fi else enableval=no - with_warnings=no + enable_warnings=no fi; -echo "$as_me:21326: result: $with_warnings" >&5 -echo "${ECHO_T}$with_warnings" >&6 -if test "$with_warnings" = "yes" +echo "$as_me:22157: result: $enable_warnings" >&5 +echo "${ECHO_T}$enable_warnings" >&6 +if test "$enable_warnings" = "yes" then -if ( test "$GCC" = yes || test "$GXX" = yes ) +if test "$GCC" = yes || test "$GXX" = yes then cat > conftest.i < conftest.i <&5 + { echo "$as_me:22180: 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" @@ -21364,8 +22196,8 @@ 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:22233: \"$ac_compile\"") >&5 (eval $ac_compile) 2>&5 ac_status=$? - echo "$as_me:21404: \$? = $ac_status" >&5 - (exit $ac_status); }; then - test -n "$verbose" && echo "$as_me:21406: result: ... $cf_attribute" >&5 + echo "$as_me:22236: \$? = $ac_status" >&5 + (exit "$ac_status"); }; then + test -n "$verbose" && echo "$as_me:22238: 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 if test "x$have_x" = xyes; then @@ -21480,8 +22312,8 @@ do esac done -cat >conftest.$ac_ext <<_ACEOF -#line 21484 "configure" +cat >"conftest.$ac_ext" <<_ACEOF +#line 22316 "configure" #include "confdefs.h" #include @@ -21490,32 +22322,32 @@ cat >conftest.$ac_ext <<_ACEOF int main (void) { -String foo = malloc(1); (void)foo +String foo = malloc(1); free((void*)foo) ; return 0; } _ACEOF -rm -f conftest.$ac_objext -if { (eval echo "$as_me:21499: \"$ac_compile\"") >&5 +rm -f "conftest.$ac_objext" +if { (eval echo "$as_me:22331: \"$ac_compile\"") >&5 (eval $ac_compile) 2>&5 ac_status=$? - echo "$as_me:21502: \$? = $ac_status" >&5 - (exit $ac_status); } && - { ac_try='test -s conftest.$ac_objext' - { (eval echo "$as_me:21505: \"$ac_try\"") >&5 + echo "$as_me:22334: \$? = $ac_status" >&5 + (exit "$ac_status"); } && + { ac_try='test -s "conftest.$ac_objext"' + { (eval echo "$as_me:22337: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? - echo "$as_me:21508: \$? = $ac_status" >&5 - (exit $ac_status); }; }; then + echo "$as_me:22340: \$? = $ac_status" >&5 + (exit "$ac_status"); }; }; then -echo "$as_me:21511: checking for X11/Xt const-feature" >&5 +echo "$as_me:22343: 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 21518 "configure" + cat >"conftest.$ac_ext" <<_ACEOF +#line 22350 "configure" #include "confdefs.h" #define _CONST_X_STRING /* X11R7.8 (perhaps) */ @@ -21531,39 +22363,39 @@ String foo = malloc(1); *foo = 0 return 0; } _ACEOF -rm -f conftest.$ac_objext -if { (eval echo "$as_me:21535: \"$ac_compile\"") >&5 +rm -f "conftest.$ac_objext" +if { (eval echo "$as_me:22367: \"$ac_compile\"") >&5 (eval $ac_compile) 2>&5 ac_status=$? - echo "$as_me:21538: \$? = $ac_status" >&5 - (exit $ac_status); } && - { ac_try='test -s conftest.$ac_objext' - { (eval echo "$as_me:21541: \"$ac_try\"") >&5 + echo "$as_me:22370: \$? = $ac_status" >&5 + (exit "$ac_status"); } && + { ac_try='test -s "conftest.$ac_objext"' + { (eval echo "$as_me:22373: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? - echo "$as_me:21544: \$? = $ac_status" >&5 - (exit $ac_status); }; }; then + echo "$as_me:22376: \$? = $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 +rm -f "conftest.$ac_objext" "conftest.$ac_ext" fi -echo "$as_me:21559: result: $cf_cv_const_x_string" >&5 +echo "$as_me:22391: result: $cf_cv_const_x_string" >&5 echo "${ECHO_T}$cf_cv_const_x_string" >&6 LIBS="$cf_save_LIBS_CF_CONST_X_STRING" CFLAGS="$cf_save_CFLAGS_CF_CONST_X_STRING" CPPFLAGS="$cf_save_CPPFLAGS_CF_CONST_X_STRING" -case $cf_cv_const_x_string in +case "$cf_cv_const_x_string" in (no) test -n "$CPPFLAGS" && CPPFLAGS="$CPPFLAGS " @@ -21580,12 +22412,12 @@ esac 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" fi -cat > conftest.$ac_ext < "conftest.$ac_ext" <&5 + { echo "$as_me:22436: checking for $CC warning options..." >&5 echo "$as_me: checking for $CC warning options..." >&6;} cf_save_CFLAGS="$CFLAGS" EXTRA_CFLAGS="$EXTRA_CFLAGS -Wall" @@ -21617,12 +22449,12 @@ echo "$as_me: checking for $CC warning options..." >&6;} wd981 do CFLAGS="$cf_save_CFLAGS $EXTRA_CFLAGS -$cf_opt" - if { (eval echo "$as_me:21620: \"$ac_compile\"") >&5 + if { (eval echo "$as_me:22452: \"$ac_compile\"") >&5 (eval $ac_compile) 2>&5 ac_status=$? - echo "$as_me:21623: \$? = $ac_status" >&5 - (exit $ac_status); }; then - test -n "$verbose" && echo "$as_me:21625: result: ... -$cf_opt" >&5 + echo "$as_me:22455: \$? = $ac_status" >&5 + (exit "$ac_status"); }; then + test -n "$verbose" && echo "$as_me:22457: result: ... -$cf_opt" >&5 echo "${ECHO_T}... -$cf_opt" >&6 EXTRA_CFLAGS="$EXTRA_CFLAGS -$cf_opt" fi @@ -21630,7 +22462,7 @@ echo "${ECHO_T}... -$cf_opt" >&6 CFLAGS="$cf_save_CFLAGS" elif test "$GCC" = yes && test "$GCC_VERSION" != "unknown" then - { echo "$as_me:21633: checking for $CC warning options..." >&5 + { echo "$as_me:22465: checking for $CC warning options..." >&5 echo "$as_me: checking for $CC warning options..." >&6;} cf_save_CFLAGS="$CFLAGS" cf_warn_CONST="" @@ -21653,30 +22485,30 @@ echo "$as_me: checking for $CC warning options..." >&6;} Wundef Wno-inline $cf_gcc_warnings $cf_warn_CONST Wno-unknown-pragmas do CFLAGS="$cf_save_CFLAGS $EXTRA_CFLAGS -$cf_opt" - if { (eval echo "$as_me:21656: \"$ac_compile\"") >&5 + if { (eval echo "$as_me:22488: \"$ac_compile\"") >&5 (eval $ac_compile) 2>&5 ac_status=$? - echo "$as_me:21659: \$? = $ac_status" >&5 - (exit $ac_status); }; then - test -n "$verbose" && echo "$as_me:21661: result: ... -$cf_opt" >&5 + echo "$as_me:22491: \$? = $ac_status" >&5 + (exit "$ac_status"); }; then + test -n "$verbose" && echo "$as_me:22493: result: ... -$cf_opt" >&5 echo "${ECHO_T}... -$cf_opt" >&6 - case $cf_opt in + 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}:21669: testing feature is broken in gcc $GCC_VERSION ..." 1>&5 +echo "${as_me:-configure}:22501: 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}:21679: testing feature is broken in gcc $GCC_VERSION ..." 1>&5 +echo "${as_me:-configure}:22511: testing feature is broken in gcc $GCC_VERSION ..." 1>&5 continue;; esac @@ -21687,33 +22519,38 @@ echo "${as_me:-configure}:21679: testing feature is broken in gcc $GCC_VERSION . done CFLAGS="$cf_save_CFLAGS" fi -rm -rf conftest* +rm -rf ./conftest* fi fi -echo "$as_me:21696: checking if you want to use dmalloc for testing" >&5 +echo "$as_me:22528: checking if you want to use dmalloc for testing" >&5 echo $ECHO_N "checking if you want to use dmalloc for testing... $ECHO_C" >&6 # Check whether --with-dmalloc or --without-dmalloc was given. if test "${with_dmalloc+set}" = set; then withval="$with_dmalloc" + case "x$withval" in + (x|xno) ;; + (*) + : "${with_cflags:=-g}" + : "${enable_leaks:=no}" + with_dmalloc=yes cat >>confdefs.h <&5 +echo "$as_me:22550: result: ${with_dmalloc:-no}" >&5 echo "${ECHO_T}${with_dmalloc:-no}" >&6 -case .$with_cflags in +case ".$with_cflags" in (.*-g*) case .$CFLAGS in (.*-g*) @@ -21727,19 +22564,19 @@ cf_new_extra_cppflags= for cf_add_cflags in -g 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" @@ -21758,7 +22595,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/=.*//'` @@ -21788,7 +22625,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}" \ @@ -21824,24 +22661,24 @@ fi esac if test "$with_dmalloc" = yes ; then - echo "$as_me:21827: checking for dmalloc.h" >&5 + echo "$as_me:22664: checking for dmalloc.h" >&5 echo $ECHO_N "checking for dmalloc.h... $ECHO_C" >&6 if test "${ac_cv_header_dmalloc_h+set}" = set; then echo $ECHO_N "(cached) $ECHO_C" >&6 else - cat >conftest.$ac_ext <<_ACEOF -#line 21833 "configure" + cat >"conftest.$ac_ext" <<_ACEOF +#line 22670 "configure" #include "confdefs.h" #include _ACEOF -if { (eval echo "$as_me:21837: \"$ac_cpp conftest.$ac_ext\"") >&5 - (eval $ac_cpp conftest.$ac_ext) 2>conftest.er1 +if { (eval echo "$as_me:22674: \"$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:21843: \$? = $ac_status" >&5 - (exit $ac_status); } >/dev/null; then + echo "$as_me:22680: \$? = $ac_status" >&5 + (exit "$ac_status"); } >/dev/null; then if test -s conftest.err; then ac_cpp_err=$ac_c_preproc_warn_flag else @@ -21854,24 +22691,24 @@ if test -z "$ac_cpp_err"; then ac_cv_header_dmalloc_h=yes else echo "$as_me: failed program was:" >&5 - cat conftest.$ac_ext >&5 + cat "conftest.$ac_ext" >&5 ac_cv_header_dmalloc_h=no fi -rm -f conftest.err conftest.$ac_ext +rm -f conftest.err "conftest.$ac_ext" fi -echo "$as_me:21862: result: $ac_cv_header_dmalloc_h" >&5 +echo "$as_me:22699: result: $ac_cv_header_dmalloc_h" >&5 echo "${ECHO_T}$ac_cv_header_dmalloc_h" >&6 -if test $ac_cv_header_dmalloc_h = yes; then +if test "$ac_cv_header_dmalloc_h" = yes; then -echo "$as_me:21866: checking for dmalloc_debug in -ldmalloc" >&5 +echo "$as_me:22703: checking for dmalloc_debug in -ldmalloc" >&5 echo $ECHO_N "checking for dmalloc_debug in -ldmalloc... $ECHO_C" >&6 if test "${ac_cv_lib_dmalloc_dmalloc_debug+set}" = set; then echo $ECHO_N "(cached) $ECHO_C" >&6 else ac_check_lib_save_LIBS=$LIBS LIBS="-ldmalloc $LIBS" -cat >conftest.$ac_ext <<_ACEOF -#line 21874 "configure" +cat >"conftest.$ac_ext" <<_ACEOF +#line 22711 "configure" #include "confdefs.h" /* Override any gcc2 internal prototype to avoid an error. */ @@ -21889,30 +22726,30 @@ dmalloc_debug (); return 0; } _ACEOF -rm -f conftest.$ac_objext conftest$ac_exeext -if { (eval echo "$as_me:21893: \"$ac_link\"") >&5 +rm -f "conftest.$ac_objext" "conftest$ac_exeext" +if { (eval echo "$as_me:22730: \"$ac_link\"") >&5 (eval $ac_link) 2>&5 ac_status=$? - echo "$as_me:21896: \$? = $ac_status" >&5 - (exit $ac_status); } && - { ac_try='test -s conftest$ac_exeext' - { (eval echo "$as_me:21899: \"$ac_try\"") >&5 + echo "$as_me:22733: \$? = $ac_status" >&5 + (exit "$ac_status"); } && + { ac_try='test -s "conftest$ac_exeext"' + { (eval echo "$as_me:22736: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? - echo "$as_me:21902: \$? = $ac_status" >&5 - (exit $ac_status); }; }; then + echo "$as_me:22739: \$? = $ac_status" >&5 + (exit "$ac_status"); }; }; then ac_cv_lib_dmalloc_dmalloc_debug=yes else echo "$as_me: failed program was:" >&5 -cat conftest.$ac_ext >&5 +cat "conftest.$ac_ext" >&5 ac_cv_lib_dmalloc_dmalloc_debug=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:21913: result: $ac_cv_lib_dmalloc_dmalloc_debug" >&5 +echo "$as_me:22750: result: $ac_cv_lib_dmalloc_dmalloc_debug" >&5 echo "${ECHO_T}$ac_cv_lib_dmalloc_dmalloc_debug" >&6 -if test $ac_cv_lib_dmalloc_dmalloc_debug = yes; then +if test "$ac_cv_lib_dmalloc_dmalloc_debug" = yes; then cat >>confdefs.h <&5 +echo "$as_me:22765: checking if you want to use dbmalloc for testing" >&5 echo $ECHO_N "checking if you want to use dbmalloc for testing... $ECHO_C" >&6 # Check whether --with-dbmalloc or --without-dbmalloc was given. if test "${with_dbmalloc+set}" = set; then withval="$with_dbmalloc" + case "x$withval" in + (x|xno) ;; + (*) + : "${with_cflags:=-g}" + : "${enable_leaks:=no}" + with_dbmalloc=yes cat >>confdefs.h <&5 +echo "$as_me:22787: result: ${with_dbmalloc:-no}" >&5 echo "${ECHO_T}${with_dbmalloc:-no}" >&6 -case .$with_cflags in +case ".$with_cflags" in (.*-g*) case .$CFLAGS in (.*-g*) @@ -21959,19 +22801,19 @@ cf_new_extra_cppflags= for cf_add_cflags in -g 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" @@ -21990,7 +22832,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/=.*//'` @@ -22020,7 +22862,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}" \ @@ -22056,24 +22898,24 @@ fi esac if test "$with_dbmalloc" = yes ; then - echo "$as_me:22059: checking for dbmalloc.h" >&5 + echo "$as_me:22901: checking for dbmalloc.h" >&5 echo $ECHO_N "checking for dbmalloc.h... $ECHO_C" >&6 if test "${ac_cv_header_dbmalloc_h+set}" = set; then echo $ECHO_N "(cached) $ECHO_C" >&6 else - cat >conftest.$ac_ext <<_ACEOF -#line 22065 "configure" + cat >"conftest.$ac_ext" <<_ACEOF +#line 22907 "configure" #include "confdefs.h" #include _ACEOF -if { (eval echo "$as_me:22069: \"$ac_cpp conftest.$ac_ext\"") >&5 - (eval $ac_cpp conftest.$ac_ext) 2>conftest.er1 +if { (eval echo "$as_me:22911: \"$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:22075: \$? = $ac_status" >&5 - (exit $ac_status); } >/dev/null; then + echo "$as_me:22917: \$? = $ac_status" >&5 + (exit "$ac_status"); } >/dev/null; then if test -s conftest.err; then ac_cpp_err=$ac_c_preproc_warn_flag else @@ -22086,24 +22928,24 @@ if test -z "$ac_cpp_err"; then ac_cv_header_dbmalloc_h=yes else echo "$as_me: failed program was:" >&5 - cat conftest.$ac_ext >&5 + cat "conftest.$ac_ext" >&5 ac_cv_header_dbmalloc_h=no fi -rm -f conftest.err conftest.$ac_ext +rm -f conftest.err "conftest.$ac_ext" fi -echo "$as_me:22094: result: $ac_cv_header_dbmalloc_h" >&5 +echo "$as_me:22936: result: $ac_cv_header_dbmalloc_h" >&5 echo "${ECHO_T}$ac_cv_header_dbmalloc_h" >&6 -if test $ac_cv_header_dbmalloc_h = yes; then +if test "$ac_cv_header_dbmalloc_h" = yes; then -echo "$as_me:22098: checking for debug_malloc in -ldbmalloc" >&5 +echo "$as_me:22940: checking for debug_malloc in -ldbmalloc" >&5 echo $ECHO_N "checking for debug_malloc in -ldbmalloc... $ECHO_C" >&6 if test "${ac_cv_lib_dbmalloc_debug_malloc+set}" = set; then echo $ECHO_N "(cached) $ECHO_C" >&6 else ac_check_lib_save_LIBS=$LIBS LIBS="-ldbmalloc $LIBS" -cat >conftest.$ac_ext <<_ACEOF -#line 22106 "configure" +cat >"conftest.$ac_ext" <<_ACEOF +#line 22948 "configure" #include "confdefs.h" /* Override any gcc2 internal prototype to avoid an error. */ @@ -22121,30 +22963,30 @@ debug_malloc (); return 0; } _ACEOF -rm -f conftest.$ac_objext conftest$ac_exeext -if { (eval echo "$as_me:22125: \"$ac_link\"") >&5 +rm -f "conftest.$ac_objext" "conftest$ac_exeext" +if { (eval echo "$as_me:22967: \"$ac_link\"") >&5 (eval $ac_link) 2>&5 ac_status=$? - echo "$as_me:22128: \$? = $ac_status" >&5 - (exit $ac_status); } && - { ac_try='test -s conftest$ac_exeext' - { (eval echo "$as_me:22131: \"$ac_try\"") >&5 + echo "$as_me:22970: \$? = $ac_status" >&5 + (exit "$ac_status"); } && + { ac_try='test -s "conftest$ac_exeext"' + { (eval echo "$as_me:22973: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? - echo "$as_me:22134: \$? = $ac_status" >&5 - (exit $ac_status); }; }; then + echo "$as_me:22976: \$? = $ac_status" >&5 + (exit "$ac_status"); }; }; then ac_cv_lib_dbmalloc_debug_malloc=yes else echo "$as_me: failed program was:" >&5 -cat conftest.$ac_ext >&5 +cat "conftest.$ac_ext" >&5 ac_cv_lib_dbmalloc_debug_malloc=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:22145: result: $ac_cv_lib_dbmalloc_debug_malloc" >&5 +echo "$as_me:22987: result: $ac_cv_lib_dbmalloc_debug_malloc" >&5 echo "${ECHO_T}$ac_cv_lib_dbmalloc_debug_malloc" >&6 -if test $ac_cv_lib_dbmalloc_debug_malloc = yes; then +if test "$ac_cv_lib_dbmalloc_debug_malloc" = yes; then cat >>confdefs.h <&5 +echo "$as_me:23002: checking if you want to use valgrind for testing" >&5 echo $ECHO_N "checking if you want to use valgrind for testing... $ECHO_C" >&6 # Check whether --with-valgrind or --without-valgrind was given. if test "${with_valgrind+set}" = set; then withval="$with_valgrind" + case "x$withval" in + (x|xno) ;; + (*) + : "${with_cflags:=-g}" + : "${enable_leaks:=no}" + with_valgrind=yes cat >>confdefs.h <&5 +echo "$as_me:23024: result: ${with_valgrind:-no}" >&5 echo "${ECHO_T}${with_valgrind:-no}" >&6 -case .$with_cflags in +case ".$with_cflags" in (.*-g*) case .$CFLAGS in (.*-g*) @@ -22191,19 +23038,19 @@ cf_new_extra_cppflags= for cf_add_cflags in -g 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" @@ -22222,7 +23069,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/=.*//'` @@ -22252,7 +23099,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}" \ @@ -22287,20 +23134,21 @@ fi ;; esac -echo "$as_me:22290: checking if you want to perform memory-leak testing" >&5 +echo "$as_me:23137: checking if you want to perform memory-leak testing" >&5 echo $ECHO_N "checking if you want to perform memory-leak testing... $ECHO_C" >&6 # Check whether --enable-leaks or --disable-leaks was given. if test "${enable_leaks+set}" = set; then enableval="$enable_leaks" - if test "x$enableval" = xno; then with_no_leaks=yes; else with_no_leaks=no; fi + enable_leaks=$enableval else - : ${with_no_leaks:=no} + enable_leaks=yes fi; -echo "$as_me:22300: result: $with_no_leaks" >&5 +if test "x$enable_leaks" = xno; then with_no_leaks=yes; else with_no_leaks=no; fi +echo "$as_me:23148: result: $with_no_leaks" >&5 echo "${ECHO_T}$with_no_leaks" >&6 -if test "$with_no_leaks" = yes ; then +if test "$enable_leaks" = no ; then cat >>confdefs.h <<\EOF #define NO_LEAKS 1 @@ -22315,9 +23163,9 @@ fi LD_RPATH_OPT= if test "x$cf_cv_enable_rpath" != xno then - echo "$as_me:22318: checking for an rpath option" >&5 + echo "$as_me:23166: 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," @@ -22346,12 +23194,12 @@ echo $ECHO_N "checking for an rpath option... $ECHO_C" >&6 (*) ;; esac - echo "$as_me:22349: result: $LD_RPATH_OPT" >&5 + echo "$as_me:23197: result: $LD_RPATH_OPT" >&5 echo "${ECHO_T}$LD_RPATH_OPT" >&6 case "x$LD_RPATH_OPT" in (x-R*) - echo "$as_me:22354: checking if we need a space after rpath option" >&5 + echo "$as_me:23202: 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" @@ -22371,8 +23219,8 @@ for cf_add_1lib in $cf_add_0lib; do done LIBS="$cf_add_libs" - cat >conftest.$ac_ext <<_ACEOF -#line 22375 "configure" + cat >"conftest.$ac_ext" <<_ACEOF +#line 23223 "configure" #include "confdefs.h" int @@ -22383,34 +23231,34 @@ main (void) return 0; } _ACEOF -rm -f conftest.$ac_objext conftest$ac_exeext -if { (eval echo "$as_me:22387: \"$ac_link\"") >&5 +rm -f "conftest.$ac_objext" "conftest$ac_exeext" +if { (eval echo "$as_me:23235: \"$ac_link\"") >&5 (eval $ac_link) 2>&5 ac_status=$? - echo "$as_me:22390: \$? = $ac_status" >&5 - (exit $ac_status); } && - { ac_try='test -s conftest$ac_exeext' - { (eval echo "$as_me:22393: \"$ac_try\"") >&5 + echo "$as_me:23238: \$? = $ac_status" >&5 + (exit "$ac_status"); } && + { ac_try='test -s "conftest$ac_exeext"' + { (eval echo "$as_me:23241: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? - echo "$as_me:22396: \$? = $ac_status" >&5 - (exit $ac_status); }; }; then + echo "$as_me:23244: \$? = $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:22406: result: $cf_rpath_space" >&5 + echo "$as_me:23254: result: $cf_rpath_space" >&5 echo "${ECHO_T}$cf_rpath_space" >&6 test "$cf_rpath_space" = yes && LD_RPATH_OPT="$LD_RPATH_OPT " ;; esac fi -echo "$as_me:22413: checking if rpath-hack should be disabled" >&5 +echo "$as_me:23261: checking if rpath-hack should be disabled" >&5 echo $ECHO_N "checking if rpath-hack should be disabled... $ECHO_C" >&6 # Check whether --enable-rpath-hack or --disable-rpath-hack was given. @@ -22418,30 +23266,32 @@ if test "${enable_rpath_hack+set}" = set; then enableval="$enable_rpath_hack" test "$enableval" != no && enableval=yes if test "$enableval" != "yes" ; then - cf_disable_rpath_hack=yes + enable_rpath_hack=no else - cf_disable_rpath_hack=no + enable_rpath_hack=yes fi else enableval=yes - cf_disable_rpath_hack=no + enable_rpath_hack=yes fi; -echo "$as_me:22430: result: $cf_disable_rpath_hack" >&5 +if test "x$enable_rpath_hack" = xno; then cf_disable_rpath_hack=yes; else cf_disable_rpath_hack=no; fi +echo "$as_me:23279: result: $cf_disable_rpath_hack" >&5 echo "${ECHO_T}$cf_disable_rpath_hack" >&6 -if test "$cf_disable_rpath_hack" = no ; then -echo "$as_me:22434: checking for updated LDFLAGS" >&5 +if test "$enable_rpath_hack" = yes ; then + +echo "$as_me:23284: checking for updated LDFLAGS" >&5 echo $ECHO_N "checking for updated LDFLAGS... $ECHO_C" >&6 if test -n "$LD_RPATH_OPT" ; then - echo "$as_me:22437: result: maybe" >&5 + echo "$as_me:23287: result: maybe" >&5 echo "${ECHO_T}maybe" >&6 for ac_prog in ldd do # Extract the first word of "$ac_prog", so it can be a program name with args. set dummy $ac_prog; ac_word=$2 -echo "$as_me:22444: checking for $ac_word" >&5 +echo "$as_me:23294: checking for $ac_word" >&5 echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6 if test "${ac_cv_prog_cf_ldd_prog+set}" = set; then echo $ECHO_N "(cached) $ECHO_C" >&6 @@ -22456,7 +23306,7 @@ for ac_dir in $ac_dummy; do test -z "$ac_dir" && ac_dir=. $as_executable_p "$ac_dir/$ac_word" || continue ac_cv_prog_cf_ldd_prog="$ac_prog" -echo "$as_me:22459: found $ac_dir/$ac_word" >&5 +echo "$as_me:23309: found $ac_dir/$ac_word" >&5 break done @@ -22464,10 +23314,10 @@ fi fi cf_ldd_prog=$ac_cv_prog_cf_ldd_prog if test -n "$cf_ldd_prog"; then - echo "$as_me:22467: result: $cf_ldd_prog" >&5 + echo "$as_me:23317: result: $cf_ldd_prog" >&5 echo "${ECHO_T}$cf_ldd_prog" >&6 else - echo "$as_me:22470: result: no" >&5 + echo "$as_me:23320: result: no" >&5 echo "${ECHO_T}no" >&6 fi @@ -22480,8 +23330,8 @@ test -n "$cf_ldd_prog" || cf_ldd_prog="no" then cf_rpath_oops= -cat >conftest.$ac_ext <<_ACEOF -#line 22484 "configure" +cat >"conftest.$ac_ext" <<_ACEOF +#line 23334 "configure" #include "confdefs.h" #include int @@ -22492,25 +23342,25 @@ printf("Hello"); return 0; } _ACEOF -rm -f conftest.$ac_objext conftest$ac_exeext -if { (eval echo "$as_me:22496: \"$ac_link\"") >&5 +rm -f "conftest.$ac_objext" "conftest$ac_exeext" +if { (eval echo "$as_me:23346: \"$ac_link\"") >&5 (eval $ac_link) 2>&5 ac_status=$? - echo "$as_me:22499: \$? = $ac_status" >&5 - (exit $ac_status); } && - { ac_try='test -s conftest$ac_exeext' - { (eval echo "$as_me:22502: \"$ac_try\"") >&5 + echo "$as_me:23349: \$? = $ac_status" >&5 + (exit "$ac_status"); } && + { ac_try='test -s "conftest$ac_exeext"' + { (eval echo "$as_me:23352: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? - echo "$as_me:22505: \$? = $ac_status" >&5 - (exit $ac_status); }; }; then - cf_rpath_oops=`$cf_ldd_prog conftest$ac_exeext | fgrep ' not found' | sed -e 's% =>.*$%%' |sort | uniq` - cf_rpath_list=`$cf_ldd_prog conftest$ac_exeext | fgrep / | sed -e 's%^.*[ ]/%/%' -e 's%/[^/][^/]*$%%' |sort | uniq` + echo "$as_me:23355: \$? = $ac_status" >&5 + (exit "$ac_status"); }; }; then + cf_rpath_oops=`"$cf_ldd_prog" "conftest$ac_exeext" | ${FGREP-fgrep} ' not found' | sed -e 's% =>.*$%%' |sort | uniq` + cf_rpath_list=`"$cf_ldd_prog" "conftest$ac_exeext" | ${FGREP-fgrep} / | sed -e 's%^.*[ ]/%/%' -e 's%/[^/][^/]*$%%' |sort | uniq` 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_exeext conftest.$ac_ext +rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext" # If we passed the link-test, but get a "not found" on a given library, # this could be due to inept reconfiguration of gcc to make it only @@ -22526,11 +23376,11 @@ rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext /usr/pkg \ /opt/sfw do - if test -f $cf_rpath_dir/lib/$cf_rpath_src + if test -f "$cf_rpath_dir/lib/$cf_rpath_src" then test -n "$verbose" && echo " ...adding -L$cf_rpath_dir/lib to LDFLAGS for $cf_rpath_src" 1>&6 -echo "${as_me:-configure}:22533: testing ...adding -L$cf_rpath_dir/lib to LDFLAGS for $cf_rpath_src ..." 1>&5 +echo "${as_me:-configure}:23383: testing ...adding -L$cf_rpath_dir/lib to LDFLAGS for $cf_rpath_src ..." 1>&5 LDFLAGS="$LDFLAGS -L$cf_rpath_dir/lib" break @@ -22542,16 +23392,16 @@ echo "${as_me:-configure}:22533: testing ...adding -L$cf_rpath_dir/lib to LDFLAG test -n "$verbose" && echo " ...checking EXTRA_LDFLAGS $EXTRA_LDFLAGS" 1>&6 -echo "${as_me:-configure}:22545: testing ...checking EXTRA_LDFLAGS $EXTRA_LDFLAGS ..." 1>&5 +echo "${as_me:-configure}:23395: testing ...checking EXTRA_LDFLAGS $EXTRA_LDFLAGS ..." 1>&5 test -n "$verbose" && echo " ...checking LDFLAGS $LDFLAGS" 1>&6 -echo "${as_me:-configure}:22549: testing ...checking LDFLAGS $LDFLAGS ..." 1>&5 +echo "${as_me:-configure}:23399: testing ...checking LDFLAGS $LDFLAGS ..." 1>&5 cf_rpath_dst= for cf_rpath_src in $LDFLAGS do - case $cf_rpath_src in + case "$cf_rpath_src" in (-L*) # check if this refers to a directory which we will ignore @@ -22583,7 +23433,7 @@ do then test -n "$verbose" && echo " ...Filter $cf_rpath_src ->$cf_rpath_tmp" 1>&6 -echo "${as_me:-configure}:22586: testing ...Filter $cf_rpath_src ->$cf_rpath_tmp ..." 1>&5 +echo "${as_me:-configure}:23436: testing ...Filter $cf_rpath_src ->$cf_rpath_tmp ..." 1>&5 EXTRA_LDFLAGS="$cf_rpath_tmp $EXTRA_LDFLAGS" fi @@ -22596,16 +23446,16 @@ LDFLAGS=$cf_rpath_dst test -n "$verbose" && echo " ...checked LDFLAGS $LDFLAGS" 1>&6 -echo "${as_me:-configure}:22599: testing ...checked LDFLAGS $LDFLAGS ..." 1>&5 +echo "${as_me:-configure}:23449: testing ...checked LDFLAGS $LDFLAGS ..." 1>&5 test -n "$verbose" && echo " ...checking LIBS $LIBS" 1>&6 -echo "${as_me:-configure}:22603: testing ...checking LIBS $LIBS ..." 1>&5 +echo "${as_me:-configure}:23453: testing ...checking LIBS $LIBS ..." 1>&5 cf_rpath_dst= for cf_rpath_src in $LIBS do - case $cf_rpath_src in + case "$cf_rpath_src" in (-L*) # check if this refers to a directory which we will ignore @@ -22637,7 +23487,7 @@ do then test -n "$verbose" && echo " ...Filter $cf_rpath_src ->$cf_rpath_tmp" 1>&6 -echo "${as_me:-configure}:22640: testing ...Filter $cf_rpath_src ->$cf_rpath_tmp ..." 1>&5 +echo "${as_me:-configure}:23490: testing ...Filter $cf_rpath_src ->$cf_rpath_tmp ..." 1>&5 EXTRA_LDFLAGS="$cf_rpath_tmp $EXTRA_LDFLAGS" fi @@ -22650,14 +23500,14 @@ LIBS=$cf_rpath_dst test -n "$verbose" && echo " ...checked LIBS $LIBS" 1>&6 -echo "${as_me:-configure}:22653: testing ...checked LIBS $LIBS ..." 1>&5 +echo "${as_me:-configure}:23503: testing ...checked LIBS $LIBS ..." 1>&5 test -n "$verbose" && echo " ...checked EXTRA_LDFLAGS $EXTRA_LDFLAGS" 1>&6 -echo "${as_me:-configure}:22657: testing ...checked EXTRA_LDFLAGS $EXTRA_LDFLAGS ..." 1>&5 +echo "${as_me:-configure}:23507: testing ...checked EXTRA_LDFLAGS $EXTRA_LDFLAGS ..." 1>&5 else - echo "$as_me:22660: result: no" >&5 + echo "$as_me:23510: result: no" >&5 echo "${ECHO_T}no" >&6 fi @@ -22744,18 +23594,20 @@ 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:22750: creating $CONFIG_STATUS" >&5 +{ echo "$as_me:23600: 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 \$@" @@ -22764,7 +23616,7 @@ 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 @@ -22777,9 +23629,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 @@ -22794,7 +23646,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 @@ -22804,9 +23656,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. @@ -22834,22 +23686,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 @@ -22878,21 +23730,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=: @@ -22915,17 +23768,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:22928: error: ambiguous option: $1 + { { echo "$as_me:23781: 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;} @@ -22944,7 +23797,7 @@ Try \`$0 --help' for more information." >&2;} ac_need_defaults=false;; # This is an error. - -*) { { echo "$as_me:22947: error: unrecognized option: $1 + -*) { { echo "$as_me:23800: 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;} @@ -22963,18 +23816,18 @@ cat >&5 << _ACEOF ## Running config.status. ## ## ----------------------- ## -This file was extended by $as_me 2.52.20200802, executed with +This file was extended by $as_me 2.52.20221202, 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 @@ -22994,7 +23847,7 @@ do "Makefile" ) CONFIG_FILES="$CONFIG_FILES Makefile" ;; "default" ) CONFIG_COMMANDS="$CONFIG_COMMANDS default" ;; "ncurses_cfg.h" ) CONFIG_HEADERS="$CONFIG_HEADERS ncurses_cfg.h:ncurses_tst.hin" ;; - *) { { echo "$as_me:22997: error: invalid argument: $ac_config_target" >&5 + *) { { echo "$as_me:23850: error: invalid argument: $ac_config_target" >&5 echo "$as_me: error: invalid argument: $ac_config_target" >&2;} { (exit 1); exit 1; }; };; esac @@ -23004,7 +23857,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 @@ -23018,14 +23871,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 @@ -23034,7 +23887,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 @@ -23096,6 +23949,8 @@ s,@EXEEXT@,$EXEEXT,;t t s,@OBJEXT@,$OBJEXT,;t t s,@EXTRA_CPPFLAGS@,$EXTRA_CPPFLAGS,;t t s,@CPP@,$CPP,;t t +s,@GREP@,$GREP,;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 @@ -23104,6 +23959,9 @@ s,@INSTALL_OPT_S@,$INSTALL_OPT_S,;t t s,@INSTALL_OPT_O@,$INSTALL_OPT_O,;t t s,@LINT@,$LINT,;t t s,@LINT_OPTS@,$LINT_OPTS,;t t +s,@LINT_LIBS@,$LINT_LIBS,;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 @@ -23137,6 +23995,9 @@ s,@TINFO_LIBS@,$TINFO_LIBS,;t t s,@cf_cv_abi_version@,$cf_cv_abi_version,;t t s,@cf_cv_rel_version@,$cf_cv_rel_version,;t t s,@includesubdir@,$includesubdir,;t t +s,@FGREP@,$FGREP,;t t +s,@HAVE_STDNORETURN_H@,$HAVE_STDNORETURN_H,;t t +s,@STDC_NORETURN@,$STDC_NORETURN,;t t s,@PKG_CONFIG@,$PKG_CONFIG,;t t s,@ac_pt_PKG_CONFIG@,$ac_pt_PKG_CONFIG,;t t s,@ECHO_LT@,$ECHO_LT,;t t @@ -23165,7 +24026,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 @@ -23174,13 +24035,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 @@ -23188,19 +24049,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 @@ -23208,27 +24069,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,[^:]*:,,'` @@ -23265,26 +24126,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 @@ -23293,7 +24154,7 @@ done; } esac if test x"$ac_file" != x-; then - { echo "$as_me:23296: creating $ac_file" >&5 + { echo "$as_me:24157: creating $ac_file" >&5 echo "$as_me: creating $ac_file" >&6;} rm -f "$ac_file" fi @@ -23308,48 +24169,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:23314: error: cannot find input file: $f" >&5 + test -f "$f" || { { echo "$as_me:24175: 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:23327: error: cannot find input file: $f" >&5 + { { echo "$as_me:24188: 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:23343: WARNING: datarootdir was used implicitly but not set: + { echo "$as_me:24204: 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:23352: WARNING: datarootdir was used explicitly but not set: + { echo "$as_me:24213: 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;} @@ -23363,53 +24224,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 +: "${FGREP:=grep -F}" +: "${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:23389: WARNING: Variable $ac_name is used but was not set: + ac_seen=`echo "$ac_seen" |sed -e 's,^,'"$ac_file"':,'` + { echo "$as_me:24258: 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:23400: 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:24269: 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. @@ -23436,9 +24305,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,[^:]*:,,'` @@ -23446,7 +24315,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:23449: creating $ac_file" >&5 + test x"$ac_file" != x- && { echo "$as_me:24318: creating $ac_file" >&5 echo "$as_me: creating $ac_file" >&6;} # First look for the input files in the build tree, otherwise in the @@ -23454,10 +24323,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:23460: error: cannot find input file: $f" >&5 + test -f "$f" || { { echo "$as_me:24329: error: cannot find input file: $f" >&5 echo "$as_me: error: cannot find input file: $f" >&2;} { (exit 1); exit 1; }; } echo $f;; @@ -23467,17 +24336,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:23473: error: cannot find input file: $f" >&5 + { { echo "$as_me:24342: 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 @@ -23490,14 +24359,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 @@ -23509,26 +24378,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:23531: $ac_file is unchanged" >&5 + if cmp -s "$ac_file" "$tmp/config.h" 2>/dev/null; then + { echo "$as_me:24400: $ac_file is unchanged" >&5 echo "$as_me: $ac_file is unchanged" >&6;} else ac_dir=`$as_expr X"$ac_file" : 'X\(.*[^/]\)//*[^/][^/]*/*$' \| \ @@ -23560,16 +24429,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. # @@ -23577,15 +24446,15 @@ 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 ) for cf_dir in . do - if test ! -d $srcdir/$cf_dir; then + if test ! -d "$srcdir/$cf_dir" ; then continue - elif test -f $srcdir/$cf_dir/programs; then - $AWK -f $srcdir/mk-test.awk INSTALL=yes ECHO_LINK="$ECHO_LD" $srcdir/$cf_dir/programs >>$cf_dir/Makefile + elif test -f "$srcdir/$cf_dir/programs" ; then + $AWK -f $srcdir/mk-test.awk INSTALL=yes ECHO_LINK="$ECHO_LD" "$srcdir/$cf_dir/programs" >>$cf_dir/Makefile fi done @@ -23623,11 +24492,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. @@ -23641,10 +24510,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