diff options
Diffstat (limited to 'configure')
| -rwxr-xr-x | configure | 13682 |
1 files changed, 7621 insertions, 6061 deletions
diff --git a/configure b/configure index 5b1b53de1533..1e5c94ceb37c 100755 --- a/configure +++ b/configure @@ -1,7 +1,8 @@ #! /bin/sh # Guess values for system-dependent variables and create Makefiles. -# Generated by Autoconf 2.52.20170501. +# Generated by Autoconf 2.52.20210105. # +# Copyright 2003-2020,2021 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 @@ -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="dialog.h" # Factoring default headers for most tests. @@ -175,6 +177,7 @@ datadir='${datarootdir}' sysconfdir='${prefix}/etc' sharedstatedir='${prefix}/com' localstatedir='${prefix}/var' +runstatedir='${localstatedir}/run' libdir='${exec_prefix}/lib' includedir='${prefix}/include' oldincludedir='/usr/include' @@ -202,7 +205,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 ;; @@ -243,7 +246,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-*) @@ -252,8 +255,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 @@ -317,6 +320,15 @@ do | --locals=* | --local=* | --loca=* | --loc=* | --lo=*) localstatedir=$ac_optarg ;; + -runstatedir | --runstatedir | --runstatedi | --runstated \ + | --runstate | --runstat | --runsta | --runst \ + | --runs | --run | --ru) + ac_prev=runstatedir ;; + -runstatedir=* | --runstatedir=* | --runstatedi=* | --runstated=* \ + | --runstate=* | --runstat=* | --runsta=* | --runst=* \ + | --runs=* | --run=* | --ru=*) + runstatedir=$ac_optarg ;; + -mandir | --mandir | --mandi | --mand | --man | --ma | --m) ac_prev=mandir ;; -mandir=* | --mandir=* | --mandi=* | --mand=* | --man=* | --ma=* | --m=*) @@ -434,8 +446,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 @@ -447,7 +459,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) @@ -481,21 +493,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 @@ -503,8 +515,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; }; };; @@ -515,8 +527,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; }; };; @@ -553,13 +565,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; }; } @@ -654,6 +666,7 @@ Fine tuning of the installation directories: --sysconfdir=DIR read-only single-machine data [PREFIX/etc] --sharedstatedir=DIR modifiable architecture-independent data [PREFIX/com] --localstatedir=DIR modifiable single-machine data [PREFIX/var] + --runstatedir=DIR extra definition of runtime data [LOCALSTATEDIR/run] --libdir=DIR object code libraries [EPREFIX/lib] --includedir=DIR C header files [PREFIX/include] --oldincludedir=DIR C header files for non-gcc [/usr/include] @@ -693,7 +706,8 @@ Optional Packages: --disable-echo do not display "compiling" commands --disable-largefile omit support for large files --with-install-prefix=XXX sets DESTDIR, useful for packaging - --with-warnings test: turn on gcc warnings + --with-x use the X Window System + --enable-warnings test: turn on gcc compiler warnings --with-pkg-config{=path} enable/disable use of pkg-config --with-package=XXX rename dialog to XXX, library to libXXX.a, etc --enable-header-subdir install dlg_XXX headers to subdirectory @@ -710,6 +724,7 @@ Optional Packages: --with-valgrind test: use valgrind --with-no-leaks test: free permanent memory, analyze leaks --disable-trace do not support --trace option + --enable-rpath use rpath option when generating shared libraries --with-rel-version=XXX override derived release version --with-abi-version=XXX override derived ABI version --disable-libtool-version enable to use libtool's incompatible naming scheme @@ -720,7 +735,6 @@ Optional Packages: --with-shlib-version=X Specify rel or abi version for shared libs --with-versioned-syms=X markup versioned symbols using ld --with-curses-dir=DIR directory in which (n)curses is installed - --enable-rpath use rpath option when generating shared libraries --with-screen=XXX use specified curses-libraries --with-ncursesw use wide ncurses-libraries --with-ncurses use ncurses-libraries @@ -731,9 +745,9 @@ Optional Packages: --with-Xaw3dxft link with Xaw 3d xft library --with-neXtaw link with neXT Athena library --with-XawPlus link with Athena-Plus library - --with-x use the X Window System --disable-extras do not include extra dialogs --disable-rc-file do not include config-file support + --disable-rc-file2 do not use extra attributes in config-file --disable-Xdialog do not include Xdialog-style dialogs (1.1) --disable-Xdialog2 do not include extra Xdialog-style dialogs (1.2) --disable-whiptail do not map extra whiptail options @@ -764,42 +778,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-2020,2021 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 @@ -813,7 +828,7 @@ This file contains any messages produced by compilers while running configure, to aid debugging if configure makes a mistake. It was created by $as_me, which was -generated by GNU Autoconf 2.52.20170501. Invocation command line was +generated by GNU Autoconf 2.52.20210105. Invocation command line was $ $0 $@ @@ -860,7 +875,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 \ @@ -917,7 +932,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 @@ -937,7 +952,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:940: loading site script $ac_site_file" >&5 + { echo "$as_me:955: 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" @@ -948,7 +963,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:951: loading cache $cache_file" >&5 + { echo "$as_me:966: loading cache $cache_file" >&5 echo "$as_me: loading cache $cache_file" >&6;} case $cache_file in [\\/]* | ?:[\\/]* ) . $cache_file;; @@ -956,7 +971,7 @@ echo "$as_me: loading cache $cache_file" >&6;} esac fi else - { echo "$as_me:959: creating cache $cache_file" >&5 + { echo "$as_me:974: creating cache $cache_file" >&5 echo "$as_me: creating cache $cache_file" >&6;} >$cache_file fi @@ -970,23 +985,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:975: error: \`$ac_var' was set to \`$ac_old_val' in the previous run" >&5 + { echo "$as_me:990: 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:979: error: \`$ac_var' was not set in the previous run" >&5 + { echo "$as_me:994: 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:985: error: \`$ac_var' has changed since the previous run:" >&5 + { echo "$as_me:1000: 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:987: former value: $ac_old_val" >&5 + { echo "$as_me:1002: former value: $ac_old_val" >&5 echo "$as_me: former value: $ac_old_val" >&2;} - { echo "$as_me:989: current value: $ac_new_val" >&5 + { echo "$as_me:1004: current value: $ac_new_val" >&5 echo "$as_me: current value: $ac_new_val" >&2;} ac_cache_corrupted=: fi;; @@ -994,7 +1009,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'" @@ -1004,35 +1019,43 @@ echo "$as_me: current value: $ac_new_val" >&2;} esac fi done -if $ac_cache_corrupted; then - { echo "$as_me:1008: error: changes in the environment can compromise the build" >&5 +if "$ac_cache_corrupted"; then + { echo "$as_me:1023: 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:1010: error: run \`make distclean' and/or \`rm $cache_file' and start over" >&5 + { { echo "$as_me:1025: 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:1031: PATH=\".;.\"; conftest.sh") >&5 +if { (echo "$as_me:1054: PATH=\".;.\"; conftest.sh") >&5 (PATH=".;."; conftest.sh) 2>&5 ac_status=$? - echo "$as_me:1034: \$? = $ac_status" >&5 - (exit $ac_status); }; then + echo "$as_me:1057: \$? = $ac_status" >&5 + (exit "$ac_status"); }; then ac_path_separator=';' else ac_path_separator=: @@ -1057,16 +1080,93 @@ rm conftest.sed DESTDIR= +ac_aux_dir= +for ac_dir in $srcdir $srcdir/.. $srcdir/../..; do + 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 + ac_aux_dir=$ac_dir + ac_install_sh="$ac_aux_dir/install.sh -c" + break + 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:1100: 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 +ac_config_guess="$SHELL $ac_aux_dir/config.guess" +ac_config_sub="$SHELL $ac_aux_dir/config.sub" +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:1110: error: cannot run $ac_config_sub" >&5 +echo "$as_me: error: cannot run $ac_config_sub" >&2;} + { (exit 1); exit 1; }; } + +echo "$as_me:1114: 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 +else + ac_cv_build_alias=$build_alias +test -z "$ac_cv_build_alias" && + ac_cv_build_alias=`$ac_config_guess` +test -z "$ac_cv_build_alias" && + { { echo "$as_me:1123: 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:1127: 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:1132: result: $ac_cv_build" >&5 +echo "${ECHO_T}$ac_cv_build" >&6 +build=$ac_cv_build +build_cpu=`echo "$ac_cv_build" | sed 's/^\([^-]*\)-\([^-]*\)-\(.*\)$/\1/'` +build_vendor=`echo "$ac_cv_build" | sed 's/^\([^-]*\)-\([^-]*\)-\(.*\)$/\2/'` +build_os=`echo "$ac_cv_build" | sed 's/^\([^-]*\)-\([^-]*\)-\(.*\)$/\3/'` + +echo "$as_me:1139: 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 +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:1148: 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:1153: 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/'` + 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:1069: checking for $ac_word" >&5 +echo "$as_me:1169: 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 @@ -1081,7 +1181,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:1084: found $ac_dir/$ac_word" >&5 +echo "$as_me:1184: found $ac_dir/$ac_word" >&5 break done @@ -1089,10 +1189,10 @@ fi fi CC=$ac_cv_prog_CC if test -n "$CC"; then - echo "$as_me:1092: result: $CC" >&5 + echo "$as_me:1192: result: $CC" >&5 echo "${ECHO_T}$CC" >&6 else - echo "$as_me:1095: result: no" >&5 + echo "$as_me:1195: result: no" >&5 echo "${ECHO_T}no" >&6 fi @@ -1101,7 +1201,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:1104: checking for $ac_word" >&5 +echo "$as_me:1204: 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 @@ -1116,7 +1216,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:1119: found $ac_dir/$ac_word" >&5 +echo "$as_me:1219: found $ac_dir/$ac_word" >&5 break done @@ -1124,10 +1224,10 @@ fi fi ac_ct_CC=$ac_cv_prog_ac_ct_CC if test -n "$ac_ct_CC"; then - echo "$as_me:1127: result: $ac_ct_CC" >&5 + echo "$as_me:1227: result: $ac_ct_CC" >&5 echo "${ECHO_T}$ac_ct_CC" >&6 else - echo "$as_me:1130: result: no" >&5 + echo "$as_me:1230: result: no" >&5 echo "${ECHO_T}no" >&6 fi @@ -1140,7 +1240,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:1143: checking for $ac_word" >&5 +echo "$as_me:1243: 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 @@ -1155,7 +1255,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:1158: found $ac_dir/$ac_word" >&5 +echo "$as_me:1258: found $ac_dir/$ac_word" >&5 break done @@ -1163,10 +1263,10 @@ fi fi CC=$ac_cv_prog_CC if test -n "$CC"; then - echo "$as_me:1166: result: $CC" >&5 + echo "$as_me:1266: result: $CC" >&5 echo "${ECHO_T}$CC" >&6 else - echo "$as_me:1169: result: no" >&5 + echo "$as_me:1269: result: no" >&5 echo "${ECHO_T}no" >&6 fi @@ -1175,7 +1275,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:1178: checking for $ac_word" >&5 +echo "$as_me:1278: 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 @@ -1190,7 +1290,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:1193: found $ac_dir/$ac_word" >&5 +echo "$as_me:1293: found $ac_dir/$ac_word" >&5 break done @@ -1198,10 +1298,10 @@ fi fi ac_ct_CC=$ac_cv_prog_ac_ct_CC if test -n "$ac_ct_CC"; then - echo "$as_me:1201: result: $ac_ct_CC" >&5 + echo "$as_me:1301: result: $ac_ct_CC" >&5 echo "${ECHO_T}$ac_ct_CC" >&6 else - echo "$as_me:1204: result: no" >&5 + echo "$as_me:1304: result: no" >&5 echo "${ECHO_T}no" >&6 fi @@ -1214,7 +1314,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:1217: checking for $ac_word" >&5 +echo "$as_me:1317: 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 @@ -1234,11 +1334,11 @@ if test "$ac_dir/$ac_word" = "/usr/ucb/cc"; then continue fi ac_cv_prog_CC="cc" -echo "$as_me:1237: found $ac_dir/$ac_word" >&5 +echo "$as_me:1337: 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 @@ -1256,10 +1356,10 @@ fi fi CC=$ac_cv_prog_CC if test -n "$CC"; then - echo "$as_me:1259: result: $CC" >&5 + echo "$as_me:1359: result: $CC" >&5 echo "${ECHO_T}$CC" >&6 else - echo "$as_me:1262: result: no" >&5 + echo "$as_me:1362: result: no" >&5 echo "${ECHO_T}no" >&6 fi @@ -1270,7 +1370,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:1273: checking for $ac_word" >&5 +echo "$as_me:1373: 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 @@ -1285,7 +1385,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:1288: found $ac_dir/$ac_word" >&5 +echo "$as_me:1388: found $ac_dir/$ac_word" >&5 break done @@ -1293,10 +1393,10 @@ fi fi CC=$ac_cv_prog_CC if test -n "$CC"; then - echo "$as_me:1296: result: $CC" >&5 + echo "$as_me:1396: result: $CC" >&5 echo "${ECHO_T}$CC" >&6 else - echo "$as_me:1299: result: no" >&5 + echo "$as_me:1399: result: no" >&5 echo "${ECHO_T}no" >&6 fi @@ -1309,7 +1409,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:1312: checking for $ac_word" >&5 +echo "$as_me:1412: 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 @@ -1324,7 +1424,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:1327: found $ac_dir/$ac_word" >&5 +echo "$as_me:1427: found $ac_dir/$ac_word" >&5 break done @@ -1332,10 +1432,10 @@ fi fi ac_ct_CC=$ac_cv_prog_ac_ct_CC if test -n "$ac_ct_CC"; then - echo "$as_me:1335: result: $ac_ct_CC" >&5 + echo "$as_me:1435: result: $ac_ct_CC" >&5 echo "${ECHO_T}$ac_ct_CC" >&6 else - echo "$as_me:1338: result: no" >&5 + echo "$as_me:1438: result: no" >&5 echo "${ECHO_T}no" >&6 fi @@ -1347,32 +1447,32 @@ fi fi -test -z "$CC" && { { echo "$as_me:1350: error: no acceptable cc found in \$PATH" >&5 +test -z "$CC" && { { echo "$as_me:1450: 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:1355:" \ +echo "$as_me:1455:" \ "checking for C compiler version" >&5 -ac_compiler=`set X $ac_compile; echo $2` -{ (eval echo "$as_me:1358: \"$ac_compiler --version </dev/null >&5\"") >&5 +ac_compiler=`set X $ac_compile; echo "$2"` +{ (eval echo "$as_me:1458: \"$ac_compiler --version </dev/null >&5\"") >&5 (eval $ac_compiler --version </dev/null >&5) 2>&5 ac_status=$? - echo "$as_me:1361: \$? = $ac_status" >&5 - (exit $ac_status); } -{ (eval echo "$as_me:1363: \"$ac_compiler -v </dev/null >&5\"") >&5 + echo "$as_me:1461: \$? = $ac_status" >&5 + (exit "$ac_status"); } +{ (eval echo "$as_me:1463: \"$ac_compiler -v </dev/null >&5\"") >&5 (eval $ac_compiler -v </dev/null >&5) 2>&5 ac_status=$? - echo "$as_me:1366: \$? = $ac_status" >&5 - (exit $ac_status); } -{ (eval echo "$as_me:1368: \"$ac_compiler -V </dev/null >&5\"") >&5 + echo "$as_me:1466: \$? = $ac_status" >&5 + (exit "$ac_status"); } +{ (eval echo "$as_me:1468: \"$ac_compiler -V </dev/null >&5\"") >&5 (eval $ac_compiler -V </dev/null >&5) 2>&5 ac_status=$? - echo "$as_me:1371: \$? = $ac_status" >&5 - (exit $ac_status); } + echo "$as_me:1471: \$? = $ac_status" >&5 + (exit "$ac_status"); } -cat >conftest.$ac_ext <<_ACEOF -#line 1375 "configure" +cat >"conftest.$ac_ext" <<_ACEOF +#line 1475 "configure" #include "confdefs.h" int @@ -1388,14 +1488,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:1391: checking for C compiler default output" >&5 +echo "$as_me:1491: 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:1394: \"$ac_link_default\"") >&5 +ac_link_default=`echo "$ac_link" | sed 's/ -o *"conftest[^"]*"//'` +if { (eval echo "$as_me:1494: \"$ac_link_default\"") >&5 (eval $ac_link_default) 2>&5 ac_status=$? - echo "$as_me:1397: \$? = $ac_status" >&5 - (exit $ac_status); }; then + echo "$as_me:1497: \$? = $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. @@ -1416,35 +1516,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:1420: error: C compiler cannot create executables" >&5 +cat "conftest.$ac_ext" >&5 +{ { echo "$as_me:1520: 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:1426: result: $ac_file" >&5 +echo "$as_me:1526: 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:1431: checking whether the C compiler works" >&5 +echo "$as_me:1531: 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:1437: \"$ac_try\"") >&5 + { (eval echo "$as_me:1537: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? - echo "$as_me:1440: \$? = $ac_status" >&5 - (exit $ac_status); }; }; then + echo "$as_me:1540: \$? = $ac_status" >&5 + (exit "$ac_status"); }; }; then cross_compiling=no else if test "$cross_compiling" = maybe; then cross_compiling=yes else - { { echo "$as_me:1447: error: cannot run C compiled programs. + { { echo "$as_me:1547: 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;} @@ -1452,25 +1552,25 @@ If you meant to cross compile, use \`--host'." >&2;} fi fi fi -echo "$as_me:1455: result: yes" >&5 +echo "$as_me:1555: 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:1462: checking whether we are cross compiling" >&5 +echo "$as_me:1562: checking whether we are cross compiling" >&5 echo $ECHO_N "checking whether we are cross compiling... $ECHO_C" >&6 -echo "$as_me:1464: result: $cross_compiling" >&5 +echo "$as_me:1564: result: $cross_compiling" >&5 echo "${ECHO_T}$cross_compiling" >&6 -echo "$as_me:1467: checking for executable suffix" >&5 +echo "$as_me:1567: checking for executable suffix" >&5 echo $ECHO_N "checking for executable suffix... $ECHO_C" >&6 -if { (eval echo "$as_me:1469: \"$ac_link\"") >&5 +if { (eval echo "$as_me:1569: \"$ac_link\"") >&5 (eval $ac_link) 2>&5 ac_status=$? - echo "$as_me:1472: \$? = $ac_status" >&5 - (exit $ac_status); }; then + echo "$as_me:1572: \$? = $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 @@ -1485,25 +1585,25 @@ for ac_file in `(ls conftest.exe; ls conftest; ls conftest.*) 2>/dev/null`; do esac done else - { { echo "$as_me:1488: error: cannot compute EXEEXT: cannot compile and link" >&5 + { { echo "$as_me:1588: 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:1494: result: $ac_cv_exeext" >&5 +rm -f "conftest$ac_cv_exeext" +echo "$as_me:1594: 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:1500: checking for object suffix" >&5 +echo "$as_me:1600: 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 1506 "configure" + cat >"conftest.$ac_ext" <<_ACEOF +#line 1606 "configure" #include "confdefs.h" int @@ -1515,11 +1615,11 @@ main (void) } _ACEOF rm -f conftest.o conftest.obj -if { (eval echo "$as_me:1518: \"$ac_compile\"") >&5 +if { (eval echo "$as_me:1618: \"$ac_compile\"") >&5 (eval $ac_compile) 2>&5 ac_status=$? - echo "$as_me:1521: \$? = $ac_status" >&5 - (exit $ac_status); }; then + echo "$as_me:1621: \$? = $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 ) ;; @@ -1529,25 +1629,25 @@ if { (eval echo "$as_me:1518: \"$ac_compile\"") >&5 done else echo "$as_me: failed program was:" >&5 -cat conftest.$ac_ext >&5 -{ { echo "$as_me:1533: error: cannot compute OBJEXT: cannot compile" >&5 +cat "conftest.$ac_ext" >&5 +{ { echo "$as_me:1633: 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:1540: result: $ac_cv_objext" >&5 +echo "$as_me:1640: result: $ac_cv_objext" >&5 echo "${ECHO_T}$ac_cv_objext" >&6 OBJEXT=$ac_cv_objext ac_objext=$OBJEXT -echo "$as_me:1544: checking whether we are using the GNU C compiler" >&5 +echo "$as_me:1644: 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 1550 "configure" + cat >"conftest.$ac_ext" <<_ACEOF +#line 1650 "configure" #include "confdefs.h" int @@ -1561,41 +1661,41 @@ main (void) return 0; } _ACEOF -rm -f conftest.$ac_objext -if { (eval echo "$as_me:1565: \"$ac_compile\"") >&5 +rm -f "conftest.$ac_objext" +if { (eval echo "$as_me:1665: \"$ac_compile\"") >&5 (eval $ac_compile) 2>&5 ac_status=$? - echo "$as_me:1568: \$? = $ac_status" >&5 - (exit $ac_status); } && - { ac_try='test -s conftest.$ac_objext' - { (eval echo "$as_me:1571: \"$ac_try\"") >&5 + echo "$as_me:1668: \$? = $ac_status" >&5 + (exit "$ac_status"); } && + { ac_try='test -s "conftest.$ac_objext"' + { (eval echo "$as_me:1671: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? - echo "$as_me:1574: \$? = $ac_status" >&5 - (exit $ac_status); }; }; then + echo "$as_me:1674: \$? = $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:1586: result: $ac_cv_c_compiler_gnu" >&5 +echo "$as_me:1686: 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:1592: checking whether $CC accepts -g" >&5 +echo "$as_me:1692: 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 1598 "configure" + cat >"conftest.$ac_ext" <<_ACEOF +#line 1698 "configure" #include "confdefs.h" int @@ -1606,27 +1706,27 @@ main (void) return 0; } _ACEOF -rm -f conftest.$ac_objext -if { (eval echo "$as_me:1610: \"$ac_compile\"") >&5 +rm -f "conftest.$ac_objext" +if { (eval echo "$as_me:1710: \"$ac_compile\"") >&5 (eval $ac_compile) 2>&5 ac_status=$? - echo "$as_me:1613: \$? = $ac_status" >&5 - (exit $ac_status); } && - { ac_try='test -s conftest.$ac_objext' - { (eval echo "$as_me:1616: \"$ac_try\"") >&5 + echo "$as_me:1713: \$? = $ac_status" >&5 + (exit "$ac_status"); } && + { ac_try='test -s "conftest.$ac_objext"' + { (eval echo "$as_me:1716: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? - echo "$as_me:1619: \$? = $ac_status" >&5 - (exit $ac_status); }; }; then + echo "$as_me:1719: \$? = $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:1629: result: $ac_cv_prog_cc_g" >&5 +echo "$as_me:1729: 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 @@ -1647,23 +1747,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:1656: \"$ac_compile\"") >&5 +rm -f "conftest.$ac_objext" +if { (eval echo "$as_me:1756: \"$ac_compile\"") >&5 (eval $ac_compile) 2>&5 ac_status=$? - echo "$as_me:1659: \$? = $ac_status" >&5 - (exit $ac_status); } && - { ac_try='test -s conftest.$ac_objext' - { (eval echo "$as_me:1662: \"$ac_try\"") >&5 + echo "$as_me:1759: \$? = $ac_status" >&5 + (exit "$ac_status"); } && + { ac_try='test -s "conftest.$ac_objext"' + { (eval echo "$as_me:1762: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? - echo "$as_me:1665: \$? = $ac_status" >&5 - (exit $ac_status); }; }; then + echo "$as_me:1765: \$? = $ac_status" >&5 + (exit "$ac_status"); }; }; then for ac_declaration in \ ''\ '#include <stdlib.h>' \ @@ -1673,8 +1773,8 @@ if { (eval echo "$as_me:1656: \"$ac_compile\"") >&5 'extern "C" void exit (int);' \ 'void exit (int);' do - cat >conftest.$ac_ext <<_ACEOF -#line 1677 "configure" + cat >"conftest.$ac_ext" <<_ACEOF +#line 1777 "configure" #include "confdefs.h" #include <stdlib.h> $ac_declaration @@ -1686,27 +1786,27 @@ exit (42); return 0; } _ACEOF -rm -f conftest.$ac_objext -if { (eval echo "$as_me:1690: \"$ac_compile\"") >&5 +rm -f "conftest.$ac_objext" +if { (eval echo "$as_me:1790: \"$ac_compile\"") >&5 (eval $ac_compile) 2>&5 ac_status=$? - echo "$as_me:1693: \$? = $ac_status" >&5 - (exit $ac_status); } && - { ac_try='test -s conftest.$ac_objext' - { (eval echo "$as_me:1696: \"$ac_try\"") >&5 + echo "$as_me:1793: \$? = $ac_status" >&5 + (exit "$ac_status"); } && + { ac_try='test -s "conftest.$ac_objext"' + { (eval echo "$as_me:1796: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? - echo "$as_me:1699: \$? = $ac_status" >&5 - (exit $ac_status); }; }; then + echo "$as_me:1799: \$? = $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 1709 "configure" +rm -f "conftest.$ac_objext" "conftest.$ac_ext" + cat >"conftest.$ac_ext" <<_ACEOF +#line 1809 "configure" #include "confdefs.h" $ac_declaration int @@ -1717,63 +1817,240 @@ exit (42); return 0; } _ACEOF -rm -f conftest.$ac_objext -if { (eval echo "$as_me:1721: \"$ac_compile\"") >&5 +rm -f "conftest.$ac_objext" +if { (eval echo "$as_me:1821: \"$ac_compile\"") >&5 (eval $ac_compile) 2>&5 ac_status=$? - echo "$as_me:1724: \$? = $ac_status" >&5 - (exit $ac_status); } && - { ac_try='test -s conftest.$ac_objext' - { (eval echo "$as_me:1727: \"$ac_try\"") >&5 + echo "$as_me:1824: \$? = $ac_status" >&5 + (exit "$ac_status"); } && + { ac_try='test -s "conftest.$ac_objext"' + { (eval echo "$as_me:1827: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? - echo "$as_me:1730: \$? = $ac_status" >&5 - (exit $ac_status); }; }; then + echo "$as_me:1830: \$? = $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:1760: checking version of $CC" >&5 + echo "$as_me:1860: 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:1764: result: $GCC_VERSION" >&5 + echo "$as_me:1864: result: $GCC_VERSION" >&5 echo "${ECHO_T}$GCC_VERSION" >&6 fi -echo "$as_me:1768: checking for $CC option to accept ANSI C" >&5 +INTEL_COMPILER=no + +if test "$GCC" = yes ; then + case "$host_os" in + (linux*|gnu*) + echo "$as_me:1873: 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 1878 "configure" +#include "confdefs.h" + +int +main (void) +{ + +#ifdef __INTEL_COMPILER +#else +make an error +#endif + + ; + return 0; +} +_ACEOF +rm -f "conftest.$ac_objext" +if { (eval echo "$as_me:1895: \"$ac_compile\"") >&5 + (eval $ac_compile) 2>&5 + ac_status=$? + echo "$as_me:1898: \$? = $ac_status" >&5 + (exit "$ac_status"); } && + { ac_try='test -s "conftest.$ac_objext"' + { (eval echo "$as_me:1901: \"$ac_try\"") >&5 + (eval $ac_try) 2>&5 + ac_status=$? + echo "$as_me:1904: \$? = $ac_status" >&5 + (exit "$ac_status"); }; }; then + INTEL_COMPILER=yes +cf_save_CFLAGS="$cf_save_CFLAGS -we147" + +else + echo "$as_me: failed program was:" >&5 +cat "conftest.$ac_ext" >&5 +fi +rm -f "conftest.$ac_objext" "conftest.$ac_ext" + CFLAGS="$cf_save_CFLAGS" + echo "$as_me:1915: result: $INTEL_COMPILER" >&5 +echo "${ECHO_T}$INTEL_COMPILER" >&6 + ;; + esac +fi + +CLANG_COMPILER=no + +if test "$GCC" = yes ; then + echo "$as_me:1924: 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 1928 "configure" +#include "confdefs.h" + +int +main (void) +{ + +#ifdef __clang__ +#else +make an error +#endif + + ; + return 0; +} +_ACEOF +rm -f "conftest.$ac_objext" +if { (eval echo "$as_me:1945: \"$ac_compile\"") >&5 + (eval $ac_compile) 2>&5 + ac_status=$? + echo "$as_me:1948: \$? = $ac_status" >&5 + (exit "$ac_status"); } && + { ac_try='test -s "conftest.$ac_objext"' + { (eval echo "$as_me:1951: \"$ac_try\"") >&5 + (eval $ac_try) 2>&5 + ac_status=$? + echo "$as_me:1954: \$? = $ac_status" >&5 + (exit "$ac_status"); }; }; then + CLANG_COMPILER=yes + +else + echo "$as_me: failed program was:" >&5 +cat "conftest.$ac_ext" >&5 +fi +rm -f "conftest.$ac_objext" "conftest.$ac_ext" + CFLAGS="$cf_save_CFLAGS" + echo "$as_me:1964: result: $CLANG_COMPILER" >&5 +echo "${ECHO_T}$CLANG_COMPILER" >&6 +fi + +CLANG_VERSION=none + +if test "x$CLANG_COMPILER" = "xyes" ; then + case "$CC" in + (c[1-9][0-9]|*/c[1-9][0-9]) + { echo "$as_me:1973: 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:1980: 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:1984: 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:1991: 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 1996 "configure" +#include "confdefs.h" + + #include <stdio.h> +int +main (void) +{ + + printf("hello!\\n"); + ; + return 0; +} +_ACEOF +rm -f "conftest.$ac_objext" "conftest$ac_exeext" +if { (eval echo "$as_me:2010: \"$ac_link\"") >&5 + (eval $ac_link) 2>&5 + ac_status=$? + echo "$as_me:2013: \$? = $ac_status" >&5 + (exit "$ac_status"); } && + { ac_try='test -s "conftest$ac_exeext"' + { (eval echo "$as_me:2016: \"$ac_try\"") >&5 + (eval $ac_try) 2>&5 + ac_status=$? + echo "$as_me:2019: \$? = $ac_status" >&5 + (exit "$ac_status"); }; }; then + + cf_clang_optok=yes +else + echo "$as_me: failed program was:" >&5 +cat "conftest.$ac_ext" >&5 + + cf_clang_optok=no +fi +rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext" + echo "$as_me:2030: result: $cf_clang_optok" >&5 +echo "${ECHO_T}$cf_clang_optok" >&6 + CFLAGS="$cf_save_CFLAGS" + if test "$cf_clang_optok" = yes; then + test -n "$verbose" && echo " adding option $cf_clang_opt" 1>&6 + +echo "${as_me:-configure}:2036: testing adding option $cf_clang_opt ..." 1>&5 + + test -n "$CFLAGS" && CFLAGS="$CFLAGS " + CFLAGS="${CFLAGS}$cf_clang_opt" + + fi + done +fi + +echo "$as_me:2045: 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 1776 "configure" +cat >"conftest.$ac_ext" <<_ACEOF +#line 2053 "configure" #include "confdefs.h" #include <stdarg.h> #include <stdio.h> @@ -1821,52 +2098,171 @@ _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:1825: \"$ac_compile\"") >&5 + rm -f "conftest.$ac_objext" +if { (eval echo "$as_me:2102: \"$ac_compile\"") >&5 (eval $ac_compile) 2>&5 ac_status=$? - echo "$as_me:1828: \$? = $ac_status" >&5 - (exit $ac_status); } && - { ac_try='test -s conftest.$ac_objext' - { (eval echo "$as_me:1831: \"$ac_try\"") >&5 + echo "$as_me:2105: \$? = $ac_status" >&5 + (exit "$ac_status"); } && + { ac_try='test -s "conftest.$ac_objext"' + { (eval echo "$as_me:2108: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? - echo "$as_me:1834: \$? = $ac_status" >&5 - (exit $ac_status); }; }; then + echo "$as_me:2111: \$? = $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:1851: result: none needed" >&5 + echo "$as_me:2128: result: none needed" >&5 echo "${ECHO_T}none needed" >&6 ;; *) - echo "$as_me:1854: result: $ac_cv_prog_cc_stdc" >&5 + echo "$as_me:2131: 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:2139: checking \$CFLAGS variable" >&5 +echo $ECHO_N "checking \$CFLAGS variable... $ECHO_C" >&6 +case "x$CFLAGS" in +(*-[IUD]*) + echo "$as_me:2143: result: broken" >&5 +echo "${ECHO_T}broken" >&6 + { echo "$as_me:2145: 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= + for cf_arg in $cf_flags + do + +cf_fix_cppflags=no +cf_new_cflags= +cf_new_cppflags= +cf_new_extra_cppflags= + +for cf_add_cflags in $cf_arg +do +case "$cf_fix_cppflags" in +(no) + case "$cf_add_cflags" in + (-undef|-nostdinc*|-I*|-D*|-U*|-E|-P|-C) + case "$cf_add_cflags" in + (-D*) + cf_tst_cflags=`echo "${cf_add_cflags}" |sed -e 's/^-D[^=]*='\''\"[^"]*//'` + + test "x${cf_add_cflags}" != "x${cf_tst_cflags}" \ + && test -z "${cf_tst_cflags}" \ + && cf_fix_cppflags=yes + + if test "$cf_fix_cppflags" = yes ; then + + test -n "$cf_new_extra_cppflags" && cf_new_extra_cppflags="$cf_new_extra_cppflags " + cf_new_extra_cppflags="${cf_new_extra_cppflags}$cf_add_cflags" + + continue + elif test "${cf_tst_cflags}" = "\"'" ; then + + test -n "$cf_new_extra_cppflags" && cf_new_extra_cppflags="$cf_new_extra_cppflags " + cf_new_extra_cppflags="${cf_new_extra_cppflags}$cf_add_cflags" + + continue + fi + ;; + esac + case "$CPPFLAGS" in + (*$cf_add_cflags) + ;; + (*) + case "$cf_add_cflags" in + (-D*) + cf_tst_cppflags=`echo "x$cf_add_cflags" | sed -e 's/^...//' -e 's/=.*//'` + +CPPFLAGS=`echo "$CPPFLAGS" | \ + sed -e 's/-[UD]'"$cf_tst_cppflags"'\(=[^ ]*\)\?[ ]/ /g' \ + -e 's/-[UD]'"$cf_tst_cppflags"'\(=[^ ]*\)\?$//g'` + + ;; + esac -echo "$as_me:1862: checking \$CC variable" >&5 + test -n "$cf_new_cppflags" && cf_new_cppflags="$cf_new_cppflags " + cf_new_cppflags="${cf_new_cppflags}$cf_add_cflags" + + ;; + esac + ;; + (*) + + test -n "$cf_new_cflags" && cf_new_cflags="$cf_new_cflags " + cf_new_cflags="${cf_new_cflags}$cf_add_cflags" + + ;; + esac + ;; +(yes) + + test -n "$cf_new_extra_cppflags" && cf_new_extra_cppflags="$cf_new_extra_cppflags " + cf_new_extra_cppflags="${cf_new_extra_cppflags}$cf_add_cflags" + + cf_tst_cflags=`echo "${cf_add_cflags}" |sed -e 's/^[^"]*"'\''//'` + + test "x${cf_add_cflags}" != "x${cf_tst_cflags}" \ + && test -z "${cf_tst_cflags}" \ + && cf_fix_cppflags=no + ;; +esac +done + +if test -n "$cf_new_cflags" ; then + + test -n "$CFLAGS" && CFLAGS="$CFLAGS " + CFLAGS="${CFLAGS}$cf_new_cflags" + +fi + +if test -n "$cf_new_cppflags" ; then + + test -n "$CPPFLAGS" && CPPFLAGS="$CPPFLAGS " + CPPFLAGS="${CPPFLAGS}$cf_new_cppflags" + +fi + +if test -n "$cf_new_extra_cppflags" ; then + + test -n "$EXTRA_CPPFLAGS" && EXTRA_CPPFLAGS="$EXTRA_CPPFLAGS " + EXTRA_CPPFLAGS="${EXTRA_CPPFLAGS}$cf_new_extra_cppflags" + +fi + + done + ;; +(*) + echo "$as_me:2253: result: ok" >&5 +echo "${ECHO_T}ok" >&6 + ;; +esac + +echo "$as_me:2258: checking \$CC variable" >&5 echo $ECHO_N "checking \$CC variable... $ECHO_C" >&6 case "$CC" in (*[\ \ ]-*) - echo "$as_me:1866: result: broken" >&5 + echo "$as_me:2262: result: broken" >&5 echo "${ECHO_T}broken" >&6 - { echo "$as_me:1868: WARNING: your environment misuses the CC variable to hold CFLAGS/CPPFLAGS options" >&5 -echo "$as_me: WARNING: your environment misuses the CC variable to hold CFLAGS/CPPFLAGS options" >&2;} + { echo "$as_me:2264: WARNING: your environment uses the CC variable to hold CFLAGS/CPPFLAGS options" >&5 +echo "$as_me: WARNING: your environment uses the CC variable to hold CFLAGS/CPPFLAGS options" >&2;} # humor him... cf_prog=`echo "$CC" | sed -e 's/ / /g' -e 's/[ ]* / /g' -e 's/[ ]*[ ]-[^ ].*//'` cf_flags=`echo "$CC" | ${AWK:-awk} -v prog="$cf_prog" '{ printf("%s", substr($0,1+length(prog))); }'` @@ -1883,19 +2279,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" @@ -1914,7 +2310,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/=.*//'` @@ -1944,7 +2340,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}" \ @@ -1982,30 +2378,128 @@ fi done test -n "$verbose" && echo " resulting CC: '$CC'" 1>&6 -echo "${as_me:-configure}:1985: testing resulting CC: '$CC' ..." 1>&5 +echo "${as_me:-configure}:2381: testing resulting CC: '$CC' ..." 1>&5 test -n "$verbose" && echo " resulting CFLAGS: '$CFLAGS'" 1>&6 -echo "${as_me:-configure}:1989: testing resulting CFLAGS: '$CFLAGS' ..." 1>&5 +echo "${as_me:-configure}:2385: testing resulting CFLAGS: '$CFLAGS' ..." 1>&5 test -n "$verbose" && echo " resulting CPPFLAGS: '$CPPFLAGS'" 1>&6 -echo "${as_me:-configure}:1993: testing resulting CPPFLAGS: '$CPPFLAGS' ..." 1>&5 +echo "${as_me:-configure}:2389: testing resulting CPPFLAGS: '$CPPFLAGS' ..." 1>&5 ;; (*) - echo "$as_me:1997: result: ok" >&5 + echo "$as_me:2393: result: ok" >&5 echo "${ECHO_T}ok" >&6 ;; 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:2402: 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:2417: found $ac_dir/$ac_word" >&5 +break +done + +fi +fi +GREP=$ac_cv_prog_GREP +if test -n "$GREP"; then + echo "$as_me:2425: result: $GREP" >&5 +echo "${ECHO_T}$GREP" >&6 +else + echo "$as_me:2428: result: no" >&5 +echo "${ECHO_T}no" >&6 +fi + + test -n "$GREP" && break +done +test -n "$GREP" || GREP=": " + +echo "$as_me:2436: 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:2448: 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:2465: found $ac_dir/$ac_word" >&5 + break +fi +done + + ;; +esac +fi +EGREP=$ac_cv_path_EGREP + +if test -n "$EGREP"; then + echo "$as_me:2476: result: $EGREP" >&5 +echo "${ECHO_T}$EGREP" >&6 +else + echo "$as_me:2479: 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:2487: error: cannot find workable egrep" >&5 +echo "$as_me: error: cannot find workable egrep" >&2;} + { (exit 1); exit 1; }; } + fi +fi +echo "$as_me:2492: 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:2008: checking how to run the C preprocessor" >&5 +ac_main_return="return" +echo "$as_me:2502: 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 @@ -2025,20 +2519,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 2029 "configure" + cat >"conftest.$ac_ext" <<_ACEOF +#line 2523 "configure" #include "confdefs.h" #include <assert.h> Syntax error _ACEOF -if { (eval echo "$as_me:2034: \"$ac_cpp conftest.$ac_ext\"") >&5 - (eval $ac_cpp conftest.$ac_ext) 2>conftest.er1 +if { (eval echo "$as_me:2528: \"$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:2040: \$? = $ac_status" >&5 - (exit $ac_status); } >/dev/null; then + echo "$as_me:2534: \$? = $ac_status" >&5 + (exit "$ac_status"); } >/dev/null; then if test -s conftest.err; then ac_cpp_err=$ac_c_preproc_warn_flag else @@ -2051,27 +2545,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 2063 "configure" + cat >"conftest.$ac_ext" <<_ACEOF +#line 2557 "configure" #include "confdefs.h" #include <ac_nonexistent.h> _ACEOF -if { (eval echo "$as_me:2067: \"$ac_cpp conftest.$ac_ext\"") >&5 - (eval $ac_cpp conftest.$ac_ext) 2>conftest.er1 +if { (eval echo "$as_me:2561: \"$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:2073: \$? = $ac_status" >&5 - (exit $ac_status); } >/dev/null; then + echo "$as_me:2567: \$? = $ac_status" >&5 + (exit "$ac_status"); } >/dev/null; then if test -s conftest.err; then ac_cpp_err=$ac_c_preproc_warn_flag else @@ -2085,16 +2579,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 @@ -2107,7 +2601,7 @@ fi else ac_cv_prog_CPP=$CPP fi -echo "$as_me:2110: result: $CPP" >&5 +echo "$as_me:2604: result: $CPP" >&5 echo "${ECHO_T}$CPP" >&6 ac_preproc_ok=false for ac_c_preproc_warn_flag in '' yes @@ -2116,20 +2610,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 2120 "configure" + cat >"conftest.$ac_ext" <<_ACEOF +#line 2614 "configure" #include "confdefs.h" #include <assert.h> Syntax error _ACEOF -if { (eval echo "$as_me:2125: \"$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:2131: \$? = $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 @@ -2142,27 +2636,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 2154 "configure" + cat >"conftest.$ac_ext" <<_ACEOF +#line 2648 "configure" #include "confdefs.h" #include <ac_nonexistent.h> _ACEOF -if { (eval echo "$as_me:2158: \"$ac_cpp conftest.$ac_ext\"") >&5 - (eval $ac_cpp conftest.$ac_ext) 2>conftest.er1 +if { (eval echo "$as_me:2652: \"$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:2164: \$? = $ac_status" >&5 - (exit $ac_status); } >/dev/null; then + echo "$as_me:2658: \$? = $ac_status" >&5 + (exit "$ac_status"); } >/dev/null; then if test -s conftest.err; then ac_cpp_err=$ac_c_preproc_warn_flag else @@ -2176,32 +2670,32 @@ 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:2192: error: C preprocessor \"$CPP\" fails sanity check" >&5 + { { echo "$as_me:2686: 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" -echo "$as_me:2204: checking whether ${MAKE-make} sets \${MAKE}" >&5 +echo "$as_me:2698: 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 @@ -2221,11 +2715,11 @@ fi rm -f conftest.make fi if eval "test \"`echo '$ac_cv_prog_make_'${ac_make}_set`\" = yes"; then - echo "$as_me:2224: result: yes" >&5 + echo "$as_me:2718: result: yes" >&5 echo "${ECHO_T}yes" >&6 SET_MAKE= else - echo "$as_me:2228: result: no" >&5 + echo "$as_me:2722: result: no" >&5 echo "${ECHO_T}no" >&6 SET_MAKE="MAKE=${MAKE-make}" fi @@ -2233,7 +2727,7 @@ fi if test -n "$ac_tool_prefix"; then # Extract the first word of "${ac_tool_prefix}ranlib", so it can be a program name with args. set dummy ${ac_tool_prefix}ranlib; ac_word=$2 -echo "$as_me:2236: checking for $ac_word" >&5 +echo "$as_me:2730: checking for $ac_word" >&5 echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6 if test "${ac_cv_prog_RANLIB+set}" = set; then echo $ECHO_N "(cached) $ECHO_C" >&6 @@ -2248,7 +2742,7 @@ for ac_dir in $ac_dummy; do test -z "$ac_dir" && ac_dir=. $as_executable_p "$ac_dir/$ac_word" || continue ac_cv_prog_RANLIB="${ac_tool_prefix}ranlib" -echo "$as_me:2251: found $ac_dir/$ac_word" >&5 +echo "$as_me:2745: found $ac_dir/$ac_word" >&5 break done @@ -2256,10 +2750,10 @@ fi fi RANLIB=$ac_cv_prog_RANLIB if test -n "$RANLIB"; then - echo "$as_me:2259: result: $RANLIB" >&5 + echo "$as_me:2753: result: $RANLIB" >&5 echo "${ECHO_T}$RANLIB" >&6 else - echo "$as_me:2262: result: no" >&5 + echo "$as_me:2756: result: no" >&5 echo "${ECHO_T}no" >&6 fi @@ -2268,7 +2762,7 @@ if test -z "$ac_cv_prog_RANLIB"; then ac_ct_RANLIB=$RANLIB # Extract the first word of "ranlib", so it can be a program name with args. set dummy ranlib; ac_word=$2 -echo "$as_me:2271: checking for $ac_word" >&5 +echo "$as_me:2765: checking for $ac_word" >&5 echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6 if test "${ac_cv_prog_ac_ct_RANLIB+set}" = set; then echo $ECHO_N "(cached) $ECHO_C" >&6 @@ -2283,7 +2777,7 @@ for ac_dir in $ac_dummy; do test -z "$ac_dir" && ac_dir=. $as_executable_p "$ac_dir/$ac_word" || continue ac_cv_prog_ac_ct_RANLIB="ranlib" -echo "$as_me:2286: found $ac_dir/$ac_word" >&5 +echo "$as_me:2780: found $ac_dir/$ac_word" >&5 break done @@ -2292,10 +2786,10 @@ fi fi ac_ct_RANLIB=$ac_cv_prog_ac_ct_RANLIB if test -n "$ac_ct_RANLIB"; then - echo "$as_me:2295: result: $ac_ct_RANLIB" >&5 + echo "$as_me:2789: result: $ac_ct_RANLIB" >&5 echo "${ECHO_T}$ac_ct_RANLIB" >&6 else - echo "$as_me:2298: result: no" >&5 + echo "$as_me:2792: result: no" >&5 echo "${ECHO_T}no" >&6 fi @@ -2304,31 +2798,6 @@ else RANLIB="$ac_cv_prog_RANLIB" fi -ac_aux_dir= -for ac_dir in $srcdir $srcdir/.. $srcdir/../..; do - 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 - ac_aux_dir=$ac_dir - ac_install_sh="$ac_aux_dir/install.sh -c" - break - 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:2324: 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 -ac_config_guess="$SHELL $ac_aux_dir/config.guess" -ac_config_sub="$SHELL $ac_aux_dir/config.sub" -ac_configure="$SHELL $ac_aux_dir/configure" # This should be Cygnus configure. - # Find a good install program. We prefer a C program (faster), # so one script is as good as another. But avoid the broken or # incompatible versions: @@ -2341,7 +2810,7 @@ ac_configure="$SHELL $ac_aux_dir/configure" # This should be Cygnus configure. # AFS /usr/afsws/bin/install, which mishandles nonexistent args # SVR4 /usr/ucb/install, which tries to use the nonexistent group "staff" # ./install, which can be erroneously created by make from ./install.sh. -echo "$as_me:2344: checking for a BSD compatible install" >&5 +echo "$as_me:2813: 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 @@ -2390,7 +2859,7 @@ fi INSTALL=$ac_install_sh fi fi -echo "$as_me:2393: result: $INSTALL" >&5 +echo "$as_me:2862: result: $INSTALL" >&5 echo "${ECHO_T}$INSTALL" >&6 # Use test -z because SunOS4 sh mishandles braces in ${var-val}. @@ -2401,18 +2870,18 @@ test -z "$INSTALL_SCRIPT" && INSTALL_SCRIPT='${INSTALL}' test -z "$INSTALL_DATA" && INSTALL_DATA='${INSTALL} -m 644' -echo "$as_me:2404: checking whether ln -s works" >&5 +echo "$as_me:2873: checking whether ln -s works" >&5 echo $ECHO_N "checking whether ln -s works... $ECHO_C" >&6 LN_S=$as_ln_s if test "$LN_S" = "ln -s"; then - echo "$as_me:2408: result: yes" >&5 + echo "$as_me:2877: result: yes" >&5 echo "${ECHO_T}yes" >&6 else - echo "$as_me:2411: result: no, using $LN_S" >&5 + echo "$as_me:2880: result: no, using $LN_S" >&5 echo "${ECHO_T}no, using $LN_S" >&6 fi -echo "$as_me:2415: checking if $LN_S -f options work" >&5 +echo "$as_me:2884: checking if $LN_S -f options work" >&5 echo $ECHO_N "checking if $LN_S -f options work... $ECHO_C" >&6 rm -f conf$$.src conf$$dst @@ -2424,7 +2893,7 @@ else cf_prog_ln_sf=no fi rm -f conf$$.dst conf$$src -echo "$as_me:2427: result: $cf_prog_ln_sf" >&5 +echo "$as_me:2896: result: $cf_prog_ln_sf" >&5 echo "${ECHO_T}$cf_prog_ln_sf" >&6 test "$cf_prog_ln_sf" = yes && LN_S="$LN_S -f" @@ -2433,7 +2902,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:2436: checking for $ac_word" >&5 +echo "$as_me:2905: 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 @@ -2448,7 +2917,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:2451: found $ac_dir/$ac_word" >&5 +echo "$as_me:2920: found $ac_dir/$ac_word" >&5 break done @@ -2456,19 +2925,25 @@ fi fi LINT=$ac_cv_prog_LINT if test -n "$LINT"; then - echo "$as_me:2459: result: $LINT" >&5 + echo "$as_me:2928: result: $LINT" >&5 echo "${ECHO_T}$LINT" >&6 else - echo "$as_me:2462: result: no" >&5 + echo "$as_me:2931: result: no" >&5 echo "${ECHO_T}no" >&6 fi test -n "$LINT" && break done +case "x$LINT" in +(xcppcheck|x*/cppcheck) + test -z "$LINT_OPTS" && LINT_OPTS="--enable=all" + ;; +esac + # Extract the first word of "groff", so it can be a program name with args. set dummy groff; ac_word=$2 -echo "$as_me:2471: checking for $ac_word" >&5 +echo "$as_me:2946: checking for $ac_word" >&5 echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6 if test "${ac_cv_path_GROFF_PATH+set}" = set; then echo $ECHO_N "(cached) $ECHO_C" >&6 @@ -2485,7 +2960,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_GROFF_PATH="$ac_dir/$ac_word" - echo "$as_me:2488: found $ac_dir/$ac_word" >&5 + echo "$as_me:2963: found $ac_dir/$ac_word" >&5 break fi done @@ -2497,10 +2972,10 @@ fi GROFF_PATH=$ac_cv_path_GROFF_PATH if test -n "$GROFF_PATH"; then - echo "$as_me:2500: result: $GROFF_PATH" >&5 + echo "$as_me:2975: result: $GROFF_PATH" >&5 echo "${ECHO_T}$GROFF_PATH" >&6 else - echo "$as_me:2503: result: no" >&5 + echo "$as_me:2978: result: no" >&5 echo "${ECHO_T}no" >&6 fi @@ -2508,7 +2983,7 @@ for ac_prog in nroff mandoc 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:2511: checking for $ac_word" >&5 +echo "$as_me:2986: checking for $ac_word" >&5 echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6 if test "${ac_cv_path_NROFF_PATH+set}" = set; then echo $ECHO_N "(cached) $ECHO_C" >&6 @@ -2525,7 +3000,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_NROFF_PATH="$ac_dir/$ac_word" - echo "$as_me:2528: found $ac_dir/$ac_word" >&5 + echo "$as_me:3003: found $ac_dir/$ac_word" >&5 break fi done @@ -2536,10 +3011,10 @@ fi NROFF_PATH=$ac_cv_path_NROFF_PATH if test -n "$NROFF_PATH"; then - echo "$as_me:2539: result: $NROFF_PATH" >&5 + echo "$as_me:3014: result: $NROFF_PATH" >&5 echo "${ECHO_T}$NROFF_PATH" >&6 else - echo "$as_me:2542: result: no" >&5 + echo "$as_me:3017: result: no" >&5 echo "${ECHO_T}no" >&6 fi @@ -2549,7 +3024,7 @@ test -n "$NROFF_PATH" || NROFF_PATH="no" # Extract the first word of "tbl", so it can be a program name with args. set dummy tbl; ac_word=$2 -echo "$as_me:2552: checking for $ac_word" >&5 +echo "$as_me:3027: checking for $ac_word" >&5 echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6 if test "${ac_cv_path_TBL_PATH+set}" = set; then echo $ECHO_N "(cached) $ECHO_C" >&6 @@ -2566,7 +3041,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_TBL_PATH="$ac_dir/$ac_word" - echo "$as_me:2569: found $ac_dir/$ac_word" >&5 + echo "$as_me:3044: found $ac_dir/$ac_word" >&5 break fi done @@ -2578,10 +3053,10 @@ fi TBL_PATH=$ac_cv_path_TBL_PATH if test -n "$TBL_PATH"; then - echo "$as_me:2581: result: $TBL_PATH" >&5 + echo "$as_me:3056: result: $TBL_PATH" >&5 echo "${ECHO_T}$TBL_PATH" >&6 else - echo "$as_me:2584: result: no" >&5 + echo "$as_me:3059: result: no" >&5 echo "${ECHO_T}no" >&6 fi @@ -2599,7 +3074,7 @@ test -z "$GROFF_NOTE" && NROFF_NOTE= if test -n "$ac_tool_prefix"; then # Extract the first word of "${ac_tool_prefix}ar", so it can be a program name with args. set dummy ${ac_tool_prefix}ar; ac_word=$2 -echo "$as_me:2602: checking for $ac_word" >&5 +echo "$as_me:3077: checking for $ac_word" >&5 echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6 if test "${ac_cv_prog_AR+set}" = set; then echo $ECHO_N "(cached) $ECHO_C" >&6 @@ -2614,7 +3089,7 @@ for ac_dir in $ac_dummy; do test -z "$ac_dir" && ac_dir=. $as_executable_p "$ac_dir/$ac_word" || continue ac_cv_prog_AR="${ac_tool_prefix}ar" -echo "$as_me:2617: found $ac_dir/$ac_word" >&5 +echo "$as_me:3092: found $ac_dir/$ac_word" >&5 break done @@ -2622,10 +3097,10 @@ fi fi AR=$ac_cv_prog_AR if test -n "$AR"; then - echo "$as_me:2625: result: $AR" >&5 + echo "$as_me:3100: result: $AR" >&5 echo "${ECHO_T}$AR" >&6 else - echo "$as_me:2628: result: no" >&5 + echo "$as_me:3103: result: no" >&5 echo "${ECHO_T}no" >&6 fi @@ -2634,7 +3109,7 @@ if test -z "$ac_cv_prog_AR"; then ac_ct_AR=$AR # Extract the first word of "ar", so it can be a program name with args. set dummy ar; ac_word=$2 -echo "$as_me:2637: checking for $ac_word" >&5 +echo "$as_me:3112: checking for $ac_word" >&5 echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6 if test "${ac_cv_prog_ac_ct_AR+set}" = set; then echo $ECHO_N "(cached) $ECHO_C" >&6 @@ -2649,7 +3124,7 @@ for ac_dir in $ac_dummy; do test -z "$ac_dir" && ac_dir=. $as_executable_p "$ac_dir/$ac_word" || continue ac_cv_prog_ac_ct_AR="ar" -echo "$as_me:2652: found $ac_dir/$ac_word" >&5 +echo "$as_me:3127: found $ac_dir/$ac_word" >&5 break done @@ -2658,10 +3133,10 @@ fi fi ac_ct_AR=$ac_cv_prog_ac_ct_AR if test -n "$ac_ct_AR"; then - echo "$as_me:2661: result: $ac_ct_AR" >&5 + echo "$as_me:3136: result: $ac_ct_AR" >&5 echo "${ECHO_T}$ac_ct_AR" >&6 else - echo "$as_me:2664: result: no" >&5 + echo "$as_me:3139: result: no" >&5 echo "${ECHO_T}no" >&6 fi @@ -2670,55 +3145,71 @@ else AR="$ac_cv_prog_AR" fi -echo "$as_me:2673: checking for options to update archives" >&5 +echo "$as_me:3148: checking for options to update archives" >&5 echo $ECHO_N "checking for options to update archives... $ECHO_C" >&6 if test "${cf_cv_ar_flags+set}" = set; then echo $ECHO_N "(cached) $ECHO_C" >&6 else - cf_cv_ar_flags=unknown - for cf_ar_flags in -curvU -curv curv -crv crv -cqv cqv -rv rv - do + case "$cf_cv_system_name" in + (*-msvc*) + cf_cv_ar_flags='' + cat >mk_static_lib.sh <<-EOF + #!$SHELL + MSVC_BIN="$AR" + out="\$1" + shift + exec \$MSVC_BIN -out:"\$out" \$@ + EOF + chmod +x mk_static_lib.sh + AR=`pwd`/mk_static_lib.sh + ;; + (*) + cf_cv_ar_flags=unknown + for cf_ar_flags in -curvU -curv curv -crv crv -cqv cqv -rv rv + do - # check if $ARFLAGS already contains this choice - if test "x$ARFLAGS" != "x" ; then - cf_check_ar_flags=`echo "x$ARFLAGS" | sed -e "s/$cf_ar_flags\$//" -e "s/$cf_ar_flags / /"` - if test "x$ARFLAGS" != "$cf_check_ar_flags" ; then - cf_cv_ar_flags= - break + # check if $ARFLAGS already contains this choice + if test "x$ARFLAGS" != "x" ; then + cf_check_ar_flags=`echo "x$ARFLAGS" | sed -e "s/$cf_ar_flags\$//" -e "s/$cf_ar_flags / /"` + if test "x$ARFLAGS" != "$cf_check_ar_flags" ; then + cf_cv_ar_flags= + break + fi fi - fi - rm -f conftest.$ac_cv_objext - rm -f conftest.a + rm -f "conftest.$ac_cv_objext" + rm -f conftest.a - cat >conftest.$ac_ext <<EOF -#line 2696 "configure" + cat >"conftest.$ac_ext" <<EOF +#line 3185 "configure" int testdata[3] = { 123, 456, 789 }; EOF - if { (eval echo "$as_me:2699: \"$ac_compile\"") >&5 + if { (eval echo "$as_me:3188: \"$ac_compile\"") >&5 (eval $ac_compile) 2>&5 ac_status=$? - echo "$as_me:2702: \$? = $ac_status" >&5 - (exit $ac_status); } ; then - echo "$AR $ARFLAGS $cf_ar_flags conftest.a conftest.$ac_cv_objext" >&5 - $AR $ARFLAGS $cf_ar_flags conftest.a conftest.$ac_cv_objext 2>&5 1>/dev/null - if test -f conftest.a ; then - cf_cv_ar_flags=$cf_ar_flags - break - fi - else - test -n "$verbose" && echo " cannot compile test-program" 1>&6 + echo "$as_me:3191: \$? = $ac_status" >&5 + (exit "$ac_status"); } ; then + echo "$AR $ARFLAGS $cf_ar_flags conftest.a conftest.$ac_cv_objext" >&5 + $AR $ARFLAGS "$cf_ar_flags" conftest.a "conftest.$ac_cv_objext" 2>&5 1>/dev/null + if test -f conftest.a ; then + cf_cv_ar_flags="$cf_ar_flags" + break + fi + else + test -n "$verbose" && echo " cannot compile test-program" 1>&6 -echo "${as_me:-configure}:2713: testing cannot compile test-program ..." 1>&5 +echo "${as_me:-configure}:3202: testing cannot compile test-program ..." 1>&5 - break - fi - done - rm -f conftest.a conftest.$ac_ext conftest.$ac_cv_objext + break + fi + done + rm -f conftest.a "conftest.$ac_ext" "conftest.$ac_cv_objext" + ;; + esac fi -echo "$as_me:2721: result: $cf_cv_ar_flags" >&5 +echo "$as_me:3212: result: $cf_cv_ar_flags" >&5 echo "${ECHO_T}$cf_cv_ar_flags" >&6 if test -n "$ARFLAGS" ; then @@ -2729,7 +3220,67 @@ else ARFLAGS=$cf_cv_ar_flags fi -echo "$as_me:2732: checking for makeflags variable" >&5 +echo "$as_me:3223: 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:3235: 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:3252: found $ac_dir/$ac_word" >&5 + break +fi +done + + ;; +esac +fi +FGREP=$ac_cv_path_FGREP + +if test -n "$FGREP"; then + echo "$as_me:3263: result: $FGREP" >&5 +echo "${ECHO_T}$FGREP" >&6 +else + echo "$as_me:3266: 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:3274: error: cannot find workable fgrep" >&5 +echo "$as_me: error: cannot find workable fgrep" >&2;} + { (exit 1); exit 1; }; } + fi +fi +echo "$as_me:3279: result: $ac_cv_path_FGREP" >&5 +echo "${ECHO_T}$ac_cv_path_FGREP" >&6 + FGREP="$ac_cv_path_FGREP" + +echo "$as_me:3283: checking for makeflags variable" >&5 echo $ECHO_N "checking for makeflags variable... $ECHO_C" >&6 if test "${cf_cv_makeflags+set}" = set; then echo $ECHO_N "(cached) $ECHO_C" >&6 @@ -2743,10 +3294,10 @@ SHELL = $SHELL all : @ echo '.$cf_option' CF_EOF - cf_result=`${MAKE:-make} -k -f cf_makeflags.tmp 2>/dev/null | fgrep -v "ing directory" | sed -e 's,[ ]*$,,'` + cf_result=`${MAKE:-make} -k -f cf_makeflags.tmp 2>/dev/null | ${FGREP-fgrep} -v "ing directory" | sed -e 's,[ ]*$,,'` case "$cf_result" in (.*k|.*kw) - cf_result=`${MAKE:-make} -k -f cf_makeflags.tmp CC=cc 2>/dev/null` + cf_result="`${MAKE:-make} -k -f cf_makeflags.tmp CC=cc 2>/dev/null`" case "$cf_result" in (.*CC=*) cf_cv_makeflags= ;; @@ -2759,7 +3310,7 @@ CF_EOF ;; (*) -echo "${as_me:-configure}:2762: testing given option \"$cf_option\",no match \"$cf_result\" ..." 1>&5 +echo "${as_me:-configure}:3313: testing given option \"$cf_option\",no match \"$cf_result\" ..." 1>&5 ;; esac @@ -2767,18 +3318,18 @@ echo "${as_me:-configure}:2762: testing given option \"$cf_option\",no match \"$ rm -f cf_makeflags.tmp fi -echo "$as_me:2770: result: $cf_cv_makeflags" >&5 +echo "$as_me:3321: result: $cf_cv_makeflags" >&5 echo "${ECHO_T}$cf_cv_makeflags" >&6 -echo "$as_me:2773: checking if filesystem supports mixed-case filenames" >&5 +echo "$as_me:3324: checking if filesystem supports mixed-case filenames" >&5 echo $ECHO_N "checking if filesystem supports mixed-case filenames... $ECHO_C" >&6 if test "${cf_cv_mixedcase+set}" = set; then echo $ECHO_N "(cached) $ECHO_C" >&6 else if test "$cross_compiling" = yes ; then - case $target_alias in - (*-os2-emx*|*-msdosdjgpp*|*-cygwin*|*-msys*|*-mingw*|*-uwin*) + case "$target_alias" in + (*-os2-emx*|*-msdosdjgpp*|*-cygwin*|*-msys*|*-mingw*|*-uwin*|darwin*) cf_cv_mixedcase=no ;; (*) @@ -2797,7 +3348,7 @@ else fi fi -echo "$as_me:2800: result: $cf_cv_mixedcase" >&5 +echo "$as_me:3351: result: $cf_cv_mixedcase" >&5 echo "${ECHO_T}$cf_cv_mixedcase" >&6 test "$cf_cv_mixedcase" = yes && cat >>confdefs.h <<\EOF @@ -2808,7 +3359,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:2811: checking for $ac_word" >&5 +echo "$as_me:3362: 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 @@ -2823,7 +3374,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:2826: found $ac_dir/$ac_word" >&5 +echo "$as_me:3377: found $ac_dir/$ac_word" >&5 break done @@ -2831,10 +3382,10 @@ fi fi CTAGS=$ac_cv_prog_CTAGS if test -n "$CTAGS"; then - echo "$as_me:2834: result: $CTAGS" >&5 + echo "$as_me:3385: result: $CTAGS" >&5 echo "${ECHO_T}$CTAGS" >&6 else - echo "$as_me:2837: result: no" >&5 + echo "$as_me:3388: result: no" >&5 echo "${ECHO_T}no" >&6 fi @@ -2845,7 +3396,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:2848: checking for $ac_word" >&5 +echo "$as_me:3399: 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 @@ -2860,7 +3411,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:2863: found $ac_dir/$ac_word" >&5 +echo "$as_me:3414: found $ac_dir/$ac_word" >&5 break done @@ -2868,10 +3419,10 @@ fi fi ETAGS=$ac_cv_prog_ETAGS if test -n "$ETAGS"; then - echo "$as_me:2871: result: $ETAGS" >&5 + echo "$as_me:3422: result: $ETAGS" >&5 echo "${ECHO_T}$ETAGS" >&6 else - echo "$as_me:2874: result: no" >&5 + echo "$as_me:3425: result: no" >&5 echo "${ECHO_T}no" >&6 fi @@ -2880,7 +3431,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:2883: checking for $ac_word" >&5 +echo "$as_me:3434: 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 @@ -2895,7 +3446,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:2898: found $ac_dir/$ac_word" >&5 +echo "$as_me:3449: found $ac_dir/$ac_word" >&5 break done @@ -2904,17 +3455,17 @@ fi fi MAKE_LOWER_TAGS=$ac_cv_prog_MAKE_LOWER_TAGS if test -n "$MAKE_LOWER_TAGS"; then - echo "$as_me:2907: result: $MAKE_LOWER_TAGS" >&5 + echo "$as_me:3458: result: $MAKE_LOWER_TAGS" >&5 echo "${ECHO_T}$MAKE_LOWER_TAGS" >&6 else - echo "$as_me:2910: result: no" >&5 + echo "$as_me:3461: 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:2917: checking for $ac_word" >&5 +echo "$as_me:3468: 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 @@ -2929,7 +3480,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:2932: found $ac_dir/$ac_word" >&5 +echo "$as_me:3483: found $ac_dir/$ac_word" >&5 break done @@ -2938,10 +3489,10 @@ fi fi MAKE_UPPER_TAGS=$ac_cv_prog_MAKE_UPPER_TAGS if test -n "$MAKE_UPPER_TAGS"; then - echo "$as_me:2941: result: $MAKE_UPPER_TAGS" >&5 + echo "$as_me:3492: result: $MAKE_UPPER_TAGS" >&5 echo "${ECHO_T}$MAKE_UPPER_TAGS" >&6 else - echo "$as_me:2944: result: no" >&5 + echo "$as_me:3495: result: no" >&5 echo "${ECHO_T}no" >&6 fi @@ -2961,7 +3512,7 @@ else MAKE_LOWER_TAGS="#" fi -echo "$as_me:2964: checking if you want to see long compiling messages" >&5 +echo "$as_me:3515: 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. @@ -2995,61 +3546,10 @@ else ECHO_CC='' fi; -echo "$as_me:2998: result: $enableval" >&5 +echo "$as_me:3549: result: $enableval" >&5 echo "${ECHO_T}$enableval" >&6 -# Make sure we can run config.sub. -$ac_config_sub sun4 >/dev/null 2>&1 || - { { echo "$as_me:3003: error: cannot run $ac_config_sub" >&5 -echo "$as_me: error: cannot run $ac_config_sub" >&2;} - { (exit 1); exit 1; }; } - -echo "$as_me:3007: 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 -else - ac_cv_build_alias=$build_alias -test -z "$ac_cv_build_alias" && - ac_cv_build_alias=`$ac_config_guess` -test -z "$ac_cv_build_alias" && - { { echo "$as_me:3016: 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:3020: 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:3025: 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/'` - -if test -f $srcdir/config.guess || test -f $ac_aux_dir/config.guess ; then - echo "$as_me:3033: 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 -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:3042: 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:3047: 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/'` +if test -f "$srcdir/config.guess" || test -f "$ac_aux_dir/config.guess" ; then system_name="$host_os" else @@ -3070,18 +3570,18 @@ else fi test -z "$system_name" && system_name="$cf_cv_system_name" -test -n "$cf_cv_system_name" && echo "$as_me:3073: result: Configuring for $cf_cv_system_name" >&5 +test -n "$cf_cv_system_name" && echo "$as_me:3573: 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:3077: result: Cached system name ($system_name) does not agree with actual ($cf_cv_system_name)" >&5 + echo "$as_me:3577: 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:3079: error: \"Please remove config.cache and try again.\"" >&5 + { { echo "$as_me:3579: 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 -case $cf_cv_system_name in +case "$cf_cv_system_name" in (os2*) CFLAGS="$CFLAGS -Zmt" @@ -3102,17 +3602,17 @@ cat >>confdefs.h <<EOF #define PROG_EXT "$PROG_EXT" EOF - echo "$as_me:3105: checking for PATH separator" >&5 + echo "$as_me:3605: checking for PATH separator" >&5 echo $ECHO_N "checking for PATH separator... $ECHO_C" >&6 - case $cf_cv_system_name in + case "$cf_cv_system_name" in (os2*) PATH_SEPARATOR=';' ;; (*) ${PATH_SEPARATOR:=':'} ;; esac - echo "$as_me:3112: result: $PATH_SEPARATOR" >&5 + echo "$as_me:3612: result: $PATH_SEPARATOR" >&5 echo "${ECHO_T}$PATH_SEPARATOR" >&6 - case $cf_cv_system_name in + case "$cf_cv_system_name" in (OS/2*|os2*) if test "$DFT_LWR_MODEL" = libtool; then LIB_PREFIX='lib' @@ -3120,15 +3620,69 @@ echo "${ECHO_T}$PATH_SEPARATOR" >&6 LIB_PREFIX='' fi ;; + (*-msvc*) + LIB_PREFIX='' + ;; (*) LIB_PREFIX='lib' ;; esac +echo "$as_me:3630: 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 3637 "configure" +#include "confdefs.h" +#include <stdio.h> +int +main (void) +{ + +#if defined(__POSIX_VISIBLE) && ((__POSIX_VISIBLE - 0L) > 0) \ + && defined(__XSI_VISIBLE) && ((__XSI_VISIBLE - 0L) > 0) \ + && defined(__BSD_VISIBLE) && ((__BSD_VISIBLE - 0L) > 0) \ + && defined(__ISO_C_VISIBLE) && ((__ISO_C_VISIBLE - 0L) > 0) +#error conflicting symbols found +#endif + + ; + return 0; +} +_ACEOF +rm -f "conftest.$ac_objext" +if { (eval echo "$as_me:3656: \"$ac_compile\"") >&5 + (eval $ac_compile) 2>&5 + ac_status=$? + echo "$as_me:3659: \$? = $ac_status" >&5 + (exit "$ac_status"); } && + { ac_try='test -s "conftest.$ac_objext"' + { (eval echo "$as_me:3662: \"$ac_try\"") >&5 + (eval $ac_try) 2>&5 + ac_status=$? + echo "$as_me:3665: \$? = $ac_status" >&5 + (exit "$ac_status"); }; }; then + cf_cv_posix_visible=no +else + echo "$as_me: failed program was:" >&5 +cat "conftest.$ac_ext" >&5 +cf_cv_posix_visible=yes +fi +rm -f "conftest.$ac_objext" "conftest.$ac_ext" + +fi +echo "$as_me:3676: result: $cf_cv_posix_visible" >&5 +echo "${ECHO_T}$cf_cv_posix_visible" >&6 + +if test "$cf_cv_posix_visible" = no; then + cf_XOPEN_SOURCE=500 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" ;; @@ -3142,7 +3696,7 @@ case $host_os in cf_xopen_source="-D_DARWIN_C_SOURCE" cf_XOPEN_SOURCE= ;; -(freebsd*|dragonfly*) +(freebsd*|dragonfly*|midnightbsd*) # 5.x headers associate # _XOPEN_SOURCE=600 with _POSIX_C_SOURCE=200112L # _XOPEN_SOURCE=500 with _POSIX_C_SOURCE=199506L @@ -3164,14 +3718,14 @@ case $host_os in cf_gnu_xopen_source=$cf_XOPEN_SOURCE -echo "$as_me:3167: checking if this is the GNU C library" >&5 +echo "$as_me:3721: 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 3174 "configure" +cat >"conftest.$ac_ext" <<_ACEOF +#line 3728 "configure" #include "confdefs.h" #include <sys/types.h> int @@ -3180,6 +3734,8 @@ main (void) #if __GLIBC__ > 0 && __GLIBC_MINOR__ >= 0 return 0; + #elif __NEWLIB__ > 0 && __NEWLIB_MINOR__ >= 0 + return 0; #else # error not GNU C library #endif @@ -3187,35 +3743,36 @@ main (void) return 0; } _ACEOF -rm -f conftest.$ac_objext -if { (eval echo "$as_me:3191: \"$ac_compile\"") >&5 +rm -f "conftest.$ac_objext" +if { (eval echo "$as_me:3747: \"$ac_compile\"") >&5 (eval $ac_compile) 2>&5 ac_status=$? - echo "$as_me:3194: \$? = $ac_status" >&5 - (exit $ac_status); } && - { ac_try='test -s conftest.$ac_objext' - { (eval echo "$as_me:3197: \"$ac_try\"") >&5 + echo "$as_me:3750: \$? = $ac_status" >&5 + (exit "$ac_status"); } && + { ac_try='test -s "conftest.$ac_objext"' + { (eval echo "$as_me:3753: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? - echo "$as_me:3200: \$? = $ac_status" >&5 - (exit $ac_status); }; }; then + echo "$as_me:3756: \$? = $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:3211: result: $cf_cv_gnu_library" >&5 +echo "$as_me:3767: result: $cf_cv_gnu_library" >&5 echo "${ECHO_T}$cf_cv_gnu_library" >&6 if test x$cf_cv_gnu_library = xyes; then # With glibc 2.19 (13 years after this check was begun), _DEFAULT_SOURCE - # was changed to help a little... - echo "$as_me:3218: checking if _DEFAULT_SOURCE can be used as a basis" >&5 + # was changed to help a little. newlib incorporated the change about 4 + # years later. + echo "$as_me:3775: 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 @@ -3226,8 +3783,8 @@ else test -n "$CPPFLAGS" && CPPFLAGS="$CPPFLAGS " CPPFLAGS="${CPPFLAGS}-D_DEFAULT_SOURCE" - cat >conftest.$ac_ext <<_ACEOF -#line 3230 "configure" + cat >"conftest.$ac_ext" <<_ACEOF +#line 3787 "configure" #include "confdefs.h" #include <sys/types.h> int @@ -3236,6 +3793,8 @@ main (void) #if (__GLIBC__ == 2 && __GLIBC_MINOR__ >= 19) || (__GLIBC__ > 2) return 0; + #elif (__NEWLIB__ == 2 && __NEWLIB_MINOR__ >= 4) || (__GLIBC__ > 3) + return 0; #else # error GNU C library __GLIBC__.__GLIBC_MINOR__ is too old #endif @@ -3243,34 +3802,34 @@ main (void) return 0; } _ACEOF -rm -f conftest.$ac_objext -if { (eval echo "$as_me:3247: \"$ac_compile\"") >&5 +rm -f "conftest.$ac_objext" +if { (eval echo "$as_me:3806: \"$ac_compile\"") >&5 (eval $ac_compile) 2>&5 ac_status=$? - echo "$as_me:3250: \$? = $ac_status" >&5 - (exit $ac_status); } && - { ac_try='test -s conftest.$ac_objext' - { (eval echo "$as_me:3253: \"$ac_try\"") >&5 + echo "$as_me:3809: \$? = $ac_status" >&5 + (exit "$ac_status"); } && + { ac_try='test -s "conftest.$ac_objext"' + { (eval echo "$as_me:3812: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? - echo "$as_me:3256: \$? = $ac_status" >&5 - (exit $ac_status); }; }; then + echo "$as_me:3815: \$? = $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:3268: result: $cf_cv_gnu_library_219" >&5 +echo "$as_me:3827: 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:3273: checking if _XOPEN_SOURCE=$cf_gnu_xopen_source works with _DEFAULT_SOURCE" >&5 + echo "$as_me:3832: 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 @@ -3283,19 +3842,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" @@ -3314,7 +3873,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/=.*//'` @@ -3344,7 +3903,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}" \ @@ -3374,8 +3933,8 @@ if test -n "$cf_new_extra_cppflags" ; then fi - cat >conftest.$ac_ext <<_ACEOF -#line 3378 "configure" + cat >"conftest.$ac_ext" <<_ACEOF +#line 3937 "configure" #include "confdefs.h" #include <limits.h> @@ -3394,28 +3953,28 @@ main (void) return 0; } _ACEOF -rm -f conftest.$ac_objext -if { (eval echo "$as_me:3398: \"$ac_compile\"") >&5 +rm -f "conftest.$ac_objext" +if { (eval echo "$as_me:3957: \"$ac_compile\"") >&5 (eval $ac_compile) 2>&5 ac_status=$? - echo "$as_me:3401: \$? = $ac_status" >&5 - (exit $ac_status); } && - { ac_try='test -s conftest.$ac_objext' - { (eval echo "$as_me:3404: \"$ac_try\"") >&5 + 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 (eval $ac_try) 2>&5 ac_status=$? - echo "$as_me:3407: \$? = $ac_status" >&5 - (exit $ac_status); }; }; then + echo "$as_me:3966: \$? = $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:3418: result: $cf_cv_gnu_dftsrc_219" >&5 +echo "$as_me:3977: 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 @@ -3424,14 +3983,14 @@ echo "${ECHO_T}$cf_cv_gnu_dftsrc_219" >&6 if test "x$cf_cv_gnu_dftsrc_219" != xyes; then - echo "$as_me:3427: checking if we must define _GNU_SOURCE" >&5 + echo "$as_me:3986: 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 3434 "configure" + cat >"conftest.$ac_ext" <<_ACEOF +#line 3993 "configure" #include "confdefs.h" #include <sys/types.h> int @@ -3445,22 +4004,22 @@ main (void) return 0; } _ACEOF -rm -f conftest.$ac_objext -if { (eval echo "$as_me:3449: \"$ac_compile\"") >&5 +rm -f "conftest.$ac_objext" +if { (eval echo "$as_me:4008: \"$ac_compile\"") >&5 (eval $ac_compile) 2>&5 ac_status=$? - echo "$as_me:3452: \$? = $ac_status" >&5 - (exit $ac_status); } && - { ac_try='test -s conftest.$ac_objext' - { (eval echo "$as_me:3455: \"$ac_try\"") >&5 + echo "$as_me:4011: \$? = $ac_status" >&5 + (exit "$ac_status"); } && + { ac_try='test -s "conftest.$ac_objext"' + { (eval echo "$as_me:4014: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? - echo "$as_me:3458: \$? = $ac_status" >&5 - (exit $ac_status); }; }; then + echo "$as_me:4017: \$? = $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 @@ -3470,19 +4029,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" @@ -3501,7 +4060,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/=.*//'` @@ -3531,7 +4090,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}" \ @@ -3561,8 +4120,8 @@ if test -n "$cf_new_extra_cppflags" ; then fi - cat >conftest.$ac_ext <<_ACEOF -#line 3565 "configure" + cat >"conftest.$ac_ext" <<_ACEOF +#line 4124 "configure" #include "confdefs.h" #include <sys/types.h> int @@ -3576,37 +4135,37 @@ main (void) return 0; } _ACEOF -rm -f conftest.$ac_objext -if { (eval echo "$as_me:3580: \"$ac_compile\"") >&5 +rm -f "conftest.$ac_objext" +if { (eval echo "$as_me:4139: \"$ac_compile\"") >&5 (eval $ac_compile) 2>&5 ac_status=$? - echo "$as_me:3583: \$? = $ac_status" >&5 - (exit $ac_status); } && - { ac_try='test -s conftest.$ac_objext' - { (eval echo "$as_me:3586: \"$ac_try\"") >&5 + echo "$as_me:4142: \$? = $ac_status" >&5 + (exit "$ac_status"); } && + { ac_try='test -s "conftest.$ac_objext"' + { (eval echo "$as_me:4145: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? - echo "$as_me:3589: \$? = $ac_status" >&5 - (exit $ac_status); }; }; then + echo "$as_me:4148: \$? = $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:3604: result: $cf_cv_gnu_source" >&5 +echo "$as_me:4163: 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:3609: checking if we should also define _DEFAULT_SOURCE" >&5 + echo "$as_me:4168: 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 @@ -3615,8 +4174,8 @@ else test -n "$CPPFLAGS" && CPPFLAGS="$CPPFLAGS " CPPFLAGS="${CPPFLAGS}-D_GNU_SOURCE" - cat >conftest.$ac_ext <<_ACEOF -#line 3619 "configure" + cat >"conftest.$ac_ext" <<_ACEOF +#line 4178 "configure" #include "confdefs.h" #include <sys/types.h> int @@ -3630,28 +4189,28 @@ main (void) return 0; } _ACEOF -rm -f conftest.$ac_objext -if { (eval echo "$as_me:3634: \"$ac_compile\"") >&5 +rm -f "conftest.$ac_objext" +if { (eval echo "$as_me:4193: \"$ac_compile\"") >&5 (eval $ac_compile) 2>&5 ac_status=$? - echo "$as_me:3637: \$? = $ac_status" >&5 - (exit $ac_status); } && - { ac_try='test -s conftest.$ac_objext' - { (eval echo "$as_me:3640: \"$ac_try\"") >&5 + echo "$as_me:4196: \$? = $ac_status" >&5 + (exit "$ac_status"); } && + { ac_try='test -s "conftest.$ac_objext"' + { (eval echo "$as_me:4199: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? - echo "$as_me:3643: \$? = $ac_status" >&5 - (exit $ac_status); }; }; then + echo "$as_me:4202: \$? = $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:3654: result: $cf_cv_default_source" >&5 +echo "$as_me:4213: result: $cf_cv_default_source" >&5 echo "${ECHO_T}$cf_cv_default_source" >&6 if test "$cf_cv_default_source" = yes then @@ -3673,6 +4232,8 @@ fi # setting _XOPEN_SOURCE or _POSIX_SOURCE breaks <sys/select.h> and other headers which use u_int / u_short types cf_XOPEN_SOURCE= +if test "$cf_cv_posix_visible" = no; then + cf_POSIX_C_SOURCE=$cf_POSIX_C_SOURCE cf_save_CFLAGS="$CFLAGS" @@ -3686,16 +4247,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:3689: checking if we should define _POSIX_C_SOURCE" >&5 +echo "$as_me:4250: 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}:3695: testing if the symbol is already defined go no further ..." 1>&5 +echo "${as_me:-configure}:4256: testing if the symbol is already defined go no further ..." 1>&5 - cat >conftest.$ac_ext <<_ACEOF -#line 3698 "configure" + cat >"conftest.$ac_ext" <<_ACEOF +#line 4259 "configure" #include "confdefs.h" #include <sys/types.h> int @@ -3709,22 +4270,22 @@ make an error return 0; } _ACEOF -rm -f conftest.$ac_objext -if { (eval echo "$as_me:3713: \"$ac_compile\"") >&5 +rm -f "conftest.$ac_objext" +if { (eval echo "$as_me:4274: \"$ac_compile\"") >&5 (eval $ac_compile) 2>&5 ac_status=$? - echo "$as_me:3716: \$? = $ac_status" >&5 - (exit $ac_status); } && - { ac_try='test -s conftest.$ac_objext' - { (eval echo "$as_me:3719: \"$ac_try\"") >&5 + echo "$as_me:4277: \$? = $ac_status" >&5 + (exit "$ac_status"); } && + { ac_try='test -s "conftest.$ac_objext"' + { (eval echo "$as_me:4280: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? - echo "$as_me:3722: \$? = $ac_status" >&5 - (exit $ac_status); }; }; then + echo "$as_me:4283: \$? = $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]??*) @@ -3739,8 +4300,8 @@ cf_want_posix_source=no ;; esac if test "$cf_want_posix_source" = yes ; then - cat >conftest.$ac_ext <<_ACEOF -#line 3743 "configure" + cat >"conftest.$ac_ext" <<_ACEOF +#line 4304 "configure" #include "confdefs.h" #include <sys/types.h> int @@ -3754,28 +4315,28 @@ make an error return 0; } _ACEOF -rm -f conftest.$ac_objext -if { (eval echo "$as_me:3758: \"$ac_compile\"") >&5 +rm -f "conftest.$ac_objext" +if { (eval echo "$as_me:4319: \"$ac_compile\"") >&5 (eval $ac_compile) 2>&5 ac_status=$? - echo "$as_me:3761: \$? = $ac_status" >&5 - (exit $ac_status); } && - { ac_try='test -s conftest.$ac_objext' - { (eval echo "$as_me:3764: \"$ac_try\"") >&5 + echo "$as_me:4322: \$? = $ac_status" >&5 + (exit "$ac_status"); } && + { ac_try='test -s "conftest.$ac_objext"' + { (eval echo "$as_me:4325: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? - echo "$as_me:3767: \$? = $ac_status" >&5 - (exit $ac_status); }; }; then + echo "$as_me:4328: \$? = $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}:3778: testing ifdef from value $cf_POSIX_C_SOURCE ..." 1>&5 +echo "${as_me:-configure}:4339: testing ifdef from value $cf_POSIX_C_SOURCE ..." 1>&5 CFLAGS="$cf_trim_CFLAGS" CPPFLAGS="$cf_trim_CPPFLAGS" @@ -3783,10 +4344,10 @@ echo "${as_me:-configure}:3778: testing ifdef from value $cf_POSIX_C_SOURCE ..." test -n "$CPPFLAGS" && CPPFLAGS="$CPPFLAGS " CPPFLAGS="${CPPFLAGS}$cf_cv_posix_c_source" -echo "${as_me:-configure}:3786: testing if the second compile does not leave our definition intact error ..." 1>&5 +echo "${as_me:-configure}:4347: testing if the second compile does not leave our definition intact error ..." 1>&5 - cat >conftest.$ac_ext <<_ACEOF -#line 3789 "configure" + cat >"conftest.$ac_ext" <<_ACEOF +#line 4350 "configure" #include "confdefs.h" #include <sys/types.h> int @@ -3800,33 +4361,33 @@ make an error return 0; } _ACEOF -rm -f conftest.$ac_objext -if { (eval echo "$as_me:3804: \"$ac_compile\"") >&5 +rm -f "conftest.$ac_objext" +if { (eval echo "$as_me:4365: \"$ac_compile\"") >&5 (eval $ac_compile) 2>&5 ac_status=$? - echo "$as_me:3807: \$? = $ac_status" >&5 - (exit $ac_status); } && - { ac_try='test -s conftest.$ac_objext' - { (eval echo "$as_me:3810: \"$ac_try\"") >&5 + echo "$as_me:4368: \$? = $ac_status" >&5 + (exit "$ac_status"); } && + { ac_try='test -s "conftest.$ac_objext"' + { (eval echo "$as_me:4371: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? - echo "$as_me:3813: \$? = $ac_status" >&5 - (exit $ac_status); }; }; then + echo "$as_me:4374: \$? = $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:3829: result: $cf_cv_posix_c_source" >&5 +echo "$as_me:4390: 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 @@ -3840,19 +4401,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" @@ -3871,7 +4432,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/=.*//'` @@ -3901,7 +4462,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}" \ @@ -3933,6 +4494,8 @@ fi fi +fi # cf_cv_posix_visible + ;; (netbsd*) cf_xopen_source="-D_NETBSD_SOURCE" # setting _XOPEN_SOURCE breaks IPv6 for lynx on NetBSD 1.6, breaks xterm, is not needed for ncursesw @@ -3964,14 +4527,14 @@ fi ;; (*) -echo "$as_me:3967: checking if we should define _XOPEN_SOURCE" >&5 +echo "$as_me:4530: 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 3974 "configure" + cat >"conftest.$ac_ext" <<_ACEOF +#line 4537 "configure" #include "confdefs.h" #include <stdlib.h> @@ -3989,29 +4552,29 @@ make an error return 0; } _ACEOF -rm -f conftest.$ac_objext -if { (eval echo "$as_me:3993: \"$ac_compile\"") >&5 +rm -f "conftest.$ac_objext" +if { (eval echo "$as_me:4556: \"$ac_compile\"") >&5 (eval $ac_compile) 2>&5 ac_status=$? - echo "$as_me:3996: \$? = $ac_status" >&5 - (exit $ac_status); } && - { ac_try='test -s conftest.$ac_objext' - { (eval echo "$as_me:3999: \"$ac_try\"") >&5 + echo "$as_me:4559: \$? = $ac_status" >&5 + (exit "$ac_status"); } && + { ac_try='test -s "conftest.$ac_objext"' + { (eval echo "$as_me:4562: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? - echo "$as_me:4002: \$? = $ac_status" >&5 - (exit $ac_status); }; }; then + echo "$as_me:4565: \$? = $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 4014 "configure" + cat >"conftest.$ac_ext" <<_ACEOF +#line 4577 "configure" #include "confdefs.h" #include <stdlib.h> @@ -4029,32 +4592,32 @@ make an error return 0; } _ACEOF -rm -f conftest.$ac_objext -if { (eval echo "$as_me:4033: \"$ac_compile\"") >&5 +rm -f "conftest.$ac_objext" +if { (eval echo "$as_me:4596: \"$ac_compile\"") >&5 (eval $ac_compile) 2>&5 ac_status=$? - echo "$as_me:4036: \$? = $ac_status" >&5 - (exit $ac_status); } && - { ac_try='test -s conftest.$ac_objext' - { (eval echo "$as_me:4039: \"$ac_try\"") >&5 + echo "$as_me:4599: \$? = $ac_status" >&5 + (exit "$ac_status"); } && + { ac_try='test -s "conftest.$ac_objext"' + { (eval echo "$as_me:4602: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? - echo "$as_me:4042: \$? = $ac_status" >&5 - (exit $ac_status); }; }; then + echo "$as_me:4605: \$? = $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 +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:4057: result: $cf_cv_xopen_source" >&5 +echo "$as_me:4620: result: $cf_cv_xopen_source" >&5 echo "${ECHO_T}$cf_cv_xopen_source" >&6 if test "$cf_cv_xopen_source" != no ; then @@ -4076,19 +4639,19 @@ cf_new_extra_cppflags= for cf_add_cflags in $cf_temp_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" @@ -4107,7 +4670,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/=.*//'` @@ -4137,7 +4700,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}" \ @@ -4169,6 +4732,8 @@ fi fi +if test "$cf_cv_posix_visible" = no; then + cf_POSIX_C_SOURCE=$cf_POSIX_C_SOURCE cf_save_CFLAGS="$CFLAGS" @@ -4182,16 +4747,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:4185: checking if we should define _POSIX_C_SOURCE" >&5 +echo "$as_me:4750: 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}:4191: testing if the symbol is already defined go no further ..." 1>&5 +echo "${as_me:-configure}:4756: testing if the symbol is already defined go no further ..." 1>&5 - cat >conftest.$ac_ext <<_ACEOF -#line 4194 "configure" + cat >"conftest.$ac_ext" <<_ACEOF +#line 4759 "configure" #include "confdefs.h" #include <sys/types.h> int @@ -4205,22 +4770,22 @@ make an error return 0; } _ACEOF -rm -f conftest.$ac_objext -if { (eval echo "$as_me:4209: \"$ac_compile\"") >&5 +rm -f "conftest.$ac_objext" +if { (eval echo "$as_me:4774: \"$ac_compile\"") >&5 (eval $ac_compile) 2>&5 ac_status=$? - echo "$as_me:4212: \$? = $ac_status" >&5 - (exit $ac_status); } && - { ac_try='test -s conftest.$ac_objext' - { (eval echo "$as_me:4215: \"$ac_try\"") >&5 + echo "$as_me:4777: \$? = $ac_status" >&5 + (exit "$ac_status"); } && + { ac_try='test -s "conftest.$ac_objext"' + { (eval echo "$as_me:4780: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? - echo "$as_me:4218: \$? = $ac_status" >&5 - (exit $ac_status); }; }; then + echo "$as_me:4783: \$? = $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]??*) @@ -4235,8 +4800,8 @@ cf_want_posix_source=no ;; esac if test "$cf_want_posix_source" = yes ; then - cat >conftest.$ac_ext <<_ACEOF -#line 4239 "configure" + cat >"conftest.$ac_ext" <<_ACEOF +#line 4804 "configure" #include "confdefs.h" #include <sys/types.h> int @@ -4250,28 +4815,28 @@ make an error return 0; } _ACEOF -rm -f conftest.$ac_objext -if { (eval echo "$as_me:4254: \"$ac_compile\"") >&5 +rm -f "conftest.$ac_objext" +if { (eval echo "$as_me:4819: \"$ac_compile\"") >&5 (eval $ac_compile) 2>&5 ac_status=$? - echo "$as_me:4257: \$? = $ac_status" >&5 - (exit $ac_status); } && - { ac_try='test -s conftest.$ac_objext' - { (eval echo "$as_me:4260: \"$ac_try\"") >&5 + echo "$as_me:4822: \$? = $ac_status" >&5 + (exit "$ac_status"); } && + { ac_try='test -s "conftest.$ac_objext"' + { (eval echo "$as_me:4825: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? - echo "$as_me:4263: \$? = $ac_status" >&5 - (exit $ac_status); }; }; then + echo "$as_me:4828: \$? = $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}:4274: testing ifdef from value $cf_POSIX_C_SOURCE ..." 1>&5 +echo "${as_me:-configure}:4839: testing ifdef from value $cf_POSIX_C_SOURCE ..." 1>&5 CFLAGS="$cf_trim_CFLAGS" CPPFLAGS="$cf_trim_CPPFLAGS" @@ -4279,10 +4844,10 @@ echo "${as_me:-configure}:4274: testing ifdef from value $cf_POSIX_C_SOURCE ..." test -n "$CPPFLAGS" && CPPFLAGS="$CPPFLAGS " CPPFLAGS="${CPPFLAGS}$cf_cv_posix_c_source" -echo "${as_me:-configure}:4282: testing if the second compile does not leave our definition intact error ..." 1>&5 +echo "${as_me:-configure}:4847: testing if the second compile does not leave our definition intact error ..." 1>&5 - cat >conftest.$ac_ext <<_ACEOF -#line 4285 "configure" + cat >"conftest.$ac_ext" <<_ACEOF +#line 4850 "configure" #include "confdefs.h" #include <sys/types.h> int @@ -4296,33 +4861,33 @@ make an error return 0; } _ACEOF -rm -f conftest.$ac_objext -if { (eval echo "$as_me:4300: \"$ac_compile\"") >&5 +rm -f "conftest.$ac_objext" +if { (eval echo "$as_me:4865: \"$ac_compile\"") >&5 (eval $ac_compile) 2>&5 ac_status=$? - echo "$as_me:4303: \$? = $ac_status" >&5 - (exit $ac_status); } && - { ac_try='test -s conftest.$ac_objext' - { (eval echo "$as_me:4306: \"$ac_try\"") >&5 + echo "$as_me:4868: \$? = $ac_status" >&5 + (exit "$ac_status"); } && + { ac_try='test -s "conftest.$ac_objext"' + { (eval echo "$as_me:4871: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? - echo "$as_me:4309: \$? = $ac_status" >&5 - (exit $ac_status); }; }; then + echo "$as_me:4874: \$? = $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:4325: result: $cf_cv_posix_c_source" >&5 +echo "$as_me:4890: 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 @@ -4336,19 +4901,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" @@ -4367,7 +4932,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/=.*//'` @@ -4397,7 +4962,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}" \ @@ -4429,6 +4994,8 @@ fi fi +fi # cf_cv_posix_visible + ;; esac @@ -4441,19 +5008,19 @@ cf_new_extra_cppflags= for cf_add_cflags in $cf_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" @@ -4472,7 +5039,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/=.*//'` @@ -4502,7 +5069,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}" \ @@ -4514,7 +5081,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}:4517: testing add to \$CFLAGS $cf_new_cflags ..." 1>&5 +echo "${as_me:-configure}:5084: testing add to \$CFLAGS $cf_new_cflags ..." 1>&5 test -n "$CFLAGS" && CFLAGS="$CFLAGS " CFLAGS="${CFLAGS}$cf_new_cflags" @@ -4524,7 +5091,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}:4527: testing add to \$CPPFLAGS $cf_new_cppflags ..." 1>&5 +echo "${as_me:-configure}:5094: testing add to \$CPPFLAGS $cf_new_cppflags ..." 1>&5 test -n "$CPPFLAGS" && CPPFLAGS="$CPPFLAGS " CPPFLAGS="${CPPFLAGS}$cf_new_cppflags" @@ -4534,7 +5101,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}:4537: testing add to \$EXTRA_CPPFLAGS $cf_new_extra_cppflags ..." 1>&5 +echo "${as_me:-configure}:5104: 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" @@ -4544,10 +5111,10 @@ fi fi if test -n "$cf_XOPEN_SOURCE" && test -z "$cf_cv_xopen_source" ; then - echo "$as_me:4547: checking if _XOPEN_SOURCE really is set" >&5 + echo "$as_me:5114: 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 4550 "configure" + cat >"conftest.$ac_ext" <<_ACEOF +#line 5117 "configure" #include "confdefs.h" #include <stdlib.h> int @@ -4561,31 +5128,31 @@ make an error return 0; } _ACEOF -rm -f conftest.$ac_objext -if { (eval echo "$as_me:4565: \"$ac_compile\"") >&5 +rm -f "conftest.$ac_objext" +if { (eval echo "$as_me:5132: \"$ac_compile\"") >&5 (eval $ac_compile) 2>&5 ac_status=$? - echo "$as_me:4568: \$? = $ac_status" >&5 - (exit $ac_status); } && - { ac_try='test -s conftest.$ac_objext' - { (eval echo "$as_me:4571: \"$ac_try\"") >&5 + echo "$as_me:5135: \$? = $ac_status" >&5 + (exit "$ac_status"); } && + { ac_try='test -s "conftest.$ac_objext"' + { (eval echo "$as_me:5138: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? - echo "$as_me:4574: \$? = $ac_status" >&5 - (exit $ac_status); }; }; then + echo "$as_me:5141: \$? = $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:4583: result: $cf_XOPEN_SOURCE_set" >&5 +rm -f "conftest.$ac_objext" "conftest.$ac_ext" + echo "$as_me:5150: 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 4588 "configure" + cat >"conftest.$ac_ext" <<_ACEOF +#line 5155 "configure" #include "confdefs.h" #include <stdlib.h> int @@ -4599,40 +5166,40 @@ make an error return 0; } _ACEOF -rm -f conftest.$ac_objext -if { (eval echo "$as_me:4603: \"$ac_compile\"") >&5 +rm -f "conftest.$ac_objext" +if { (eval echo "$as_me:5170: \"$ac_compile\"") >&5 (eval $ac_compile) 2>&5 ac_status=$? - echo "$as_me:4606: \$? = $ac_status" >&5 - (exit $ac_status); } && - { ac_try='test -s conftest.$ac_objext' - { (eval echo "$as_me:4609: \"$ac_try\"") >&5 + 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 (eval $ac_try) 2>&5 ac_status=$? - echo "$as_me:4612: \$? = $ac_status" >&5 - (exit $ac_status); }; }; then + echo "$as_me:5179: \$? = $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:4623: WARNING: _XOPEN_SOURCE is lower than requested" >&5 + { echo "$as_me:5190: WARNING: _XOPEN_SOURCE is lower than requested" >&5 echo "$as_me: WARNING: _XOPEN_SOURCE is lower than requested" >&2;} fi else -echo "$as_me:4628: checking if we should define _XOPEN_SOURCE" >&5 +echo "$as_me:5195: 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 4635 "configure" + cat >"conftest.$ac_ext" <<_ACEOF +#line 5202 "configure" #include "confdefs.h" #include <stdlib.h> @@ -4650,29 +5217,29 @@ make an error return 0; } _ACEOF -rm -f conftest.$ac_objext -if { (eval echo "$as_me:4654: \"$ac_compile\"") >&5 +rm -f "conftest.$ac_objext" +if { (eval echo "$as_me:5221: \"$ac_compile\"") >&5 (eval $ac_compile) 2>&5 ac_status=$? - echo "$as_me:4657: \$? = $ac_status" >&5 - (exit $ac_status); } && - { ac_try='test -s conftest.$ac_objext' - { (eval echo "$as_me:4660: \"$ac_try\"") >&5 + echo "$as_me:5224: \$? = $ac_status" >&5 + (exit "$ac_status"); } && + { ac_try='test -s "conftest.$ac_objext"' + { (eval echo "$as_me:5227: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? - echo "$as_me:4663: \$? = $ac_status" >&5 - (exit $ac_status); }; }; then + echo "$as_me:5230: \$? = $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 4675 "configure" + cat >"conftest.$ac_ext" <<_ACEOF +#line 5242 "configure" #include "confdefs.h" #include <stdlib.h> @@ -4690,32 +5257,32 @@ make an error return 0; } _ACEOF -rm -f conftest.$ac_objext -if { (eval echo "$as_me:4694: \"$ac_compile\"") >&5 +rm -f "conftest.$ac_objext" +if { (eval echo "$as_me:5261: \"$ac_compile\"") >&5 (eval $ac_compile) 2>&5 ac_status=$? - echo "$as_me:4697: \$? = $ac_status" >&5 - (exit $ac_status); } && - { ac_try='test -s conftest.$ac_objext' - { (eval echo "$as_me:4700: \"$ac_try\"") >&5 + echo "$as_me:5264: \$? = $ac_status" >&5 + (exit "$ac_status"); } && + { ac_try='test -s "conftest.$ac_objext"' + { (eval echo "$as_me:5267: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? - echo "$as_me:4703: \$? = $ac_status" >&5 - (exit $ac_status); }; }; then + echo "$as_me:5270: \$? = $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 +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:4718: result: $cf_cv_xopen_source" >&5 +echo "$as_me:5285: result: $cf_cv_xopen_source" >&5 echo "${ECHO_T}$cf_cv_xopen_source" >&6 if test "$cf_cv_xopen_source" != no ; then @@ -4737,19 +5304,19 @@ cf_new_extra_cppflags= for cf_add_cflags in $cf_temp_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" @@ -4768,7 +5335,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/=.*//'` @@ -4798,7 +5365,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}" \ @@ -4832,6 +5399,7 @@ fi fi fi +fi # cf_cv_posix_visible # Check whether --enable-largefile or --disable-largefile was given. if test "${enable_largefile+set}" = set; then @@ -4840,7 +5408,7 @@ if test "${enable_largefile+set}" = set; then fi; if test "$enable_largefile" != no; then - echo "$as_me:4843: checking for special C compiler options needed for large files" >&5 + echo "$as_me:5411: checking for special C compiler options needed for large files" >&5 echo $ECHO_N "checking for special C compiler options needed for large files... $ECHO_C" >&6 if test "${ac_cv_sys_largefile_CC+set}" = set; then echo $ECHO_N "(cached) $ECHO_C" >&6 @@ -4851,8 +5419,8 @@ else while :; do # IRIX 6.2 and later do not support large files by default, # so use the C compiler's -n32 option if that helps. - cat >conftest.$ac_ext <<_ACEOF -#line 4855 "configure" + cat >"conftest.$ac_ext" <<_ACEOF +#line 5423 "configure" #include "confdefs.h" #include <sys/types.h> /* Check that off_t can represent 2**63 - 1 correctly. @@ -4871,64 +5439,64 @@ main (void) return 0; } _ACEOF - rm -f conftest.$ac_objext -if { (eval echo "$as_me:4875: \"$ac_compile\"") >&5 + rm -f "conftest.$ac_objext" +if { (eval echo "$as_me:5443: \"$ac_compile\"") >&5 (eval $ac_compile) 2>&5 ac_status=$? - echo "$as_me:4878: \$? = $ac_status" >&5 - (exit $ac_status); } && - { ac_try='test -s conftest.$ac_objext' - { (eval echo "$as_me:4881: \"$ac_try\"") >&5 + 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 (eval $ac_try) 2>&5 ac_status=$? - echo "$as_me:4884: \$? = $ac_status" >&5 - (exit $ac_status); }; }; then + echo "$as_me:5452: \$? = $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 +rm -f "conftest.$ac_objext" CC="$CC -n32" - rm -f conftest.$ac_objext -if { (eval echo "$as_me:4894: \"$ac_compile\"") >&5 + rm -f "conftest.$ac_objext" +if { (eval echo "$as_me:5462: \"$ac_compile\"") >&5 (eval $ac_compile) 2>&5 ac_status=$? - echo "$as_me:4897: \$? = $ac_status" >&5 - (exit $ac_status); } && - { ac_try='test -s conftest.$ac_objext' - { (eval echo "$as_me:4900: \"$ac_try\"") >&5 + echo "$as_me:5465: \$? = $ac_status" >&5 + (exit "$ac_status"); } && + { ac_try='test -s "conftest.$ac_objext"' + { (eval echo "$as_me:5468: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? - echo "$as_me:4903: \$? = $ac_status" >&5 - (exit $ac_status); }; }; then + echo "$as_me:5471: \$? = $ac_status" >&5 + (exit "$ac_status"); }; }; then ac_cv_sys_largefile_CC=' -n32'; break else echo "$as_me: failed program was:" >&5 -cat conftest.$ac_ext >&5 +cat "conftest.$ac_ext" >&5 fi -rm -f conftest.$ac_objext +rm -f "conftest.$ac_objext" break done CC=$ac_save_CC - rm -f conftest.$ac_ext + rm -f "conftest.$ac_ext" fi fi -echo "$as_me:4917: result: $ac_cv_sys_largefile_CC" >&5 +echo "$as_me:5485: result: $ac_cv_sys_largefile_CC" >&5 echo "${ECHO_T}$ac_cv_sys_largefile_CC" >&6 if test "$ac_cv_sys_largefile_CC" != no; then CC=$CC$ac_cv_sys_largefile_CC fi - echo "$as_me:4923: checking for _FILE_OFFSET_BITS value needed for large files" >&5 + echo "$as_me:5491: checking for _FILE_OFFSET_BITS value needed for large files" >&5 echo $ECHO_N "checking for _FILE_OFFSET_BITS value needed for large files... $ECHO_C" >&6 if test "${ac_cv_sys_file_offset_bits+set}" = set; then echo $ECHO_N "(cached) $ECHO_C" >&6 else while :; do ac_cv_sys_file_offset_bits=no - cat >conftest.$ac_ext <<_ACEOF -#line 4931 "configure" + cat >"conftest.$ac_ext" <<_ACEOF +#line 5499 "configure" #include "confdefs.h" #include <sys/types.h> /* Check that off_t can represent 2**63 - 1 correctly. @@ -4947,26 +5515,26 @@ main (void) return 0; } _ACEOF -rm -f conftest.$ac_objext -if { (eval echo "$as_me:4951: \"$ac_compile\"") >&5 +rm -f "conftest.$ac_objext" +if { (eval echo "$as_me:5519: \"$ac_compile\"") >&5 (eval $ac_compile) 2>&5 ac_status=$? - echo "$as_me:4954: \$? = $ac_status" >&5 - (exit $ac_status); } && - { ac_try='test -s conftest.$ac_objext' - { (eval echo "$as_me:4957: \"$ac_try\"") >&5 + echo "$as_me:5522: \$? = $ac_status" >&5 + (exit "$ac_status"); } && + { ac_try='test -s "conftest.$ac_objext"' + { (eval echo "$as_me:5525: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? - echo "$as_me:4960: \$? = $ac_status" >&5 - (exit $ac_status); }; }; then + echo "$as_me:5528: \$? = $ac_status" >&5 + (exit "$ac_status"); }; }; then break else echo "$as_me: failed program was:" >&5 -cat conftest.$ac_ext >&5 +cat "conftest.$ac_ext" >&5 fi -rm -f conftest.$ac_objext conftest.$ac_ext - cat >conftest.$ac_ext <<_ACEOF -#line 4969 "configure" +rm -f "conftest.$ac_objext" "conftest.$ac_ext" + cat >"conftest.$ac_ext" <<_ACEOF +#line 5537 "configure" #include "confdefs.h" #define _FILE_OFFSET_BITS 64 #include <sys/types.h> @@ -4986,28 +5554,28 @@ main (void) return 0; } _ACEOF -rm -f conftest.$ac_objext -if { (eval echo "$as_me:4990: \"$ac_compile\"") >&5 +rm -f "conftest.$ac_objext" +if { (eval echo "$as_me:5558: \"$ac_compile\"") >&5 (eval $ac_compile) 2>&5 ac_status=$? - echo "$as_me:4993: \$? = $ac_status" >&5 - (exit $ac_status); } && - { ac_try='test -s conftest.$ac_objext' - { (eval echo "$as_me:4996: \"$ac_try\"") >&5 + echo "$as_me:5561: \$? = $ac_status" >&5 + (exit "$ac_status"); } && + { ac_try='test -s "conftest.$ac_objext"' + { (eval echo "$as_me:5564: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? - echo "$as_me:4999: \$? = $ac_status" >&5 - (exit $ac_status); }; }; then + echo "$as_me:5567: \$? = $ac_status" >&5 + (exit "$ac_status"); }; }; then ac_cv_sys_file_offset_bits=64; break else echo "$as_me: failed program was:" >&5 -cat conftest.$ac_ext >&5 +cat "conftest.$ac_ext" >&5 fi -rm -f conftest.$ac_objext conftest.$ac_ext +rm -f "conftest.$ac_objext" "conftest.$ac_ext" break done fi -echo "$as_me:5010: result: $ac_cv_sys_file_offset_bits" >&5 +echo "$as_me:5578: result: $ac_cv_sys_file_offset_bits" >&5 echo "${ECHO_T}$ac_cv_sys_file_offset_bits" >&6 if test "$ac_cv_sys_file_offset_bits" != no; then @@ -5017,15 +5585,15 @@ EOF fi rm -rf conftest* - echo "$as_me:5020: checking for _LARGE_FILES value needed for large files" >&5 + echo "$as_me:5588: checking for _LARGE_FILES value needed for large files" >&5 echo $ECHO_N "checking for _LARGE_FILES value needed for large files... $ECHO_C" >&6 if test "${ac_cv_sys_large_files+set}" = set; then echo $ECHO_N "(cached) $ECHO_C" >&6 else while :; do ac_cv_sys_large_files=no - cat >conftest.$ac_ext <<_ACEOF -#line 5028 "configure" + cat >"conftest.$ac_ext" <<_ACEOF +#line 5596 "configure" #include "confdefs.h" #include <sys/types.h> /* Check that off_t can represent 2**63 - 1 correctly. @@ -5044,26 +5612,26 @@ main (void) return 0; } _ACEOF -rm -f conftest.$ac_objext -if { (eval echo "$as_me:5048: \"$ac_compile\"") >&5 +rm -f "conftest.$ac_objext" +if { (eval echo "$as_me:5616: \"$ac_compile\"") >&5 (eval $ac_compile) 2>&5 ac_status=$? - echo "$as_me:5051: \$? = $ac_status" >&5 - (exit $ac_status); } && - { ac_try='test -s conftest.$ac_objext' - { (eval echo "$as_me:5054: \"$ac_try\"") >&5 + echo "$as_me:5619: \$? = $ac_status" >&5 + (exit "$ac_status"); } && + { ac_try='test -s "conftest.$ac_objext"' + { (eval echo "$as_me:5622: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? - echo "$as_me:5057: \$? = $ac_status" >&5 - (exit $ac_status); }; }; then + echo "$as_me:5625: \$? = $ac_status" >&5 + (exit "$ac_status"); }; }; then break else echo "$as_me: failed program was:" >&5 -cat conftest.$ac_ext >&5 +cat "conftest.$ac_ext" >&5 fi -rm -f conftest.$ac_objext conftest.$ac_ext - cat >conftest.$ac_ext <<_ACEOF -#line 5066 "configure" +rm -f "conftest.$ac_objext" "conftest.$ac_ext" + cat >"conftest.$ac_ext" <<_ACEOF +#line 5634 "configure" #include "confdefs.h" #define _LARGE_FILES 1 #include <sys/types.h> @@ -5083,28 +5651,28 @@ main (void) return 0; } _ACEOF -rm -f conftest.$ac_objext -if { (eval echo "$as_me:5087: \"$ac_compile\"") >&5 +rm -f "conftest.$ac_objext" +if { (eval echo "$as_me:5655: \"$ac_compile\"") >&5 (eval $ac_compile) 2>&5 ac_status=$? - echo "$as_me:5090: \$? = $ac_status" >&5 - (exit $ac_status); } && - { ac_try='test -s conftest.$ac_objext' - { (eval echo "$as_me:5093: \"$ac_try\"") >&5 + echo "$as_me:5658: \$? = $ac_status" >&5 + (exit "$ac_status"); } && + { ac_try='test -s "conftest.$ac_objext"' + { (eval echo "$as_me:5661: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? - echo "$as_me:5096: \$? = $ac_status" >&5 - (exit $ac_status); }; }; then + echo "$as_me:5664: \$? = $ac_status" >&5 + (exit "$ac_status"); }; }; then ac_cv_sys_large_files=1; break else echo "$as_me: failed program was:" >&5 -cat conftest.$ac_ext >&5 +cat "conftest.$ac_ext" >&5 fi -rm -f conftest.$ac_objext conftest.$ac_ext +rm -f "conftest.$ac_objext" "conftest.$ac_ext" break done fi -echo "$as_me:5107: result: $ac_cv_sys_large_files" >&5 +echo "$as_me:5675: result: $ac_cv_sys_large_files" >&5 echo "${ECHO_T}$ac_cv_sys_large_files" >&6 if test "$ac_cv_sys_large_files" != no; then @@ -5117,15 +5685,15 @@ rm -rf conftest* fi if test "$enable_largefile" != no ; then - echo "$as_me:5120: checking for _LARGEFILE_SOURCE value needed for large files" >&5 + echo "$as_me:5688: checking for _LARGEFILE_SOURCE value needed for large files" >&5 echo $ECHO_N "checking for _LARGEFILE_SOURCE value needed for large files... $ECHO_C" >&6 if test "${ac_cv_sys_largefile_source+set}" = set; then echo $ECHO_N "(cached) $ECHO_C" >&6 else while :; do ac_cv_sys_largefile_source=no - cat >conftest.$ac_ext <<_ACEOF -#line 5128 "configure" + cat >"conftest.$ac_ext" <<_ACEOF +#line 5696 "configure" #include "confdefs.h" #include <stdio.h> int @@ -5136,26 +5704,26 @@ return !fseeko; return 0; } _ACEOF -rm -f conftest.$ac_objext -if { (eval echo "$as_me:5140: \"$ac_compile\"") >&5 +rm -f "conftest.$ac_objext" +if { (eval echo "$as_me:5708: \"$ac_compile\"") >&5 (eval $ac_compile) 2>&5 ac_status=$? - echo "$as_me:5143: \$? = $ac_status" >&5 - (exit $ac_status); } && - { ac_try='test -s conftest.$ac_objext' - { (eval echo "$as_me:5146: \"$ac_try\"") >&5 + echo "$as_me:5711: \$? = $ac_status" >&5 + (exit "$ac_status"); } && + { ac_try='test -s "conftest.$ac_objext"' + { (eval echo "$as_me:5714: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? - echo "$as_me:5149: \$? = $ac_status" >&5 - (exit $ac_status); }; }; then + echo "$as_me:5717: \$? = $ac_status" >&5 + (exit "$ac_status"); }; }; then break else echo "$as_me: failed program was:" >&5 -cat conftest.$ac_ext >&5 +cat "conftest.$ac_ext" >&5 fi -rm -f conftest.$ac_objext conftest.$ac_ext - cat >conftest.$ac_ext <<_ACEOF -#line 5158 "configure" +rm -f "conftest.$ac_objext" "conftest.$ac_ext" + cat >"conftest.$ac_ext" <<_ACEOF +#line 5726 "configure" #include "confdefs.h" #define _LARGEFILE_SOURCE 1 #include <stdio.h> @@ -5167,28 +5735,28 @@ return !fseeko; return 0; } _ACEOF -rm -f conftest.$ac_objext -if { (eval echo "$as_me:5171: \"$ac_compile\"") >&5 +rm -f "conftest.$ac_objext" +if { (eval echo "$as_me:5739: \"$ac_compile\"") >&5 (eval $ac_compile) 2>&5 ac_status=$? - echo "$as_me:5174: \$? = $ac_status" >&5 - (exit $ac_status); } && - { ac_try='test -s conftest.$ac_objext' - { (eval echo "$as_me:5177: \"$ac_try\"") >&5 + echo "$as_me:5742: \$? = $ac_status" >&5 + (exit "$ac_status"); } && + { ac_try='test -s "conftest.$ac_objext"' + { (eval echo "$as_me:5745: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? - echo "$as_me:5180: \$? = $ac_status" >&5 - (exit $ac_status); }; }; then + echo "$as_me:5748: \$? = $ac_status" >&5 + (exit "$ac_status"); }; }; then ac_cv_sys_largefile_source=1; break else echo "$as_me: failed program was:" >&5 -cat conftest.$ac_ext >&5 +cat "conftest.$ac_ext" >&5 fi -rm -f conftest.$ac_objext conftest.$ac_ext +rm -f "conftest.$ac_objext" "conftest.$ac_ext" break done fi -echo "$as_me:5191: result: $ac_cv_sys_largefile_source" >&5 +echo "$as_me:5759: result: $ac_cv_sys_largefile_source" >&5 echo "${ECHO_T}$ac_cv_sys_largefile_source" >&6 if test "$ac_cv_sys_largefile_source" != no; then @@ -5202,13 +5770,13 @@ rm -rf conftest* # We used to try defining _XOPEN_SOURCE=500 too, to work around a bug # in glibc 2.1.3, but that breaks too many other things. # If you want fseeko and ftello with glibc, upgrade to a fixed glibc. -echo "$as_me:5205: checking for fseeko" >&5 +echo "$as_me:5773: checking for fseeko" >&5 echo $ECHO_N "checking for fseeko... $ECHO_C" >&6 if test "${ac_cv_func_fseeko+set}" = set; then echo $ECHO_N "(cached) $ECHO_C" >&6 else - cat >conftest.$ac_ext <<_ACEOF -#line 5211 "configure" + cat >"conftest.$ac_ext" <<_ACEOF +#line 5779 "configure" #include "confdefs.h" #include <stdio.h> int @@ -5219,27 +5787,27 @@ return fseeko && fseeko (stdin, 0, 0); return 0; } _ACEOF -rm -f conftest.$ac_objext conftest$ac_exeext -if { (eval echo "$as_me:5223: \"$ac_link\"") >&5 +rm -f "conftest.$ac_objext" "conftest$ac_exeext" +if { (eval echo "$as_me:5791: \"$ac_link\"") >&5 (eval $ac_link) 2>&5 ac_status=$? - echo "$as_me:5226: \$? = $ac_status" >&5 - (exit $ac_status); } && - { ac_try='test -s conftest$ac_exeext' - { (eval echo "$as_me:5229: \"$ac_try\"") >&5 + echo "$as_me:5794: \$? = $ac_status" >&5 + (exit "$ac_status"); } && + { ac_try='test -s "conftest$ac_exeext"' + { (eval echo "$as_me:5797: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? - echo "$as_me:5232: \$? = $ac_status" >&5 - (exit $ac_status); }; }; then + echo "$as_me:5800: \$? = $ac_status" >&5 + (exit "$ac_status"); }; }; then ac_cv_func_fseeko=yes else echo "$as_me: failed program was:" >&5 -cat conftest.$ac_ext >&5 +cat "conftest.$ac_ext" >&5 ac_cv_func_fseeko=no fi -rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext +rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext" fi -echo "$as_me:5242: result: $ac_cv_func_fseeko" >&5 +echo "$as_me:5810: result: $ac_cv_func_fseeko" >&5 echo "${ECHO_T}$ac_cv_func_fseeko" >&6 if test $ac_cv_func_fseeko = yes; then @@ -5278,14 +5846,14 @@ fi fi - echo "$as_me:5281: checking whether to use struct dirent64" >&5 + echo "$as_me:5849: checking whether to use struct dirent64" >&5 echo $ECHO_N "checking whether to use struct dirent64... $ECHO_C" >&6 if test "${cf_cv_struct_dirent64+set}" = set; then echo $ECHO_N "(cached) $ECHO_C" >&6 else - cat >conftest.$ac_ext <<_ACEOF -#line 5288 "configure" + cat >"conftest.$ac_ext" <<_ACEOF +#line 5856 "configure" #include "confdefs.h" #pragma GCC diagnostic error "-Wincompatible-pointer-types" @@ -5301,33 +5869,34 @@ main (void) struct dirent64 *x = readdir((DIR *)0); struct dirent *y = readdir((DIR *)0); int z = x - y; + (void)z; ; return 0; } _ACEOF -rm -f conftest.$ac_objext -if { (eval echo "$as_me:5310: \"$ac_compile\"") >&5 +rm -f "conftest.$ac_objext" +if { (eval echo "$as_me:5879: \"$ac_compile\"") >&5 (eval $ac_compile) 2>&5 ac_status=$? - echo "$as_me:5313: \$? = $ac_status" >&5 - (exit $ac_status); } && - { ac_try='test -s conftest.$ac_objext' - { (eval echo "$as_me:5316: \"$ac_try\"") >&5 + echo "$as_me:5882: \$? = $ac_status" >&5 + (exit "$ac_status"); } && + { ac_try='test -s "conftest.$ac_objext"' + { (eval echo "$as_me:5885: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? - echo "$as_me:5319: \$? = $ac_status" >&5 - (exit $ac_status); }; }; then + echo "$as_me:5888: \$? = $ac_status" >&5 + (exit "$ac_status"); }; }; then cf_cv_struct_dirent64=yes else echo "$as_me: failed program was:" >&5 -cat conftest.$ac_ext >&5 +cat "conftest.$ac_ext" >&5 cf_cv_struct_dirent64=no fi -rm -f conftest.$ac_objext conftest.$ac_ext +rm -f "conftest.$ac_objext" "conftest.$ac_ext" fi -echo "$as_me:5330: result: $cf_cv_struct_dirent64" >&5 +echo "$as_me:5899: result: $cf_cv_struct_dirent64" >&5 echo "${ECHO_T}$cf_cv_struct_dirent64" >&6 test "$cf_cv_struct_dirent64" = yes && cat >>confdefs.h <<\EOF @@ -5336,7 +5905,7 @@ EOF fi -echo "$as_me:5339: checking for install-prefix" >&5 +echo "$as_me:5908: checking for install-prefix" >&5 echo $ECHO_N "checking for install-prefix... $ECHO_C" >&6 # Check whether --with-install-prefix or --without-install-prefix was given. @@ -5346,7 +5915,7 @@ if test "${with_install_prefix+set}" = set; then else cf_opt_with_install_prefix=${DESTDIR:-no} fi; -echo "$as_me:5349: result: $cf_opt_with_install_prefix" >&5 +echo "$as_me:5918: result: $cf_opt_with_install_prefix" >&5 echo "${ECHO_T}$cf_opt_with_install_prefix" >&6 if test "$cf_opt_with_install_prefix" != no ; then @@ -5363,19 +5932,19 @@ case ".$cf_opt_with_install_prefix" in ;; (.[a-zA-Z]:[\\/]*) # OS/2 EMX ;; -(.\${*prefix}*|.\${*dir}*) +(.\$\{*prefix\}*|.\$\{*dir\}*) eval cf_opt_with_install_prefix="$cf_opt_with_install_prefix" case ".$cf_opt_with_install_prefix" in (.NONE/*) - cf_opt_with_install_prefix=`echo $cf_opt_with_install_prefix | sed -e s%NONE%$cf_path_syntax%` + cf_opt_with_install_prefix=`echo "$cf_opt_with_install_prefix" | sed -e s%NONE%$cf_path_syntax%` ;; esac ;; (.no|.NONE/*) - cf_opt_with_install_prefix=`echo $cf_opt_with_install_prefix | sed -e s%NONE%$cf_path_syntax%` + cf_opt_with_install_prefix=`echo "$cf_opt_with_install_prefix" | sed -e s%NONE%$cf_path_syntax%` ;; (*) - { { echo "$as_me:5378: error: expected a pathname, not \"$cf_opt_with_install_prefix\"" >&5 + { { echo "$as_me:5947: error: expected a pathname, not \"$cf_opt_with_install_prefix\"" >&5 echo "$as_me: error: expected a pathname, not \"$cf_opt_with_install_prefix\"" >&2;} { (exit 1); exit 1; }; } ;; @@ -5384,263 +5953,1362 @@ esac DESTDIR=$cf_opt_with_install_prefix fi -if ( test "$GCC" = yes || test "$GXX" = yes ) +if test -n "$with_screen" && test "x$with_screen" = "xpdcurses" then -echo "$as_me:5389: checking if you want to check for gcc warnings" >&5 -echo $ECHO_N "checking if you want to check for gcc warnings... $ECHO_C" >&6 + echo "$as_me:5958: checking for X" >&5 +echo $ECHO_N "checking for X... $ECHO_C" >&6 + +# Check whether --with-x or --without-x was given. +if test "${with_x+set}" = set; then + withval="$with_x" -# Check whether --with-warnings or --without-warnings was given. -if test "${with_warnings+set}" = set; then - withval="$with_warnings" - cf_opt_with_warnings=$withval -else - cf_opt_with_warnings=no fi; -echo "$as_me:5399: result: $cf_opt_with_warnings" >&5 -echo "${ECHO_T}$cf_opt_with_warnings" >&6 -if test "$cf_opt_with_warnings" != no ; then +# $have_x is `yes', `no', `disabled', or empty when we do not yet know. +if test "x$with_x" = xno; then + # The user explicitly disabled X. + have_x=disabled +else + if test "x$x_includes" != xNONE && test "x$x_libraries" != xNONE; then + # Both variables are already set. + have_x=yes + else + if test "${ac_cv_have_x+set}" = set; then + echo $ECHO_N "(cached) $ECHO_C" >&6 +else + # One or both of the vars are not set, and there is no cached value. +ac_x_includes=no ac_x_libraries=no +rm -fr conftest.dir +if mkdir conftest.dir; then + cd conftest.dir + # Make sure to not put "make" in the Imakefile rules, since we grep it out. + cat >Imakefile <<'EOF' +acfindx: + @echo 'ac_im_incroot="${INCROOT}"; ac_im_usrlibdir="${USRLIBDIR}"; ac_im_libdir="${LIBDIR}"' +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`" + # 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 + ac_im_usrlibdir=$ac_im_libdir; break + fi + done + # Screen out bogus values from the imake configuration. They are + # bogus both because they are the default anyway, and because + # using them would break gcc on systems where it needs fixed includes. + case $ac_im_incroot in + /usr/include) ;; + *) test -f "$ac_im_incroot/X11/Xos.h" && ac_x_includes=$ac_im_incroot;; + esac + case $ac_im_usrlibdir in + /usr/lib | /lib) ;; + *) test -d "$ac_im_usrlibdir" && ac_x_libraries=$ac_im_usrlibdir ;; + esac + fi + cd .. + rm -fr conftest.dir +fi -if test "$GCC" = yes -then -cat > conftest.i <<EOF -#ifndef GCC_PRINTF -#define GCC_PRINTF 0 -#endif -#ifndef GCC_SCANF -#define GCC_SCANF 0 +# Standard set of common directories for X headers. +# Check X11 before X11Rn because it is often a symlink to the current release. +ac_x_header_dirs=' +/usr/X11/include +/usr/X11R7/include +/usr/X11R6/include +/usr/X11R5/include +/usr/X11R4/include + +/opt/local/include +/opt/X11/include + +/usr/include/X11 +/usr/include/X11R7 +/usr/include/X11R6 +/usr/include/X11R5 +/usr/include/X11R4 + +/usr/local/X11/include +/usr/local/X11R7/include +/usr/local/X11R6/include +/usr/local/X11R5/include +/usr/local/X11R4/include + +/usr/local/include/X11 +/usr/local/include/X11R7 +/usr/local/include/X11R6 +/usr/local/include/X11R5 +/usr/local/include/X11R4 + +/usr/X386/include +/usr/x386/include +/usr/XFree86/include/X11 + +/usr/include +/usr/local/include +/usr/unsupported/include +/usr/athena/include +/usr/local/x11r5/include +/usr/lpp/Xamples/include + +/usr/openwin/include +/usr/openwin/share/include' + +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 6062 "configure" +#include "confdefs.h" +#include <X11/Intrinsic.h> +_ACEOF +if { (eval echo "$as_me:6066: \"$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:6072: \$? = $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 + # We can compile using X headers with no special include directory. +ac_x_includes= +else + echo "$as_me: failed program was:" >&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 + break + fi +done +fi +rm -f conftest.err "conftest.$ac_ext" +fi # $ac_x_includes = no + +if test "$ac_x_libraries" = no; then + # Check for the libraries. + # See if we find them without any special options. + # Don't add to $LIBS permanently. + ac_save_LIBS=$LIBS + LIBS="-lXt $LIBS" + cat >"conftest.$ac_ext" <<_ACEOF +#line 6105 "configure" +#include "confdefs.h" +#include <X11/Intrinsic.h> +int +main (void) +{ +XtMalloc (0) + ; + return 0; +} +_ACEOF +rm -f "conftest.$ac_objext" "conftest$ac_exeext" +if { (eval echo "$as_me:6117: \"$ac_link\"") >&5 + (eval $ac_link) 2>&5 + ac_status=$? + echo "$as_me:6120: \$? = $ac_status" >&5 + (exit "$ac_status"); } && + { ac_try='test -s "conftest$ac_exeext"' + { (eval echo "$as_me:6123: \"$ac_try\"") >&5 + (eval $ac_try) 2>&5 + ac_status=$? + echo "$as_me:6126: \$? = $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 +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 + ac_x_libraries=$ac_dir + break 2 + fi + done +done +fi +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 + # Didn't find X anywhere. Cache the known absence of X. + ac_cv_have_x="have_x=no" +else + # Record where we found X for the cache. + ac_cv_have_x="have_x=yes \ + ac_x_includes=$ac_x_includes ac_x_libraries=$ac_x_libraries" +fi +fi + + fi + eval "$ac_cv_have_x" +fi # $with_x != no + +if test "$have_x" != yes; then + echo "$as_me:6164: result: $have_x" >&5 +echo "${ECHO_T}$have_x" >&6 + no_x=yes +else + # If each of the values was on the command line, it overrides each guess. + test "x$x_includes" = xNONE && x_includes=$ac_x_includes + test "x$x_libraries" = xNONE && x_libraries=$ac_x_libraries + # 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:6174: result: libraries $x_libraries, headers $x_includes" >&5 +echo "${ECHO_T}libraries $x_libraries, headers $x_includes" >&6 +fi + + if test "$no_x" = yes; then + # Not all programs may use this symbol, but it does not hurt to define it. + +cat >>confdefs.h <<\EOF +#define X_DISPLAY_MISSING 1 +EOF + + X_CFLAGS= + X_PRE_LIBS= + X_LIBS= + X_EXTRA_LIBS= +else + if test -n "$x_includes"; then + X_CFLAGS="$X_CFLAGS -I$x_includes" + fi + + # It would also be nice to do this for all -L options, not just this one. + if test -n "$x_libraries"; then + X_LIBS="$X_LIBS -L$x_libraries" + # For Solaris; some versions of Sun CC require a space after -R and + # others require no space. Words are not sufficient . . . . + case `(uname -sr) 2>/dev/null` in + "SunOS 5"*) + echo "$as_me:6201: 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 6205 "configure" +#include "confdefs.h" + +int +main (void) +{ + + ; + return 0; +} +_ACEOF +rm -f "conftest.$ac_objext" "conftest$ac_exeext" +if { (eval echo "$as_me:6217: \"$ac_link\"") >&5 + (eval $ac_link) 2>&5 + ac_status=$? + echo "$as_me:6220: \$? = $ac_status" >&5 + (exit "$ac_status"); } && + { ac_try='test -s "conftest$ac_exeext"' + { (eval echo "$as_me:6223: \"$ac_try\"") >&5 + (eval $ac_try) 2>&5 + ac_status=$? + echo "$as_me:6226: \$? = $ac_status" >&5 + (exit "$ac_status"); }; }; then + ac_R_nospace=yes +else + echo "$as_me: failed program was:" >&5 +cat "conftest.$ac_ext" >&5 +ac_R_nospace=no +fi +rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext" + if test $ac_R_nospace = yes; then + echo "$as_me:6236: 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 6242 "configure" +#include "confdefs.h" + +int +main (void) +{ + + ; + return 0; +} +_ACEOF +rm -f "conftest.$ac_objext" "conftest$ac_exeext" +if { (eval echo "$as_me:6254: \"$ac_link\"") >&5 + (eval $ac_link) 2>&5 + ac_status=$? + echo "$as_me:6257: \$? = $ac_status" >&5 + (exit "$ac_status"); } && + { ac_try='test -s "conftest$ac_exeext"' + { (eval echo "$as_me:6260: \"$ac_try\"") >&5 + (eval $ac_try) 2>&5 + ac_status=$? + echo "$as_me:6263: \$? = $ac_status" >&5 + (exit "$ac_status"); }; }; then + ac_R_space=yes +else + echo "$as_me: failed program was:" >&5 +cat "conftest.$ac_ext" >&5 +ac_R_space=no +fi +rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext" + if test $ac_R_space = yes; then + echo "$as_me:6273: result: yes" >&5 +echo "${ECHO_T}yes" >&6 + X_LIBS="$X_LIBS -R $x_libraries" + else + echo "$as_me:6277: result: neither works" >&5 +echo "${ECHO_T}neither works" >&6 + fi + fi + LIBS=$ac_xsave_LIBS + esac + fi + + # Check for system-dependent libraries X programs must link with. + # Do this before checking for the system-independent R6 libraries + # (-lICE), since we may need -lsocket or whatever for X linking. + + if test "$ISC" = yes; then + X_EXTRA_LIBS="$X_EXTRA_LIBS -lnsl_s -linet" + else + # Martyn Johnson says this is needed for Ultrix, if the X + # 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 6297 "configure" +#include "confdefs.h" + +/* Override any gcc2 internal prototype to avoid an error. */ +#ifdef __cplusplus +extern "C" #endif -#ifndef GCC_NORETURN -#define GCC_NORETURN /* nothing */ +/* We use char because int might match the return type of a gcc2 + builtin and then its argument prototype would still apply. */ +char XOpenDisplay (); +int +main (void) +{ +XOpenDisplay (); + ; + return 0; +} +_ACEOF +rm -f "conftest.$ac_objext" "conftest$ac_exeext" +if { (eval echo "$as_me:6316: \"$ac_link\"") >&5 + (eval $ac_link) 2>&5 + ac_status=$? + echo "$as_me:6319: \$? = $ac_status" >&5 + (exit "$ac_status"); } && + { ac_try='test -s "conftest$ac_exeext"' + { (eval echo "$as_me:6322: \"$ac_try\"") >&5 + (eval $ac_try) 2>&5 + ac_status=$? + echo "$as_me:6325: \$? = $ac_status" >&5 + (exit "$ac_status"); }; }; then + : +else + echo "$as_me: failed program was:" >&5 +cat "conftest.$ac_ext" >&5 +echo "$as_me:6331: 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 6339 "configure" +#include "confdefs.h" + +/* Override any gcc2 internal prototype to avoid an error. */ +#ifdef __cplusplus +extern "C" #endif -#ifndef GCC_UNUSED -#define GCC_UNUSED /* nothing */ +/* We use char because int might match the return type of a gcc2 + builtin and then its argument prototype would still apply. */ +char dnet_ntoa (); +int +main (void) +{ +dnet_ntoa (); + ; + return 0; +} +_ACEOF +rm -f "conftest.$ac_objext" "conftest$ac_exeext" +if { (eval echo "$as_me:6358: \"$ac_link\"") >&5 + (eval $ac_link) 2>&5 + ac_status=$? + echo "$as_me:6361: \$? = $ac_status" >&5 + (exit "$ac_status"); } && + { ac_try='test -s "conftest$ac_exeext"' + { (eval echo "$as_me:6364: \"$ac_try\"") >&5 + (eval $ac_try) 2>&5 + ac_status=$? + echo "$as_me:6367: \$? = $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 +ac_cv_lib_dnet_dnet_ntoa=no +fi +rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext" +LIBS=$ac_check_lib_save_LIBS +fi +echo "$as_me:6378: 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 + X_EXTRA_LIBS="$X_EXTRA_LIBS -ldnet" +fi + + if test $ac_cv_lib_dnet_dnet_ntoa = no; then + echo "$as_me:6385: 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 6393 "configure" +#include "confdefs.h" + +/* Override any gcc2 internal prototype to avoid an error. */ +#ifdef __cplusplus +extern "C" #endif -EOF -if test "$GCC" = yes -then - { echo "$as_me:5421: checking for $CC __attribute__ directives..." >&5 -echo "$as_me: checking for $CC __attribute__ directives..." >&6;} -cat > conftest.$ac_ext <<EOF -#line 5424 "${as_me:-configure}" +/* We use char because int might match the return type of a gcc2 + builtin and then its argument prototype would still apply. */ +char dnet_ntoa (); +int +main (void) +{ +dnet_ntoa (); + ; + return 0; +} +_ACEOF +rm -f "conftest.$ac_objext" "conftest$ac_exeext" +if { (eval echo "$as_me:6412: \"$ac_link\"") >&5 + (eval $ac_link) 2>&5 + ac_status=$? + echo "$as_me:6415: \$? = $ac_status" >&5 + (exit "$ac_status"); } && + { ac_try='test -s "conftest$ac_exeext"' + { (eval echo "$as_me:6418: \"$ac_try\"") >&5 + (eval $ac_try) 2>&5 + ac_status=$? + echo "$as_me:6421: \$? = $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 +ac_cv_lib_dnet_stub_dnet_ntoa=no +fi +rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext" +LIBS=$ac_check_lib_save_LIBS +fi +echo "$as_me:6432: 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 + X_EXTRA_LIBS="$X_EXTRA_LIBS -ldnet_stub" +fi + + fi +fi +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, + # to get the SysV transport functions. + # Chad R. Larson says the Pyramis MIS-ES running DC/OSx (SVR4) + # needs -lnsl. + # The nsl library prevents programs from opening the X display + # 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:6451: 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 6457 "configure" #include "confdefs.h" -#include "conftest.h" -#include "conftest.i" -#if GCC_PRINTF -#define GCC_PRINTFLIKE(fmt,var) __attribute__((format(printf,fmt,var))) -#else -#define GCC_PRINTFLIKE(fmt,var) /*nothing*/ +#define gethostbyname autoconf_temporary +#include <limits.h> /* least-intrusive standard header which defines gcc2 __stub macros */ +#undef gethostbyname + +#ifdef __cplusplus +extern "C" #endif -#if GCC_SCANF -#define GCC_SCANFLIKE(fmt,var) __attribute__((format(scanf,fmt,var))) -#else -#define GCC_SCANFLIKE(fmt,var) /*nothing*/ + +/* We use char because int might match the return type of a gcc2 + builtin and then its argument prototype would still apply. */ +char gethostbyname (void); + +int +main (void) +{ + +/* The GNU C library defines stubs for functions which it implements + to always fail with ENOSYS. Some functions are actually named + something starting with __ and the normal name is an alias. */ +#if defined (__stub_gethostbyname) || defined (__stub___gethostbyname) +#error found stub for gethostbyname #endif -extern void wow(char *,...) GCC_SCANFLIKE(1,2); -extern void oops(char *,...) GCC_PRINTFLIKE(1,2) GCC_NORETURN; -extern void foo(void) GCC_NORETURN; -int main(int argc GCC_UNUSED, char *argv[] GCC_UNUSED) { return 0; } -EOF - cf_printf_attribute=no - cf_scanf_attribute=no - for cf_attribute in scanf printf unused noreturn - do -cf_ATTRIBUTE=`echo "$cf_attribute" | sed y%abcdefghijklmnopqrstuvwxyz./-%ABCDEFGHIJKLMNOPQRSTUVWXYZ___%` + return gethostbyname (); + ; + return 0; +} +_ACEOF +rm -f "conftest.$ac_objext" "conftest$ac_exeext" +if { (eval echo "$as_me:6488: \"$ac_link\"") >&5 + (eval $ac_link) 2>&5 + ac_status=$? + echo "$as_me:6491: \$? = $ac_status" >&5 + (exit "$ac_status"); } && + { ac_try='test -s "conftest$ac_exeext"' + { (eval echo "$as_me:6494: \"$ac_try\"") >&5 + (eval $ac_try) 2>&5 + ac_status=$? + echo "$as_me:6497: \$? = $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 +ac_cv_func_gethostbyname=no +fi +rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext" +fi +echo "$as_me:6507: result: $ac_cv_func_gethostbyname" >&5 +echo "${ECHO_T}$ac_cv_func_gethostbyname" >&6 - cf_directive="__attribute__(($cf_attribute))" - echo "checking for $CC $cf_directive" 1>&5 + if test $ac_cv_func_gethostbyname = no; then + echo "$as_me:6511: 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 6519 "configure" +#include "confdefs.h" - case $cf_attribute in - (printf) - cf_printf_attribute=yes - cat >conftest.h <<EOF -#define GCC_$cf_ATTRIBUTE 1 -EOF - ;; - (scanf) - cf_scanf_attribute=yes - cat >conftest.h <<EOF -#define GCC_$cf_ATTRIBUTE 1 -EOF - ;; - (*) - cat >conftest.h <<EOF -#define GCC_$cf_ATTRIBUTE $cf_directive -EOF - ;; - esac +/* Override any gcc2 internal prototype to avoid an error. */ +#ifdef __cplusplus +extern "C" +#endif +/* We use char because int might match the return type of a gcc2 + builtin and then its argument prototype would still apply. */ +char gethostbyname (); +int +main (void) +{ +gethostbyname (); + ; + return 0; +} +_ACEOF +rm -f "conftest.$ac_objext" "conftest$ac_exeext" +if { (eval echo "$as_me:6538: \"$ac_link\"") >&5 + (eval $ac_link) 2>&5 + ac_status=$? + echo "$as_me:6541: \$? = $ac_status" >&5 + (exit "$ac_status"); } && + { ac_try='test -s "conftest$ac_exeext"' + { (eval echo "$as_me:6544: \"$ac_try\"") >&5 + (eval $ac_try) 2>&5 + ac_status=$? + echo "$as_me:6547: \$? = $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 +ac_cv_lib_nsl_gethostbyname=no +fi +rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext" +LIBS=$ac_check_lib_save_LIBS +fi +echo "$as_me:6558: 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 + X_EXTRA_LIBS="$X_EXTRA_LIBS -lnsl" +fi - if { (eval echo "$as_me:5473: \"$ac_compile\"") >&5 - (eval $ac_compile) 2>&5 + if test $ac_cv_lib_nsl_gethostbyname = no; then + echo "$as_me:6565: 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 6573 "configure" +#include "confdefs.h" + +/* Override any gcc2 internal prototype to avoid an error. */ +#ifdef __cplusplus +extern "C" +#endif +/* We use char because int might match the return type of a gcc2 + builtin and then its argument prototype would still apply. */ +char gethostbyname (); +int +main (void) +{ +gethostbyname (); + ; + return 0; +} +_ACEOF +rm -f "conftest.$ac_objext" "conftest$ac_exeext" +if { (eval echo "$as_me:6592: \"$ac_link\"") >&5 + (eval $ac_link) 2>&5 ac_status=$? - echo "$as_me:5476: \$? = $ac_status" >&5 - (exit $ac_status); }; then - test -n "$verbose" && echo "$as_me:5478: result: ... $cf_attribute" >&5 -echo "${ECHO_T}... $cf_attribute" >&6 - cat conftest.h >>confdefs.h - case $cf_attribute in - (noreturn) + echo "$as_me:6595: \$? = $ac_status" >&5 + (exit "$ac_status"); } && + { ac_try='test -s "conftest$ac_exeext"' + { (eval echo "$as_me:6598: \"$ac_try\"") >&5 + (eval $ac_try) 2>&5 + ac_status=$? + echo "$as_me:6601: \$? = $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 +ac_cv_lib_bsd_gethostbyname=no +fi +rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext" +LIBS=$ac_check_lib_save_LIBS +fi +echo "$as_me:6612: 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 + X_EXTRA_LIBS="$X_EXTRA_LIBS -lbsd" +fi -cat >>confdefs.h <<EOF -#define GCC_NORETURN $cf_directive -EOF + fi + fi - ;; - (printf) - cf_value='/* nothing */' - if test "$cf_printf_attribute" != no ; then - cf_value='__attribute__((format(printf,fmt,var)))' + # lieder@skyler.mavd.honeywell.com says without -lsocket, + # socket/setsockopt and other routines are undefined under SCO ODT + # 2.0. But -lsocket is broken on IRIX 5.2 (and is not necessary + # on later versions), says Simon Leinen: it contains gethostby* + # 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:6628: 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 6634 "configure" +#include "confdefs.h" +#define connect autoconf_temporary +#include <limits.h> /* least-intrusive standard header which defines gcc2 __stub macros */ +#undef connect -cat >>confdefs.h <<\EOF -#define GCC_PRINTF 1 -EOF +#ifdef __cplusplus +extern "C" +#endif - fi +/* We use char because int might match the return type of a gcc2 + builtin and then its argument prototype would still apply. */ +char connect (void); -cat >>confdefs.h <<EOF -#define GCC_PRINTFLIKE(fmt,var) $cf_value -EOF +int +main (void) +{ - ;; - (scanf) - cf_value='/* nothing */' - if test "$cf_scanf_attribute" != no ; then - cf_value='__attribute__((format(scanf,fmt,var)))' +/* The GNU C library defines stubs for functions which it implements + to always fail with ENOSYS. Some functions are actually named + something starting with __ and the normal name is an alias. */ +#if defined (__stub_connect) || defined (__stub___connect) +#error found stub for connect +#endif -cat >>confdefs.h <<\EOF -#define GCC_SCANF 1 -EOF + return connect (); + ; + return 0; +} +_ACEOF +rm -f "conftest.$ac_objext" "conftest$ac_exeext" +if { (eval echo "$as_me:6665: \"$ac_link\"") >&5 + (eval $ac_link) 2>&5 + ac_status=$? + echo "$as_me:6668: \$? = $ac_status" >&5 + (exit "$ac_status"); } && + { ac_try='test -s "conftest$ac_exeext"' + { (eval echo "$as_me:6671: \"$ac_try\"") >&5 + (eval $ac_try) 2>&5 + ac_status=$? + echo "$as_me:6674: \$? = $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 +ac_cv_func_connect=no +fi +rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext" +fi +echo "$as_me:6684: result: $ac_cv_func_connect" >&5 +echo "${ECHO_T}$ac_cv_func_connect" >&6 - fi + if test $ac_cv_func_connect = no; then + echo "$as_me:6688: 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 6696 "configure" +#include "confdefs.h" -cat >>confdefs.h <<EOF -#define GCC_SCANFLIKE(fmt,var) $cf_value -EOF +/* Override any gcc2 internal prototype to avoid an error. */ +#ifdef __cplusplus +extern "C" +#endif +/* We use char because int might match the return type of a gcc2 + builtin and then its argument prototype would still apply. */ +char connect (); +int +main (void) +{ +connect (); + ; + return 0; +} +_ACEOF +rm -f "conftest.$ac_objext" "conftest$ac_exeext" +if { (eval echo "$as_me:6715: \"$ac_link\"") >&5 + (eval $ac_link) 2>&5 + ac_status=$? + echo "$as_me:6718: \$? = $ac_status" >&5 + (exit "$ac_status"); } && + { ac_try='test -s "conftest$ac_exeext"' + { (eval echo "$as_me:6721: \"$ac_try\"") >&5 + (eval $ac_try) 2>&5 + ac_status=$? + echo "$as_me:6724: \$? = $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 +ac_cv_lib_socket_connect=no +fi +rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext" +LIBS=$ac_check_lib_save_LIBS +fi +echo "$as_me:6735: 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 + X_EXTRA_LIBS="-lsocket $X_EXTRA_LIBS" +fi - ;; - (unused) + fi -cat >>confdefs.h <<EOF -#define GCC_UNUSED $cf_directive -EOF + # Guillermo Gomez says -lposix is necessary on A/UX. + echo "$as_me:6744: 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 6750 "configure" +#include "confdefs.h" +#define remove autoconf_temporary +#include <limits.h> /* least-intrusive standard header which defines gcc2 __stub macros */ +#undef remove - ;; - esac - fi - done +#ifdef __cplusplus +extern "C" +#endif + +/* We use char because int might match the return type of a gcc2 + builtin and then its argument prototype would still apply. */ +char remove (void); + +int +main (void) +{ + +/* The GNU C library defines stubs for functions which it implements + to always fail with ENOSYS. Some functions are actually named + something starting with __ and the normal name is an alias. */ +#if defined (__stub_remove) || defined (__stub___remove) +#error found stub for remove +#endif + + return remove (); + ; + return 0; +} +_ACEOF +rm -f "conftest.$ac_objext" "conftest$ac_exeext" +if { (eval echo "$as_me:6781: \"$ac_link\"") >&5 + (eval $ac_link) 2>&5 + ac_status=$? + echo "$as_me:6784: \$? = $ac_status" >&5 + (exit "$ac_status"); } && + { ac_try='test -s "conftest$ac_exeext"' + { (eval echo "$as_me:6787: \"$ac_try\"") >&5 + (eval $ac_try) 2>&5 + ac_status=$? + echo "$as_me:6790: \$? = $ac_status" >&5 + (exit "$ac_status"); }; }; then + ac_cv_func_remove=yes else - fgrep define conftest.i >>confdefs.h + echo "$as_me: failed program was:" >&5 +cat "conftest.$ac_ext" >&5 +ac_cv_func_remove=no fi -rm -rf conftest* +rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext" fi +echo "$as_me:6800: result: $ac_cv_func_remove" >&5 +echo "${ECHO_T}$ac_cv_func_remove" >&6 -INTEL_COMPILER=no + if test $ac_cv_func_remove = no; then + echo "$as_me:6804: 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 6812 "configure" +#include "confdefs.h" -if test "$GCC" = yes ; then - case $host_os in - (linux*|gnu*) - echo "$as_me:5542: 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 5547 "configure" +/* Override any gcc2 internal prototype to avoid an error. */ +#ifdef __cplusplus +extern "C" +#endif +/* We use char because int might match the return type of a gcc2 + builtin and then its argument prototype would still apply. */ +char remove (); +int +main (void) +{ +remove (); + ; + return 0; +} +_ACEOF +rm -f "conftest.$ac_objext" "conftest$ac_exeext" +if { (eval echo "$as_me:6831: \"$ac_link\"") >&5 + (eval $ac_link) 2>&5 + ac_status=$? + echo "$as_me:6834: \$? = $ac_status" >&5 + (exit "$ac_status"); } && + { ac_try='test -s "conftest$ac_exeext"' + { (eval echo "$as_me:6837: \"$ac_try\"") >&5 + (eval $ac_try) 2>&5 + ac_status=$? + echo "$as_me:6840: \$? = $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 +ac_cv_lib_posix_remove=no +fi +rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext" +LIBS=$ac_check_lib_save_LIBS +fi +echo "$as_me:6851: 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 + X_EXTRA_LIBS="$X_EXTRA_LIBS -lposix" +fi + + fi + + # BSDI BSD/OS 2.1 needs -lipc for XOpenDisplay. + echo "$as_me:6860: 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 6866 "configure" #include "confdefs.h" +#define shmat autoconf_temporary +#include <limits.h> /* least-intrusive standard header which defines gcc2 __stub macros */ +#undef shmat + +#ifdef __cplusplus +extern "C" +#endif + +/* We use char because int might match the return type of a gcc2 + builtin and then its argument prototype would still apply. */ +char shmat (void); int main (void) { -#ifdef __INTEL_COMPILER -#else -make an error +/* The GNU C library defines stubs for functions which it implements + to always fail with ENOSYS. Some functions are actually named + something starting with __ and the normal name is an alias. */ +#if defined (__stub_shmat) || defined (__stub___shmat) +#error found stub for shmat #endif + return shmat (); ; return 0; } _ACEOF -rm -f conftest.$ac_objext -if { (eval echo "$as_me:5564: \"$ac_compile\"") >&5 - (eval $ac_compile) 2>&5 +rm -f "conftest.$ac_objext" "conftest$ac_exeext" +if { (eval echo "$as_me:6897: \"$ac_link\"") >&5 + (eval $ac_link) 2>&5 ac_status=$? - echo "$as_me:5567: \$? = $ac_status" >&5 - (exit $ac_status); } && - { ac_try='test -s conftest.$ac_objext' - { (eval echo "$as_me:5570: \"$ac_try\"") >&5 + echo "$as_me:6900: \$? = $ac_status" >&5 + (exit "$ac_status"); } && + { ac_try='test -s "conftest$ac_exeext"' + { (eval echo "$as_me:6903: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? - echo "$as_me:5573: \$? = $ac_status" >&5 - (exit $ac_status); }; }; then - INTEL_COMPILER=yes -cf_save_CFLAGS="$cf_save_CFLAGS -we147" + echo "$as_me:6906: \$? = $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 +ac_cv_func_shmat=no +fi +rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext" +fi +echo "$as_me:6916: 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:6920: 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 6928 "configure" +#include "confdefs.h" + +/* Override any gcc2 internal prototype to avoid an error. */ +#ifdef __cplusplus +extern "C" +#endif +/* We use char because int might match the return type of a gcc2 + builtin and then its argument prototype would still apply. */ +char shmat (); +int +main (void) +{ +shmat (); + ; + return 0; +} +_ACEOF +rm -f "conftest.$ac_objext" "conftest$ac_exeext" +if { (eval echo "$as_me:6947: \"$ac_link\"") >&5 + (eval $ac_link) 2>&5 + ac_status=$? + echo "$as_me:6950: \$? = $ac_status" >&5 + (exit "$ac_status"); } && + { ac_try='test -s "conftest$ac_exeext"' + { (eval echo "$as_me:6953: \"$ac_try\"") >&5 + (eval $ac_try) 2>&5 + ac_status=$? + echo "$as_me:6956: \$? = $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_ext - CFLAGS="$cf_save_CFLAGS" - echo "$as_me:5584: result: $INTEL_COMPILER" >&5 -echo "${ECHO_T}$INTEL_COMPILER" >&6 +rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext" +LIBS=$ac_check_lib_save_LIBS +fi +echo "$as_me:6967: 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 + X_EXTRA_LIBS="$X_EXTRA_LIBS -lipc" +fi + + fi + fi + + # Check for libraries that X11R6 Xt/Xaw programs need. + ac_save_LDFLAGS=$LDFLAGS + test -n "$x_libraries" && LDFLAGS="$LDFLAGS -L$x_libraries" + # SM needs ICE to (dynamically) link under SunOS 4.x (so we have to + # check for ICE first), but we must link in the order -lSM -lICE or + # we get undefined symbols. So assume we have SM if we have ICE. + # 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:6985: 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 6993 "configure" +#include "confdefs.h" + +/* Override any gcc2 internal prototype to avoid an error. */ +#ifdef __cplusplus +extern "C" +#endif +/* We use char because int might match the return type of a gcc2 + builtin and then its argument prototype would still apply. */ +char IceConnectionNumber (); +int +main (void) +{ +IceConnectionNumber (); + ; + return 0; +} +_ACEOF +rm -f "conftest.$ac_objext" "conftest$ac_exeext" +if { (eval echo "$as_me:7012: \"$ac_link\"") >&5 + (eval $ac_link) 2>&5 + ac_status=$? + echo "$as_me:7015: \$? = $ac_status" >&5 + (exit "$ac_status"); } && + { ac_try='test -s "conftest$ac_exeext"' + { (eval echo "$as_me:7018: \"$ac_try\"") >&5 + (eval $ac_try) 2>&5 + ac_status=$? + echo "$as_me:7021: \$? = $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 +ac_cv_lib_ICE_IceConnectionNumber=no +fi +rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext" +LIBS=$ac_check_lib_save_LIBS +fi +echo "$as_me:7032: 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 + X_PRE_LIBS="$X_PRE_LIBS -lSM -lICE" +fi + + LDFLAGS=$ac_save_LDFLAGS + +fi + +fi + +if test "$GCC" = yes || test "$GXX" = yes +then + +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}:7053: testing repairing CFLAGS: $CFLAGS ..." 1>&5 + + cf_temp_flags= + for cf_temp_scan in $CFLAGS + do + case "x$cf_temp_scan" in + (x-Werror=*) + + test -n "$EXTRA_CFLAGS" && EXTRA_CFLAGS="$EXTRA_CFLAGS " + EXTRA_CFLAGS="${EXTRA_CFLAGS}$cf_temp_scan" + + ;; + (*) + + test -n "$cf_temp_flags" && cf_temp_flags="$cf_temp_flags " + cf_temp_flags="${cf_temp_flags}$cf_temp_scan" + + ;; + esac + done + CFLAGS="$cf_temp_flags" + test -n "$verbose" && echo " ... fixed $CFLAGS" 1>&6 + +echo "${as_me:-configure}:7076: testing ... fixed $CFLAGS ..." 1>&5 + + test -n "$verbose" && echo " ... extra $EXTRA_CFLAGS" 1>&6 + +echo "${as_me:-configure}:7080: testing ... extra $EXTRA_CFLAGS ..." 1>&5 + ;; esac fi -CLANG_COMPILER=no +if test "$GCC" = yes || test "$GXX" = yes +then + case $CPPFLAGS in + (*-Werror=*) + test -n "$verbose" && echo " repairing CPPFLAGS: $CPPFLAGS" 1>&6 -if test "$GCC" = yes ; then - echo "$as_me:5593: checking if this is really Clang C compiler" >&5 -echo $ECHO_N "checking if this is really Clang C compiler... $ECHO_C" >&6 - cf_save_CFLAGS="$CFLAGS" - CFLAGS="$CFLAGS -Qunused-arguments" - cat >conftest.$ac_ext <<_ACEOF -#line 5598 "configure" +echo "${as_me:-configure}:7092: testing repairing CPPFLAGS: $CPPFLAGS ..." 1>&5 + + cf_temp_flags= + for cf_temp_scan in $CPPFLAGS + do + case "x$cf_temp_scan" in + (x-Werror=*) + + test -n "$EXTRA_CFLAGS" && EXTRA_CFLAGS="$EXTRA_CFLAGS " + EXTRA_CFLAGS="${EXTRA_CFLAGS}$cf_temp_scan" + + ;; + (*) + + test -n "$cf_temp_flags" && cf_temp_flags="$cf_temp_flags " + cf_temp_flags="${cf_temp_flags}$cf_temp_scan" + + ;; + esac + done + CPPFLAGS="$cf_temp_flags" + test -n "$verbose" && echo " ... fixed $CPPFLAGS" 1>&6 + +echo "${as_me:-configure}:7115: testing ... fixed $CPPFLAGS ..." 1>&5 + + test -n "$verbose" && echo " ... extra $EXTRA_CFLAGS" 1>&6 + +echo "${as_me:-configure}:7119: testing ... extra $EXTRA_CFLAGS ..." 1>&5 + + ;; + esac +fi + +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}:7131: testing repairing LDFLAGS: $LDFLAGS ..." 1>&5 + + cf_temp_flags= + for cf_temp_scan in $LDFLAGS + do + case "x$cf_temp_scan" in + (x-Werror=*) + + test -n "$EXTRA_CFLAGS" && EXTRA_CFLAGS="$EXTRA_CFLAGS " + EXTRA_CFLAGS="${EXTRA_CFLAGS}$cf_temp_scan" + + ;; + (*) + + test -n "$cf_temp_flags" && cf_temp_flags="$cf_temp_flags " + cf_temp_flags="${cf_temp_flags}$cf_temp_scan" + + ;; + esac + done + LDFLAGS="$cf_temp_flags" + test -n "$verbose" && echo " ... fixed $LDFLAGS" 1>&6 + +echo "${as_me:-configure}:7154: testing ... fixed $LDFLAGS ..." 1>&5 + + test -n "$verbose" && echo " ... extra $EXTRA_CFLAGS" 1>&6 + +echo "${as_me:-configure}:7158: testing ... extra $EXTRA_CFLAGS ..." 1>&5 + + ;; + esac +fi + +echo "$as_me:7164: checking if you want to turn on gcc warnings" >&5 +echo $ECHO_N "checking if you want to turn on gcc warnings... $ECHO_C" >&6 + +# Check whether --enable-warnings or --disable-warnings was given. +if test "${enable_warnings+set}" = set; then + enableval="$enable_warnings" + test "$enableval" != yes && enableval=no + if test "$enableval" != "no" ; then + enable_warnings=yes + else + enable_warnings=no + fi +else + enableval=no + enable_warnings=no + +fi; +echo "$as_me:7181: result: $enable_warnings" >&5 +echo "${ECHO_T}$enable_warnings" >&6 +if test "$enable_warnings" = "yes" +then + +if test "x$have_x" = xyes; then + +cf_save_LIBS_CF_CONST_X_STRING="$LIBS" +cf_save_CFLAGS_CF_CONST_X_STRING="$CFLAGS" +cf_save_CPPFLAGS_CF_CONST_X_STRING="$CPPFLAGS" +LIBS="$LIBS ${X_PRE_LIBS} ${X_LIBS} ${X_EXTRA_LIBS}" +for cf_X_CFLAGS in $X_CFLAGS +do + case "x$cf_X_CFLAGS" in + x-[IUD]*) + CPPFLAGS="$CPPFLAGS $cf_X_CFLAGS" + ;; + *) + CFLAGS="$CFLAGS $cf_X_CFLAGS" + ;; + esac +done + +cat >"conftest.$ac_ext" <<_ACEOF +#line 7205 "configure" #include "confdefs.h" +#include <stdlib.h> +#include <X11/Intrinsic.h> + int main (void) { +String foo = malloc(1); (void)foo + ; + return 0; +} +_ACEOF +rm -f "conftest.$ac_objext" +if { (eval echo "$as_me:7220: \"$ac_compile\"") >&5 + (eval $ac_compile) 2>&5 + ac_status=$? + echo "$as_me:7223: \$? = $ac_status" >&5 + (exit "$ac_status"); } && + { ac_try='test -s "conftest.$ac_objext"' + { (eval echo "$as_me:7226: \"$ac_try\"") >&5 + (eval $ac_try) 2>&5 + ac_status=$? + echo "$as_me:7229: \$? = $ac_status" >&5 + (exit "$ac_status"); }; }; then -#ifdef __clang__ -#else -make an error -#endif +echo "$as_me:7232: 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 7239 "configure" +#include "confdefs.h" + +#define _CONST_X_STRING /* X11R7.8 (perhaps) */ +#undef XTSTRINGDEFINES /* X11R5 and later */ +#include <stdlib.h> +#include <X11/Intrinsic.h> + +int +main (void) +{ +String foo = malloc(1); *foo = 0 ; return 0; } _ACEOF -rm -f conftest.$ac_objext -if { (eval echo "$as_me:5615: \"$ac_compile\"") >&5 +rm -f "conftest.$ac_objext" +if { (eval echo "$as_me:7256: \"$ac_compile\"") >&5 (eval $ac_compile) 2>&5 ac_status=$? - echo "$as_me:5618: \$? = $ac_status" >&5 - (exit $ac_status); } && - { ac_try='test -s conftest.$ac_objext' - { (eval echo "$as_me:5621: \"$ac_try\"") >&5 + echo "$as_me:7259: \$? = $ac_status" >&5 + (exit "$ac_status"); } && + { ac_try='test -s "conftest.$ac_objext"' + { (eval echo "$as_me:7262: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? - echo "$as_me:5624: \$? = $ac_status" >&5 - (exit $ac_status); }; }; then - CLANG_COMPILER=yes -cf_save_CFLAGS="$cf_save_CFLAGS -Qunused-arguments" + echo "$as_me:7265: \$? = $ac_status" >&5 + (exit "$ac_status"); }; }; then + + cf_cv_const_x_string=no else echo "$as_me: failed program was:" >&5 -cat conftest.$ac_ext >&5 +cat "conftest.$ac_ext" >&5 + + cf_cv_const_x_string=yes + fi -rm -f conftest.$ac_objext conftest.$ac_ext - CFLAGS="$cf_save_CFLAGS" - echo "$as_me:5635: result: $CLANG_COMPILER" >&5 -echo "${ECHO_T}$CLANG_COMPILER" >&6 +rm -f "conftest.$ac_objext" "conftest.$ac_ext" + fi +echo "$as_me:7280: result: $cf_cv_const_x_string" >&5 +echo "${ECHO_T}$cf_cv_const_x_string" >&6 -cat > conftest.$ac_ext <<EOF -#line 5640 "${as_me:-configure}" +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 +(no) + + test -n "$CPPFLAGS" && CPPFLAGS="$CPPFLAGS " + CPPFLAGS="${CPPFLAGS}-DXTSTRINGDEFINES" + + ;; +(*) + + test -n "$CPPFLAGS" && CPPFLAGS="$CPPFLAGS " + CPPFLAGS="${CPPFLAGS}-D_CONST_X_STRING" + + ;; +esac + +else + echo "$as_me: failed program was:" >&5 +cat "conftest.$ac_ext" >&5 +fi +rm -f "conftest.$ac_objext" "conftest.$ac_ext" + fi +cat > "conftest.$ac_ext" <<EOF +#line 7309 "${as_me:-configure}" int main(int argc, char *argv[]) { return (argv[argc-1] == 0) ; } EOF - if test "$INTEL_COMPILER" = yes then # The "-wdXXX" options suppress warnings: @@ -5654,10 +7322,10 @@ then # remark #981: operands are evaluated in unspecified order # warning #279: controlling expression is constant - { echo "$as_me:5657: checking for $CC warning options..." >&5 + { echo "$as_me:7325: checking for $CC warning options..." >&5 echo "$as_me: checking for $CC warning options..." >&6;} cf_save_CFLAGS="$CFLAGS" - EXTRA_CFLAGS="-Wall" + EXTRA_CFLAGS="$EXTRA_CFLAGS -Wall" for cf_opt in \ wd1419 \ wd1683 \ @@ -5670,24 +7338,22 @@ echo "$as_me: checking for $CC warning options..." >&6;} wd981 do CFLAGS="$cf_save_CFLAGS $EXTRA_CFLAGS -$cf_opt" - if { (eval echo "$as_me:5673: \"$ac_compile\"") >&5 + if { (eval echo "$as_me:7341: \"$ac_compile\"") >&5 (eval $ac_compile) 2>&5 ac_status=$? - echo "$as_me:5676: \$? = $ac_status" >&5 - (exit $ac_status); }; then - test -n "$verbose" && echo "$as_me:5678: result: ... -$cf_opt" >&5 + echo "$as_me:7344: \$? = $ac_status" >&5 + (exit "$ac_status"); }; then + test -n "$verbose" && echo "$as_me:7346: result: ... -$cf_opt" >&5 echo "${ECHO_T}... -$cf_opt" >&6 EXTRA_CFLAGS="$EXTRA_CFLAGS -$cf_opt" fi done CFLAGS="$cf_save_CFLAGS" - -elif test "$GCC" = yes +elif test "$GCC" = yes && test "$GCC_VERSION" != "unknown" then - { echo "$as_me:5687: checking for $CC warning options..." >&5 + { echo "$as_me:7354: checking for $CC warning options..." >&5 echo "$as_me: checking for $CC warning options..." >&6;} cf_save_CFLAGS="$CFLAGS" - EXTRA_CFLAGS= cf_warn_CONST="" test "$with_ext_const" = yes && cf_warn_CONST="Wwrite-strings" cf_gcc_warnings="Wignored-qualifiers Wlogical-op Wvarargs" @@ -5705,39 +7371,33 @@ echo "$as_me: checking for $CC warning options..." >&6;} Wpointer-arith \ Wshadow \ Wstrict-prototypes \ - Wundef $cf_gcc_warnings $cf_warn_CONST + Wundef Wno-inline $cf_gcc_warnings $cf_warn_CONST do CFLAGS="$cf_save_CFLAGS $EXTRA_CFLAGS -$cf_opt" - if { (eval echo "$as_me:5711: \"$ac_compile\"") >&5 + if { (eval echo "$as_me:7377: \"$ac_compile\"") >&5 (eval $ac_compile) 2>&5 ac_status=$? - echo "$as_me:5714: \$? = $ac_status" >&5 - (exit $ac_status); }; then - test -n "$verbose" && echo "$as_me:5716: result: ... -$cf_opt" >&5 + echo "$as_me:7380: \$? = $ac_status" >&5 + (exit "$ac_status"); }; then + test -n "$verbose" && echo "$as_me:7382: result: ... -$cf_opt" >&5 echo "${ECHO_T}... -$cf_opt" >&6 - case $cf_opt in - (Wcast-qual) - - test -n "$CPPFLAGS" && CPPFLAGS="$CPPFLAGS " - CPPFLAGS="${CPPFLAGS}-DXTSTRINGDEFINES" - - ;; + case "$cf_opt" in (Winline) - case $GCC_VERSION in + case "$GCC_VERSION" in ([34].*) test -n "$verbose" && echo " feature is broken in gcc $GCC_VERSION" 1>&6 -echo "${as_me:-configure}:5730: testing feature is broken in gcc $GCC_VERSION ..." 1>&5 +echo "${as_me:-configure}:7390: 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}:5740: testing feature is broken in gcc $GCC_VERSION ..." 1>&5 +echo "${as_me:-configure}:7400: testing feature is broken in gcc $GCC_VERSION ..." 1>&5 continue;; esac @@ -5748,12 +7408,147 @@ echo "${as_me:-configure}:5740: testing feature is broken in gcc $GCC_VERSION .. done CFLAGS="$cf_save_CFLAGS" fi -rm -rf conftest* +rm -rf ./conftest* fi + +if test "$GCC" = yes || test "$GXX" = yes +then +cat > conftest.i <<EOF +#ifndef GCC_PRINTF +#define GCC_PRINTF 0 +#endif +#ifndef GCC_SCANF +#define GCC_SCANF 0 +#endif +#ifndef GCC_NORETURN +#define GCC_NORETURN /* nothing */ +#endif +#ifndef GCC_UNUSED +#define GCC_UNUSED /* nothing */ +#endif +EOF +if test "$GCC" = yes +then + { echo "$as_me:7433: checking for $CC __attribute__ directives..." >&5 +echo "$as_me: checking for $CC __attribute__ directives..." >&6;} +cat > "conftest.$ac_ext" <<EOF +#line 7436 "${as_me:-configure}" +#include "confdefs.h" +#include "conftest.h" +#include "conftest.i" +#if GCC_PRINTF +#define GCC_PRINTFLIKE(fmt,var) __attribute__((format(printf,fmt,var))) +#else +#define GCC_PRINTFLIKE(fmt,var) /*nothing*/ +#endif +#if GCC_SCANF +#define GCC_SCANFLIKE(fmt,var) __attribute__((format(scanf,fmt,var))) +#else +#define GCC_SCANFLIKE(fmt,var) /*nothing*/ +#endif +extern void wow(char *,...) GCC_SCANFLIKE(1,2); +extern void oops(char *,...) GCC_PRINTFLIKE(1,2) GCC_NORETURN; +extern void foo(void) GCC_NORETURN; +int main(int argc GCC_UNUSED, char *argv[] GCC_UNUSED) { (void)argc; (void)argv; return 0; } +EOF + cf_printf_attribute=no + cf_scanf_attribute=no + for cf_attribute in scanf printf unused noreturn + do + +cf_ATTRIBUTE=`echo "$cf_attribute" | sed y%abcdefghijklmnopqrstuvwxyz./-%ABCDEFGHIJKLMNOPQRSTUVWXYZ___%` + + cf_directive="__attribute__(($cf_attribute))" + echo "checking for $CC $cf_directive" 1>&5 + + case "$cf_attribute" in + (printf) + cf_printf_attribute=yes + cat >conftest.h <<EOF +#define GCC_$cf_ATTRIBUTE 1 +EOF + ;; + (scanf) + cf_scanf_attribute=yes + cat >conftest.h <<EOF +#define GCC_$cf_ATTRIBUTE 1 +EOF + ;; + (*) + cat >conftest.h <<EOF +#define GCC_$cf_ATTRIBUTE $cf_directive +EOF + ;; + esac + + if { (eval echo "$as_me:7485: \"$ac_compile\"") >&5 + (eval $ac_compile) 2>&5 + ac_status=$? + echo "$as_me:7488: \$? = $ac_status" >&5 + (exit "$ac_status"); }; then + test -n "$verbose" && echo "$as_me:7490: result: ... $cf_attribute" >&5 +echo "${ECHO_T}... $cf_attribute" >&6 + cat conftest.h >>confdefs.h + case "$cf_attribute" in + (noreturn) + +cat >>confdefs.h <<EOF +#define GCC_NORETURN $cf_directive +EOF + + ;; + (printf) + cf_value='/* nothing */' + if test "$cf_printf_attribute" != no ; then + cf_value='__attribute__((format(printf,fmt,var)))' + +cat >>confdefs.h <<\EOF +#define GCC_PRINTF 1 +EOF + + fi + +cat >>confdefs.h <<EOF +#define GCC_PRINTFLIKE(fmt,var) $cf_value +EOF + + ;; + (scanf) + cf_value='/* nothing */' + if test "$cf_scanf_attribute" != no ; then + cf_value='__attribute__((format(scanf,fmt,var)))' + +cat >>confdefs.h <<\EOF +#define GCC_SCANF 1 +EOF + + fi + +cat >>confdefs.h <<EOF +#define GCC_SCANFLIKE(fmt,var) $cf_value +EOF + + ;; + (unused) + +cat >>confdefs.h <<EOF +#define GCC_UNUSED $cf_directive +EOF + + ;; + esac + fi + done +else + ${FGREP-fgrep} define conftest.i >>confdefs.h +fi +rm -rf ./conftest* fi -echo "$as_me:5756: checking if you want to use pkg-config" >&5 +fi + +echo "$as_me:7551: 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. @@ -5763,10 +7558,10 @@ if test "${with_pkg_config+set}" = set; then else cf_pkg_config=yes fi; -echo "$as_me:5766: result: $cf_pkg_config" >&5 +echo "$as_me:7561: 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 ;; @@ -5775,7 +7570,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:5778: checking for $ac_word" >&5 +echo "$as_me:7573: 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 @@ -5792,7 +7587,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:5795: found $ac_dir/$ac_word" >&5 + echo "$as_me:7590: found $ac_dir/$ac_word" >&5 break fi done @@ -5803,10 +7598,10 @@ fi PKG_CONFIG=$ac_cv_path_PKG_CONFIG if test -n "$PKG_CONFIG"; then - echo "$as_me:5806: result: $PKG_CONFIG" >&5 + echo "$as_me:7601: result: $PKG_CONFIG" >&5 echo "${ECHO_T}$PKG_CONFIG" >&6 else - echo "$as_me:5809: result: no" >&5 + echo "$as_me:7604: result: no" >&5 echo "${ECHO_T}no" >&6 fi @@ -5815,7 +7610,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:5818: checking for $ac_word" >&5 +echo "$as_me:7613: 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 @@ -5832,7 +7627,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:5835: found $ac_dir/$ac_word" >&5 + echo "$as_me:7630: found $ac_dir/$ac_word" >&5 break fi done @@ -5844,10 +7639,10 @@ fi ac_pt_PKG_CONFIG=$ac_cv_path_ac_pt_PKG_CONFIG if test -n "$ac_pt_PKG_CONFIG"; then - echo "$as_me:5847: result: $ac_pt_PKG_CONFIG" >&5 + echo "$as_me:7642: result: $ac_pt_PKG_CONFIG" >&5 echo "${ECHO_T}$ac_pt_PKG_CONFIG" >&6 else - echo "$as_me:5850: result: no" >&5 + echo "$as_me:7645: result: no" >&5 echo "${ECHO_T}no" >&6 fi @@ -5878,30 +7673,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:5893: error: expected a pathname, not \"$PKG_CONFIG\"" >&5 + { { echo "$as_me:7688: 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:5900: WARNING: pkg-config is not installed" >&5 + { echo "$as_me:7695: WARNING: pkg-config is not installed" >&5 echo "$as_me: WARNING: pkg-config is not installed" >&2;} fi -echo "$as_me:5904: checking for this package's name" >&5 +echo "$as_me:7699: checking for this package's name" >&5 echo $ECHO_N "checking for this package's name... $ECHO_C" >&6 # Check whether --with-package or --without-package was given. @@ -5911,55 +7706,55 @@ if test "${with_package+set}" = set; then else PACKAGE=dialog fi; -echo "$as_me:5914: result: $PACKAGE" >&5 +echo "$as_me:7709: result: $PACKAGE" >&5 echo "${ECHO_T}$PACKAGE" >&6 -if test -f $srcdir/VERSION ; then - echo "$as_me:5918: checking for package version" >&5 +if test -f "$srcdir/VERSION" ; then + echo "$as_me:7713: checking for package version" >&5 echo $ECHO_N "checking for package version... $ECHO_C" >&6 # if there are not enough fields, cut returns the last one... - cf_field1=`sed -e '2,$d' $srcdir/VERSION|cut -f1` - cf_field2=`sed -e '2,$d' $srcdir/VERSION|cut -f2` - cf_field3=`sed -e '2,$d' $srcdir/VERSION|cut -f3` + cf_field1=`sed -e '2,$d' "$srcdir/VERSION" |cut -f1` + cf_field2=`sed -e '2,$d' "$srcdir/VERSION" |cut -f2` + cf_field3=`sed -e '2,$d' "$srcdir/VERSION" |cut -f3` # this is how CF_BUNDLED_INTL uses $VERSION: VERSION="$cf_field1" VERSION_MAJOR=`echo "$cf_field2" | sed -e 's/\..*//'` - test -z "$VERSION_MAJOR" && { { echo "$as_me:5930: error: missing major-version" >&5 + test -z "$VERSION_MAJOR" && { { echo "$as_me:7725: error: missing major-version" >&5 echo "$as_me: error: missing major-version" >&2;} { (exit 1); exit 1; }; } VERSION_MINOR=`echo "$cf_field2" | sed -e 's/^[^.]*\.//' -e 's/-.*//'` - test -z "$VERSION_MINOR" && { { echo "$as_me:5935: error: missing minor-version" >&5 + test -z "$VERSION_MINOR" && { { echo "$as_me:7730: error: missing minor-version" >&5 echo "$as_me: error: missing minor-version" >&2;} { (exit 1); exit 1; }; } - echo "$as_me:5939: result: ${VERSION_MAJOR}.${VERSION_MINOR}" >&5 + echo "$as_me:7734: result: ${VERSION_MAJOR}.${VERSION_MINOR}" >&5 echo "${ECHO_T}${VERSION_MAJOR}.${VERSION_MINOR}" >&6 - echo "$as_me:5942: checking for package patch date" >&5 + echo "$as_me:7737: checking for package patch date" >&5 echo $ECHO_N "checking for package patch date... $ECHO_C" >&6 VERSION_PATCH=`echo "$cf_field3" | sed -e 's/^[^-]*-//'` case .$VERSION_PATCH in (.) - { { echo "$as_me:5947: error: missing patch-date $VERSION_PATCH" >&5 + { { echo "$as_me:7742: error: missing patch-date $VERSION_PATCH" >&5 echo "$as_me: error: missing patch-date $VERSION_PATCH" >&2;} { (exit 1); exit 1; }; } ;; (.[0-9][0-9][0-9][0-9][0-9][0-9][0-9][0-9]) ;; (*) - { { echo "$as_me:5954: error: illegal patch-date $VERSION_PATCH" >&5 + { { echo "$as_me:7749: error: illegal patch-date $VERSION_PATCH" >&5 echo "$as_me: error: illegal patch-date $VERSION_PATCH" >&2;} { (exit 1); exit 1; }; } ;; esac - echo "$as_me:5959: result: $VERSION_PATCH" >&5 + echo "$as_me:7754: result: $VERSION_PATCH" >&5 echo "${ECHO_T}$VERSION_PATCH" >&6 else - { { echo "$as_me:5962: error: did not find $srcdir/VERSION" >&5 + { { echo "$as_me:7757: error: did not find $srcdir/VERSION" >&5 echo "$as_me: error: did not find $srcdir/VERSION" >&2;} { (exit 1); exit 1; }; } fi @@ -5967,19 +7762,19 @@ fi # show the actual data that we have for versions: test -n "$verbose" && echo " ABI VERSION $VERSION" 1>&6 -echo "${as_me:-configure}:5970: testing ABI VERSION $VERSION ..." 1>&5 +echo "${as_me:-configure}:7765: testing ABI VERSION $VERSION ..." 1>&5 test -n "$verbose" && echo " VERSION_MAJOR $VERSION_MAJOR" 1>&6 -echo "${as_me:-configure}:5974: testing VERSION_MAJOR $VERSION_MAJOR ..." 1>&5 +echo "${as_me:-configure}:7769: testing VERSION_MAJOR $VERSION_MAJOR ..." 1>&5 test -n "$verbose" && echo " VERSION_MINOR $VERSION_MINOR" 1>&6 -echo "${as_me:-configure}:5978: testing VERSION_MINOR $VERSION_MINOR ..." 1>&5 +echo "${as_me:-configure}:7773: testing VERSION_MINOR $VERSION_MINOR ..." 1>&5 test -n "$verbose" && echo " VERSION_PATCH $VERSION_PATCH" 1>&6 -echo "${as_me:-configure}:5982: testing VERSION_PATCH $VERSION_PATCH ..." 1>&5 +echo "${as_me:-configure}:7777: testing VERSION_PATCH $VERSION_PATCH ..." 1>&5 cf_PACKAGE=dialog PACKAGE=$PACKAGE @@ -6002,7 +7797,7 @@ CFG_ROOTNAME=$PACKAGE HDR_ROOTNAME=$PACKAGE LIB_ROOTNAME=$PACKAGE -echo "$as_me:6005: checking if we should install dlg_XXX headers to subdirectory" >&5 +echo "$as_me:7800: checking if we should install dlg_XXX headers to subdirectory" >&5 echo $ECHO_N "checking if we should install dlg_XXX headers to subdirectory... $ECHO_C" >&6 # Check whether --enable-header-subdir or --disable-header-subdir was given. @@ -6012,7 +7807,7 @@ if test "${enable_header_subdir+set}" = set; then else SUB_INC=no fi; -echo "$as_me:6015: result: $SUB_INC" >&5 +echo "$as_me:7810: result: $SUB_INC" >&5 echo "${ECHO_T}$SUB_INC" >&6 case "x${with_man2html}" in @@ -6022,7 +7817,7 @@ case "x${with_man2html}" in (x|xyes) # Extract the first word of "man2html", so it can be a program name with args. set dummy man2html; ac_word=$2 -echo "$as_me:6025: checking for $ac_word" >&5 +echo "$as_me:7820: checking for $ac_word" >&5 echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6 if test "${ac_cv_path_cf_man2html+set}" = set; then echo $ECHO_N "(cached) $ECHO_C" >&6 @@ -6039,7 +7834,7 @@ for ac_dir in $ac_dummy; do test -z "$ac_dir" && ac_dir=. if $as_executable_p "$ac_dir/$ac_word"; then ac_cv_path_cf_man2html="$ac_dir/$ac_word" - echo "$as_me:6042: found $ac_dir/$ac_word" >&5 + echo "$as_me:7837: found $ac_dir/$ac_word" >&5 break fi done @@ -6051,16 +7846,16 @@ fi cf_man2html=$ac_cv_path_cf_man2html if test -n "$cf_man2html"; then - echo "$as_me:6054: result: $cf_man2html" >&5 + echo "$as_me:7849: result: $cf_man2html" >&5 echo "${ECHO_T}$cf_man2html" >&6 else - echo "$as_me:6057: result: no" >&5 + echo "$as_me:7852: result: no" >&5 echo "${ECHO_T}no" >&6 fi case "x$cf_man2html" in (x/*) - echo "$as_me:6063: checking for the modified Earl Hood script" >&5 + echo "$as_me:7858: checking for the modified Earl Hood script" >&5 echo $ECHO_N "checking for the modified Earl Hood script... $ECHO_C" >&6 if ( $cf_man2html -help 2>&1 | grep 'Make an index of headers at the end' >/dev/null ) then @@ -6069,7 +7864,7 @@ echo $ECHO_N "checking for the modified Earl Hood script... $ECHO_C" >&6 cf_man2html=no cf_man2html_ok=no fi - echo "$as_me:6072: result: $cf_man2html_ok" >&5 + echo "$as_me:7867: result: $cf_man2html_ok" >&5 echo "${ECHO_T}$cf_man2html_ok" >&6 ;; (*) @@ -6078,7 +7873,7 @@ echo "${ECHO_T}$cf_man2html_ok" >&6 esac esac -echo "$as_me:6081: checking for program to convert manpage to html" >&5 +echo "$as_me:7876: checking for program to convert manpage to html" >&5 echo $ECHO_N "checking for program to convert manpage to html... $ECHO_C" >&6 # Check whether --with-man2html or --without-man2html was given. @@ -6093,11 +7888,11 @@ cf_with_groff=no case $cf_man2html in (yes) - echo "$as_me:6096: result: man2html" >&5 + echo "$as_me:7891: result: man2html" >&5 echo "${ECHO_T}man2html" >&6 # Extract the first word of "man2html", so it can be a program name with args. set dummy man2html; ac_word=$2 -echo "$as_me:6100: checking for $ac_word" >&5 +echo "$as_me:7895: checking for $ac_word" >&5 echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6 if test "${ac_cv_path_cf_man2html+set}" = set; then echo $ECHO_N "(cached) $ECHO_C" >&6 @@ -6114,7 +7909,7 @@ for ac_dir in $ac_dummy; do test -z "$ac_dir" && ac_dir=. if $as_executable_p "$ac_dir/$ac_word"; then ac_cv_path_cf_man2html="$ac_dir/$ac_word" - echo "$as_me:6117: found $ac_dir/$ac_word" >&5 + echo "$as_me:7912: found $ac_dir/$ac_word" >&5 break fi done @@ -6126,10 +7921,10 @@ fi cf_man2html=$ac_cv_path_cf_man2html if test -n "$cf_man2html"; then - echo "$as_me:6129: result: $cf_man2html" >&5 + echo "$as_me:7924: result: $cf_man2html" >&5 echo "${ECHO_T}$cf_man2html" >&6 else - echo "$as_me:6132: result: no" >&5 + echo "$as_me:7927: result: no" >&5 echo "${ECHO_T}no" >&6 fi @@ -6137,11 +7932,11 @@ fi (no|groff|*/groff*) cf_with_groff=yes cf_man2html=$GROFF_PATH - echo "$as_me:6140: result: $cf_man2html" >&5 + echo "$as_me:7935: result: $cf_man2html" >&5 echo "${ECHO_T}$cf_man2html" >&6 ;; (*) - echo "$as_me:6144: result: $cf_man2html" >&5 + echo "$as_me:7939: result: $cf_man2html" >&5 echo "${ECHO_T}$cf_man2html" >&6 ;; esac @@ -6170,6 +7965,7 @@ export GROFF_NO_SGR CF_EOF +NROFF_OPTS= if test "x$cf_with_groff" = xyes then MAN2HTML_NOTE="$GROFF_NOTE" @@ -6178,6 +7974,18 @@ then $SHELL -c "$TBL_PATH \${ROOT}.\${TYPE} | $GROFF_PATH -P -o0 -I\${ROOT}_ -Thtml -\${MACS}" CF_EOF else + # disable hyphenation if this is groff + if test "x$GROFF_PATH" != xno + then + echo "$as_me:7980: checking if nroff is really groff" >&5 +echo $ECHO_N "checking if nroff is really groff... $ECHO_C" >&6 + cf_check_groff="`$NROFF_PATH --version 2>/dev/null | grep groff`" + test -n "$cf_check_groff" && cf_check_groff=yes + test -n "$cf_check_groff" || cf_check_groff=no + echo "$as_me:7985: result: $cf_check_groff" >&5 +echo "${ECHO_T}$cf_check_groff" >&6 + test "x$cf_check_groff" = xyes && NROFF_OPTS="-rHY=0" + fi MAN2HTML_NOTE="" if test "x$prefix" != xNONE; then @@ -6193,26 +8001,26 @@ case ".$cf_man2html" in ;; (.[a-zA-Z]:[\\/]*) # OS/2 EMX ;; -(.\${*prefix}*|.\${*dir}*) +(.\$\{*prefix\}*|.\$\{*dir\}*) eval cf_man2html="$cf_man2html" case ".$cf_man2html" in (.NONE/*) - cf_man2html=`echo $cf_man2html | sed -e s%NONE%$cf_path_syntax%` + cf_man2html=`echo "$cf_man2html" | sed -e s%NONE%$cf_path_syntax%` ;; esac ;; (.no|.NONE/*) - cf_man2html=`echo $cf_man2html | sed -e s%NONE%$cf_path_syntax%` + cf_man2html=`echo "$cf_man2html" | sed -e s%NONE%$cf_path_syntax%` ;; (*) - { { echo "$as_me:6208: error: expected a pathname, not \"$cf_man2html\"" >&5 + { { echo "$as_me:8016: error: expected a pathname, not \"$cf_man2html\"" >&5 echo "$as_me: error: expected a pathname, not \"$cf_man2html\"" >&2;} { (exit 1); exit 1; }; } ;; esac MAN2HTML_PATH="$cf_man2html" - echo "$as_me:6215: checking for $cf_man2html top/bottom margins" >&5 + echo "$as_me:8023: checking for $cf_man2html top/bottom margins" >&5 echo $ECHO_N "checking for $cf_man2html top/bottom margins... $ECHO_C" >&6 # for this example, expect 3 lines of content, the remainder is head/foot @@ -6224,16 +8032,16 @@ CF_EOF LC_ALL=C LC_CTYPE=C LANG=C LANGUAGE=C $NROFF_PATH -man conftest.in >conftest.out - cf_man2html_1st=`fgrep -n MARKER conftest.out |sed -e 's/^[^0-9]*://' -e 's/:.*//'` - cf_man2html_top=`expr $cf_man2html_1st - 2` - cf_man2html_bot=`wc -l conftest.out |sed -e 's/[^0-9]//g'` - cf_man2html_bot=`expr $cf_man2html_bot - 2 - $cf_man2html_top` + cf_man2html_1st="`${FGREP-fgrep} -n MARKER conftest.out |sed -e 's/^[^0-9]*://' -e 's/:.*//'`" + cf_man2html_top=`expr "$cf_man2html_1st" - 2` + cf_man2html_bot="`wc -l conftest.out |sed -e 's/[^0-9]//g'`" + cf_man2html_bot=`expr "$cf_man2html_bot" - 2 - "$cf_man2html_top"` cf_man2html_top_bot="-topm=$cf_man2html_top -botm=$cf_man2html_bot" - echo "$as_me:6233: result: $cf_man2html_top_bot" >&5 + echo "$as_me:8041: result: $cf_man2html_top_bot" >&5 echo "${ECHO_T}$cf_man2html_top_bot" >&6 - echo "$as_me:6236: checking for pagesize to use" >&5 + echo "$as_me:8044: checking for pagesize to use" >&5 echo $ECHO_N "checking for pagesize to use... $ECHO_C" >&6 for cf_block in 1 2 3 4 5 6 7 8 9 10 11 12 13 14 15 16 17 18 19 20 do @@ -6253,23 +8061,23 @@ CF_EOF done LC_ALL=C LC_CTYPE=C LANG=C LANGUAGE=C $NROFF_PATH -man conftest.in >conftest.out - cf_man2html_page=`fgrep -n HEAD1 conftest.out |tail -n 1 |sed -e 's/^[^0-9]*://' -e 's/:.*//'` + cf_man2html_page="`${FGREP-fgrep} -n HEAD1 conftest.out |sed -n '$p' |sed -e 's/^[^0-9]*://' -e 's/:.*//'`" test -z "$cf_man2html_page" && cf_man2html_page=99999 test "$cf_man2html_page" -gt 100 && cf_man2html_page=99999 rm -rf conftest* - echo "$as_me:6261: result: $cf_man2html_page" >&5 + echo "$as_me:8069: result: $cf_man2html_page" >&5 echo "${ECHO_T}$cf_man2html_page" >&6 cat >>$MAN2HTML_TEMP <<CF_EOF : \${MAN2HTML_PATH=$MAN2HTML_PATH} -MAN2HTML_OPTS="\$MAN2HTML_OPTS -index -title="\$ROOT\(\$TYPE\)" -compress -pgsize $cf_man2html_page" +MAN2HTML_OPTS="\$MAN2HTML_OPTS -index -title=\"\$ROOT(\$TYPE)\" -compress -pgsize $cf_man2html_page" case \${TYPE} in (ms) - $TBL_PATH \${ROOT}.\${TYPE} | $NROFF_PATH -\${MACS} | \$MAN2HTML_PATH -topm=0 -botm=0 \$MAN2HTML_OPTS + $TBL_PATH \${ROOT}.\${TYPE} | $NROFF_PATH $NROFF_OPTS -\${MACS} | \$MAN2HTML_PATH -topm=0 -botm=0 \$MAN2HTML_OPTS ;; (*) - $TBL_PATH \${ROOT}.\${TYPE} | $NROFF_PATH -\${MACS} | \$MAN2HTML_PATH $cf_man2html_top_bot \$MAN2HTML_OPTS + $TBL_PATH \${ROOT}.\${TYPE} | $NROFF_PATH $NROFF_OPTS -\${MACS} | \$MAN2HTML_PATH $cf_man2html_top_bot \$MAN2HTML_OPTS ;; esac CF_EOF @@ -6278,14 +8086,13 @@ fi chmod 700 $MAN2HTML_TEMP EXTRAOBJS="" - -echo "$as_me:6282: checking for ANSI C header files" >&5 +echo "$as_me:8089: 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 6288 "configure" + cat >"conftest.$ac_ext" <<_ACEOF +#line 8095 "configure" #include "confdefs.h" #include <stdlib.h> #include <stdarg.h> @@ -6293,14 +8100,14 @@ else #include <float.h> _ACEOF -if { (eval echo "$as_me:6296: \"$ac_cpp conftest.$ac_ext\"") >&5 - (eval $ac_cpp conftest.$ac_ext) 2>conftest.er1 +if { (eval echo "$as_me:8103: \"$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:6302: \$? = $ac_status" >&5 - (exit $ac_status); } >/dev/null; then + echo "$as_me:8109: \$? = $ac_status" >&5 + (exit "$ac_status"); } >/dev/null; then if test -s conftest.err; then ac_cpp_err=$ac_c_preproc_warn_flag else @@ -6313,21 +8120,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 6324 "configure" + cat >"conftest.$ac_ext" <<_ACEOF +#line 8131 "configure" #include "confdefs.h" #include <string.h> _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 @@ -6338,14 +8145,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 6342 "configure" + cat >"conftest.$ac_ext" <<_ACEOF +#line 8149 "configure" #include "confdefs.h" #include <stdlib.h> _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 @@ -6359,8 +8166,8 @@ if test $ac_cv_header_stdc = yes; then if test "$cross_compiling" = yes; then : else - cat >conftest.$ac_ext <<_ACEOF -#line 6363 "configure" + cat >"conftest.$ac_ext" <<_ACEOF +#line 8170 "configure" #include "confdefs.h" #include <ctype.h> #if ((' ' & 0x0FF) == 0x020) @@ -6385,29 +8192,29 @@ main (void) $ac_main_return (0); } _ACEOF -rm -f conftest$ac_exeext -if { (eval echo "$as_me:6389: \"$ac_link\"") >&5 +rm -f "conftest$ac_exeext" +if { (eval echo "$as_me:8196: \"$ac_link\"") >&5 (eval $ac_link) 2>&5 ac_status=$? - echo "$as_me:6392: \$? = $ac_status" >&5 - (exit $ac_status); } && { ac_try='./conftest$ac_exeext' - { (eval echo "$as_me:6394: \"$ac_try\"") >&5 + echo "$as_me:8199: \$? = $ac_status" >&5 + (exit "$ac_status"); } && { ac_try='"./conftest$ac_exeext"' + { (eval echo "$as_me:8201: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? - echo "$as_me:6397: \$? = $ac_status" >&5 - (exit $ac_status); }; }; then + echo "$as_me:8204: \$? = $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:6410: result: $ac_cv_header_stdc" >&5 +echo "$as_me:8217: result: $ac_cv_header_stdc" >&5 echo "${ECHO_T}$ac_cv_header_stdc" >&6 if test $ac_cv_header_stdc = yes; then @@ -6417,15 +8224,15 @@ EOF fi -echo "$as_me:6420: checking for inline" >&5 +echo "$as_me:8227: 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 6428 "configure" + cat >"conftest.$ac_ext" <<_ACEOF +#line 8235 "configure" #include "confdefs.h" #ifndef __cplusplus static $ac_kw int static_foo () {return 0; } @@ -6433,28 +8240,28 @@ $ac_kw int foo () {return 0; } #endif _ACEOF -rm -f conftest.$ac_objext -if { (eval echo "$as_me:6437: \"$ac_compile\"") >&5 +rm -f "conftest.$ac_objext" +if { (eval echo "$as_me:8244: \"$ac_compile\"") >&5 (eval $ac_compile) 2>&5 ac_status=$? - echo "$as_me:6440: \$? = $ac_status" >&5 - (exit $ac_status); } && - { ac_try='test -s conftest.$ac_objext' - { (eval echo "$as_me:6443: \"$ac_try\"") >&5 + echo "$as_me:8247: \$? = $ac_status" >&5 + (exit "$ac_status"); } && + { ac_try='test -s "conftest.$ac_objext"' + { (eval echo "$as_me:8250: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? - echo "$as_me:6446: \$? = $ac_status" >&5 - (exit $ac_status); }; }; then + echo "$as_me:8253: \$? = $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:6457: result: $ac_cv_c_inline" >&5 +echo "$as_me:8264: result: $ac_cv_c_inline" >&5 echo "${ECHO_T}$ac_cv_c_inline" >&6 case $ac_cv_c_inline in inline | yes) ;; @@ -6475,40 +8282,40 @@ for ac_header in sys/types.h sys/stat.h stdlib.h string.h memory.h strings.h \ inttypes.h stdint.h unistd.h do as_ac_Header=`echo "ac_cv_header_$ac_header" | $as_tr_sh` -echo "$as_me:6478: checking for $ac_header" >&5 +echo "$as_me:8285: 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 6484 "configure" + cat >"conftest.$ac_ext" <<_ACEOF +#line 8291 "configure" #include "confdefs.h" $ac_includes_default #include <$ac_header> _ACEOF -rm -f conftest.$ac_objext -if { (eval echo "$as_me:6490: \"$ac_compile\"") >&5 +rm -f "conftest.$ac_objext" +if { (eval echo "$as_me:8297: \"$ac_compile\"") >&5 (eval $ac_compile) 2>&5 ac_status=$? - echo "$as_me:6493: \$? = $ac_status" >&5 - (exit $ac_status); } && - { ac_try='test -s conftest.$ac_objext' - { (eval echo "$as_me:6496: \"$ac_try\"") >&5 + echo "$as_me:8300: \$? = $ac_status" >&5 + (exit "$ac_status"); } && + { ac_try='test -s "conftest.$ac_objext"' + { (eval echo "$as_me:8303: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? - echo "$as_me:6499: \$? = $ac_status" >&5 - (exit $ac_status); }; }; then + echo "$as_me:8306: \$? = $ac_status" >&5 + (exit "$ac_status"); }; }; then eval "$as_ac_Header=yes" else echo "$as_me: failed program was:" >&5 -cat conftest.$ac_ext >&5 +cat "conftest.$ac_ext" >&5 eval "$as_ac_Header=no" fi -rm -f conftest.$ac_objext conftest.$ac_ext +rm -f "conftest.$ac_objext" "conftest.$ac_ext" fi -echo "$as_me:6509: 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:8316: result: `eval echo '${'"$as_ac_Header"'}'`" >&5 +echo "${ECHO_T}`eval echo '${'"$as_ac_Header"'}'`" >&6 +if test "`eval echo '${'"$as_ac_Header"'}'`" = yes; then cat >>confdefs.h <<EOF #define `echo "HAVE_$ac_header" | $as_tr_cpp` 1 EOF @@ -6516,13 +8323,13 @@ EOF fi done -echo "$as_me:6519: checking for off_t" >&5 +echo "$as_me:8326: checking for off_t" >&5 echo $ECHO_N "checking for off_t... $ECHO_C" >&6 if test "${ac_cv_type_off_t+set}" = set; then echo $ECHO_N "(cached) $ECHO_C" >&6 else - cat >conftest.$ac_ext <<_ACEOF -#line 6525 "configure" + cat >"conftest.$ac_ext" <<_ACEOF +#line 8332 "configure" #include "confdefs.h" $ac_includes_default int @@ -6536,29 +8343,29 @@ if (sizeof (off_t)) return 0; } _ACEOF -rm -f conftest.$ac_objext -if { (eval echo "$as_me:6540: \"$ac_compile\"") >&5 +rm -f "conftest.$ac_objext" +if { (eval echo "$as_me:8347: \"$ac_compile\"") >&5 (eval $ac_compile) 2>&5 ac_status=$? - echo "$as_me:6543: \$? = $ac_status" >&5 - (exit $ac_status); } && - { ac_try='test -s conftest.$ac_objext' - { (eval echo "$as_me:6546: \"$ac_try\"") >&5 + 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 (eval $ac_try) 2>&5 ac_status=$? - echo "$as_me:6549: \$? = $ac_status" >&5 - (exit $ac_status); }; }; then + echo "$as_me:8356: \$? = $ac_status" >&5 + (exit "$ac_status"); }; }; then ac_cv_type_off_t=yes else echo "$as_me: failed program was:" >&5 -cat conftest.$ac_ext >&5 +cat "conftest.$ac_ext" >&5 ac_cv_type_off_t=no fi -rm -f conftest.$ac_objext conftest.$ac_ext +rm -f "conftest.$ac_objext" "conftest.$ac_ext" fi -echo "$as_me:6559: result: $ac_cv_type_off_t" >&5 +echo "$as_me:8366: result: $ac_cv_type_off_t" >&5 echo "${ECHO_T}$ac_cv_type_off_t" >&6 -if test $ac_cv_type_off_t = yes; then +if test "$ac_cv_type_off_t" = yes; then : else @@ -6568,13 +8375,13 @@ EOF fi -echo "$as_me:6571: checking for size_t" >&5 +echo "$as_me:8378: checking for size_t" >&5 echo $ECHO_N "checking for size_t... $ECHO_C" >&6 if test "${ac_cv_type_size_t+set}" = set; then echo $ECHO_N "(cached) $ECHO_C" >&6 else - cat >conftest.$ac_ext <<_ACEOF -#line 6577 "configure" + cat >"conftest.$ac_ext" <<_ACEOF +#line 8384 "configure" #include "confdefs.h" $ac_includes_default int @@ -6588,29 +8395,29 @@ if (sizeof (size_t)) return 0; } _ACEOF -rm -f conftest.$ac_objext -if { (eval echo "$as_me:6592: \"$ac_compile\"") >&5 +rm -f "conftest.$ac_objext" +if { (eval echo "$as_me:8399: \"$ac_compile\"") >&5 (eval $ac_compile) 2>&5 ac_status=$? - echo "$as_me:6595: \$? = $ac_status" >&5 - (exit $ac_status); } && - { ac_try='test -s conftest.$ac_objext' - { (eval echo "$as_me:6598: \"$ac_try\"") >&5 + echo "$as_me:8402: \$? = $ac_status" >&5 + (exit "$ac_status"); } && + { ac_try='test -s "conftest.$ac_objext"' + { (eval echo "$as_me:8405: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? - echo "$as_me:6601: \$? = $ac_status" >&5 - (exit $ac_status); }; }; then + echo "$as_me:8408: \$? = $ac_status" >&5 + (exit "$ac_status"); }; }; then ac_cv_type_size_t=yes else echo "$as_me: failed program was:" >&5 -cat conftest.$ac_ext >&5 +cat "conftest.$ac_ext" >&5 ac_cv_type_size_t=no fi -rm -f conftest.$ac_objext conftest.$ac_ext +rm -f "conftest.$ac_objext" "conftest.$ac_ext" fi -echo "$as_me:6611: result: $ac_cv_type_size_t" >&5 +echo "$as_me:8418: result: $ac_cv_type_size_t" >&5 echo "${ECHO_T}$ac_cv_type_size_t" >&6 -if test $ac_cv_type_size_t = yes; then +if test "$ac_cv_type_size_t" = yes; then : else @@ -6622,13 +8429,13 @@ fi # The Ultrix 4.2 mips builtin alloca declared by alloca.h only works # for constant arguments. Useless! -echo "$as_me:6625: checking for working alloca.h" >&5 +echo "$as_me:8432: checking for working alloca.h" >&5 echo $ECHO_N "checking for working alloca.h... $ECHO_C" >&6 if test "${ac_cv_working_alloca_h+set}" = set; then echo $ECHO_N "(cached) $ECHO_C" >&6 else - cat >conftest.$ac_ext <<_ACEOF -#line 6631 "configure" + cat >"conftest.$ac_ext" <<_ACEOF +#line 8438 "configure" #include "confdefs.h" #include <alloca.h> int @@ -6639,27 +8446,27 @@ char *p = (char *) alloca (2 * sizeof (int)); return 0; } _ACEOF -rm -f conftest.$ac_objext conftest$ac_exeext -if { (eval echo "$as_me:6643: \"$ac_link\"") >&5 +rm -f "conftest.$ac_objext" "conftest$ac_exeext" +if { (eval echo "$as_me:8450: \"$ac_link\"") >&5 (eval $ac_link) 2>&5 ac_status=$? - echo "$as_me:6646: \$? = $ac_status" >&5 - (exit $ac_status); } && - { ac_try='test -s conftest$ac_exeext' - { (eval echo "$as_me:6649: \"$ac_try\"") >&5 + echo "$as_me:8453: \$? = $ac_status" >&5 + (exit "$ac_status"); } && + { ac_try='test -s "conftest$ac_exeext"' + { (eval echo "$as_me:8456: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? - echo "$as_me:6652: \$? = $ac_status" >&5 - (exit $ac_status); }; }; then + echo "$as_me:8459: \$? = $ac_status" >&5 + (exit "$ac_status"); }; }; then ac_cv_working_alloca_h=yes else echo "$as_me: failed program was:" >&5 -cat conftest.$ac_ext >&5 +cat "conftest.$ac_ext" >&5 ac_cv_working_alloca_h=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:6662: result: $ac_cv_working_alloca_h" >&5 +echo "$as_me:8469: result: $ac_cv_working_alloca_h" >&5 echo "${ECHO_T}$ac_cv_working_alloca_h" >&6 if test $ac_cv_working_alloca_h = yes; then @@ -6669,13 +8476,13 @@ EOF fi -echo "$as_me:6672: checking for alloca" >&5 +echo "$as_me:8479: checking for alloca" >&5 echo $ECHO_N "checking for alloca... $ECHO_C" >&6 if test "${ac_cv_func_alloca_works+set}" = set; then echo $ECHO_N "(cached) $ECHO_C" >&6 else - cat >conftest.$ac_ext <<_ACEOF -#line 6678 "configure" + cat >"conftest.$ac_ext" <<_ACEOF +#line 8485 "configure" #include "confdefs.h" #ifdef __GNUC__ # define alloca __builtin_alloca @@ -6706,27 +8513,27 @@ char *p = (char *) alloca (1); return 0; } _ACEOF -rm -f conftest.$ac_objext conftest$ac_exeext -if { (eval echo "$as_me:6710: \"$ac_link\"") >&5 +rm -f "conftest.$ac_objext" "conftest$ac_exeext" +if { (eval echo "$as_me:8517: \"$ac_link\"") >&5 (eval $ac_link) 2>&5 ac_status=$? - echo "$as_me:6713: \$? = $ac_status" >&5 - (exit $ac_status); } && - { ac_try='test -s conftest$ac_exeext' - { (eval echo "$as_me:6716: \"$ac_try\"") >&5 + echo "$as_me:8520: \$? = $ac_status" >&5 + (exit "$ac_status"); } && + { ac_try='test -s "conftest$ac_exeext"' + { (eval echo "$as_me:8523: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? - echo "$as_me:6719: \$? = $ac_status" >&5 - (exit $ac_status); }; }; then + echo "$as_me:8526: \$? = $ac_status" >&5 + (exit "$ac_status"); }; }; then ac_cv_func_alloca_works=yes else echo "$as_me: failed program was:" >&5 -cat conftest.$ac_ext >&5 +cat "conftest.$ac_ext" >&5 ac_cv_func_alloca_works=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:6729: result: $ac_cv_func_alloca_works" >&5 +echo "$as_me:8536: result: $ac_cv_func_alloca_works" >&5 echo "${ECHO_T}$ac_cv_func_alloca_works" >&6 if test $ac_cv_func_alloca_works = yes; then @@ -6741,19 +8548,19 @@ else # contain a buggy version. If you still want to use their alloca, # use ar to extract alloca.o from them instead of compiling alloca.c. -ALLOCA=alloca.$ac_objext +ALLOCA="alloca.$ac_objext" cat >>confdefs.h <<\EOF #define C_ALLOCA 1 EOF -echo "$as_me:6750: checking whether \`alloca.c' needs Cray hooks" >&5 +echo "$as_me:8557: checking whether \`alloca.c' needs Cray hooks" >&5 echo $ECHO_N "checking whether \`alloca.c' needs Cray hooks... $ECHO_C" >&6 if test "${ac_cv_os_cray+set}" = set; then echo $ECHO_N "(cached) $ECHO_C" >&6 else - cat >conftest.$ac_ext <<_ACEOF -#line 6756 "configure" + cat >"conftest.$ac_ext" <<_ACEOF +#line 8563 "configure" #include "confdefs.h" #if defined(CRAY) && ! defined(CRAY2) webecray @@ -6763,7 +8570,7 @@ wenotbecray _ACEOF if (eval "$ac_cpp conftest.$ac_ext") 2>&5 | - egrep "webecray" >/dev/null 2>&1; then + $EGREP "webecray" >/dev/null 2>&1; then ac_cv_os_cray=yes else ac_cv_os_cray=no @@ -6771,70 +8578,70 @@ fi rm -rf conftest* fi -echo "$as_me:6774: result: $ac_cv_os_cray" >&5 +echo "$as_me:8581: result: $ac_cv_os_cray" >&5 echo "${ECHO_T}$ac_cv_os_cray" >&6 if test $ac_cv_os_cray = yes; then for ac_func in _getb67 GETB67 getb67; do as_ac_var=`echo "ac_cv_func_$ac_func" | $as_tr_sh` -echo "$as_me:6779: checking for $ac_func" >&5 +echo "$as_me:8586: 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 6785 "configure" + cat >"conftest.$ac_ext" <<_ACEOF +#line 8592 "configure" #include "confdefs.h" -/* System header to define __stub macros and hopefully few prototypes, - which can conflict with char $ac_func (); below. */ -#include <assert.h> -/* Override any gcc2 internal prototype to avoid an error. */ +#define $ac_func autoconf_temporary +#include <limits.h> /* least-intrusive standard header which defines gcc2 __stub macros */ +#undef $ac_func + #ifdef __cplusplus extern "C" #endif + /* We use char because int might match the return type of a gcc2 builtin and then its argument prototype would still apply. */ -char $ac_func (); -char (*f) (); +char $ac_func (void); int main (void) { -/* The GNU C library defines this for functions which it implements + +/* The GNU C library defines stubs for functions which it implements to always fail with ENOSYS. Some functions are actually named something starting with __ and the normal name is an alias. */ #if defined (__stub_$ac_func) || defined (__stub___$ac_func) -choke me -#else -f = $ac_func; /* workaround for ICC 12.0.3 */ if (f == 0) return 1; +#error found stub for $ac_func #endif + return $ac_func (); ; return 0; } _ACEOF -rm -f conftest.$ac_objext conftest$ac_exeext -if { (eval echo "$as_me:6816: \"$ac_link\"") >&5 +rm -f "conftest.$ac_objext" "conftest$ac_exeext" +if { (eval echo "$as_me:8623: \"$ac_link\"") >&5 (eval $ac_link) 2>&5 ac_status=$? - echo "$as_me:6819: \$? = $ac_status" >&5 - (exit $ac_status); } && - { ac_try='test -s conftest$ac_exeext' - { (eval echo "$as_me:6822: \"$ac_try\"") >&5 + echo "$as_me:8626: \$? = $ac_status" >&5 + (exit "$ac_status"); } && + { ac_try='test -s "conftest$ac_exeext"' + { (eval echo "$as_me:8629: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? - echo "$as_me:6825: \$? = $ac_status" >&5 - (exit $ac_status); }; }; then + echo "$as_me:8632: \$? = $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:6835: 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:8642: result: `eval echo '${'"$as_ac_var"'}'`" >&5 +echo "${ECHO_T}`eval echo '${'"$as_ac_var"'}'`" >&6 +if test "`eval echo '${'"$as_ac_var"'}'`" = yes; then cat >>confdefs.h <<EOF #define CRAY_STACKSEG_END $ac_func @@ -6846,7 +8653,7 @@ fi done fi -echo "$as_me:6849: checking stack direction for C alloca" >&5 +echo "$as_me:8656: checking stack direction for C alloca" >&5 echo $ECHO_N "checking stack direction for C alloca... $ECHO_C" >&6 if test "${ac_cv_c_stack_direction+set}" = set; then echo $ECHO_N "(cached) $ECHO_C" >&6 @@ -6854,8 +8661,8 @@ else if test "$cross_compiling" = yes; then ac_cv_c_stack_direction=0 else - cat >conftest.$ac_ext <<_ACEOF -#line 6858 "configure" + cat >"conftest.$ac_ext" <<_ACEOF +#line 8665 "configure" #include "confdefs.h" int find_stack_direction (void) @@ -6877,28 +8684,28 @@ main (void) $ac_main_return (find_stack_direction () < 0); } _ACEOF -rm -f conftest$ac_exeext -if { (eval echo "$as_me:6881: \"$ac_link\"") >&5 +rm -f "conftest$ac_exeext" +if { (eval echo "$as_me:8688: \"$ac_link\"") >&5 (eval $ac_link) 2>&5 ac_status=$? - echo "$as_me:6884: \$? = $ac_status" >&5 - (exit $ac_status); } && { ac_try='./conftest$ac_exeext' - { (eval echo "$as_me:6886: \"$ac_try\"") >&5 + echo "$as_me:8691: \$? = $ac_status" >&5 + (exit "$ac_status"); } && { ac_try='"./conftest$ac_exeext"' + { (eval echo "$as_me:8693: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? - echo "$as_me:6889: \$? = $ac_status" >&5 - (exit $ac_status); }; }; then + echo "$as_me:8696: \$? = $ac_status" >&5 + (exit "$ac_status"); }; }; then ac_cv_c_stack_direction=1 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_c_stack_direction=-1 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 -echo "$as_me:6901: result: $ac_cv_c_stack_direction" >&5 +echo "$as_me:8708: result: $ac_cv_c_stack_direction" >&5 echo "${ECHO_T}$ac_cv_c_stack_direction" >&6 cat >>confdefs.h <<EOF @@ -6910,24 +8717,24 @@ fi for ac_header in stdlib.h unistd.h do as_ac_Header=`echo "ac_cv_header_$ac_header" | $as_tr_sh` -echo "$as_me:6913: checking for $ac_header" >&5 +echo "$as_me:8720: 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 6919 "configure" + cat >"conftest.$ac_ext" <<_ACEOF +#line 8726 "configure" #include "confdefs.h" #include <$ac_header> _ACEOF -if { (eval echo "$as_me:6923: \"$ac_cpp conftest.$ac_ext\"") >&5 - (eval $ac_cpp conftest.$ac_ext) 2>conftest.er1 +if { (eval echo "$as_me:8730: \"$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:6929: \$? = $ac_status" >&5 - (exit $ac_status); } >/dev/null; then + echo "$as_me:8736: \$? = $ac_status" >&5 + (exit "$ac_status"); } >/dev/null; then if test -s conftest.err; then ac_cpp_err=$ac_c_preproc_warn_flag else @@ -6940,14 +8747,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:6948: 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:8755: result: `eval echo '${'"$as_ac_Header"'}'`" >&5 +echo "${ECHO_T}`eval echo '${'"$as_ac_Header"'}'`" >&6 +if test "`eval echo '${'"$as_ac_Header"'}'`" = yes; then cat >>confdefs.h <<EOF #define `echo "HAVE_$ac_header" | $as_tr_cpp` 1 EOF @@ -6958,65 +8765,65 @@ done for ac_func in getpagesize do as_ac_var=`echo "ac_cv_func_$ac_func" | $as_tr_sh` -echo "$as_me:6961: checking for $ac_func" >&5 +echo "$as_me:8768: 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 6967 "configure" + cat >"conftest.$ac_ext" <<_ACEOF +#line 8774 "configure" #include "confdefs.h" -/* System header to define __stub macros and hopefully few prototypes, - which can conflict with char $ac_func (); below. */ -#include <assert.h> -/* Override any gcc2 internal prototype to avoid an error. */ +#define $ac_func autoconf_temporary +#include <limits.h> /* least-intrusive standard header which defines gcc2 __stub macros */ +#undef $ac_func + #ifdef __cplusplus extern "C" #endif + /* We use char because int might match the return type of a gcc2 builtin and then its argument prototype would still apply. */ -char $ac_func (); -char (*f) (); +char $ac_func (void); int main (void) { -/* The GNU C library defines this for functions which it implements + +/* The GNU C library defines stubs for functions which it implements to always fail with ENOSYS. Some functions are actually named something starting with __ and the normal name is an alias. */ #if defined (__stub_$ac_func) || defined (__stub___$ac_func) -choke me -#else -f = $ac_func; /* workaround for ICC 12.0.3 */ if (f == 0) return 1; +#error found stub for $ac_func #endif + return $ac_func (); ; return 0; } _ACEOF -rm -f conftest.$ac_objext conftest$ac_exeext -if { (eval echo "$as_me:6998: \"$ac_link\"") >&5 +rm -f "conftest.$ac_objext" "conftest$ac_exeext" +if { (eval echo "$as_me:8805: \"$ac_link\"") >&5 (eval $ac_link) 2>&5 ac_status=$? - echo "$as_me:7001: \$? = $ac_status" >&5 - (exit $ac_status); } && - { ac_try='test -s conftest$ac_exeext' - { (eval echo "$as_me:7004: \"$ac_try\"") >&5 + echo "$as_me:8808: \$? = $ac_status" >&5 + (exit "$ac_status"); } && + { ac_try='test -s "conftest$ac_exeext"' + { (eval echo "$as_me:8811: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? - echo "$as_me:7007: \$? = $ac_status" >&5 - (exit $ac_status); }; }; then + echo "$as_me:8814: \$? = $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:7017: 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:8824: result: `eval echo '${'"$as_ac_var"'}'`" >&5 +echo "${ECHO_T}`eval echo '${'"$as_ac_var"'}'`" >&6 +if test "`eval echo '${'"$as_ac_var"'}'`" = yes; then cat >>confdefs.h <<EOF #define `echo "HAVE_$ac_func" | $as_tr_cpp` 1 EOF @@ -7024,7 +8831,7 @@ EOF fi done -echo "$as_me:7027: checking for working mmap" >&5 +echo "$as_me:8834: checking for working mmap" >&5 echo $ECHO_N "checking for working mmap... $ECHO_C" >&6 if test "${ac_cv_func_mmap_fixed_mapped+set}" = set; then echo $ECHO_N "(cached) $ECHO_C" >&6 @@ -7032,8 +8839,8 @@ else if test "$cross_compiling" = yes; then ac_cv_func_mmap_fixed_mapped=no else - cat >conftest.$ac_ext <<_ACEOF -#line 7036 "configure" + cat >"conftest.$ac_ext" <<_ACEOF +#line 8843 "configure" #include "confdefs.h" $ac_includes_default /* Thanks to Mike Haertel and Jim Avera for this test. @@ -7159,28 +8966,28 @@ main (void) $ac_main_return (0); } _ACEOF -rm -f conftest$ac_exeext -if { (eval echo "$as_me:7163: \"$ac_link\"") >&5 +rm -f "conftest$ac_exeext" +if { (eval echo "$as_me:8970: \"$ac_link\"") >&5 (eval $ac_link) 2>&5 ac_status=$? - echo "$as_me:7166: \$? = $ac_status" >&5 - (exit $ac_status); } && { ac_try='./conftest$ac_exeext' - { (eval echo "$as_me:7168: \"$ac_try\"") >&5 + echo "$as_me:8973: \$? = $ac_status" >&5 + (exit "$ac_status"); } && { ac_try='"./conftest$ac_exeext"' + { (eval echo "$as_me:8975: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? - echo "$as_me:7171: \$? = $ac_status" >&5 - (exit $ac_status); }; }; then + echo "$as_me:8978: \$? = $ac_status" >&5 + (exit "$ac_status"); }; }; then ac_cv_func_mmap_fixed_mapped=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 ac_cv_func_mmap_fixed_mapped=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 -echo "$as_me:7183: result: $ac_cv_func_mmap_fixed_mapped" >&5 +echo "$as_me:8990: result: $ac_cv_func_mmap_fixed_mapped" >&5 echo "${ECHO_T}$ac_cv_func_mmap_fixed_mapped" >&6 if test $ac_cv_func_mmap_fixed_mapped = yes; then @@ -7191,13 +8998,13 @@ EOF fi rm -f conftest.mmap -echo "$as_me:7194: checking whether we are using the GNU C Library 2.1 or newer" >&5 +echo "$as_me:9001: checking whether we are using the GNU C Library 2.1 or newer" >&5 echo $ECHO_N "checking whether we are using the GNU C Library 2.1 or newer... $ECHO_C" >&6 if test "${ac_cv_gnu_library_2_1+set}" = set; then echo $ECHO_N "(cached) $ECHO_C" >&6 else - cat >conftest.$ac_ext <<_ACEOF -#line 7200 "configure" + cat >"conftest.$ac_ext" <<_ACEOF +#line 9007 "configure" #include "confdefs.h" #include <features.h> @@ -7209,7 +9016,7 @@ else _ACEOF if (eval "$ac_cpp conftest.$ac_ext") 2>&5 | - egrep "Lucky GNU user" >/dev/null 2>&1; then + $EGREP "Lucky GNU user" >/dev/null 2>&1; then ac_cv_gnu_library_2_1=yes else ac_cv_gnu_library_2_1=no @@ -7217,27 +9024,27 @@ fi rm -rf conftest* fi -echo "$as_me:7220: result: $ac_cv_gnu_library_2_1" >&5 +echo "$as_me:9027: result: $ac_cv_gnu_library_2_1" >&5 echo "${ECHO_T}$ac_cv_gnu_library_2_1" >&6 GLIBC21="$ac_cv_gnu_library_2_1" cf_makefile=makefile -test -z "$ALL_LINGUAS" && ALL_LINGUAS=`test -d $srcdir/po && cd $srcdir/po && echo *.po|sed -e 's/\.po//g' -e 's/*//'` +test -z "$ALL_LINGUAS" && ALL_LINGUAS=`test -d "$srcdir/po" && cd "$srcdir/po" && echo *.po|sed -e 's/\.po//g' -e 's/*//'` # Allow override of "config.h" definition: : ${CONFIG_H:=config.h} if test -z "$PACKAGE" ; then - { { echo "$as_me:7233: error: CF_BUNDLED_INTL used without setting PACKAGE variable" >&5 + { { echo "$as_me:9040: error: CF_BUNDLED_INTL used without setting PACKAGE variable" >&5 echo "$as_me: error: CF_BUNDLED_INTL used without setting PACKAGE variable" >&2;} { (exit 1); exit 1; }; } fi if test -z "$VERSION" ; then -if test -f $srcdir/VERSION ; then - VERSION=`sed -e '2,$d' $srcdir/VERSION|cut -f1` +if test -f "$srcdir/VERSION" ; then + VERSION=`sed -e '2,$d' "$srcdir/VERSION" |cut -f1` else VERSION=unknown fi @@ -7247,24 +9054,24 @@ for ac_header in argz.h limits.h locale.h nl_types.h malloc.h stddef.h \ stdlib.h string.h unistd.h sys/param.h do as_ac_Header=`echo "ac_cv_header_$ac_header" | $as_tr_sh` -echo "$as_me:7250: checking for $ac_header" >&5 +echo "$as_me:9057: 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 7256 "configure" + cat >"conftest.$ac_ext" <<_ACEOF +#line 9063 "configure" #include "confdefs.h" #include <$ac_header> _ACEOF -if { (eval echo "$as_me:7260: \"$ac_cpp conftest.$ac_ext\"") >&5 - (eval $ac_cpp conftest.$ac_ext) 2>conftest.er1 +if { (eval echo "$as_me:9067: \"$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:7266: \$? = $ac_status" >&5 - (exit $ac_status); } >/dev/null; then + echo "$as_me:9073: \$? = $ac_status" >&5 + (exit "$ac_status"); } >/dev/null; then if test -s conftest.err; then ac_cpp_err=$ac_c_preproc_warn_flag else @@ -7277,14 +9084,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:7285: 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:9092: result: `eval echo '${'"$as_ac_Header"'}'`" >&5 +echo "${ECHO_T}`eval echo '${'"$as_ac_Header"'}'`" >&6 +if test "`eval echo '${'"$as_ac_Header"'}'`" = yes; then cat >>confdefs.h <<EOF #define `echo "HAVE_$ac_header" | $as_tr_cpp` 1 EOF @@ -7297,65 +9104,65 @@ getgid getuid mempcpy munmap putenv setenv setlocale stpcpy strchr strcasecmp \ strdup strtoul tsearch __argz_count __argz_stringify __argz_next do as_ac_var=`echo "ac_cv_func_$ac_func" | $as_tr_sh` -echo "$as_me:7300: checking for $ac_func" >&5 +echo "$as_me:9107: 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 7306 "configure" + cat >"conftest.$ac_ext" <<_ACEOF +#line 9113 "configure" #include "confdefs.h" -/* System header to define __stub macros and hopefully few prototypes, - which can conflict with char $ac_func (); below. */ -#include <assert.h> -/* Override any gcc2 internal prototype to avoid an error. */ +#define $ac_func autoconf_temporary +#include <limits.h> /* least-intrusive standard header which defines gcc2 __stub macros */ +#undef $ac_func + #ifdef __cplusplus extern "C" #endif + /* We use char because int might match the return type of a gcc2 builtin and then its argument prototype would still apply. */ -char $ac_func (); -char (*f) (); +char $ac_func (void); int main (void) { -/* The GNU C library defines this for functions which it implements + +/* The GNU C library defines stubs for functions which it implements to always fail with ENOSYS. Some functions are actually named something starting with __ and the normal name is an alias. */ #if defined (__stub_$ac_func) || defined (__stub___$ac_func) -choke me -#else -f = $ac_func; /* workaround for ICC 12.0.3 */ if (f == 0) return 1; +#error found stub for $ac_func #endif + return $ac_func (); ; return 0; } _ACEOF -rm -f conftest.$ac_objext conftest$ac_exeext -if { (eval echo "$as_me:7337: \"$ac_link\"") >&5 +rm -f "conftest.$ac_objext" "conftest$ac_exeext" +if { (eval echo "$as_me:9144: \"$ac_link\"") >&5 (eval $ac_link) 2>&5 ac_status=$? - echo "$as_me:7340: \$? = $ac_status" >&5 - (exit $ac_status); } && - { ac_try='test -s conftest$ac_exeext' - { (eval echo "$as_me:7343: \"$ac_try\"") >&5 + echo "$as_me:9147: \$? = $ac_status" >&5 + (exit "$ac_status"); } && + { ac_try='test -s "conftest$ac_exeext"' + { (eval echo "$as_me:9150: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? - echo "$as_me:7346: \$? = $ac_status" >&5 - (exit $ac_status); }; }; then + echo "$as_me:9153: \$? = $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:7356: 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:9163: result: `eval echo '${'"$as_ac_var"'}'`" >&5 +echo "${ECHO_T}`eval echo '${'"$as_ac_var"'}'`" >&6 +if test "`eval echo '${'"$as_ac_var"'}'`" = yes; then cat >>confdefs.h <<EOF #define `echo "HAVE_$ac_func" | $as_tr_cpp` 1 EOF @@ -7375,14 +9182,14 @@ case "$withval" in (*) for cf_searchpath in `echo "$withval" | tr $PATH_SEPARATOR ' '`; do - if test -d $cf_searchpath/include; then + if test -d "$cf_searchpath/include" ; then if test -n "$cf_searchpath/include" ; then for cf_add_incdir in $cf_searchpath/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 @@ -7403,8 +9210,8 @@ if test -n "$cf_searchpath/include" ; then test -n "$CPPFLAGS" && CPPFLAGS="$CPPFLAGS " CPPFLAGS="${CPPFLAGS}-I$cf_add_incdir" - cat >conftest.$ac_ext <<_ACEOF -#line 7407 "configure" + cat >"conftest.$ac_ext" <<_ACEOF +#line 9214 "configure" #include "confdefs.h" #include <stdio.h> int @@ -7415,25 +9222,25 @@ printf("Hello") return 0; } _ACEOF -rm -f conftest.$ac_objext -if { (eval echo "$as_me:7419: \"$ac_compile\"") >&5 +rm -f "conftest.$ac_objext" +if { (eval echo "$as_me:9226: \"$ac_compile\"") >&5 (eval $ac_compile) 2>&5 ac_status=$? - echo "$as_me:7422: \$? = $ac_status" >&5 - (exit $ac_status); } && - { ac_try='test -s conftest.$ac_objext' - { (eval echo "$as_me:7425: \"$ac_try\"") >&5 + echo "$as_me:9229: \$? = $ac_status" >&5 + (exit "$ac_status"); } && + { ac_try='test -s "conftest.$ac_objext"' + { (eval echo "$as_me:9232: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? - echo "$as_me:7428: \$? = $ac_status" >&5 - (exit $ac_status); }; }; then + echo "$as_me:9235: \$? = $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 @@ -7442,11 +9249,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}:7445: testing adding $cf_add_incdir to include-path ..." 1>&5 +echo "${as_me:-configure}:9252: 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 @@ -7459,14 +9266,14 @@ echo "${as_me:-configure}:7445: testing adding $cf_add_incdir to include-path .. done fi - elif test -d $cf_searchpath/../include ; then + elif test -d "$cf_searchpath/../include" ; then if test -n "$cf_searchpath/../include" ; then for cf_add_incdir in $cf_searchpath/../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 @@ -7487,8 +9294,8 @@ if test -n "$cf_searchpath/../include" ; then test -n "$CPPFLAGS" && CPPFLAGS="$CPPFLAGS " CPPFLAGS="${CPPFLAGS}-I$cf_add_incdir" - cat >conftest.$ac_ext <<_ACEOF -#line 7491 "configure" + cat >"conftest.$ac_ext" <<_ACEOF +#line 9298 "configure" #include "confdefs.h" #include <stdio.h> int @@ -7499,25 +9306,25 @@ printf("Hello") return 0; } _ACEOF -rm -f conftest.$ac_objext -if { (eval echo "$as_me:7503: \"$ac_compile\"") >&5 +rm -f "conftest.$ac_objext" +if { (eval echo "$as_me:9310: \"$ac_compile\"") >&5 (eval $ac_compile) 2>&5 ac_status=$? - echo "$as_me:7506: \$? = $ac_status" >&5 - (exit $ac_status); } && - { ac_try='test -s conftest.$ac_objext' - { (eval echo "$as_me:7509: \"$ac_try\"") >&5 + echo "$as_me:9313: \$? = $ac_status" >&5 + (exit "$ac_status"); } && + { ac_try='test -s "conftest.$ac_objext"' + { (eval echo "$as_me:9316: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? - echo "$as_me:7512: \$? = $ac_status" >&5 - (exit $ac_status); }; }; then + echo "$as_me:9319: \$? = $ac_status" >&5 + (exit "$ac_status"); }; }; then : else echo "$as_me: failed program was:" >&5 -cat conftest.$ac_ext >&5 +cat "conftest.$ac_ext" >&5 cf_have_incdir=yes fi -rm -f conftest.$ac_objext conftest.$ac_ext +rm -f "conftest.$ac_objext" "conftest.$ac_ext" CPPFLAGS=$cf_save_CPPFLAGS fi fi @@ -7526,11 +9333,11 @@ rm -f conftest.$ac_objext conftest.$ac_ext if test "$cf_have_incdir" = no ; then test -n "$verbose" && echo " adding $cf_add_incdir to include-path" 1>&6 -echo "${as_me:-configure}:7529: testing adding $cf_add_incdir to include-path ..." 1>&5 +echo "${as_me:-configure}:9336: 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 @@ -7544,18 +9351,18 @@ echo "${as_me:-configure}:7529: testing adding $cf_add_incdir to include-path .. fi else -{ { echo "$as_me:7547: error: cannot find libiconv under $withval" >&5 +{ { echo "$as_me:9354: error: cannot find libiconv under $withval" >&5 echo "$as_me: error: cannot find libiconv under $withval" >&2;} { (exit 1); exit 1; }; } fi - if test -d $cf_searchpath/lib; then + if test -d "$cf_searchpath/lib" ; then if test -n "$cf_searchpath/lib" ; then for cf_add_libdir in $cf_searchpath/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 @@ -7569,7 +9376,7 @@ if test -n "$cf_searchpath/lib" ; then if test "$cf_have_libdir" = no ; then test -n "$verbose" && echo " adding $cf_add_libdir to library-path" 1>&6 -echo "${as_me:-configure}:7572: testing adding $cf_add_libdir to library-path ..." 1>&5 +echo "${as_me:-configure}:9379: testing adding $cf_add_libdir to library-path ..." 1>&5 LDFLAGS="-L$cf_add_libdir $LDFLAGS" fi @@ -7577,14 +9384,14 @@ echo "${as_me:-configure}:7572: testing adding $cf_add_libdir to library-path .. done fi - elif test -d $cf_searchpath ; then + elif test -d "$cf_searchpath" ; then if test -n "$cf_searchpath" ; then for cf_add_libdir in $cf_searchpath 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 @@ -7598,7 +9405,7 @@ if test -n "$cf_searchpath" ; then if test "$cf_have_libdir" = no ; then test -n "$verbose" && echo " adding $cf_add_libdir to library-path" 1>&6 -echo "${as_me:-configure}:7601: testing adding $cf_add_libdir to library-path ..." 1>&5 +echo "${as_me:-configure}:9408: testing adding $cf_add_libdir to library-path ..." 1>&5 LDFLAGS="-L$cf_add_libdir $LDFLAGS" fi @@ -7607,7 +9414,7 @@ echo "${as_me:-configure}:7601: testing adding $cf_add_libdir to library-path .. fi else -{ { echo "$as_me:7610: error: cannot find libiconv under $withval" >&5 +{ { echo "$as_me:9417: error: cannot find libiconv under $withval" >&5 echo "$as_me: error: cannot find libiconv under $withval" >&2;} { (exit 1); exit 1; }; } fi @@ -7618,7 +9425,7 @@ esac fi; - echo "$as_me:7621: checking for iconv" >&5 + echo "$as_me:9428: checking for iconv" >&5 echo $ECHO_N "checking for iconv... $ECHO_C" >&6 if test "${am_cv_func_iconv+set}" = set; then echo $ECHO_N "(cached) $ECHO_C" >&6 @@ -7629,12 +9436,12 @@ else cf_cv_header_path_iconv= cf_cv_library_path_iconv= -echo "${as_me:-configure}:7632: testing Starting FIND_LINKAGE(iconv,) ..." 1>&5 +echo "${as_me:-configure}:9439: testing Starting FIND_LINKAGE(iconv,) ..." 1>&5 cf_save_LIBS="$LIBS" -cat >conftest.$ac_ext <<_ACEOF -#line 7637 "configure" +cat >"conftest.$ac_ext" <<_ACEOF +#line 9444 "configure" #include "confdefs.h" #include <stdlib.h> @@ -7652,18 +9459,18 @@ main (void) return 0; } _ACEOF -rm -f conftest.$ac_objext conftest$ac_exeext -if { (eval echo "$as_me:7656: \"$ac_link\"") >&5 +rm -f "conftest.$ac_objext" "conftest$ac_exeext" +if { (eval echo "$as_me:9463: \"$ac_link\"") >&5 (eval $ac_link) 2>&5 ac_status=$? - echo "$as_me:7659: \$? = $ac_status" >&5 - (exit $ac_status); } && - { ac_try='test -s conftest$ac_exeext' - { (eval echo "$as_me:7662: \"$ac_try\"") >&5 + echo "$as_me:9466: \$? = $ac_status" >&5 + (exit "$ac_status"); } && + { ac_try='test -s "conftest$ac_exeext"' + { (eval echo "$as_me:9469: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? - echo "$as_me:7665: \$? = $ac_status" >&5 - (exit $ac_status); }; }; then + echo "$as_me:9472: \$? = $ac_status" >&5 + (exit "$ac_status"); }; }; then cf_cv_find_linkage_iconv=yes cf_cv_header_path_iconv=/usr/include @@ -7671,12 +9478,12 @@ if { (eval echo "$as_me:7656: \"$ac_link\"") >&5 else echo "$as_me: failed program was:" >&5 -cat conftest.$ac_ext >&5 +cat "conftest.$ac_ext" >&5 LIBS="-liconv $cf_save_LIBS" -cat >conftest.$ac_ext <<_ACEOF -#line 7679 "configure" +cat >"conftest.$ac_ext" <<_ACEOF +#line 9486 "configure" #include "confdefs.h" #include <stdlib.h> @@ -7694,18 +9501,18 @@ main (void) return 0; } _ACEOF -rm -f conftest.$ac_objext conftest$ac_exeext -if { (eval echo "$as_me:7698: \"$ac_link\"") >&5 +rm -f "conftest.$ac_objext" "conftest$ac_exeext" +if { (eval echo "$as_me:9505: \"$ac_link\"") >&5 (eval $ac_link) 2>&5 ac_status=$? - echo "$as_me:7701: \$? = $ac_status" >&5 - (exit $ac_status); } && - { ac_try='test -s conftest$ac_exeext' - { (eval echo "$as_me:7704: \"$ac_try\"") >&5 + echo "$as_me:9508: \$? = $ac_status" >&5 + (exit "$ac_status"); } && + { ac_try='test -s "conftest$ac_exeext"' + { (eval echo "$as_me:9511: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? - echo "$as_me:7707: \$? = $ac_status" >&5 - (exit $ac_status); }; }; then + echo "$as_me:9514: \$? = $ac_status" >&5 + (exit "$ac_status"); }; }; then cf_cv_find_linkage_iconv=yes cf_cv_header_path_iconv=/usr/include @@ -7714,16 +9521,16 @@ if { (eval echo "$as_me:7698: \"$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_iconv=no LIBS="$cf_save_LIBS" test -n "$verbose" && echo " find linkage for iconv library" 1>&6 -echo "${as_me:-configure}:7724: testing find linkage for iconv library ..." 1>&5 +echo "${as_me:-configure}:9531: testing find linkage for iconv library ..." 1>&5 -echo "${as_me:-configure}:7726: testing Searching for headers in FIND_LINKAGE(iconv,) ..." 1>&5 +echo "${as_me:-configure}:9533: testing Searching for headers in FIND_LINKAGE(iconv,) ..." 1>&5 cf_save_CPPFLAGS="$CPPFLAGS" cf_test_CPPFLAGS="$CPPFLAGS" @@ -7735,7 +9542,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$,,'` @@ -7743,11 +9550,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/iconv && cf_search="$cf_search $cf_header_path/include/iconv" - test -d $cf_header_path/include/iconv/include && cf_search="$cf_search $cf_header_path/include/iconv/include" - test -d $cf_header_path/iconv/include && cf_search="$cf_search $cf_header_path/iconv/include" - test -d $cf_header_path/iconv/include/iconv && cf_search="$cf_search $cf_header_path/iconv/include/iconv" + test -d "$cf_header_path/include" && cf_search="$cf_search $cf_header_path/include" + test -d "$cf_header_path/include/iconv" && cf_search="$cf_search $cf_header_path/include/iconv" + test -d "$cf_header_path/include/iconv/include" && cf_search="$cf_search $cf_header_path/include/iconv/include" + test -d "$cf_header_path/iconv/include" && cf_search="$cf_search $cf_header_path/iconv/include" + test -d "$cf_header_path/iconv/include/iconv" && cf_search="$cf_search $cf_header_path/iconv/include/iconv" } cf_header_path_list="$cf_header_path_list $cf_search" @@ -7764,11 +9571,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/iconv && cf_search="$cf_search $prefix/include/iconv" - test -d $prefix/include/iconv/include && cf_search="$cf_search $prefix/include/iconv/include" - test -d $prefix/iconv/include && cf_search="$cf_search $prefix/iconv/include" - test -d $prefix/iconv/include/iconv && cf_search="$cf_search $prefix/iconv/include/iconv" + test -d "$prefix/include" && cf_search="$cf_search $prefix/include" + test -d "$prefix/include/iconv" && cf_search="$cf_search $prefix/include/iconv" + test -d "$prefix/include/iconv/include" && cf_search="$cf_search $prefix/include/iconv/include" + test -d "$prefix/iconv/include" && cf_search="$cf_search $prefix/iconv/include" + test -d "$prefix/iconv/include/iconv" && cf_search="$cf_search $prefix/iconv/include/iconv" } for cf_subdir_prefix in \ @@ -7782,13 +9589,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/iconv && cf_search="$cf_search $cf_subdir_prefix/include/iconv" - test -d $cf_subdir_prefix/include/iconv/include && cf_search="$cf_search $cf_subdir_prefix/include/iconv/include" - test -d $cf_subdir_prefix/iconv/include && cf_search="$cf_search $cf_subdir_prefix/iconv/include" - test -d $cf_subdir_prefix/iconv/include/iconv && cf_search="$cf_search $cf_subdir_prefix/iconv/include/iconv" + test -d "$cf_subdir_prefix/include" && cf_search="$cf_search $cf_subdir_prefix/include" + test -d "$cf_subdir_prefix/include/iconv" && cf_search="$cf_search $cf_subdir_prefix/include/iconv" + test -d "$cf_subdir_prefix/include/iconv/include" && cf_search="$cf_search $cf_subdir_prefix/include/iconv/include" + test -d "$cf_subdir_prefix/iconv/include" && cf_search="$cf_search $cf_subdir_prefix/iconv/include" + test -d "$cf_subdir_prefix/iconv/include/iconv" && cf_search="$cf_search $cf_subdir_prefix/iconv/include/iconv" } done @@ -7796,33 +9603,33 @@ done test "$includedir" != NONE && \ test "$includedir" != "/usr/include" && \ test -d "$includedir" && { - test -d $includedir && cf_search="$cf_search $includedir" - test -d $includedir/iconv && cf_search="$cf_search $includedir/iconv" + test -d "$includedir" && cf_search="$cf_search $includedir" + test -d "$includedir/iconv" && cf_search="$cf_search $includedir/iconv" } test "$oldincludedir" != NONE && \ test "$oldincludedir" != "/usr/include" && \ test -d "$oldincludedir" && { - test -d $oldincludedir && cf_search="$cf_search $oldincludedir" - test -d $oldincludedir/iconv && cf_search="$cf_search $oldincludedir/iconv" + test -d "$oldincludedir" && cf_search="$cf_search $oldincludedir" + test -d "$oldincludedir/iconv" && cf_search="$cf_search $oldincludedir/iconv" } cf_search="$cf_search $cf_header_path_list" for cf_cv_header_path_iconv in $cf_search do - if test -d $cf_cv_header_path_iconv ; then + if test -d "$cf_cv_header_path_iconv" ; then test -n "$verbose" && echo " ... testing $cf_cv_header_path_iconv" 1>&6 -echo "${as_me:-configure}:7817: testing ... testing $cf_cv_header_path_iconv ..." 1>&5 +echo "${as_me:-configure}:9624: testing ... testing $cf_cv_header_path_iconv ..." 1>&5 CPPFLAGS="$cf_save_CPPFLAGS" test -n "$CPPFLAGS" && CPPFLAGS="$CPPFLAGS " CPPFLAGS="${CPPFLAGS}-I$cf_cv_header_path_iconv" - cat >conftest.$ac_ext <<_ACEOF -#line 7825 "configure" + cat >"conftest.$ac_ext" <<_ACEOF +#line 9632 "configure" #include "confdefs.h" #include <stdlib.h> @@ -7840,40 +9647,40 @@ main (void) return 0; } _ACEOF -rm -f conftest.$ac_objext -if { (eval echo "$as_me:7844: \"$ac_compile\"") >&5 +rm -f "conftest.$ac_objext" +if { (eval echo "$as_me:9651: \"$ac_compile\"") >&5 (eval $ac_compile) 2>&5 ac_status=$? - echo "$as_me:7847: \$? = $ac_status" >&5 - (exit $ac_status); } && - { ac_try='test -s conftest.$ac_objext' - { (eval echo "$as_me:7850: \"$ac_try\"") >&5 + echo "$as_me:9654: \$? = $ac_status" >&5 + (exit "$ac_status"); } && + { ac_try='test -s "conftest.$ac_objext"' + { (eval echo "$as_me:9657: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? - echo "$as_me:7853: \$? = $ac_status" >&5 - (exit $ac_status); }; }; then + echo "$as_me:9660: \$? = $ac_status" >&5 + (exit "$ac_status"); }; }; then test -n "$verbose" && echo " ... found iconv headers in $cf_cv_header_path_iconv" 1>&6 -echo "${as_me:-configure}:7858: testing ... found iconv headers in $cf_cv_header_path_iconv ..." 1>&5 +echo "${as_me:-configure}:9665: testing ... found iconv headers in $cf_cv_header_path_iconv ..." 1>&5 cf_cv_find_linkage_iconv=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_iconv" = maybe ; then -echo "${as_me:-configure}:7876: testing Searching for iconv library in FIND_LINKAGE(iconv,) ..." 1>&5 +echo "${as_me:-configure}:9683: testing Searching for iconv library in FIND_LINKAGE(iconv,) ..." 1>&5 cf_save_LIBS="$LIBS" cf_save_LDFLAGS="$LDFLAGS" @@ -7885,7 +9692,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$,,'` @@ -7893,11 +9700,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/iconv && cf_search="$cf_search $cf_library_path/lib/iconv" - test -d $cf_library_path/lib/iconv/lib && cf_search="$cf_search $cf_library_path/lib/iconv/lib" - test -d $cf_library_path/iconv/lib && cf_search="$cf_search $cf_library_path/iconv/lib" - test -d $cf_library_path/iconv/lib/iconv && cf_search="$cf_search $cf_library_path/iconv/lib/iconv" + test -d "$cf_library_path/lib" && cf_search="$cf_search $cf_library_path/lib" + test -d "$cf_library_path/lib/iconv" && cf_search="$cf_search $cf_library_path/lib/iconv" + test -d "$cf_library_path/lib/iconv/lib" && cf_search="$cf_search $cf_library_path/lib/iconv/lib" + test -d "$cf_library_path/iconv/lib" && cf_search="$cf_search $cf_library_path/iconv/lib" + test -d "$cf_library_path/iconv/lib/iconv" && cf_search="$cf_search $cf_library_path/iconv/lib/iconv" } cf_library_path_list="$cf_library_path_list $cf_search" @@ -7912,11 +9719,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/iconv && cf_search="$cf_search $prefix/lib/iconv" - test -d $prefix/lib/iconv/lib && cf_search="$cf_search $prefix/lib/iconv/lib" - test -d $prefix/iconv/lib && cf_search="$cf_search $prefix/iconv/lib" - test -d $prefix/iconv/lib/iconv && cf_search="$cf_search $prefix/iconv/lib/iconv" + test -d "$prefix/lib" && cf_search="$cf_search $prefix/lib" + test -d "$prefix/lib/iconv" && cf_search="$cf_search $prefix/lib/iconv" + test -d "$prefix/lib/iconv/lib" && cf_search="$cf_search $prefix/lib/iconv/lib" + test -d "$prefix/iconv/lib" && cf_search="$cf_search $prefix/iconv/lib" + test -d "$prefix/iconv/lib/iconv" && cf_search="$cf_search $prefix/iconv/lib/iconv" } for cf_subdir_prefix in \ @@ -7930,13 +9737,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/iconv && cf_search="$cf_search $cf_subdir_prefix/lib/iconv" - test -d $cf_subdir_prefix/lib/iconv/lib && cf_search="$cf_search $cf_subdir_prefix/lib/iconv/lib" - test -d $cf_subdir_prefix/iconv/lib && cf_search="$cf_search $cf_subdir_prefix/iconv/lib" - test -d $cf_subdir_prefix/iconv/lib/iconv && cf_search="$cf_search $cf_subdir_prefix/iconv/lib/iconv" + test -d "$cf_subdir_prefix/lib" && cf_search="$cf_search $cf_subdir_prefix/lib" + test -d "$cf_subdir_prefix/lib/iconv" && cf_search="$cf_search $cf_subdir_prefix/lib/iconv" + test -d "$cf_subdir_prefix/lib/iconv/lib" && cf_search="$cf_search $cf_subdir_prefix/lib/iconv/lib" + test -d "$cf_subdir_prefix/iconv/lib" && cf_search="$cf_search $cf_subdir_prefix/iconv/lib" + test -d "$cf_subdir_prefix/iconv/lib/iconv" && cf_search="$cf_search $cf_subdir_prefix/iconv/lib/iconv" } done @@ -7945,16 +9752,16 @@ cf_search="$cf_library_path_list $cf_search" for cf_cv_library_path_iconv in $cf_search do - if test -d $cf_cv_library_path_iconv ; then + if test -d "$cf_cv_library_path_iconv" ; then test -n "$verbose" && echo " ... testing $cf_cv_library_path_iconv" 1>&6 -echo "${as_me:-configure}:7951: testing ... testing $cf_cv_library_path_iconv ..." 1>&5 +echo "${as_me:-configure}:9758: testing ... testing $cf_cv_library_path_iconv ..." 1>&5 CPPFLAGS="$cf_test_CPPFLAGS" LIBS="-liconv $cf_save_LIBS" LDFLAGS="$cf_save_LDFLAGS -L$cf_cv_library_path_iconv" - cat >conftest.$ac_ext <<_ACEOF -#line 7957 "configure" + cat >"conftest.$ac_ext" <<_ACEOF +#line 9764 "configure" #include "confdefs.h" #include <stdlib.h> @@ -7972,36 +9779,36 @@ main (void) return 0; } _ACEOF -rm -f conftest.$ac_objext conftest$ac_exeext -if { (eval echo "$as_me:7976: \"$ac_link\"") >&5 +rm -f "conftest.$ac_objext" "conftest$ac_exeext" +if { (eval echo "$as_me:9783: \"$ac_link\"") >&5 (eval $ac_link) 2>&5 ac_status=$? - echo "$as_me:7979: \$? = $ac_status" >&5 - (exit $ac_status); } && - { ac_try='test -s conftest$ac_exeext' - { (eval echo "$as_me:7982: \"$ac_try\"") >&5 + echo "$as_me:9786: \$? = $ac_status" >&5 + (exit "$ac_status"); } && + { ac_try='test -s "conftest$ac_exeext"' + { (eval echo "$as_me:9789: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? - echo "$as_me:7985: \$? = $ac_status" >&5 - (exit $ac_status); }; }; then + echo "$as_me:9792: \$? = $ac_status" >&5 + (exit "$ac_status"); }; }; then test -n "$verbose" && echo " ... found iconv library in $cf_cv_library_path_iconv" 1>&6 -echo "${as_me:-configure}:7990: testing ... found iconv library in $cf_cv_library_path_iconv ..." 1>&5 +echo "${as_me:-configure}:9797: testing ... found iconv library in $cf_cv_library_path_iconv ..." 1>&5 cf_cv_find_linkage_iconv=yes cf_cv_library_file_iconv="-liconv" 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" @@ -8013,10 +9820,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" @@ -8027,7 +9834,7 @@ am_cv_func_iconv="no, consider installing GNU libiconv" fi fi -echo "$as_me:8030: result: $am_cv_func_iconv" >&5 +echo "$as_me:9837: result: $am_cv_func_iconv" >&5 echo "${ECHO_T}$am_cv_func_iconv" >&6 if test "$am_cv_func_iconv" = yes; then @@ -8036,14 +9843,14 @@ cat >>confdefs.h <<\EOF #define HAVE_ICONV 1 EOF - echo "$as_me:8039: checking if the declaration of iconv() needs const." >&5 + echo "$as_me:9846: checking if the declaration of iconv() needs const." >&5 echo $ECHO_N "checking if the declaration of iconv() needs const.... $ECHO_C" >&6 if test "${am_cv_proto_iconv_const+set}" = set; then echo $ECHO_N "(cached) $ECHO_C" >&6 else - cat >conftest.$ac_ext <<_ACEOF -#line 8046 "configure" + cat >"conftest.$ac_ext" <<_ACEOF +#line 9853 "configure" #include "confdefs.h" #include <stdlib.h> @@ -8067,27 +9874,27 @@ main (void) return 0; } _ACEOF -rm -f conftest.$ac_objext -if { (eval echo "$as_me:8071: \"$ac_compile\"") >&5 +rm -f "conftest.$ac_objext" +if { (eval echo "$as_me:9878: \"$ac_compile\"") >&5 (eval $ac_compile) 2>&5 ac_status=$? - echo "$as_me:8074: \$? = $ac_status" >&5 - (exit $ac_status); } && - { ac_try='test -s conftest.$ac_objext' - { (eval echo "$as_me:8077: \"$ac_try\"") >&5 + echo "$as_me:9881: \$? = $ac_status" >&5 + (exit "$ac_status"); } && + { ac_try='test -s "conftest.$ac_objext"' + { (eval echo "$as_me:9884: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? - echo "$as_me:8080: \$? = $ac_status" >&5 - (exit $ac_status); }; }; then + echo "$as_me:9887: \$? = $ac_status" >&5 + (exit "$ac_status"); }; }; then am_cv_proto_iconv_const=no else echo "$as_me: failed program was:" >&5 -cat conftest.$ac_ext >&5 +cat "conftest.$ac_ext" >&5 am_cv_proto_iconv_const=yes fi -rm -f conftest.$ac_objext conftest.$ac_ext +rm -f "conftest.$ac_objext" "conftest.$ac_ext" fi -echo "$as_me:8090: result: $am_cv_proto_iconv_const" >&5 +echo "$as_me:9897: result: $am_cv_proto_iconv_const" >&5 echo "${ECHO_T}$am_cv_proto_iconv_const" >&6 if test "$am_cv_proto_iconv_const" = yes ; then @@ -8108,9 +9915,9 @@ EOF if test -n "$cf_cv_header_path_iconv" ; then for cf_add_incdir in $cf_cv_header_path_iconv 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 @@ -8131,8 +9938,8 @@ if test -n "$cf_cv_header_path_iconv" ; then test -n "$CPPFLAGS" && CPPFLAGS="$CPPFLAGS " CPPFLAGS="${CPPFLAGS}-I$cf_add_incdir" - cat >conftest.$ac_ext <<_ACEOF -#line 8135 "configure" + cat >"conftest.$ac_ext" <<_ACEOF +#line 9942 "configure" #include "confdefs.h" #include <stdio.h> int @@ -8143,25 +9950,25 @@ printf("Hello") return 0; } _ACEOF -rm -f conftest.$ac_objext -if { (eval echo "$as_me:8147: \"$ac_compile\"") >&5 +rm -f "conftest.$ac_objext" +if { (eval echo "$as_me:9954: \"$ac_compile\"") >&5 (eval $ac_compile) 2>&5 ac_status=$? - echo "$as_me:8150: \$? = $ac_status" >&5 - (exit $ac_status); } && - { ac_try='test -s conftest.$ac_objext' - { (eval echo "$as_me:8153: \"$ac_try\"") >&5 + echo "$as_me:9957: \$? = $ac_status" >&5 + (exit "$ac_status"); } && + { ac_try='test -s "conftest.$ac_objext"' + { (eval echo "$as_me:9960: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? - echo "$as_me:8156: \$? = $ac_status" >&5 - (exit $ac_status); }; }; then + echo "$as_me:9963: \$? = $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 @@ -8170,11 +9977,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}:8173: testing adding $cf_add_incdir to include-path ..." 1>&5 +echo "${as_me:-configure}:9980: 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 @@ -8193,9 +10000,9 @@ fi if test -n "$cf_cv_library_path_iconv" ; then for cf_add_libdir in $cf_cv_library_path_iconv 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 @@ -8209,7 +10016,7 @@ if test -n "$cf_cv_library_path_iconv" ; then if test "$cf_have_libdir" = no ; then test -n "$verbose" && echo " adding $cf_add_libdir to library-path" 1>&6 -echo "${as_me:-configure}:8212: testing adding $cf_add_libdir to library-path ..." 1>&5 +echo "${as_me:-configure}:10019: testing adding $cf_add_libdir to library-path ..." 1>&5 LDFLAGS="-L$cf_add_libdir $LDFLAGS" fi @@ -8220,47 +10027,47 @@ fi fi fi -echo "$as_me:8223: checking for nl_langinfo and CODESET" >&5 +echo "$as_me:10030: 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 8229 "configure" + cat >"conftest.$ac_ext" <<_ACEOF +#line 10036 "configure" #include "confdefs.h" #include <langinfo.h> int main (void) { -char* cs = nl_langinfo(CODESET); +char* cs = nl_langinfo(CODESET); (void)cs ; return 0; } _ACEOF -rm -f conftest.$ac_objext conftest$ac_exeext -if { (eval echo "$as_me:8241: \"$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:8244: \$? = $ac_status" >&5 - (exit $ac_status); } && - { ac_try='test -s conftest$ac_exeext' - { (eval echo "$as_me:8247: \"$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:8250: \$? = $ac_status" >&5 - (exit $ac_status); }; }; then + echo "$as_me:10057: \$? = $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:8261: result: $am_cv_langinfo_codeset" >&5 +echo "$as_me:10068: 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 @@ -8268,14 +10075,14 @@ EOF fi - if test $ac_cv_header_locale_h = yes; then - echo "$as_me:8272: checking for LC_MESSAGES" >&5 + if test "$ac_cv_header_locale_h" = yes; then + echo "$as_me:10079: checking for LC_MESSAGES" >&5 echo $ECHO_N "checking for LC_MESSAGES... $ECHO_C" >&6 if test "${am_cv_val_LC_MESSAGES+set}" = set; then echo $ECHO_N "(cached) $ECHO_C" >&6 else - cat >conftest.$ac_ext <<_ACEOF -#line 8278 "configure" + cat >"conftest.$ac_ext" <<_ACEOF +#line 10085 "configure" #include "confdefs.h" #include <locale.h> int @@ -8286,29 +10093,29 @@ return LC_MESSAGES return 0; } _ACEOF -rm -f conftest.$ac_objext conftest$ac_exeext -if { (eval echo "$as_me:8290: \"$ac_link\"") >&5 +rm -f "conftest.$ac_objext" "conftest$ac_exeext" +if { (eval echo "$as_me:10097: \"$ac_link\"") >&5 (eval $ac_link) 2>&5 ac_status=$? - echo "$as_me:8293: \$? = $ac_status" >&5 - (exit $ac_status); } && - { ac_try='test -s conftest$ac_exeext' - { (eval echo "$as_me:8296: \"$ac_try\"") >&5 + echo "$as_me:10100: \$? = $ac_status" >&5 + (exit "$ac_status"); } && + { ac_try='test -s "conftest$ac_exeext"' + { (eval echo "$as_me:10103: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? - echo "$as_me:8299: \$? = $ac_status" >&5 - (exit $ac_status); }; }; then + echo "$as_me:10106: \$? = $ac_status" >&5 + (exit "$ac_status"); }; }; then am_cv_val_LC_MESSAGES=yes else echo "$as_me: failed program was:" >&5 -cat conftest.$ac_ext >&5 +cat "conftest.$ac_ext" >&5 am_cv_val_LC_MESSAGES=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:8309: result: $am_cv_val_LC_MESSAGES" >&5 +echo "$as_me:10116: result: $am_cv_val_LC_MESSAGES" >&5 echo "${ECHO_T}$am_cv_val_LC_MESSAGES" >&6 - if test $am_cv_val_LC_MESSAGES = yes; then + if test "$am_cv_val_LC_MESSAGES" = yes; then cat >>confdefs.h <<\EOF #define HAVE_LC_MESSAGES 1 @@ -8316,7 +10123,7 @@ EOF fi fi - echo "$as_me:8319: checking whether NLS is requested" >&5 + echo "$as_me:10126: checking whether NLS is requested" >&5 echo $ECHO_N "checking whether NLS is requested... $ECHO_C" >&6 # Check whether --enable-nls or --disable-nls was given. @@ -8326,7 +10133,7 @@ if test "${enable_nls+set}" = set; then else USE_NLS=no fi; - echo "$as_me:8329: result: $USE_NLS" >&5 + echo "$as_me:10136: result: $USE_NLS" >&5 echo "${ECHO_T}$USE_NLS" >&6 BUILD_INCLUDED_LIBINTL=no @@ -8340,7 +10147,7 @@ cat >>confdefs.h <<\EOF #define ENABLE_NLS 1 EOF - echo "$as_me:8343: checking whether included gettext is requested" >&5 + echo "$as_me:10150: checking whether included gettext is requested" >&5 echo $ECHO_N "checking whether included gettext is requested... $ECHO_C" >&6 # Check whether --with-included-gettext or --without-included-gettext was given. @@ -8350,7 +10157,7 @@ if test "${with_included_gettext+set}" = set; then else nls_cv_force_use_gnu_gettext=no fi; - echo "$as_me:8353: result: $nls_cv_force_use_gnu_gettext" >&5 + echo "$as_me:10160: result: $nls_cv_force_use_gnu_gettext" >&5 echo "${ECHO_T}$nls_cv_force_use_gnu_gettext" >&6 nls_cv_use_gnu_gettext="$nls_cv_force_use_gnu_gettext" @@ -8363,7 +10170,7 @@ echo "${ECHO_T}$nls_cv_force_use_gnu_gettext" >&6 # Extract the first word of "msgfmt", so it can be a program name with args. set dummy msgfmt; ac_word=$2 -echo "$as_me:8366: checking for $ac_word" >&5 +echo "$as_me:10173: checking for $ac_word" >&5 echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6 if test "${ac_cv_path_MSGFMT+set}" = set; then echo $ECHO_N "(cached) $ECHO_C" >&6 @@ -8376,8 +10183,8 @@ else IFS="${IFS= }"; ac_save_ifs="$IFS"; IFS="${IFS}${PATH_SEPARATOR}" for ac_dir in $PATH; do test -z "$ac_dir" && ac_dir=. - if test -f $ac_dir/$ac_word$ac_exeext; then - if $ac_dir/$ac_word --statistics /dev/null >/dev/null 2>&1; then + if test -f "$ac_dir/$ac_word$ac_exeext" ; then + if "$ac_dir/$ac_word" --statistics /dev/null >/dev/null 2>&1; then ac_cv_path_MSGFMT="$ac_dir/$ac_word$ac_exeext" break fi @@ -8390,16 +10197,16 @@ esac fi MSGFMT="$ac_cv_path_MSGFMT" if test "$MSGFMT" != ":"; then - echo "$as_me:8393: result: $MSGFMT" >&5 + echo "$as_me:10200: result: $MSGFMT" >&5 echo "${ECHO_T}$MSGFMT" >&6 else - echo "$as_me:8396: result: no" >&5 + echo "$as_me:10203: result: no" >&5 echo "${ECHO_T}no" >&6 fi # Extract the first word of "gmsgfmt", so it can be a program name with args. set dummy gmsgfmt; ac_word=$2 -echo "$as_me:8402: checking for $ac_word" >&5 +echo "$as_me:10209: checking for $ac_word" >&5 echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6 if test "${ac_cv_path_GMSGFMT+set}" = set; then echo $ECHO_N "(cached) $ECHO_C" >&6 @@ -8416,7 +10223,7 @@ for ac_dir in $ac_dummy; do test -z "$ac_dir" && ac_dir=. if $as_executable_p "$ac_dir/$ac_word"; then ac_cv_path_GMSGFMT="$ac_dir/$ac_word" - echo "$as_me:8419: found $ac_dir/$ac_word" >&5 + echo "$as_me:10226: found $ac_dir/$ac_word" >&5 break fi done @@ -8428,17 +10235,17 @@ fi GMSGFMT=$ac_cv_path_GMSGFMT if test -n "$GMSGFMT"; then - echo "$as_me:8431: result: $GMSGFMT" >&5 + echo "$as_me:10238: result: $GMSGFMT" >&5 echo "${ECHO_T}$GMSGFMT" >&6 else - echo "$as_me:8434: result: no" >&5 + echo "$as_me:10241: result: no" >&5 echo "${ECHO_T}no" >&6 fi # Extract the first word of "xgettext", so it can be a program name with args. set dummy xgettext; ac_word=$2 -echo "$as_me:8441: checking for $ac_word" >&5 +echo "$as_me:10248: checking for $ac_word" >&5 echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6 if test "${ac_cv_path_XGETTEXT+set}" = set; then echo $ECHO_N "(cached) $ECHO_C" >&6 @@ -8451,8 +10258,8 @@ else IFS="${IFS= }"; ac_save_ifs="$IFS"; IFS="${IFS}${PATH_SEPARATOR}" for ac_dir in $PATH; do test -z "$ac_dir" && ac_dir=. - if test -f $ac_dir/$ac_word$ac_exeext; then - if $ac_dir/$ac_word --omit-header /dev/null >/dev/null 2>&1; then + if test -f "$ac_dir/$ac_word$ac_exeext" ; then + if "$ac_dir/$ac_word" --omit-header /dev/null >/dev/null 2>&1; then ac_cv_path_XGETTEXT="$ac_dir/$ac_word$ac_exeext" break fi @@ -8465,10 +10272,10 @@ esac fi XGETTEXT="$ac_cv_path_XGETTEXT" if test "$XGETTEXT" != ":"; then - echo "$as_me:8468: result: $XGETTEXT" >&5 + echo "$as_me:10275: result: $XGETTEXT" >&5 echo "${ECHO_T}$XGETTEXT" >&6 else - echo "$as_me:8471: result: no" >&5 + echo "$as_me:10278: result: no" >&5 echo "${ECHO_T}no" >&6 fi @@ -8483,19 +10290,19 @@ cf_new_extra_cppflags= for cf_add_cflags in -DIGNORE_MSGFMT_HACK 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" @@ -8514,7 +10321,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/=.*//'` @@ -8544,7 +10351,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}" \ @@ -8578,19 +10385,19 @@ fi cf_save_LIBS_1="$LIBS" -cf_add_libs="$LIBICONV" -# Filter out duplicates - this happens with badly-designed ".pc" files... -for cf_add_1lib in $LIBS -do - for cf_add_2lib in $cf_add_libs - do - if test "x$cf_add_1lib" = "x$cf_add_2lib" - then +cf_add_libs="$LIBS" +# reverse order +cf_add_0lib= +for cf_add_1lib in $LIBICONV; do cf_add_0lib="$cf_add_1lib $cf_add_0lib"; done +# filter duplicates +for cf_add_1lib in $cf_add_0lib; do + for cf_add_2lib in $cf_add_libs; do + if test "x$cf_add_1lib" = "x$cf_add_2lib"; then cf_add_1lib= break fi done - test -n "$cf_add_1lib" && cf_add_libs="$cf_add_libs $cf_add_1lib" + test -n "$cf_add_1lib" && cf_add_libs="$cf_add_1lib $cf_add_libs" done LIBS="$cf_add_libs" @@ -8599,12 +10406,12 @@ LIBS="$cf_add_libs" cf_cv_header_path_intl= cf_cv_library_path_intl= -echo "${as_me:-configure}:8602: testing Starting FIND_LINKAGE(intl,) ..." 1>&5 +echo "${as_me:-configure}:10409: testing Starting FIND_LINKAGE(intl,) ..." 1>&5 cf_save_LIBS="$LIBS" -cat >conftest.$ac_ext <<_ACEOF -#line 8607 "configure" +cat >"conftest.$ac_ext" <<_ACEOF +#line 10414 "configure" #include "confdefs.h" #include <libintl.h> @@ -8625,18 +10432,18 @@ main (void) return 0; } _ACEOF -rm -f conftest.$ac_objext conftest$ac_exeext -if { (eval echo "$as_me:8629: \"$ac_link\"") >&5 +rm -f "conftest.$ac_objext" "conftest$ac_exeext" +if { (eval echo "$as_me:10436: \"$ac_link\"") >&5 (eval $ac_link) 2>&5 ac_status=$? - echo "$as_me:8632: \$? = $ac_status" >&5 - (exit $ac_status); } && - { ac_try='test -s conftest$ac_exeext' - { (eval echo "$as_me:8635: \"$ac_try\"") >&5 + echo "$as_me:10439: \$? = $ac_status" >&5 + (exit "$ac_status"); } && + { ac_try='test -s "conftest$ac_exeext"' + { (eval echo "$as_me:10442: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? - echo "$as_me:8638: \$? = $ac_status" >&5 - (exit $ac_status); }; }; then + echo "$as_me:10445: \$? = $ac_status" >&5 + (exit "$ac_status"); }; }; then cf_cv_find_linkage_intl=yes cf_cv_header_path_intl=/usr/include @@ -8644,12 +10451,12 @@ if { (eval echo "$as_me:8629: \"$ac_link\"") >&5 else echo "$as_me: failed program was:" >&5 -cat conftest.$ac_ext >&5 +cat "conftest.$ac_ext" >&5 LIBS="-lintl $cf_save_LIBS" -cat >conftest.$ac_ext <<_ACEOF -#line 8652 "configure" +cat >"conftest.$ac_ext" <<_ACEOF +#line 10459 "configure" #include "confdefs.h" #include <libintl.h> @@ -8670,18 +10477,18 @@ main (void) return 0; } _ACEOF -rm -f conftest.$ac_objext conftest$ac_exeext -if { (eval echo "$as_me:8674: \"$ac_link\"") >&5 +rm -f "conftest.$ac_objext" "conftest$ac_exeext" +if { (eval echo "$as_me:10481: \"$ac_link\"") >&5 (eval $ac_link) 2>&5 ac_status=$? - echo "$as_me:8677: \$? = $ac_status" >&5 - (exit $ac_status); } && - { ac_try='test -s conftest$ac_exeext' - { (eval echo "$as_me:8680: \"$ac_try\"") >&5 + echo "$as_me:10484: \$? = $ac_status" >&5 + (exit "$ac_status"); } && + { ac_try='test -s "conftest$ac_exeext"' + { (eval echo "$as_me:10487: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? - echo "$as_me:8683: \$? = $ac_status" >&5 - (exit $ac_status); }; }; then + echo "$as_me:10490: \$? = $ac_status" >&5 + (exit "$ac_status"); }; }; then cf_cv_find_linkage_intl=yes cf_cv_header_path_intl=/usr/include @@ -8690,16 +10497,16 @@ if { (eval echo "$as_me:8674: \"$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_intl=no LIBS="$cf_save_LIBS" test -n "$verbose" && echo " find linkage for intl library" 1>&6 -echo "${as_me:-configure}:8700: testing find linkage for intl library ..." 1>&5 +echo "${as_me:-configure}:10507: testing find linkage for intl library ..." 1>&5 -echo "${as_me:-configure}:8702: testing Searching for headers in FIND_LINKAGE(intl,) ..." 1>&5 +echo "${as_me:-configure}:10509: testing Searching for headers in FIND_LINKAGE(intl,) ..." 1>&5 cf_save_CPPFLAGS="$CPPFLAGS" cf_test_CPPFLAGS="$CPPFLAGS" @@ -8711,7 +10518,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$,,'` @@ -8719,11 +10526,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/intl && cf_search="$cf_search $cf_header_path/include/intl" - test -d $cf_header_path/include/intl/include && cf_search="$cf_search $cf_header_path/include/intl/include" - test -d $cf_header_path/intl/include && cf_search="$cf_search $cf_header_path/intl/include" - test -d $cf_header_path/intl/include/intl && cf_search="$cf_search $cf_header_path/intl/include/intl" + test -d "$cf_header_path/include" && cf_search="$cf_search $cf_header_path/include" + test -d "$cf_header_path/include/intl" && cf_search="$cf_search $cf_header_path/include/intl" + test -d "$cf_header_path/include/intl/include" && cf_search="$cf_search $cf_header_path/include/intl/include" + test -d "$cf_header_path/intl/include" && cf_search="$cf_search $cf_header_path/intl/include" + test -d "$cf_header_path/intl/include/intl" && cf_search="$cf_search $cf_header_path/intl/include/intl" } cf_header_path_list="$cf_header_path_list $cf_search" @@ -8740,11 +10547,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/intl && cf_search="$cf_search $prefix/include/intl" - test -d $prefix/include/intl/include && cf_search="$cf_search $prefix/include/intl/include" - test -d $prefix/intl/include && cf_search="$cf_search $prefix/intl/include" - test -d $prefix/intl/include/intl && cf_search="$cf_search $prefix/intl/include/intl" + test -d "$prefix/include" && cf_search="$cf_search $prefix/include" + test -d "$prefix/include/intl" && cf_search="$cf_search $prefix/include/intl" + test -d "$prefix/include/intl/include" && cf_search="$cf_search $prefix/include/intl/include" + test -d "$prefix/intl/include" && cf_search="$cf_search $prefix/intl/include" + test -d "$prefix/intl/include/intl" && cf_search="$cf_search $prefix/intl/include/intl" } for cf_subdir_prefix in \ @@ -8758,13 +10565,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/intl && cf_search="$cf_search $cf_subdir_prefix/include/intl" - test -d $cf_subdir_prefix/include/intl/include && cf_search="$cf_search $cf_subdir_prefix/include/intl/include" - test -d $cf_subdir_prefix/intl/include && cf_search="$cf_search $cf_subdir_prefix/intl/include" - test -d $cf_subdir_prefix/intl/include/intl && cf_search="$cf_search $cf_subdir_prefix/intl/include/intl" + test -d "$cf_subdir_prefix/include" && cf_search="$cf_search $cf_subdir_prefix/include" + test -d "$cf_subdir_prefix/include/intl" && cf_search="$cf_search $cf_subdir_prefix/include/intl" + test -d "$cf_subdir_prefix/include/intl/include" && cf_search="$cf_search $cf_subdir_prefix/include/intl/include" + test -d "$cf_subdir_prefix/intl/include" && cf_search="$cf_search $cf_subdir_prefix/intl/include" + test -d "$cf_subdir_prefix/intl/include/intl" && cf_search="$cf_search $cf_subdir_prefix/intl/include/intl" } done @@ -8772,33 +10579,33 @@ done test "$includedir" != NONE && \ test "$includedir" != "/usr/include" && \ test -d "$includedir" && { - test -d $includedir && cf_search="$cf_search $includedir" - test -d $includedir/intl && cf_search="$cf_search $includedir/intl" + test -d "$includedir" && cf_search="$cf_search $includedir" + test -d "$includedir/intl" && cf_search="$cf_search $includedir/intl" } test "$oldincludedir" != NONE && \ test "$oldincludedir" != "/usr/include" && \ test -d "$oldincludedir" && { - test -d $oldincludedir && cf_search="$cf_search $oldincludedir" - test -d $oldincludedir/intl && cf_search="$cf_search $oldincludedir/intl" + test -d "$oldincludedir" && cf_search="$cf_search $oldincludedir" + test -d "$oldincludedir/intl" && cf_search="$cf_search $oldincludedir/intl" } cf_search="$cf_search $cf_header_path_list" for cf_cv_header_path_intl in $cf_search do - if test -d $cf_cv_header_path_intl ; then + if test -d "$cf_cv_header_path_intl" ; then test -n "$verbose" && echo " ... testing $cf_cv_header_path_intl" 1>&6 -echo "${as_me:-configure}:8793: testing ... testing $cf_cv_header_path_intl ..." 1>&5 +echo "${as_me:-configure}:10600: testing ... testing $cf_cv_header_path_intl ..." 1>&5 CPPFLAGS="$cf_save_CPPFLAGS" test -n "$CPPFLAGS" && CPPFLAGS="$CPPFLAGS " CPPFLAGS="${CPPFLAGS}-I$cf_cv_header_path_intl" - cat >conftest.$ac_ext <<_ACEOF -#line 8801 "configure" + cat >"conftest.$ac_ext" <<_ACEOF +#line 10608 "configure" #include "confdefs.h" #include <libintl.h> @@ -8819,40 +10626,40 @@ main (void) return 0; } _ACEOF -rm -f conftest.$ac_objext -if { (eval echo "$as_me:8823: \"$ac_compile\"") >&5 +rm -f "conftest.$ac_objext" +if { (eval echo "$as_me:10630: \"$ac_compile\"") >&5 (eval $ac_compile) 2>&5 ac_status=$? - echo "$as_me:8826: \$? = $ac_status" >&5 - (exit $ac_status); } && - { ac_try='test -s conftest.$ac_objext' - { (eval echo "$as_me:8829: \"$ac_try\"") >&5 + echo "$as_me:10633: \$? = $ac_status" >&5 + (exit "$ac_status"); } && + { ac_try='test -s "conftest.$ac_objext"' + { (eval echo "$as_me:10636: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? - echo "$as_me:8832: \$? = $ac_status" >&5 - (exit $ac_status); }; }; then + echo "$as_me:10639: \$? = $ac_status" >&5 + (exit "$ac_status"); }; }; then test -n "$verbose" && echo " ... found intl headers in $cf_cv_header_path_intl" 1>&6 -echo "${as_me:-configure}:8837: testing ... found intl headers in $cf_cv_header_path_intl ..." 1>&5 +echo "${as_me:-configure}:10644: testing ... found intl headers in $cf_cv_header_path_intl ..." 1>&5 cf_cv_find_linkage_intl=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_intl" = maybe ; then -echo "${as_me:-configure}:8855: testing Searching for intl library in FIND_LINKAGE(intl,) ..." 1>&5 +echo "${as_me:-configure}:10662: testing Searching for intl library in FIND_LINKAGE(intl,) ..." 1>&5 cf_save_LIBS="$LIBS" cf_save_LDFLAGS="$LDFLAGS" @@ -8864,7 +10671,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$,,'` @@ -8872,11 +10679,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/intl && cf_search="$cf_search $cf_library_path/lib/intl" - test -d $cf_library_path/lib/intl/lib && cf_search="$cf_search $cf_library_path/lib/intl/lib" - test -d $cf_library_path/intl/lib && cf_search="$cf_search $cf_library_path/intl/lib" - test -d $cf_library_path/intl/lib/intl && cf_search="$cf_search $cf_library_path/intl/lib/intl" + test -d "$cf_library_path/lib" && cf_search="$cf_search $cf_library_path/lib" + test -d "$cf_library_path/lib/intl" && cf_search="$cf_search $cf_library_path/lib/intl" + test -d "$cf_library_path/lib/intl/lib" && cf_search="$cf_search $cf_library_path/lib/intl/lib" + test -d "$cf_library_path/intl/lib" && cf_search="$cf_search $cf_library_path/intl/lib" + test -d "$cf_library_path/intl/lib/intl" && cf_search="$cf_search $cf_library_path/intl/lib/intl" } cf_library_path_list="$cf_library_path_list $cf_search" @@ -8891,11 +10698,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/intl && cf_search="$cf_search $prefix/lib/intl" - test -d $prefix/lib/intl/lib && cf_search="$cf_search $prefix/lib/intl/lib" - test -d $prefix/intl/lib && cf_search="$cf_search $prefix/intl/lib" - test -d $prefix/intl/lib/intl && cf_search="$cf_search $prefix/intl/lib/intl" + test -d "$prefix/lib" && cf_search="$cf_search $prefix/lib" + test -d "$prefix/lib/intl" && cf_search="$cf_search $prefix/lib/intl" + test -d "$prefix/lib/intl/lib" && cf_search="$cf_search $prefix/lib/intl/lib" + test -d "$prefix/intl/lib" && cf_search="$cf_search $prefix/intl/lib" + test -d "$prefix/intl/lib/intl" && cf_search="$cf_search $prefix/intl/lib/intl" } for cf_subdir_prefix in \ @@ -8909,13 +10716,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/intl && cf_search="$cf_search $cf_subdir_prefix/lib/intl" - test -d $cf_subdir_prefix/lib/intl/lib && cf_search="$cf_search $cf_subdir_prefix/lib/intl/lib" - test -d $cf_subdir_prefix/intl/lib && cf_search="$cf_search $cf_subdir_prefix/intl/lib" - test -d $cf_subdir_prefix/intl/lib/intl && cf_search="$cf_search $cf_subdir_prefix/intl/lib/intl" + test -d "$cf_subdir_prefix/lib" && cf_search="$cf_search $cf_subdir_prefix/lib" + test -d "$cf_subdir_prefix/lib/intl" && cf_search="$cf_search $cf_subdir_prefix/lib/intl" + test -d "$cf_subdir_prefix/lib/intl/lib" && cf_search="$cf_search $cf_subdir_prefix/lib/intl/lib" + test -d "$cf_subdir_prefix/intl/lib" && cf_search="$cf_search $cf_subdir_prefix/intl/lib" + test -d "$cf_subdir_prefix/intl/lib/intl" && cf_search="$cf_search $cf_subdir_prefix/intl/lib/intl" } done @@ -8924,16 +10731,16 @@ cf_search="$cf_library_path_list $cf_search" for cf_cv_library_path_intl in $cf_search do - if test -d $cf_cv_library_path_intl ; then + if test -d "$cf_cv_library_path_intl" ; then test -n "$verbose" && echo " ... testing $cf_cv_library_path_intl" 1>&6 -echo "${as_me:-configure}:8930: testing ... testing $cf_cv_library_path_intl ..." 1>&5 +echo "${as_me:-configure}:10737: testing ... testing $cf_cv_library_path_intl ..." 1>&5 CPPFLAGS="$cf_test_CPPFLAGS" LIBS="-lintl $cf_save_LIBS" LDFLAGS="$cf_save_LDFLAGS -L$cf_cv_library_path_intl" - cat >conftest.$ac_ext <<_ACEOF -#line 8936 "configure" + cat >"conftest.$ac_ext" <<_ACEOF +#line 10743 "configure" #include "confdefs.h" #include <libintl.h> @@ -8954,36 +10761,36 @@ main (void) return 0; } _ACEOF -rm -f conftest.$ac_objext conftest$ac_exeext -if { (eval echo "$as_me:8958: \"$ac_link\"") >&5 +rm -f "conftest.$ac_objext" "conftest$ac_exeext" +if { (eval echo "$as_me:10765: \"$ac_link\"") >&5 (eval $ac_link) 2>&5 ac_status=$? - echo "$as_me:8961: \$? = $ac_status" >&5 - (exit $ac_status); } && - { ac_try='test -s conftest$ac_exeext' - { (eval echo "$as_me:8964: \"$ac_try\"") >&5 + echo "$as_me:10768: \$? = $ac_status" >&5 + (exit "$ac_status"); } && + { ac_try='test -s "conftest$ac_exeext"' + { (eval echo "$as_me:10771: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? - echo "$as_me:8967: \$? = $ac_status" >&5 - (exit $ac_status); }; }; then + echo "$as_me:10774: \$? = $ac_status" >&5 + (exit "$ac_status"); }; }; then test -n "$verbose" && echo " ... found intl library in $cf_cv_library_path_intl" 1>&6 -echo "${as_me:-configure}:8972: testing ... found intl library in $cf_cv_library_path_intl ..." 1>&5 +echo "${as_me:-configure}:10779: testing ... found intl library in $cf_cv_library_path_intl ..." 1>&5 cf_cv_find_linkage_intl=yes cf_cv_library_file_intl="-lintl" 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" @@ -8995,10 +10802,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" @@ -9008,9 +10815,9 @@ else cf_cv_func_gettext=no fi - echo "$as_me:9011: checking for libintl.h and gettext()" >&5 + echo "$as_me:10818: checking for libintl.h and gettext()" >&5 echo $ECHO_N "checking for libintl.h and gettext()... $ECHO_C" >&6 - echo "$as_me:9013: result: $cf_cv_func_gettext" >&5 + echo "$as_me:10820: result: $cf_cv_func_gettext" >&5 echo "${ECHO_T}$cf_cv_func_gettext" >&6 LIBS="$cf_save_LIBS_1" @@ -9031,9 +10838,9 @@ EOF if test -n "$cf_cv_header_path_intl" ; then for cf_add_incdir in $cf_cv_header_path_intl 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 @@ -9054,8 +10861,8 @@ if test -n "$cf_cv_header_path_intl" ; then test -n "$CPPFLAGS" && CPPFLAGS="$CPPFLAGS " CPPFLAGS="${CPPFLAGS}-I$cf_add_incdir" - cat >conftest.$ac_ext <<_ACEOF -#line 9058 "configure" + cat >"conftest.$ac_ext" <<_ACEOF +#line 10865 "configure" #include "confdefs.h" #include <stdio.h> int @@ -9066,25 +10873,25 @@ printf("Hello") return 0; } _ACEOF -rm -f conftest.$ac_objext -if { (eval echo "$as_me:9070: \"$ac_compile\"") >&5 +rm -f "conftest.$ac_objext" +if { (eval echo "$as_me:10877: \"$ac_compile\"") >&5 (eval $ac_compile) 2>&5 ac_status=$? - echo "$as_me:9073: \$? = $ac_status" >&5 - (exit $ac_status); } && - { ac_try='test -s conftest.$ac_objext' - { (eval echo "$as_me:9076: \"$ac_try\"") >&5 + echo "$as_me:10880: \$? = $ac_status" >&5 + (exit "$ac_status"); } && + { ac_try='test -s "conftest.$ac_objext"' + { (eval echo "$as_me:10883: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? - echo "$as_me:9079: \$? = $ac_status" >&5 - (exit $ac_status); }; }; then + echo "$as_me:10886: \$? = $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 @@ -9093,11 +10900,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}:9096: testing adding $cf_add_incdir to include-path ..." 1>&5 +echo "${as_me:-configure}:10903: 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 @@ -9116,9 +10923,9 @@ fi if test -n "$cf_cv_library_path_intl" ; then for cf_add_libdir in $cf_cv_library_path_intl 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 @@ -9132,7 +10939,7 @@ if test -n "$cf_cv_library_path_intl" ; then if test "$cf_have_libdir" = no ; then test -n "$verbose" && echo " adding $cf_add_libdir to library-path" 1>&6 -echo "${as_me:-configure}:9135: testing adding $cf_add_libdir to library-path ..." 1>&5 +echo "${as_me:-configure}:10942: testing adding $cf_add_libdir to library-path ..." 1>&5 INTLLIBS="-L$cf_add_libdir $INTLLIBS" fi @@ -9148,65 +10955,65 @@ fi for ac_func in dcgettext do as_ac_var=`echo "ac_cv_func_$ac_func" | $as_tr_sh` -echo "$as_me:9151: checking for $ac_func" >&5 +echo "$as_me:10958: 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 9157 "configure" + cat >"conftest.$ac_ext" <<_ACEOF +#line 10964 "configure" #include "confdefs.h" -/* System header to define __stub macros and hopefully few prototypes, - which can conflict with char $ac_func (); below. */ -#include <assert.h> -/* Override any gcc2 internal prototype to avoid an error. */ +#define $ac_func autoconf_temporary +#include <limits.h> /* least-intrusive standard header which defines gcc2 __stub macros */ +#undef $ac_func + #ifdef __cplusplus extern "C" #endif + /* We use char because int might match the return type of a gcc2 builtin and then its argument prototype would still apply. */ -char $ac_func (); -char (*f) (); +char $ac_func (void); int main (void) { -/* The GNU C library defines this for functions which it implements + +/* The GNU C library defines stubs for functions which it implements to always fail with ENOSYS. Some functions are actually named something starting with __ and the normal name is an alias. */ #if defined (__stub_$ac_func) || defined (__stub___$ac_func) -choke me -#else -f = $ac_func; /* workaround for ICC 12.0.3 */ if (f == 0) return 1; +#error found stub for $ac_func #endif + return $ac_func (); ; return 0; } _ACEOF -rm -f conftest.$ac_objext conftest$ac_exeext -if { (eval echo "$as_me:9188: \"$ac_link\"") >&5 +rm -f "conftest.$ac_objext" "conftest$ac_exeext" +if { (eval echo "$as_me:10995: \"$ac_link\"") >&5 (eval $ac_link) 2>&5 ac_status=$? - echo "$as_me:9191: \$? = $ac_status" >&5 - (exit $ac_status); } && - { ac_try='test -s conftest$ac_exeext' - { (eval echo "$as_me:9194: \"$ac_try\"") >&5 + echo "$as_me:10998: \$? = $ac_status" >&5 + (exit "$ac_status"); } && + { ac_try='test -s "conftest$ac_exeext"' + { (eval echo "$as_me:11001: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? - echo "$as_me:9197: \$? = $ac_status" >&5 - (exit $ac_status); }; }; then + echo "$as_me:11004: \$? = $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:9207: 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:11014: result: `eval echo '${'"$as_ac_var"'}'`" >&5 +echo "${ECHO_T}`eval echo '${'"$as_ac_var"'}'`" >&6 +if test "`eval echo '${'"$as_ac_var"'}'`" = yes; then cat >>confdefs.h <<EOF #define `echo "HAVE_$ac_func" | $as_tr_cpp` 1 EOF @@ -9219,7 +11026,7 @@ done CATOBJEXT=.gmo fi elif test -z "$MSGFMT" || test -z "$XGETTEXT" ; then - { echo "$as_me:9222: WARNING: disabling NLS feature" >&5 + { echo "$as_me:11029: WARNING: disabling NLS feature" >&5 echo "$as_me: WARNING: disabling NLS feature" >&2;} sed -e /ENABLE_NLS/d confdefs.h >confdefs.tmp mv confdefs.tmp confdefs.h @@ -9242,7 +11049,7 @@ echo "$as_me: WARNING: disabling NLS feature" >&2;} if test "$nls_cv_use_gnu_gettext" != "no"; then CATOBJEXT=.gmo - if test -f $srcdir/intl/libintl.h ; then + if test -f "$srcdir/intl/libintl.h" ; then INTLOBJS="\$(GETTOBJS)" BUILD_INCLUDED_LIBINTL=yes USE_INCLUDED_LIBINTL=yes @@ -9250,7 +11057,7 @@ echo "$as_me: WARNING: disabling NLS feature" >&2;} LIBS=`echo " $LIBS " | sed -e 's/ -lintl / /' -e 's/^ //' -e 's/ $//'` elif test "$nls_cv_use_gnu_gettext" = "yes"; then nls_cv_use_gnu_gettext=no - { echo "$as_me:9253: WARNING: no NLS library is packaged with this application" >&5 + { echo "$as_me:11060: WARNING: no NLS library is packaged with this application" >&5 echo "$as_me: WARNING: no NLS library is packaged with this application" >&2;} fi fi @@ -9259,7 +11066,7 @@ echo "$as_me: WARNING: no NLS library is packaged with this application" >&2;} if $GMSGFMT --statistics /dev/null >/dev/null 2>&1; then : ; else - { echo "$as_me:9262: WARNING: found msgfmt program is not GNU msgfmt" >&5 + { echo "$as_me:11069: WARNING: found msgfmt program is not GNU msgfmt" >&5 echo "$as_me: WARNING: found msgfmt program is not GNU msgfmt" >&2;} fi fi @@ -9268,7 +11075,7 @@ echo "$as_me: WARNING: found msgfmt program is not GNU msgfmt" >&2;} if $XGETTEXT --omit-header /dev/null >/dev/null 2>&1; then : ; else - { echo "$as_me:9271: WARNING: found xgettext program is not GNU xgettext" >&5 + { echo "$as_me:11078: WARNING: found xgettext program is not GNU xgettext" >&5 echo "$as_me: WARNING: found xgettext program is not GNU xgettext" >&2;} fi fi @@ -9286,7 +11093,7 @@ echo "$as_me: WARNING: found xgettext program is not GNU xgettext" >&2;} 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:9289: checking for $ac_word" >&5 +echo "$as_me:11096: checking for $ac_word" >&5 echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6 if test "${ac_cv_prog_INTLBISON+set}" = set; then echo $ECHO_N "(cached) $ECHO_C" >&6 @@ -9301,7 +11108,7 @@ for ac_dir in $ac_dummy; do test -z "$ac_dir" && ac_dir=. $as_executable_p "$ac_dir/$ac_word" || continue ac_cv_prog_INTLBISON="$ac_prog" -echo "$as_me:9304: found $ac_dir/$ac_word" >&5 +echo "$as_me:11111: found $ac_dir/$ac_word" >&5 break done @@ -9309,10 +11116,10 @@ fi fi INTLBISON=$ac_cv_prog_INTLBISON if test -n "$INTLBISON"; then - echo "$as_me:9312: result: $INTLBISON" >&5 + echo "$as_me:11119: result: $INTLBISON" >&5 echo "${ECHO_T}$INTLBISON" >&6 else - echo "$as_me:9315: result: no" >&5 + echo "$as_me:11122: result: no" >&5 echo "${ECHO_T}no" >&6 fi @@ -9322,19 +11129,19 @@ done if test -z "$INTLBISON"; then ac_verc_fail=yes else - echo "$as_me:9325: checking version of bison" >&5 + echo "$as_me:11132: checking version of bison" >&5 echo $ECHO_N "checking version of bison... $ECHO_C" >&6 ac_prog_version=`$INTLBISON --version 2>&1 | sed -n 's/^.*GNU Bison.* \([0-9]*\.[0-9.]*\).*$/\1/p'` - case $ac_prog_version in + case "$ac_prog_version" in ('') ac_prog_version="v. ?.??, bad"; ac_verc_fail=yes;; (1.2[6-9]*|1.[3-9][0-9]*|[2-9].*) ac_prog_version="$ac_prog_version, ok"; ac_verc_fail=no;; (*) ac_prog_version="$ac_prog_version, bad"; ac_verc_fail=yes;; esac - echo "$as_me:9334: result: $ac_prog_version" >&5 + echo "$as_me:11141: result: $ac_prog_version" >&5 echo "${ECHO_T}$ac_prog_version" >&6 fi - if test $ac_verc_fail = yes; then + if test "$ac_verc_fail" = yes; then INTLBISON=: fi fi @@ -9358,7 +11165,7 @@ echo "${ECHO_T}$ac_prog_version" >&6 if test "x$ALL_LINGUAS" = "x"; then LINGUAS= else - echo "$as_me:9361: checking for catalogs to be installed" >&5 + echo "$as_me:11168: checking for catalogs to be installed" >&5 echo $ECHO_N "checking for catalogs to be installed... $ECHO_C" >&6 NEW_LINGUAS= for presentlang in $ALL_LINGUAS; do @@ -9373,12 +11180,12 @@ echo $ECHO_N "checking for catalogs to be installed... $ECHO_C" >&6 ("$presentlang"*) useit=yes;; esac done - if test $useit = yes; then + if test "$useit" = yes; then NEW_LINGUAS="$NEW_LINGUAS $presentlang" fi done LINGUAS=$NEW_LINGUAS - echo "$as_me:9381: result: $LINGUAS" >&5 + echo "$as_me:11188: result: $LINGUAS" >&5 echo "${ECHO_T}$LINGUAS" >&6 fi @@ -9413,8 +11220,8 @@ cf_makefile=makefile use_our_messages=no if test "$USE_NLS" = yes ; then -if test -d $srcdir/po ; then -echo "$as_me:9417: checking if we should use included message-library" >&5 +if test -d "$srcdir/po" ; then +echo "$as_me:11224: checking if we should use included message-library" >&5 echo $ECHO_N "checking if we should use included message-library... $ECHO_C" >&6 # Check whether --enable-included-msgs or --disable-included-msgs was given. @@ -9425,7 +11232,7 @@ else use_our_messages=yes fi; fi -echo "$as_me:9428: result: $use_our_messages" >&5 +echo "$as_me:11235: result: $use_our_messages" >&5 echo "${ECHO_T}$use_our_messages" >&6 fi @@ -9467,24 +11274,24 @@ else for ac_header in libintl.h do as_ac_Header=`echo "ac_cv_header_$ac_header" | $as_tr_sh` -echo "$as_me:9470: checking for $ac_header" >&5 +echo "$as_me:11277: 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 9476 "configure" + cat >"conftest.$ac_ext" <<_ACEOF +#line 11283 "configure" #include "confdefs.h" #include <$ac_header> _ACEOF -if { (eval echo "$as_me:9480: \"$ac_cpp conftest.$ac_ext\"") >&5 - (eval $ac_cpp conftest.$ac_ext) 2>conftest.er1 +if { (eval echo "$as_me:11287: \"$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:9486: \$? = $ac_status" >&5 - (exit $ac_status); } >/dev/null; then + echo "$as_me:11293: \$? = $ac_status" >&5 + (exit "$ac_status"); } >/dev/null; then if test -s conftest.err; then ac_cpp_err=$ac_c_preproc_warn_flag else @@ -9497,14 +11304,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:9505: 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:11312: result: `eval echo '${'"$as_ac_Header"'}'`" >&5 +echo "${ECHO_T}`eval echo '${'"$as_ac_Header"'}'`" >&6 +if test "`eval echo '${'"$as_ac_Header"'}'`" = yes; then cat >>confdefs.h <<EOF #define `echo "HAVE_$ac_header" | $as_tr_cpp` 1 EOF @@ -9553,14 +11360,14 @@ EOF fi fi -echo "$as_me:9556: checking if -lm needed for math functions" >&5 +echo "$as_me:11363: 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 9563 "configure" + cat >"conftest.$ac_ext" <<_ACEOF +#line 11370 "configure" #include "confdefs.h" #include <stdio.h> @@ -9570,55 +11377,55 @@ else int main (void) { -double x = rand(); printf("result = %g\n", sqrt(x)) +double x = rand(); printf("result = %g\\n", sqrt(x)) ; return 0; } _ACEOF -rm -f conftest.$ac_objext conftest$ac_exeext -if { (eval echo "$as_me:9579: \"$ac_link\"") >&5 +rm -f "conftest.$ac_objext" "conftest$ac_exeext" +if { (eval echo "$as_me:11386: \"$ac_link\"") >&5 (eval $ac_link) 2>&5 ac_status=$? - echo "$as_me:9582: \$? = $ac_status" >&5 - (exit $ac_status); } && - { ac_try='test -s conftest$ac_exeext' - { (eval echo "$as_me:9585: \"$ac_try\"") >&5 + echo "$as_me:11389: \$? = $ac_status" >&5 + (exit "$ac_status"); } && + { ac_try='test -s "conftest$ac_exeext"' + { (eval echo "$as_me:11392: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? - echo "$as_me:9588: \$? = $ac_status" >&5 - (exit $ac_status); }; }; then + echo "$as_me:11395: \$? = $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:9598: result: $cf_cv_need_libm" >&5 +echo "$as_me:11405: result: $cf_cv_need_libm" >&5 echo "${ECHO_T}$cf_cv_need_libm" >&6 if test "$cf_cv_need_libm" = yes then -cf_add_libs="-lm" -# Filter out duplicates - this happens with badly-designed ".pc" files... -for cf_add_1lib in $LIBS -do - for cf_add_2lib in $cf_add_libs - do - if test "x$cf_add_1lib" = "x$cf_add_2lib" - then +cf_add_libs="$LIBS" +# reverse order +cf_add_0lib= +for cf_add_1lib in -lm; do cf_add_0lib="$cf_add_1lib $cf_add_0lib"; done +# filter duplicates +for cf_add_1lib in $cf_add_0lib; do + for cf_add_2lib in $cf_add_libs; do + if test "x$cf_add_1lib" = "x$cf_add_2lib"; then cf_add_1lib= break fi done - test -n "$cf_add_1lib" && cf_add_libs="$cf_add_libs $cf_add_1lib" + test -n "$cf_add_1lib" && cf_add_libs="$cf_add_1lib $cf_add_libs" done LIBS="$cf_add_libs" fi -echo "$as_me:9621: checking if you want to use dmalloc for testing" >&5 +echo "$as_me:11428: 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. @@ -9629,16 +11436,16 @@ cat >>confdefs.h <<EOF #define USE_DMALLOC 1 EOF - : ${with_cflags:=-g} - : ${with_no_leaks:=yes} + : "${with_cflags:=-g}" + : "${enable_leaks:=no}" with_dmalloc=yes else with_dmalloc= fi; -echo "$as_me:9638: result: ${with_dmalloc:-no}" >&5 +echo "$as_me:11445: 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*) @@ -9652,19 +11459,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" @@ -9683,7 +11490,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/=.*//'` @@ -9713,7 +11520,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}" \ @@ -9749,24 +11556,24 @@ fi esac if test "$with_dmalloc" = yes ; then - echo "$as_me:9752: checking for dmalloc.h" >&5 + echo "$as_me:11559: 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 9758 "configure" + cat >"conftest.$ac_ext" <<_ACEOF +#line 11565 "configure" #include "confdefs.h" #include <dmalloc.h> _ACEOF -if { (eval echo "$as_me:9762: \"$ac_cpp conftest.$ac_ext\"") >&5 - (eval $ac_cpp conftest.$ac_ext) 2>conftest.er1 +if { (eval echo "$as_me:11569: \"$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:9768: \$? = $ac_status" >&5 - (exit $ac_status); } >/dev/null; then + echo "$as_me:11575: \$? = $ac_status" >&5 + (exit "$ac_status"); } >/dev/null; then if test -s conftest.err; then ac_cpp_err=$ac_c_preproc_warn_flag else @@ -9779,24 +11586,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:9787: result: $ac_cv_header_dmalloc_h" >&5 +echo "$as_me:11594: 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:9791: checking for dmalloc_debug in -ldmalloc" >&5 +echo "$as_me:11598: 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 9799 "configure" +cat >"conftest.$ac_ext" <<_ACEOF +#line 11606 "configure" #include "confdefs.h" /* Override any gcc2 internal prototype to avoid an error. */ @@ -9814,30 +11621,30 @@ dmalloc_debug (); return 0; } _ACEOF -rm -f conftest.$ac_objext conftest$ac_exeext -if { (eval echo "$as_me:9818: \"$ac_link\"") >&5 +rm -f "conftest.$ac_objext" "conftest$ac_exeext" +if { (eval echo "$as_me:11625: \"$ac_link\"") >&5 (eval $ac_link) 2>&5 ac_status=$? - echo "$as_me:9821: \$? = $ac_status" >&5 - (exit $ac_status); } && - { ac_try='test -s conftest$ac_exeext' - { (eval echo "$as_me:9824: \"$ac_try\"") >&5 + echo "$as_me:11628: \$? = $ac_status" >&5 + (exit "$ac_status"); } && + { ac_try='test -s "conftest$ac_exeext"' + { (eval echo "$as_me:11631: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? - echo "$as_me:9827: \$? = $ac_status" >&5 - (exit $ac_status); }; }; then + echo "$as_me:11634: \$? = $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:9838: result: $ac_cv_lib_dmalloc_dmalloc_debug" >&5 +echo "$as_me:11645: 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 <<EOF #define HAVE_LIBDMALLOC 1 EOF @@ -9850,7 +11657,7 @@ fi fi -echo "$as_me:9853: checking if you want to use dbmalloc for testing" >&5 +echo "$as_me:11660: 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. @@ -9861,16 +11668,16 @@ cat >>confdefs.h <<EOF #define USE_DBMALLOC 1 EOF - : ${with_cflags:=-g} - : ${with_no_leaks:=yes} + : "${with_cflags:=-g}" + : "${enable_leaks:=no}" with_dbmalloc=yes else with_dbmalloc= fi; -echo "$as_me:9870: result: ${with_dbmalloc:-no}" >&5 +echo "$as_me:11677: 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*) @@ -9884,19 +11691,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" @@ -9915,7 +11722,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/=.*//'` @@ -9945,7 +11752,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}" \ @@ -9981,24 +11788,24 @@ fi esac if test "$with_dbmalloc" = yes ; then - echo "$as_me:9984: checking for dbmalloc.h" >&5 + echo "$as_me:11791: 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 9990 "configure" + cat >"conftest.$ac_ext" <<_ACEOF +#line 11797 "configure" #include "confdefs.h" #include <dbmalloc.h> _ACEOF -if { (eval echo "$as_me:9994: \"$ac_cpp conftest.$ac_ext\"") >&5 - (eval $ac_cpp conftest.$ac_ext) 2>conftest.er1 +if { (eval echo "$as_me:11801: \"$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:10000: \$? = $ac_status" >&5 - (exit $ac_status); } >/dev/null; then + echo "$as_me:11807: \$? = $ac_status" >&5 + (exit "$ac_status"); } >/dev/null; then if test -s conftest.err; then ac_cpp_err=$ac_c_preproc_warn_flag else @@ -10011,24 +11818,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:10019: result: $ac_cv_header_dbmalloc_h" >&5 +echo "$as_me:11826: 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:10023: checking for debug_malloc in -ldbmalloc" >&5 +echo "$as_me:11830: 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 10031 "configure" +cat >"conftest.$ac_ext" <<_ACEOF +#line 11838 "configure" #include "confdefs.h" /* Override any gcc2 internal prototype to avoid an error. */ @@ -10046,30 +11853,30 @@ debug_malloc (); return 0; } _ACEOF -rm -f conftest.$ac_objext conftest$ac_exeext -if { (eval echo "$as_me:10050: \"$ac_link\"") >&5 +rm -f "conftest.$ac_objext" "conftest$ac_exeext" +if { (eval echo "$as_me:11857: \"$ac_link\"") >&5 (eval $ac_link) 2>&5 ac_status=$? - echo "$as_me:10053: \$? = $ac_status" >&5 - (exit $ac_status); } && - { ac_try='test -s conftest$ac_exeext' - { (eval echo "$as_me:10056: \"$ac_try\"") >&5 + echo "$as_me:11860: \$? = $ac_status" >&5 + (exit "$ac_status"); } && + { ac_try='test -s "conftest$ac_exeext"' + { (eval echo "$as_me:11863: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? - echo "$as_me:10059: \$? = $ac_status" >&5 - (exit $ac_status); }; }; then + echo "$as_me:11866: \$? = $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:10070: result: $ac_cv_lib_dbmalloc_debug_malloc" >&5 +echo "$as_me:11877: 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 <<EOF #define HAVE_LIBDBMALLOC 1 EOF @@ -10082,7 +11889,7 @@ fi fi -echo "$as_me:10085: checking if you want to use purify for testing" >&5 +echo "$as_me:11892: checking if you want to use purify for testing" >&5 echo $ECHO_N "checking if you want to use purify for testing... $ECHO_C" >&6 # Check whether --with-purify or --without-purify was given. @@ -10093,16 +11900,16 @@ cat >>confdefs.h <<EOF #define USE_PURIFY 1 EOF - : ${with_cflags:=-g} - : ${with_no_leaks:=yes} + : "${with_cflags:=-g}" + : "${enable_leaks:=no}" with_purify=yes else with_purify= fi; -echo "$as_me:10102: result: ${with_purify:-no}" >&5 +echo "$as_me:11909: result: ${with_purify:-no}" >&5 echo "${ECHO_T}${with_purify:-no}" >&6 -case .$with_cflags in +case ".$with_cflags" in (.*-g*) case .$CFLAGS in (.*-g*) @@ -10116,19 +11923,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" @@ -10147,7 +11954,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/=.*//'` @@ -10177,7 +11984,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}" \ @@ -10212,7 +12019,7 @@ fi ;; esac -echo "$as_me:10215: checking if you want to use valgrind for testing" >&5 +echo "$as_me:12022: 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. @@ -10223,16 +12030,16 @@ cat >>confdefs.h <<EOF #define USE_VALGRIND 1 EOF - : ${with_cflags:=-g} - : ${with_no_leaks:=yes} + : "${with_cflags:=-g}" + : "${enable_leaks:=no}" with_valgrind=yes else with_valgrind= fi; -echo "$as_me:10232: result: ${with_valgrind:-no}" >&5 +echo "$as_me:12039: 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*) @@ -10246,19 +12053,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" @@ -10277,7 +12084,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/=.*//'` @@ -10307,7 +12114,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}" \ @@ -10342,7 +12149,7 @@ fi ;; esac -echo "$as_me:10345: checking if you want to perform memory-leak testing" >&5 +echo "$as_me:12152: checking if you want to perform memory-leak testing" >&5 echo $ECHO_N "checking if you want to perform memory-leak testing... $ECHO_C" >&6 # Check whether --with-no-leaks or --without-no-leaks was given. @@ -10362,14 +12169,15 @@ cat >>confdefs.h <<\EOF EOF ;; esac - with_no_leaks=yes + enable_leaks=no else - with_no_leaks= + enable_leaks=yes fi; -echo "$as_me:10369: 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:12177: result: $with_no_leaks" >&5 echo "${ECHO_T}$with_no_leaks" >&6 -echo "$as_me:10372: checking if you want --trace option" >&5 +echo "$as_me:12180: checking if you want --trace option" >&5 echo $ECHO_N "checking if you want --trace option... $ECHO_C" >&6 # Check whether --enable-trace or --disable-trace was given. @@ -10379,7 +12187,7 @@ if test "${enable_trace+set}" = set; then else enableval=yes fi; -echo "$as_me:10382: result: $enableval" >&5 +echo "$as_me:12190: result: $enableval" >&5 echo "${ECHO_T}$enableval" >&6 if test "$enableval" != no ; then EXTRAOBJS="$EXTRAOBJS trace\$o" @@ -10392,65 +12200,80 @@ else : fi +echo "$as_me:12203: checking if rpath option should be used" >&5 +echo $ECHO_N "checking if rpath option should be used... $ECHO_C" >&6 + +# Check whether --enable-rpath or --disable-rpath was given. +if test "${enable_rpath+set}" = set; then + enableval="$enable_rpath" + cf_cv_enable_rpath=$enableval +else + cf_cv_enable_rpath=no +fi; +echo "$as_me:12213: result: $cf_cv_enable_rpath" >&5 +echo "${ECHO_T}$cf_cv_enable_rpath" >&6 + LD_RPATH_OPT= -echo "$as_me:10396: checking for an rpath option" >&5 +if test "x$cf_cv_enable_rpath" != xno +then + echo "$as_me:12219: checking for an rpath option" >&5 echo $ECHO_N "checking for an rpath option... $ECHO_C" >&6 -case $cf_cv_system_name in -(irix*) - if test "$GCC" = yes; then + case "$cf_cv_system_name" in + (irix*) + if test "$GCC" = yes; then + LD_RPATH_OPT="-Wl,-rpath," + else + LD_RPATH_OPT="-rpath " + fi + ;; + (linux*|gnu*|k*bsd*-gnu|freebsd*) LD_RPATH_OPT="-Wl,-rpath," - else + ;; + (openbsd[2-9].*|mirbsd*) + LD_RPATH_OPT="-Wl,-rpath," + ;; + (dragonfly*) LD_RPATH_OPT="-rpath " - fi - ;; -(linux*|gnu*|k*bsd*-gnu|freebsd*) - LD_RPATH_OPT="-Wl,-rpath," - ;; -(openbsd[2-9].*|mirbsd*) - LD_RPATH_OPT="-Wl,-rpath," - ;; -(dragonfly*) - LD_RPATH_OPT="-rpath " - ;; -(netbsd*) - LD_RPATH_OPT="-Wl,-rpath," - ;; -(osf*|mls+*) - LD_RPATH_OPT="-rpath " - ;; -(solaris2*) - LD_RPATH_OPT="-R" - ;; -(*) - ;; -esac -echo "$as_me:10427: result: $LD_RPATH_OPT" >&5 + ;; + (netbsd*) + LD_RPATH_OPT="-Wl,-rpath," + ;; + (osf*|mls+*) + LD_RPATH_OPT="-rpath " + ;; + (solaris2*) + LD_RPATH_OPT="-R" + ;; + (*) + ;; + esac + echo "$as_me:12250: result: $LD_RPATH_OPT" >&5 echo "${ECHO_T}$LD_RPATH_OPT" >&6 -case "x$LD_RPATH_OPT" in -(x-R*) - echo "$as_me:10432: checking if we need a space after rpath option" >&5 + case "x$LD_RPATH_OPT" in + (x-R*) + echo "$as_me:12255: checking if we need a space after rpath option" >&5 echo $ECHO_N "checking if we need a space after rpath option... $ECHO_C" >&6 - cf_save_LIBS="$LIBS" + cf_save_LIBS="$LIBS" -cf_add_libs="${LD_RPATH_OPT}$libdir" -# Filter out duplicates - this happens with badly-designed ".pc" files... -for cf_add_1lib in $LIBS -do - for cf_add_2lib in $cf_add_libs - do - if test "x$cf_add_1lib" = "x$cf_add_2lib" - then +cf_add_libs="$LIBS" +# reverse order +cf_add_0lib= +for cf_add_1lib in ${LD_RPATH_OPT}$libdir; do cf_add_0lib="$cf_add_1lib $cf_add_0lib"; done +# filter duplicates +for cf_add_1lib in $cf_add_0lib; do + for cf_add_2lib in $cf_add_libs; do + if test "x$cf_add_1lib" = "x$cf_add_2lib"; then cf_add_1lib= break fi done - test -n "$cf_add_1lib" && cf_add_libs="$cf_add_libs $cf_add_1lib" + test -n "$cf_add_1lib" && cf_add_libs="$cf_add_1lib $cf_add_libs" done LIBS="$cf_add_libs" - cat >conftest.$ac_ext <<_ACEOF -#line 10453 "configure" + cat >"conftest.$ac_ext" <<_ACEOF +#line 12276 "configure" #include "confdefs.h" int @@ -10461,31 +12284,32 @@ main (void) return 0; } _ACEOF -rm -f conftest.$ac_objext conftest$ac_exeext -if { (eval echo "$as_me:10465: \"$ac_link\"") >&5 +rm -f "conftest.$ac_objext" "conftest$ac_exeext" +if { (eval echo "$as_me:12288: \"$ac_link\"") >&5 (eval $ac_link) 2>&5 ac_status=$? - echo "$as_me:10468: \$? = $ac_status" >&5 - (exit $ac_status); } && - { ac_try='test -s conftest$ac_exeext' - { (eval echo "$as_me:10471: \"$ac_try\"") >&5 + echo "$as_me:12291: \$? = $ac_status" >&5 + (exit "$ac_status"); } && + { ac_try='test -s "conftest$ac_exeext"' + { (eval echo "$as_me:12294: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? - echo "$as_me:10474: \$? = $ac_status" >&5 - (exit $ac_status); }; }; then + echo "$as_me:12297: \$? = $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 - LIBS="$cf_save_LIBS" - echo "$as_me:10484: result: $cf_rpath_space" >&5 +rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext" + LIBS="$cf_save_LIBS" + echo "$as_me:12307: result: $cf_rpath_space" >&5 echo "${ECHO_T}$cf_rpath_space" >&6 - test "$cf_rpath_space" = yes && LD_RPATH_OPT="$LD_RPATH_OPT " - ;; -esac + test "$cf_rpath_space" = yes && LD_RPATH_OPT="$LD_RPATH_OPT " + ;; + esac +fi REL_VERSION=${VERSION_MAJOR}.${VERSION_MINOR} ABI_VERSION=`echo "$VERSION" |sed -e 's/:/./g'` @@ -10496,7 +12320,7 @@ test -z "$cf_cv_rel_version" && cf_cv_rel_version=0.0 # Check whether --with-rel-version or --without-rel-version was given. if test "${with_rel_version+set}" = set; then withval="$with_rel_version" - { echo "$as_me:10499: WARNING: overriding release version $cf_cv_rel_version to $withval" >&5 + { echo "$as_me:12323: WARNING: overriding release version $cf_cv_rel_version to $withval" >&5 echo "$as_me: WARNING: overriding release version $cf_cv_rel_version to $withval" >&2;} cf_cv_rel_version=$withval fi; @@ -10509,13 +12333,13 @@ if test -n "$DIALOG_MAJOR" ; then ([0-9]*) ;; (*) - { { echo "$as_me:10512: error: Release major-version is not a number: $DIALOG_MAJOR" >&5 + { { echo "$as_me:12336: error: Release major-version is not a number: $DIALOG_MAJOR" >&5 echo "$as_me: error: Release major-version is not a number: $DIALOG_MAJOR" >&2;} { (exit 1); exit 1; }; } ;; esac else - { { echo "$as_me:10518: error: Release major-version value is empty" >&5 + { { echo "$as_me:12342: error: Release major-version value is empty" >&5 echo "$as_me: error: Release major-version value is empty" >&2;} { (exit 1); exit 1; }; } fi @@ -10525,13 +12349,13 @@ if test -n "$DIALOG_MINOR" ; then ([0-9]*) ;; (*) - { { echo "$as_me:10528: error: Release minor-version is not a number: $DIALOG_MINOR" >&5 + { { echo "$as_me:12352: error: Release minor-version is not a number: $DIALOG_MINOR" >&5 echo "$as_me: error: Release minor-version is not a number: $DIALOG_MINOR" >&2;} { (exit 1); exit 1; }; } ;; esac else - { { echo "$as_me:10534: error: Release minor-version value is empty" >&5 + { { echo "$as_me:12358: error: Release minor-version value is empty" >&5 echo "$as_me: error: Release minor-version value is empty" >&2;} { (exit 1); exit 1; }; } fi @@ -10544,9 +12368,9 @@ if test "${with_abi_version+set}" = set; then if test "x$cf_cv_abi_version" != "x$withval" then - { echo "$as_me:10547: WARNING: overriding ABI version $cf_cv_abi_version to $withval" >&5 + { echo "$as_me:12371: WARNING: overriding ABI version $cf_cv_abi_version to $withval" >&5 echo "$as_me: WARNING: overriding ABI version $cf_cv_abi_version to $withval" >&2;} - case $cf_cv_rel_version in + case "$cf_cv_rel_version" in (5.*) cf_cv_rel_version=$withval.0 ;; @@ -10563,13 +12387,13 @@ if test -n "$cf_cv_abi_version" ; then ([0-9]*) ;; (*) - { { echo "$as_me:10566: error: ABI version is not a number: $cf_cv_abi_version" >&5 + { { echo "$as_me:12390: error: ABI version is not a number: $cf_cv_abi_version" >&5 echo "$as_me: error: ABI version is not a number: $cf_cv_abi_version" >&2;} { (exit 1); exit 1; }; } ;; esac else - { { echo "$as_me:10572: error: ABI version value is empty" >&5 + { { echo "$as_me:12396: error: ABI version value is empty" >&5 echo "$as_me: error: ABI version value is empty" >&2;} { (exit 1); exit 1; }; } fi @@ -10586,7 +12410,7 @@ MAKE_DLLS="#" shlibdir=$libdir -echo "$as_me:10589: checking if libtool -version-number should be used" >&5 +echo "$as_me:12413: checking if libtool -version-number should be used" >&5 echo $ECHO_N "checking if libtool -version-number should be used... $ECHO_C" >&6 # Check whether --enable-libtool-version or --disable-libtool-version was given. @@ -10603,7 +12427,7 @@ else cf_libtool_version=yes fi; -echo "$as_me:10606: result: $cf_libtool_version" >&5 +echo "$as_me:12430: result: $cf_libtool_version" >&5 echo "${ECHO_T}$cf_libtool_version" >&6 if test "$cf_libtool_version" = yes ; then @@ -10612,25 +12436,25 @@ else LIBTOOL_VERSION="-version-info" case "x$VERSION" in (x) - { echo "$as_me:10615: WARNING: VERSION was not set" >&5 + { echo "$as_me:12439: WARNING: VERSION was not set" >&5 echo "$as_me: WARNING: VERSION was not set" >&2;} ;; (x*.*.*) ABI_VERSION="$VERSION" test -n "$verbose" && echo " ABI_VERSION: $ABI_VERSION" 1>&6 -echo "${as_me:-configure}:10622: testing ABI_VERSION: $ABI_VERSION ..." 1>&5 +echo "${as_me:-configure}:12446: testing ABI_VERSION: $ABI_VERSION ..." 1>&5 ;; (x*:*:*) ABI_VERSION=`echo "$VERSION" | sed -e 's/:/./g'` test -n "$verbose" && echo " ABI_VERSION: $ABI_VERSION" 1>&6 -echo "${as_me:-configure}:10629: testing ABI_VERSION: $ABI_VERSION ..." 1>&5 +echo "${as_me:-configure}:12453: testing ABI_VERSION: $ABI_VERSION ..." 1>&5 ;; (*) - { echo "$as_me:10633: WARNING: unexpected VERSION value: $VERSION" >&5 + { echo "$as_me:12457: WARNING: unexpected VERSION value: $VERSION" >&5 echo "$as_me: WARNING: unexpected VERSION value: $VERSION" >&2;} ;; esac @@ -10652,7 +12476,7 @@ LIB_LINK='${CC}' LIB_INSTALL= LIB_UNINSTALL= -echo "$as_me:10655: checking if you want to build libraries with libtool" >&5 +echo "$as_me:12479: checking if you want to build libraries with libtool" >&5 echo $ECHO_N "checking if you want to build libraries with libtool... $ECHO_C" >&6 # Check whether --with-libtool or --without-libtool was given. @@ -10662,7 +12486,7 @@ if test "${with_libtool+set}" = set; then else with_libtool=no fi; -echo "$as_me:10665: result: $with_libtool" >&5 +echo "$as_me:12489: result: $with_libtool" >&5 echo "${ECHO_T}$with_libtool" >&6 if test "$with_libtool" != "no"; then @@ -10681,19 +12505,19 @@ case ".$with_libtool" in ;; (.[a-zA-Z]:[\\/]*) # OS/2 EMX ;; -(.\${*prefix}*|.\${*dir}*) +(.\$\{*prefix\}*|.\$\{*dir\}*) eval with_libtool="$with_libtool" case ".$with_libtool" in (.NONE/*) - with_libtool=`echo $with_libtool | sed -e s%NONE%$cf_path_syntax%` + with_libtool=`echo "$with_libtool" | sed -e s%NONE%$cf_path_syntax%` ;; esac ;; (.no|.NONE/*) - with_libtool=`echo $with_libtool | sed -e s%NONE%$cf_path_syntax%` + with_libtool=`echo "$with_libtool" | sed -e s%NONE%$cf_path_syntax%` ;; (*) - { { echo "$as_me:10696: error: expected a pathname, not \"$with_libtool\"" >&5 + { { echo "$as_me:12520: error: expected a pathname, not \"$with_libtool\"" >&5 echo "$as_me: error: expected a pathname, not \"$with_libtool\"" >&2;} { (exit 1); exit 1; }; } ;; @@ -10706,7 +12530,7 @@ esac 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:10709: checking for $ac_word" >&5 +echo "$as_me:12533: checking for $ac_word" >&5 echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6 if test "${ac_cv_prog_LIBTOOL+set}" = set; then echo $ECHO_N "(cached) $ECHO_C" >&6 @@ -10721,7 +12545,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_LIBTOOL="$ac_tool_prefix$ac_prog" -echo "$as_me:10724: found $ac_dir/$ac_word" >&5 +echo "$as_me:12548: found $ac_dir/$ac_word" >&5 break done @@ -10729,10 +12553,10 @@ fi fi LIBTOOL=$ac_cv_prog_LIBTOOL if test -n "$LIBTOOL"; then - echo "$as_me:10732: result: $LIBTOOL" >&5 + echo "$as_me:12556: result: $LIBTOOL" >&5 echo "${ECHO_T}$LIBTOOL" >&6 else - echo "$as_me:10735: result: no" >&5 + echo "$as_me:12559: result: no" >&5 echo "${ECHO_T}no" >&6 fi @@ -10745,7 +12569,7 @@ if test -z "$LIBTOOL"; 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:10748: checking for $ac_word" >&5 +echo "$as_me:12572: checking for $ac_word" >&5 echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6 if test "${ac_cv_prog_ac_ct_LIBTOOL+set}" = set; then echo $ECHO_N "(cached) $ECHO_C" >&6 @@ -10760,7 +12584,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_LIBTOOL="$ac_prog" -echo "$as_me:10763: found $ac_dir/$ac_word" >&5 +echo "$as_me:12587: found $ac_dir/$ac_word" >&5 break done @@ -10768,10 +12592,10 @@ fi fi ac_ct_LIBTOOL=$ac_cv_prog_ac_ct_LIBTOOL if test -n "$ac_ct_LIBTOOL"; then - echo "$as_me:10771: result: $ac_ct_LIBTOOL" >&5 + echo "$as_me:12595: result: $ac_ct_LIBTOOL" >&5 echo "${ECHO_T}$ac_ct_LIBTOOL" >&6 else - echo "$as_me:10774: result: no" >&5 + echo "$as_me:12598: result: no" >&5 echo "${ECHO_T}no" >&6 fi @@ -10802,7 +12626,7 @@ unset LIBTOOL 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:10805: checking for $ac_word" >&5 +echo "$as_me:12629: checking for $ac_word" >&5 echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6 if test "${ac_cv_prog_LIBTOOL+set}" = set; then echo $ECHO_N "(cached) $ECHO_C" >&6 @@ -10817,7 +12641,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_LIBTOOL="$ac_tool_prefix$ac_prog" -echo "$as_me:10820: found $ac_dir/$ac_word" >&5 +echo "$as_me:12644: found $ac_dir/$ac_word" >&5 break done @@ -10825,10 +12649,10 @@ fi fi LIBTOOL=$ac_cv_prog_LIBTOOL if test -n "$LIBTOOL"; then - echo "$as_me:10828: result: $LIBTOOL" >&5 + echo "$as_me:12652: result: $LIBTOOL" >&5 echo "${ECHO_T}$LIBTOOL" >&6 else - echo "$as_me:10831: result: no" >&5 + echo "$as_me:12655: result: no" >&5 echo "${ECHO_T}no" >&6 fi @@ -10841,7 +12665,7 @@ if test -z "$LIBTOOL"; 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:10844: checking for $ac_word" >&5 +echo "$as_me:12668: checking for $ac_word" >&5 echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6 if test "${ac_cv_prog_ac_ct_LIBTOOL+set}" = set; then echo $ECHO_N "(cached) $ECHO_C" >&6 @@ -10856,7 +12680,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_LIBTOOL="$ac_prog" -echo "$as_me:10859: found $ac_dir/$ac_word" >&5 +echo "$as_me:12683: found $ac_dir/$ac_word" >&5 break done @@ -10864,10 +12688,10 @@ fi fi ac_ct_LIBTOOL=$ac_cv_prog_ac_ct_LIBTOOL if test -n "$ac_ct_LIBTOOL"; then - echo "$as_me:10867: result: $ac_ct_LIBTOOL" >&5 + echo "$as_me:12691: result: $ac_ct_LIBTOOL" >&5 echo "${ECHO_T}$ac_ct_LIBTOOL" >&6 else - echo "$as_me:10870: result: no" >&5 + echo "$as_me:12694: result: no" >&5 echo "${ECHO_T}no" >&6 fi @@ -10889,7 +12713,7 @@ test -z "$cf_cv_libtool_version" && unset cf_cv_libtool_version fi fi if test -z "$LIBTOOL" ; then - { { echo "$as_me:10892: error: Cannot find libtool" >&5 + { { echo "$as_me:12716: error: Cannot find libtool" >&5 echo "$as_me: error: Cannot find libtool" >&2;} { (exit 1); exit 1; }; } fi @@ -10905,7 +12729,7 @@ echo "$as_me: error: Cannot find libtool" >&2;} if test -n "$LIBTOOL" && test "$LIBTOOL" != none then - echo "$as_me:10908: checking version of $LIBTOOL" >&5 + echo "$as_me:12732: checking version of $LIBTOOL" >&5 echo $ECHO_N "checking version of $LIBTOOL... $ECHO_C" >&6 if test -n "$LIBTOOL" && test "$LIBTOOL" != none @@ -10916,15 +12740,15 @@ else fi test -z "$cf_cv_libtool_version" && unset cf_cv_libtool_version - echo "$as_me:10919: result: $cf_cv_libtool_version" >&5 + echo "$as_me:12743: result: $cf_cv_libtool_version" >&5 echo "${ECHO_T}$cf_cv_libtool_version" >&6 if test -z "$cf_cv_libtool_version" ; then - { { echo "$as_me:10922: error: This is not GNU libtool" >&5 + { { echo "$as_me:12746: error: This is not GNU libtool" >&5 echo "$as_me: error: This is not GNU libtool" >&2;} { (exit 1); exit 1; }; } fi else - { { echo "$as_me:10927: error: GNU libtool has not been found" >&5 + { { echo "$as_me:12751: error: GNU libtool has not been found" >&5 echo "$as_me: error: GNU libtool has not been found" >&2;} { (exit 1); exit 1; }; } fi @@ -10938,7 +12762,7 @@ fi esac # special hack to add --tag option for C++ compiler - case $cf_cv_libtool_version in + case "$cf_cv_libtool_version" in (1.[5-9]*|[2-9].[0-9.a-z]*) LIBTOOL_CXX="$LIBTOOL --tag=CXX" LIBTOOL="$LIBTOOL --tag=CC" @@ -10962,7 +12786,7 @@ if test "$with_libtool" = "yes" ; then DFT_LWR_MODEL=$LIB_MODEL LIBTOOL_MAKE= -echo "$as_me:10965: checking for additional libtool options" >&5 +echo "$as_me:12789: checking for additional libtool options" >&5 echo $ECHO_N "checking for additional libtool options... $ECHO_C" >&6 # Check whether --with-libtool-opts or --without-libtool-opts was given. @@ -10972,7 +12796,7 @@ if test "${with_libtool_opts+set}" = set; then else with_libtool_opts=no fi; -echo "$as_me:10975: result: $with_libtool_opts" >&5 +echo "$as_me:12799: result: $with_libtool_opts" >&5 echo "${ECHO_T}$with_libtool_opts" >&6 case .$with_libtool_opts in @@ -10983,7 +12807,7 @@ case .$with_libtool_opts in ;; esac -echo "$as_me:10986: checking if exported-symbols file should be used" >&5 +echo "$as_me:12810: checking if exported-symbols file should be used" >&5 echo $ECHO_N "checking if exported-symbols file should be used... $ECHO_C" >&6 # Check whether --with-export-syms or --without-export-syms was given. @@ -10998,7 +12822,7 @@ then with_export_syms='${top_srcdir}/package/${PACKAGE}.sym' fi -echo "$as_me:11001: result: $with_export_syms" >&5 +echo "$as_me:12825: result: $with_export_syms" >&5 echo "${ECHO_T}$with_export_syms" >&6 if test "x$with_export_syms" != xno then @@ -11010,7 +12834,7 @@ fi MAKE_STATIC="#" MAKE_SHARED= else - echo "$as_me:11013: checking if you want to build shared libraries" >&5 + echo "$as_me:12837: checking if you want to build shared libraries" >&5 echo $ECHO_N "checking if you want to build shared libraries... $ECHO_C" >&6 # Check whether --with-shared or --without-shared was given. @@ -11020,7 +12844,7 @@ if test "${with_shared+set}" = set; then else with_shared=no fi; - echo "$as_me:11023: result: $with_shared" >&5 + echo "$as_me:12847: result: $with_shared" >&5 echo "${ECHO_T}$with_shared" >&6 if test "$with_shared" = "yes" ; then LIB_MODEL=shared @@ -11041,14 +12865,14 @@ echo "${ECHO_T}$with_shared" >&6 cf_ld_rpath_opt= test "$cf_cv_enable_rpath" = yes && cf_ld_rpath_opt="$LD_RPATH_OPT" - echo "$as_me:11044: checking if release/abi version should be used for shared libs" >&5 + echo "$as_me:12868: checking if release/abi version should be used for shared libs" >&5 echo $ECHO_N "checking if release/abi version should be used for shared libs... $ECHO_C" >&6 # Check whether --with-shlib-version or --without-shlib-version was given. if test "${with_shlib_version+set}" = set; then withval="$with_shlib_version" test -z "$withval" && withval=auto - case $withval in + case "$withval" in (yes) cf_cv_shlib_version=auto ;; @@ -11056,9 +12880,9 @@ if test "${with_shlib_version+set}" = set; then cf_cv_shlib_version=$withval ;; (*) - echo "$as_me:11059: result: $withval" >&5 + echo "$as_me:12883: result: $withval" >&5 echo "${ECHO_T}$withval" >&6 - { { echo "$as_me:11061: error: option value must be one of: rel, abi, or auto" >&5 + { { echo "$as_me:12885: error: option value must be one of: rel, abi, or auto" >&5 echo "$as_me: error: option value must be one of: rel, abi, or auto" >&2;} { (exit 1); exit 1; }; } ;; @@ -11067,7 +12891,7 @@ echo "$as_me: error: option value must be one of: rel, abi, or auto" >&2;} else cf_cv_shlib_version=auto fi; - echo "$as_me:11070: result: $cf_cv_shlib_version" >&5 + echo "$as_me:12894: result: $cf_cv_shlib_version" >&5 echo "${ECHO_T}$cf_cv_shlib_version" >&6 cf_cv_rm_so_locs=no @@ -11081,7 +12905,7 @@ echo "${ECHO_T}$cf_cv_shlib_version" >&6 then cf_try_fPIC=yes else - case $cf_cv_system_name in + case "$cf_cv_system_name" in (*linux*) # e.g., PGI compiler cf_try_fPIC=yes ;; @@ -11090,14 +12914,14 @@ echo "${ECHO_T}$cf_cv_shlib_version" >&6 if test "$cf_try_fPIC" = yes then - echo "$as_me:11093: checking which $CC option to use" >&5 + echo "$as_me:12917: checking which $CC option to use" >&5 echo $ECHO_N "checking which $CC option to use... $ECHO_C" >&6 cf_save_CFLAGS="$CFLAGS" for CC_SHARED_OPTS in -fPIC -fpic '' do CFLAGS="$cf_save_CFLAGS $CC_SHARED_OPTS" - cat >conftest.$ac_ext <<_ACEOF -#line 11100 "configure" + cat >"conftest.$ac_ext" <<_ACEOF +#line 12924 "configure" #include "confdefs.h" #include <stdio.h> int @@ -11108,33 +12932,33 @@ int x = 1 return 0; } _ACEOF -rm -f conftest.$ac_objext -if { (eval echo "$as_me:11112: \"$ac_compile\"") >&5 +rm -f "conftest.$ac_objext" +if { (eval echo "$as_me:12936: \"$ac_compile\"") >&5 (eval $ac_compile) 2>&5 ac_status=$? - echo "$as_me:11115: \$? = $ac_status" >&5 - (exit $ac_status); } && - { ac_try='test -s conftest.$ac_objext' - { (eval echo "$as_me:11118: \"$ac_try\"") >&5 + echo "$as_me:12939: \$? = $ac_status" >&5 + (exit "$ac_status"); } && + { ac_try='test -s "conftest.$ac_objext"' + { (eval echo "$as_me:12942: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? - echo "$as_me:11121: \$? = $ac_status" >&5 - (exit $ac_status); }; }; then + echo "$as_me:12945: \$? = $ac_status" >&5 + (exit "$ac_status"); }; }; then break else echo "$as_me: failed program was:" >&5 -cat conftest.$ac_ext >&5 +cat "conftest.$ac_ext" >&5 fi -rm -f conftest.$ac_objext conftest.$ac_ext +rm -f "conftest.$ac_objext" "conftest.$ac_ext" done - echo "$as_me:11130: result: $CC_SHARED_OPTS" >&5 + echo "$as_me:12954: result: $CC_SHARED_OPTS" >&5 echo "${ECHO_T}$CC_SHARED_OPTS" >&6 CFLAGS="$cf_save_CFLAGS" fi cf_cv_shlib_version_infix=no - case $cf_cv_system_name in + case "$cf_cv_system_name" in (aix4.3-9*|aix[5-7]*) if test "$GCC" = yes; then CC_SHARED_OPTS='-Wl,-brtl' @@ -11198,7 +13022,7 @@ CF_EOF MK_SHARED_LIB='${CC} ${LDFLAGS} ${CFLAGS} -dynamiclib -install_name ${libdir}/`basename $@` -compatibility_version ${ABI_VERSION} -current_version ${ABI_VERSION} -o $@' test "$cf_cv_shlib_version" = auto && cf_cv_shlib_version=abi cf_cv_shlib_version_infix=yes - echo "$as_me:11201: checking if ld -search_paths_first works" >&5 + echo "$as_me:13025: checking if ld -search_paths_first works" >&5 echo $ECHO_N "checking if ld -search_paths_first works... $ECHO_C" >&6 if test "${cf_cv_ldflags_search_paths_first+set}" = set; then echo $ECHO_N "(cached) $ECHO_C" >&6 @@ -11206,8 +13030,8 @@ else cf_save_LDFLAGS=$LDFLAGS LDFLAGS="$LDFLAGS -Wl,-search_paths_first" - cat >conftest.$ac_ext <<_ACEOF -#line 11210 "configure" + cat >"conftest.$ac_ext" <<_ACEOF +#line 13034 "configure" #include "confdefs.h" int @@ -11218,30 +13042,30 @@ int i; return 0; } _ACEOF -rm -f conftest.$ac_objext conftest$ac_exeext -if { (eval echo "$as_me:11222: \"$ac_link\"") >&5 +rm -f "conftest.$ac_objext" "conftest$ac_exeext" +if { (eval echo "$as_me:13046: \"$ac_link\"") >&5 (eval $ac_link) 2>&5 ac_status=$? - echo "$as_me:11225: \$? = $ac_status" >&5 - (exit $ac_status); } && - { ac_try='test -s conftest$ac_exeext' - { (eval echo "$as_me:11228: \"$ac_try\"") >&5 + echo "$as_me:13049: \$? = $ac_status" >&5 + (exit "$ac_status"); } && + { ac_try='test -s "conftest$ac_exeext"' + { (eval echo "$as_me:13052: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? - echo "$as_me:11231: \$? = $ac_status" >&5 - (exit $ac_status); }; }; then + echo "$as_me:13055: \$? = $ac_status" >&5 + (exit "$ac_status"); }; }; then cf_cv_ldflags_search_paths_first=yes else echo "$as_me: failed program was:" >&5 -cat conftest.$ac_ext >&5 +cat "conftest.$ac_ext" >&5 cf_cv_ldflags_search_paths_first=no fi -rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext +rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext" LDFLAGS=$cf_save_LDFLAGS fi -echo "$as_me:11242: result: $cf_cv_ldflags_search_paths_first" >&5 +echo "$as_me:13066: result: $cf_cv_ldflags_search_paths_first" >&5 echo "${ECHO_T}$cf_cv_ldflags_search_paths_first" >&6 - if test $cf_cv_ldflags_search_paths_first = yes; then + if test "$cf_cv_ldflags_search_paths_first" = yes; then LDFLAGS="$LDFLAGS -Wl,-search_paths_first" fi ;; @@ -11290,7 +13114,7 @@ echo "${ECHO_T}$cf_cv_ldflags_search_paths_first" >&6 cf_cv_rm_so_locs=yes ;; (linux*|gnu*|k*bsd*-gnu) - if test "$DFT_LWR_MODEL" = "shared" ; then + if test "$DFT_LWR_MODEL" = "shared" && test -n "$LD_RPATH_OPT" ; then LOCAL_LDFLAGS="${LD_RPATH_OPT}\$(LOCAL_LIBDIR)" LOCAL_LDFLAGS2="$LOCAL_LDFLAGS" fi @@ -11307,6 +13131,112 @@ echo "${ECHO_T}$cf_cv_ldflags_search_paths_first" >&6 MK_SHARED_LIB='${CC} ${LDFLAGS} ${CFLAGS} -shared -Wl,-soname,'$cf_cv_shared_soname',-stats,-lc -o $@' ;; + (mingw*msvc*) + cf_cv_shlib_version=msvcdll + cf_cv_shlib_version_infix=msvcdll + shlibdir=$bindir + MAKE_DLLS= + if test "$DFT_LWR_MODEL" = "shared" ; then + LOCAL_LDFLAGS="-link -dll" + LOCAL_LDFLAGS2="$LOCAL_LDFLAGS" + EXTRA_LDFLAGS="-link -dll $EXTRA_LDFLAGS" + fi + CC_SHARED_OPTS= + MK_SHARED_LIB=$SHELL' '$rel_builddir'/mk_shared_lib.sh $@ ${LD} ${CFLAGS}' + RM_SHARED_OPTS="$RM_SHARED_OPTS $rel_builddir/mk_shared_lib.sh *.dll.lib" + cat >mk_shared_lib.sh <<-CF_EOF + #!$SHELL + SHARED_LIB=\$1 + IMPORT_LIB=\`echo "\$1" | sed -e 's/[0-9]*\.dll$/.dll.lib/'\` + shift + my_ld=\$1 + shift + cat <<-EOF + Linking shared library + ** SHARED LIB \$SHARED_LIB + ** IMPORT_LIB \$IMPORT_LIB +EOF + args=\$(echo \$* | sed -E "s#-l(\w*)#\1.dll.lib#g" | sed -E "s#-L(\w*)#-LIBPATH:\1#g") + exec \$my_ld -DLL -IMPLIB:"\${IMPORT_LIB}" -OUT:"\${SHARED_LIB}" ${LDFLAGS} \$args + mv "\${IMPORT_LIB}" "\${IMPORT_LIB}" +CF_EOF + chmod +x mk_shared_lib.sh + cat >mk_prog.sh <<-CF_EOF + #!$SHELL + shift + # Ignore first argument (compiler) and use LD (link.exe) unconditionally + LD="$LD" + clopts=() + ldopts=("/subsystem:console") + libs=() + isdll=0 + while test \$# -gt 0; do + case "\$1" in + -link) + # ignore -link argument + ;; + -M[TD] | -M[TD]d) + # ignore runtime-library option + ;; + -dll) + isdll=1 + ;; + -W* | -w*) + # ignore warnings + ;; + -D*) + clopts+=("\$1") + ;; + -I*) + clopts+=("\$1") + ;; + -l*) + libs+=("\`echo \"\$1\" | sed \"s/^-l//\"\`") + ;; + -L*) + ldopts+=("\`echo \"\$1\" | sed \"s/^-L/-LIBPATH:/\"\`") + ;; + *.obj | *.o) + ldopts+=("\$1") + ;; + -Wl,*) + for linkarg in \`echo '\$1' | sed -e 's/-Wl,//' -e 's/,/ /'\`; do + ldopts+=("\${linkarg}") + done + ;; + *.lib) + ldopts+=("\$1") + ;; + -o) + shift + ldopts+=("-out:\$1") + ;; + *) + clopts+=("\$1") + ldopts+=("\$1") + ;; + esac + shift + done + if [ "\$isdll" -ne 0 ]; then + for lib in \${libs[*]}; do + ldopts+=("\$lib.dll.lib") + done + else + for lib in \${libs[*]}; do + ldopts+=("\$lib.lib") + done + fi + cat <<-EOF + Creating program + ** ld options: "\${ldopts[@]}" +EOF + exec \$LD \${ldopts[@]} +CF_EOF + chmod +x mk_prog.sh + LINK_PROGS="$SHELL ${rel_builddir}/mk_prog.sh" + LINK_TESTS="$SHELL ${rel_builddir}/mk_prog.sh" + ;; (mingw*) cf_cv_shlib_version=mingw cf_cv_shlib_version_infix=mingw @@ -11335,7 +13265,7 @@ CF_EOF chmod +x mk_shared_lib.sh ;; (openbsd[2-9].*|mirbsd*) - if test "$DFT_LWR_MODEL" = "shared" ; then + if test "$DFT_LWR_MODEL" = "shared" && test -n "$LD_RPATH_OPT" ; then LOCAL_LDFLAGS="${LD_RPATH_OPT}\$(LOCAL_LIBDIR)" LOCAL_LDFLAGS2="$LOCAL_LDFLAGS" fi @@ -11353,6 +13283,14 @@ CF_EOF MK_SHARED_LIB='${CC} ${LDFLAGS} ${CFLAGS} -shared -Wl,-Bshareable,-soname,'$cf_cv_shared_soname',-stats,-lc -o $@' ;; + (nskJ*) + CC_SHARED_OPTS= + MK_SHARED_LIB='${LD} -Wshared -Weld=-export_all -o $@' + ;; + (nskL*) + CC_SHARED_OPTS= + MK_SHARED_LIB='${LD} -Wshared -Wxld=-export_all -o $@' + ;; (nto-qnx*|openbsd*|freebsd[12].*) CC_SHARED_OPTS="$CC_SHARED_OPTS -DPIC" MK_SHARED_LIB='${LD} ${LDFLAGS} -Bshareable -o $@' @@ -11398,7 +13336,7 @@ CF_EOF MK_SHARED_LIB='${CC} ${LDFLAGS} ${CFLAGS} -shared -Wl,-soname,'$cf_cv_shared_soname' -o $@' else - MK_SHARED_LIB='${CC} ${LDFLAGS} ${CFLAGS} -Wl,-shared -Wl,-Bshareable -o $@' + MK_SHARED_LIB='${CC} ${LDFLAGS} ${CFLAGS} -shared -o $@' fi ;; (osf*|mls+*) @@ -11406,13 +13344,13 @@ CF_EOF # tested with OSF/1 V3.2 and gcc 2.6.3 (but the c++ demo didn't # link with shared libs). MK_SHARED_LIB='${LD} ${LDFLAGS} -set_version ${REL_VERSION}:${ABI_VERSION} -expect_unresolved "*" -shared -soname `basename $@`' - case $host_os in + case "$host_os" in (osf4*) MK_SHARED_LIB="${MK_SHARED_LIB} -msym" ;; esac MK_SHARED_LIB="${MK_SHARED_LIB}"' -o $@' - if test "$DFT_LWR_MODEL" = "shared" ; then + if test "$DFT_LWR_MODEL" = "shared" && test -n "$LD_RPATH_OPT" ; then LOCAL_LDFLAGS="${LD_RPATH_OPT}\$(LOCAL_LIBDIR)" LOCAL_LDFLAGS2="$LOCAL_LDFLAGS" fi @@ -11463,36 +13401,36 @@ CF_EOF for cf_shared_opts in -xcode=pic32 -xcode=pic13 -KPIC -Kpic -O do CFLAGS="$cf_shared_opts $cf_save_CFLAGS" - cat >conftest.$ac_ext <<_ACEOF -#line 11467 "configure" + cat >"conftest.$ac_ext" <<_ACEOF +#line 13405 "configure" #include "confdefs.h" #include <stdio.h> int main (void) { -printf("Hello\n"); +printf("Hello\\n"); ; return 0; } _ACEOF -rm -f conftest.$ac_objext -if { (eval echo "$as_me:11479: \"$ac_compile\"") >&5 +rm -f "conftest.$ac_objext" +if { (eval echo "$as_me:13417: \"$ac_compile\"") >&5 (eval $ac_compile) 2>&5 ac_status=$? - echo "$as_me:11482: \$? = $ac_status" >&5 - (exit $ac_status); } && - { ac_try='test -s conftest.$ac_objext' - { (eval echo "$as_me:11485: \"$ac_try\"") >&5 + echo "$as_me:13420: \$? = $ac_status" >&5 + (exit "$ac_status"); } && + { ac_try='test -s "conftest.$ac_objext"' + { (eval echo "$as_me:13423: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? - echo "$as_me:11488: \$? = $ac_status" >&5 - (exit $ac_status); }; }; then + echo "$as_me:13426: \$? = $ac_status" >&5 + (exit "$ac_status"); }; }; then break else echo "$as_me: failed program was:" >&5 -cat conftest.$ac_ext >&5 +cat "conftest.$ac_ext" >&5 fi -rm -f conftest.$ac_objext conftest.$ac_ext +rm -f "conftest.$ac_objext" "conftest.$ac_ext" done CFLAGS="$cf_save_CFLAGS" CC_SHARED_OPTS=$cf_shared_opts @@ -11522,7 +13460,7 @@ rm -f conftest.$ac_objext conftest.$ac_ext test "$cf_cv_do_symlinks" = no && cf_cv_do_symlinks=yes ;; (*) - { echo "$as_me:11525: WARNING: ignored --with-shlib-version" >&5 + { echo "$as_me:13463: WARNING: ignored --with-shlib-version" >&5 echo "$as_me: WARNING: ignored --with-shlib-version" >&2;} ;; esac @@ -11532,11 +13470,11 @@ echo "$as_me: WARNING: ignored --with-shlib-version" >&2;} if test -n "$cf_try_cflags" then cat > conftest.$ac_ext <<EOF -#line 11535 "${as_me:-configure}" +#line 13473 "${as_me:-configure}" #include <stdio.h> int main(int argc, char *argv[]) { - printf("hello\n"); + printf("hello\\n"); return (argv[argc-1] == 0) ; } EOF @@ -11544,18 +13482,18 @@ EOF for cf_opt in $cf_try_cflags do CFLAGS="$cf_save_CFLAGS -$cf_opt" - echo "$as_me:11547: checking if CFLAGS option -$cf_opt works" >&5 + echo "$as_me:13485: checking if CFLAGS option -$cf_opt works" >&5 echo $ECHO_N "checking if CFLAGS option -$cf_opt works... $ECHO_C" >&6 - if { (eval echo "$as_me:11549: \"$ac_compile\"") >&5 + if { (eval echo "$as_me:13487: \"$ac_compile\"") >&5 (eval $ac_compile) 2>&5 ac_status=$? - echo "$as_me:11552: \$? = $ac_status" >&5 - (exit $ac_status); }; then - echo "$as_me:11554: result: yes" >&5 + echo "$as_me:13490: \$? = $ac_status" >&5 + (exit "$ac_status"); }; then + echo "$as_me:13492: result: yes" >&5 echo "${ECHO_T}yes" >&6 cf_save_CFLAGS="$CFLAGS" else - echo "$as_me:11558: result: no" >&5 + echo "$as_me:13496: result: no" >&5 echo "${ECHO_T}no" >&6 fi done @@ -11566,17 +13504,17 @@ echo "${ECHO_T}no" >&6 test -n "$cf_ld_rpath_opt" && MK_SHARED_LIB="$MK_SHARED_LIB $cf_ld_rpath_opt\${RPATH_LIST}" test -z "$RPATH_LIST" && RPATH_LIST="\${libdir}" - test $cf_cv_rm_so_locs = yes && RM_SHARED_OPTS="$RM_SHARED_OPTS so_locations" + test "$cf_cv_rm_so_locs" = yes && RM_SHARED_OPTS="$RM_SHARED_OPTS so_locations" test -n "$verbose" && echo " CC_SHARED_OPTS: $CC_SHARED_OPTS" 1>&6 -echo "${as_me:-configure}:11573: testing CC_SHARED_OPTS: $CC_SHARED_OPTS ..." 1>&5 +echo "${as_me:-configure}:13511: testing CC_SHARED_OPTS: $CC_SHARED_OPTS ..." 1>&5 test -n "$verbose" && echo " MK_SHARED_LIB: $MK_SHARED_LIB" 1>&6 -echo "${as_me:-configure}:11577: testing MK_SHARED_LIB: $MK_SHARED_LIB ..." 1>&5 +echo "${as_me:-configure}:13515: testing MK_SHARED_LIB: $MK_SHARED_LIB ..." 1>&5 -echo "$as_me:11579: checking if versioned-symbols file should be used" >&5 +echo "$as_me:13517: checking if versioned-symbols file should be used" >&5 echo $ECHO_N "checking if versioned-symbols file should be used... $ECHO_C" >&6 # Check whether --with-versioned-syms or --without-versioned-syms was given. @@ -11586,12 +13524,26 @@ if test "${with_versioned_syms+set}" = set; then else with_versioned_syms=no fi; -if test "x$with_versioned_syms" = xyes -then +case "x$with_versioned_syms" in +(xyes) with_versioned_syms='${top_srcdir}/package/${PACKAGE}.map' -fi -echo "$as_me:11594: result: $with_versioned_syms" >&5 + ;; +(xno) + ;; +(x/*) + test -f "$with_versioned_syms" || { { echo "$as_me:13535: error: expected a filename: $with_versioned_syms" >&5 +echo "$as_me: error: expected a filename: $with_versioned_syms" >&2;} + { (exit 1); exit 1; }; } + ;; +(*) + test -f "$with_versioned_syms" || { { echo "$as_me:13540: error: expected a filename: $with_versioned_syms" >&5 +echo "$as_me: error: expected a filename: $with_versioned_syms" >&2;} + { (exit 1); exit 1; }; } + with_versioned_syms=`pwd`/"$with_versioned_syms" + ;; +esac +echo "$as_me:13546: result: $with_versioned_syms" >&5 echo "${ECHO_T}$with_versioned_syms" >&6 RESULTING_SYMS= @@ -11607,7 +13559,7 @@ then MK_SHARED_LIB=`echo "$MK_SHARED_LIB" | sed -e "s%-Wl,%\\${VERSIONED_SYMS} -Wl,%"` test -n "$verbose" && echo " MK_SHARED_LIB: $MK_SHARED_LIB" 1>&6 -echo "${as_me:-configure}:11610: testing MK_SHARED_LIB: $MK_SHARED_LIB ..." 1>&5 +echo "${as_me:-configure}:13562: testing MK_SHARED_LIB: $MK_SHARED_LIB ..." 1>&5 ;; (*-dy\ *) @@ -11615,11 +13567,11 @@ echo "${as_me:-configure}:11610: testing MK_SHARED_LIB: $MK_SHARED_LIB ..." 1>& MK_SHARED_LIB=`echo "$MK_SHARED_LIB" | sed -e "s%-dy%\\${VERSIONED_SYMS} -dy%"` test -n "$verbose" && echo " MK_SHARED_LIB: $MK_SHARED_LIB" 1>&6 -echo "${as_me:-configure}:11618: testing MK_SHARED_LIB: $MK_SHARED_LIB ..." 1>&5 +echo "${as_me:-configure}:13570: testing MK_SHARED_LIB: $MK_SHARED_LIB ..." 1>&5 ;; (*) - { echo "$as_me:11622: WARNING: this system does not support versioned-symbols" >&5 + { echo "$as_me:13574: WARNING: this system does not support versioned-symbols" >&5 echo "$as_me: WARNING: this system does not support versioned-symbols" >&2;} ;; esac @@ -11631,7 +13583,7 @@ echo "$as_me: WARNING: this system does not support versioned-symbols" >&2;} # symbols. if test "x$VERSIONED_SYMS" != "x" then - echo "$as_me:11634: checking if wildcards can be used to selectively omit symbols" >&5 + echo "$as_me:13586: checking if wildcards can be used to selectively omit symbols" >&5 echo $ECHO_N "checking if wildcards can be used to selectively omit symbols... $ECHO_C" >&6 WILDCARD_SYMS=no @@ -11668,7 +13620,7 @@ local: } submodule_1.0; EOF cat >conftest.$ac_ext <<EOF -#line 11671 "configure" +#line 13623 "configure" int _ismissing(void) { return 1; } int _localf1(void) { return 1; } int _localf2(void) { return 2; } @@ -11696,10 +13648,10 @@ EOF if make -f conftest.mk 2>&5 >/dev/null then # test for missing symbol in either Data or Text section - cf_missing=`nm -P conftest.so 2>&5 |fgrep _ismissing | egrep '[ ][DT][ ]'` + cf_missing="`nm -P conftest.so 2>&5 |${FGREP-fgrep} _ismissing | ${EGREP-egrep} '[ ][DT][ ]'`" test -n "$cf_missing" && WILDCARD_SYMS=yes fi - echo "$as_me:11702: result: $WILDCARD_SYMS" >&5 + echo "$as_me:13654: result: $WILDCARD_SYMS" >&5 echo "${ECHO_T}$WILDCARD_SYMS" >&6 rm -f conftest.* fi @@ -11722,19 +13674,37 @@ LIB_SUFFIX= DFT_DEP_SUFFIX=$DFT_LIB_SUFFIX ;; (Xdebug) - DFT_LIB_SUFFIX='_g.a' + case "$cf_cv_system_name" in + (*-msvc*) + DFT_LIB_SUFFIX='_g.lib' + ;; + (*) + DFT_LIB_SUFFIX='_g.a' + ;; + esac DFT_DEP_SUFFIX=$DFT_LIB_SUFFIX ;; (Xprofile) - DFT_LIB_SUFFIX='_p.a' + case "$cf_cv_system_name" in + (*-msvc*) + DFT_LIB_SUFFIX='_p.lib' + ;; + (*) + DFT_LIB_SUFFIX='_p.a' + ;; + esac DFT_DEP_SUFFIX=$DFT_LIB_SUFFIX ;; (Xshared) - case $cf_cv_system_name in + case "$cf_cv_system_name" in (aix[5-7]*) DFT_LIB_SUFFIX='.so' DFT_DEP_SUFFIX=$DFT_LIB_SUFFIX ;; + (*-msvc*) + DFT_LIB_SUFFIX='.dll' + DFT_DEP_SUFFIX='.dll.lib' + ;; (cygwin*|msys*|mingw*) DFT_LIB_SUFFIX='.dll' DFT_DEP_SUFFIX='.dll.a' @@ -11744,7 +13714,7 @@ LIB_SUFFIX= DFT_DEP_SUFFIX=$DFT_LIB_SUFFIX ;; (hpux*) - case $target in + case "$target" in (ia64*) DFT_LIB_SUFFIX='.so' DFT_DEP_SUFFIX=$DFT_LIB_SUFFIX @@ -11762,7 +13732,14 @@ LIB_SUFFIX= esac ;; (*) - DFT_LIB_SUFFIX='.a' + case "$target" in + (*-msvc*) + DFT_LIB_SUFFIX='.lib' + ;; + (*) + DFT_LIB_SUFFIX='.a' + ;; + esac DFT_DEP_SUFFIX=$DFT_LIB_SUFFIX ;; esac @@ -11774,7 +13751,7 @@ LIB_SUFFIX= LIB_SUFFIX=$DFT_LIB_SUFFIX -echo "$as_me:11777: checking for specific curses-directory" >&5 +echo "$as_me:13754: 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. @@ -11784,10 +13761,10 @@ if test "${with_curses_dir+set}" = set; then else cf_cv_curses_dir=no fi; -echo "$as_me:11787: result: $cf_cv_curses_dir" >&5 +echo "$as_me:13764: 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 @@ -11803,19 +13780,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:11818: error: expected a pathname, not \"$withval\"" >&5 + { { echo "$as_me:13795: error: expected a pathname, not \"$withval\"" >&5 echo "$as_me: error: expected a pathname, not \"$withval\"" >&2;} { (exit 1); exit 1; }; } ;; @@ -11827,9 +13804,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 @@ -11850,8 +13827,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 11854 "configure" + cat >"conftest.$ac_ext" <<_ACEOF +#line 13831 "configure" #include "confdefs.h" #include <stdio.h> int @@ -11862,25 +13839,25 @@ printf("Hello") return 0; } _ACEOF -rm -f conftest.$ac_objext -if { (eval echo "$as_me:11866: \"$ac_compile\"") >&5 +rm -f "conftest.$ac_objext" +if { (eval echo "$as_me:13843: \"$ac_compile\"") >&5 (eval $ac_compile) 2>&5 ac_status=$? - echo "$as_me:11869: \$? = $ac_status" >&5 - (exit $ac_status); } && - { ac_try='test -s conftest.$ac_objext' - { (eval echo "$as_me:11872: \"$ac_try\"") >&5 + echo "$as_me:13846: \$? = $ac_status" >&5 + (exit "$ac_status"); } && + { ac_try='test -s "conftest.$ac_objext"' + { (eval echo "$as_me:13849: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? - echo "$as_me:11875: \$? = $ac_status" >&5 - (exit $ac_status); }; }; then + echo "$as_me:13852: \$? = $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 @@ -11889,11 +13866,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}:11892: testing adding $cf_add_incdir to include-path ..." 1>&5 +echo "${as_me:-configure}:13869: 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 @@ -11909,9 +13886,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 @@ -11925,7 +13902,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}:11928: testing adding $cf_add_libdir to library-path ..." 1>&5 +echo "${as_me:-configure}:13905: testing adding $cf_add_libdir to library-path ..." 1>&5 LDFLAGS="-L$cf_add_libdir $LDFLAGS" fi @@ -11936,20 +13913,7 @@ fi fi fi -echo "$as_me:11939: checking if rpath option should be used" >&5 -echo $ECHO_N "checking if rpath option should be used... $ECHO_C" >&6 - -# Check whether --enable-rpath or --disable-rpath was given. -if test "${enable_rpath+set}" = set; then - enableval="$enable_rpath" - cf_cv_enable_rpath=$enableval -else - cf_cv_enable_rpath=no -fi; -echo "$as_me:11949: result: $cf_cv_enable_rpath" >&5 -echo "${ECHO_T}$cf_cv_enable_rpath" >&6 - -echo "$as_me:11952: checking for specific curses-directory" >&5 +echo "$as_me:13916: 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. @@ -11959,10 +13923,10 @@ if test "${with_curses_dir+set}" = set; then else cf_cv_curses_dir=no fi; -echo "$as_me:11962: result: $cf_cv_curses_dir" >&5 +echo "$as_me:13926: 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 @@ -11978,19 +13942,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:11993: error: expected a pathname, not \"$withval\"" >&5 + { { echo "$as_me:13957: error: expected a pathname, not \"$withval\"" >&5 echo "$as_me: error: expected a pathname, not \"$withval\"" >&2;} { (exit 1); exit 1; }; } ;; @@ -12002,9 +13966,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 @@ -12025,8 +13989,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 12029 "configure" + cat >"conftest.$ac_ext" <<_ACEOF +#line 13993 "configure" #include "confdefs.h" #include <stdio.h> int @@ -12037,25 +14001,25 @@ printf("Hello") return 0; } _ACEOF -rm -f conftest.$ac_objext -if { (eval echo "$as_me:12041: \"$ac_compile\"") >&5 +rm -f "conftest.$ac_objext" +if { (eval echo "$as_me:14005: \"$ac_compile\"") >&5 (eval $ac_compile) 2>&5 ac_status=$? - echo "$as_me:12044: \$? = $ac_status" >&5 - (exit $ac_status); } && - { ac_try='test -s conftest.$ac_objext' - { (eval echo "$as_me:12047: \"$ac_try\"") >&5 + echo "$as_me:14008: \$? = $ac_status" >&5 + (exit "$ac_status"); } && + { ac_try='test -s "conftest.$ac_objext"' + { (eval echo "$as_me:14011: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? - echo "$as_me:12050: \$? = $ac_status" >&5 - (exit $ac_status); }; }; then + echo "$as_me:14014: \$? = $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 @@ -12064,11 +14028,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}:12067: testing adding $cf_add_incdir to include-path ..." 1>&5 +echo "${as_me:-configure}:14031: 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 @@ -12084,9 +14048,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 @@ -12100,7 +14064,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}:12103: testing adding $cf_add_libdir to library-path ..." 1>&5 +echo "${as_me:-configure}:14067: testing adding $cf_add_libdir to library-path ..." 1>&5 LDFLAGS="-L$cf_add_libdir $LDFLAGS" fi @@ -12113,7 +14077,7 @@ fi cf_cv_screen=curses -echo "$as_me:12116: checking for specified curses library type" >&5 +echo "$as_me:14080: 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. @@ -12157,20 +14121,20 @@ fi; fi; fi; -echo "$as_me:12160: result: $cf_cv_screen" >&5 +echo "$as_me:14124: result: $cf_cv_screen" >&5 echo "${ECHO_T}$cf_cv_screen" >&6 case $cf_cv_screen in (curses|curses_*) -echo "$as_me:12166: checking for extra include directories" >&5 +echo "$as_me:14130: 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 @@ -12189,7 +14153,7 @@ case $host_os in esac fi -echo "$as_me:12192: result: $cf_cv_curses_incdir" >&5 +echo "$as_me:14156: result: $cf_cv_curses_incdir" >&5 echo "${ECHO_T}$cf_cv_curses_incdir" >&6 if test "$cf_cv_curses_incdir" != no then @@ -12199,7 +14163,7 @@ then fi -echo "$as_me:12202: checking if we have identified curses headers" >&5 +echo "$as_me:14166: 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 @@ -12210,8 +14174,8 @@ for cf_header in \ ncurses.h \ curses.h ncurses/ncurses.h ncurses/curses.h do -cat >conftest.$ac_ext <<_ACEOF -#line 12214 "configure" +cat >"conftest.$ac_ext" <<_ACEOF +#line 14178 "configure" #include "confdefs.h" #include <${cf_header}> int @@ -12222,32 +14186,32 @@ initscr(); tgoto("?", 0,0) return 0; } _ACEOF -rm -f conftest.$ac_objext -if { (eval echo "$as_me:12226: \"$ac_compile\"") >&5 +rm -f "conftest.$ac_objext" +if { (eval echo "$as_me:14190: \"$ac_compile\"") >&5 (eval $ac_compile) 2>&5 ac_status=$? - echo "$as_me:12229: \$? = $ac_status" >&5 - (exit $ac_status); } && - { ac_try='test -s conftest.$ac_objext' - { (eval echo "$as_me:12232: \"$ac_try\"") >&5 + echo "$as_me:14193: \$? = $ac_status" >&5 + (exit "$ac_status"); } && + { ac_try='test -s "conftest.$ac_objext"' + { (eval echo "$as_me:14196: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? - echo "$as_me:12235: \$? = $ac_status" >&5 - (exit $ac_status); }; }; then + echo "$as_me:14199: \$? = $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:12246: result: $cf_cv_ncurses_header" >&5 +echo "$as_me:14210: 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:12250: error: No curses header-files found" >&5 + { { echo "$as_me:14214: error: No curses header-files found" >&5 echo "$as_me: error: No curses header-files found" >&2;} { (exit 1); exit 1; }; } fi @@ -12257,24 +14221,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:12260: checking for $ac_header" >&5 +echo "$as_me:14224: 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 12266 "configure" + cat >"conftest.$ac_ext" <<_ACEOF +#line 14230 "configure" #include "confdefs.h" #include <$ac_header> _ACEOF -if { (eval echo "$as_me:12270: \"$ac_cpp conftest.$ac_ext\"") >&5 - (eval $ac_cpp conftest.$ac_ext) 2>conftest.er1 +if { (eval echo "$as_me:14234: \"$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:12276: \$? = $ac_status" >&5 - (exit $ac_status); } >/dev/null; then + echo "$as_me:14240: \$? = $ac_status" >&5 + (exit "$ac_status"); } >/dev/null; then if test -s conftest.err; then ac_cpp_err=$ac_c_preproc_warn_flag else @@ -12287,14 +14251,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:12295: 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:14259: result: `eval echo '${'"$as_ac_Header"'}'`" >&5 +echo "${ECHO_T}`eval echo '${'"$as_ac_Header"'}'`" >&6 +if test "`eval echo '${'"$as_ac_Header"'}'`" = yes; then cat >>confdefs.h <<EOF #define `echo "HAVE_$ac_header" | $as_tr_cpp` 1 EOF @@ -12302,13 +14266,13 @@ EOF fi done -echo "$as_me:12305: checking for terminfo header" >&5 +echo "$as_me:14269: 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%'` ;; @@ -12319,8 +14283,8 @@ esac for cf_test in $cf_term_header "ncurses/term.h" "ncursesw/term.h" do -cat >conftest.$ac_ext <<_ACEOF -#line 12323 "configure" +cat >"conftest.$ac_ext" <<_ACEOF +#line 14287 "configure" #include "confdefs.h" #include <stdio.h> #include <${cf_cv_ncurses_header:-curses.h}> @@ -12329,43 +14293,43 @@ cat >conftest.$ac_ext <<_ACEOF int main (void) { -int x = auto_left_margin +int x = auto_left_margin; (void)x ; return 0; } _ACEOF -rm -f conftest.$ac_objext -if { (eval echo "$as_me:12338: \"$ac_compile\"") >&5 +rm -f "conftest.$ac_objext" +if { (eval echo "$as_me:14302: \"$ac_compile\"") >&5 (eval $ac_compile) 2>&5 ac_status=$? - echo "$as_me:12341: \$? = $ac_status" >&5 - (exit $ac_status); } && - { ac_try='test -s conftest.$ac_objext' - { (eval echo "$as_me:12344: \"$ac_try\"") >&5 + echo "$as_me:14305: \$? = $ac_status" >&5 + (exit "$ac_status"); } && + { ac_try='test -s "conftest.$ac_objext"' + { (eval echo "$as_me:14308: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? - echo "$as_me:12347: \$? = $ac_status" >&5 - (exit $ac_status); }; }; then + echo "$as_me:14311: \$? = $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:12363: result: $cf_cv_term_header" >&5 +echo "$as_me:14327: 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 @@ -12375,7 +14339,7 @@ EOF ;; esac -case $cf_cv_term_header in +case "$cf_cv_term_header" in (ncurses/term.h) cat >>confdefs.h <<\EOF @@ -12392,7 +14356,7 @@ EOF ;; esac -echo "$as_me:12395: checking for ncurses version" >&5 +echo "$as_me:14359: 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 @@ -12400,12 +14364,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 <<EOF + cat > "conftest.$ac_ext" <<EOF #include <${cf_cv_ncurses_header:-curses.h}> #undef Autoconf #ifdef NCURSES_VERSION @@ -12418,20 +14382,20 @@ Autoconf "old" #endif EOF cf_try="$ac_cpp conftest.$ac_ext 2>&5 | grep '^Autoconf ' >conftest.out" - { (eval echo "$as_me:12421: \"$cf_try\"") >&5 + { (eval echo "$as_me:14385: \"$cf_try\"") >&5 (eval $cf_try) 2>&5 ac_status=$? - echo "$as_me:12424: \$? = $ac_status" >&5 - (exit $ac_status); } + echo "$as_me:14388: \$? = $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 12434 "configure" + cat >"conftest.$ac_ext" <<_ACEOF +#line 14398 "configure" #include "confdefs.h" #include <${cf_cv_ncurses_header:-curses.h}> @@ -12441,13 +14405,13 @@ 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 @@ -12455,40 +14419,40 @@ int main(void) ${cf_cv_main_return:-return}(0); } _ACEOF -rm -f conftest$ac_exeext -if { (eval echo "$as_me:12459: \"$ac_link\"") >&5 +rm -f "conftest$ac_exeext" +if { (eval echo "$as_me:14423: \"$ac_link\"") >&5 (eval $ac_link) 2>&5 ac_status=$? - echo "$as_me:12462: \$? = $ac_status" >&5 - (exit $ac_status); } && { ac_try='./conftest$ac_exeext' - { (eval echo "$as_me:12464: \"$ac_try\"") >&5 + echo "$as_me:14426: \$? = $ac_status" >&5 + (exit "$ac_status"); } && { ac_try='"./conftest$ac_exeext"' + { (eval echo "$as_me:14428: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? - echo "$as_me:12467: \$? = $ac_status" >&5 - (exit $ac_status); }; }; then + echo "$as_me:14431: \$? = $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:12481: result: $cf_cv_ncurses_version" >&5 +echo "$as_me:14445: 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:12488: checking if we have identified curses libraries" >&5 +echo "$as_me:14452: 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 12491 "configure" +cat >"conftest.$ac_ext" <<_ACEOF +#line 14455 "configure" #include "confdefs.h" #include <${cf_cv_ncurses_header:-curses.h}> int @@ -12499,40 +14463,40 @@ initscr(); tgoto("?", 0,0) return 0; } _ACEOF -rm -f conftest.$ac_objext conftest$ac_exeext -if { (eval echo "$as_me:12503: \"$ac_link\"") >&5 +rm -f "conftest.$ac_objext" "conftest$ac_exeext" +if { (eval echo "$as_me:14467: \"$ac_link\"") >&5 (eval $ac_link) 2>&5 ac_status=$? - echo "$as_me:12506: \$? = $ac_status" >&5 - (exit $ac_status); } && - { ac_try='test -s conftest$ac_exeext' - { (eval echo "$as_me:12509: \"$ac_try\"") >&5 + echo "$as_me:14470: \$? = $ac_status" >&5 + (exit "$ac_status"); } && + { ac_try='test -s "conftest$ac_exeext"' + { (eval echo "$as_me:14473: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? - echo "$as_me:12512: \$? = $ac_status" >&5 - (exit $ac_status); }; }; then + echo "$as_me:14476: \$? = $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:12521: result: $cf_result" >&5 +rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext" +echo "$as_me:14485: 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:12527: checking for tgoto in -lmytinfo" >&5 + echo "$as_me:14491: 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 12535 "configure" +cat >"conftest.$ac_ext" <<_ACEOF +#line 14499 "configure" #include "confdefs.h" /* Override any gcc2 internal prototype to avoid an error. */ @@ -12550,44 +14514,44 @@ tgoto (); return 0; } _ACEOF -rm -f conftest.$ac_objext conftest$ac_exeext -if { (eval echo "$as_me:12554: \"$ac_link\"") >&5 +rm -f "conftest.$ac_objext" "conftest$ac_exeext" +if { (eval echo "$as_me:14518: \"$ac_link\"") >&5 (eval $ac_link) 2>&5 ac_status=$? - echo "$as_me:12557: \$? = $ac_status" >&5 - (exit $ac_status); } && - { ac_try='test -s conftest$ac_exeext' - { (eval echo "$as_me:12560: \"$ac_try\"") >&5 + echo "$as_me:14521: \$? = $ac_status" >&5 + (exit "$ac_status"); } && + { ac_try='test -s "conftest$ac_exeext"' + { (eval echo "$as_me:14524: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? - echo "$as_me:12563: \$? = $ac_status" >&5 - (exit $ac_status); }; }; then + echo "$as_me:14527: \$? = $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:12574: result: $ac_cv_lib_mytinfo_tgoto" >&5 +echo "$as_me:14538: result: $ac_cv_lib_mytinfo_tgoto" >&5 echo "${ECHO_T}$ac_cv_lib_mytinfo_tgoto" >&6 -if test $ac_cv_lib_mytinfo_tgoto = yes; then - -cf_add_libs="-lmytinfo" -# Filter out duplicates - this happens with badly-designed ".pc" files... -for cf_add_1lib in $LIBS -do - for cf_add_2lib in $cf_add_libs - do - if test "x$cf_add_1lib" = "x$cf_add_2lib" - then +if test "$ac_cv_lib_mytinfo_tgoto" = yes; then + +cf_add_libs="$LIBS" +# reverse order +cf_add_0lib= +for cf_add_1lib in -lmytinfo; do cf_add_0lib="$cf_add_1lib $cf_add_0lib"; done +# filter duplicates +for cf_add_1lib in $cf_add_0lib; do + for cf_add_2lib in $cf_add_libs; do + if test "x$cf_add_1lib" = "x$cf_add_2lib"; then cf_add_1lib= break fi done - test -n "$cf_add_1lib" && cf_add_libs="$cf_add_libs $cf_add_1lib" + test -n "$cf_add_1lib" && cf_add_libs="$cf_add_1lib $cf_add_libs" done LIBS="$cf_add_libs" @@ -12601,15 +14565,15 @@ fi # term.h) for cur_colr if test "x$cf_cv_screen" = "xcurses_colr" then - echo "$as_me:12604: checking for initscr in -lcur_colr" >&5 + echo "$as_me:14568: 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 12612 "configure" +cat >"conftest.$ac_ext" <<_ACEOF +#line 14576 "configure" #include "confdefs.h" /* Override any gcc2 internal prototype to avoid an error. */ @@ -12627,44 +14591,44 @@ initscr (); return 0; } _ACEOF -rm -f conftest.$ac_objext conftest$ac_exeext -if { (eval echo "$as_me:12631: \"$ac_link\"") >&5 +rm -f "conftest.$ac_objext" "conftest$ac_exeext" +if { (eval echo "$as_me:14595: \"$ac_link\"") >&5 (eval $ac_link) 2>&5 ac_status=$? - echo "$as_me:12634: \$? = $ac_status" >&5 - (exit $ac_status); } && - { ac_try='test -s conftest$ac_exeext' - { (eval echo "$as_me:12637: \"$ac_try\"") >&5 + echo "$as_me:14598: \$? = $ac_status" >&5 + (exit "$ac_status"); } && + { ac_try='test -s "conftest$ac_exeext"' + { (eval echo "$as_me:14601: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? - echo "$as_me:12640: \$? = $ac_status" >&5 - (exit $ac_status); }; }; then + echo "$as_me:14604: \$? = $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:12651: result: $ac_cv_lib_cur_colr_initscr" >&5 +echo "$as_me:14615: 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 - -cf_add_libs="-lcur_colr" -# Filter out duplicates - this happens with badly-designed ".pc" files... -for cf_add_1lib in $LIBS -do - for cf_add_2lib in $cf_add_libs - do - if test "x$cf_add_1lib" = "x$cf_add_2lib" - then +if test "$ac_cv_lib_cur_colr_initscr" = yes; then + +cf_add_libs="$LIBS" +# reverse order +cf_add_0lib= +for cf_add_1lib in -lcur_colr; do cf_add_0lib="$cf_add_1lib $cf_add_0lib"; done +# filter duplicates +for cf_add_1lib in $cf_add_0lib; do + for cf_add_2lib in $cf_add_libs; do + if test "x$cf_add_1lib" = "x$cf_add_2lib"; then cf_add_1lib= break fi done - test -n "$cf_add_1lib" && cf_add_libs="$cf_add_libs $cf_add_1lib" + test -n "$cf_add_1lib" && cf_add_libs="$cf_add_1lib $cf_add_libs" done LIBS="$cf_add_libs" @@ -12672,15 +14636,15 @@ LIBS="$cf_add_libs" else - echo "$as_me:12675: checking for initscr in -lHcurses" >&5 + echo "$as_me:14639: 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 12683 "configure" +cat >"conftest.$ac_ext" <<_ACEOF +#line 14647 "configure" #include "confdefs.h" /* Override any gcc2 internal prototype to avoid an error. */ @@ -12698,46 +14662,46 @@ initscr (); return 0; } _ACEOF -rm -f conftest.$ac_objext conftest$ac_exeext -if { (eval echo "$as_me:12702: \"$ac_link\"") >&5 +rm -f "conftest.$ac_objext" "conftest$ac_exeext" +if { (eval echo "$as_me:14666: \"$ac_link\"") >&5 (eval $ac_link) 2>&5 ac_status=$? - echo "$as_me:12705: \$? = $ac_status" >&5 - (exit $ac_status); } && - { ac_try='test -s conftest$ac_exeext' - { (eval echo "$as_me:12708: \"$ac_try\"") >&5 + echo "$as_me:14669: \$? = $ac_status" >&5 + (exit "$ac_status"); } && + { ac_try='test -s "conftest$ac_exeext"' + { (eval echo "$as_me:14672: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? - echo "$as_me:12711: \$? = $ac_status" >&5 - (exit $ac_status); }; }; then + echo "$as_me:14675: \$? = $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:12722: result: $ac_cv_lib_Hcurses_initscr" >&5 +echo "$as_me:14686: 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. -cf_add_libs="-lHcurses" -# Filter out duplicates - this happens with badly-designed ".pc" files... -for cf_add_1lib in $LIBS -do - for cf_add_2lib in $cf_add_libs - do - if test "x$cf_add_1lib" = "x$cf_add_2lib" - then +cf_add_libs="$LIBS" +# reverse order +cf_add_0lib= +for cf_add_1lib in -lHcurses; do cf_add_0lib="$cf_add_1lib $cf_add_0lib"; done +# filter duplicates +for cf_add_1lib in $cf_add_0lib; do + for cf_add_2lib in $cf_add_libs; do + if test "x$cf_add_1lib" = "x$cf_add_2lib"; then cf_add_1lib= break fi done - test -n "$cf_add_1lib" && cf_add_libs="$cf_add_libs $cf_add_1lib" + test -n "$cf_add_1lib" && cf_add_libs="$cf_add_1lib $cf_add_libs" done LIBS="$cf_add_libs" @@ -12761,9 +14725,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 @@ -12777,7 +14741,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}:12780: testing adding $cf_add_libdir to library-path ..." 1>&5 +echo "${as_me:-configure}:14744: testing adding $cf_add_libdir to library-path ..." 1>&5 LDFLAGS="-L$cf_add_libdir $LDFLAGS" fi @@ -12790,9 +14754,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 @@ -12806,7 +14770,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}:12809: testing adding $cf_add_libdir to library-path ..." 1>&5 +echo "${as_me:-configure}:14773: testing adding $cf_add_libdir to library-path ..." 1>&5 LDFLAGS="-L$cf_add_libdir $LDFLAGS" fi @@ -12821,9 +14785,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 @@ -12837,7 +14801,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}:12840: testing adding $cf_add_libdir to library-path ..." 1>&5 +echo "${as_me:-configure}:14804: testing adding $cf_add_libdir to library-path ..." 1>&5 LDFLAGS="-L$cf_add_libdir $LDFLAGS" fi @@ -12856,9 +14820,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 @@ -12872,7 +14836,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}:12875: testing adding $cf_add_libdir to library-path ..." 1>&5 +echo "${as_me:-configure}:14839: testing adding $cf_add_libdir to library-path ..." 1>&5 LDFLAGS="-L$cf_add_libdir $LDFLAGS" fi @@ -12880,19 +14844,19 @@ echo "${as_me:-configure}:12875: testing adding $cf_add_libdir to library-path . done fi -cf_add_libs="-lcurses -ltermcap" -# Filter out duplicates - this happens with badly-designed ".pc" files... -for cf_add_1lib in $LIBS -do - for cf_add_2lib in $cf_add_libs - do - if test "x$cf_add_1lib" = "x$cf_add_2lib" - then +cf_add_libs="$LIBS" +# reverse order +cf_add_0lib= +for cf_add_1lib in -lcurses -ltermcap; do cf_add_0lib="$cf_add_1lib $cf_add_0lib"; done +# filter duplicates +for cf_add_1lib in $cf_add_0lib; do + for cf_add_2lib in $cf_add_libs; do + if test "x$cf_add_1lib" = "x$cf_add_2lib"; then cf_add_1lib= break fi done - test -n "$cf_add_1lib" && cf_add_libs="$cf_add_libs $cf_add_1lib" + test -n "$cf_add_1lib" && cf_add_libs="$cf_add_1lib $cf_add_libs" done LIBS="$cf_add_libs" @@ -12916,80 +14880,80 @@ 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:12919: checking for tgoto" >&5 + echo "$as_me:14883: 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 12925 "configure" + cat >"conftest.$ac_ext" <<_ACEOF +#line 14889 "configure" #include "confdefs.h" -/* System header to define __stub macros and hopefully few prototypes, - which can conflict with char tgoto (); below. */ -#include <assert.h> -/* Override any gcc2 internal prototype to avoid an error. */ +#define tgoto autoconf_temporary +#include <limits.h> /* least-intrusive standard header which defines gcc2 __stub macros */ +#undef tgoto + #ifdef __cplusplus extern "C" #endif + /* We use char because int might match the return type of a gcc2 builtin and then its argument prototype would still apply. */ -char tgoto (); -char (*f) (); +char tgoto (void); int main (void) { -/* The GNU C library defines this for functions which it implements + +/* The GNU C library defines stubs for functions which it implements to always fail with ENOSYS. Some functions are actually named something starting with __ and the normal name is an alias. */ #if defined (__stub_tgoto) || defined (__stub___tgoto) -choke me -#else -f = tgoto; /* workaround for ICC 12.0.3 */ if (f == 0) return 1; +#error found stub for tgoto #endif + return tgoto (); ; return 0; } _ACEOF -rm -f conftest.$ac_objext conftest$ac_exeext -if { (eval echo "$as_me:12956: \"$ac_link\"") >&5 +rm -f "conftest.$ac_objext" "conftest$ac_exeext" +if { (eval echo "$as_me:14920: \"$ac_link\"") >&5 (eval $ac_link) 2>&5 ac_status=$? - echo "$as_me:12959: \$? = $ac_status" >&5 - (exit $ac_status); } && - { ac_try='test -s conftest$ac_exeext' - { (eval echo "$as_me:12962: \"$ac_try\"") >&5 + echo "$as_me:14923: \$? = $ac_status" >&5 + (exit "$ac_status"); } && + { ac_try='test -s "conftest$ac_exeext"' + { (eval echo "$as_me:14926: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? - echo "$as_me:12965: \$? = $ac_status" >&5 - (exit $ac_status); }; }; then + echo "$as_me:14929: \$? = $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:12975: result: $ac_cv_func_tgoto" >&5 +echo "$as_me:14939: 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:12984: checking for tgoto in -l$cf_term_lib" >&5 +echo "$as_me:14948: 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 12992 "configure" +cat >"conftest.$ac_ext" <<_ACEOF +#line 14956 "configure" #include "confdefs.h" /* Override any gcc2 internal prototype to avoid an error. */ @@ -13007,32 +14971,32 @@ tgoto (); return 0; } _ACEOF -rm -f conftest.$ac_objext conftest$ac_exeext -if { (eval echo "$as_me:13011: \"$ac_link\"") >&5 +rm -f "conftest.$ac_objext" "conftest$ac_exeext" +if { (eval echo "$as_me:14975: \"$ac_link\"") >&5 (eval $ac_link) 2>&5 ac_status=$? - echo "$as_me:13014: \$? = $ac_status" >&5 - (exit $ac_status); } && - { ac_try='test -s conftest$ac_exeext' - { (eval echo "$as_me:13017: \"$ac_try\"") >&5 + echo "$as_me:14978: \$? = $ac_status" >&5 + (exit "$ac_status"); } && + { ac_try='test -s "conftest$ac_exeext"' + { (eval echo "$as_me:14981: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? - echo "$as_me:13020: \$? = $ac_status" >&5 - (exit $ac_status); }; }; then + echo "$as_me:14984: \$? = $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:13031: 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:14995: 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 @@ -13051,10 +15015,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:13054: checking if we can link with $cf_curs_lib library" >&5 + echo "$as_me:15018: 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 13057 "configure" + cat >"conftest.$ac_ext" <<_ACEOF +#line 15021 "configure" #include "confdefs.h" #include <${cf_cv_ncurses_header:-curses.h}> int @@ -13065,35 +15029,35 @@ initscr() return 0; } _ACEOF -rm -f conftest.$ac_objext conftest$ac_exeext -if { (eval echo "$as_me:13069: \"$ac_link\"") >&5 +rm -f "conftest.$ac_objext" "conftest$ac_exeext" +if { (eval echo "$as_me:15033: \"$ac_link\"") >&5 (eval $ac_link) 2>&5 ac_status=$? - echo "$as_me:13072: \$? = $ac_status" >&5 - (exit $ac_status); } && - { ac_try='test -s conftest$ac_exeext' - { (eval echo "$as_me:13075: \"$ac_try\"") >&5 + echo "$as_me:15036: \$? = $ac_status" >&5 + (exit "$ac_status"); } && + { ac_try='test -s "conftest$ac_exeext"' + { (eval echo "$as_me:15039: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? - echo "$as_me:13078: \$? = $ac_status" >&5 - (exit $ac_status); }; }; then + echo "$as_me:15042: \$? = $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:13087: result: $cf_result" >&5 +rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext" + echo "$as_me:15051: 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:13093: checking if we need both $cf_curs_lib and $cf_term_lib libraries" >&5 + echo "$as_me:15057: 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 13096 "configure" + cat >"conftest.$ac_ext" <<_ACEOF +#line 15060 "configure" #include "confdefs.h" #include <${cf_cv_ncurses_header:-curses.h}> int @@ -13104,26 +15068,26 @@ initscr(); tgoto((char *)0, 0, 0); return 0; } _ACEOF -rm -f conftest.$ac_objext conftest$ac_exeext -if { (eval echo "$as_me:13108: \"$ac_link\"") >&5 +rm -f "conftest.$ac_objext" "conftest$ac_exeext" +if { (eval echo "$as_me:15072: \"$ac_link\"") >&5 (eval $ac_link) 2>&5 ac_status=$? - echo "$as_me:13111: \$? = $ac_status" >&5 - (exit $ac_status); } && - { ac_try='test -s conftest$ac_exeext' - { (eval echo "$as_me:13114: \"$ac_try\"") >&5 + echo "$as_me:15075: \$? = $ac_status" >&5 + (exit "$ac_status"); } && + { ac_try='test -s "conftest$ac_exeext"' + { (eval echo "$as_me:15078: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? - echo "$as_me:13117: \$? = $ac_status" >&5 - (exit $ac_status); }; }; then + echo "$as_me:15081: \$? = $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 13126 "configure" + cat >"conftest.$ac_ext" <<_ACEOF +#line 15090 "configure" #include "confdefs.h" #include <${cf_cv_ncurses_header:-curses.h}> int @@ -13134,35 +15098,35 @@ initscr() return 0; } _ACEOF -rm -f conftest.$ac_objext conftest$ac_exeext -if { (eval echo "$as_me:13138: \"$ac_link\"") >&5 +rm -f "conftest.$ac_objext" "conftest$ac_exeext" +if { (eval echo "$as_me:15102: \"$ac_link\"") >&5 (eval $ac_link) 2>&5 ac_status=$? - echo "$as_me:13141: \$? = $ac_status" >&5 - (exit $ac_status); } && - { ac_try='test -s conftest$ac_exeext' - { (eval echo "$as_me:13144: \"$ac_try\"") >&5 + echo "$as_me:15105: \$? = $ac_status" >&5 + (exit "$ac_status"); } && + { ac_try='test -s "conftest$ac_exeext"' + { (eval echo "$as_me:15108: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? - echo "$as_me:13147: \$? = $ac_status" >&5 - (exit $ac_status); }; }; then + echo "$as_me:15111: \$? = $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:13159: result: $cf_result" >&5 +rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext" + echo "$as_me:15123: 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:13165: error: no curses library found" >&5 + test "$cf_curs_lib" = unknown && { { echo "$as_me:15129: error: no curses library found" >&5 echo "$as_me: error: no curses library found" >&2;} { (exit 1); exit 1; }; } fi @@ -13171,15 +15135,15 @@ fi ;; (ncursesw*) -echo "$as_me:13174: checking for multibyte character support" >&5 +echo "$as_me:15138: checking for multibyte character support" >&5 echo $ECHO_N "checking for multibyte character support... $ECHO_C" >&6 if test "${cf_cv_utf8_lib+set}" = set; then echo $ECHO_N "(cached) $ECHO_C" >&6 else cf_save_LIBS="$LIBS" - cat >conftest.$ac_ext <<_ACEOF -#line 13182 "configure" + cat >"conftest.$ac_ext" <<_ACEOF +#line 15146 "configure" #include "confdefs.h" #include <stdlib.h> @@ -13191,34 +15155,34 @@ putwc(0,0); return 0; } _ACEOF -rm -f conftest.$ac_objext conftest$ac_exeext -if { (eval echo "$as_me:13195: \"$ac_link\"") >&5 +rm -f "conftest.$ac_objext" "conftest$ac_exeext" +if { (eval echo "$as_me:15159: \"$ac_link\"") >&5 (eval $ac_link) 2>&5 ac_status=$? - echo "$as_me:13198: \$? = $ac_status" >&5 - (exit $ac_status); } && - { ac_try='test -s conftest$ac_exeext' - { (eval echo "$as_me:13201: \"$ac_try\"") >&5 + echo "$as_me:15162: \$? = $ac_status" >&5 + (exit "$ac_status"); } && + { ac_try='test -s "conftest$ac_exeext"' + { (eval echo "$as_me:15165: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? - echo "$as_me:13204: \$? = $ac_status" >&5 - (exit $ac_status); }; }; then + echo "$as_me:15168: \$? = $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}:13216: testing Starting FIND_LINKAGE(utf8,) ..." 1>&5 +echo "${as_me:-configure}:15180: testing Starting FIND_LINKAGE(utf8,) ..." 1>&5 cf_save_LIBS="$LIBS" -cat >conftest.$ac_ext <<_ACEOF -#line 13221 "configure" +cat >"conftest.$ac_ext" <<_ACEOF +#line 15185 "configure" #include "confdefs.h" #include <libutf8.h> @@ -13230,18 +15194,18 @@ putwc(0,0); return 0; } _ACEOF -rm -f conftest.$ac_objext conftest$ac_exeext -if { (eval echo "$as_me:13234: \"$ac_link\"") >&5 +rm -f "conftest.$ac_objext" "conftest$ac_exeext" +if { (eval echo "$as_me:15198: \"$ac_link\"") >&5 (eval $ac_link) 2>&5 ac_status=$? - echo "$as_me:13237: \$? = $ac_status" >&5 - (exit $ac_status); } && - { ac_try='test -s conftest$ac_exeext' - { (eval echo "$as_me:13240: \"$ac_try\"") >&5 + echo "$as_me:15201: \$? = $ac_status" >&5 + (exit "$ac_status"); } && + { ac_try='test -s "conftest$ac_exeext"' + { (eval echo "$as_me:15204: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? - echo "$as_me:13243: \$? = $ac_status" >&5 - (exit $ac_status); }; }; then + echo "$as_me:15207: \$? = $ac_status" >&5 + (exit "$ac_status"); }; }; then cf_cv_find_linkage_utf8=yes cf_cv_header_path_utf8=/usr/include @@ -13249,12 +15213,12 @@ if { (eval echo "$as_me:13234: \"$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 13257 "configure" +cat >"conftest.$ac_ext" <<_ACEOF +#line 15221 "configure" #include "confdefs.h" #include <libutf8.h> @@ -13266,18 +15230,18 @@ putwc(0,0); return 0; } _ACEOF -rm -f conftest.$ac_objext conftest$ac_exeext -if { (eval echo "$as_me:13270: \"$ac_link\"") >&5 +rm -f "conftest.$ac_objext" "conftest$ac_exeext" +if { (eval echo "$as_me:15234: \"$ac_link\"") >&5 (eval $ac_link) 2>&5 ac_status=$? - echo "$as_me:13273: \$? = $ac_status" >&5 - (exit $ac_status); } && - { ac_try='test -s conftest$ac_exeext' - { (eval echo "$as_me:13276: \"$ac_try\"") >&5 + echo "$as_me:15237: \$? = $ac_status" >&5 + (exit "$ac_status"); } && + { ac_try='test -s "conftest$ac_exeext"' + { (eval echo "$as_me:15240: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? - echo "$as_me:13279: \$? = $ac_status" >&5 - (exit $ac_status); }; }; then + echo "$as_me:15243: \$? = $ac_status" >&5 + (exit "$ac_status"); }; }; then cf_cv_find_linkage_utf8=yes cf_cv_header_path_utf8=/usr/include @@ -13286,16 +15250,16 @@ if { (eval echo "$as_me:13270: \"$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}:13296: testing find linkage for utf8 library ..." 1>&5 +echo "${as_me:-configure}:15260: testing find linkage for utf8 library ..." 1>&5 -echo "${as_me:-configure}:13298: testing Searching for headers in FIND_LINKAGE(utf8,) ..." 1>&5 +echo "${as_me:-configure}:15262: testing Searching for headers in FIND_LINKAGE(utf8,) ..." 1>&5 cf_save_CPPFLAGS="$CPPFLAGS" cf_test_CPPFLAGS="$CPPFLAGS" @@ -13307,7 +15271,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$,,'` @@ -13315,11 +15279,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" @@ -13336,11 +15300,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 \ @@ -13354,13 +15318,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 @@ -13368,33 +15332,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}:13389: testing ... testing $cf_cv_header_path_utf8 ..." 1>&5 +echo "${as_me:-configure}:15353: 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 13397 "configure" + cat >"conftest.$ac_ext" <<_ACEOF +#line 15361 "configure" #include "confdefs.h" #include <libutf8.h> @@ -13406,40 +15370,40 @@ putwc(0,0); return 0; } _ACEOF -rm -f conftest.$ac_objext -if { (eval echo "$as_me:13410: \"$ac_compile\"") >&5 +rm -f "conftest.$ac_objext" +if { (eval echo "$as_me:15374: \"$ac_compile\"") >&5 (eval $ac_compile) 2>&5 ac_status=$? - echo "$as_me:13413: \$? = $ac_status" >&5 - (exit $ac_status); } && - { ac_try='test -s conftest.$ac_objext' - { (eval echo "$as_me:13416: \"$ac_try\"") >&5 + echo "$as_me:15377: \$? = $ac_status" >&5 + (exit "$ac_status"); } && + { ac_try='test -s "conftest.$ac_objext"' + { (eval echo "$as_me:15380: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? - echo "$as_me:13419: \$? = $ac_status" >&5 - (exit $ac_status); }; }; then + echo "$as_me:15383: \$? = $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}:13424: testing ... found utf8 headers in $cf_cv_header_path_utf8 ..." 1>&5 +echo "${as_me:-configure}:15388: 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}:13442: testing Searching for utf8 library in FIND_LINKAGE(utf8,) ..." 1>&5 +echo "${as_me:-configure}:15406: testing Searching for utf8 library in FIND_LINKAGE(utf8,) ..." 1>&5 cf_save_LIBS="$LIBS" cf_save_LDFLAGS="$LDFLAGS" @@ -13451,7 +15415,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$,,'` @@ -13459,11 +15423,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" @@ -13478,11 +15442,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 \ @@ -13496,13 +15460,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 @@ -13511,16 +15475,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}:13517: testing ... testing $cf_cv_library_path_utf8 ..." 1>&5 +echo "${as_me:-configure}:15481: 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 13523 "configure" + cat >"conftest.$ac_ext" <<_ACEOF +#line 15487 "configure" #include "confdefs.h" #include <libutf8.h> @@ -13532,36 +15496,36 @@ putwc(0,0); return 0; } _ACEOF -rm -f conftest.$ac_objext conftest$ac_exeext -if { (eval echo "$as_me:13536: \"$ac_link\"") >&5 +rm -f "conftest.$ac_objext" "conftest$ac_exeext" +if { (eval echo "$as_me:15500: \"$ac_link\"") >&5 (eval $ac_link) 2>&5 ac_status=$? - echo "$as_me:13539: \$? = $ac_status" >&5 - (exit $ac_status); } && - { ac_try='test -s conftest$ac_exeext' - { (eval echo "$as_me:13542: \"$ac_try\"") >&5 + echo "$as_me:15503: \$? = $ac_status" >&5 + (exit "$ac_status"); } && + { ac_try='test -s "conftest$ac_exeext"' + { (eval echo "$as_me:15506: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? - echo "$as_me:13545: \$? = $ac_status" >&5 - (exit $ac_status); }; }; then + echo "$as_me:15509: \$? = $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}:13550: testing ... found utf8 library in $cf_cv_library_path_utf8 ..." 1>&5 +echo "${as_me:-configure}:15514: 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" @@ -13573,10 +15537,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" @@ -13587,9 +15551,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:13592: result: $cf_cv_utf8_lib" >&5 +echo "$as_me:15556: 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 @@ -13603,9 +15567,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 @@ -13626,8 +15590,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 13630 "configure" + cat >"conftest.$ac_ext" <<_ACEOF +#line 15594 "configure" #include "confdefs.h" #include <stdio.h> int @@ -13638,25 +15602,25 @@ printf("Hello") return 0; } _ACEOF -rm -f conftest.$ac_objext -if { (eval echo "$as_me:13642: \"$ac_compile\"") >&5 +rm -f "conftest.$ac_objext" +if { (eval echo "$as_me:15606: \"$ac_compile\"") >&5 (eval $ac_compile) 2>&5 ac_status=$? - echo "$as_me:13645: \$? = $ac_status" >&5 - (exit $ac_status); } && - { ac_try='test -s conftest.$ac_objext' - { (eval echo "$as_me:13648: \"$ac_try\"") >&5 + echo "$as_me:15609: \$? = $ac_status" >&5 + (exit "$ac_status"); } && + { ac_try='test -s "conftest.$ac_objext"' + { (eval echo "$as_me:15612: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? - echo "$as_me:13651: \$? = $ac_status" >&5 - (exit $ac_status); }; }; then + echo "$as_me:15615: \$? = $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 @@ -13665,11 +15629,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}:13668: testing adding $cf_add_incdir to include-path ..." 1>&5 +echo "${as_me:-configure}:15632: 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 @@ -13685,9 +15649,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 @@ -13701,7 +15665,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}:13704: testing adding $cf_add_libdir to library-path ..." 1>&5 +echo "${as_me:-configure}:15668: testing adding $cf_add_libdir to library-path ..." 1>&5 LDFLAGS="-L$cf_add_libdir $LDFLAGS" fi @@ -13709,19 +15673,19 @@ echo "${as_me:-configure}:13704: testing adding $cf_add_libdir to library-path . done fi -cf_add_libs="$cf_cv_library_file_utf8" -# Filter out duplicates - this happens with badly-designed ".pc" files... -for cf_add_1lib in $LIBS -do - for cf_add_2lib in $cf_add_libs - do - if test "x$cf_add_1lib" = "x$cf_add_2lib" - then +cf_add_libs="$LIBS" +# reverse order +cf_add_0lib= +for cf_add_1lib in $cf_cv_library_file_utf8; do cf_add_0lib="$cf_add_1lib $cf_add_0lib"; done +# filter duplicates +for cf_add_1lib in $cf_add_0lib; do + for cf_add_2lib in $cf_add_libs; do + if test "x$cf_add_1lib" = "x$cf_add_2lib"; then cf_add_1lib= break fi done - test -n "$cf_add_1lib" && cf_add_libs="$cf_add_libs $cf_add_1lib" + test -n "$cf_add_1lib" && cf_add_libs="$cf_add_1lib $cf_add_libs" done LIBS="$cf_add_libs" @@ -13731,39 +15695,50 @@ cf_ncuconfig_root=$cf_cv_screen cf_have_ncuconfig=no if test "x${PKG_CONFIG:=none}" != xnone; then - echo "$as_me:13734: checking pkg-config for $cf_ncuconfig_root" >&5 + echo "$as_me:15698: 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:13737: result: yes" >&5 + echo "$as_me:15701: result: yes" >&5 echo "${ECHO_T}yes" >&6 - echo "$as_me:13740: checking if the $cf_ncuconfig_root package files work" >&5 + echo "$as_me:15704: checking if the $cf_ncuconfig_root package files work" >&5 echo $ECHO_N "checking if the $cf_ncuconfig_root package files work... $ECHO_C" >&6 cf_have_ncuconfig=unknown + cf_save_CFLAGS="$CFLAGS" cf_save_CPPFLAGS="$CPPFLAGS" cf_save_LIBS="$LIBS" + cf_pkg_cflags="`$PKG_CONFIG --cflags $cf_ncuconfig_root`" + cf_pkg_libs="`$PKG_CONFIG --libs $cf_ncuconfig_root`" + + # while -W for passing linker flags is prevalent, it is not "standard". + # At least one wrapper for c89/c99 (in Apple's xcode) has its own + # incompatible _and_ non-standard -W option which gives an error. Work + # around that pitfall. + case "x${CC}@@${cf_pkg_libs}@${cf_pkg_cflags}" in + (x*c[89]9@@*-W*) + cf_fix_cppflags=no cf_new_cflags= cf_new_cppflags= cf_new_extra_cppflags= -for cf_add_cflags in `$PKG_CONFIG --cflags $cf_ncuconfig_root` +for cf_add_cflags in $cf_pkg_cflags do -case $cf_fix_cppflags in +case "$cf_fix_cppflags" in (no) - case $cf_add_cflags in + case "$cf_add_cflags" in (-undef|-nostdinc*|-I*|-D*|-U*|-E|-P|-C) - case $cf_add_cflags in + case "$cf_add_cflags" in (-D*) - cf_tst_cflags=`echo ${cf_add_cflags} |sed -e 's/^-D[^=]*='\''\"[^"]*//'` + cf_tst_cflags=`echo "${cf_add_cflags}" |sed -e 's/^-D[^=]*='\''\"[^"]*//'` test "x${cf_add_cflags}" != "x${cf_tst_cflags}" \ && test -z "${cf_tst_cflags}" \ && cf_fix_cppflags=yes - if test $cf_fix_cppflags = yes ; then + if test "$cf_fix_cppflags" = yes ; then test -n "$cf_new_extra_cppflags" && cf_new_extra_cppflags="$cf_new_extra_cppflags " cf_new_extra_cppflags="${cf_new_extra_cppflags}$cf_add_cflags" @@ -13782,7 +15757,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/=.*//'` @@ -13812,7 +15787,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}" \ @@ -13842,83 +15817,271 @@ if test -n "$cf_new_extra_cppflags" ; then fi -cf_add_libs="`$PKG_CONFIG --libs $cf_ncuconfig_root`" -# Filter out duplicates - this happens with badly-designed ".pc" files... -for cf_add_1lib in $LIBS +cf_add_libs="$LIBS" +# reverse order +cf_add_0lib= +for cf_add_1lib in $cf_pkg_libs; do cf_add_0lib="$cf_add_1lib $cf_add_0lib"; done +# filter duplicates +for cf_add_1lib in $cf_add_0lib; do + for cf_add_2lib in $cf_add_libs; do + if test "x$cf_add_1lib" = "x$cf_add_2lib"; then + cf_add_1lib= + break + fi + done + test -n "$cf_add_1lib" && cf_add_libs="$cf_add_1lib $cf_add_libs" +done +LIBS="$cf_add_libs" + + cat >"conftest.$ac_ext" <<_ACEOF +#line 15837 "configure" +#include "confdefs.h" +#include <${cf_cv_ncurses_header:-curses.h}> +int +main (void) +{ +initscr(); mousemask(0,0); tigetstr((char *)0); + ; + return 0; +} +_ACEOF +rm -f "conftest.$ac_objext" "conftest$ac_exeext" +if { (eval echo "$as_me:15849: \"$ac_link\"") >&5 + (eval $ac_link) 2>&5 + ac_status=$? + echo "$as_me:15852: \$? = $ac_status" >&5 + (exit "$ac_status"); } && + { ac_try='test -s "conftest$ac_exeext"' + { (eval echo "$as_me:15855: \"$ac_try\"") >&5 + (eval $ac_try) 2>&5 + ac_status=$? + echo "$as_me:15858: \$? = $ac_status" >&5 + (exit "$ac_status"); }; }; then + if test "$cross_compiling" = yes; then + cf_test_ncuconfig=maybe +else + cat >"conftest.$ac_ext" <<_ACEOF +#line 15864 "configure" +#include "confdefs.h" +#include <${cf_cv_ncurses_header:-curses.h}> + int main(void) + { char *xx = curses_version(); return (xx == 0); } +_ACEOF +rm -f "conftest$ac_exeext" +if { (eval echo "$as_me:15871: \"$ac_link\"") >&5 + (eval $ac_link) 2>&5 + ac_status=$? + echo "$as_me:15874: \$? = $ac_status" >&5 + (exit "$ac_status"); } && { ac_try='"./conftest$ac_exeext"' + { (eval echo "$as_me:15876: \"$ac_try\"") >&5 + (eval $ac_try) 2>&5 + ac_status=$? + echo "$as_me:15879: \$? = $ac_status" >&5 + (exit "$ac_status"); }; }; then + cf_test_ncuconfig=yes +else + echo "$as_me: program exited with status $ac_status" >&5 +echo "$as_me: failed program was:" >&5 +cat "conftest.$ac_ext" >&5 +cf_test_ncuconfig=no +fi +rm -f core ./core.* ./*.core "conftest$ac_exeext" "conftest.$ac_objext" "conftest.$ac_ext" +fi +else + echo "$as_me: failed program was:" >&5 +cat "conftest.$ac_ext" >&5 +cf_test_ncuconfig=no +fi +rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext" + + CFLAGS="$cf_save_CFLAGS" + CPPFLAGS="$cf_save_CPPFLAGS" + LIBS="$cf_save_LIBS" + + if test "x$cf_test_ncuconfig" != xyes; then + cf_temp=`echo "x$cf_pkg_cflags" | sed -e s/^x// -e 's/-W[^ ]*//g'` + cf_pkg_cflags="$cf_temp" + cf_temp=`echo "x$cf_pkg_libs" | sed -e s/^x// -e 's/-W[^ ]*//g'` + cf_pkg_libs="$cf_temp" + fi + ;; + esac + +cf_fix_cppflags=no +cf_new_cflags= +cf_new_cppflags= +cf_new_extra_cppflags= + +for cf_add_cflags in $cf_pkg_cflags do - for cf_add_2lib in $cf_add_libs - do - if test "x$cf_add_1lib" = "x$cf_add_2lib" - then +case "$cf_fix_cppflags" in +(no) + case "$cf_add_cflags" in + (-undef|-nostdinc*|-I*|-D*|-U*|-E|-P|-C) + case "$cf_add_cflags" in + (-D*) + cf_tst_cflags=`echo "${cf_add_cflags}" |sed -e 's/^-D[^=]*='\''\"[^"]*//'` + + test "x${cf_add_cflags}" != "x${cf_tst_cflags}" \ + && test -z "${cf_tst_cflags}" \ + && cf_fix_cppflags=yes + + if test "$cf_fix_cppflags" = yes ; then + + test -n "$cf_new_extra_cppflags" && cf_new_extra_cppflags="$cf_new_extra_cppflags " + cf_new_extra_cppflags="${cf_new_extra_cppflags}$cf_add_cflags" + + continue + elif test "${cf_tst_cflags}" = "\"'" ; then + + test -n "$cf_new_extra_cppflags" && cf_new_extra_cppflags="$cf_new_extra_cppflags " + cf_new_extra_cppflags="${cf_new_extra_cppflags}$cf_add_cflags" + + continue + fi + ;; + esac + case "$CPPFLAGS" in + (*$cf_add_cflags) + ;; + (*) + case "$cf_add_cflags" in + (-D*) + cf_tst_cppflags=`echo "x$cf_add_cflags" | sed -e 's/^...//' -e 's/=.*//'` + +CPPFLAGS=`echo "$CPPFLAGS" | \ + sed -e 's/-[UD]'"$cf_tst_cppflags"'\(=[^ ]*\)\?[ ]/ /g' \ + -e 's/-[UD]'"$cf_tst_cppflags"'\(=[^ ]*\)\?$//g'` + + ;; + esac + + test -n "$cf_new_cppflags" && cf_new_cppflags="$cf_new_cppflags " + cf_new_cppflags="${cf_new_cppflags}$cf_add_cflags" + + ;; + esac + ;; + (*) + + test -n "$cf_new_cflags" && cf_new_cflags="$cf_new_cflags " + cf_new_cflags="${cf_new_cflags}$cf_add_cflags" + + ;; + esac + ;; +(yes) + + test -n "$cf_new_extra_cppflags" && cf_new_extra_cppflags="$cf_new_extra_cppflags " + cf_new_extra_cppflags="${cf_new_extra_cppflags}$cf_add_cflags" + + cf_tst_cflags=`echo "${cf_add_cflags}" |sed -e 's/^[^"]*"'\''//'` + + test "x${cf_add_cflags}" != "x${cf_tst_cflags}" \ + && test -z "${cf_tst_cflags}" \ + && cf_fix_cppflags=no + ;; +esac +done + +if test -n "$cf_new_cflags" ; then + + test -n "$CFLAGS" && CFLAGS="$CFLAGS " + CFLAGS="${CFLAGS}$cf_new_cflags" + +fi + +if test -n "$cf_new_cppflags" ; then + + test -n "$CPPFLAGS" && CPPFLAGS="$CPPFLAGS " + CPPFLAGS="${CPPFLAGS}$cf_new_cppflags" + +fi + +if test -n "$cf_new_extra_cppflags" ; then + + test -n "$EXTRA_CPPFLAGS" && EXTRA_CPPFLAGS="$EXTRA_CPPFLAGS " + EXTRA_CPPFLAGS="${EXTRA_CPPFLAGS}$cf_new_extra_cppflags" + +fi + +cf_add_libs="$LIBS" +# reverse order +cf_add_0lib= +for cf_add_1lib in $cf_pkg_libs; do cf_add_0lib="$cf_add_1lib $cf_add_0lib"; done +# filter duplicates +for cf_add_1lib in $cf_add_0lib; do + for cf_add_2lib in $cf_add_libs; do + if test "x$cf_add_1lib" = "x$cf_add_2lib"; then cf_add_1lib= break fi done - test -n "$cf_add_1lib" && cf_add_libs="$cf_add_libs $cf_add_1lib" + test -n "$cf_add_1lib" && cf_add_libs="$cf_add_1lib $cf_add_libs" done LIBS="$cf_add_libs" - cat >conftest.$ac_ext <<_ACEOF -#line 13862 "configure" + cat >"conftest.$ac_ext" <<_ACEOF +#line 16025 "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:13874: \"$ac_link\"") >&5 +rm -f "conftest.$ac_objext" "conftest$ac_exeext" +if { (eval echo "$as_me:16037: \"$ac_link\"") >&5 (eval $ac_link) 2>&5 ac_status=$? - echo "$as_me:13877: \$? = $ac_status" >&5 - (exit $ac_status); } && - { ac_try='test -s conftest$ac_exeext' - { (eval echo "$as_me:13880: \"$ac_try\"") >&5 + echo "$as_me:16040: \$? = $ac_status" >&5 + (exit "$ac_status"); } && + { ac_try='test -s "conftest$ac_exeext"' + { (eval echo "$as_me:16043: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? - echo "$as_me:13883: \$? = $ac_status" >&5 - (exit $ac_status); }; }; then + echo "$as_me:16046: \$? = $ac_status" >&5 + (exit "$ac_status"); }; }; then if test "$cross_compiling" = yes; then cf_have_ncuconfig=maybe else - cat >conftest.$ac_ext <<_ACEOF -#line 13889 "configure" + cat >"conftest.$ac_ext" <<_ACEOF +#line 16052 "configure" #include "confdefs.h" #include <${cf_cv_ncurses_header:-curses.h}> int main(void) { char *xx = curses_version(); return (xx == 0); } _ACEOF -rm -f conftest$ac_exeext -if { (eval echo "$as_me:13896: \"$ac_link\"") >&5 +rm -f "conftest$ac_exeext" +if { (eval echo "$as_me:16059: \"$ac_link\"") >&5 (eval $ac_link) 2>&5 ac_status=$? - echo "$as_me:13899: \$? = $ac_status" >&5 - (exit $ac_status); } && { ac_try='./conftest$ac_exeext' - { (eval echo "$as_me:13901: \"$ac_try\"") >&5 + echo "$as_me:16062: \$? = $ac_status" >&5 + (exit "$ac_status"); } && { ac_try='"./conftest$ac_exeext"' + { (eval echo "$as_me:16064: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? - echo "$as_me:13904: \$? = $ac_status" >&5 - (exit $ac_status); }; }; then + echo "$as_me:16067: \$? = $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:13921: result: $cf_have_ncuconfig" >&5 +rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext" + echo "$as_me:16084: 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" @@ -13934,13 +16097,13 @@ EOF NCURSES_CONFIG_PKG=$cf_ncuconfig_root -echo "$as_me:13937: checking for terminfo header" >&5 +echo "$as_me:16100: 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%'` ;; @@ -13951,8 +16114,8 @@ esac for cf_test in $cf_term_header "ncurses/term.h" "ncursesw/term.h" do -cat >conftest.$ac_ext <<_ACEOF -#line 13955 "configure" +cat >"conftest.$ac_ext" <<_ACEOF +#line 16118 "configure" #include "confdefs.h" #include <stdio.h> #include <${cf_cv_ncurses_header:-curses.h}> @@ -13961,43 +16124,43 @@ cat >conftest.$ac_ext <<_ACEOF int main (void) { -int x = auto_left_margin +int x = auto_left_margin; (void)x ; return 0; } _ACEOF -rm -f conftest.$ac_objext -if { (eval echo "$as_me:13970: \"$ac_compile\"") >&5 +rm -f "conftest.$ac_objext" +if { (eval echo "$as_me:16133: \"$ac_compile\"") >&5 (eval $ac_compile) 2>&5 ac_status=$? - echo "$as_me:13973: \$? = $ac_status" >&5 - (exit $ac_status); } && - { ac_try='test -s conftest.$ac_objext' - { (eval echo "$as_me:13976: \"$ac_try\"") >&5 + echo "$as_me:16136: \$? = $ac_status" >&5 + (exit "$ac_status"); } && + { ac_try='test -s "conftest.$ac_objext"' + { (eval echo "$as_me:16139: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? - echo "$as_me:13979: \$? = $ac_status" >&5 - (exit $ac_status); }; }; then + echo "$as_me:16142: \$? = $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:13995: result: $cf_cv_term_header" >&5 +echo "$as_me:16158: 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 @@ -14007,7 +16170,7 @@ EOF ;; esac -case $cf_cv_term_header in +case "$cf_cv_term_header" in (ncurses/term.h) cat >>confdefs.h <<\EOF @@ -14027,7 +16190,7 @@ esac fi else - echo "$as_me:14030: result: no" >&5 + echo "$as_me:16193: result: no" >&5 echo "${ECHO_T}no" >&6 NCURSES_CONFIG_PKG=none fi @@ -14043,7 +16206,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:14046: checking for $ac_word" >&5 +echo "$as_me:16209: 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 @@ -14058,7 +16221,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:14061: found $ac_dir/$ac_word" >&5 +echo "$as_me:16224: found $ac_dir/$ac_word" >&5 break done @@ -14066,10 +16229,10 @@ fi fi NCURSES_CONFIG=$ac_cv_prog_NCURSES_CONFIG if test -n "$NCURSES_CONFIG"; then - echo "$as_me:14069: result: $NCURSES_CONFIG" >&5 + echo "$as_me:16232: result: $NCURSES_CONFIG" >&5 echo "${ECHO_T}$NCURSES_CONFIG" >&6 else - echo "$as_me:14072: result: no" >&5 + echo "$as_me:16235: result: no" >&5 echo "${ECHO_T}no" >&6 fi @@ -14082,7 +16245,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:14085: checking for $ac_word" >&5 +echo "$as_me:16248: 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 @@ -14097,7 +16260,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:14100: found $ac_dir/$ac_word" >&5 +echo "$as_me:16263: found $ac_dir/$ac_word" >&5 break done @@ -14105,10 +16268,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:14108: result: $ac_ct_NCURSES_CONFIG" >&5 + echo "$as_me:16271: result: $ac_ct_NCURSES_CONFIG" >&5 echo "${ECHO_T}$ac_ct_NCURSES_CONFIG" >&6 else - echo "$as_me:14111: result: no" >&5 + echo "$as_me:16274: result: no" >&5 echo "${ECHO_T}no" >&6 fi @@ -14128,19 +16291,19 @@ cf_new_extra_cppflags= for cf_add_cflags in `$NCURSES_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" @@ -14159,7 +16322,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/=.*//'` @@ -14189,7 +16352,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}" \ @@ -14219,25 +16382,25 @@ if test -n "$cf_new_extra_cppflags" ; then fi -cf_add_libs="`$NCURSES_CONFIG --libs`" -# Filter out duplicates - this happens with badly-designed ".pc" files... -for cf_add_1lib in $LIBS -do - for cf_add_2lib in $cf_add_libs - do - if test "x$cf_add_1lib" = "x$cf_add_2lib" - then +cf_add_libs="$LIBS" +# reverse order +cf_add_0lib= +for cf_add_1lib in `$NCURSES_CONFIG --libs`; do cf_add_0lib="$cf_add_1lib $cf_add_0lib"; done +# filter duplicates +for cf_add_1lib in $cf_add_0lib; do + for cf_add_2lib in $cf_add_libs; do + if test "x$cf_add_1lib" = "x$cf_add_2lib"; then cf_add_1lib= break fi done - test -n "$cf_add_1lib" && cf_add_libs="$cf_add_libs $cf_add_1lib" + test -n "$cf_add_1lib" && cf_add_libs="$cf_add_1lib $cf_add_libs" done LIBS="$cf_add_libs" # even with config script, some packages use no-override for curses.h -echo "$as_me:14240: checking if we have identified curses headers" >&5 +echo "$as_me:16403: 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 @@ -14248,8 +16411,8 @@ 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 14252 "configure" +cat >"conftest.$ac_ext" <<_ACEOF +#line 16415 "configure" #include "confdefs.h" #include <${cf_header}> int @@ -14260,32 +16423,32 @@ initscr(); tgoto("?", 0,0) return 0; } _ACEOF -rm -f conftest.$ac_objext -if { (eval echo "$as_me:14264: \"$ac_compile\"") >&5 +rm -f "conftest.$ac_objext" +if { (eval echo "$as_me:16427: \"$ac_compile\"") >&5 (eval $ac_compile) 2>&5 ac_status=$? - echo "$as_me:14267: \$? = $ac_status" >&5 - (exit $ac_status); } && - { ac_try='test -s conftest.$ac_objext' - { (eval echo "$as_me:14270: \"$ac_try\"") >&5 + echo "$as_me:16430: \$? = $ac_status" >&5 + (exit "$ac_status"); } && + { ac_try='test -s "conftest.$ac_objext"' + { (eval echo "$as_me:16433: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? - echo "$as_me:14273: \$? = $ac_status" >&5 - (exit $ac_status); }; }; then + echo "$as_me:16436: \$? = $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:14284: result: $cf_cv_ncurses_header" >&5 +echo "$as_me:16447: 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:14288: error: No curses header-files found" >&5 + { { echo "$as_me:16451: error: No curses header-files found" >&5 echo "$as_me: error: No curses header-files found" >&2;} { (exit 1); exit 1; }; } fi @@ -14295,24 +16458,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:14298: checking for $ac_header" >&5 +echo "$as_me:16461: 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 14304 "configure" + cat >"conftest.$ac_ext" <<_ACEOF +#line 16467 "configure" #include "confdefs.h" #include <$ac_header> _ACEOF -if { (eval echo "$as_me:14308: \"$ac_cpp conftest.$ac_ext\"") >&5 - (eval $ac_cpp conftest.$ac_ext) 2>conftest.er1 +if { (eval echo "$as_me:16471: \"$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:14314: \$? = $ac_status" >&5 - (exit $ac_status); } >/dev/null; then + echo "$as_me:16477: \$? = $ac_status" >&5 + (exit "$ac_status"); } >/dev/null; then if test -s conftest.err; then ac_cpp_err=$ac_c_preproc_warn_flag else @@ -14325,14 +16488,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:14333: 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:16496: result: `eval echo '${'"$as_ac_Header"'}'`" >&5 +echo "${ECHO_T}`eval echo '${'"$as_ac_Header"'}'`" >&6 +if test "`eval echo '${'"$as_ac_Header"'}'`" = yes; then cat >>confdefs.h <<EOF #define `echo "HAVE_$ac_header" | $as_tr_cpp` 1 EOF @@ -14350,7 +16513,7 @@ cf_nculib_ROOT=`echo "HAVE_LIB$cf_ncuconfig_root" | sed y%abcdefghijklmnopqrstuv #define $cf_nculib_ROOT 1 EOF - cf_cv_ncurses_version=`$NCURSES_CONFIG --version` + cf_cv_ncurses_version="`$NCURSES_CONFIG --version`" else @@ -14362,9 +16525,9 @@ test "$cf_cv_curses_dir" != "no" && { \ if test -n "$cf_cv_curses_dir/include/$cf_ncuhdr_root" ; then for cf_add_incdir in $cf_cv_curses_dir/include/$cf_ncuhdr_root 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 @@ -14385,8 +16548,8 @@ if test -n "$cf_cv_curses_dir/include/$cf_ncuhdr_root" ; then test -n "$CPPFLAGS" && CPPFLAGS="$CPPFLAGS " CPPFLAGS="${CPPFLAGS}-I$cf_add_incdir" - cat >conftest.$ac_ext <<_ACEOF -#line 14389 "configure" + cat >"conftest.$ac_ext" <<_ACEOF +#line 16552 "configure" #include "confdefs.h" #include <stdio.h> int @@ -14397,25 +16560,25 @@ printf("Hello") return 0; } _ACEOF -rm -f conftest.$ac_objext -if { (eval echo "$as_me:14401: \"$ac_compile\"") >&5 +rm -f "conftest.$ac_objext" +if { (eval echo "$as_me:16564: \"$ac_compile\"") >&5 (eval $ac_compile) 2>&5 ac_status=$? - echo "$as_me:14404: \$? = $ac_status" >&5 - (exit $ac_status); } && - { ac_try='test -s conftest.$ac_objext' - { (eval echo "$as_me:14407: \"$ac_try\"") >&5 + echo "$as_me:16567: \$? = $ac_status" >&5 + (exit "$ac_status"); } && + { ac_try='test -s "conftest.$ac_objext"' + { (eval echo "$as_me:16570: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? - echo "$as_me:14410: \$? = $ac_status" >&5 - (exit $ac_status); }; }; then + echo "$as_me:16573: \$? = $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 @@ -14424,11 +16587,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}:14427: testing adding $cf_add_incdir to include-path ..." 1>&5 +echo "${as_me:-configure}:16590: 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 @@ -14443,19 +16606,19 @@ fi } -echo "$as_me:14446: checking for $cf_ncuhdr_root header in include-path" >&5 +echo "$as_me:16609: 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 14458 "configure" + cat >"conftest.$ac_ext" <<_ACEOF +#line 16621 "configure" #include "confdefs.h" #include <$cf_header> @@ -14465,10 +16628,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 @@ -14478,39 +16641,39 @@ printf("old\n"); return 0; } _ACEOF -rm -f conftest.$ac_objext -if { (eval echo "$as_me:14482: \"$ac_compile\"") >&5 +rm -f "conftest.$ac_objext" +if { (eval echo "$as_me:16645: \"$ac_compile\"") >&5 (eval $ac_compile) 2>&5 ac_status=$? - echo "$as_me:14485: \$? = $ac_status" >&5 - (exit $ac_status); } && - { ac_try='test -s conftest.$ac_objext' - { (eval echo "$as_me:14488: \"$ac_try\"") >&5 + echo "$as_me:16648: \$? = $ac_status" >&5 + (exit "$ac_status"); } && + { ac_try='test -s "conftest.$ac_objext"' + { (eval echo "$as_me:16651: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? - echo "$as_me:14491: \$? = $ac_status" >&5 - (exit $ac_status); }; }; then + echo "$as_me:16654: \$? = $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:14506: result: $cf_cv_ncurses_h" >&5 +echo "$as_me:16669: 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:14513: checking for $cf_ncuhdr_root include-path" >&5 +echo "$as_me:16676: 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 @@ -14525,7 +16688,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$,,'` @@ -14533,11 +16696,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" @@ -14554,11 +16717,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 \ @@ -14572,13 +16735,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 @@ -14586,20 +16749,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 @@ -14607,9 +16770,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 @@ -14630,8 +16793,8 @@ if test -n "$cf_incdir" ; then test -n "$CPPFLAGS" && CPPFLAGS="$CPPFLAGS " CPPFLAGS="${CPPFLAGS}-I$cf_add_incdir" - cat >conftest.$ac_ext <<_ACEOF -#line 14634 "configure" + cat >"conftest.$ac_ext" <<_ACEOF +#line 16797 "configure" #include "confdefs.h" #include <stdio.h> int @@ -14642,25 +16805,25 @@ printf("Hello") return 0; } _ACEOF -rm -f conftest.$ac_objext -if { (eval echo "$as_me:14646: \"$ac_compile\"") >&5 +rm -f "conftest.$ac_objext" +if { (eval echo "$as_me:16809: \"$ac_compile\"") >&5 (eval $ac_compile) 2>&5 ac_status=$? - echo "$as_me:14649: \$? = $ac_status" >&5 - (exit $ac_status); } && - { ac_try='test -s conftest.$ac_objext' - { (eval echo "$as_me:14652: \"$ac_try\"") >&5 + echo "$as_me:16812: \$? = $ac_status" >&5 + (exit "$ac_status"); } && + { ac_try='test -s "conftest.$ac_objext"' + { (eval echo "$as_me:16815: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? - echo "$as_me:14655: \$? = $ac_status" >&5 - (exit $ac_status); }; }; then + echo "$as_me:16818: \$? = $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 @@ -14669,11 +16832,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}:14672: testing adding $cf_add_incdir to include-path ..." 1>&5 +echo "${as_me:-configure}:16835: 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 @@ -14691,8 +16854,8 @@ fi curses.h do - cat >conftest.$ac_ext <<_ACEOF -#line 14695 "configure" + cat >"conftest.$ac_ext" <<_ACEOF +#line 16858 "configure" #include "confdefs.h" #include <$cf_header> @@ -14702,10 +16865,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 @@ -14715,30 +16878,30 @@ printf("old\n"); return 0; } _ACEOF -rm -f conftest.$ac_objext -if { (eval echo "$as_me:14719: \"$ac_compile\"") >&5 +rm -f "conftest.$ac_objext" +if { (eval echo "$as_me:16882: \"$ac_compile\"") >&5 (eval $ac_compile) 2>&5 ac_status=$? - echo "$as_me:14722: \$? = $ac_status" >&5 - (exit $ac_status); } && - { ac_try='test -s conftest.$ac_objext' - { (eval echo "$as_me:14725: \"$ac_try\"") >&5 + echo "$as_me:16885: \$? = $ac_status" >&5 + (exit "$ac_status"); } && + { ac_try='test -s "conftest.$ac_objext"' + { (eval echo "$as_me:16888: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? - echo "$as_me:14728: \$? = $ac_status" >&5 - (exit $ac_status); }; }; then + echo "$as_me:16891: \$? = $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 @@ -14746,26 +16909,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:14749: error: not found" >&5 + test "$cf_cv_ncurses_h2" = no && { { echo "$as_me:16912: error: not found" >&5 echo "$as_me: error: not found" >&2;} { (exit 1); exit 1; }; } fi -echo "$as_me:14754: result: $cf_cv_ncurses_h2" >&5 +echo "$as_me:16917: 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 @@ -14786,8 +16949,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 14790 "configure" + cat >"conftest.$ac_ext" <<_ACEOF +#line 16953 "configure" #include "confdefs.h" #include <stdio.h> int @@ -14798,25 +16961,25 @@ printf("Hello") return 0; } _ACEOF -rm -f conftest.$ac_objext -if { (eval echo "$as_me:14802: \"$ac_compile\"") >&5 +rm -f "conftest.$ac_objext" +if { (eval echo "$as_me:16965: \"$ac_compile\"") >&5 (eval $ac_compile) 2>&5 ac_status=$? - echo "$as_me:14805: \$? = $ac_status" >&5 - (exit $ac_status); } && - { ac_try='test -s conftest.$ac_objext' - { (eval echo "$as_me:14808: \"$ac_try\"") >&5 + echo "$as_me:16968: \$? = $ac_status" >&5 + (exit "$ac_status"); } && + { ac_try='test -s "conftest.$ac_objext"' + { (eval echo "$as_me:16971: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? - echo "$as_me:14811: \$? = $ac_status" >&5 - (exit $ac_status); }; }; then + echo "$as_me:16974: \$? = $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 @@ -14825,11 +16988,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}:14828: testing adding $cf_add_incdir to include-path ..." 1>&5 +echo "${as_me:-configure}:16991: 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 @@ -14846,7 +17009,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 @@ -14856,7 +17019,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 @@ -14873,13 +17036,13 @@ EOF ;; esac -echo "$as_me:14876: checking for terminfo header" >&5 +echo "$as_me:17039: 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%'` ;; @@ -14890,8 +17053,8 @@ esac for cf_test in $cf_term_header "ncurses/term.h" "ncursesw/term.h" do -cat >conftest.$ac_ext <<_ACEOF -#line 14894 "configure" +cat >"conftest.$ac_ext" <<_ACEOF +#line 17057 "configure" #include "confdefs.h" #include <stdio.h> #include <${cf_cv_ncurses_header:-curses.h}> @@ -14900,43 +17063,43 @@ cat >conftest.$ac_ext <<_ACEOF int main (void) { -int x = auto_left_margin +int x = auto_left_margin; (void)x ; return 0; } _ACEOF -rm -f conftest.$ac_objext -if { (eval echo "$as_me:14909: \"$ac_compile\"") >&5 +rm -f "conftest.$ac_objext" +if { (eval echo "$as_me:17072: \"$ac_compile\"") >&5 (eval $ac_compile) 2>&5 ac_status=$? - echo "$as_me:14912: \$? = $ac_status" >&5 - (exit $ac_status); } && - { ac_try='test -s conftest.$ac_objext' - { (eval echo "$as_me:14915: \"$ac_try\"") >&5 + echo "$as_me:17075: \$? = $ac_status" >&5 + (exit "$ac_status"); } && + { ac_try='test -s "conftest.$ac_objext"' + { (eval echo "$as_me:17078: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? - echo "$as_me:14918: \$? = $ac_status" >&5 - (exit $ac_status); }; }; then + echo "$as_me:17081: \$? = $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:14934: result: $cf_cv_term_header" >&5 +echo "$as_me:17097: 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 @@ -14946,7 +17109,7 @@ EOF ;; esac -case $cf_cv_term_header in +case "$cf_cv_term_header" in (ncurses/term.h) cat >>confdefs.h <<\EOF @@ -14969,7 +17132,7 @@ cat >>confdefs.h <<\EOF #define NCURSES 1 EOF -echo "$as_me:14972: checking for ncurses version" >&5 +echo "$as_me:17135: 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 @@ -14977,12 +17140,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 <<EOF + cat > "conftest.$ac_ext" <<EOF #include <${cf_cv_ncurses_header:-curses.h}> #undef Autoconf #ifdef NCURSES_VERSION @@ -14995,20 +17158,20 @@ Autoconf "old" #endif EOF cf_try="$ac_cpp conftest.$ac_ext 2>&5 | grep '^Autoconf ' >conftest.out" - { (eval echo "$as_me:14998: \"$cf_try\"") >&5 + { (eval echo "$as_me:17161: \"$cf_try\"") >&5 (eval $cf_try) 2>&5 ac_status=$? - echo "$as_me:15001: \$? = $ac_status" >&5 - (exit $ac_status); } + echo "$as_me:17164: \$? = $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 15011 "configure" + cat >"conftest.$ac_ext" <<_ACEOF +#line 17174 "configure" #include "confdefs.h" #include <${cf_cv_ncurses_header:-curses.h}> @@ -15018,13 +17181,13 @@ 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 @@ -15032,30 +17195,30 @@ int main(void) ${cf_cv_main_return:-return}(0); } _ACEOF -rm -f conftest$ac_exeext -if { (eval echo "$as_me:15036: \"$ac_link\"") >&5 +rm -f "conftest$ac_exeext" +if { (eval echo "$as_me:17199: \"$ac_link\"") >&5 (eval $ac_link) 2>&5 ac_status=$? - echo "$as_me:15039: \$? = $ac_status" >&5 - (exit $ac_status); } && { ac_try='./conftest$ac_exeext' - { (eval echo "$as_me:15041: \"$ac_try\"") >&5 + echo "$as_me:17202: \$? = $ac_status" >&5 + (exit "$ac_status"); } && { ac_try='"./conftest$ac_exeext"' + { (eval echo "$as_me:17204: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? - echo "$as_me:15044: \$? = $ac_status" >&5 - (exit $ac_status); }; }; then + echo "$as_me:17207: \$? = $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:15058: result: $cf_cv_ncurses_version" >&5 +echo "$as_me:17221: result: $cf_cv_ncurses_version" >&5 echo "${ECHO_T}$cf_cv_ncurses_version" >&6 test "$cf_cv_ncurses_version" = no || cat >>confdefs.h <<\EOF @@ -15068,15 +17231,15 @@ cf_nculib_root=$cf_cv_screen # to link gpm. cf_ncurses_LIBS="" cf_ncurses_SAVE="$LIBS" -echo "$as_me:15071: checking for Gpm_Open in -lgpm" >&5 +echo "$as_me:17234: 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 15079 "configure" +cat >"conftest.$ac_ext" <<_ACEOF +#line 17242 "configure" #include "confdefs.h" /* Override any gcc2 internal prototype to avoid an error. */ @@ -15094,39 +17257,39 @@ Gpm_Open (); return 0; } _ACEOF -rm -f conftest.$ac_objext conftest$ac_exeext -if { (eval echo "$as_me:15098: \"$ac_link\"") >&5 +rm -f "conftest.$ac_objext" "conftest$ac_exeext" +if { (eval echo "$as_me:17261: \"$ac_link\"") >&5 (eval $ac_link) 2>&5 ac_status=$? - echo "$as_me:15101: \$? = $ac_status" >&5 - (exit $ac_status); } && - { ac_try='test -s conftest$ac_exeext' - { (eval echo "$as_me:15104: \"$ac_try\"") >&5 + echo "$as_me:17264: \$? = $ac_status" >&5 + (exit "$ac_status"); } && + { ac_try='test -s "conftest$ac_exeext"' + { (eval echo "$as_me:17267: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? - echo "$as_me:15107: \$? = $ac_status" >&5 - (exit $ac_status); }; }; then + echo "$as_me:17270: \$? = $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:15118: result: $ac_cv_lib_gpm_Gpm_Open" >&5 +echo "$as_me:17281: 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:15121: checking for initscr in -lgpm" >&5 +if test "$ac_cv_lib_gpm_Gpm_Open" = yes; then + echo "$as_me:17284: 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 15129 "configure" +cat >"conftest.$ac_ext" <<_ACEOF +#line 17292 "configure" #include "confdefs.h" /* Override any gcc2 internal prototype to avoid an error. */ @@ -15144,30 +17307,30 @@ initscr (); return 0; } _ACEOF -rm -f conftest.$ac_objext conftest$ac_exeext -if { (eval echo "$as_me:15148: \"$ac_link\"") >&5 +rm -f "conftest.$ac_objext" "conftest$ac_exeext" +if { (eval echo "$as_me:17311: \"$ac_link\"") >&5 (eval $ac_link) 2>&5 ac_status=$? - echo "$as_me:15151: \$? = $ac_status" >&5 - (exit $ac_status); } && - { ac_try='test -s conftest$ac_exeext' - { (eval echo "$as_me:15154: \"$ac_try\"") >&5 + echo "$as_me:17314: \$? = $ac_status" >&5 + (exit "$ac_status"); } && + { ac_try='test -s "conftest$ac_exeext"' + { (eval echo "$as_me:17317: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? - echo "$as_me:15157: \$? = $ac_status" >&5 - (exit $ac_status); }; }; then + echo "$as_me:17320: \$? = $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:15168: result: $ac_cv_lib_gpm_initscr" >&5 +echo "$as_me:17331: 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" @@ -15175,20 +17338,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). if test "$cf_nculib_root" = ncurses ; then - echo "$as_me:15183: checking for tgoto in -lmytinfo" >&5 + echo "$as_me:17346: 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 15191 "configure" +cat >"conftest.$ac_ext" <<_ACEOF +#line 17354 "configure" #include "confdefs.h" /* Override any gcc2 internal prototype to avoid an error. */ @@ -15206,30 +17369,30 @@ tgoto (); return 0; } _ACEOF -rm -f conftest.$ac_objext conftest$ac_exeext -if { (eval echo "$as_me:15210: \"$ac_link\"") >&5 +rm -f "conftest.$ac_objext" "conftest$ac_exeext" +if { (eval echo "$as_me:17373: \"$ac_link\"") >&5 (eval $ac_link) 2>&5 ac_status=$? - echo "$as_me:15213: \$? = $ac_status" >&5 - (exit $ac_status); } && - { ac_try='test -s conftest$ac_exeext' - { (eval echo "$as_me:15216: \"$ac_try\"") >&5 + echo "$as_me:17376: \$? = $ac_status" >&5 + (exit "$ac_status"); } && + { ac_try='test -s "conftest$ac_exeext"' + { (eval echo "$as_me:17379: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? - echo "$as_me:15219: \$? = $ac_status" >&5 - (exit $ac_status); }; }; then + echo "$as_me:17382: \$? = $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:15230: result: $ac_cv_lib_mytinfo_tgoto" >&5 +echo "$as_me:17393: 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 @@ -15237,113 +17400,113 @@ fi ;; esac -cf_add_libs="$cf_ncurses_LIBS" -# Filter out duplicates - this happens with badly-designed ".pc" files... -for cf_add_1lib in $LIBS -do - for cf_add_2lib in $cf_add_libs - do - if test "x$cf_add_1lib" = "x$cf_add_2lib" - then +cf_add_libs="$LIBS" +# reverse order +cf_add_0lib= +for cf_add_1lib in $cf_ncurses_LIBS; do cf_add_0lib="$cf_add_1lib $cf_add_0lib"; done +# filter duplicates +for cf_add_1lib in $cf_add_0lib; do + for cf_add_2lib in $cf_add_libs; do + if test "x$cf_add_1lib" = "x$cf_add_2lib"; then cf_add_1lib= break fi done - test -n "$cf_add_1lib" && cf_add_libs="$cf_add_libs $cf_add_1lib" + test -n "$cf_add_1lib" && cf_add_libs="$cf_add_1lib $cf_add_libs" done LIBS="$cf_add_libs" -if ( test -n "$cf_cv_curses_dir" && test "$cf_cv_curses_dir" != "no" ) +if test -n "$cf_cv_curses_dir" && test "$cf_cv_curses_dir" != "no" then -cf_add_libs="-l$cf_nculib_root" -# Filter out duplicates - this happens with badly-designed ".pc" files... -for cf_add_1lib in $LIBS -do - for cf_add_2lib in $cf_add_libs - do - if test "x$cf_add_1lib" = "x$cf_add_2lib" - then +cf_add_libs="$LIBS" +# reverse order +cf_add_0lib= +for cf_add_1lib in -l$cf_nculib_root; do cf_add_0lib="$cf_add_1lib $cf_add_0lib"; done +# filter duplicates +for cf_add_1lib in $cf_add_0lib; do + for cf_add_2lib in $cf_add_libs; do + if test "x$cf_add_1lib" = "x$cf_add_2lib"; then cf_add_1lib= break fi done - test -n "$cf_add_1lib" && cf_add_libs="$cf_add_libs $cf_add_1lib" + test -n "$cf_add_1lib" && cf_add_libs="$cf_add_1lib $cf_add_libs" done LIBS="$cf_add_libs" else - eval 'cf_cv_have_lib_'$cf_nculib_root'=no' + eval 'cf_cv_have_lib_'"$cf_nculib_root"'=no' cf_libdir="" - echo "$as_me:15279: checking for initscr" >&5 + echo "$as_me:17442: 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 15285 "configure" + cat >"conftest.$ac_ext" <<_ACEOF +#line 17448 "configure" #include "confdefs.h" -/* System header to define __stub macros and hopefully few prototypes, - which can conflict with char initscr (); below. */ -#include <assert.h> -/* Override any gcc2 internal prototype to avoid an error. */ +#define initscr autoconf_temporary +#include <limits.h> /* least-intrusive standard header which defines gcc2 __stub macros */ +#undef initscr + #ifdef __cplusplus extern "C" #endif + /* We use char because int might match the return type of a gcc2 builtin and then its argument prototype would still apply. */ -char initscr (); -char (*f) (); +char initscr (void); int main (void) { -/* The GNU C library defines this for functions which it implements + +/* The GNU C library defines stubs for functions which it implements to always fail with ENOSYS. Some functions are actually named something starting with __ and the normal name is an alias. */ #if defined (__stub_initscr) || defined (__stub___initscr) -choke me -#else -f = initscr; /* workaround for ICC 12.0.3 */ if (f == 0) return 1; +#error found stub for initscr #endif + return initscr (); ; return 0; } _ACEOF -rm -f conftest.$ac_objext conftest$ac_exeext -if { (eval echo "$as_me:15316: \"$ac_link\"") >&5 +rm -f "conftest.$ac_objext" "conftest$ac_exeext" +if { (eval echo "$as_me:17479: \"$ac_link\"") >&5 (eval $ac_link) 2>&5 ac_status=$? - echo "$as_me:15319: \$? = $ac_status" >&5 - (exit $ac_status); } && - { ac_try='test -s conftest$ac_exeext' - { (eval echo "$as_me:15322: \"$ac_try\"") >&5 + echo "$as_me:17482: \$? = $ac_status" >&5 + (exit "$ac_status"); } && + { ac_try='test -s "conftest$ac_exeext"' + { (eval echo "$as_me:17485: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? - echo "$as_me:15325: \$? = $ac_status" >&5 - (exit $ac_status); }; }; then + echo "$as_me:17488: \$? = $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:15335: result: $ac_cv_func_initscr" >&5 +echo "$as_me:17498: 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:15342: checking for initscr in -l$cf_nculib_root" >&5 + echo "$as_me:17505: 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 15346 "configure" + cat >"conftest.$ac_ext" <<_ACEOF +#line 17509 "configure" #include "confdefs.h" #include <${cf_cv_ncurses_header:-curses.h}> int @@ -15354,26 +17517,26 @@ initscr() return 0; } _ACEOF -rm -f conftest.$ac_objext conftest$ac_exeext -if { (eval echo "$as_me:15358: \"$ac_link\"") >&5 +rm -f "conftest.$ac_objext" "conftest$ac_exeext" +if { (eval echo "$as_me:17521: \"$ac_link\"") >&5 (eval $ac_link) 2>&5 ac_status=$? - echo "$as_me:15361: \$? = $ac_status" >&5 - (exit $ac_status); } && - { ac_try='test -s conftest$ac_exeext' - { (eval echo "$as_me:15364: \"$ac_try\"") >&5 + echo "$as_me:17524: \$? = $ac_status" >&5 + (exit "$ac_status"); } && + { ac_try='test -s "conftest$ac_exeext"' + { (eval echo "$as_me:17527: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? - echo "$as_me:15367: \$? = $ac_status" >&5 - (exit $ac_status); }; }; then - echo "$as_me:15369: result: yes" >&5 + echo "$as_me:17530: \$? = $ac_status" >&5 + (exit "$ac_status"); }; }; then + echo "$as_me:17532: 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:15376: result: no" >&5 +cat "conftest.$ac_ext" >&5 +echo "$as_me:17539: result: no" >&5 echo "${ECHO_T}no" >&6 cf_search= @@ -15381,7 +17544,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$,,'` @@ -15389,11 +17552,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" @@ -15408,11 +17571,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 \ @@ -15426,13 +17589,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 @@ -15441,11 +17604,11 @@ cf_search="$cf_library_path_list $cf_search" for cf_libdir in $cf_search do - echo "$as_me:15444: checking for -l$cf_nculib_root in $cf_libdir" >&5 + echo "$as_me:17607: 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 15448 "configure" + cat >"conftest.$ac_ext" <<_ACEOF +#line 17611 "configure" #include "confdefs.h" #include <${cf_cv_ncurses_header:-curses.h}> int @@ -15456,41 +17619,41 @@ initscr() return 0; } _ACEOF -rm -f conftest.$ac_objext conftest$ac_exeext -if { (eval echo "$as_me:15460: \"$ac_link\"") >&5 +rm -f "conftest.$ac_objext" "conftest$ac_exeext" +if { (eval echo "$as_me:17623: \"$ac_link\"") >&5 (eval $ac_link) 2>&5 ac_status=$? - echo "$as_me:15463: \$? = $ac_status" >&5 - (exit $ac_status); } && - { ac_try='test -s conftest$ac_exeext' - { (eval echo "$as_me:15466: \"$ac_try\"") >&5 + echo "$as_me:17626: \$? = $ac_status" >&5 + (exit "$ac_status"); } && + { ac_try='test -s "conftest$ac_exeext"' + { (eval echo "$as_me:17629: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? - echo "$as_me:15469: \$? = $ac_status" >&5 - (exit $ac_status); }; }; then - echo "$as_me:15471: result: yes" >&5 + echo "$as_me:17632: \$? = $ac_status" >&5 + (exit "$ac_status"); }; }; then + echo "$as_me:17634: 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:15478: result: no" >&5 +cat "conftest.$ac_ext" >&5 +echo "$as_me:17641: 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:15493: error: Cannot link $cf_nculib_root library" >&5 +if test "$cf_found_library" = no ; then + { { echo "$as_me:17656: error: Cannot link $cf_nculib_root library" >&5 echo "$as_me: error: Cannot link $cf_nculib_root library" >&2;} { (exit 1); exit 1; }; } fi @@ -15498,49 +17661,49 @@ fi fi if test -n "$cf_ncurses_LIBS" ; then - echo "$as_me:15501: checking if we can link $cf_nculib_root without $cf_ncurses_LIBS" >&5 + echo "$as_me:17664: 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 15511 "configure" + cat >"conftest.$ac_ext" <<_ACEOF +#line 17674 "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:15523: \"$ac_link\"") >&5 +rm -f "conftest.$ac_objext" "conftest$ac_exeext" +if { (eval echo "$as_me:17686: \"$ac_link\"") >&5 (eval $ac_link) 2>&5 ac_status=$? - echo "$as_me:15526: \$? = $ac_status" >&5 - (exit $ac_status); } && - { ac_try='test -s conftest$ac_exeext' - { (eval echo "$as_me:15529: \"$ac_try\"") >&5 + echo "$as_me:17689: \$? = $ac_status" >&5 + (exit "$ac_status"); } && + { ac_try='test -s "conftest$ac_exeext"' + { (eval echo "$as_me:17692: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? - echo "$as_me:15532: \$? = $ac_status" >&5 - (exit $ac_status); }; }; then - echo "$as_me:15534: result: yes" >&5 + echo "$as_me:17695: \$? = $ac_status" >&5 + (exit "$ac_status"); }; }; then + echo "$as_me:17697: result: yes" >&5 echo "${ECHO_T}yes" >&6 else echo "$as_me: failed program was:" >&5 -cat conftest.$ac_ext >&5 -echo "$as_me:15539: result: no" >&5 +cat "conftest.$ac_ext" >&5 +echo "$as_me:17702: 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___%` @@ -15561,39 +17724,50 @@ cf_ncuconfig_root=$cf_cv_screen cf_have_ncuconfig=no if test "x${PKG_CONFIG:=none}" != xnone; then - echo "$as_me:15564: checking pkg-config for $cf_ncuconfig_root" >&5 + echo "$as_me:17727: 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:15567: result: yes" >&5 + echo "$as_me:17730: result: yes" >&5 echo "${ECHO_T}yes" >&6 - echo "$as_me:15570: checking if the $cf_ncuconfig_root package files work" >&5 + echo "$as_me:17733: checking if the $cf_ncuconfig_root package files work" >&5 echo $ECHO_N "checking if the $cf_ncuconfig_root package files work... $ECHO_C" >&6 cf_have_ncuconfig=unknown + cf_save_CFLAGS="$CFLAGS" cf_save_CPPFLAGS="$CPPFLAGS" cf_save_LIBS="$LIBS" + cf_pkg_cflags="`$PKG_CONFIG --cflags $cf_ncuconfig_root`" + cf_pkg_libs="`$PKG_CONFIG --libs $cf_ncuconfig_root`" + + # while -W for passing linker flags is prevalent, it is not "standard". + # At least one wrapper for c89/c99 (in Apple's xcode) has its own + # incompatible _and_ non-standard -W option which gives an error. Work + # around that pitfall. + case "x${CC}@@${cf_pkg_libs}@${cf_pkg_cflags}" in + (x*c[89]9@@*-W*) + cf_fix_cppflags=no cf_new_cflags= cf_new_cppflags= cf_new_extra_cppflags= -for cf_add_cflags in `$PKG_CONFIG --cflags $cf_ncuconfig_root` +for cf_add_cflags in $cf_pkg_cflags do -case $cf_fix_cppflags in +case "$cf_fix_cppflags" in (no) - case $cf_add_cflags in + case "$cf_add_cflags" in (-undef|-nostdinc*|-I*|-D*|-U*|-E|-P|-C) - case $cf_add_cflags in + case "$cf_add_cflags" in (-D*) - cf_tst_cflags=`echo ${cf_add_cflags} |sed -e 's/^-D[^=]*='\''\"[^"]*//'` + cf_tst_cflags=`echo "${cf_add_cflags}" |sed -e 's/^-D[^=]*='\''\"[^"]*//'` test "x${cf_add_cflags}" != "x${cf_tst_cflags}" \ && test -z "${cf_tst_cflags}" \ && cf_fix_cppflags=yes - if test $cf_fix_cppflags = yes ; then + if test "$cf_fix_cppflags" = yes ; then test -n "$cf_new_extra_cppflags" && cf_new_extra_cppflags="$cf_new_extra_cppflags " cf_new_extra_cppflags="${cf_new_extra_cppflags}$cf_add_cflags" @@ -15612,7 +17786,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/=.*//'` @@ -15642,7 +17816,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}" \ @@ -15672,83 +17846,271 @@ if test -n "$cf_new_extra_cppflags" ; then fi -cf_add_libs="`$PKG_CONFIG --libs $cf_ncuconfig_root`" -# Filter out duplicates - this happens with badly-designed ".pc" files... -for cf_add_1lib in $LIBS +cf_add_libs="$LIBS" +# reverse order +cf_add_0lib= +for cf_add_1lib in $cf_pkg_libs; do cf_add_0lib="$cf_add_1lib $cf_add_0lib"; done +# filter duplicates +for cf_add_1lib in $cf_add_0lib; do + for cf_add_2lib in $cf_add_libs; do + if test "x$cf_add_1lib" = "x$cf_add_2lib"; then + cf_add_1lib= + break + fi + done + test -n "$cf_add_1lib" && cf_add_libs="$cf_add_1lib $cf_add_libs" +done +LIBS="$cf_add_libs" + + cat >"conftest.$ac_ext" <<_ACEOF +#line 17866 "configure" +#include "confdefs.h" +#include <${cf_cv_ncurses_header:-curses.h}> +int +main (void) +{ +initscr(); mousemask(0,0); tigetstr((char *)0); + ; + return 0; +} +_ACEOF +rm -f "conftest.$ac_objext" "conftest$ac_exeext" +if { (eval echo "$as_me:17878: \"$ac_link\"") >&5 + (eval $ac_link) 2>&5 + ac_status=$? + echo "$as_me:17881: \$? = $ac_status" >&5 + (exit "$ac_status"); } && + { ac_try='test -s "conftest$ac_exeext"' + { (eval echo "$as_me:17884: \"$ac_try\"") >&5 + (eval $ac_try) 2>&5 + ac_status=$? + echo "$as_me:17887: \$? = $ac_status" >&5 + (exit "$ac_status"); }; }; then + if test "$cross_compiling" = yes; then + cf_test_ncuconfig=maybe +else + cat >"conftest.$ac_ext" <<_ACEOF +#line 17893 "configure" +#include "confdefs.h" +#include <${cf_cv_ncurses_header:-curses.h}> + int main(void) + { char *xx = curses_version(); return (xx == 0); } +_ACEOF +rm -f "conftest$ac_exeext" +if { (eval echo "$as_me:17900: \"$ac_link\"") >&5 + (eval $ac_link) 2>&5 + ac_status=$? + echo "$as_me:17903: \$? = $ac_status" >&5 + (exit "$ac_status"); } && { ac_try='"./conftest$ac_exeext"' + { (eval echo "$as_me:17905: \"$ac_try\"") >&5 + (eval $ac_try) 2>&5 + ac_status=$? + echo "$as_me:17908: \$? = $ac_status" >&5 + (exit "$ac_status"); }; }; then + cf_test_ncuconfig=yes +else + echo "$as_me: program exited with status $ac_status" >&5 +echo "$as_me: failed program was:" >&5 +cat "conftest.$ac_ext" >&5 +cf_test_ncuconfig=no +fi +rm -f core ./core.* ./*.core "conftest$ac_exeext" "conftest.$ac_objext" "conftest.$ac_ext" +fi +else + echo "$as_me: failed program was:" >&5 +cat "conftest.$ac_ext" >&5 +cf_test_ncuconfig=no +fi +rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext" + + CFLAGS="$cf_save_CFLAGS" + CPPFLAGS="$cf_save_CPPFLAGS" + LIBS="$cf_save_LIBS" + + if test "x$cf_test_ncuconfig" != xyes; then + cf_temp=`echo "x$cf_pkg_cflags" | sed -e s/^x// -e 's/-W[^ ]*//g'` + cf_pkg_cflags="$cf_temp" + cf_temp=`echo "x$cf_pkg_libs" | sed -e s/^x// -e 's/-W[^ ]*//g'` + cf_pkg_libs="$cf_temp" + fi + ;; + esac + +cf_fix_cppflags=no +cf_new_cflags= +cf_new_cppflags= +cf_new_extra_cppflags= + +for cf_add_cflags in $cf_pkg_cflags do - for cf_add_2lib in $cf_add_libs - do - if test "x$cf_add_1lib" = "x$cf_add_2lib" - then +case "$cf_fix_cppflags" in +(no) + case "$cf_add_cflags" in + (-undef|-nostdinc*|-I*|-D*|-U*|-E|-P|-C) + case "$cf_add_cflags" in + (-D*) + cf_tst_cflags=`echo "${cf_add_cflags}" |sed -e 's/^-D[^=]*='\''\"[^"]*//'` + + test "x${cf_add_cflags}" != "x${cf_tst_cflags}" \ + && test -z "${cf_tst_cflags}" \ + && cf_fix_cppflags=yes + + if test "$cf_fix_cppflags" = yes ; then + + test -n "$cf_new_extra_cppflags" && cf_new_extra_cppflags="$cf_new_extra_cppflags " + cf_new_extra_cppflags="${cf_new_extra_cppflags}$cf_add_cflags" + + continue + elif test "${cf_tst_cflags}" = "\"'" ; then + + test -n "$cf_new_extra_cppflags" && cf_new_extra_cppflags="$cf_new_extra_cppflags " + cf_new_extra_cppflags="${cf_new_extra_cppflags}$cf_add_cflags" + + continue + fi + ;; + esac + case "$CPPFLAGS" in + (*$cf_add_cflags) + ;; + (*) + case "$cf_add_cflags" in + (-D*) + cf_tst_cppflags=`echo "x$cf_add_cflags" | sed -e 's/^...//' -e 's/=.*//'` + +CPPFLAGS=`echo "$CPPFLAGS" | \ + sed -e 's/-[UD]'"$cf_tst_cppflags"'\(=[^ ]*\)\?[ ]/ /g' \ + -e 's/-[UD]'"$cf_tst_cppflags"'\(=[^ ]*\)\?$//g'` + + ;; + esac + + test -n "$cf_new_cppflags" && cf_new_cppflags="$cf_new_cppflags " + cf_new_cppflags="${cf_new_cppflags}$cf_add_cflags" + + ;; + esac + ;; + (*) + + test -n "$cf_new_cflags" && cf_new_cflags="$cf_new_cflags " + cf_new_cflags="${cf_new_cflags}$cf_add_cflags" + + ;; + esac + ;; +(yes) + + test -n "$cf_new_extra_cppflags" && cf_new_extra_cppflags="$cf_new_extra_cppflags " + cf_new_extra_cppflags="${cf_new_extra_cppflags}$cf_add_cflags" + + cf_tst_cflags=`echo "${cf_add_cflags}" |sed -e 's/^[^"]*"'\''//'` + + test "x${cf_add_cflags}" != "x${cf_tst_cflags}" \ + && test -z "${cf_tst_cflags}" \ + && cf_fix_cppflags=no + ;; +esac +done + +if test -n "$cf_new_cflags" ; then + + test -n "$CFLAGS" && CFLAGS="$CFLAGS " + CFLAGS="${CFLAGS}$cf_new_cflags" + +fi + +if test -n "$cf_new_cppflags" ; then + + test -n "$CPPFLAGS" && CPPFLAGS="$CPPFLAGS " + CPPFLAGS="${CPPFLAGS}$cf_new_cppflags" + +fi + +if test -n "$cf_new_extra_cppflags" ; then + + test -n "$EXTRA_CPPFLAGS" && EXTRA_CPPFLAGS="$EXTRA_CPPFLAGS " + EXTRA_CPPFLAGS="${EXTRA_CPPFLAGS}$cf_new_extra_cppflags" + +fi + +cf_add_libs="$LIBS" +# reverse order +cf_add_0lib= +for cf_add_1lib in $cf_pkg_libs; do cf_add_0lib="$cf_add_1lib $cf_add_0lib"; done +# filter duplicates +for cf_add_1lib in $cf_add_0lib; do + for cf_add_2lib in $cf_add_libs; do + if test "x$cf_add_1lib" = "x$cf_add_2lib"; then cf_add_1lib= break fi done - test -n "$cf_add_1lib" && cf_add_libs="$cf_add_libs $cf_add_1lib" + test -n "$cf_add_1lib" && cf_add_libs="$cf_add_1lib $cf_add_libs" done LIBS="$cf_add_libs" - cat >conftest.$ac_ext <<_ACEOF -#line 15692 "configure" + cat >"conftest.$ac_ext" <<_ACEOF +#line 18054 "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:15704: \"$ac_link\"") >&5 +rm -f "conftest.$ac_objext" "conftest$ac_exeext" +if { (eval echo "$as_me:18066: \"$ac_link\"") >&5 (eval $ac_link) 2>&5 ac_status=$? - echo "$as_me:15707: \$? = $ac_status" >&5 - (exit $ac_status); } && - { ac_try='test -s conftest$ac_exeext' - { (eval echo "$as_me:15710: \"$ac_try\"") >&5 + echo "$as_me:18069: \$? = $ac_status" >&5 + (exit "$ac_status"); } && + { ac_try='test -s "conftest$ac_exeext"' + { (eval echo "$as_me:18072: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? - echo "$as_me:15713: \$? = $ac_status" >&5 - (exit $ac_status); }; }; then + echo "$as_me:18075: \$? = $ac_status" >&5 + (exit "$ac_status"); }; }; then if test "$cross_compiling" = yes; then cf_have_ncuconfig=maybe else - cat >conftest.$ac_ext <<_ACEOF -#line 15719 "configure" + cat >"conftest.$ac_ext" <<_ACEOF +#line 18081 "configure" #include "confdefs.h" #include <${cf_cv_ncurses_header:-curses.h}> int main(void) { char *xx = curses_version(); return (xx == 0); } _ACEOF -rm -f conftest$ac_exeext -if { (eval echo "$as_me:15726: \"$ac_link\"") >&5 +rm -f "conftest$ac_exeext" +if { (eval echo "$as_me:18088: \"$ac_link\"") >&5 (eval $ac_link) 2>&5 ac_status=$? - echo "$as_me:15729: \$? = $ac_status" >&5 - (exit $ac_status); } && { ac_try='./conftest$ac_exeext' - { (eval echo "$as_me:15731: \"$ac_try\"") >&5 + echo "$as_me:18091: \$? = $ac_status" >&5 + (exit "$ac_status"); } && { ac_try='"./conftest$ac_exeext"' + { (eval echo "$as_me:18093: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? - echo "$as_me:15734: \$? = $ac_status" >&5 - (exit $ac_status); }; }; then + echo "$as_me:18096: \$? = $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:15751: result: $cf_have_ncuconfig" >&5 +rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext" + echo "$as_me:18113: 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" @@ -15764,13 +18126,13 @@ EOF NCURSES_CONFIG_PKG=$cf_ncuconfig_root -echo "$as_me:15767: checking for terminfo header" >&5 +echo "$as_me:18129: 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%'` ;; @@ -15781,8 +18143,8 @@ esac for cf_test in $cf_term_header "ncurses/term.h" "ncursesw/term.h" do -cat >conftest.$ac_ext <<_ACEOF -#line 15785 "configure" +cat >"conftest.$ac_ext" <<_ACEOF +#line 18147 "configure" #include "confdefs.h" #include <stdio.h> #include <${cf_cv_ncurses_header:-curses.h}> @@ -15791,43 +18153,43 @@ cat >conftest.$ac_ext <<_ACEOF int main (void) { -int x = auto_left_margin +int x = auto_left_margin; (void)x ; return 0; } _ACEOF -rm -f conftest.$ac_objext -if { (eval echo "$as_me:15800: \"$ac_compile\"") >&5 +rm -f "conftest.$ac_objext" +if { (eval echo "$as_me:18162: \"$ac_compile\"") >&5 (eval $ac_compile) 2>&5 ac_status=$? - echo "$as_me:15803: \$? = $ac_status" >&5 - (exit $ac_status); } && - { ac_try='test -s conftest.$ac_objext' - { (eval echo "$as_me:15806: \"$ac_try\"") >&5 + echo "$as_me:18165: \$? = $ac_status" >&5 + (exit "$ac_status"); } && + { ac_try='test -s "conftest.$ac_objext"' + { (eval echo "$as_me:18168: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? - echo "$as_me:15809: \$? = $ac_status" >&5 - (exit $ac_status); }; }; then + echo "$as_me:18171: \$? = $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:15825: result: $cf_cv_term_header" >&5 +echo "$as_me:18187: 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 @@ -15837,7 +18199,7 @@ EOF ;; esac -case $cf_cv_term_header in +case "$cf_cv_term_header" in (ncurses/term.h) cat >>confdefs.h <<\EOF @@ -15857,7 +18219,7 @@ esac fi else - echo "$as_me:15860: result: no" >&5 + echo "$as_me:18222: result: no" >&5 echo "${ECHO_T}no" >&6 NCURSES_CONFIG_PKG=none fi @@ -15873,7 +18235,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:15876: checking for $ac_word" >&5 +echo "$as_me:18238: 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 @@ -15888,7 +18250,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:15891: found $ac_dir/$ac_word" >&5 +echo "$as_me:18253: found $ac_dir/$ac_word" >&5 break done @@ -15896,10 +18258,10 @@ fi fi NCURSES_CONFIG=$ac_cv_prog_NCURSES_CONFIG if test -n "$NCURSES_CONFIG"; then - echo "$as_me:15899: result: $NCURSES_CONFIG" >&5 + echo "$as_me:18261: result: $NCURSES_CONFIG" >&5 echo "${ECHO_T}$NCURSES_CONFIG" >&6 else - echo "$as_me:15902: result: no" >&5 + echo "$as_me:18264: result: no" >&5 echo "${ECHO_T}no" >&6 fi @@ -15912,7 +18274,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:15915: checking for $ac_word" >&5 +echo "$as_me:18277: 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 @@ -15927,7 +18289,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:15930: found $ac_dir/$ac_word" >&5 +echo "$as_me:18292: found $ac_dir/$ac_word" >&5 break done @@ -15935,10 +18297,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:15938: result: $ac_ct_NCURSES_CONFIG" >&5 + echo "$as_me:18300: result: $ac_ct_NCURSES_CONFIG" >&5 echo "${ECHO_T}$ac_ct_NCURSES_CONFIG" >&6 else - echo "$as_me:15941: result: no" >&5 + echo "$as_me:18303: result: no" >&5 echo "${ECHO_T}no" >&6 fi @@ -15958,19 +18320,19 @@ cf_new_extra_cppflags= for cf_add_cflags in `$NCURSES_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" @@ -15989,7 +18351,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/=.*//'` @@ -16019,7 +18381,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}" \ @@ -16049,25 +18411,25 @@ if test -n "$cf_new_extra_cppflags" ; then fi -cf_add_libs="`$NCURSES_CONFIG --libs`" -# Filter out duplicates - this happens with badly-designed ".pc" files... -for cf_add_1lib in $LIBS -do - for cf_add_2lib in $cf_add_libs - do - if test "x$cf_add_1lib" = "x$cf_add_2lib" - then +cf_add_libs="$LIBS" +# reverse order +cf_add_0lib= +for cf_add_1lib in `$NCURSES_CONFIG --libs`; do cf_add_0lib="$cf_add_1lib $cf_add_0lib"; done +# filter duplicates +for cf_add_1lib in $cf_add_0lib; do + for cf_add_2lib in $cf_add_libs; do + if test "x$cf_add_1lib" = "x$cf_add_2lib"; then cf_add_1lib= break fi done - test -n "$cf_add_1lib" && cf_add_libs="$cf_add_libs $cf_add_1lib" + test -n "$cf_add_1lib" && cf_add_libs="$cf_add_1lib $cf_add_libs" done LIBS="$cf_add_libs" # even with config script, some packages use no-override for curses.h -echo "$as_me:16070: checking if we have identified curses headers" >&5 +echo "$as_me:18432: 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 @@ -16078,8 +18440,8 @@ 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 16082 "configure" +cat >"conftest.$ac_ext" <<_ACEOF +#line 18444 "configure" #include "confdefs.h" #include <${cf_header}> int @@ -16090,32 +18452,32 @@ initscr(); tgoto("?", 0,0) return 0; } _ACEOF -rm -f conftest.$ac_objext -if { (eval echo "$as_me:16094: \"$ac_compile\"") >&5 +rm -f "conftest.$ac_objext" +if { (eval echo "$as_me:18456: \"$ac_compile\"") >&5 (eval $ac_compile) 2>&5 ac_status=$? - echo "$as_me:16097: \$? = $ac_status" >&5 - (exit $ac_status); } && - { ac_try='test -s conftest.$ac_objext' - { (eval echo "$as_me:16100: \"$ac_try\"") >&5 + echo "$as_me:18459: \$? = $ac_status" >&5 + (exit "$ac_status"); } && + { ac_try='test -s "conftest.$ac_objext"' + { (eval echo "$as_me:18462: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? - echo "$as_me:16103: \$? = $ac_status" >&5 - (exit $ac_status); }; }; then + echo "$as_me:18465: \$? = $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:16114: result: $cf_cv_ncurses_header" >&5 +echo "$as_me:18476: 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:16118: error: No curses header-files found" >&5 + { { echo "$as_me:18480: error: No curses header-files found" >&5 echo "$as_me: error: No curses header-files found" >&2;} { (exit 1); exit 1; }; } fi @@ -16125,24 +18487,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:16128: checking for $ac_header" >&5 +echo "$as_me:18490: 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 16134 "configure" + cat >"conftest.$ac_ext" <<_ACEOF +#line 18496 "configure" #include "confdefs.h" #include <$ac_header> _ACEOF -if { (eval echo "$as_me:16138: \"$ac_cpp conftest.$ac_ext\"") >&5 - (eval $ac_cpp conftest.$ac_ext) 2>conftest.er1 +if { (eval echo "$as_me:18500: \"$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:16144: \$? = $ac_status" >&5 - (exit $ac_status); } >/dev/null; then + echo "$as_me:18506: \$? = $ac_status" >&5 + (exit "$ac_status"); } >/dev/null; then if test -s conftest.err; then ac_cpp_err=$ac_c_preproc_warn_flag else @@ -16155,14 +18517,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:16163: 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:18525: result: `eval echo '${'"$as_ac_Header"'}'`" >&5 +echo "${ECHO_T}`eval echo '${'"$as_ac_Header"'}'`" >&6 +if test "`eval echo '${'"$as_ac_Header"'}'`" = yes; then cat >>confdefs.h <<EOF #define `echo "HAVE_$ac_header" | $as_tr_cpp` 1 EOF @@ -16180,7 +18542,7 @@ cf_nculib_ROOT=`echo "HAVE_LIB$cf_ncuconfig_root" | sed y%abcdefghijklmnopqrstuv #define $cf_nculib_ROOT 1 EOF - cf_cv_ncurses_version=`$NCURSES_CONFIG --version` + cf_cv_ncurses_version="`$NCURSES_CONFIG --version`" else @@ -16192,9 +18554,9 @@ test "$cf_cv_curses_dir" != "no" && { \ if test -n "$cf_cv_curses_dir/include/$cf_ncuhdr_root" ; then for cf_add_incdir in $cf_cv_curses_dir/include/$cf_ncuhdr_root 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 @@ -16215,8 +18577,8 @@ if test -n "$cf_cv_curses_dir/include/$cf_ncuhdr_root" ; then test -n "$CPPFLAGS" && CPPFLAGS="$CPPFLAGS " CPPFLAGS="${CPPFLAGS}-I$cf_add_incdir" - cat >conftest.$ac_ext <<_ACEOF -#line 16219 "configure" + cat >"conftest.$ac_ext" <<_ACEOF +#line 18581 "configure" #include "confdefs.h" #include <stdio.h> int @@ -16227,25 +18589,25 @@ printf("Hello") return 0; } _ACEOF -rm -f conftest.$ac_objext -if { (eval echo "$as_me:16231: \"$ac_compile\"") >&5 +rm -f "conftest.$ac_objext" +if { (eval echo "$as_me:18593: \"$ac_compile\"") >&5 (eval $ac_compile) 2>&5 ac_status=$? - echo "$as_me:16234: \$? = $ac_status" >&5 - (exit $ac_status); } && - { ac_try='test -s conftest.$ac_objext' - { (eval echo "$as_me:16237: \"$ac_try\"") >&5 + echo "$as_me:18596: \$? = $ac_status" >&5 + (exit "$ac_status"); } && + { ac_try='test -s "conftest.$ac_objext"' + { (eval echo "$as_me:18599: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? - echo "$as_me:16240: \$? = $ac_status" >&5 - (exit $ac_status); }; }; then + echo "$as_me:18602: \$? = $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 @@ -16254,11 +18616,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}:16257: testing adding $cf_add_incdir to include-path ..." 1>&5 +echo "${as_me:-configure}:18619: 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 @@ -16273,19 +18635,19 @@ fi } -echo "$as_me:16276: checking for $cf_ncuhdr_root header in include-path" >&5 +echo "$as_me:18638: 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 16288 "configure" + cat >"conftest.$ac_ext" <<_ACEOF +#line 18650 "configure" #include "confdefs.h" #include <$cf_header> @@ -16295,10 +18657,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 @@ -16308,39 +18670,39 @@ printf("old\n"); return 0; } _ACEOF -rm -f conftest.$ac_objext -if { (eval echo "$as_me:16312: \"$ac_compile\"") >&5 +rm -f "conftest.$ac_objext" +if { (eval echo "$as_me:18674: \"$ac_compile\"") >&5 (eval $ac_compile) 2>&5 ac_status=$? - echo "$as_me:16315: \$? = $ac_status" >&5 - (exit $ac_status); } && - { ac_try='test -s conftest.$ac_objext' - { (eval echo "$as_me:16318: \"$ac_try\"") >&5 + echo "$as_me:18677: \$? = $ac_status" >&5 + (exit "$ac_status"); } && + { ac_try='test -s "conftest.$ac_objext"' + { (eval echo "$as_me:18680: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? - echo "$as_me:16321: \$? = $ac_status" >&5 - (exit $ac_status); }; }; then + echo "$as_me:18683: \$? = $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:16336: result: $cf_cv_ncurses_h" >&5 +echo "$as_me:18698: 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:16343: checking for $cf_ncuhdr_root include-path" >&5 +echo "$as_me:18705: 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 @@ -16355,7 +18717,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$,,'` @@ -16363,11 +18725,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" @@ -16384,11 +18746,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 \ @@ -16402,13 +18764,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 @@ -16416,20 +18778,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 @@ -16437,9 +18799,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 @@ -16460,8 +18822,8 @@ if test -n "$cf_incdir" ; then test -n "$CPPFLAGS" && CPPFLAGS="$CPPFLAGS " CPPFLAGS="${CPPFLAGS}-I$cf_add_incdir" - cat >conftest.$ac_ext <<_ACEOF -#line 16464 "configure" + cat >"conftest.$ac_ext" <<_ACEOF +#line 18826 "configure" #include "confdefs.h" #include <stdio.h> int @@ -16472,25 +18834,25 @@ printf("Hello") return 0; } _ACEOF -rm -f conftest.$ac_objext -if { (eval echo "$as_me:16476: \"$ac_compile\"") >&5 +rm -f "conftest.$ac_objext" +if { (eval echo "$as_me:18838: \"$ac_compile\"") >&5 (eval $ac_compile) 2>&5 ac_status=$? - echo "$as_me:16479: \$? = $ac_status" >&5 - (exit $ac_status); } && - { ac_try='test -s conftest.$ac_objext' - { (eval echo "$as_me:16482: \"$ac_try\"") >&5 + echo "$as_me:18841: \$? = $ac_status" >&5 + (exit "$ac_status"); } && + { ac_try='test -s "conftest.$ac_objext"' + { (eval echo "$as_me:18844: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? - echo "$as_me:16485: \$? = $ac_status" >&5 - (exit $ac_status); }; }; then + echo "$as_me:18847: \$? = $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 @@ -16499,11 +18861,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}:16502: testing adding $cf_add_incdir to include-path ..." 1>&5 +echo "${as_me:-configure}:18864: 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 @@ -16521,8 +18883,8 @@ fi curses.h do - cat >conftest.$ac_ext <<_ACEOF -#line 16525 "configure" + cat >"conftest.$ac_ext" <<_ACEOF +#line 18887 "configure" #include "confdefs.h" #include <$cf_header> @@ -16532,10 +18894,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 @@ -16545,30 +18907,30 @@ printf("old\n"); return 0; } _ACEOF -rm -f conftest.$ac_objext -if { (eval echo "$as_me:16549: \"$ac_compile\"") >&5 +rm -f "conftest.$ac_objext" +if { (eval echo "$as_me:18911: \"$ac_compile\"") >&5 (eval $ac_compile) 2>&5 ac_status=$? - echo "$as_me:16552: \$? = $ac_status" >&5 - (exit $ac_status); } && - { ac_try='test -s conftest.$ac_objext' - { (eval echo "$as_me:16555: \"$ac_try\"") >&5 + echo "$as_me:18914: \$? = $ac_status" >&5 + (exit "$ac_status"); } && + { ac_try='test -s "conftest.$ac_objext"' + { (eval echo "$as_me:18917: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? - echo "$as_me:16558: \$? = $ac_status" >&5 - (exit $ac_status); }; }; then + echo "$as_me:18920: \$? = $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 @@ -16576,26 +18938,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:16579: error: not found" >&5 + test "$cf_cv_ncurses_h2" = no && { { echo "$as_me:18941: error: not found" >&5 echo "$as_me: error: not found" >&2;} { (exit 1); exit 1; }; } fi -echo "$as_me:16584: result: $cf_cv_ncurses_h2" >&5 +echo "$as_me:18946: 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 @@ -16616,8 +18978,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 16620 "configure" + cat >"conftest.$ac_ext" <<_ACEOF +#line 18982 "configure" #include "confdefs.h" #include <stdio.h> int @@ -16628,25 +18990,25 @@ printf("Hello") return 0; } _ACEOF -rm -f conftest.$ac_objext -if { (eval echo "$as_me:16632: \"$ac_compile\"") >&5 +rm -f "conftest.$ac_objext" +if { (eval echo "$as_me:18994: \"$ac_compile\"") >&5 (eval $ac_compile) 2>&5 ac_status=$? - echo "$as_me:16635: \$? = $ac_status" >&5 - (exit $ac_status); } && - { ac_try='test -s conftest.$ac_objext' - { (eval echo "$as_me:16638: \"$ac_try\"") >&5 + echo "$as_me:18997: \$? = $ac_status" >&5 + (exit "$ac_status"); } && + { ac_try='test -s "conftest.$ac_objext"' + { (eval echo "$as_me:19000: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? - echo "$as_me:16641: \$? = $ac_status" >&5 - (exit $ac_status); }; }; then + echo "$as_me:19003: \$? = $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 @@ -16655,11 +19017,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}:16658: testing adding $cf_add_incdir to include-path ..." 1>&5 +echo "${as_me:-configure}:19020: 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 @@ -16676,7 +19038,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 @@ -16686,7 +19048,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 @@ -16703,13 +19065,13 @@ EOF ;; esac -echo "$as_me:16706: checking for terminfo header" >&5 +echo "$as_me:19068: 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%'` ;; @@ -16720,8 +19082,8 @@ esac for cf_test in $cf_term_header "ncurses/term.h" "ncursesw/term.h" do -cat >conftest.$ac_ext <<_ACEOF -#line 16724 "configure" +cat >"conftest.$ac_ext" <<_ACEOF +#line 19086 "configure" #include "confdefs.h" #include <stdio.h> #include <${cf_cv_ncurses_header:-curses.h}> @@ -16730,43 +19092,43 @@ cat >conftest.$ac_ext <<_ACEOF int main (void) { -int x = auto_left_margin +int x = auto_left_margin; (void)x ; return 0; } _ACEOF -rm -f conftest.$ac_objext -if { (eval echo "$as_me:16739: \"$ac_compile\"") >&5 +rm -f "conftest.$ac_objext" +if { (eval echo "$as_me:19101: \"$ac_compile\"") >&5 (eval $ac_compile) 2>&5 ac_status=$? - echo "$as_me:16742: \$? = $ac_status" >&5 - (exit $ac_status); } && - { ac_try='test -s conftest.$ac_objext' - { (eval echo "$as_me:16745: \"$ac_try\"") >&5 + echo "$as_me:19104: \$? = $ac_status" >&5 + (exit "$ac_status"); } && + { ac_try='test -s "conftest.$ac_objext"' + { (eval echo "$as_me:19107: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? - echo "$as_me:16748: \$? = $ac_status" >&5 - (exit $ac_status); }; }; then + echo "$as_me:19110: \$? = $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:16764: result: $cf_cv_term_header" >&5 +echo "$as_me:19126: 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 @@ -16776,7 +19138,7 @@ EOF ;; esac -case $cf_cv_term_header in +case "$cf_cv_term_header" in (ncurses/term.h) cat >>confdefs.h <<\EOF @@ -16799,7 +19161,7 @@ cat >>confdefs.h <<\EOF #define NCURSES 1 EOF -echo "$as_me:16802: checking for ncurses version" >&5 +echo "$as_me:19164: 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 @@ -16807,12 +19169,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 <<EOF + cat > "conftest.$ac_ext" <<EOF #include <${cf_cv_ncurses_header:-curses.h}> #undef Autoconf #ifdef NCURSES_VERSION @@ -16825,20 +19187,20 @@ Autoconf "old" #endif EOF cf_try="$ac_cpp conftest.$ac_ext 2>&5 | grep '^Autoconf ' >conftest.out" - { (eval echo "$as_me:16828: \"$cf_try\"") >&5 + { (eval echo "$as_me:19190: \"$cf_try\"") >&5 (eval $cf_try) 2>&5 ac_status=$? - echo "$as_me:16831: \$? = $ac_status" >&5 - (exit $ac_status); } + echo "$as_me:19193: \$? = $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 16841 "configure" + cat >"conftest.$ac_ext" <<_ACEOF +#line 19203 "configure" #include "confdefs.h" #include <${cf_cv_ncurses_header:-curses.h}> @@ -16848,13 +19210,13 @@ 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 @@ -16862,30 +19224,30 @@ int main(void) ${cf_cv_main_return:-return}(0); } _ACEOF -rm -f conftest$ac_exeext -if { (eval echo "$as_me:16866: \"$ac_link\"") >&5 +rm -f "conftest$ac_exeext" +if { (eval echo "$as_me:19228: \"$ac_link\"") >&5 (eval $ac_link) 2>&5 ac_status=$? - echo "$as_me:16869: \$? = $ac_status" >&5 - (exit $ac_status); } && { ac_try='./conftest$ac_exeext' - { (eval echo "$as_me:16871: \"$ac_try\"") >&5 + echo "$as_me:19231: \$? = $ac_status" >&5 + (exit "$ac_status"); } && { ac_try='"./conftest$ac_exeext"' + { (eval echo "$as_me:19233: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? - echo "$as_me:16874: \$? = $ac_status" >&5 - (exit $ac_status); }; }; then + echo "$as_me:19236: \$? = $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:16888: result: $cf_cv_ncurses_version" >&5 +echo "$as_me:19250: result: $cf_cv_ncurses_version" >&5 echo "${ECHO_T}$cf_cv_ncurses_version" >&6 test "$cf_cv_ncurses_version" = no || cat >>confdefs.h <<\EOF @@ -16898,15 +19260,15 @@ cf_nculib_root=$cf_cv_screen # to link gpm. cf_ncurses_LIBS="" cf_ncurses_SAVE="$LIBS" -echo "$as_me:16901: checking for Gpm_Open in -lgpm" >&5 +echo "$as_me:19263: 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 16909 "configure" +cat >"conftest.$ac_ext" <<_ACEOF +#line 19271 "configure" #include "confdefs.h" /* Override any gcc2 internal prototype to avoid an error. */ @@ -16924,39 +19286,39 @@ Gpm_Open (); return 0; } _ACEOF -rm -f conftest.$ac_objext conftest$ac_exeext -if { (eval echo "$as_me:16928: \"$ac_link\"") >&5 +rm -f "conftest.$ac_objext" "conftest$ac_exeext" +if { (eval echo "$as_me:19290: \"$ac_link\"") >&5 (eval $ac_link) 2>&5 ac_status=$? - echo "$as_me:16931: \$? = $ac_status" >&5 - (exit $ac_status); } && - { ac_try='test -s conftest$ac_exeext' - { (eval echo "$as_me:16934: \"$ac_try\"") >&5 + echo "$as_me:19293: \$? = $ac_status" >&5 + (exit "$ac_status"); } && + { ac_try='test -s "conftest$ac_exeext"' + { (eval echo "$as_me:19296: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? - echo "$as_me:16937: \$? = $ac_status" >&5 - (exit $ac_status); }; }; then + echo "$as_me:19299: \$? = $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:16948: result: $ac_cv_lib_gpm_Gpm_Open" >&5 +echo "$as_me:19310: 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:16951: checking for initscr in -lgpm" >&5 +if test "$ac_cv_lib_gpm_Gpm_Open" = yes; then + echo "$as_me:19313: 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 16959 "configure" +cat >"conftest.$ac_ext" <<_ACEOF +#line 19321 "configure" #include "confdefs.h" /* Override any gcc2 internal prototype to avoid an error. */ @@ -16974,30 +19336,30 @@ initscr (); return 0; } _ACEOF -rm -f conftest.$ac_objext conftest$ac_exeext -if { (eval echo "$as_me:16978: \"$ac_link\"") >&5 +rm -f "conftest.$ac_objext" "conftest$ac_exeext" +if { (eval echo "$as_me:19340: \"$ac_link\"") >&5 (eval $ac_link) 2>&5 ac_status=$? - echo "$as_me:16981: \$? = $ac_status" >&5 - (exit $ac_status); } && - { ac_try='test -s conftest$ac_exeext' - { (eval echo "$as_me:16984: \"$ac_try\"") >&5 + echo "$as_me:19343: \$? = $ac_status" >&5 + (exit "$ac_status"); } && + { ac_try='test -s "conftest$ac_exeext"' + { (eval echo "$as_me:19346: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? - echo "$as_me:16987: \$? = $ac_status" >&5 - (exit $ac_status); }; }; then + echo "$as_me:19349: \$? = $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:16998: result: $ac_cv_lib_gpm_initscr" >&5 +echo "$as_me:19360: 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" @@ -17005,20 +19367,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). if test "$cf_nculib_root" = ncurses ; then - echo "$as_me:17013: checking for tgoto in -lmytinfo" >&5 + echo "$as_me:19375: 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 17021 "configure" +cat >"conftest.$ac_ext" <<_ACEOF +#line 19383 "configure" #include "confdefs.h" /* Override any gcc2 internal prototype to avoid an error. */ @@ -17036,30 +19398,30 @@ tgoto (); return 0; } _ACEOF -rm -f conftest.$ac_objext conftest$ac_exeext -if { (eval echo "$as_me:17040: \"$ac_link\"") >&5 +rm -f "conftest.$ac_objext" "conftest$ac_exeext" +if { (eval echo "$as_me:19402: \"$ac_link\"") >&5 (eval $ac_link) 2>&5 ac_status=$? - echo "$as_me:17043: \$? = $ac_status" >&5 - (exit $ac_status); } && - { ac_try='test -s conftest$ac_exeext' - { (eval echo "$as_me:17046: \"$ac_try\"") >&5 + echo "$as_me:19405: \$? = $ac_status" >&5 + (exit "$ac_status"); } && + { ac_try='test -s "conftest$ac_exeext"' + { (eval echo "$as_me:19408: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? - echo "$as_me:17049: \$? = $ac_status" >&5 - (exit $ac_status); }; }; then + echo "$as_me:19411: \$? = $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:17060: result: $ac_cv_lib_mytinfo_tgoto" >&5 +echo "$as_me:19422: 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 @@ -17067,113 +19429,113 @@ fi ;; esac -cf_add_libs="$cf_ncurses_LIBS" -# Filter out duplicates - this happens with badly-designed ".pc" files... -for cf_add_1lib in $LIBS -do - for cf_add_2lib in $cf_add_libs - do - if test "x$cf_add_1lib" = "x$cf_add_2lib" - then +cf_add_libs="$LIBS" +# reverse order +cf_add_0lib= +for cf_add_1lib in $cf_ncurses_LIBS; do cf_add_0lib="$cf_add_1lib $cf_add_0lib"; done +# filter duplicates +for cf_add_1lib in $cf_add_0lib; do + for cf_add_2lib in $cf_add_libs; do + if test "x$cf_add_1lib" = "x$cf_add_2lib"; then cf_add_1lib= break fi done - test -n "$cf_add_1lib" && cf_add_libs="$cf_add_libs $cf_add_1lib" + test -n "$cf_add_1lib" && cf_add_libs="$cf_add_1lib $cf_add_libs" done LIBS="$cf_add_libs" -if ( test -n "$cf_cv_curses_dir" && test "$cf_cv_curses_dir" != "no" ) +if test -n "$cf_cv_curses_dir" && test "$cf_cv_curses_dir" != "no" then -cf_add_libs="-l$cf_nculib_root" -# Filter out duplicates - this happens with badly-designed ".pc" files... -for cf_add_1lib in $LIBS -do - for cf_add_2lib in $cf_add_libs - do - if test "x$cf_add_1lib" = "x$cf_add_2lib" - then +cf_add_libs="$LIBS" +# reverse order +cf_add_0lib= +for cf_add_1lib in -l$cf_nculib_root; do cf_add_0lib="$cf_add_1lib $cf_add_0lib"; done +# filter duplicates +for cf_add_1lib in $cf_add_0lib; do + for cf_add_2lib in $cf_add_libs; do + if test "x$cf_add_1lib" = "x$cf_add_2lib"; then cf_add_1lib= break fi done - test -n "$cf_add_1lib" && cf_add_libs="$cf_add_libs $cf_add_1lib" + test -n "$cf_add_1lib" && cf_add_libs="$cf_add_1lib $cf_add_libs" done LIBS="$cf_add_libs" else - eval 'cf_cv_have_lib_'$cf_nculib_root'=no' + eval 'cf_cv_have_lib_'"$cf_nculib_root"'=no' cf_libdir="" - echo "$as_me:17109: checking for initscr" >&5 + echo "$as_me:19471: 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 17115 "configure" + cat >"conftest.$ac_ext" <<_ACEOF +#line 19477 "configure" #include "confdefs.h" -/* System header to define __stub macros and hopefully few prototypes, - which can conflict with char initscr (); below. */ -#include <assert.h> -/* Override any gcc2 internal prototype to avoid an error. */ +#define initscr autoconf_temporary +#include <limits.h> /* least-intrusive standard header which defines gcc2 __stub macros */ +#undef initscr + #ifdef __cplusplus extern "C" #endif + /* We use char because int might match the return type of a gcc2 builtin and then its argument prototype would still apply. */ -char initscr (); -char (*f) (); +char initscr (void); int main (void) { -/* The GNU C library defines this for functions which it implements + +/* The GNU C library defines stubs for functions which it implements to always fail with ENOSYS. Some functions are actually named something starting with __ and the normal name is an alias. */ #if defined (__stub_initscr) || defined (__stub___initscr) -choke me -#else -f = initscr; /* workaround for ICC 12.0.3 */ if (f == 0) return 1; +#error found stub for initscr #endif + return initscr (); ; return 0; } _ACEOF -rm -f conftest.$ac_objext conftest$ac_exeext -if { (eval echo "$as_me:17146: \"$ac_link\"") >&5 +rm -f "conftest.$ac_objext" "conftest$ac_exeext" +if { (eval echo "$as_me:19508: \"$ac_link\"") >&5 (eval $ac_link) 2>&5 ac_status=$? - echo "$as_me:17149: \$? = $ac_status" >&5 - (exit $ac_status); } && - { ac_try='test -s conftest$ac_exeext' - { (eval echo "$as_me:17152: \"$ac_try\"") >&5 + echo "$as_me:19511: \$? = $ac_status" >&5 + (exit "$ac_status"); } && + { ac_try='test -s "conftest$ac_exeext"' + { (eval echo "$as_me:19514: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? - echo "$as_me:17155: \$? = $ac_status" >&5 - (exit $ac_status); }; }; then + echo "$as_me:19517: \$? = $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:17165: result: $ac_cv_func_initscr" >&5 +echo "$as_me:19527: 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:17172: checking for initscr in -l$cf_nculib_root" >&5 + echo "$as_me:19534: 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 17176 "configure" + cat >"conftest.$ac_ext" <<_ACEOF +#line 19538 "configure" #include "confdefs.h" #include <${cf_cv_ncurses_header:-curses.h}> int @@ -17184,26 +19546,26 @@ initscr() return 0; } _ACEOF -rm -f conftest.$ac_objext conftest$ac_exeext -if { (eval echo "$as_me:17188: \"$ac_link\"") >&5 +rm -f "conftest.$ac_objext" "conftest$ac_exeext" +if { (eval echo "$as_me:19550: \"$ac_link\"") >&5 (eval $ac_link) 2>&5 ac_status=$? - echo "$as_me:17191: \$? = $ac_status" >&5 - (exit $ac_status); } && - { ac_try='test -s conftest$ac_exeext' - { (eval echo "$as_me:17194: \"$ac_try\"") >&5 + echo "$as_me:19553: \$? = $ac_status" >&5 + (exit "$ac_status"); } && + { ac_try='test -s "conftest$ac_exeext"' + { (eval echo "$as_me:19556: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? - echo "$as_me:17197: \$? = $ac_status" >&5 - (exit $ac_status); }; }; then - echo "$as_me:17199: result: yes" >&5 + echo "$as_me:19559: \$? = $ac_status" >&5 + (exit "$ac_status"); }; }; then + echo "$as_me:19561: 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:17206: result: no" >&5 +cat "conftest.$ac_ext" >&5 +echo "$as_me:19568: result: no" >&5 echo "${ECHO_T}no" >&6 cf_search= @@ -17211,7 +19573,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$,,'` @@ -17219,11 +19581,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" @@ -17238,11 +19600,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 \ @@ -17256,13 +19618,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 @@ -17271,11 +19633,11 @@ cf_search="$cf_library_path_list $cf_search" for cf_libdir in $cf_search do - echo "$as_me:17274: checking for -l$cf_nculib_root in $cf_libdir" >&5 + echo "$as_me:19636: 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 17278 "configure" + cat >"conftest.$ac_ext" <<_ACEOF +#line 19640 "configure" #include "confdefs.h" #include <${cf_cv_ncurses_header:-curses.h}> int @@ -17286,41 +19648,41 @@ initscr() return 0; } _ACEOF -rm -f conftest.$ac_objext conftest$ac_exeext -if { (eval echo "$as_me:17290: \"$ac_link\"") >&5 +rm -f "conftest.$ac_objext" "conftest$ac_exeext" +if { (eval echo "$as_me:19652: \"$ac_link\"") >&5 (eval $ac_link) 2>&5 ac_status=$? - echo "$as_me:17293: \$? = $ac_status" >&5 - (exit $ac_status); } && - { ac_try='test -s conftest$ac_exeext' - { (eval echo "$as_me:17296: \"$ac_try\"") >&5 + echo "$as_me:19655: \$? = $ac_status" >&5 + (exit "$ac_status"); } && + { ac_try='test -s "conftest$ac_exeext"' + { (eval echo "$as_me:19658: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? - echo "$as_me:17299: \$? = $ac_status" >&5 - (exit $ac_status); }; }; then - echo "$as_me:17301: result: yes" >&5 + echo "$as_me:19661: \$? = $ac_status" >&5 + (exit "$ac_status"); }; }; then + echo "$as_me:19663: 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:17308: result: no" >&5 +cat "conftest.$ac_ext" >&5 +echo "$as_me:19670: 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:17323: error: Cannot link $cf_nculib_root library" >&5 +if test "$cf_found_library" = no ; then + { { echo "$as_me:19685: error: Cannot link $cf_nculib_root library" >&5 echo "$as_me: error: Cannot link $cf_nculib_root library" >&2;} { (exit 1); exit 1; }; } fi @@ -17328,49 +19690,49 @@ fi fi if test -n "$cf_ncurses_LIBS" ; then - echo "$as_me:17331: checking if we can link $cf_nculib_root without $cf_ncurses_LIBS" >&5 + echo "$as_me:19693: 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 17341 "configure" + cat >"conftest.$ac_ext" <<_ACEOF +#line 19703 "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:17353: \"$ac_link\"") >&5 +rm -f "conftest.$ac_objext" "conftest$ac_exeext" +if { (eval echo "$as_me:19715: \"$ac_link\"") >&5 (eval $ac_link) 2>&5 ac_status=$? - echo "$as_me:17356: \$? = $ac_status" >&5 - (exit $ac_status); } && - { ac_try='test -s conftest$ac_exeext' - { (eval echo "$as_me:17359: \"$ac_try\"") >&5 + echo "$as_me:19718: \$? = $ac_status" >&5 + (exit "$ac_status"); } && + { ac_try='test -s "conftest$ac_exeext"' + { (eval echo "$as_me:19721: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? - echo "$as_me:17362: \$? = $ac_status" >&5 - (exit $ac_status); }; }; then - echo "$as_me:17364: result: yes" >&5 + echo "$as_me:19724: \$? = $ac_status" >&5 + (exit "$ac_status"); }; }; then + echo "$as_me:19726: result: yes" >&5 echo "${ECHO_T}yes" >&6 else echo "$as_me: failed program was:" >&5 -cat conftest.$ac_ext >&5 -echo "$as_me:17369: result: no" >&5 +cat "conftest.$ac_ext" >&5 +echo "$as_me:19731: 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___%` @@ -17386,1083 +19748,10 @@ fi ;; (pdcurses) - echo "$as_me:17389: checking for X" >&5 -echo $ECHO_N "checking for X... $ECHO_C" >&6 - -# Check whether --with-x or --without-x was given. -if test "${with_x+set}" = set; then - withval="$with_x" - -fi; -# $have_x is `yes', `no', `disabled', or empty when we do not yet know. -if test "x$with_x" = xno; then - # The user explicitly disabled X. - have_x=disabled -else - if test "x$x_includes" != xNONE && test "x$x_libraries" != xNONE; then - # Both variables are already set. - have_x=yes - else - if test "${ac_cv_have_x+set}" = set; then - echo $ECHO_N "(cached) $ECHO_C" >&6 -else - # One or both of the vars are not set, and there is no cached value. -ac_x_includes=no ac_x_libraries=no -rm -fr conftest.dir -if mkdir conftest.dir; then - cd conftest.dir - # Make sure to not put "make" in the Imakefile rules, since we grep it out. - cat >Imakefile <<'EOF' -acfindx: - @echo 'ac_im_incroot="${INCROOT}"; ac_im_usrlibdir="${USRLIBDIR}"; ac_im_libdir="${LIBDIR}"' -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` - # 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 - ac_im_usrlibdir=$ac_im_libdir; break - fi - done - # Screen out bogus values from the imake configuration. They are - # bogus both because they are the default anyway, and because - # using them would break gcc on systems where it needs fixed includes. - case $ac_im_incroot in - /usr/include) ;; - *) test -f "$ac_im_incroot/X11/Xos.h" && ac_x_includes=$ac_im_incroot;; - esac - case $ac_im_usrlibdir in - /usr/lib | /lib) ;; - *) test -d "$ac_im_usrlibdir" && ac_x_libraries=$ac_im_usrlibdir ;; - esac - fi - cd .. - rm -fr conftest.dir -fi - -# Standard set of common directories for X headers. -# Check X11 before X11Rn because it is often a symlink to the current release. -ac_x_header_dirs=' -/usr/X11/include -/usr/X11R6/include -/usr/X11R5/include -/usr/X11R4/include - -/usr/include/X11 -/usr/include/X11R6 -/usr/include/X11R5 -/usr/include/X11R4 - -/usr/local/X11/include -/usr/local/X11R6/include -/usr/local/X11R5/include -/usr/local/X11R4/include - -/usr/local/include/X11 -/usr/local/include/X11R6 -/usr/local/include/X11R5 -/usr/local/include/X11R4 - -/usr/X386/include -/usr/x386/include -/usr/XFree86/include/X11 - -/usr/include -/usr/local/include -/usr/unsupported/include -/usr/athena/include -/usr/local/x11r5/include -/usr/lpp/Xamples/include - -/usr/openwin/include -/usr/openwin/share/include' - -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 17486 "configure" -#include "confdefs.h" -#include <X11/Intrinsic.h> -_ACEOF -if { (eval echo "$as_me:17490: \"$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:17496: \$? = $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 - # We can compile using X headers with no special include directory. -ac_x_includes= -else - echo "$as_me: failed program was:" >&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 - break - fi -done -fi -rm -f conftest.err conftest.$ac_ext -fi # $ac_x_includes = no - -if test "$ac_x_libraries" = no; then - # Check for the libraries. - # See if we find them without any special options. - # Don't add to $LIBS permanently. - ac_save_LIBS=$LIBS - LIBS="-lXt $LIBS" - cat >conftest.$ac_ext <<_ACEOF -#line 17529 "configure" -#include "confdefs.h" -#include <X11/Intrinsic.h> -int -main (void) -{ -XtMalloc (0) - ; - return 0; -} -_ACEOF -rm -f conftest.$ac_objext conftest$ac_exeext -if { (eval echo "$as_me:17541: \"$ac_link\"") >&5 - (eval $ac_link) 2>&5 - ac_status=$? - echo "$as_me:17544: \$? = $ac_status" >&5 - (exit $ac_status); } && - { ac_try='test -s conftest$ac_exeext' - { (eval echo "$as_me:17547: \"$ac_try\"") >&5 - (eval $ac_try) 2>&5 - ac_status=$? - echo "$as_me:17550: \$? = $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 -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 - ac_x_libraries=$ac_dir - break 2 - fi - done -done -fi -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 - # Didn't find X anywhere. Cache the known absence of X. - ac_cv_have_x="have_x=no" -else - # Record where we found X for the cache. - ac_cv_have_x="have_x=yes \ - ac_x_includes=$ac_x_includes ac_x_libraries=$ac_x_libraries" -fi -fi - - fi - eval "$ac_cv_have_x" -fi # $with_x != no - -if test "$have_x" != yes; then - echo "$as_me:17588: result: $have_x" >&5 -echo "${ECHO_T}$have_x" >&6 - no_x=yes -else - # If each of the values was on the command line, it overrides each guess. - test "x$x_includes" = xNONE && x_includes=$ac_x_includes - test "x$x_libraries" = xNONE && x_libraries=$ac_x_libraries - # 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:17598: result: libraries $x_libraries, headers $x_includes" >&5 -echo "${ECHO_T}libraries $x_libraries, headers $x_includes" >&6 -fi - -if test "$no_x" = yes; then - # Not all programs may use this symbol, but it does not hurt to define it. - -cat >>confdefs.h <<\EOF -#define X_DISPLAY_MISSING 1 -EOF - - X_CFLAGS= X_PRE_LIBS= X_LIBS= X_EXTRA_LIBS= -else - if test -n "$x_includes"; then - X_CFLAGS="$X_CFLAGS -I$x_includes" - fi - - # It would also be nice to do this for all -L options, not just this one. - if test -n "$x_libraries"; then - X_LIBS="$X_LIBS -L$x_libraries" - # For Solaris; some versions of Sun CC require a space after -R and - # others require no space. Words are not sufficient . . . . - case `(uname -sr) 2>/dev/null` in - "SunOS 5"*) - echo "$as_me:17622: 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 17626 "configure" -#include "confdefs.h" - -int -main (void) -{ - - ; - return 0; -} -_ACEOF -rm -f conftest.$ac_objext conftest$ac_exeext -if { (eval echo "$as_me:17638: \"$ac_link\"") >&5 - (eval $ac_link) 2>&5 - ac_status=$? - echo "$as_me:17641: \$? = $ac_status" >&5 - (exit $ac_status); } && - { ac_try='test -s conftest$ac_exeext' - { (eval echo "$as_me:17644: \"$ac_try\"") >&5 - (eval $ac_try) 2>&5 - ac_status=$? - echo "$as_me:17647: \$? = $ac_status" >&5 - (exit $ac_status); }; }; then - ac_R_nospace=yes -else - echo "$as_me: failed program was:" >&5 -cat conftest.$ac_ext >&5 -ac_R_nospace=no -fi -rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext - if test $ac_R_nospace = yes; then - echo "$as_me:17657: 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 17663 "configure" -#include "confdefs.h" - -int -main (void) -{ - - ; - return 0; -} -_ACEOF -rm -f conftest.$ac_objext conftest$ac_exeext -if { (eval echo "$as_me:17675: \"$ac_link\"") >&5 - (eval $ac_link) 2>&5 - ac_status=$? - echo "$as_me:17678: \$? = $ac_status" >&5 - (exit $ac_status); } && - { ac_try='test -s conftest$ac_exeext' - { (eval echo "$as_me:17681: \"$ac_try\"") >&5 - (eval $ac_try) 2>&5 - ac_status=$? - echo "$as_me:17684: \$? = $ac_status" >&5 - (exit $ac_status); }; }; then - ac_R_space=yes -else - echo "$as_me: failed program was:" >&5 -cat conftest.$ac_ext >&5 -ac_R_space=no -fi -rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext - if test $ac_R_space = yes; then - echo "$as_me:17694: result: yes" >&5 -echo "${ECHO_T}yes" >&6 - X_LIBS="$X_LIBS -R $x_libraries" - else - echo "$as_me:17698: result: neither works" >&5 -echo "${ECHO_T}neither works" >&6 - fi - fi - LIBS=$ac_xsave_LIBS - esac - fi - - # Check for system-dependent libraries X programs must link with. - # Do this before checking for the system-independent R6 libraries - # (-lICE), since we may need -lsocket or whatever for X linking. - - if test "$ISC" = yes; then - X_EXTRA_LIBS="$X_EXTRA_LIBS -lnsl_s -linet" - else - # Martyn Johnson says this is needed for Ultrix, if the X - # 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 17718 "configure" -#include "confdefs.h" - -/* Override any gcc2 internal prototype to avoid an error. */ -#ifdef __cplusplus -extern "C" -#endif -/* We use char because int might match the return type of a gcc2 - builtin and then its argument prototype would still apply. */ -char XOpenDisplay (); -int -main (void) -{ -XOpenDisplay (); - ; - return 0; -} -_ACEOF -rm -f conftest.$ac_objext conftest$ac_exeext -if { (eval echo "$as_me:17737: \"$ac_link\"") >&5 - (eval $ac_link) 2>&5 - ac_status=$? - echo "$as_me:17740: \$? = $ac_status" >&5 - (exit $ac_status); } && - { ac_try='test -s conftest$ac_exeext' - { (eval echo "$as_me:17743: \"$ac_try\"") >&5 - (eval $ac_try) 2>&5 - ac_status=$? - echo "$as_me:17746: \$? = $ac_status" >&5 - (exit $ac_status); }; }; then - : -else - echo "$as_me: failed program was:" >&5 -cat conftest.$ac_ext >&5 -echo "$as_me:17752: 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 17760 "configure" -#include "confdefs.h" - -/* Override any gcc2 internal prototype to avoid an error. */ -#ifdef __cplusplus -extern "C" -#endif -/* We use char because int might match the return type of a gcc2 - builtin and then its argument prototype would still apply. */ -char dnet_ntoa (); -int -main (void) -{ -dnet_ntoa (); - ; - return 0; -} -_ACEOF -rm -f conftest.$ac_objext conftest$ac_exeext -if { (eval echo "$as_me:17779: \"$ac_link\"") >&5 - (eval $ac_link) 2>&5 - ac_status=$? - echo "$as_me:17782: \$? = $ac_status" >&5 - (exit $ac_status); } && - { ac_try='test -s conftest$ac_exeext' - { (eval echo "$as_me:17785: \"$ac_try\"") >&5 - (eval $ac_try) 2>&5 - ac_status=$? - echo "$as_me:17788: \$? = $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 -ac_cv_lib_dnet_dnet_ntoa=no -fi -rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext -LIBS=$ac_check_lib_save_LIBS -fi -echo "$as_me:17799: 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 - X_EXTRA_LIBS="$X_EXTRA_LIBS -ldnet" -fi - - if test $ac_cv_lib_dnet_dnet_ntoa = no; then - echo "$as_me:17806: 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 17814 "configure" -#include "confdefs.h" - -/* Override any gcc2 internal prototype to avoid an error. */ -#ifdef __cplusplus -extern "C" -#endif -/* We use char because int might match the return type of a gcc2 - builtin and then its argument prototype would still apply. */ -char dnet_ntoa (); -int -main (void) -{ -dnet_ntoa (); - ; - return 0; -} -_ACEOF -rm -f conftest.$ac_objext conftest$ac_exeext -if { (eval echo "$as_me:17833: \"$ac_link\"") >&5 - (eval $ac_link) 2>&5 - ac_status=$? - echo "$as_me:17836: \$? = $ac_status" >&5 - (exit $ac_status); } && - { ac_try='test -s conftest$ac_exeext' - { (eval echo "$as_me:17839: \"$ac_try\"") >&5 - (eval $ac_try) 2>&5 - ac_status=$? - echo "$as_me:17842: \$? = $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 -ac_cv_lib_dnet_stub_dnet_ntoa=no -fi -rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext -LIBS=$ac_check_lib_save_LIBS -fi -echo "$as_me:17853: 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 - X_EXTRA_LIBS="$X_EXTRA_LIBS -ldnet_stub" -fi - - fi -fi -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, - # to get the SysV transport functions. - # Chad R. Larson says the Pyramis MIS-ES running DC/OSx (SVR4) - # needs -lnsl. - # The nsl library prevents programs from opening the X display - # 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:17872: 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 17878 "configure" -#include "confdefs.h" -/* System header to define __stub macros and hopefully few prototypes, - which can conflict with char gethostbyname (); below. */ -#include <assert.h> -/* Override any gcc2 internal prototype to avoid an error. */ -#ifdef __cplusplus -extern "C" -#endif -/* We use char because int might match the return type of a gcc2 - builtin and then its argument prototype would still apply. */ -char gethostbyname (); -char (*f) (); - -int -main (void) -{ -/* The GNU C library defines this for functions which it implements - to always fail with ENOSYS. Some functions are actually named - something starting with __ and the normal name is an alias. */ -#if defined (__stub_gethostbyname) || defined (__stub___gethostbyname) -choke me -#else -f = gethostbyname; /* workaround for ICC 12.0.3 */ if (f == 0) return 1; -#endif - - ; - return 0; -} -_ACEOF -rm -f conftest.$ac_objext conftest$ac_exeext -if { (eval echo "$as_me:17909: \"$ac_link\"") >&5 - (eval $ac_link) 2>&5 - ac_status=$? - echo "$as_me:17912: \$? = $ac_status" >&5 - (exit $ac_status); } && - { ac_try='test -s conftest$ac_exeext' - { (eval echo "$as_me:17915: \"$ac_try\"") >&5 - (eval $ac_try) 2>&5 - ac_status=$? - echo "$as_me:17918: \$? = $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 -ac_cv_func_gethostbyname=no -fi -rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext -fi -echo "$as_me:17928: 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:17932: 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 17940 "configure" -#include "confdefs.h" - -/* Override any gcc2 internal prototype to avoid an error. */ -#ifdef __cplusplus -extern "C" -#endif -/* We use char because int might match the return type of a gcc2 - builtin and then its argument prototype would still apply. */ -char gethostbyname (); -int -main (void) -{ -gethostbyname (); - ; - return 0; -} -_ACEOF -rm -f conftest.$ac_objext conftest$ac_exeext -if { (eval echo "$as_me:17959: \"$ac_link\"") >&5 - (eval $ac_link) 2>&5 - ac_status=$? - echo "$as_me:17962: \$? = $ac_status" >&5 - (exit $ac_status); } && - { ac_try='test -s conftest$ac_exeext' - { (eval echo "$as_me:17965: \"$ac_try\"") >&5 - (eval $ac_try) 2>&5 - ac_status=$? - echo "$as_me:17968: \$? = $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 -ac_cv_lib_nsl_gethostbyname=no -fi -rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext -LIBS=$ac_check_lib_save_LIBS -fi -echo "$as_me:17979: 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 - X_EXTRA_LIBS="$X_EXTRA_LIBS -lnsl" -fi - - if test $ac_cv_lib_nsl_gethostbyname = no; then - echo "$as_me:17986: 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 17994 "configure" -#include "confdefs.h" - -/* Override any gcc2 internal prototype to avoid an error. */ -#ifdef __cplusplus -extern "C" -#endif -/* We use char because int might match the return type of a gcc2 - builtin and then its argument prototype would still apply. */ -char gethostbyname (); -int -main (void) -{ -gethostbyname (); - ; - return 0; -} -_ACEOF -rm -f conftest.$ac_objext conftest$ac_exeext -if { (eval echo "$as_me:18013: \"$ac_link\"") >&5 - (eval $ac_link) 2>&5 - ac_status=$? - echo "$as_me:18016: \$? = $ac_status" >&5 - (exit $ac_status); } && - { ac_try='test -s conftest$ac_exeext' - { (eval echo "$as_me:18019: \"$ac_try\"") >&5 - (eval $ac_try) 2>&5 - ac_status=$? - echo "$as_me:18022: \$? = $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 -ac_cv_lib_bsd_gethostbyname=no -fi -rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext -LIBS=$ac_check_lib_save_LIBS -fi -echo "$as_me:18033: 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 - X_EXTRA_LIBS="$X_EXTRA_LIBS -lbsd" -fi - - fi - fi - - # lieder@skyler.mavd.honeywell.com says without -lsocket, - # socket/setsockopt and other routines are undefined under SCO ODT - # 2.0. But -lsocket is broken on IRIX 5.2 (and is not necessary - # on later versions), says Simon Leinen: it contains gethostby* - # 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:18049: 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 18055 "configure" -#include "confdefs.h" -/* System header to define __stub macros and hopefully few prototypes, - which can conflict with char connect (); below. */ -#include <assert.h> -/* Override any gcc2 internal prototype to avoid an error. */ -#ifdef __cplusplus -extern "C" -#endif -/* We use char because int might match the return type of a gcc2 - builtin and then its argument prototype would still apply. */ -char connect (); -char (*f) (); - -int -main (void) -{ -/* The GNU C library defines this for functions which it implements - to always fail with ENOSYS. Some functions are actually named - something starting with __ and the normal name is an alias. */ -#if defined (__stub_connect) || defined (__stub___connect) -choke me -#else -f = connect; /* workaround for ICC 12.0.3 */ if (f == 0) return 1; -#endif - - ; - return 0; -} -_ACEOF -rm -f conftest.$ac_objext conftest$ac_exeext -if { (eval echo "$as_me:18086: \"$ac_link\"") >&5 - (eval $ac_link) 2>&5 - ac_status=$? - echo "$as_me:18089: \$? = $ac_status" >&5 - (exit $ac_status); } && - { ac_try='test -s conftest$ac_exeext' - { (eval echo "$as_me:18092: \"$ac_try\"") >&5 - (eval $ac_try) 2>&5 - ac_status=$? - echo "$as_me:18095: \$? = $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 -ac_cv_func_connect=no -fi -rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext -fi -echo "$as_me:18105: 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:18109: 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 18117 "configure" -#include "confdefs.h" - -/* Override any gcc2 internal prototype to avoid an error. */ -#ifdef __cplusplus -extern "C" -#endif -/* We use char because int might match the return type of a gcc2 - builtin and then its argument prototype would still apply. */ -char connect (); -int -main (void) -{ -connect (); - ; - return 0; -} -_ACEOF -rm -f conftest.$ac_objext conftest$ac_exeext -if { (eval echo "$as_me:18136: \"$ac_link\"") >&5 - (eval $ac_link) 2>&5 - ac_status=$? - echo "$as_me:18139: \$? = $ac_status" >&5 - (exit $ac_status); } && - { ac_try='test -s conftest$ac_exeext' - { (eval echo "$as_me:18142: \"$ac_try\"") >&5 - (eval $ac_try) 2>&5 - ac_status=$? - echo "$as_me:18145: \$? = $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 -ac_cv_lib_socket_connect=no -fi -rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext -LIBS=$ac_check_lib_save_LIBS -fi -echo "$as_me:18156: 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 - X_EXTRA_LIBS="-lsocket $X_EXTRA_LIBS" -fi - - fi - - # Guillermo Gomez says -lposix is necessary on A/UX. - echo "$as_me:18165: 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 18171 "configure" -#include "confdefs.h" -/* System header to define __stub macros and hopefully few prototypes, - which can conflict with char remove (); below. */ -#include <assert.h> -/* Override any gcc2 internal prototype to avoid an error. */ -#ifdef __cplusplus -extern "C" -#endif -/* We use char because int might match the return type of a gcc2 - builtin and then its argument prototype would still apply. */ -char remove (); -char (*f) (); - -int -main (void) -{ -/* The GNU C library defines this for functions which it implements - to always fail with ENOSYS. Some functions are actually named - something starting with __ and the normal name is an alias. */ -#if defined (__stub_remove) || defined (__stub___remove) -choke me -#else -f = remove; /* workaround for ICC 12.0.3 */ if (f == 0) return 1; -#endif - - ; - return 0; -} -_ACEOF -rm -f conftest.$ac_objext conftest$ac_exeext -if { (eval echo "$as_me:18202: \"$ac_link\"") >&5 - (eval $ac_link) 2>&5 - ac_status=$? - echo "$as_me:18205: \$? = $ac_status" >&5 - (exit $ac_status); } && - { ac_try='test -s conftest$ac_exeext' - { (eval echo "$as_me:18208: \"$ac_try\"") >&5 - (eval $ac_try) 2>&5 - ac_status=$? - echo "$as_me:18211: \$? = $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 -ac_cv_func_remove=no -fi -rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext -fi -echo "$as_me:18221: 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:18225: 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 18233 "configure" -#include "confdefs.h" - -/* Override any gcc2 internal prototype to avoid an error. */ -#ifdef __cplusplus -extern "C" -#endif -/* We use char because int might match the return type of a gcc2 - builtin and then its argument prototype would still apply. */ -char remove (); -int -main (void) -{ -remove (); - ; - return 0; -} -_ACEOF -rm -f conftest.$ac_objext conftest$ac_exeext -if { (eval echo "$as_me:18252: \"$ac_link\"") >&5 - (eval $ac_link) 2>&5 - ac_status=$? - echo "$as_me:18255: \$? = $ac_status" >&5 - (exit $ac_status); } && - { ac_try='test -s conftest$ac_exeext' - { (eval echo "$as_me:18258: \"$ac_try\"") >&5 - (eval $ac_try) 2>&5 - ac_status=$? - echo "$as_me:18261: \$? = $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 -ac_cv_lib_posix_remove=no -fi -rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext -LIBS=$ac_check_lib_save_LIBS -fi -echo "$as_me:18272: 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 - X_EXTRA_LIBS="$X_EXTRA_LIBS -lposix" -fi - - fi - - # BSDI BSD/OS 2.1 needs -lipc for XOpenDisplay. - echo "$as_me:18281: 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 18287 "configure" -#include "confdefs.h" -/* System header to define __stub macros and hopefully few prototypes, - which can conflict with char shmat (); below. */ -#include <assert.h> -/* Override any gcc2 internal prototype to avoid an error. */ -#ifdef __cplusplus -extern "C" -#endif -/* We use char because int might match the return type of a gcc2 - builtin and then its argument prototype would still apply. */ -char shmat (); -char (*f) (); - -int -main (void) -{ -/* The GNU C library defines this for functions which it implements - to always fail with ENOSYS. Some functions are actually named - something starting with __ and the normal name is an alias. */ -#if defined (__stub_shmat) || defined (__stub___shmat) -choke me -#else -f = shmat; /* workaround for ICC 12.0.3 */ if (f == 0) return 1; -#endif - - ; - return 0; -} -_ACEOF -rm -f conftest.$ac_objext conftest$ac_exeext -if { (eval echo "$as_me:18318: \"$ac_link\"") >&5 - (eval $ac_link) 2>&5 - ac_status=$? - echo "$as_me:18321: \$? = $ac_status" >&5 - (exit $ac_status); } && - { ac_try='test -s conftest$ac_exeext' - { (eval echo "$as_me:18324: \"$ac_try\"") >&5 - (eval $ac_try) 2>&5 - ac_status=$? - echo "$as_me:18327: \$? = $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 -ac_cv_func_shmat=no -fi -rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext -fi -echo "$as_me:18337: 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:18341: 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 18349 "configure" -#include "confdefs.h" - -/* Override any gcc2 internal prototype to avoid an error. */ -#ifdef __cplusplus -extern "C" -#endif -/* We use char because int might match the return type of a gcc2 - builtin and then its argument prototype would still apply. */ -char shmat (); -int -main (void) -{ -shmat (); - ; - return 0; -} -_ACEOF -rm -f conftest.$ac_objext conftest$ac_exeext -if { (eval echo "$as_me:18368: \"$ac_link\"") >&5 - (eval $ac_link) 2>&5 - ac_status=$? - echo "$as_me:18371: \$? = $ac_status" >&5 - (exit $ac_status); } && - { ac_try='test -s conftest$ac_exeext' - { (eval echo "$as_me:18374: \"$ac_try\"") >&5 - (eval $ac_try) 2>&5 - ac_status=$? - echo "$as_me:18377: \$? = $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 -ac_cv_lib_ipc_shmat=no -fi -rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext -LIBS=$ac_check_lib_save_LIBS -fi -echo "$as_me:18388: 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 - X_EXTRA_LIBS="$X_EXTRA_LIBS -lipc" -fi - - fi - fi - - # Check for libraries that X11R6 Xt/Xaw programs need. - ac_save_LDFLAGS=$LDFLAGS - test -n "$x_libraries" && LDFLAGS="$LDFLAGS -L$x_libraries" - # SM needs ICE to (dynamically) link under SunOS 4.x (so we have to - # check for ICE first), but we must link in the order -lSM -lICE or - # we get undefined symbols. So assume we have SM if we have ICE. - # 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:18406: 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 18414 "configure" -#include "confdefs.h" - -/* Override any gcc2 internal prototype to avoid an error. */ -#ifdef __cplusplus -extern "C" -#endif -/* We use char because int might match the return type of a gcc2 - builtin and then its argument prototype would still apply. */ -char IceConnectionNumber (); -int -main (void) -{ -IceConnectionNumber (); - ; - return 0; -} -_ACEOF -rm -f conftest.$ac_objext conftest$ac_exeext -if { (eval echo "$as_me:18433: \"$ac_link\"") >&5 - (eval $ac_link) 2>&5 - ac_status=$? - echo "$as_me:18436: \$? = $ac_status" >&5 - (exit $ac_status); } && - { ac_try='test -s conftest$ac_exeext' - { (eval echo "$as_me:18439: \"$ac_try\"") >&5 - (eval $ac_try) 2>&5 - ac_status=$? - echo "$as_me:18442: \$? = $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 -ac_cv_lib_ICE_IceConnectionNumber=no -fi -rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext -LIBS=$ac_check_lib_save_LIBS -fi -echo "$as_me:18453: 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 - X_PRE_LIBS="$X_PRE_LIBS -lSM -lICE" -fi - - LDFLAGS=$ac_save_LDFLAGS - -fi cf_x_athena=${cf_x_athena:-Xaw} -echo "$as_me:18465: checking if you want to link with Xaw 3d library" >&5 +echo "$as_me:19754: 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= @@ -18473,14 +19762,14 @@ if test "${with_Xaw3d+set}" = set; then fi; if test "$withval" = yes ; then cf_x_athena=Xaw3d - echo "$as_me:18476: result: yes" >&5 + echo "$as_me:19765: result: yes" >&5 echo "${ECHO_T}yes" >&6 else - echo "$as_me:18479: result: no" >&5 + echo "$as_me:19768: result: no" >&5 echo "${ECHO_T}no" >&6 fi -echo "$as_me:18483: checking if you want to link with Xaw 3d xft library" >&5 +echo "$as_me:19772: 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= @@ -18491,14 +19780,14 @@ if test "${with_Xaw3dxft+set}" = set; then fi; if test "$withval" = yes ; then cf_x_athena=Xaw3dxft - echo "$as_me:18494: result: yes" >&5 + echo "$as_me:19783: result: yes" >&5 echo "${ECHO_T}yes" >&6 else - echo "$as_me:18497: result: no" >&5 + echo "$as_me:19786: result: no" >&5 echo "${ECHO_T}no" >&6 fi -echo "$as_me:18501: checking if you want to link with neXT Athena library" >&5 +echo "$as_me:19790: 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= @@ -18509,14 +19798,14 @@ if test "${with_neXtaw+set}" = set; then fi; if test "$withval" = yes ; then cf_x_athena=neXtaw - echo "$as_me:18512: result: yes" >&5 + echo "$as_me:19801: result: yes" >&5 echo "${ECHO_T}yes" >&6 else - echo "$as_me:18515: result: no" >&5 + echo "$as_me:19804: result: no" >&5 echo "${ECHO_T}no" >&6 fi -echo "$as_me:18519: checking if you want to link with Athena-Plus library" >&5 +echo "$as_me:19808: 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= @@ -18527,10 +19816,10 @@ if test "${with_XawPlus+set}" = set; then fi; if test "$withval" = yes ; then cf_x_athena=XawPlus - echo "$as_me:18530: result: yes" >&5 + echo "$as_me:19819: result: yes" >&5 echo "${ECHO_T}yes" >&6 else - echo "$as_me:18533: result: no" >&5 + echo "$as_me:19822: result: no" >&5 echo "${ECHO_T}no" >&6 fi @@ -18547,20 +19836,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}:18553: testing found package $cf_athena_pkg ..." 1>&5 +echo "${as_me:-configure}:19842: 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}:18559: testing package $cf_athena_pkg CFLAGS: $cf_pkgconfig_incs ..." 1>&5 +echo "${as_me:-configure}:19848: 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}:18563: testing package $cf_athena_pkg LIBS: $cf_pkgconfig_libs ..." 1>&5 +echo "${as_me:-configure}:19852: testing package $cf_athena_pkg LIBS: $cf_pkgconfig_libs ..." 1>&5 cf_fix_cppflags=no cf_new_cflags= @@ -18569,19 +19858,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" @@ -18600,7 +19889,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/=.*//'` @@ -18630,7 +19919,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}" \ @@ -18660,19 +19949,19 @@ if test -n "$cf_new_extra_cppflags" ; then fi -cf_add_libs="$cf_pkgconfig_libs" -# Filter out duplicates - this happens with badly-designed ".pc" files... -for cf_add_1lib in $LIBS -do - for cf_add_2lib in $cf_add_libs - do - if test "x$cf_add_1lib" = "x$cf_add_2lib" - then +cf_add_libs="$LIBS" +# reverse order +cf_add_0lib= +for cf_add_1lib in $cf_pkgconfig_libs; do cf_add_0lib="$cf_add_1lib $cf_add_0lib"; done +# filter duplicates +for cf_add_1lib in $cf_add_0lib; do + for cf_add_2lib in $cf_add_libs; do + if test "x$cf_add_1lib" = "x$cf_add_2lib"; then cf_add_1lib= break fi done - test -n "$cf_add_1lib" && cf_add_libs="$cf_add_libs $cf_add_1lib" + test -n "$cf_add_1lib" && cf_add_libs="$cf_add_1lib $cf_add_libs" done LIBS="$cf_add_libs" @@ -18691,20 +19980,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}:18694: testing ..trimmed $LIBS ..." 1>&5 +echo "${as_me:-configure}:19983: testing ..trimmed $LIBS ..." 1>&5 ;; esac done -echo "$as_me:18700: checking for usable $cf_x_athena/Xmu package" >&5 +echo "$as_me:19989: 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 18707 "configure" +cat >"conftest.$ac_ext" <<_ACEOF +#line 19996 "configure" #include "confdefs.h" #include <X11/Xmu/CharSet.h> @@ -18713,33 +20002,34 @@ int main (void) { -int check = XmuCompareISOLatin1("big", "small") +int check = XmuCompareISOLatin1("big", "small"); +(void)check; ; return 0; } _ACEOF -rm -f conftest.$ac_objext conftest$ac_exeext -if { (eval echo "$as_me:18723: \"$ac_link\"") >&5 +rm -f "conftest.$ac_objext" "conftest$ac_exeext" +if { (eval echo "$as_me:20013: \"$ac_link\"") >&5 (eval $ac_link) 2>&5 ac_status=$? - echo "$as_me:18726: \$? = $ac_status" >&5 - (exit $ac_status); } && - { ac_try='test -s conftest$ac_exeext' - { (eval echo "$as_me:18729: \"$ac_try\"") >&5 + echo "$as_me:20016: \$? = $ac_status" >&5 + (exit "$ac_status"); } && + { ac_try='test -s "conftest$ac_exeext"' + { (eval echo "$as_me:20019: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? - echo "$as_me:18732: \$? = $ac_status" >&5 - (exit $ac_status); }; }; then + echo "$as_me:20022: \$? = $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:18742: result: $cf_cv_xaw_compat" >&5 +echo "$as_me:20032: result: $cf_cv_xaw_compat" >&5 echo "${ECHO_T}$cf_cv_xaw_compat" >&6 if test "$cf_cv_xaw_compat" = no @@ -18751,25 +20041,25 @@ echo "${ECHO_T}$cf_cv_xaw_compat" >&6 (*) test -n "$verbose" && echo " work around broken package" 1>&6 -echo "${as_me:-configure}:18754: testing work around broken package ..." 1>&5 +echo "${as_me:-configure}:20044: 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}:18762: testing found package xmu ..." 1>&5 +echo "${as_me:-configure}:20052: 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}:18768: testing package xmu CFLAGS: $cf_pkgconfig_incs ..." 1>&5 +echo "${as_me:-configure}:20058: 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}:18772: testing package xmu LIBS: $cf_pkgconfig_libs ..." 1>&5 +echo "${as_me:-configure}:20062: testing package xmu LIBS: $cf_pkgconfig_libs ..." 1>&5 cf_fix_cppflags=no cf_new_cflags= @@ -18778,19 +20068,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" @@ -18809,7 +20099,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/=.*//'` @@ -18839,7 +20129,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}" \ @@ -18869,19 +20159,19 @@ if test -n "$cf_new_extra_cppflags" ; then fi -cf_add_libs="$cf_pkgconfig_libs" -# Filter out duplicates - this happens with badly-designed ".pc" files... -for cf_add_1lib in $LIBS -do - for cf_add_2lib in $cf_add_libs - do - if test "x$cf_add_1lib" = "x$cf_add_2lib" - then +cf_add_libs="$LIBS" +# reverse order +cf_add_0lib= +for cf_add_1lib in $cf_pkgconfig_libs; do cf_add_0lib="$cf_add_1lib $cf_add_0lib"; done +# filter duplicates +for cf_add_1lib in $cf_add_0lib; do + for cf_add_2lib in $cf_add_libs; do + if test "x$cf_add_1lib" = "x$cf_add_2lib"; then cf_add_1lib= break fi done - test -n "$cf_add_1lib" && cf_add_libs="$cf_add_libs $cf_add_1lib" + test -n "$cf_add_1lib" && cf_add_libs="$cf_add_1lib $cf_add_libs" done LIBS="$cf_add_libs" @@ -18889,12 +20179,12 @@ LIBS="$cf_add_libs" test -n "$verbose" && echo " ...before $LIBS" 1>&6 -echo "${as_me:-configure}:18892: testing ...before $LIBS ..." 1>&5 +echo "${as_me:-configure}:20182: 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}:18897: testing ...after $LIBS ..." 1>&5 +echo "${as_me:-configure}:20187: testing ...after $LIBS ..." 1>&5 else cf_pkgconfig_incs= @@ -18902,12 +20192,12 @@ else test -n "$verbose" && echo " ...before $LIBS" 1>&6 -echo "${as_me:-configure}:18905: testing ...before $LIBS ..." 1>&5 +echo "${as_me:-configure}:20195: 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}:18910: testing ...after $LIBS ..." 1>&5 +echo "${as_me:-configure}:20200: testing ...after $LIBS ..." 1>&5 fi @@ -18918,7 +20208,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}:18921: testing ..trimmed $LIBS ..." 1>&5 +echo "${as_me:-configure}:20211: testing ..trimmed $LIBS ..." 1>&5 ;; esac @@ -18940,20 +20230,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}:18946: testing found package Xext ..." 1>&5 +echo "${as_me:-configure}:20236: 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}:18952: testing package Xext CFLAGS: $cf_pkgconfig_incs ..." 1>&5 +echo "${as_me:-configure}:20242: 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}:18956: testing package Xext LIBS: $cf_pkgconfig_libs ..." 1>&5 +echo "${as_me:-configure}:20246: testing package Xext LIBS: $cf_pkgconfig_libs ..." 1>&5 cf_fix_cppflags=no cf_new_cflags= @@ -18962,19 +20252,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" @@ -18993,7 +20283,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/=.*//'` @@ -19023,7 +20313,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}" \ @@ -19053,19 +20343,19 @@ if test -n "$cf_new_extra_cppflags" ; then fi -cf_add_libs="$cf_pkgconfig_libs" -# Filter out duplicates - this happens with badly-designed ".pc" files... -for cf_add_1lib in $LIBS -do - for cf_add_2lib in $cf_add_libs - do - if test "x$cf_add_1lib" = "x$cf_add_2lib" - then +cf_add_libs="$LIBS" +# reverse order +cf_add_0lib= +for cf_add_1lib in $cf_pkgconfig_libs; do cf_add_0lib="$cf_add_1lib $cf_add_0lib"; done +# filter duplicates +for cf_add_1lib in $cf_add_0lib; do + for cf_add_2lib in $cf_add_libs; do + if test "x$cf_add_1lib" = "x$cf_add_2lib"; then cf_add_1lib= break fi done - test -n "$cf_add_1lib" && cf_add_libs="$cf_add_libs $cf_add_1lib" + test -n "$cf_add_1lib" && cf_add_libs="$cf_add_1lib $cf_add_libs" done LIBS="$cf_add_libs" @@ -19074,15 +20364,15 @@ else cf_pkgconfig_incs= cf_pkgconfig_libs= - echo "$as_me:19077: checking for XextCreateExtension in -lXext" >&5 + echo "$as_me:20367: 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 19085 "configure" +cat >"conftest.$ac_ext" <<_ACEOF +#line 20375 "configure" #include "confdefs.h" /* Override any gcc2 internal prototype to avoid an error. */ @@ -19100,44 +20390,44 @@ XextCreateExtension (); return 0; } _ACEOF -rm -f conftest.$ac_objext conftest$ac_exeext -if { (eval echo "$as_me:19104: \"$ac_link\"") >&5 +rm -f "conftest.$ac_objext" "conftest$ac_exeext" +if { (eval echo "$as_me:20394: \"$ac_link\"") >&5 (eval $ac_link) 2>&5 ac_status=$? - echo "$as_me:19107: \$? = $ac_status" >&5 - (exit $ac_status); } && - { ac_try='test -s conftest$ac_exeext' - { (eval echo "$as_me:19110: \"$ac_try\"") >&5 + echo "$as_me:20397: \$? = $ac_status" >&5 + (exit "$ac_status"); } && + { ac_try='test -s "conftest$ac_exeext"' + { (eval echo "$as_me:20400: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? - echo "$as_me:19113: \$? = $ac_status" >&5 - (exit $ac_status); }; }; then + echo "$as_me:20403: \$? = $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:19124: result: $ac_cv_lib_Xext_XextCreateExtension" >&5 +echo "$as_me:20414: 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 - -cf_add_libs="-lXext" -# Filter out duplicates - this happens with badly-designed ".pc" files... -for cf_add_1lib in $LIBS -do - for cf_add_2lib in $cf_add_libs - do - if test "x$cf_add_1lib" = "x$cf_add_2lib" - then +if test "$ac_cv_lib_Xext_XextCreateExtension" = yes; then + +cf_add_libs="$LIBS" +# reverse order +cf_add_0lib= +for cf_add_1lib in -lXext; do cf_add_0lib="$cf_add_1lib $cf_add_0lib"; done +# filter duplicates +for cf_add_1lib in $cf_add_0lib; do + for cf_add_2lib in $cf_add_libs; do + if test "x$cf_add_1lib" = "x$cf_add_2lib"; then cf_add_1lib= break fi done - test -n "$cf_add_1lib" && cf_add_libs="$cf_add_libs $cf_add_1lib" + test -n "$cf_add_1lib" && cf_add_libs="$cf_add_1lib $cf_add_libs" done LIBS="$cf_add_libs" @@ -19145,7 +20435,7 @@ fi fi -# OSX is schizoid about who owns /usr/X11 (old) versus /opt/X11 (new), and (and +# OSX is schizoid about who owns /usr/X11 (old) versus /opt/X11 (new) (and # in some cases has installed dummy files in the former, other cases replaced # it with a link to the new location). This complicates the configure script. # Check for that pitfall, and recover using pkg-config @@ -19154,20 +20444,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}:19160: testing found package x11 ..." 1>&5 +echo "${as_me:-configure}:20450: 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}:19166: testing package x11 CFLAGS: $cf_pkgconfig_incs ..." 1>&5 +echo "${as_me:-configure}:20456: 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}:19170: testing package x11 LIBS: $cf_pkgconfig_libs ..." 1>&5 +echo "${as_me:-configure}:20460: testing package x11 LIBS: $cf_pkgconfig_libs ..." 1>&5 cf_fix_cppflags=no cf_new_cflags= @@ -19176,19 +20466,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" @@ -19207,7 +20497,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/=.*//'` @@ -19237,7 +20527,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}" \ @@ -19267,19 +20557,19 @@ if test -n "$cf_new_extra_cppflags" ; then fi -cf_add_libs="$cf_pkgconfig_libs" -# Filter out duplicates - this happens with badly-designed ".pc" files... -for cf_add_1lib in $LIBS -do - for cf_add_2lib in $cf_add_libs - do - if test "x$cf_add_1lib" = "x$cf_add_2lib" - then +cf_add_libs="$LIBS" +# reverse order +cf_add_0lib= +for cf_add_1lib in $cf_pkgconfig_libs; do cf_add_0lib="$cf_add_1lib $cf_add_0lib"; done +# filter duplicates +for cf_add_1lib in $cf_add_0lib; do + for cf_add_2lib in $cf_add_libs; do + if test "x$cf_add_1lib" = "x$cf_add_2lib"; then cf_add_1lib= break fi done - test -n "$cf_add_1lib" && cf_add_libs="$cf_add_libs $cf_add_1lib" + test -n "$cf_add_1lib" && cf_add_libs="$cf_add_1lib $cf_add_libs" done LIBS="$cf_add_libs" @@ -19287,24 +20577,24 @@ LIBS="$cf_add_libs" else cf_pkgconfig_incs= cf_pkgconfig_libs= - { echo "$as_me:19290: WARNING: unable to find X11 library" >&5 + { echo "$as_me:20580: 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}:19297: testing found package ice ..." 1>&5 +echo "${as_me:-configure}:20587: 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}:19303: testing package ice CFLAGS: $cf_pkgconfig_incs ..." 1>&5 +echo "${as_me:-configure}:20593: 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}:19307: testing package ice LIBS: $cf_pkgconfig_libs ..." 1>&5 +echo "${as_me:-configure}:20597: testing package ice LIBS: $cf_pkgconfig_libs ..." 1>&5 cf_fix_cppflags=no cf_new_cflags= @@ -19313,19 +20603,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" @@ -19344,7 +20634,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/=.*//'` @@ -19374,7 +20664,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}" \ @@ -19404,19 +20694,19 @@ if test -n "$cf_new_extra_cppflags" ; then fi -cf_add_libs="$cf_pkgconfig_libs" -# Filter out duplicates - this happens with badly-designed ".pc" files... -for cf_add_1lib in $LIBS -do - for cf_add_2lib in $cf_add_libs - do - if test "x$cf_add_1lib" = "x$cf_add_2lib" - then +cf_add_libs="$LIBS" +# reverse order +cf_add_0lib= +for cf_add_1lib in $cf_pkgconfig_libs; do cf_add_0lib="$cf_add_1lib $cf_add_0lib"; done +# filter duplicates +for cf_add_1lib in $cf_add_0lib; do + for cf_add_2lib in $cf_add_libs; do + if test "x$cf_add_1lib" = "x$cf_add_2lib"; then cf_add_1lib= break fi done - test -n "$cf_add_1lib" && cf_add_libs="$cf_add_libs $cf_add_1lib" + test -n "$cf_add_1lib" && cf_add_libs="$cf_add_1lib $cf_add_libs" done LIBS="$cf_add_libs" @@ -19424,24 +20714,24 @@ LIBS="$cf_add_libs" else cf_pkgconfig_incs= cf_pkgconfig_libs= - { echo "$as_me:19427: WARNING: unable to find ICE library" >&5 + { echo "$as_me:20717: 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}:19434: testing found package sm ..." 1>&5 +echo "${as_me:-configure}:20724: 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}:19440: testing package sm CFLAGS: $cf_pkgconfig_incs ..." 1>&5 +echo "${as_me:-configure}:20730: 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}:19444: testing package sm LIBS: $cf_pkgconfig_libs ..." 1>&5 +echo "${as_me:-configure}:20734: testing package sm LIBS: $cf_pkgconfig_libs ..." 1>&5 cf_fix_cppflags=no cf_new_cflags= @@ -19450,19 +20740,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" @@ -19481,7 +20771,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/=.*//'` @@ -19511,7 +20801,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}" \ @@ -19541,19 +20831,19 @@ if test -n "$cf_new_extra_cppflags" ; then fi -cf_add_libs="$cf_pkgconfig_libs" -# Filter out duplicates - this happens with badly-designed ".pc" files... -for cf_add_1lib in $LIBS -do - for cf_add_2lib in $cf_add_libs - do - if test "x$cf_add_1lib" = "x$cf_add_2lib" - then +cf_add_libs="$LIBS" +# reverse order +cf_add_0lib= +for cf_add_1lib in $cf_pkgconfig_libs; do cf_add_0lib="$cf_add_1lib $cf_add_0lib"; done +# filter duplicates +for cf_add_1lib in $cf_add_0lib; do + for cf_add_2lib in $cf_add_libs; do + if test "x$cf_add_1lib" = "x$cf_add_2lib"; then cf_add_1lib= break fi done - test -n "$cf_add_1lib" && cf_add_libs="$cf_add_libs $cf_add_1lib" + test -n "$cf_add_1lib" && cf_add_libs="$cf_add_1lib $cf_add_libs" done LIBS="$cf_add_libs" @@ -19561,24 +20851,24 @@ LIBS="$cf_add_libs" else cf_pkgconfig_incs= cf_pkgconfig_libs= - { echo "$as_me:19564: WARNING: unable to find SM library" >&5 + { echo "$as_me:20854: 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}:19571: testing found package xt ..." 1>&5 +echo "${as_me:-configure}:20861: 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}:19577: testing package xt CFLAGS: $cf_pkgconfig_incs ..." 1>&5 +echo "${as_me:-configure}:20867: 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}:19581: testing package xt LIBS: $cf_pkgconfig_libs ..." 1>&5 +echo "${as_me:-configure}:20871: testing package xt LIBS: $cf_pkgconfig_libs ..." 1>&5 cf_fix_cppflags=no cf_new_cflags= @@ -19587,19 +20877,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" @@ -19618,7 +20908,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/=.*//'` @@ -19648,7 +20938,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}" \ @@ -19678,19 +20968,19 @@ if test -n "$cf_new_extra_cppflags" ; then fi -cf_add_libs="$cf_pkgconfig_libs" -# Filter out duplicates - this happens with badly-designed ".pc" files... -for cf_add_1lib in $LIBS -do - for cf_add_2lib in $cf_add_libs - do - if test "x$cf_add_1lib" = "x$cf_add_2lib" - then +cf_add_libs="$LIBS" +# reverse order +cf_add_0lib= +for cf_add_1lib in $cf_pkgconfig_libs; do cf_add_0lib="$cf_add_1lib $cf_add_0lib"; done +# filter duplicates +for cf_add_1lib in $cf_add_0lib; do + for cf_add_2lib in $cf_add_libs; do + if test "x$cf_add_1lib" = "x$cf_add_2lib"; then cf_add_1lib= break fi done - test -n "$cf_add_1lib" && cf_add_libs="$cf_add_libs $cf_add_1lib" + test -n "$cf_add_1lib" && cf_add_libs="$cf_add_1lib $cf_add_libs" done LIBS="$cf_add_libs" @@ -19698,28 +20988,30 @@ LIBS="$cf_add_libs" else cf_pkgconfig_incs= cf_pkgconfig_libs= - { echo "$as_me:19701: WARNING: unable to find Xt library" >&5 + { echo "$as_me:20991: WARNING: unable to find Xt library" >&5 echo "$as_me: WARNING: unable to find Xt library" >&2;} fi +else + LIBS="$X_PRE_LIBS $LIBS $X_EXTRA_LIBS" 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}:19712: testing found package xt ..." 1>&5 +echo "${as_me:-configure}:21004: 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}:19718: testing package xt CFLAGS: $cf_pkgconfig_incs ..." 1>&5 +echo "${as_me:-configure}:21010: 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}:19722: testing package xt LIBS: $cf_pkgconfig_libs ..." 1>&5 +echo "${as_me:-configure}:21014: testing package xt LIBS: $cf_pkgconfig_libs ..." 1>&5 cf_fix_cppflags=no cf_new_cflags= @@ -19728,19 +21020,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" @@ -19759,7 +21051,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/=.*//'` @@ -19789,7 +21081,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}" \ @@ -19819,19 +21111,19 @@ if test -n "$cf_new_extra_cppflags" ; then fi -cf_add_libs="$cf_pkgconfig_libs" -# Filter out duplicates - this happens with badly-designed ".pc" files... -for cf_add_1lib in $LIBS -do - for cf_add_2lib in $cf_add_libs - do - if test "x$cf_add_1lib" = "x$cf_add_2lib" - then +cf_add_libs="$LIBS" +# reverse order +cf_add_0lib= +for cf_add_1lib in $cf_pkgconfig_libs; do cf_add_0lib="$cf_add_1lib $cf_add_0lib"; done +# filter duplicates +for cf_add_1lib in $cf_add_0lib; do + for cf_add_2lib in $cf_add_libs; do + if test "x$cf_add_1lib" = "x$cf_add_2lib"; then cf_add_1lib= break fi done - test -n "$cf_add_1lib" && cf_add_libs="$cf_add_libs $cf_add_1lib" + test -n "$cf_add_1lib" && cf_add_libs="$cf_add_1lib $cf_add_libs" done LIBS="$cf_add_libs" @@ -19840,14 +21132,14 @@ LIBS="$cf_add_libs" ;; (*) # we have an "xt" package, but it may omit Xt's dependency on X11 -echo "$as_me:19843: checking for usable X dependency" >&5 +echo "$as_me:21135: 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 19850 "configure" +cat >"conftest.$ac_ext" <<_ACEOF +#line 21142 "configure" #include "confdefs.h" #include <X11/Xlib.h> @@ -19865,50 +21157,50 @@ main (void) return 0; } _ACEOF -rm -f conftest.$ac_objext conftest$ac_exeext -if { (eval echo "$as_me:19869: \"$ac_link\"") >&5 +rm -f "conftest.$ac_objext" "conftest$ac_exeext" +if { (eval echo "$as_me:21161: \"$ac_link\"") >&5 (eval $ac_link) 2>&5 ac_status=$? - echo "$as_me:19872: \$? = $ac_status" >&5 - (exit $ac_status); } && - { ac_try='test -s conftest$ac_exeext' - { (eval echo "$as_me:19875: \"$ac_try\"") >&5 + echo "$as_me:21164: \$? = $ac_status" >&5 + (exit "$ac_status"); } && + { ac_try='test -s "conftest$ac_exeext"' + { (eval echo "$as_me:21167: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? - echo "$as_me:19878: \$? = $ac_status" >&5 - (exit $ac_status); }; }; then + echo "$as_me:21170: \$? = $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:19888: result: $cf_cv_xt_x11_compat" >&5 +echo "$as_me:21180: 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}:19894: testing work around broken X11 dependency ..." 1>&5 +echo "${as_me:-configure}:21186: 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}:19901: testing found package x11 ..." 1>&5 +echo "${as_me:-configure}:21193: 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}:19907: testing package x11 CFLAGS: $cf_pkgconfig_incs ..." 1>&5 +echo "${as_me:-configure}:21199: 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}:19911: testing package x11 LIBS: $cf_pkgconfig_libs ..." 1>&5 +echo "${as_me:-configure}:21203: testing package x11 LIBS: $cf_pkgconfig_libs ..." 1>&5 cf_fix_cppflags=no cf_new_cflags= @@ -19917,19 +21209,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" @@ -19948,7 +21240,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/=.*//'` @@ -19978,7 +21270,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}" \ @@ -20008,19 +21300,19 @@ if test -n "$cf_new_extra_cppflags" ; then fi -cf_add_libs="$cf_pkgconfig_libs" -# Filter out duplicates - this happens with badly-designed ".pc" files... -for cf_add_1lib in $LIBS -do - for cf_add_2lib in $cf_add_libs - do - if test "x$cf_add_1lib" = "x$cf_add_2lib" - then +cf_add_libs="$LIBS" +# reverse order +cf_add_0lib= +for cf_add_1lib in $cf_pkgconfig_libs; do cf_add_0lib="$cf_add_1lib $cf_add_0lib"; done +# filter duplicates +for cf_add_1lib in $cf_add_0lib; do + for cf_add_2lib in $cf_add_libs; do + if test "x$cf_add_1lib" = "x$cf_add_2lib"; then cf_add_1lib= break fi done - test -n "$cf_add_1lib" && cf_add_libs="$cf_add_libs $cf_add_1lib" + test -n "$cf_add_1lib" && cf_add_libs="$cf_add_1lib $cf_add_libs" done LIBS="$cf_add_libs" @@ -20031,12 +21323,12 @@ else test -n "$verbose" && echo " ...before $LIBS" 1>&6 -echo "${as_me:-configure}:20034: testing ...before $LIBS ..." 1>&5 +echo "${as_me:-configure}:21326: 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}:20039: testing ...after $LIBS ..." 1>&5 +echo "${as_me:-configure}:21331: testing ...after $LIBS ..." 1>&5 fi @@ -20044,14 +21336,14 @@ fi ;; esac -echo "$as_me:20047: checking for usable X Toolkit package" >&5 +echo "$as_me:21339: 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 20054 "configure" +cat >"conftest.$ac_ext" <<_ACEOF +#line 21346 "configure" #include "confdefs.h" #include <X11/Shell.h> @@ -20059,33 +21351,33 @@ cat >conftest.$ac_ext <<_ACEOF int main (void) { -int num = IceConnectionNumber(0) +int num = IceConnectionNumber(0); (void) num ; return 0; } _ACEOF -rm -f conftest.$ac_objext conftest$ac_exeext -if { (eval echo "$as_me:20069: \"$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:20072: \$? = $ac_status" >&5 - (exit $ac_status); } && - { ac_try='test -s conftest$ac_exeext' - { (eval echo "$as_me:20075: \"$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:20078: \$? = $ac_status" >&5 - (exit $ac_status); }; }; then + echo "$as_me:21370: \$? = $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:20088: result: $cf_cv_xt_ice_compat" >&5 +echo "$as_me:21380: result: $cf_cv_xt_ice_compat" >&5 echo "${ECHO_T}$cf_cv_xt_ice_compat" >&6 if test "$cf_cv_xt_ice_compat" = no @@ -20099,22 +21391,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}:20102: testing work around broken ICE dependency ..." 1>&5 +echo "${as_me:-configure}:21394: 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}:20107: testing found package ice ..." 1>&5 +echo "${as_me:-configure}:21399: 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}:20113: testing package ice CFLAGS: $cf_pkgconfig_incs ..." 1>&5 +echo "${as_me:-configure}:21405: 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}:20117: testing package ice LIBS: $cf_pkgconfig_libs ..." 1>&5 +echo "${as_me:-configure}:21409: testing package ice LIBS: $cf_pkgconfig_libs ..." 1>&5 cf_fix_cppflags=no cf_new_cflags= @@ -20123,19 +21415,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" @@ -20154,7 +21446,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/=.*//'` @@ -20184,7 +21476,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}" \ @@ -20214,36 +21506,36 @@ if test -n "$cf_new_extra_cppflags" ; then fi -cf_add_libs="$cf_pkgconfig_libs" -# Filter out duplicates - this happens with badly-designed ".pc" files... -for cf_add_1lib in $LIBS -do - for cf_add_2lib in $cf_add_libs - do - if test "x$cf_add_1lib" = "x$cf_add_2lib" - then +cf_add_libs="$LIBS" +# reverse order +cf_add_0lib= +for cf_add_1lib in $cf_pkgconfig_libs; do cf_add_0lib="$cf_add_1lib $cf_add_0lib"; done +# filter duplicates +for cf_add_1lib in $cf_add_0lib; do + for cf_add_2lib in $cf_add_libs; do + if test "x$cf_add_1lib" = "x$cf_add_2lib"; then cf_add_1lib= break fi done - test -n "$cf_add_1lib" && cf_add_libs="$cf_add_libs $cf_add_1lib" + test -n "$cf_add_1lib" && cf_add_libs="$cf_add_1lib $cf_add_libs" done LIBS="$cf_add_libs" -if test "$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}:20236: testing found package sm ..." 1>&5 +echo "${as_me:-configure}:21528: 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}:20242: testing package sm CFLAGS: $cf_pkgconfig_incs ..." 1>&5 +echo "${as_me:-configure}:21534: 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}:20246: testing package sm LIBS: $cf_pkgconfig_libs ..." 1>&5 +echo "${as_me:-configure}:21538: testing package sm LIBS: $cf_pkgconfig_libs ..." 1>&5 cf_fix_cppflags=no cf_new_cflags= @@ -20252,19 +21544,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" @@ -20283,7 +21575,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/=.*//'` @@ -20313,7 +21605,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}" \ @@ -20343,19 +21635,19 @@ if test -n "$cf_new_extra_cppflags" ; then fi -cf_add_libs="$cf_pkgconfig_libs" -# Filter out duplicates - this happens with badly-designed ".pc" files... -for cf_add_1lib in $LIBS -do - for cf_add_2lib in $cf_add_libs - do - if test "x$cf_add_1lib" = "x$cf_add_2lib" - then +cf_add_libs="$LIBS" +# reverse order +cf_add_0lib= +for cf_add_1lib in $cf_pkgconfig_libs; do cf_add_0lib="$cf_add_1lib $cf_add_0lib"; done +# filter duplicates +for cf_add_1lib in $cf_add_0lib; do + for cf_add_2lib in $cf_add_libs; do + if test "x$cf_add_1lib" = "x$cf_add_2lib"; then cf_add_1lib= break fi done - test -n "$cf_add_1lib" && cf_add_libs="$cf_add_libs $cf_add_1lib" + test -n "$cf_add_1lib" && cf_add_libs="$cf_add_1lib $cf_add_libs" done LIBS="$cf_add_libs" @@ -20372,12 +21664,12 @@ else test -n "$verbose" && echo " ...before $LIBS" 1>&6 -echo "${as_me:-configure}:20375: testing ...before $LIBS ..." 1>&5 +echo "${as_me:-configure}:21667: 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}:20380: testing ...after $LIBS ..." 1>&5 +echo "${as_me:-configure}:21672: testing ...after $LIBS ..." 1>&5 fi @@ -20397,7 +21689,7 @@ else test -n "$verbose" && echo " checking additions to CFLAGS" 1>&6 -echo "${as_me:-configure}:20400: testing checking additions to CFLAGS ..." 1>&5 +echo "${as_me:-configure}:21692: testing checking additions to CFLAGS ..." 1>&5 cf_check_cflags="$CFLAGS" cf_check_cppflags="$CPPFLAGS" @@ -20409,19 +21701,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" @@ -20440,7 +21732,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/=.*//'` @@ -20470,7 +21762,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}" \ @@ -20482,7 +21774,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}:20485: testing add to \$CFLAGS $cf_new_cflags ..." 1>&5 +echo "${as_me:-configure}:21777: testing add to \$CFLAGS $cf_new_cflags ..." 1>&5 test -n "$CFLAGS" && CFLAGS="$CFLAGS " CFLAGS="${CFLAGS}$cf_new_cflags" @@ -20492,7 +21784,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}:20495: testing add to \$CPPFLAGS $cf_new_cppflags ..." 1>&5 +echo "${as_me:-configure}:21787: testing add to \$CPPFLAGS $cf_new_cppflags ..." 1>&5 test -n "$CPPFLAGS" && CPPFLAGS="$CPPFLAGS " CPPFLAGS="${CPPFLAGS}$cf_new_cppflags" @@ -20502,7 +21794,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}:20505: testing add to \$EXTRA_CPPFLAGS $cf_new_extra_cppflags ..." 1>&5 +echo "${as_me:-configure}:21797: 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" @@ -20510,8 +21802,8 @@ echo "${as_me:-configure}:20505: 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 20514 "configure" +cat >"conftest.$ac_ext" <<_ACEOF +#line 21806 "configure" #include "confdefs.h" #include <stdio.h> int @@ -20522,108 +21814,108 @@ printf("Hello world"); return 0; } _ACEOF -rm -f conftest.$ac_objext conftest$ac_exeext -if { (eval echo "$as_me:20526: \"$ac_link\"") >&5 +rm -f "conftest.$ac_objext" "conftest$ac_exeext" +if { (eval echo "$as_me:21818: \"$ac_link\"") >&5 (eval $ac_link) 2>&5 ac_status=$? - echo "$as_me:20529: \$? = $ac_status" >&5 - (exit $ac_status); } && - { ac_try='test -s conftest$ac_exeext' - { (eval echo "$as_me:20532: \"$ac_try\"") >&5 + echo "$as_me:21821: \$? = $ac_status" >&5 + (exit "$ac_status"); } && + { ac_try='test -s "conftest$ac_exeext"' + { (eval echo "$as_me:21824: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? - echo "$as_me:20535: \$? = $ac_status" >&5 - (exit $ac_status); }; }; then + echo "$as_me:21827: \$? = $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}:20543: testing test-compile failed. Undoing change to \$CFLAGS ..." 1>&5 +echo "${as_me:-configure}:21835: 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}:20548: testing but keeping change to \$CPPFLAGS ..." 1>&5 +echo "${as_me:-configure}:21840: 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:20556: checking for XOpenDisplay" >&5 + echo "$as_me:21848: 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 20562 "configure" + cat >"conftest.$ac_ext" <<_ACEOF +#line 21854 "configure" #include "confdefs.h" -/* System header to define __stub macros and hopefully few prototypes, - which can conflict with char XOpenDisplay (); below. */ -#include <assert.h> -/* Override any gcc2 internal prototype to avoid an error. */ +#define XOpenDisplay autoconf_temporary +#include <limits.h> /* least-intrusive standard header which defines gcc2 __stub macros */ +#undef XOpenDisplay + #ifdef __cplusplus extern "C" #endif + /* We use char because int might match the return type of a gcc2 builtin and then its argument prototype would still apply. */ -char XOpenDisplay (); -char (*f) (); +char XOpenDisplay (void); int main (void) { -/* The GNU C library defines this for functions which it implements + +/* The GNU C library defines stubs for functions which it implements to always fail with ENOSYS. Some functions are actually named something starting with __ and the normal name is an alias. */ #if defined (__stub_XOpenDisplay) || defined (__stub___XOpenDisplay) -choke me -#else -f = XOpenDisplay; /* workaround for ICC 12.0.3 */ if (f == 0) return 1; +#error found stub for XOpenDisplay #endif + return XOpenDisplay (); ; return 0; } _ACEOF -rm -f conftest.$ac_objext conftest$ac_exeext -if { (eval echo "$as_me:20593: \"$ac_link\"") >&5 +rm -f "conftest.$ac_objext" "conftest$ac_exeext" +if { (eval echo "$as_me:21885: \"$ac_link\"") >&5 (eval $ac_link) 2>&5 ac_status=$? - echo "$as_me:20596: \$? = $ac_status" >&5 - (exit $ac_status); } && - { ac_try='test -s conftest$ac_exeext' - { (eval echo "$as_me:20599: \"$ac_try\"") >&5 + echo "$as_me:21888: \$? = $ac_status" >&5 + (exit "$ac_status"); } && + { ac_try='test -s "conftest$ac_exeext"' + { (eval echo "$as_me:21891: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? - echo "$as_me:20602: \$? = $ac_status" >&5 - (exit $ac_status); }; }; then + echo "$as_me:21894: \$? = $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:20612: result: $ac_cv_func_XOpenDisplay" >&5 +echo "$as_me:21904: 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:20618: checking for XOpenDisplay in -lX11" >&5 + echo "$as_me:21910: 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 20626 "configure" +LIBS="-lX11 $LIBS" +cat >"conftest.$ac_ext" <<_ACEOF +#line 21918 "configure" #include "confdefs.h" /* Override any gcc2 internal prototype to avoid an error. */ @@ -20641,44 +21933,44 @@ XOpenDisplay (); return 0; } _ACEOF -rm -f conftest.$ac_objext conftest$ac_exeext -if { (eval echo "$as_me:20645: \"$ac_link\"") >&5 +rm -f "conftest.$ac_objext" "conftest$ac_exeext" +if { (eval echo "$as_me:21937: \"$ac_link\"") >&5 (eval $ac_link) 2>&5 ac_status=$? - echo "$as_me:20648: \$? = $ac_status" >&5 - (exit $ac_status); } && - { ac_try='test -s conftest$ac_exeext' - { (eval echo "$as_me:20651: \"$ac_try\"") >&5 + echo "$as_me:21940: \$? = $ac_status" >&5 + (exit "$ac_status"); } && + { ac_try='test -s "conftest$ac_exeext"' + { (eval echo "$as_me:21943: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? - echo "$as_me:20654: \$? = $ac_status" >&5 - (exit $ac_status); }; }; then + echo "$as_me:21946: \$? = $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:20665: result: $ac_cv_lib_X11_XOpenDisplay" >&5 +echo "$as_me:21957: 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 - -cf_add_libs="-lX11" -# Filter out duplicates - this happens with badly-designed ".pc" files... -for cf_add_1lib in $LIBS -do - for cf_add_2lib in $cf_add_libs - do - if test "x$cf_add_1lib" = "x$cf_add_2lib" - then +if test "$ac_cv_lib_X11_XOpenDisplay" = yes; then + +cf_add_libs="$LIBS" +# reverse order +cf_add_0lib= +for cf_add_1lib in -lX11; do cf_add_0lib="$cf_add_1lib $cf_add_0lib"; done +# filter duplicates +for cf_add_1lib in $cf_add_0lib; do + for cf_add_2lib in $cf_add_libs; do + if test "x$cf_add_1lib" = "x$cf_add_2lib"; then cf_add_1lib= break fi done - test -n "$cf_add_1lib" && cf_add_libs="$cf_add_libs $cf_add_1lib" + test -n "$cf_add_1lib" && cf_add_libs="$cf_add_1lib $cf_add_libs" done LIBS="$cf_add_libs" @@ -20686,77 +21978,77 @@ fi fi - echo "$as_me:20689: checking for XtAppInitialize" >&5 + echo "$as_me:21981: 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 20695 "configure" + cat >"conftest.$ac_ext" <<_ACEOF +#line 21987 "configure" #include "confdefs.h" -/* System header to define __stub macros and hopefully few prototypes, - which can conflict with char XtAppInitialize (); below. */ -#include <assert.h> -/* Override any gcc2 internal prototype to avoid an error. */ +#define XtAppInitialize autoconf_temporary +#include <limits.h> /* least-intrusive standard header which defines gcc2 __stub macros */ +#undef XtAppInitialize + #ifdef __cplusplus extern "C" #endif + /* We use char because int might match the return type of a gcc2 builtin and then its argument prototype would still apply. */ -char XtAppInitialize (); -char (*f) (); +char XtAppInitialize (void); int main (void) { -/* The GNU C library defines this for functions which it implements + +/* The GNU C library defines stubs for functions which it implements to always fail with ENOSYS. Some functions are actually named something starting with __ and the normal name is an alias. */ #if defined (__stub_XtAppInitialize) || defined (__stub___XtAppInitialize) -choke me -#else -f = XtAppInitialize; /* workaround for ICC 12.0.3 */ if (f == 0) return 1; +#error found stub for XtAppInitialize #endif + return XtAppInitialize (); ; return 0; } _ACEOF -rm -f conftest.$ac_objext conftest$ac_exeext -if { (eval echo "$as_me:20726: \"$ac_link\"") >&5 +rm -f "conftest.$ac_objext" "conftest$ac_exeext" +if { (eval echo "$as_me:22018: \"$ac_link\"") >&5 (eval $ac_link) 2>&5 ac_status=$? - echo "$as_me:20729: \$? = $ac_status" >&5 - (exit $ac_status); } && - { ac_try='test -s conftest$ac_exeext' - { (eval echo "$as_me:20732: \"$ac_try\"") >&5 + echo "$as_me:22021: \$? = $ac_status" >&5 + (exit "$ac_status"); } && + { ac_try='test -s "conftest$ac_exeext"' + { (eval echo "$as_me:22024: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? - echo "$as_me:20735: \$? = $ac_status" >&5 - (exit $ac_status); }; }; then + echo "$as_me:22027: \$? = $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:20745: result: $ac_cv_func_XtAppInitialize" >&5 +echo "$as_me:22037: 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:20751: checking for XtAppInitialize in -lXt" >&5 + echo "$as_me:22043: 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 $X_PRE_LIBS $LIBS $X_EXTRA_LIBS $LIBS" -cat >conftest.$ac_ext <<_ACEOF -#line 20759 "configure" +LIBS="-lXt $LIBS" +cat >"conftest.$ac_ext" <<_ACEOF +#line 22051 "configure" #include "confdefs.h" /* Override any gcc2 internal prototype to avoid an error. */ @@ -20774,45 +22066,45 @@ XtAppInitialize (); return 0; } _ACEOF -rm -f conftest.$ac_objext conftest$ac_exeext -if { (eval echo "$as_me:20778: \"$ac_link\"") >&5 +rm -f "conftest.$ac_objext" "conftest$ac_exeext" +if { (eval echo "$as_me:22070: \"$ac_link\"") >&5 (eval $ac_link) 2>&5 ac_status=$? - echo "$as_me:20781: \$? = $ac_status" >&5 - (exit $ac_status); } && - { ac_try='test -s conftest$ac_exeext' - { (eval echo "$as_me:20784: \"$ac_try\"") >&5 + echo "$as_me:22073: \$? = $ac_status" >&5 + (exit "$ac_status"); } && + { ac_try='test -s "conftest$ac_exeext"' + { (eval echo "$as_me:22076: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? - echo "$as_me:20787: \$? = $ac_status" >&5 - (exit $ac_status); }; }; then + echo "$as_me:22079: \$? = $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:20798: result: $ac_cv_lib_Xt_XtAppInitialize" >&5 +echo "$as_me:22090: 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 EOF cf_have_X_LIBS=Xt - LIBS="-lXt $X_PRE_LIBS $LIBS $X_EXTRA_LIBS" + LIBS="-lXt $LIBS" fi fi fi -if test $cf_have_X_LIBS = no ; then - { echo "$as_me:20815: WARNING: Unable to successfully link X Toolkit library (-lXt) with +if test "$cf_have_X_LIBS" = no ; then + { echo "$as_me:22107: 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 @@ -20830,22 +22122,37 @@ for cf_path in default \ /usr/local do if test -z "$cf_x_athena_inc" ; then - cf_save="$CPPFLAGS" + +cf_save_LIBS_CF_X_ATHENA_CPPFLAGS="$LIBS" +cf_save_CFLAGS_CF_X_ATHENA_CPPFLAGS="$CFLAGS" +cf_save_CPPFLAGS_CF_X_ATHENA_CPPFLAGS="$CPPFLAGS" +LIBS="$LIBS ${X_PRE_LIBS} ${X_LIBS} ${X_EXTRA_LIBS}" +for cf_X_CFLAGS in $X_CFLAGS +do + case "x$cf_X_CFLAGS" in + x-[IUD]*) + CPPFLAGS="$CPPFLAGS $cf_X_CFLAGS" + ;; + *) + CFLAGS="$CFLAGS $cf_X_CFLAGS" + ;; + esac +done + cf_test=X11/$cf_x_athena_root/SimpleMenu.h - if test $cf_path != default ; then - CPPFLAGS="$cf_save" + if test "$cf_path" != default ; then test -n "$CPPFLAGS" && CPPFLAGS="$CPPFLAGS " CPPFLAGS="${CPPFLAGS}-I$cf_path/include" - echo "$as_me:20841: checking for $cf_test in $cf_path" >&5 + echo "$as_me:22148: 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:20844: checking for $cf_test" >&5 + echo "$as_me:22151: checking for $cf_test" >&5 echo $ECHO_N "checking for $cf_test... $ECHO_C" >&6 fi - cat >conftest.$ac_ext <<_ACEOF -#line 20848 "configure" + cat >"conftest.$ac_ext" <<_ACEOF +#line 22155 "configure" #include "confdefs.h" #include <X11/Intrinsic.h> @@ -20858,39 +22165,43 @@ main (void) return 0; } _ACEOF -rm -f conftest.$ac_objext -if { (eval echo "$as_me:20862: \"$ac_compile\"") >&5 +rm -f "conftest.$ac_objext" +if { (eval echo "$as_me:22169: \"$ac_compile\"") >&5 (eval $ac_compile) 2>&5 ac_status=$? - echo "$as_me:20865: \$? = $ac_status" >&5 - (exit $ac_status); } && - { ac_try='test -s conftest.$ac_objext' - { (eval echo "$as_me:20868: \"$ac_try\"") >&5 + echo "$as_me:22172: \$? = $ac_status" >&5 + (exit "$ac_status"); } && + { ac_try='test -s "conftest.$ac_objext"' + { (eval echo "$as_me:22175: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? - echo "$as_me:20871: \$? = $ac_status" >&5 - (exit $ac_status); }; }; then + echo "$as_me:22178: \$? = $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:20880: result: $cf_result" >&5 +rm -f "conftest.$ac_objext" "conftest.$ac_ext" + echo "$as_me:22187: result: $cf_result" >&5 echo "${ECHO_T}$cf_result" >&6 + +LIBS="$cf_save_LIBS_CF_X_ATHENA_CPPFLAGS" +CFLAGS="$cf_save_CFLAGS_CF_X_ATHENA_CPPFLAGS" +CPPFLAGS="$cf_save_CPPFLAGS_CF_X_ATHENA_CPPFLAGS" + if test "$cf_result" = yes ; then - cf_x_athena_inc=$cf_path + test "$cf_path" = default && cf_x_athena_inc=default + test "$cf_path" != default && cf_x_athena_inc="$cf_path/include" break - else - CPPFLAGS="$cf_save" fi fi done if test -z "$cf_x_athena_inc" ; then - { echo "$as_me:20892: WARNING: Unable to successfully find Athena header files with test program" >&5 -echo "$as_me: WARNING: Unable to successfully find Athena header files with test program" >&2;} + { echo "$as_me:22203: 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 test -n "$CPPFLAGS" && CPPFLAGS="$CPPFLAGS " @@ -20917,52 +22228,47 @@ do "-l$cf_lib -lXpm -lXmu" \ "-l${cf_lib}_s -lXmu_s" do - if test -z "$cf_x_athena_lib" ; then - cf_save="$LIBS" - cf_test=XawSimpleMenuAddGlobalActions - if test $cf_path != default ; then - -cf_add_libs="-L$cf_path/lib $cf_libs" -# Filter out duplicates - this happens with badly-designed ".pc" files... -for cf_add_1lib in $LIBS + test -n "$cf_x_athena_lib" && break + +cf_save_LIBS_CF_X_ATHENA_LIBS="$LIBS" +cf_save_CFLAGS_CF_X_ATHENA_LIBS="$CFLAGS" +cf_save_CPPFLAGS_CF_X_ATHENA_LIBS="$CPPFLAGS" +LIBS="$LIBS ${X_PRE_LIBS} ${X_LIBS} ${X_EXTRA_LIBS}" +for cf_X_CFLAGS in $X_CFLAGS do - for cf_add_2lib in $cf_add_libs - do - if test "x$cf_add_1lib" = "x$cf_add_2lib" - then - cf_add_1lib= - break - fi - done - test -n "$cf_add_1lib" && cf_add_libs="$cf_add_libs $cf_add_1lib" + case "x$cf_X_CFLAGS" in + x-[IUD]*) + CPPFLAGS="$CPPFLAGS $cf_X_CFLAGS" + ;; + *) + CFLAGS="$CFLAGS $cf_X_CFLAGS" + ;; + esac done -LIBS="$cf_add_libs" - echo "$as_me:20941: checking for $cf_libs in $cf_path" >&5 -echo $ECHO_N "checking for $cf_libs in $cf_path... $ECHO_C" >&6 - else - -cf_add_libs="$cf_libs" -# Filter out duplicates - this happens with badly-designed ".pc" files... -for cf_add_1lib in $LIBS -do - for cf_add_2lib in $cf_add_libs - do - if test "x$cf_add_1lib" = "x$cf_add_2lib" - then + cf_test=XawSimpleMenuAddGlobalActions + test "$cf_path" != default && cf_libs="-L$cf_path/lib $cf_libs" + +cf_add_libs="$LIBS" +# reverse order +cf_add_0lib= +for cf_add_1lib in $cf_libs; do cf_add_0lib="$cf_add_1lib $cf_add_0lib"; done +# filter duplicates +for cf_add_1lib in $cf_add_0lib; do + for cf_add_2lib in $cf_add_libs; do + if test "x$cf_add_1lib" = "x$cf_add_2lib"; then cf_add_1lib= break fi done - test -n "$cf_add_1lib" && cf_add_libs="$cf_add_libs $cf_add_1lib" + test -n "$cf_add_1lib" && cf_add_libs="$cf_add_1lib $cf_add_libs" done LIBS="$cf_add_libs" - echo "$as_me:20961: checking for $cf_test in $cf_libs" >&5 + echo "$as_me:22268: checking for $cf_test in $cf_libs" >&5 echo $ECHO_N "checking for $cf_test in $cf_libs... $ECHO_C" >&6 - fi - cat >conftest.$ac_ext <<_ACEOF -#line 20965 "configure" + cat >"conftest.$ac_ext" <<_ACEOF +#line 22271 "configure" #include "confdefs.h" #include <X11/Intrinsic.h> @@ -20977,32 +22283,35 @@ $cf_test((XtAppContext) 0) return 0; } _ACEOF -rm -f conftest.$ac_objext conftest$ac_exeext -if { (eval echo "$as_me:20981: \"$ac_link\"") >&5 +rm -f "conftest.$ac_objext" "conftest$ac_exeext" +if { (eval echo "$as_me:22287: \"$ac_link\"") >&5 (eval $ac_link) 2>&5 ac_status=$? - echo "$as_me:20984: \$? = $ac_status" >&5 - (exit $ac_status); } && - { ac_try='test -s conftest$ac_exeext' - { (eval echo "$as_me:20987: \"$ac_try\"") >&5 + echo "$as_me:22290: \$? = $ac_status" >&5 + (exit "$ac_status"); } && + { ac_try='test -s "conftest$ac_exeext"' + { (eval echo "$as_me:22293: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? - echo "$as_me:20990: \$? = $ac_status" >&5 - (exit $ac_status); }; }; then + echo "$as_me:22296: \$? = $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:20999: result: $cf_result" >&5 +rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext" + echo "$as_me:22305: result: $cf_result" >&5 echo "${ECHO_T}$cf_result" >&6 - if test "$cf_result" = yes ; then - cf_x_athena_lib="$cf_libs" - break - fi - LIBS="$cf_save" + +LIBS="$cf_save_LIBS_CF_X_ATHENA_LIBS" +CFLAGS="$cf_save_CFLAGS_CF_X_ATHENA_LIBS" +CPPFLAGS="$cf_save_CPPFLAGS_CF_X_ATHENA_LIBS" + + if test "$cf_result" = yes ; then + cf_x_athena_lib="$cf_libs" + break fi done # cf_libs test -n "$cf_x_athena_lib" && break @@ -21010,11 +22319,27 @@ echo "${ECHO_T}$cf_result" >&6 done if test -z "$cf_x_athena_lib" ; then - { { echo "$as_me:21013: error: Unable to successfully link Athena library (-l$cf_x_athena_root) with test program" >&5 + { { echo "$as_me:22322: 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 +cf_add_libs="$LIBS" +# reverse order +cf_add_0lib= +for cf_add_1lib in $cf_x_athena_lib; do cf_add_0lib="$cf_add_1lib $cf_add_0lib"; done +# filter duplicates +for cf_add_1lib in $cf_add_0lib; do + for cf_add_2lib in $cf_add_libs; do + if test "x$cf_add_1lib" = "x$cf_add_2lib"; then + cf_add_1lib= + break + fi + done + test -n "$cf_add_1lib" && cf_add_libs="$cf_add_1lib $cf_add_libs" +done +LIBS="$cf_add_libs" + cf_x_athena_LIBS=`echo "HAVE_LIB_$cf_x_athena" | sed y%abcdefghijklmnopqrstuvwxyz./-%ABCDEFGHIJKLMNOPQRSTUVWXYZ___%` cat >>confdefs.h <<EOF @@ -21028,7 +22353,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:21031: checking for $ac_word" >&5 +echo "$as_me:22356: 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 @@ -21043,7 +22368,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:21046: found $ac_dir/$ac_word" >&5 +echo "$as_me:22371: found $ac_dir/$ac_word" >&5 break done @@ -21051,10 +22376,10 @@ fi fi XCURSES_CONFIG=$ac_cv_prog_XCURSES_CONFIG if test -n "$XCURSES_CONFIG"; then - echo "$as_me:21054: result: $XCURSES_CONFIG" >&5 + echo "$as_me:22379: result: $XCURSES_CONFIG" >&5 echo "${ECHO_T}$XCURSES_CONFIG" >&6 else - echo "$as_me:21057: result: no" >&5 + echo "$as_me:22382: result: no" >&5 echo "${ECHO_T}no" >&6 fi @@ -21067,7 +22392,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:21070: checking for $ac_word" >&5 +echo "$as_me:22395: 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 @@ -21082,7 +22407,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:21085: found $ac_dir/$ac_word" >&5 +echo "$as_me:22410: found $ac_dir/$ac_word" >&5 break done @@ -21090,10 +22415,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:21093: result: $ac_ct_XCURSES_CONFIG" >&5 + echo "$as_me:22418: result: $ac_ct_XCURSES_CONFIG" >&5 echo "${ECHO_T}$ac_ct_XCURSES_CONFIG" >&6 else - echo "$as_me:21096: result: no" >&5 + echo "$as_me:22421: result: no" >&5 echo "${ECHO_T}no" >&6 fi @@ -21113,19 +22438,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" @@ -21144,7 +22469,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/=.*//'` @@ -21174,7 +22499,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}" \ @@ -21204,19 +22529,19 @@ if test -n "$cf_new_extra_cppflags" ; then fi -cf_add_libs="`$XCURSES_CONFIG --libs`" -# Filter out duplicates - this happens with badly-designed ".pc" files... -for cf_add_1lib in $LIBS -do - for cf_add_2lib in $cf_add_libs - do - if test "x$cf_add_1lib" = "x$cf_add_2lib" - then +cf_add_libs="$LIBS" +# reverse order +cf_add_0lib= +for cf_add_1lib in `$XCURSES_CONFIG --libs`; do cf_add_0lib="$cf_add_1lib $cf_add_0lib"; done +# filter duplicates +for cf_add_1lib in $cf_add_0lib; do + for cf_add_2lib in $cf_add_libs; do + if test "x$cf_add_1lib" = "x$cf_add_2lib"; then cf_add_1lib= break fi done - test -n "$cf_add_1lib" && cf_add_libs="$cf_add_libs $cf_add_1lib" + test -n "$cf_add_1lib" && cf_add_libs="$cf_add_1lib $cf_add_libs" done LIBS="$cf_add_libs" @@ -21228,7 +22553,7 @@ LDFLAGS="$LDFLAGS $X_LIBS" test -n "$verbose" && echo " checking additions to CFLAGS" 1>&6 -echo "${as_me:-configure}:21231: testing checking additions to CFLAGS ..." 1>&5 +echo "${as_me:-configure}:22556: testing checking additions to CFLAGS ..." 1>&5 cf_check_cflags="$CFLAGS" cf_check_cppflags="$CPPFLAGS" @@ -21240,19 +22565,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" @@ -21271,7 +22596,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/=.*//'` @@ -21301,7 +22626,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}" \ @@ -21313,7 +22638,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}:21316: testing add to \$CFLAGS $cf_new_cflags ..." 1>&5 +echo "${as_me:-configure}:22641: testing add to \$CFLAGS $cf_new_cflags ..." 1>&5 test -n "$CFLAGS" && CFLAGS="$CFLAGS " CFLAGS="${CFLAGS}$cf_new_cflags" @@ -21323,7 +22648,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}:21326: testing add to \$CPPFLAGS $cf_new_cppflags ..." 1>&5 +echo "${as_me:-configure}:22651: testing add to \$CPPFLAGS $cf_new_cppflags ..." 1>&5 test -n "$CPPFLAGS" && CPPFLAGS="$CPPFLAGS " CPPFLAGS="${CPPFLAGS}$cf_new_cppflags" @@ -21333,7 +22658,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}:21336: testing add to \$EXTRA_CPPFLAGS $cf_new_extra_cppflags ..." 1>&5 +echo "${as_me:-configure}:22661: 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" @@ -21341,8 +22666,8 @@ echo "${as_me:-configure}:21336: 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 21345 "configure" +cat >"conftest.$ac_ext" <<_ACEOF +#line 22670 "configure" #include "confdefs.h" #include <stdio.h> int @@ -21353,46 +22678,46 @@ printf("Hello world"); return 0; } _ACEOF -rm -f conftest.$ac_objext conftest$ac_exeext -if { (eval echo "$as_me:21357: \"$ac_link\"") >&5 +rm -f "conftest.$ac_objext" "conftest$ac_exeext" +if { (eval echo "$as_me:22682: \"$ac_link\"") >&5 (eval $ac_link) 2>&5 ac_status=$? - echo "$as_me:21360: \$? = $ac_status" >&5 - (exit $ac_status); } && - { ac_try='test -s conftest$ac_exeext' - { (eval echo "$as_me:21363: \"$ac_try\"") >&5 + echo "$as_me:22685: \$? = $ac_status" >&5 + (exit "$ac_status"); } && + { ac_try='test -s "conftest$ac_exeext"' + { (eval echo "$as_me:22688: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? - echo "$as_me:21366: \$? = $ac_status" >&5 - (exit $ac_status); }; }; then + echo "$as_me:22691: \$? = $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}:21374: testing test-compile failed. Undoing change to \$CFLAGS ..." 1>&5 +echo "${as_me:-configure}:22699: 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}:21379: testing but keeping change to \$CPPFLAGS ..." 1>&5 +echo "${as_me:-configure}:22704: 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:21387: checking for XOpenDisplay in -lX11" >&5 +echo "$as_me:22712: 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 21395 "configure" +cat >"conftest.$ac_ext" <<_ACEOF +#line 22720 "configure" #include "confdefs.h" /* Override any gcc2 internal prototype to avoid an error. */ @@ -21410,73 +22735,73 @@ XOpenDisplay (); return 0; } _ACEOF -rm -f conftest.$ac_objext conftest$ac_exeext -if { (eval echo "$as_me:21414: \"$ac_link\"") >&5 +rm -f "conftest.$ac_objext" "conftest$ac_exeext" +if { (eval echo "$as_me:22739: \"$ac_link\"") >&5 (eval $ac_link) 2>&5 ac_status=$? - echo "$as_me:21417: \$? = $ac_status" >&5 - (exit $ac_status); } && - { ac_try='test -s conftest$ac_exeext' - { (eval echo "$as_me:21420: \"$ac_try\"") >&5 + echo "$as_me:22742: \$? = $ac_status" >&5 + (exit "$ac_status"); } && + { ac_try='test -s "conftest$ac_exeext"' + { (eval echo "$as_me:22745: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? - echo "$as_me:21423: \$? = $ac_status" >&5 - (exit $ac_status); }; }; then + echo "$as_me:22748: \$? = $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:21434: result: $ac_cv_lib_X11_XOpenDisplay" >&5 +echo "$as_me:22759: 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 - -cf_add_libs="-lX11" -# Filter out duplicates - this happens with badly-designed ".pc" files... -for cf_add_1lib in $LIBS -do - for cf_add_2lib in $cf_add_libs - do - if test "x$cf_add_1lib" = "x$cf_add_2lib" - then +if test "$ac_cv_lib_X11_XOpenDisplay" = yes; then + +cf_add_libs="$LIBS" +# reverse order +cf_add_0lib= +for cf_add_1lib in -lX11; do cf_add_0lib="$cf_add_1lib $cf_add_0lib"; done +# filter duplicates +for cf_add_1lib in $cf_add_0lib; do + for cf_add_2lib in $cf_add_libs; do + if test "x$cf_add_1lib" = "x$cf_add_2lib"; then cf_add_1lib= break fi done - test -n "$cf_add_1lib" && cf_add_libs="$cf_add_libs $cf_add_1lib" + test -n "$cf_add_1lib" && cf_add_libs="$cf_add_1lib $cf_add_libs" done LIBS="$cf_add_libs" fi -echo "$as_me:21456: checking for XCurses library" >&5 +echo "$as_me:22781: 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 else -cf_add_libs="-lXCurses" -# Filter out duplicates - this happens with badly-designed ".pc" files... -for cf_add_1lib in $LIBS -do - for cf_add_2lib in $cf_add_libs - do - if test "x$cf_add_1lib" = "x$cf_add_2lib" - then +cf_add_libs="$LIBS" +# reverse order +cf_add_0lib= +for cf_add_1lib in -lXCurses; do cf_add_0lib="$cf_add_1lib $cf_add_0lib"; done +# filter duplicates +for cf_add_1lib in $cf_add_0lib; do + for cf_add_2lib in $cf_add_libs; do + if test "x$cf_add_1lib" = "x$cf_add_2lib"; then cf_add_1lib= break fi done - test -n "$cf_add_1lib" && cf_add_libs="$cf_add_libs $cf_add_1lib" + test -n "$cf_add_1lib" && cf_add_libs="$cf_add_1lib $cf_add_libs" done LIBS="$cf_add_libs" -cat >conftest.$ac_ext <<_ACEOF -#line 21479 "configure" +cat >"conftest.$ac_ext" <<_ACEOF +#line 22804 "configure" #include "confdefs.h" #include <xcurses.h> @@ -21490,33 +22815,33 @@ XCursesExit(); return 0; } _ACEOF -rm -f conftest.$ac_objext conftest$ac_exeext -if { (eval echo "$as_me:21494: \"$ac_link\"") >&5 +rm -f "conftest.$ac_objext" "conftest$ac_exeext" +if { (eval echo "$as_me:22819: \"$ac_link\"") >&5 (eval $ac_link) 2>&5 ac_status=$? - echo "$as_me:21497: \$? = $ac_status" >&5 - (exit $ac_status); } && - { ac_try='test -s conftest$ac_exeext' - { (eval echo "$as_me:21500: \"$ac_try\"") >&5 + echo "$as_me:22822: \$? = $ac_status" >&5 + (exit "$ac_status"); } && + { ac_try='test -s "conftest$ac_exeext"' + { (eval echo "$as_me:22825: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? - echo "$as_me:21503: \$? = $ac_status" >&5 - (exit $ac_status); }; }; then + echo "$as_me:22828: \$? = $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:21514: result: $cf_cv_lib_XCurses" >&5 +echo "$as_me:22839: 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 @@ -21526,24 +22851,24 @@ cat >>confdefs.h <<\EOF #define XCURSES 1 EOF - echo "$as_me:21529: checking for xcurses.h" >&5 + echo "$as_me:22854: 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 21535 "configure" + cat >"conftest.$ac_ext" <<_ACEOF +#line 22860 "configure" #include "confdefs.h" #include <xcurses.h> _ACEOF -if { (eval echo "$as_me:21539: \"$ac_cpp conftest.$ac_ext\"") >&5 - (eval $ac_cpp conftest.$ac_ext) 2>conftest.er1 +if { (eval echo "$as_me:22864: \"$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:21545: \$? = $ac_status" >&5 - (exit $ac_status); } >/dev/null; then + echo "$as_me:22870: \$? = $ac_status" >&5 + (exit "$ac_status"); } >/dev/null; then if test -s conftest.err; then ac_cpp_err=$ac_c_preproc_warn_flag else @@ -21556,14 +22881,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:21564: result: $ac_cv_header_xcurses_h" >&5 +echo "$as_me:22889: 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 @@ -21572,14 +22897,14 @@ EOF fi else - { { echo "$as_me:21575: error: Cannot link with XCurses" >&5 + { { echo "$as_me:22900: error: Cannot link with XCurses" >&5 echo "$as_me: error: Cannot link with XCurses" >&2;} { (exit 1); exit 1; }; } fi ;; (*) - { { echo "$as_me:21582: error: unexpected screen-value: $cf_cv_screen" >&5 + { { echo "$as_me:22907: error: unexpected screen-value: $cf_cv_screen" >&5 echo "$as_me: error: unexpected screen-value: $cf_cv_screen" >&2;} { (exit 1); exit 1; }; } ;; @@ -21587,15 +22912,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:21590: checking for _nc_init_pthreads in -l$cf_nculib_root" >&5 +echo "$as_me:22915: 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 21598 "configure" +cat >"conftest.$ac_ext" <<_ACEOF +#line 22923 "configure" #include "confdefs.h" /* Override any gcc2 internal prototype to avoid an error. */ @@ -21613,30 +22938,30 @@ _nc_init_pthreads (); return 0; } _ACEOF -rm -f conftest.$ac_objext conftest$ac_exeext -if { (eval echo "$as_me:21617: \"$ac_link\"") >&5 +rm -f "conftest.$ac_objext" "conftest$ac_exeext" +if { (eval echo "$as_me:22942: \"$ac_link\"") >&5 (eval $ac_link) 2>&5 ac_status=$? - echo "$as_me:21620: \$? = $ac_status" >&5 - (exit $ac_status); } && - { ac_try='test -s conftest$ac_exeext' - { (eval echo "$as_me:21623: \"$ac_try\"") >&5 + echo "$as_me:22945: \$? = $ac_status" >&5 + (exit "$ac_status"); } && + { ac_try='test -s "conftest$ac_exeext"' + { (eval echo "$as_me:22948: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? - echo "$as_me:21626: \$? = $ac_status" >&5 - (exit $ac_status); }; }; then + echo "$as_me:22951: \$? = $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:21637: 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:22962: 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 @@ -21645,32 +22970,32 @@ fi if test "$cf_cv_ncurses_pthreads" = yes then -cf_add_libs="-lpthread" -# Filter out duplicates - this happens with badly-designed ".pc" files... -for cf_add_1lib in $LIBS -do - for cf_add_2lib in $cf_add_libs - do - if test "x$cf_add_1lib" = "x$cf_add_2lib" - then +cf_add_libs="$LIBS" +# reverse order +cf_add_0lib= +for cf_add_1lib in -lpthread; do cf_add_0lib="$cf_add_1lib $cf_add_0lib"; done +# filter duplicates +for cf_add_1lib in $cf_add_0lib; do + for cf_add_2lib in $cf_add_libs; do + if test "x$cf_add_1lib" = "x$cf_add_2lib"; then cf_add_1lib= break fi done - test -n "$cf_add_1lib" && cf_add_libs="$cf_add_libs $cf_add_1lib" + test -n "$cf_add_1lib" && cf_add_libs="$cf_add_1lib $cf_add_libs" done LIBS="$cf_add_libs" fi -echo "$as_me:21666: checking if curses supports wide characters" >&5 +echo "$as_me:22991: checking if curses supports wide characters" >&5 echo $ECHO_N "checking if curses supports wide characters... $ECHO_C" >&6 if test "${cf_cv_widec_curses+set}" = set; then echo $ECHO_N "(cached) $ECHO_C" >&6 else -cat >conftest.$ac_ext <<_ACEOF -#line 21673 "configure" +cat >"conftest.$ac_ext" <<_ACEOF +#line 22998 "configure" #include "confdefs.h" #include <stdlib.h> @@ -21688,28 +23013,28 @@ main (void) return 0; } _ACEOF -rm -f conftest.$ac_objext conftest$ac_exeext -if { (eval echo "$as_me:21692: \"$ac_link\"") >&5 +rm -f "conftest.$ac_objext" "conftest$ac_exeext" +if { (eval echo "$as_me:23017: \"$ac_link\"") >&5 (eval $ac_link) 2>&5 ac_status=$? - echo "$as_me:21695: \$? = $ac_status" >&5 - (exit $ac_status); } && - { ac_try='test -s conftest$ac_exeext' - { (eval echo "$as_me:21698: \"$ac_try\"") >&5 + echo "$as_me:23020: \$? = $ac_status" >&5 + (exit "$ac_status"); } && + { ac_try='test -s "conftest$ac_exeext"' + { (eval echo "$as_me:23023: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? - echo "$as_me:21701: \$? = $ac_status" >&5 - (exit $ac_status); }; }; then + echo "$as_me:23026: \$? = $ac_status" >&5 + (exit "$ac_status"); }; }; then cf_cv_widec_curses=yes else echo "$as_me: failed program was:" >&5 -cat conftest.$ac_ext >&5 +cat "conftest.$ac_ext" >&5 cf_cv_widec_curses=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:21712: result: $cf_cv_widec_curses" >&5 +echo "$as_me:23037: result: $cf_cv_widec_curses" >&5 echo "${ECHO_T}$cf_cv_widec_curses" >&6 if test "$cf_cv_widec_curses" = yes ; then @@ -21719,14 +23044,14 @@ cat >>confdefs.h <<\EOF EOF # This is needed on Tru64 5.0 to declare mbstate_t - echo "$as_me:21722: checking if we must include wchar.h to declare mbstate_t" >&5 + echo "$as_me:23047: 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_widec_mbstate+set}" = set; then echo $ECHO_N "(cached) $ECHO_C" >&6 else - cat >conftest.$ac_ext <<_ACEOF -#line 21729 "configure" + cat >"conftest.$ac_ext" <<_ACEOF +#line 23054 "configure" #include "confdefs.h" #include <stdlib.h> @@ -21734,29 +23059,29 @@ else int main (void) { -mbstate_t state +mbstate_t state; (void)state ; return 0; } _ACEOF -rm -f conftest.$ac_objext -if { (eval echo "$as_me:21743: \"$ac_compile\"") >&5 +rm -f "conftest.$ac_objext" +if { (eval echo "$as_me:23068: \"$ac_compile\"") >&5 (eval $ac_compile) 2>&5 ac_status=$? - echo "$as_me:21746: \$? = $ac_status" >&5 - (exit $ac_status); } && - { ac_try='test -s conftest.$ac_objext' - { (eval echo "$as_me:21749: \"$ac_try\"") >&5 + echo "$as_me:23071: \$? = $ac_status" >&5 + (exit "$ac_status"); } && + { ac_try='test -s "conftest.$ac_objext"' + { (eval echo "$as_me:23074: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? - echo "$as_me:21752: \$? = $ac_status" >&5 - (exit $ac_status); }; }; then + echo "$as_me:23077: \$? = $ac_status" >&5 + (exit "$ac_status"); }; }; then cf_cv_widec_mbstate=no else echo "$as_me: failed program was:" >&5 -cat conftest.$ac_ext >&5 -cat >conftest.$ac_ext <<_ACEOF -#line 21759 "configure" +cat "conftest.$ac_ext" >&5 +cat >"conftest.$ac_ext" <<_ACEOF +#line 23084 "configure" #include "confdefs.h" #include <stdlib.h> @@ -21765,34 +23090,34 @@ cat >conftest.$ac_ext <<_ACEOF int main (void) { -mbstate_t state +mbstate_t state; (void)state ; return 0; } _ACEOF -rm -f conftest.$ac_objext -if { (eval echo "$as_me:21774: \"$ac_compile\"") >&5 +rm -f "conftest.$ac_objext" +if { (eval echo "$as_me:23099: \"$ac_compile\"") >&5 (eval $ac_compile) 2>&5 ac_status=$? - echo "$as_me:21777: \$? = $ac_status" >&5 - (exit $ac_status); } && - { ac_try='test -s conftest.$ac_objext' - { (eval echo "$as_me:21780: \"$ac_try\"") >&5 + echo "$as_me:23102: \$? = $ac_status" >&5 + (exit "$ac_status"); } && + { ac_try='test -s "conftest.$ac_objext"' + { (eval echo "$as_me:23105: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? - echo "$as_me:21783: \$? = $ac_status" >&5 - (exit $ac_status); }; }; then + echo "$as_me:23108: \$? = $ac_status" >&5 + (exit "$ac_status"); }; }; then cf_cv_widec_mbstate=yes else echo "$as_me: failed program was:" >&5 -cat conftest.$ac_ext >&5 +cat "conftest.$ac_ext" >&5 cf_cv_widec_mbstate=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:21795: result: $cf_cv_widec_mbstate" >&5 +echo "$as_me:23120: result: $cf_cv_widec_mbstate" >&5 echo "${ECHO_T}$cf_cv_widec_mbstate" >&6 if test "$cf_cv_widec_mbstate" = yes ; then @@ -21815,7 +23140,7 @@ fi cf_all_widgets=yes -echo "$as_me:21818: checking if you want extra dialogs" >&5 +echo "$as_me:23143: checking if you want extra dialogs" >&5 echo $ECHO_N "checking if you want extra dialogs... $ECHO_C" >&6 # Check whether --enable-extras or --disable-extras was given. @@ -21825,7 +23150,7 @@ if test "${enable_extras+set}" = set; then else enableval=yes fi; -echo "$as_me:21828: result: $enableval" >&5 +echo "$as_me:23153: result: $enableval" >&5 echo "${ECHO_T}$enableval" >&6 if test "$enableval" != no ; then cf_all_widgets=yes @@ -21833,7 +23158,9 @@ else cf_all_widgets=no fi -echo "$as_me:21836: checking if you want config-file support" >&5 +cf_use_dialogrc=yes + +echo "$as_me:23163: checking if you want config-file support" >&5 echo $ECHO_N "checking if you want config-file support... $ECHO_C" >&6 # Check whether --enable-rc-file or --disable-rc-file was given. @@ -21843,7 +23170,7 @@ if test "${enable_rc_file+set}" = set; then else enableval=$cf_all_widgets fi; -echo "$as_me:21846: result: $enableval" >&5 +echo "$as_me:23173: result: $enableval" >&5 echo "${ECHO_T}$enableval" >&6 if test "$enableval" != no ; then EXTRAOBJS="$EXTRAOBJS rc\$o" @@ -21853,10 +23180,37 @@ cat >>confdefs.h <<\EOF EOF else - : +cf_use_dialogrc=no fi -echo "$as_me:21859: checking if you want Xdialog-style dialogs" >&5 +cf_use_dialogrc2=yes +if test "$cf_use_dialogrc" = yes; then + +echo "$as_me:23189: checking if you want extra attributes in config-file" >&5 +echo $ECHO_N "checking if you want extra attributes in config-file... $ECHO_C" >&6 + +# Check whether --enable-rc-file2 or --disable-rc-file2 was given. +if test "${enable_rc_file2+set}" = set; then + enableval="$enable_rc_file2" + +else + enableval=$cf_all_widgets +fi; +echo "$as_me:23199: result: $enableval" >&5 +echo "${ECHO_T}$enableval" >&6 +if test "$enableval" != no ; then + +cat >>confdefs.h <<\EOF +#define HAVE_RC_FILE2 1 +EOF + +else +cf_use_dialogrc2=no +fi + +fi + +echo "$as_me:23213: checking if you want Xdialog-style dialogs" >&5 echo $ECHO_N "checking if you want Xdialog-style dialogs... $ECHO_C" >&6 # Check whether --enable-Xdialog or --disable-Xdialog was given. @@ -21866,7 +23220,7 @@ if test "${enable_Xdialog+set}" = set; then else enableval=$cf_all_widgets fi; -echo "$as_me:21869: result: $enableval" >&5 +echo "$as_me:23223: result: $enableval" >&5 echo "${ECHO_T}$enableval" >&6 if test "$enableval" != no ; then EXTRAOBJS="$EXTRAOBJS calendar\$o fselect\$o timebox\$o" @@ -21879,7 +23233,7 @@ else : fi -echo "$as_me:21882: checking if you want extra Xdialog-style dialogs (1.2)" >&5 +echo "$as_me:23236: checking if you want extra Xdialog-style dialogs (1.2)" >&5 echo $ECHO_N "checking if you want extra Xdialog-style dialogs (1.2)... $ECHO_C" >&6 # Check whether --enable-Xdialog2 or --disable-Xdialog2 was given. @@ -21889,7 +23243,7 @@ if test "${enable_Xdialog2+set}" = set; then else enableval=$cf_all_widgets fi; -echo "$as_me:21892: result: $enableval" >&5 +echo "$as_me:23246: result: $enableval" >&5 echo "${ECHO_T}$enableval" >&6 if test "$enableval" != no ; then EXTRAOBJS="$EXTRAOBJS buildlist\$o rangebox\$o treeview\$o" @@ -21902,7 +23256,7 @@ else : fi -echo "$as_me:21905: checking if you want compatibility with whiptail options" >&5 +echo "$as_me:23259: checking if you want compatibility with whiptail options" >&5 echo $ECHO_N "checking if you want compatibility with whiptail options... $ECHO_C" >&6 # Check whether --enable-whiptail or --disable-whiptail was given. @@ -21912,7 +23266,7 @@ if test "${enable_whiptail+set}" = set; then else enableval=$cf_all_widgets fi; -echo "$as_me:21915: result: $enableval" >&5 +echo "$as_me:23269: result: $enableval" >&5 echo "${ECHO_T}$enableval" >&6 if test "$enableval" != no ; then @@ -21924,7 +23278,7 @@ else : fi -echo "$as_me:21927: checking if you want the form dialog" >&5 +echo "$as_me:23281: checking if you want the form dialog" >&5 echo $ECHO_N "checking if you want the form dialog... $ECHO_C" >&6 # Check whether --enable-form or --disable-form was given. @@ -21934,7 +23288,7 @@ if test "${enable_form+set}" = set; then else enableval=$cf_all_widgets fi; -echo "$as_me:21937: result: $enableval" >&5 +echo "$as_me:23291: result: $enableval" >&5 echo "${ECHO_T}$enableval" >&6 if test "$enableval" != no ; then EXTRAOBJS="$EXTRAOBJS formbox\$o" @@ -21947,7 +23301,7 @@ else : fi -echo "$as_me:21950: checking if you want the gauge dialog" >&5 +echo "$as_me:23304: checking if you want the gauge dialog" >&5 echo $ECHO_N "checking if you want the gauge dialog... $ECHO_C" >&6 # Check whether --enable-gauge or --disable-gauge was given. @@ -21957,7 +23311,7 @@ if test "${enable_gauge+set}" = set; then else enableval=$cf_all_widgets fi; -echo "$as_me:21960: result: $enableval" >&5 +echo "$as_me:23314: result: $enableval" >&5 echo "${ECHO_T}$enableval" >&6 if test "$enableval" != no ; then EXTRAOBJS="$EXTRAOBJS guage\$o pause\$o prgbox\$o progressbox\$o" @@ -21970,7 +23324,7 @@ else : fi -echo "$as_me:21973: checking if you want the tailbox dialog" >&5 +echo "$as_me:23327: checking if you want the tailbox dialog" >&5 echo $ECHO_N "checking if you want the tailbox dialog... $ECHO_C" >&6 # Check whether --enable-tailbox or --disable-tailbox was given. @@ -21980,7 +23334,7 @@ if test "${enable_tailbox+set}" = set; then else enableval=$cf_all_widgets fi; -echo "$as_me:21983: result: $enableval" >&5 +echo "$as_me:23337: result: $enableval" >&5 echo "${ECHO_T}$enableval" >&6 if test "$enableval" != no ; then EXTRAOBJS="$EXTRAOBJS tailbox\$o" @@ -21993,7 +23347,7 @@ else : fi -echo "$as_me:21996: checking if you want the mixedform dialog" >&5 +echo "$as_me:23350: checking if you want the mixedform dialog" >&5 echo $ECHO_N "checking if you want the mixedform dialog... $ECHO_C" >&6 # Check whether --enable-mixedform or --disable-mixedform was given. @@ -22003,7 +23357,7 @@ if test "${enable_mixedform+set}" = set; then else enableval=${enable_form:=$cf_all_widgets} fi; -echo "$as_me:22006: result: $enableval" >&5 +echo "$as_me:23360: result: $enableval" >&5 echo "${ECHO_T}$enableval" >&6 if test "$enableval" != no ; then EXTRAOBJS="$EXTRAOBJS mixedform\$o" @@ -22016,7 +23370,7 @@ else : fi -echo "$as_me:22019: checking if you want the mixedgauge dialog" >&5 +echo "$as_me:23373: checking if you want the mixedgauge dialog" >&5 echo $ECHO_N "checking if you want the mixedgauge dialog... $ECHO_C" >&6 # Check whether --enable-mixedgauge or --disable-mixedgauge was given. @@ -22026,7 +23380,7 @@ if test "${enable_mixedgauge+set}" = set; then else enableval=$cf_all_widgets fi; -echo "$as_me:22029: result: $enableval" >&5 +echo "$as_me:23383: result: $enableval" >&5 echo "${ECHO_T}$enableval" >&6 if test "$enableval" != no ; then EXTRAOBJS="$EXTRAOBJS mixedgauge\$o" @@ -22039,7 +23393,7 @@ else : fi -echo "$as_me:22042: checking if you want the wide-curses features" >&5 +echo "$as_me:23396: checking if you want the wide-curses features" >&5 echo $ECHO_N "checking if you want the wide-curses features... $ECHO_C" >&6 # Check whether --enable-widec or --disable-widec was given. @@ -22049,7 +23403,7 @@ if test "${enable_widec+set}" = set; then else enableval=$cf_cv_widec_curses fi; -echo "$as_me:22052: result: $enableval" >&5 +echo "$as_me:23406: result: $enableval" >&5 echo "${ECHO_T}$enableval" >&6 if test "$enableval" != no ; then @@ -22061,13 +23415,13 @@ else : fi -echo "$as_me:22064: checking for ANSI C header files" >&5 +echo "$as_me:23418: 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 22070 "configure" + cat >"conftest.$ac_ext" <<_ACEOF +#line 23424 "configure" #include "confdefs.h" #include <stdlib.h> #include <stdarg.h> @@ -22075,14 +23429,14 @@ else #include <float.h> _ACEOF -if { (eval echo "$as_me:22078: \"$ac_cpp conftest.$ac_ext\"") >&5 - (eval $ac_cpp conftest.$ac_ext) 2>conftest.er1 +if { (eval echo "$as_me:23432: \"$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:22084: \$? = $ac_status" >&5 - (exit $ac_status); } >/dev/null; then + echo "$as_me:23438: \$? = $ac_status" >&5 + (exit "$ac_status"); } >/dev/null; then if test -s conftest.err; then ac_cpp_err=$ac_c_preproc_warn_flag else @@ -22095,21 +23449,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 22106 "configure" + cat >"conftest.$ac_ext" <<_ACEOF +#line 23460 "configure" #include "confdefs.h" #include <string.h> _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 @@ -22120,14 +23474,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 22124 "configure" + cat >"conftest.$ac_ext" <<_ACEOF +#line 23478 "configure" #include "confdefs.h" #include <stdlib.h> _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 @@ -22141,8 +23495,8 @@ if test $ac_cv_header_stdc = yes; then if test "$cross_compiling" = yes; then : else - cat >conftest.$ac_ext <<_ACEOF -#line 22145 "configure" + cat >"conftest.$ac_ext" <<_ACEOF +#line 23499 "configure" #include "confdefs.h" #include <ctype.h> #if ((' ' & 0x0FF) == 0x020) @@ -22167,29 +23521,29 @@ main (void) $ac_main_return (0); } _ACEOF -rm -f conftest$ac_exeext -if { (eval echo "$as_me:22171: \"$ac_link\"") >&5 +rm -f "conftest$ac_exeext" +if { (eval echo "$as_me:23525: \"$ac_link\"") >&5 (eval $ac_link) 2>&5 ac_status=$? - echo "$as_me:22174: \$? = $ac_status" >&5 - (exit $ac_status); } && { ac_try='./conftest$ac_exeext' - { (eval echo "$as_me:22176: \"$ac_try\"") >&5 + echo "$as_me:23528: \$? = $ac_status" >&5 + (exit "$ac_status"); } && { ac_try='"./conftest$ac_exeext"' + { (eval echo "$as_me:23530: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? - echo "$as_me:22179: \$? = $ac_status" >&5 - (exit $ac_status); }; }; then + echo "$as_me:23533: \$? = $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:22192: result: $ac_cv_header_stdc" >&5 +echo "$as_me:23546: result: $ac_cv_header_stdc" >&5 echo "${ECHO_T}$ac_cv_header_stdc" >&6 if test $ac_cv_header_stdc = yes; then @@ -22199,13 +23553,13 @@ EOF fi -echo "$as_me:22202: checking whether time.h and sys/time.h may both be included" >&5 +echo "$as_me:23556: 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 22208 "configure" + cat >"conftest.$ac_ext" <<_ACEOF +#line 23562 "configure" #include "confdefs.h" #include <sys/types.h> #include <sys/time.h> @@ -22220,27 +23574,27 @@ return 0; return 0; } _ACEOF -rm -f conftest.$ac_objext -if { (eval echo "$as_me:22224: \"$ac_compile\"") >&5 +rm -f "conftest.$ac_objext" +if { (eval echo "$as_me:23578: \"$ac_compile\"") >&5 (eval $ac_compile) 2>&5 ac_status=$? - echo "$as_me:22227: \$? = $ac_status" >&5 - (exit $ac_status); } && - { ac_try='test -s conftest.$ac_objext' - { (eval echo "$as_me:22230: \"$ac_try\"") >&5 + echo "$as_me:23581: \$? = $ac_status" >&5 + (exit "$ac_status"); } && + { ac_try='test -s "conftest.$ac_objext"' + { (eval echo "$as_me:23584: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? - echo "$as_me:22233: \$? = $ac_status" >&5 - (exit $ac_status); }; }; then + echo "$as_me:23587: \$? = $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:22243: result: $ac_cv_header_time" >&5 +echo "$as_me:23597: result: $ac_cv_header_time" >&5 echo "${ECHO_T}$ac_cv_header_time" >&6 if test $ac_cv_header_time = yes; then @@ -22253,13 +23607,13 @@ fi ac_header_dirent=no for ac_hdr in dirent.h sys/ndir.h sys/dir.h ndir.h; do as_ac_Header=`echo "ac_cv_header_dirent_$ac_hdr" | $as_tr_sh` -echo "$as_me:22256: checking for $ac_hdr that defines DIR" >&5 +echo "$as_me:23610: checking for $ac_hdr that defines DIR" >&5 echo $ECHO_N "checking for $ac_hdr that defines DIR... $ECHO_C" >&6 if eval "test \"\${$as_ac_Header+set}\" = set"; then echo $ECHO_N "(cached) $ECHO_C" >&6 else - cat >conftest.$ac_ext <<_ACEOF -#line 22262 "configure" + cat >"conftest.$ac_ext" <<_ACEOF +#line 23616 "configure" #include "confdefs.h" #include <sys/types.h> #include <$ac_hdr> @@ -22273,29 +23627,29 @@ return 0; return 0; } _ACEOF -rm -f conftest.$ac_objext -if { (eval echo "$as_me:22277: \"$ac_compile\"") >&5 +rm -f "conftest.$ac_objext" +if { (eval echo "$as_me:23631: \"$ac_compile\"") >&5 (eval $ac_compile) 2>&5 ac_status=$? - echo "$as_me:22280: \$? = $ac_status" >&5 - (exit $ac_status); } && - { ac_try='test -s conftest.$ac_objext' - { (eval echo "$as_me:22283: \"$ac_try\"") >&5 + echo "$as_me:23634: \$? = $ac_status" >&5 + (exit "$ac_status"); } && + { ac_try='test -s "conftest.$ac_objext"' + { (eval echo "$as_me:23637: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? - echo "$as_me:22286: \$? = $ac_status" >&5 - (exit $ac_status); }; }; then + echo "$as_me:23640: \$? = $ac_status" >&5 + (exit "$ac_status"); }; }; then eval "$as_ac_Header=yes" else echo "$as_me: failed program was:" >&5 -cat conftest.$ac_ext >&5 +cat "conftest.$ac_ext" >&5 eval "$as_ac_Header=no" fi -rm -f conftest.$ac_objext conftest.$ac_ext +rm -f "conftest.$ac_objext" "conftest.$ac_ext" fi -echo "$as_me:22296: 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:23650: result: `eval echo '${'"$as_ac_Header"'}'`" >&5 +echo "${ECHO_T}`eval echo '${'"$as_ac_Header"'}'`" >&6 +if test "`eval echo '${'"$as_ac_Header"'}'`" = yes; then cat >>confdefs.h <<EOF #define `echo "HAVE_$ac_hdr" | $as_tr_cpp` 1 EOF @@ -22306,15 +23660,15 @@ fi done # Two versions of opendir et al. are in -ldir and -lx on SCO Xenix. if test $ac_header_dirent = dirent.h; then - echo "$as_me:22309: checking for opendir in -ldir" >&5 + echo "$as_me:23663: checking for opendir in -ldir" >&5 echo $ECHO_N "checking for opendir in -ldir... $ECHO_C" >&6 if test "${ac_cv_lib_dir_opendir+set}" = set; then echo $ECHO_N "(cached) $ECHO_C" >&6 else ac_check_lib_save_LIBS=$LIBS LIBS="-ldir $LIBS" -cat >conftest.$ac_ext <<_ACEOF -#line 22317 "configure" +cat >"conftest.$ac_ext" <<_ACEOF +#line 23671 "configure" #include "confdefs.h" /* Override any gcc2 internal prototype to avoid an error. */ @@ -22332,43 +23686,43 @@ opendir (); return 0; } _ACEOF -rm -f conftest.$ac_objext conftest$ac_exeext -if { (eval echo "$as_me:22336: \"$ac_link\"") >&5 +rm -f "conftest.$ac_objext" "conftest$ac_exeext" +if { (eval echo "$as_me:23690: \"$ac_link\"") >&5 (eval $ac_link) 2>&5 ac_status=$? - echo "$as_me:22339: \$? = $ac_status" >&5 - (exit $ac_status); } && - { ac_try='test -s conftest$ac_exeext' - { (eval echo "$as_me:22342: \"$ac_try\"") >&5 + echo "$as_me:23693: \$? = $ac_status" >&5 + (exit "$ac_status"); } && + { ac_try='test -s "conftest$ac_exeext"' + { (eval echo "$as_me:23696: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? - echo "$as_me:22345: \$? = $ac_status" >&5 - (exit $ac_status); }; }; then + echo "$as_me:23699: \$? = $ac_status" >&5 + (exit "$ac_status"); }; }; then ac_cv_lib_dir_opendir=yes else echo "$as_me: failed program was:" >&5 -cat conftest.$ac_ext >&5 +cat "conftest.$ac_ext" >&5 ac_cv_lib_dir_opendir=no fi -rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext +rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext" LIBS=$ac_check_lib_save_LIBS fi -echo "$as_me:22356: result: $ac_cv_lib_dir_opendir" >&5 +echo "$as_me:23710: result: $ac_cv_lib_dir_opendir" >&5 echo "${ECHO_T}$ac_cv_lib_dir_opendir" >&6 -if test $ac_cv_lib_dir_opendir = yes; then +if test "$ac_cv_lib_dir_opendir" = yes; then LIBS="$LIBS -ldir" fi else - echo "$as_me:22363: checking for opendir in -lx" >&5 + echo "$as_me:23717: checking for opendir in -lx" >&5 echo $ECHO_N "checking for opendir in -lx... $ECHO_C" >&6 if test "${ac_cv_lib_x_opendir+set}" = set; then echo $ECHO_N "(cached) $ECHO_C" >&6 else ac_check_lib_save_LIBS=$LIBS LIBS="-lx $LIBS" -cat >conftest.$ac_ext <<_ACEOF -#line 22371 "configure" +cat >"conftest.$ac_ext" <<_ACEOF +#line 23725 "configure" #include "confdefs.h" /* Override any gcc2 internal prototype to avoid an error. */ @@ -22386,56 +23740,56 @@ opendir (); return 0; } _ACEOF -rm -f conftest.$ac_objext conftest$ac_exeext -if { (eval echo "$as_me:22390: \"$ac_link\"") >&5 +rm -f "conftest.$ac_objext" "conftest$ac_exeext" +if { (eval echo "$as_me:23744: \"$ac_link\"") >&5 (eval $ac_link) 2>&5 ac_status=$? - echo "$as_me:22393: \$? = $ac_status" >&5 - (exit $ac_status); } && - { ac_try='test -s conftest$ac_exeext' - { (eval echo "$as_me:22396: \"$ac_try\"") >&5 + echo "$as_me:23747: \$? = $ac_status" >&5 + (exit "$ac_status"); } && + { ac_try='test -s "conftest$ac_exeext"' + { (eval echo "$as_me:23750: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? - echo "$as_me:22399: \$? = $ac_status" >&5 - (exit $ac_status); }; }; then + echo "$as_me:23753: \$? = $ac_status" >&5 + (exit "$ac_status"); }; }; then ac_cv_lib_x_opendir=yes else echo "$as_me: failed program was:" >&5 -cat conftest.$ac_ext >&5 +cat "conftest.$ac_ext" >&5 ac_cv_lib_x_opendir=no fi -rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext +rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext" LIBS=$ac_check_lib_save_LIBS fi -echo "$as_me:22410: result: $ac_cv_lib_x_opendir" >&5 +echo "$as_me:23764: result: $ac_cv_lib_x_opendir" >&5 echo "${ECHO_T}$ac_cv_lib_x_opendir" >&6 -if test $ac_cv_lib_x_opendir = yes; then +if test "$ac_cv_lib_x_opendir" = yes; then LIBS="$LIBS -lx" fi fi -for ac_header in search.h stdint.h unistd.h +for ac_header in search.h stdint.h sys/param.h unistd.h do as_ac_Header=`echo "ac_cv_header_$ac_header" | $as_tr_sh` -echo "$as_me:22421: checking for $ac_header" >&5 +echo "$as_me:23775: 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 22427 "configure" + cat >"conftest.$ac_ext" <<_ACEOF +#line 23781 "configure" #include "confdefs.h" #include <$ac_header> _ACEOF -if { (eval echo "$as_me:22431: \"$ac_cpp conftest.$ac_ext\"") >&5 - (eval $ac_cpp conftest.$ac_ext) 2>conftest.er1 +if { (eval echo "$as_me:23785: \"$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:22437: \$? = $ac_status" >&5 - (exit $ac_status); } >/dev/null; then + echo "$as_me:23791: \$? = $ac_status" >&5 + (exit "$ac_status"); } >/dev/null; then if test -s conftest.err; then ac_cpp_err=$ac_c_preproc_warn_flag else @@ -22448,14 +23802,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:22456: 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:23810: result: `eval echo '${'"$as_ac_Header"'}'`" >&5 +echo "${ECHO_T}`eval echo '${'"$as_ac_Header"'}'`" >&6 +if test "`eval echo '${'"$as_ac_Header"'}'`" = yes; then cat >>confdefs.h <<EOF #define `echo "HAVE_$ac_header" | $as_tr_cpp` 1 EOF @@ -22463,7 +23817,7 @@ EOF fi done -echo "$as_me:22466: checking for term.h" >&5 +echo "$as_me:23820: 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 @@ -22474,17 +23828,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 22487 "configure" + cat >"conftest.$ac_ext" <<_ACEOF +#line 23841 "configure" #include "confdefs.h" #include <${cf_cv_ncurses_header:-curses.h}> @@ -22492,41 +23846,41 @@ do int main (void) { -WINDOW *x +WINDOW *x; (void)x ; return 0; } _ACEOF -rm -f conftest.$ac_objext -if { (eval echo "$as_me:22501: \"$ac_compile\"") >&5 +rm -f "conftest.$ac_objext" +if { (eval echo "$as_me:23855: \"$ac_compile\"") >&5 (eval $ac_compile) 2>&5 ac_status=$? - echo "$as_me:22504: \$? = $ac_status" >&5 - (exit $ac_status); } && - { ac_try='test -s conftest.$ac_objext' - { (eval echo "$as_me:22507: \"$ac_try\"") >&5 + echo "$as_me:23858: \$? = $ac_status" >&5 + (exit "$ac_status"); } && + { ac_try='test -s "conftest.$ac_objext"' + { (eval echo "$as_me:23861: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? - echo "$as_me:22510: \$? = $ac_status" >&5 - (exit $ac_status); }; }; then + echo "$as_me:23864: \$? = $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 22529 "configure" + cat >"conftest.$ac_ext" <<_ACEOF +#line 23883 "configure" #include "confdefs.h" #include <${cf_cv_ncurses_header:-curses.h}> @@ -22538,40 +23892,40 @@ make an error int main (void) { -WINDOW *x +WINDOW *x; (void)x ; return 0; } _ACEOF -rm -f conftest.$ac_objext -if { (eval echo "$as_me:22547: \"$ac_compile\"") >&5 +rm -f "conftest.$ac_objext" +if { (eval echo "$as_me:23901: \"$ac_compile\"") >&5 (eval $ac_compile) 2>&5 ac_status=$? - echo "$as_me:22550: \$? = $ac_status" >&5 - (exit $ac_status); } && - { ac_try='test -s conftest.$ac_objext' - { (eval echo "$as_me:22553: \"$ac_try\"") >&5 + echo "$as_me:23904: \$? = $ac_status" >&5 + (exit "$ac_status"); } && + { ac_try='test -s "conftest.$ac_objext"' + { (eval echo "$as_me:23907: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? - echo "$as_me:22556: \$? = $ac_status" >&5 - (exit $ac_status); }; }; then + echo "$as_me:23910: \$? = $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:22571: result: $cf_cv_term_header" >&5 +echo "$as_me:23925: 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 @@ -22595,13 +23949,13 @@ EOF ;; esac -echo "$as_me:22598: checking return type of signal handlers" >&5 +echo "$as_me:23952: checking return type of signal handlers" >&5 echo $ECHO_N "checking return type of signal handlers... $ECHO_C" >&6 if test "${ac_cv_type_signal+set}" = set; then echo $ECHO_N "(cached) $ECHO_C" >&6 else - cat >conftest.$ac_ext <<_ACEOF -#line 22604 "configure" + cat >"conftest.$ac_ext" <<_ACEOF +#line 23958 "configure" #include "confdefs.h" #include <sys/types.h> #include <signal.h> @@ -22622,27 +23976,27 @@ int i; return 0; } _ACEOF -rm -f conftest.$ac_objext -if { (eval echo "$as_me:22626: \"$ac_compile\"") >&5 +rm -f "conftest.$ac_objext" +if { (eval echo "$as_me:23980: \"$ac_compile\"") >&5 (eval $ac_compile) 2>&5 ac_status=$? - echo "$as_me:22629: \$? = $ac_status" >&5 - (exit $ac_status); } && - { ac_try='test -s conftest.$ac_objext' - { (eval echo "$as_me:22632: \"$ac_try\"") >&5 + echo "$as_me:23983: \$? = $ac_status" >&5 + (exit "$ac_status"); } && + { ac_try='test -s "conftest.$ac_objext"' + { (eval echo "$as_me:23986: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? - echo "$as_me:22635: \$? = $ac_status" >&5 - (exit $ac_status); }; }; then + echo "$as_me:23989: \$? = $ac_status" >&5 + (exit "$ac_status"); }; }; then ac_cv_type_signal=void else echo "$as_me: failed program was:" >&5 -cat conftest.$ac_ext >&5 +cat "conftest.$ac_ext" >&5 ac_cv_type_signal=int fi -rm -f conftest.$ac_objext conftest.$ac_ext +rm -f "conftest.$ac_objext" "conftest.$ac_ext" fi -echo "$as_me:22645: result: $ac_cv_type_signal" >&5 +echo "$as_me:23999: result: $ac_cv_type_signal" >&5 echo "${ECHO_T}$ac_cv_type_signal" >&6 cat >>confdefs.h <<EOF @@ -22650,7 +24004,6 @@ cat >>confdefs.h <<EOF EOF for ac_func in \ -_nc_free_and_exit \ btowc \ mblen \ mbrlen \ @@ -22668,65 +24021,65 @@ mktime \ do as_ac_var=`echo "ac_cv_func_$ac_func" | $as_tr_sh` -echo "$as_me:22671: checking for $ac_func" >&5 +echo "$as_me:24024: 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 22677 "configure" + cat >"conftest.$ac_ext" <<_ACEOF +#line 24030 "configure" #include "confdefs.h" -/* System header to define __stub macros and hopefully few prototypes, - which can conflict with char $ac_func (); below. */ -#include <assert.h> -/* Override any gcc2 internal prototype to avoid an error. */ +#define $ac_func autoconf_temporary +#include <limits.h> /* least-intrusive standard header which defines gcc2 __stub macros */ +#undef $ac_func + #ifdef __cplusplus extern "C" #endif + /* We use char because int might match the return type of a gcc2 builtin and then its argument prototype would still apply. */ -char $ac_func (); -char (*f) (); +char $ac_func (void); int main (void) { -/* The GNU C library defines this for functions which it implements + +/* The GNU C library defines stubs for functions which it implements to always fail with ENOSYS. Some functions are actually named something starting with __ and the normal name is an alias. */ #if defined (__stub_$ac_func) || defined (__stub___$ac_func) -choke me -#else -f = $ac_func; /* workaround for ICC 12.0.3 */ if (f == 0) return 1; +#error found stub for $ac_func #endif + return $ac_func (); ; return 0; } _ACEOF -rm -f conftest.$ac_objext conftest$ac_exeext -if { (eval echo "$as_me:22708: \"$ac_link\"") >&5 +rm -f "conftest.$ac_objext" "conftest$ac_exeext" +if { (eval echo "$as_me:24061: \"$ac_link\"") >&5 (eval $ac_link) 2>&5 ac_status=$? - echo "$as_me:22711: \$? = $ac_status" >&5 - (exit $ac_status); } && - { ac_try='test -s conftest$ac_exeext' - { (eval echo "$as_me:22714: \"$ac_try\"") >&5 + echo "$as_me:24064: \$? = $ac_status" >&5 + (exit "$ac_status"); } && + { ac_try='test -s "conftest$ac_exeext"' + { (eval echo "$as_me:24067: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? - echo "$as_me:22717: \$? = $ac_status" >&5 - (exit $ac_status); }; }; then + echo "$as_me:24070: \$? = $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:22727: 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:24080: result: `eval echo '${'"$as_ac_var"'}'`" >&5 +echo "${ECHO_T}`eval echo '${'"$as_ac_var"'}'`" >&6 +if test "`eval echo '${'"$as_ac_var"'}'`" = yes; then cat >>confdefs.h <<EOF #define `echo "HAVE_$ac_func" | $as_tr_cpp` 1 EOF @@ -22734,15 +24087,15 @@ EOF fi done -echo "$as_me:22737: checking definition to turn on extended curses functions" >&5 +echo "$as_me:24090: 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 22745 "configure" +cat >"conftest.$ac_ext" <<_ACEOF +#line 24098 "configure" #include "confdefs.h" #include <stdlib.h> @@ -22762,32 +24115,39 @@ main (void) #endif long x = winnstr(stdscr, "", 0); int x1, y1; - getbegyx(stdscr, y1, x1) +#ifdef NCURSES_VERSION + (void)check2; +#endif + getbegyx(stdscr, y1, x1); + (void)x; + (void)y1; + (void)x1; + ; return 0; } _ACEOF -rm -f conftest.$ac_objext conftest$ac_exeext -if { (eval echo "$as_me:22771: \"$ac_link\"") >&5 +rm -f "conftest.$ac_objext" "conftest$ac_exeext" +if { (eval echo "$as_me:24131: \"$ac_link\"") >&5 (eval $ac_link) 2>&5 ac_status=$? - echo "$as_me:22774: \$? = $ac_status" >&5 - (exit $ac_status); } && - { ac_try='test -s conftest$ac_exeext' - { (eval echo "$as_me:22777: \"$ac_try\"") >&5 + echo "$as_me:24134: \$? = $ac_status" >&5 + (exit "$ac_status"); } && + { ac_try='test -s "conftest$ac_exeext"' + { (eval echo "$as_me:24137: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? - echo "$as_me:22780: \$? = $ac_status" >&5 - (exit $ac_status); }; }; then + echo "$as_me:24140: \$? = $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 22790 "configure" + cat >"conftest.$ac_ext" <<_ACEOF +#line 24150 "configure" #include "confdefs.h" #define $cf_try_xopen_extension 1 @@ -22803,39 +24163,46 @@ main (void) #endif long x = winnstr(stdscr, "", 0); int x1, y1; - getbegyx(stdscr, y1, x1) + getbegyx(stdscr, y1, x1); +#ifdef NCURSES_VERSION + (void)check2; +#endif + (void)x; + (void)y1; + (void)x1; + ; return 0; } _ACEOF -rm -f conftest.$ac_objext conftest$ac_exeext -if { (eval echo "$as_me:22812: \"$ac_link\"") >&5 +rm -f "conftest.$ac_objext" "conftest$ac_exeext" +if { (eval echo "$as_me:24179: \"$ac_link\"") >&5 (eval $ac_link) 2>&5 ac_status=$? - echo "$as_me:22815: \$? = $ac_status" >&5 - (exit $ac_status); } && - { ac_try='test -s conftest$ac_exeext' - { (eval echo "$as_me:22818: \"$ac_try\"") >&5 + echo "$as_me:24182: \$? = $ac_status" >&5 + (exit "$ac_status"); } && + { ac_try='test -s "conftest$ac_exeext"' + { (eval echo "$as_me:24185: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? - echo "$as_me:22821: \$? = $ac_status" >&5 - (exit $ac_status); }; }; then + echo "$as_me:24188: \$? = $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:22835: result: $cf_cv_need_xopen_extension" >&5 +echo "$as_me:24202: 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 " @@ -22844,7 +24211,7 @@ case $cf_cv_need_xopen_extension in ;; esac -echo "$as_me:22847: checking for unctrl.h" >&5 +echo "$as_me:24214: 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 @@ -22855,17 +24222,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 22868 "configure" + cat >"conftest.$ac_ext" <<_ACEOF +#line 24235 "configure" #include "confdefs.h" #include <${cf_cv_ncurses_header:-curses.h}> @@ -22873,45 +24240,45 @@ do int main (void) { -WINDOW *x +WINDOW *x; (void)x ; return 0; } _ACEOF -rm -f conftest.$ac_objext -if { (eval echo "$as_me:22882: \"$ac_compile\"") >&5 +rm -f "conftest.$ac_objext" +if { (eval echo "$as_me:24249: \"$ac_compile\"") >&5 (eval $ac_compile) 2>&5 ac_status=$? - echo "$as_me:22885: \$? = $ac_status" >&5 - (exit $ac_status); } && - { ac_try='test -s conftest.$ac_objext' - { (eval echo "$as_me:22888: \"$ac_try\"") >&5 + echo "$as_me:24252: \$? = $ac_status" >&5 + (exit "$ac_status"); } && + { ac_try='test -s "conftest.$ac_objext"' + { (eval echo "$as_me:24255: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? - echo "$as_me:22891: \$? = $ac_status" >&5 - (exit $ac_status); }; }; then + echo "$as_me:24258: \$? = $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:22904: result: $cf_cv_unctrl_header" >&5 +echo "$as_me:24271: 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:22909: WARNING: unctrl.h header not found" >&5 + { echo "$as_me:24276: 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 @@ -22959,10 +24326,10 @@ do cf_tr_func=`echo "$cf_func" | sed y%abcdefghijklmnopqrstuvwxyz./-%ABCDEFGHIJKLMNOPQRSTUVWXYZ___%` - echo "$as_me:22962: checking for ${cf_func}" >&5 + echo "$as_me:24329: checking for ${cf_func}" >&5 echo $ECHO_N "checking for ${cf_func}... $ECHO_C" >&6 -echo "${as_me:-configure}:22965: testing ${cf_func} ..." 1>&5 +echo "${as_me:-configure}:24332: testing ${cf_func} ..." 1>&5 if eval "test \"\${cf_cv_func_$cf_func+set}\" = set"; then echo $ECHO_N "(cached) $ECHO_C" >&6 @@ -22970,8 +24337,8 @@ else eval cf_result='$ac_cv_func_'$cf_func if test ".$cf_result" != ".no"; then - cat >conftest.$ac_ext <<_ACEOF -#line 22974 "configure" + cat >"conftest.$ac_ext" <<_ACEOF +#line 24341 "configure" #include "confdefs.h" #ifdef HAVE_XCURSES @@ -22994,7 +24361,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 @@ -23003,35 +24370,35 @@ if (foo + 1234L > 5678L) return 0; } _ACEOF -rm -f conftest.$ac_objext conftest$ac_exeext -if { (eval echo "$as_me:23007: \"$ac_link\"") >&5 +rm -f "conftest.$ac_objext" "conftest$ac_exeext" +if { (eval echo "$as_me:24374: \"$ac_link\"") >&5 (eval $ac_link) 2>&5 ac_status=$? - echo "$as_me:23010: \$? = $ac_status" >&5 - (exit $ac_status); } && - { ac_try='test -s conftest$ac_exeext' - { (eval echo "$as_me:23013: \"$ac_try\"") >&5 + echo "$as_me:24377: \$? = $ac_status" >&5 + (exit "$ac_status"); } && + { ac_try='test -s "conftest$ac_exeext"' + { (eval echo "$as_me:24380: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? - echo "$as_me:23016: \$? = $ac_status" >&5 - (exit $ac_status); }; }; then + echo "$as_me:24383: \$? = $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:23032: result: $cf_result" >&5 + echo "$as_me:24399: 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 <<EOF #define HAVE_${cf_tr_func} 1 EOF @@ -23039,65 +24406,153 @@ EOF fi done -echo "$as_me:23042: checking for start_color" >&5 +for cf_func in \ +curses_exit \ +_nc_free_and_exit \ + +do + +cf_tr_func=`echo "$cf_func" | sed y%abcdefghijklmnopqrstuvwxyz./-%ABCDEFGHIJKLMNOPQRSTUVWXYZ___%` + + echo "$as_me:24417: checking for ${cf_func}" >&5 +echo $ECHO_N "checking for ${cf_func}... $ECHO_C" >&6 + +echo "${as_me:-configure}:24420: testing ${cf_func} ..." 1>&5 + + if eval "test \"\${cf_cv_func_$cf_func+set}\" = set"; then + echo $ECHO_N "(cached) $ECHO_C" >&6 +else + + eval cf_result='$ac_cv_func_'$cf_func + if test ".$cf_result" != ".no"; then + cat >"conftest.$ac_ext" <<_ACEOF +#line 24429 "configure" +#include "confdefs.h" + +#ifdef HAVE_XCURSES +#include <xcurses.h> +char * XCursesProgramName = "test"; +#else +#include <${cf_cv_ncurses_header:-curses.h}> +#if defined(NCURSES_VERSION) && defined(HAVE_NCURSESW_TERM_H) +#include <ncursesw/term.h> +#elif defined(NCURSES_VERSION) && defined(HAVE_NCURSES_TERM_H) +#include <ncurses/term.h> +#elif defined(HAVE_TERM_H) +#include <term.h> +#endif +#endif + +int +main (void) +{ + +#ifndef ${cf_func} +long foo = (long)(&${cf_func}); +fprintf(stderr, "testing linkage of $cf_func:%p\\n", (void *)foo); +if (foo + 1234L > 5678L) + ${cf_cv_main_return:-return}(foo != 0); +#endif + + ; + return 0; +} +_ACEOF +rm -f "conftest.$ac_objext" "conftest$ac_exeext" +if { (eval echo "$as_me:24462: \"$ac_link\"") >&5 + (eval $ac_link) 2>&5 + ac_status=$? + echo "$as_me:24465: \$? = $ac_status" >&5 + (exit "$ac_status"); } && + { ac_try='test -s "conftest$ac_exeext"' + { (eval echo "$as_me:24468: \"$ac_try\"") >&5 + (eval $ac_try) 2>&5 + ac_status=$? + echo "$as_me:24471: \$? = $ac_status" >&5 + (exit "$ac_status"); }; }; then + cf_result=yes +else + echo "$as_me: failed program was:" >&5 +cat "conftest.$ac_ext" >&5 +cf_result=no +fi +rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext" + fi + 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:24487: result: $cf_result" >&5 +echo "${ECHO_T}$cf_result" >&6 + if test "$cf_result" != no; then + cat >>confdefs.h <<EOF +#define HAVE_${cf_tr_func} 1 +EOF + + fi +done + +echo "$as_me:24497: checking for start_color" >&5 echo $ECHO_N "checking for start_color... $ECHO_C" >&6 if test "${ac_cv_func_start_color+set}" = set; then echo $ECHO_N "(cached) $ECHO_C" >&6 else - cat >conftest.$ac_ext <<_ACEOF -#line 23048 "configure" + cat >"conftest.$ac_ext" <<_ACEOF +#line 24503 "configure" #include "confdefs.h" -/* System header to define __stub macros and hopefully few prototypes, - which can conflict with char start_color (); below. */ -#include <assert.h> -/* Override any gcc2 internal prototype to avoid an error. */ +#define start_color autoconf_temporary +#include <limits.h> /* least-intrusive standard header which defines gcc2 __stub macros */ +#undef start_color + #ifdef __cplusplus extern "C" #endif + /* We use char because int might match the return type of a gcc2 builtin and then its argument prototype would still apply. */ -char start_color (); -char (*f) (); +char start_color (void); int main (void) { -/* The GNU C library defines this for functions which it implements + +/* The GNU C library defines stubs for functions which it implements to always fail with ENOSYS. Some functions are actually named something starting with __ and the normal name is an alias. */ #if defined (__stub_start_color) || defined (__stub___start_color) -choke me -#else -f = start_color; /* workaround for ICC 12.0.3 */ if (f == 0) return 1; +#error found stub for start_color #endif + return start_color (); ; return 0; } _ACEOF -rm -f conftest.$ac_objext conftest$ac_exeext -if { (eval echo "$as_me:23079: \"$ac_link\"") >&5 +rm -f "conftest.$ac_objext" "conftest$ac_exeext" +if { (eval echo "$as_me:24534: \"$ac_link\"") >&5 (eval $ac_link) 2>&5 ac_status=$? - echo "$as_me:23082: \$? = $ac_status" >&5 - (exit $ac_status); } && - { ac_try='test -s conftest$ac_exeext' - { (eval echo "$as_me:23085: \"$ac_try\"") >&5 + echo "$as_me:24537: \$? = $ac_status" >&5 + (exit "$ac_status"); } && + { ac_try='test -s "conftest$ac_exeext"' + { (eval echo "$as_me:24540: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? - echo "$as_me:23088: \$? = $ac_status" >&5 - (exit $ac_status); }; }; then + echo "$as_me:24543: \$? = $ac_status" >&5 + (exit "$ac_status"); }; }; then ac_cv_func_start_color=yes else echo "$as_me: failed program was:" >&5 -cat conftest.$ac_ext >&5 +cat "conftest.$ac_ext" >&5 ac_cv_func_start_color=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:23098: result: $ac_cv_func_start_color" >&5 +echo "$as_me:24553: result: $ac_cv_func_start_color" >&5 echo "${ECHO_T}$ac_cv_func_start_color" >&6 -if test $ac_cv_func_start_color = yes; then +if test "$ac_cv_func_start_color" = yes; then cat >>confdefs.h <<\EOF #define HAVE_COLOR 1 @@ -23105,93 +24560,93 @@ EOF fi -echo "$as_me:23108: checking for chtype typedef" >&5 +echo "$as_me:24563: checking for chtype typedef" >&5 echo $ECHO_N "checking for chtype typedef... $ECHO_C" >&6 if test "${cf_cv_chtype_decl+set}" = set; then echo $ECHO_N "(cached) $ECHO_C" >&6 else - cat >conftest.$ac_ext <<_ACEOF -#line 23115 "configure" + cat >"conftest.$ac_ext" <<_ACEOF +#line 24570 "configure" #include "confdefs.h" #include <${cf_cv_ncurses_header:-curses.h}> int main (void) { -chtype foo +chtype foo; (void)foo ; return 0; } _ACEOF -rm -f conftest.$ac_objext -if { (eval echo "$as_me:23127: \"$ac_compile\"") >&5 +rm -f "conftest.$ac_objext" +if { (eval echo "$as_me:24582: \"$ac_compile\"") >&5 (eval $ac_compile) 2>&5 ac_status=$? - echo "$as_me:23130: \$? = $ac_status" >&5 - (exit $ac_status); } && - { ac_try='test -s conftest.$ac_objext' - { (eval echo "$as_me:23133: \"$ac_try\"") >&5 + echo "$as_me:24585: \$? = $ac_status" >&5 + (exit "$ac_status"); } && + { ac_try='test -s "conftest.$ac_objext"' + { (eval echo "$as_me:24588: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? - echo "$as_me:23136: \$? = $ac_status" >&5 - (exit $ac_status); }; }; then + echo "$as_me:24591: \$? = $ac_status" >&5 + (exit "$ac_status"); }; }; then cf_cv_chtype_decl=yes else echo "$as_me: failed program was:" >&5 -cat conftest.$ac_ext >&5 +cat "conftest.$ac_ext" >&5 cf_cv_chtype_decl=no fi -rm -f conftest.$ac_objext conftest.$ac_ext +rm -f "conftest.$ac_objext" "conftest.$ac_ext" fi -echo "$as_me:23146: result: $cf_cv_chtype_decl" >&5 +echo "$as_me:24601: result: $cf_cv_chtype_decl" >&5 echo "${ECHO_T}$cf_cv_chtype_decl" >&6 -if test $cf_cv_chtype_decl = yes ; then +if test "$cf_cv_chtype_decl" = yes ; then cat >>confdefs.h <<\EOF #define HAVE_TYPE_CHTYPE 1 EOF - echo "$as_me:23154: checking if chtype is scalar or struct" >&5 + echo "$as_me:24609: checking if chtype is scalar or struct" >&5 echo $ECHO_N "checking if chtype is scalar or struct... $ECHO_C" >&6 if test "${cf_cv_chtype_type+set}" = set; then echo $ECHO_N "(cached) $ECHO_C" >&6 else - cat >conftest.$ac_ext <<_ACEOF -#line 23161 "configure" + cat >"conftest.$ac_ext" <<_ACEOF +#line 24616 "configure" #include "confdefs.h" #include <${cf_cv_ncurses_header:-curses.h}> int main (void) { -chtype foo; long x = foo +static chtype foo; long x = foo; (void)x ; return 0; } _ACEOF -rm -f conftest.$ac_objext -if { (eval echo "$as_me:23173: \"$ac_compile\"") >&5 +rm -f "conftest.$ac_objext" +if { (eval echo "$as_me:24628: \"$ac_compile\"") >&5 (eval $ac_compile) 2>&5 ac_status=$? - echo "$as_me:23176: \$? = $ac_status" >&5 - (exit $ac_status); } && - { ac_try='test -s conftest.$ac_objext' - { (eval echo "$as_me:23179: \"$ac_try\"") >&5 + echo "$as_me:24631: \$? = $ac_status" >&5 + (exit "$ac_status"); } && + { ac_try='test -s "conftest.$ac_objext"' + { (eval echo "$as_me:24634: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? - echo "$as_me:23182: \$? = $ac_status" >&5 - (exit $ac_status); }; }; then + echo "$as_me:24637: \$? = $ac_status" >&5 + (exit "$ac_status"); }; }; then cf_cv_chtype_type=scalar else echo "$as_me: failed program was:" >&5 -cat conftest.$ac_ext >&5 +cat "conftest.$ac_ext" >&5 cf_cv_chtype_type=struct fi -rm -f conftest.$ac_objext conftest.$ac_ext +rm -f "conftest.$ac_objext" "conftest.$ac_ext" fi -echo "$as_me:23192: result: $cf_cv_chtype_type" >&5 +echo "$as_me:24647: result: $cf_cv_chtype_type" >&5 echo "${ECHO_T}$cf_cv_chtype_type" >&6 - if test $cf_cv_chtype_type = scalar ; then + if test "$cf_cv_chtype_type" = scalar ; then cat >>confdefs.h <<\EOF #define TYPE_CHTYPE_IS_SCALAR 1 @@ -23200,7 +24655,7 @@ EOF fi fi -echo "$as_me:23203: checking for wide alternate character set array" >&5 +echo "$as_me:24658: 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 @@ -23209,8 +24664,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 23213 "configure" + cat >"conftest.$ac_ext" <<_ACEOF +#line 24668 "configure" #include "confdefs.h" #ifndef _XOPEN_SOURCE_EXTENDED @@ -23220,33 +24675,33 @@ else int main (void) { -void *foo = &($name['k']) +void *foo = &(${name}['k']); (void)foo ; return 0; } _ACEOF -rm -f conftest.$ac_objext conftest$ac_exeext -if { (eval echo "$as_me:23229: \"$ac_link\"") >&5 +rm -f "conftest.$ac_objext" "conftest$ac_exeext" +if { (eval echo "$as_me:24684: \"$ac_link\"") >&5 (eval $ac_link) 2>&5 ac_status=$? - echo "$as_me:23232: \$? = $ac_status" >&5 - (exit $ac_status); } && - { ac_try='test -s conftest$ac_exeext' - { (eval echo "$as_me:23235: \"$ac_try\"") >&5 + echo "$as_me:24687: \$? = $ac_status" >&5 + (exit "$ac_status"); } && + { ac_try='test -s "conftest$ac_exeext"' + { (eval echo "$as_me:24690: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? - echo "$as_me:23238: \$? = $ac_status" >&5 - (exit $ac_status); }; }; then + echo "$as_me:24693: \$? = $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:23249: result: $cf_cv_curses_wacs_map" >&5 +echo "$as_me:24704: result: $cf_cv_curses_wacs_map" >&5 echo "${ECHO_T}$cf_cv_curses_wacs_map" >&6 test "$cf_cv_curses_wacs_map" != unknown && @@ -23254,7 +24709,7 @@ cat >>confdefs.h <<EOF #define CURSES_WACS_ARRAY $cf_cv_curses_wacs_map EOF -echo "$as_me:23257: checking for wide alternate character constants" >&5 +echo "$as_me:24712: 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 @@ -23263,8 +24718,8 @@ else cf_cv_curses_wacs_symbols=no if test "$cf_cv_curses_wacs_map" != unknown then - cat >conftest.$ac_ext <<_ACEOF -#line 23267 "configure" + cat >"conftest.$ac_ext" <<_ACEOF +#line 24722 "configure" #include "confdefs.h" #ifndef _XOPEN_SOURCE_EXTENDED @@ -23275,32 +24730,32 @@ int main (void) { cchar_t *foo = WACS_PLUS; - $cf_cv_curses_wacs_map['k'] = *WACS_PLUS + ${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:23284: \"$ac_link\"") >&5 +rm -f "conftest.$ac_objext" "conftest$ac_exeext" +if { (eval echo "$as_me:24739: \"$ac_link\"") >&5 (eval $ac_link) 2>&5 ac_status=$? - echo "$as_me:23287: \$? = $ac_status" >&5 - (exit $ac_status); } && - { ac_try='test -s conftest$ac_exeext' - { (eval echo "$as_me:23290: \"$ac_try\"") >&5 + echo "$as_me:24742: \$? = $ac_status" >&5 + (exit "$ac_status"); } && + { ac_try='test -s "conftest$ac_exeext"' + { (eval echo "$as_me:24745: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? - echo "$as_me:23293: \$? = $ac_status" >&5 - (exit $ac_status); }; }; then + echo "$as_me:24748: \$? = $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 23303 "configure" + cat >"conftest.$ac_ext" <<_ACEOF +#line 24758 "configure" #include "confdefs.h" #ifndef _XOPEN_SOURCE_EXTENDED @@ -23310,33 +24765,33 @@ else int main (void) { -cchar_t *foo = WACS_PLUS +cchar_t *foo = WACS_PLUS; (void)foo ; return 0; } _ACEOF -rm -f conftest.$ac_objext conftest$ac_exeext -if { (eval echo "$as_me:23319: \"$ac_link\"") >&5 +rm -f "conftest.$ac_objext" "conftest$ac_exeext" +if { (eval echo "$as_me:24774: \"$ac_link\"") >&5 (eval $ac_link) 2>&5 ac_status=$? - echo "$as_me:23322: \$? = $ac_status" >&5 - (exit $ac_status); } && - { ac_try='test -s conftest$ac_exeext' - { (eval echo "$as_me:23325: \"$ac_try\"") >&5 + echo "$as_me:24777: \$? = $ac_status" >&5 + (exit "$ac_status"); } && + { ac_try='test -s "conftest$ac_exeext"' + { (eval echo "$as_me:24780: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? - echo "$as_me:23328: \$? = $ac_status" >&5 - (exit $ac_status); }; }; then + echo "$as_me:24783: \$? = $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:23339: result: $cf_cv_curses_wacs_symbols" >&5 +echo "$as_me:24794: result: $cf_cv_curses_wacs_symbols" >&5 echo "${ECHO_T}$cf_cv_curses_wacs_symbols" >&6 test "$cf_cv_curses_wacs_symbols" != no && @@ -23349,10 +24804,10 @@ do cf_tr_func=`echo "$cf_func" | sed y%abcdefghijklmnopqrstuvwxyz./-%ABCDEFGHIJKLMNOPQRSTUVWXYZ___%` - echo "$as_me:23352: checking for ${cf_func}" >&5 + echo "$as_me:24807: checking for ${cf_func}" >&5 echo $ECHO_N "checking for ${cf_func}... $ECHO_C" >&6 -echo "${as_me:-configure}:23355: testing ${cf_func} ..." 1>&5 +echo "${as_me:-configure}:24810: testing ${cf_func} ..." 1>&5 if eval "test \"\${cf_cv_func_$cf_func+set}\" = set"; then echo $ECHO_N "(cached) $ECHO_C" >&6 @@ -23360,8 +24815,8 @@ else eval cf_result='$ac_cv_func_'$cf_func if test ".$cf_result" != ".no"; then - cat >conftest.$ac_ext <<_ACEOF -#line 23364 "configure" + cat >"conftest.$ac_ext" <<_ACEOF +#line 24819 "configure" #include "confdefs.h" #ifdef HAVE_XCURSES @@ -23384,7 +24839,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 @@ -23393,35 +24848,35 @@ if (foo + 1234L > 5678L) return 0; } _ACEOF -rm -f conftest.$ac_objext conftest$ac_exeext -if { (eval echo "$as_me:23397: \"$ac_link\"") >&5 +rm -f "conftest.$ac_objext" "conftest$ac_exeext" +if { (eval echo "$as_me:24852: \"$ac_link\"") >&5 (eval $ac_link) 2>&5 ac_status=$? - echo "$as_me:23400: \$? = $ac_status" >&5 - (exit $ac_status); } && - { ac_try='test -s conftest$ac_exeext' - { (eval echo "$as_me:23403: \"$ac_try\"") >&5 + echo "$as_me:24855: \$? = $ac_status" >&5 + (exit "$ac_status"); } && + { ac_try='test -s "conftest$ac_exeext"' + { (eval echo "$as_me:24858: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? - echo "$as_me:23406: \$? = $ac_status" >&5 - (exit $ac_status); }; }; then + echo "$as_me:24861: \$? = $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:23422: result: $cf_result" >&5 + echo "$as_me:24877: 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 <<EOF #define HAVE_${cf_tr_func} 1 EOF @@ -23431,40 +24886,40 @@ done if test "x$cf_cv_func_wgetparent" != xyes then - echo "$as_me:23434: checking if WINDOW has _parent member" >&5 + echo "$as_me:24889: checking if WINDOW has _parent member" >&5 echo $ECHO_N "checking if WINDOW has _parent member... $ECHO_C" >&6 - cat >conftest.$ac_ext <<_ACEOF -#line 23437 "configure" + cat >"conftest.$ac_ext" <<_ACEOF +#line 24892 "configure" #include "confdefs.h" #include <${cf_cv_ncurses_header:-curses.h}> int main (void) { -WINDOW *p = stdscr->_parent +WINDOW *p = stdscr->_parent; (void)p ; return 0; } _ACEOF -rm -f conftest.$ac_objext -if { (eval echo "$as_me:23449: \"$ac_compile\"") >&5 +rm -f "conftest.$ac_objext" +if { (eval echo "$as_me:24904: \"$ac_compile\"") >&5 (eval $ac_compile) 2>&5 ac_status=$? - echo "$as_me:23452: \$? = $ac_status" >&5 - (exit $ac_status); } && - { ac_try='test -s conftest.$ac_objext' - { (eval echo "$as_me:23455: \"$ac_try\"") >&5 + echo "$as_me:24907: \$? = $ac_status" >&5 + (exit "$ac_status"); } && + { ac_try='test -s "conftest.$ac_objext"' + { (eval echo "$as_me:24910: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? - echo "$as_me:23458: \$? = $ac_status" >&5 - (exit $ac_status); }; }; then + echo "$as_me:24913: \$? = $ac_status" >&5 + (exit "$ac_status"); }; }; then cf_window__parent=yes else echo "$as_me: failed program was:" >&5 -cat conftest.$ac_ext >&5 +cat "conftest.$ac_ext" >&5 cf_window__parent=no fi -rm -f conftest.$ac_objext conftest.$ac_ext - echo "$as_me:23467: result: $cf_window__parent" >&5 +rm -f "conftest.$ac_objext" "conftest.$ac_ext" + echo "$as_me:24922: result: $cf_window__parent" >&5 echo "${ECHO_T}$cf_window__parent" >&6 if test "$cf_window__parent" = yes then @@ -23479,24 +24934,24 @@ fi for ac_header in sys/wait.h do as_ac_Header=`echo "ac_cv_header_$ac_header" | $as_tr_sh` -echo "$as_me:23482: checking for $ac_header" >&5 +echo "$as_me:24937: 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 23488 "configure" + cat >"conftest.$ac_ext" <<_ACEOF +#line 24943 "configure" #include "confdefs.h" #include <$ac_header> _ACEOF -if { (eval echo "$as_me:23492: \"$ac_cpp conftest.$ac_ext\"") >&5 - (eval $ac_cpp conftest.$ac_ext) 2>conftest.er1 +if { (eval echo "$as_me:24947: \"$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:23498: \$? = $ac_status" >&5 - (exit $ac_status); } >/dev/null; then + echo "$as_me:24953: \$? = $ac_status" >&5 + (exit "$ac_status"); } >/dev/null; then if test -s conftest.err; then ac_cpp_err=$ac_c_preproc_warn_flag else @@ -23509,14 +24964,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:23517: 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:24972: result: `eval echo '${'"$as_ac_Header"'}'`" >&5 +echo "${ECHO_T}`eval echo '${'"$as_ac_Header"'}'`" >&6 +if test "`eval echo '${'"$as_ac_Header"'}'`" = yes; then cat >>confdefs.h <<EOF #define `echo "HAVE_$ac_header" | $as_tr_cpp` 1 EOF @@ -23526,7 +24981,7 @@ done cf_wait_headers="#include <sys/types.h> " -if test $ac_cv_header_sys_wait_h = yes; then +if test "$ac_cv_header_sys_wait_h" = yes; then cf_wait_headers="$cf_wait_headers #include <sys/wait.h> " @@ -23535,24 +24990,24 @@ else for ac_header in wait.h do as_ac_Header=`echo "ac_cv_header_$ac_header" | $as_tr_sh` -echo "$as_me:23538: checking for $ac_header" >&5 +echo "$as_me:24993: 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 23544 "configure" + cat >"conftest.$ac_ext" <<_ACEOF +#line 24999 "configure" #include "confdefs.h" #include <$ac_header> _ACEOF -if { (eval echo "$as_me:23548: \"$ac_cpp conftest.$ac_ext\"") >&5 - (eval $ac_cpp conftest.$ac_ext) 2>conftest.er1 +if { (eval echo "$as_me:25003: \"$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:23554: \$? = $ac_status" >&5 - (exit $ac_status); } >/dev/null; then + echo "$as_me:25009: \$? = $ac_status" >&5 + (exit "$ac_status"); } >/dev/null; then if test -s conftest.err; then ac_cpp_err=$ac_c_preproc_warn_flag else @@ -23565,14 +25020,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:23573: 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:25028: result: `eval echo '${'"$as_ac_Header"'}'`" >&5 +echo "${ECHO_T}`eval echo '${'"$as_ac_Header"'}'`" >&6 +if test "`eval echo '${'"$as_ac_Header"'}'`" = yes; then cat >>confdefs.h <<EOF #define `echo "HAVE_$ac_header" | $as_tr_cpp` 1 EOF @@ -23583,24 +25038,24 @@ done for ac_header in waitstatus.h do as_ac_Header=`echo "ac_cv_header_$ac_header" | $as_tr_sh` -echo "$as_me:23586: checking for $ac_header" >&5 +echo "$as_me:25041: 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 23592 "configure" + cat >"conftest.$ac_ext" <<_ACEOF +#line 25047 "configure" #include "confdefs.h" #include <$ac_header> _ACEOF -if { (eval echo "$as_me:23596: \"$ac_cpp conftest.$ac_ext\"") >&5 - (eval $ac_cpp conftest.$ac_ext) 2>conftest.er1 +if { (eval echo "$as_me:25051: \"$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:23602: \$? = $ac_status" >&5 - (exit $ac_status); } >/dev/null; then + echo "$as_me:25057: \$? = $ac_status" >&5 + (exit "$ac_status"); } >/dev/null; then if test -s conftest.err; then ac_cpp_err=$ac_c_preproc_warn_flag else @@ -23613,14 +25068,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:23621: 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:25076: result: `eval echo '${'"$as_ac_Header"'}'`" >&5 +echo "${ECHO_T}`eval echo '${'"$as_ac_Header"'}'`" >&6 +if test "`eval echo '${'"$as_ac_Header"'}'`" = yes; then cat >>confdefs.h <<EOF #define `echo "HAVE_$ac_header" | $as_tr_cpp` 1 EOF @@ -23628,26 +25083,26 @@ EOF fi done -if test $ac_cv_header_wait_h = yes; then +if test "$ac_cv_header_wait_h" = yes; then cf_wait_headers="$cf_wait_headers #include <wait.h> " fi -if test $ac_cv_header_waitstatus_h = yes; then +if test "$ac_cv_header_waitstatus_h" = yes; then cf_wait_headers="$cf_wait_headers #include <waitstatus.h> " fi fi -echo "$as_me:23643: checking for union wait" >&5 +echo "$as_me:25098: checking for union wait" >&5 echo $ECHO_N "checking for union wait... $ECHO_C" >&6 if test "${cf_cv_type_unionwait+set}" = set; then echo $ECHO_N "(cached) $ECHO_C" >&6 else - cat >conftest.$ac_ext <<_ACEOF -#line 23650 "configure" + cat >"conftest.$ac_ext" <<_ACEOF +#line 25105 "configure" #include "confdefs.h" $cf_wait_headers int @@ -23657,32 +25112,35 @@ int x; int y = WEXITSTATUS(x); int z = WTERMSIG(x); wait(&x); + (void)x; + (void)y; + (void)z; ; return 0; } _ACEOF -rm -f conftest.$ac_objext conftest$ac_exeext -if { (eval echo "$as_me:23666: \"$ac_link\"") >&5 +rm -f "conftest.$ac_objext" "conftest$ac_exeext" +if { (eval echo "$as_me:25124: \"$ac_link\"") >&5 (eval $ac_link) 2>&5 ac_status=$? - echo "$as_me:23669: \$? = $ac_status" >&5 - (exit $ac_status); } && - { ac_try='test -s conftest$ac_exeext' - { (eval echo "$as_me:23672: \"$ac_try\"") >&5 + echo "$as_me:25127: \$? = $ac_status" >&5 + (exit "$ac_status"); } && + { ac_try='test -s "conftest$ac_exeext"' + { (eval echo "$as_me:25130: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? - echo "$as_me:23675: \$? = $ac_status" >&5 - (exit $ac_status); }; }; then + echo "$as_me:25133: \$? = $ac_status" >&5 + (exit "$ac_status"); }; }; then cf_cv_type_unionwait=no echo compiles ok w/o union wait 1>&5 else echo "$as_me: failed program was:" >&5 -cat conftest.$ac_ext >&5 +cat "conftest.$ac_ext" >&5 - cat >conftest.$ac_ext <<_ACEOF -#line 23685 "configure" + cat >"conftest.$ac_ext" <<_ACEOF +#line 25143 "configure" #include "confdefs.h" $cf_wait_headers int @@ -23696,53 +25154,60 @@ union wait x; int z = WTERMSIG(x); #endif wait(&x); + (void)x; +#ifdef WEXITSTATUS + (void)y; +#endif +#ifdef WTERMSIG + (void)z; +#endif ; return 0; } _ACEOF -rm -f conftest.$ac_objext conftest$ac_exeext -if { (eval echo "$as_me:23705: \"$ac_link\"") >&5 +rm -f "conftest.$ac_objext" "conftest$ac_exeext" +if { (eval echo "$as_me:25170: \"$ac_link\"") >&5 (eval $ac_link) 2>&5 ac_status=$? - echo "$as_me:23708: \$? = $ac_status" >&5 - (exit $ac_status); } && - { ac_try='test -s conftest$ac_exeext' - { (eval echo "$as_me:23711: \"$ac_try\"") >&5 + echo "$as_me:25173: \$? = $ac_status" >&5 + (exit "$ac_status"); } && + { ac_try='test -s "conftest$ac_exeext"' + { (eval echo "$as_me:25176: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? - echo "$as_me:23714: \$? = $ac_status" >&5 - (exit $ac_status); }; }; then + echo "$as_me:25179: \$? = $ac_status" >&5 + (exit "$ac_status"); }; }; then cf_cv_type_unionwait=yes echo compiles ok with union wait and possibly macros too 1>&5 else echo "$as_me: failed program was:" >&5 -cat conftest.$ac_ext >&5 +cat "conftest.$ac_ext" >&5 cf_cv_type_unionwait=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_exeext conftest.$ac_ext +rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext" fi -echo "$as_me:23729: result: $cf_cv_type_unionwait" >&5 +echo "$as_me:25194: result: $cf_cv_type_unionwait" >&5 echo "${ECHO_T}$cf_cv_type_unionwait" >&6 -test $cf_cv_type_unionwait = yes && +test "$cf_cv_type_unionwait" = yes && cat >>confdefs.h <<\EOF #define HAVE_TYPE_UNIONWAIT 1 EOF -if test $cf_cv_type_unionwait = yes; then +if test "$cf_cv_type_unionwait" = yes; then - echo "$as_me:23738: checking if union wait can be used as wait-arg" >&5 + echo "$as_me:25203: checking if union wait can be used as wait-arg" >&5 echo $ECHO_N "checking if union wait can be used as wait-arg... $ECHO_C" >&6 if test "${cf_cv_arg_union_wait+set}" = set; then echo $ECHO_N "(cached) $ECHO_C" >&6 else - cat >conftest.$ac_ext <<_ACEOF -#line 23745 "configure" + cat >"conftest.$ac_ext" <<_ACEOF +#line 25210 "configure" #include "confdefs.h" $cf_wait_headers int @@ -23753,43 +25218,43 @@ union wait x; wait(&x) return 0; } _ACEOF -rm -f conftest.$ac_objext -if { (eval echo "$as_me:23757: \"$ac_compile\"") >&5 +rm -f "conftest.$ac_objext" +if { (eval echo "$as_me:25222: \"$ac_compile\"") >&5 (eval $ac_compile) 2>&5 ac_status=$? - echo "$as_me:23760: \$? = $ac_status" >&5 - (exit $ac_status); } && - { ac_try='test -s conftest.$ac_objext' - { (eval echo "$as_me:23763: \"$ac_try\"") >&5 + echo "$as_me:25225: \$? = $ac_status" >&5 + (exit "$ac_status"); } && + { ac_try='test -s "conftest.$ac_objext"' + { (eval echo "$as_me:25228: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? - echo "$as_me:23766: \$? = $ac_status" >&5 - (exit $ac_status); }; }; then + echo "$as_me:25231: \$? = $ac_status" >&5 + (exit "$ac_status"); }; }; then cf_cv_arg_union_wait=yes else echo "$as_me: failed program was:" >&5 -cat conftest.$ac_ext >&5 +cat "conftest.$ac_ext" >&5 cf_cv_arg_union_wait=no fi -rm -f conftest.$ac_objext conftest.$ac_ext +rm -f "conftest.$ac_objext" "conftest.$ac_ext" fi - echo "$as_me:23778: result: $cf_cv_arg_union_wait" >&5 + echo "$as_me:25243: result: $cf_cv_arg_union_wait" >&5 echo "${ECHO_T}$cf_cv_arg_union_wait" >&6 - test $cf_cv_arg_union_wait = yes && + test "$cf_cv_arg_union_wait" = yes && cat >>confdefs.h <<\EOF #define WAIT_USES_UNION 1 EOF - echo "$as_me:23785: checking if union wait can be used as waitpid-arg" >&5 + echo "$as_me:25250: checking if union wait can be used as waitpid-arg" >&5 echo $ECHO_N "checking if union wait can be used as waitpid-arg... $ECHO_C" >&6 if test "${cf_cv_arg_union_waitpid+set}" = set; then echo $ECHO_N "(cached) $ECHO_C" >&6 else - cat >conftest.$ac_ext <<_ACEOF -#line 23792 "configure" + cat >"conftest.$ac_ext" <<_ACEOF +#line 25257 "configure" #include "confdefs.h" $cf_wait_headers int @@ -23800,45 +25265,45 @@ union wait x; waitpid(0, &x, 0) return 0; } _ACEOF -rm -f conftest.$ac_objext -if { (eval echo "$as_me:23804: \"$ac_compile\"") >&5 +rm -f "conftest.$ac_objext" +if { (eval echo "$as_me:25269: \"$ac_compile\"") >&5 (eval $ac_compile) 2>&5 ac_status=$? - echo "$as_me:23807: \$? = $ac_status" >&5 - (exit $ac_status); } && - { ac_try='test -s conftest.$ac_objext' - { (eval echo "$as_me:23810: \"$ac_try\"") >&5 + echo "$as_me:25272: \$? = $ac_status" >&5 + (exit "$ac_status"); } && + { ac_try='test -s "conftest.$ac_objext"' + { (eval echo "$as_me:25275: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? - echo "$as_me:23813: \$? = $ac_status" >&5 - (exit $ac_status); }; }; then + echo "$as_me:25278: \$? = $ac_status" >&5 + (exit "$ac_status"); }; }; then cf_cv_arg_union_waitpid=yes else echo "$as_me: failed program was:" >&5 -cat conftest.$ac_ext >&5 +cat "conftest.$ac_ext" >&5 cf_cv_arg_union_waitpid=no fi -rm -f conftest.$ac_objext conftest.$ac_ext +rm -f "conftest.$ac_objext" "conftest.$ac_ext" fi - echo "$as_me:23825: result: $cf_cv_arg_union_waitpid" >&5 + echo "$as_me:25290: result: $cf_cv_arg_union_waitpid" >&5 echo "${ECHO_T}$cf_cv_arg_union_waitpid" >&6 - test $cf_cv_arg_union_waitpid = yes && + test "$cf_cv_arg_union_waitpid" = yes && cat >>confdefs.h <<\EOF #define WAITPID_USES_UNION 1 EOF fi -echo "$as_me:23834: checking if we must include wchar.h to declare mbstate_t" >&5 +echo "$as_me:25299: 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 23841 "configure" +cat >"conftest.$ac_ext" <<_ACEOF +#line 25306 "configure" #include "confdefs.h" #include <stdlib.h> @@ -23849,29 +25314,29 @@ cat >conftest.$ac_ext <<_ACEOF int main (void) { -mbstate_t state +mbstate_t state; (void)state ; return 0; } _ACEOF -rm -f conftest.$ac_objext -if { (eval echo "$as_me:23858: \"$ac_compile\"") >&5 +rm -f "conftest.$ac_objext" +if { (eval echo "$as_me:25323: \"$ac_compile\"") >&5 (eval $ac_compile) 2>&5 ac_status=$? - echo "$as_me:23861: \$? = $ac_status" >&5 - (exit $ac_status); } && - { ac_try='test -s conftest.$ac_objext' - { (eval echo "$as_me:23864: \"$ac_try\"") >&5 + echo "$as_me:25326: \$? = $ac_status" >&5 + (exit "$ac_status"); } && + { ac_try='test -s "conftest.$ac_objext"' + { (eval echo "$as_me:25329: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? - echo "$as_me:23867: \$? = $ac_status" >&5 - (exit $ac_status); }; }; then + echo "$as_me:25332: \$? = $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 23874 "configure" +cat "conftest.$ac_ext" >&5 +cat >"conftest.$ac_ext" <<_ACEOF +#line 25339 "configure" #include "confdefs.h" #include <stdlib.h> @@ -23883,34 +25348,34 @@ cat >conftest.$ac_ext <<_ACEOF int main (void) { -mbstate_t value +mbstate_t value; (void)value ; return 0; } _ACEOF -rm -f conftest.$ac_objext -if { (eval echo "$as_me:23892: \"$ac_compile\"") >&5 +rm -f "conftest.$ac_objext" +if { (eval echo "$as_me:25357: \"$ac_compile\"") >&5 (eval $ac_compile) 2>&5 ac_status=$? - echo "$as_me:23895: \$? = $ac_status" >&5 - (exit $ac_status); } && - { ac_try='test -s conftest.$ac_objext' - { (eval echo "$as_me:23898: \"$ac_try\"") >&5 + echo "$as_me:25360: \$? = $ac_status" >&5 + (exit "$ac_status"); } && + { ac_try='test -s "conftest.$ac_objext"' + { (eval echo "$as_me:25363: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? - echo "$as_me:23901: \$? = $ac_status" >&5 - (exit $ac_status); }; }; then + echo "$as_me:25366: \$? = $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:23913: result: $cf_cv_mbstate_t" >&5 +echo "$as_me:25378: result: $cf_cv_mbstate_t" >&5 echo "${ECHO_T}$cf_cv_mbstate_t" >&6 if test "$cf_cv_mbstate_t" = yes ; then @@ -23938,24 +25403,24 @@ sys/termio.h \ do as_ac_Header=`echo "ac_cv_header_$ac_header" | $as_tr_sh` -echo "$as_me:23941: checking for $ac_header" >&5 +echo "$as_me:25406: 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 23947 "configure" + cat >"conftest.$ac_ext" <<_ACEOF +#line 25412 "configure" #include "confdefs.h" #include <$ac_header> _ACEOF -if { (eval echo "$as_me:23951: \"$ac_cpp conftest.$ac_ext\"") >&5 - (eval $ac_cpp conftest.$ac_ext) 2>conftest.er1 +if { (eval echo "$as_me:25416: \"$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:23957: \$? = $ac_status" >&5 - (exit $ac_status); } >/dev/null; then + echo "$as_me:25422: \$? = $ac_status" >&5 + (exit "$ac_status"); } >/dev/null; then if test -s conftest.err; then ac_cpp_err=$ac_c_preproc_warn_flag else @@ -23968,14 +25433,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:23976: 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:25441: result: `eval echo '${'"$as_ac_Header"'}'`" >&5 +echo "${ECHO_T}`eval echo '${'"$as_ac_Header"'}'`" >&6 +if test "`eval echo '${'"$as_ac_Header"'}'`" = yes; then cat >>confdefs.h <<EOF #define `echo "HAVE_$ac_header" | $as_tr_cpp` 1 EOF @@ -23990,39 +25455,39 @@ if test "$ac_cv_header_termios_h" = yes ; then (*) termios_bad=maybe ;; esac if test "$termios_bad" = maybe ; then - echo "$as_me:23993: checking whether termios.h needs _POSIX_SOURCE" >&5 + echo "$as_me:25458: checking whether termios.h needs _POSIX_SOURCE" >&5 echo $ECHO_N "checking whether termios.h needs _POSIX_SOURCE... $ECHO_C" >&6 - cat >conftest.$ac_ext <<_ACEOF -#line 23996 "configure" + cat >"conftest.$ac_ext" <<_ACEOF +#line 25461 "configure" #include "confdefs.h" #include <termios.h> int main (void) { -struct termios foo; int x = foo.c_iflag +struct termios foo; int x = foo.c_iflag = 1; (void)x ; return 0; } _ACEOF -rm -f conftest.$ac_objext -if { (eval echo "$as_me:24008: \"$ac_compile\"") >&5 +rm -f "conftest.$ac_objext" +if { (eval echo "$as_me:25473: \"$ac_compile\"") >&5 (eval $ac_compile) 2>&5 ac_status=$? - echo "$as_me:24011: \$? = $ac_status" >&5 - (exit $ac_status); } && - { ac_try='test -s conftest.$ac_objext' - { (eval echo "$as_me:24014: \"$ac_try\"") >&5 + echo "$as_me:25476: \$? = $ac_status" >&5 + (exit "$ac_status"); } && + { ac_try='test -s "conftest.$ac_objext"' + { (eval echo "$as_me:25479: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? - echo "$as_me:24017: \$? = $ac_status" >&5 - (exit $ac_status); }; }; then + echo "$as_me:25482: \$? = $ac_status" >&5 + (exit "$ac_status"); }; }; then termios_bad=no else echo "$as_me: failed program was:" >&5 -cat conftest.$ac_ext >&5 +cat "conftest.$ac_ext" >&5 - cat >conftest.$ac_ext <<_ACEOF -#line 24025 "configure" + cat >"conftest.$ac_ext" <<_ACEOF +#line 25490 "configure" #include "confdefs.h" #define _POSIX_SOURCE @@ -24030,43 +25495,43 @@ cat conftest.$ac_ext >&5 int main (void) { -struct termios foo; int x = foo.c_iflag +struct termios foo; int x = foo.c_iflag = 2; (void)x ; return 0; } _ACEOF -rm -f conftest.$ac_objext -if { (eval echo "$as_me:24039: \"$ac_compile\"") >&5 +rm -f "conftest.$ac_objext" +if { (eval echo "$as_me:25504: \"$ac_compile\"") >&5 (eval $ac_compile) 2>&5 ac_status=$? - echo "$as_me:24042: \$? = $ac_status" >&5 - (exit $ac_status); } && - { ac_try='test -s conftest.$ac_objext' - { (eval echo "$as_me:24045: \"$ac_try\"") >&5 + echo "$as_me:25507: \$? = $ac_status" >&5 + (exit "$ac_status"); } && + { ac_try='test -s "conftest.$ac_objext"' + { (eval echo "$as_me:25510: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? - echo "$as_me:24048: \$? = $ac_status" >&5 - (exit $ac_status); }; }; then + echo "$as_me:25513: \$? = $ac_status" >&5 + (exit "$ac_status"); }; }; then termios_bad=unknown else echo "$as_me: failed program was:" >&5 -cat conftest.$ac_ext >&5 +cat "conftest.$ac_ext" >&5 termios_bad=yes cat >>confdefs.h <<\EOF #define _POSIX_SOURCE 1 EOF 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 - echo "$as_me:24064: result: $termios_bad" >&5 +rm -f "conftest.$ac_objext" "conftest.$ac_ext" + echo "$as_me:25529: result: $termios_bad" >&5 echo "${ECHO_T}$termios_bad" >&6 fi fi -echo "$as_me:24069: checking declaration of size-change" >&5 +echo "$as_me:25534: checking declaration of size-change" >&5 echo $ECHO_N "checking declaration of size-change... $ECHO_C" >&6 if test "${cf_cv_sizechange+set}" = set; then echo $ECHO_N "(cached) $ECHO_C" >&6 @@ -24086,8 +25551,8 @@ do CPPFLAGS="${CPPFLAGS}-D$cf_opts" fi - cat >conftest.$ac_ext <<_ACEOF -#line 24090 "configure" + cat >"conftest.$ac_ext" <<_ACEOF +#line 25555 "configure" #include "confdefs.h" #include <sys/types.h> #ifdef HAVE_TERMIOS_H @@ -24116,13 +25581,17 @@ main (void) #ifdef TIOCGSIZE struct ttysize win; /* SunOS 3.0... */ - int y = win.ts_lines; - int x = win.ts_cols; + int y = win.ts_lines = 2; + int x = win.ts_cols = 1; + (void)y; + (void)x; #else #ifdef TIOCGWINSZ struct winsize win; /* everything else */ - int y = win.ws_row; - int x = win.ws_col; + int y = win.ws_row = 2; + int x = win.ws_col = 1; + (void)y; + (void)x; #else no TIOCGSIZE or TIOCGWINSZ #endif /* TIOCGWINSZ */ @@ -24132,25 +25601,25 @@ main (void) return 0; } _ACEOF -rm -f conftest.$ac_objext -if { (eval echo "$as_me:24136: \"$ac_compile\"") >&5 +rm -f "conftest.$ac_objext" +if { (eval echo "$as_me:25605: \"$ac_compile\"") >&5 (eval $ac_compile) 2>&5 ac_status=$? - echo "$as_me:24139: \$? = $ac_status" >&5 - (exit $ac_status); } && - { ac_try='test -s conftest.$ac_objext' - { (eval echo "$as_me:24142: \"$ac_try\"") >&5 + echo "$as_me:25608: \$? = $ac_status" >&5 + (exit "$ac_status"); } && + { ac_try='test -s "conftest.$ac_objext"' + { (eval echo "$as_me:25611: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? - echo "$as_me:24145: \$? = $ac_status" >&5 - (exit $ac_status); }; }; then + echo "$as_me:25614: \$? = $ac_status" >&5 + (exit "$ac_status"); }; }; then cf_cv_sizechange=yes else echo "$as_me: failed program was:" >&5 -cat conftest.$ac_ext >&5 +cat "conftest.$ac_ext" >&5 cf_cv_sizechange=no fi -rm -f conftest.$ac_objext conftest.$ac_ext +rm -f "conftest.$ac_objext" "conftest.$ac_ext" CPPFLAGS="$cf_save_CPPFLAGS" if test "$cf_cv_sizechange" = yes ; then @@ -24161,7 +25630,7 @@ rm -f conftest.$ac_objext conftest.$ac_ext done fi -echo "$as_me:24164: result: $cf_cv_sizechange" >&5 +echo "$as_me:25633: result: $cf_cv_sizechange" >&5 echo "${ECHO_T}$cf_cv_sizechange" >&6 if test "$cf_cv_sizechange" != no ; then @@ -24169,7 +25638,7 @@ cat >>confdefs.h <<\EOF #define HAVE_SIZECHANGE 1 EOF - case $cf_cv_sizechange in + case "$cf_cv_sizechange" in (NEED*) cat >>confdefs.h <<EOF #define $cf_cv_sizechange 1 @@ -24184,8 +25653,8 @@ PACKAGE_CONFIG=dlg_config.h EXTRA_OUTPUT="$EXTRA_OUTPUT headers-sh:$srcdir/headers-sh.in" -cat >conftest.$ac_ext <<_ACEOF -#line 24188 "configure" +cat >"conftest.$ac_ext" <<_ACEOF +#line 25657 "configure" #include "confdefs.h" #include <locale.h> int @@ -24196,18 +25665,18 @@ setlocale(LC_ALL, "") return 0; } _ACEOF -rm -f conftest.$ac_objext conftest$ac_exeext -if { (eval echo "$as_me:24200: \"$ac_link\"") >&5 +rm -f "conftest.$ac_objext" "conftest$ac_exeext" +if { (eval echo "$as_me:25669: \"$ac_link\"") >&5 (eval $ac_link) 2>&5 ac_status=$? - echo "$as_me:24203: \$? = $ac_status" >&5 - (exit $ac_status); } && - { ac_try='test -s conftest$ac_exeext' - { (eval echo "$as_me:24206: \"$ac_try\"") >&5 + echo "$as_me:25672: \$? = $ac_status" >&5 + (exit "$ac_status"); } && + { ac_try='test -s "conftest$ac_exeext"' + { (eval echo "$as_me:25675: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? - echo "$as_me:24209: \$? = $ac_status" >&5 - (exit $ac_status); }; }; then + echo "$as_me:25678: \$? = $ac_status" >&5 + (exit "$ac_status"); }; }; then cat >>confdefs.h <<\EOF #define HAVE_SETLOCALE 1 @@ -24215,18 +25684,18 @@ EOF 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" -echo "$as_me:24222: checking if runtime has nl_langinfo support for first weekday" >&5 +echo "$as_me:25691: checking if runtime has nl_langinfo support for first weekday" >&5 echo $ECHO_N "checking if runtime has nl_langinfo support for first weekday... $ECHO_C" >&6 if test "${cf_nl_langinfo_1stday+set}" = set; then echo $ECHO_N "(cached) $ECHO_C" >&6 else - cat >conftest.$ac_ext <<_ACEOF -#line 24229 "configure" + cat >"conftest.$ac_ext" <<_ACEOF +#line 25698 "configure" #include "confdefs.h" #include <langinfo.h> @@ -24238,41 +25707,53 @@ main (void) int first_weekday = nl_langinfo (_NL_TIME_FIRST_WEEKDAY)[0]; long week_1stday_l = (long) nl_langinfo (_NL_TIME_WEEK_1STDAY); + (void) first_weekday; + (void) week_1stday_l; ; return 0; } _ACEOF -rm -f conftest.$ac_objext -if { (eval echo "$as_me:24247: \"$ac_compile\"") >&5 +rm -f "conftest.$ac_objext" +if { (eval echo "$as_me:25718: \"$ac_compile\"") >&5 (eval $ac_compile) 2>&5 ac_status=$? - echo "$as_me:24250: \$? = $ac_status" >&5 - (exit $ac_status); } && - { ac_try='test -s conftest.$ac_objext' - { (eval echo "$as_me:24253: \"$ac_try\"") >&5 + echo "$as_me:25721: \$? = $ac_status" >&5 + (exit "$ac_status"); } && + { ac_try='test -s "conftest.$ac_objext"' + { (eval echo "$as_me:25724: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? - echo "$as_me:24256: \$? = $ac_status" >&5 - (exit $ac_status); }; }; then + echo "$as_me:25727: \$? = $ac_status" >&5 + (exit "$ac_status"); }; }; then cf_nl_langinfo_1stday=yes else echo "$as_me: failed program was:" >&5 -cat conftest.$ac_ext >&5 +cat "conftest.$ac_ext" >&5 cf_nl_langinfo_1stday=no fi -rm -f conftest.$ac_objext conftest.$ac_ext +rm -f "conftest.$ac_objext" "conftest.$ac_ext" fi -echo "$as_me:24269: result: $cf_nl_langinfo_1stday" >&5 +echo "$as_me:25740: result: $cf_nl_langinfo_1stday" >&5 echo "${ECHO_T}$cf_nl_langinfo_1stday" >&6 -test "x$cf_nl_langinfo_1stday" = xyes && cat >>confdefs.h <<\EOF +test "x$cf_nl_langinfo_1stday" = xyes && +cat >>confdefs.h <<\EOF #define HAVE_NL_LANGINFO_1STDAY 1 EOF -echo "$as_me:24275: checking if rpath-hack should be disabled" >&5 +if test "$GCC" = yes || test "$GXX" = yes +then + + test -n "$CFLAGS" && CFLAGS="$CFLAGS " + CFLAGS="${CFLAGS}$EXTRA_CFLAGS" + + EXTRA_CFLAGS= +fi + +echo "$as_me:25756: 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. @@ -24280,30 +25761,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:24292: 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:25774: 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:24296: checking for updated LDFLAGS" >&5 +if test "$enable_rpath_hack" = yes ; then + +echo "$as_me:25779: 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:24299: result: maybe" >&5 + echo "$as_me:25782: 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:24306: checking for $ac_word" >&5 +echo "$as_me:25789: 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 @@ -24318,7 +25801,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:24321: found $ac_dir/$ac_word" >&5 +echo "$as_me:25804: found $ac_dir/$ac_word" >&5 break done @@ -24326,10 +25809,10 @@ fi fi cf_ldd_prog=$ac_cv_prog_cf_ldd_prog if test -n "$cf_ldd_prog"; then - echo "$as_me:24329: result: $cf_ldd_prog" >&5 + echo "$as_me:25812: result: $cf_ldd_prog" >&5 echo "${ECHO_T}$cf_ldd_prog" >&6 else - echo "$as_me:24332: result: no" >&5 + echo "$as_me:25815: result: no" >&5 echo "${ECHO_T}no" >&6 fi @@ -24342,8 +25825,8 @@ test -n "$cf_ldd_prog" || cf_ldd_prog="no" then cf_rpath_oops= -cat >conftest.$ac_ext <<_ACEOF -#line 24346 "configure" +cat >"conftest.$ac_ext" <<_ACEOF +#line 25829 "configure" #include "confdefs.h" #include <stdio.h> int @@ -24354,25 +25837,25 @@ printf("Hello"); return 0; } _ACEOF -rm -f conftest.$ac_objext conftest$ac_exeext -if { (eval echo "$as_me:24358: \"$ac_link\"") >&5 +rm -f "conftest.$ac_objext" "conftest$ac_exeext" +if { (eval echo "$as_me:25841: \"$ac_link\"") >&5 (eval $ac_link) 2>&5 ac_status=$? - echo "$as_me:24361: \$? = $ac_status" >&5 - (exit $ac_status); } && - { ac_try='test -s conftest$ac_exeext' - { (eval echo "$as_me:24364: \"$ac_try\"") >&5 + echo "$as_me:25844: \$? = $ac_status" >&5 + (exit "$ac_status"); } && + { ac_try='test -s "conftest$ac_exeext"' + { (eval echo "$as_me:25847: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? - echo "$as_me:24367: \$? = $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:25850: \$? = $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 @@ -24388,11 +25871,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}:24395: testing ...adding -L$cf_rpath_dir/lib to LDFLAGS for $cf_rpath_src ..." 1>&5 +echo "${as_me:-configure}:25878: testing ...adding -L$cf_rpath_dir/lib to LDFLAGS for $cf_rpath_src ..." 1>&5 LDFLAGS="$LDFLAGS -L$cf_rpath_dir/lib" break @@ -24404,16 +25887,16 @@ echo "${as_me:-configure}:24395: testing ...adding -L$cf_rpath_dir/lib to LDFLAG test -n "$verbose" && echo " ...checking EXTRA_LDFLAGS $EXTRA_LDFLAGS" 1>&6 -echo "${as_me:-configure}:24407: testing ...checking EXTRA_LDFLAGS $EXTRA_LDFLAGS ..." 1>&5 +echo "${as_me:-configure}:25890: testing ...checking EXTRA_LDFLAGS $EXTRA_LDFLAGS ..." 1>&5 test -n "$verbose" && echo " ...checking LDFLAGS $LDFLAGS" 1>&6 -echo "${as_me:-configure}:24411: testing ...checking LDFLAGS $LDFLAGS ..." 1>&5 +echo "${as_me:-configure}:25894: 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 @@ -24445,7 +25928,7 @@ do then test -n "$verbose" && echo " ...Filter $cf_rpath_src ->$cf_rpath_tmp" 1>&6 -echo "${as_me:-configure}:24448: testing ...Filter $cf_rpath_src ->$cf_rpath_tmp ..." 1>&5 +echo "${as_me:-configure}:25931: testing ...Filter $cf_rpath_src ->$cf_rpath_tmp ..." 1>&5 EXTRA_LDFLAGS="$cf_rpath_tmp $EXTRA_LDFLAGS" fi @@ -24458,16 +25941,16 @@ LDFLAGS=$cf_rpath_dst test -n "$verbose" && echo " ...checked LDFLAGS $LDFLAGS" 1>&6 -echo "${as_me:-configure}:24461: testing ...checked LDFLAGS $LDFLAGS ..." 1>&5 +echo "${as_me:-configure}:25944: testing ...checked LDFLAGS $LDFLAGS ..." 1>&5 test -n "$verbose" && echo " ...checking LIBS $LIBS" 1>&6 -echo "${as_me:-configure}:24465: testing ...checking LIBS $LIBS ..." 1>&5 +echo "${as_me:-configure}:25948: 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 @@ -24499,7 +25982,7 @@ do then test -n "$verbose" && echo " ...Filter $cf_rpath_src ->$cf_rpath_tmp" 1>&6 -echo "${as_me:-configure}:24502: testing ...Filter $cf_rpath_src ->$cf_rpath_tmp ..." 1>&5 +echo "${as_me:-configure}:25985: testing ...Filter $cf_rpath_src ->$cf_rpath_tmp ..." 1>&5 EXTRA_LDFLAGS="$cf_rpath_tmp $EXTRA_LDFLAGS" fi @@ -24512,14 +25995,14 @@ LIBS=$cf_rpath_dst test -n "$verbose" && echo " ...checked LIBS $LIBS" 1>&6 -echo "${as_me:-configure}:24515: testing ...checked LIBS $LIBS ..." 1>&5 +echo "${as_me:-configure}:25998: testing ...checked LIBS $LIBS ..." 1>&5 test -n "$verbose" && echo " ...checked EXTRA_LDFLAGS $EXTRA_LDFLAGS" 1>&6 -echo "${as_me:-configure}:24519: testing ...checked EXTRA_LDFLAGS $EXTRA_LDFLAGS ..." 1>&5 +echo "${as_me:-configure}:26002: testing ...checked EXTRA_LDFLAGS $EXTRA_LDFLAGS ..." 1>&5 else - echo "$as_me:24522: result: no" >&5 + echo "$as_me:26005: result: no" >&5 echo "${ECHO_T}no" >&6 fi @@ -24552,6 +26035,75 @@ LIB_TARGET = $LIB_TARGET\\ RM_SHARED_OPTS = $RM_SHARED_OPTS\\ # end CF__DEFINE_SHLIB_VARS" +echo "$as_me:26038: checking for linker search path" >&5 +echo $ECHO_N "checking for linker search path... $ECHO_C" >&6 +if test "${cf_cv_ld_searchpath+set}" = set; then + echo $ECHO_N "(cached) $ECHO_C" >&6 +else + +if test "$cross_compiling" != yes ; then + +# GNU binutils' ld does not involve permissions which may stop ldconfig. +cf_pathlist=`ld --verbose 2>/dev/null | grep SEARCH_DIR | sed -e 's,SEARCH_DIR[("=][("=]*,,g' -e 's/"[)];//gp' | sort -u` + +# The -NX options tell newer versions of Linux ldconfig to not attempt to +# update the cache, which makes it run faster. +test -z "$cf_pathlist" && \ + cf_pathlist=`ldconfig -NX -v 2>/dev/null | sed -e '/^[ ]/d' -e 's/:$//' | sort -u` + +test -z "$cf_pathlist" && + cf_pathlist=`ldconfig -v 2>/dev/null | sed -n -e '/^[ ]/d' -e 's/:$//p' | sort -u` + +# This works with OpenBSD 6.5, which lists only filenames +test -z "$cf_pathlist" && + cf_pathlist=`ldconfig -v 2>/dev/null | sed -n -e 's,^Adding \(.*\)/.*$,\1,p' | sort -u` + +if test -z "$cf_pathlist" +then + # dyld default path with MacOS + if test -f /usr/bin/otool && test "x`uname -s`" = xDarwin + then + # do this to bypass check + cf_cv_ld_searchpath='$HOME/lib' + cf_pathlist="/usr/local/lib /lib /usr/lib" + fi +fi + +if test -z "$cf_pathlist" +then + # Solaris is hardcoded + if test -d /opt/SUNWspro/lib + then + cf_pathlist="/opt/SUNWspro/lib /usr/ccs/lib /usr/lib" + elif test -d /usr/ccs/lib + then + cf_pathlist="/usr/ccs/lib /usr/lib" + fi +fi + +fi + +# If nothing else, assume it is conventional +test -z "$cf_pathlist" && cf_pathlist="/usr/lib /lib" + +# Finally, check that this is only directories +for cf_path in $0 $cf_pathlist +do + if test -d "$cf_path"; then + test -n "$cf_cv_ld_searchpath" && cf_cv_ld_searchpath="${cf_cv_ld_searchpath} " + cf_cv_ld_searchpath="${cf_cv_ld_searchpath}${cf_path}" + fi +done + +# Ensure that it is nonempty +test -z "$cf_cv_ld_searchpath" && cf_cv_ld_searchpath=/usr/lib + +fi +echo "$as_me:26102: result: $cf_cv_ld_searchpath" >&5 +echo "${ECHO_T}$cf_cv_ld_searchpath" >&6 + +LD_SEARCHPATH=`echo "$cf_cv_ld_searchpath"|sed -e 's/ /|/g'` + ac_config_files="$ac_config_files dialog-config makefile $EXTRA_OUTPUT $SUB_MAKEFILE" ac_config_commands="$ac_config_commands default" cat >confcache <<\_ACEOF @@ -24630,12 +26182,12 @@ 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:24636: creating $CONFIG_STATUS" >&5 +{ echo "$as_me:26188: 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. @@ -24646,9 +26198,11 @@ debug=false SHELL=\${CONFIG_SHELL-$SHELL} ac_cs_invocation="\$0 \$@" +CLICOLOR_FORCE= GREP_OPTIONS= +unset CLICOLOR_FORCE GREP_OPTIONS _ACEOF -cat >>$CONFIG_STATUS <<\_ACEOF +cat >>"$CONFIG_STATUS" <<\_ACEOF # Be Bourne compatible if test -n "${ZSH_VERSION+set}" && (emulate sh) >/dev/null 2>&1; then emulate sh @@ -24688,9 +26242,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. @@ -24718,22 +26272,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 @@ -24762,21 +26316,22 @@ $config_commands Report bugs to <dickey@invisible-island.net>." EOF -cat >>$CONFIG_STATUS <<EOF +cat >>"$CONFIG_STATUS" <<EOF ac_cs_version="\\ config.status -configured by $0, generated by GNU Autoconf 2.52.20170501, +configured by $0, generated by GNU Autoconf 2.52.20210105, with options \\"`echo "$ac_configure_args" | sed 's/[\\""\`\$]/\\\\&/g'`\\" +Copyright 2003-2020,2021 Thomas E. Dickey Copyright 1992, 1993, 1994, 1995, 1996, 1998, 1999, 2000, 2001 Free Software Foundation, Inc. This config.status script is free software; the Free Software Foundation gives unlimited permission to copy, distribute and modify it." -srcdir=$srcdir +srcdir="$srcdir" INSTALL="$INSTALL" EOF -cat >>$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=: @@ -24799,17 +26354,17 @@ do case $1 in # Handling of the options. EOF -cat >>$CONFIG_STATUS <<EOF +cat >>"$CONFIG_STATUS" <<EOF -recheck | --recheck | --rechec | --reche | --rech | --rec | --re | --r) echo "running $SHELL $0 " $ac_configure_args " --no-create --no-recursion" exec $SHELL $0 $ac_configure_args --no-create --no-recursion ;; EOF -cat >>$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:24812: error: ambiguous option: $1 + { { echo "$as_me:26367: 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;} @@ -24828,7 +26383,7 @@ Try \`$0 --help' for more information." >&2;} ac_need_defaults=false;; # This is an error. - -*) { { echo "$as_me:24831: error: unrecognized option: $1 + -*) { { echo "$as_me:26386: 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;} @@ -24847,18 +26402,18 @@ cat >&5 << _ACEOF ## Running config.status. ## ## ----------------------- ## -This file was extended by $as_me 2.52.20170501, executed with +This file was extended by $as_me 2.52.20210105, 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 <<EOF +cat >>"$CONFIG_STATUS" <<EOF # # INIT-COMMANDS section. # @@ -24875,7 +26430,7 @@ cf_cv_shlib_version="$cf_cv_shlib_version" EOF -cat >>$CONFIG_STATUS <<\EOF +cat >>"$CONFIG_STATUS" <<\EOF for ac_config_target in $ac_config_targets do case "$ac_config_target" in @@ -24887,7 +26442,7 @@ do "default-1" ) CONFIG_COMMANDS="$CONFIG_COMMANDS default-1" ;; "default" ) CONFIG_COMMANDS="$CONFIG_COMMANDS default" ;; "dlg_config.h" ) CONFIG_HEADERS="$CONFIG_HEADERS dlg_config.h:config.hin" ;; - *) { { echo "$as_me:24890: error: invalid argument: $ac_config_target" >&5 + *) { { echo "$as_me:26445: error: invalid argument: $ac_config_target" >&5 echo "$as_me: error: invalid argument: $ac_config_target" >&2;} { (exit 1); exit 1; }; };; esac @@ -24897,7 +26452,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 @@ -24927,7 +26482,7 @@ $debug || EOF -cat >>$CONFIG_STATUS <<EOF +cat >>"$CONFIG_STATUS" <<EOF # # CONFIG_FILES section. @@ -24951,6 +26506,7 @@ s,@datadir@,$datadir,;t t s,@sysconfdir@,$sysconfdir,;t t s,@sharedstatedir@,$sharedstatedir,;t t s,@localstatedir@,$localstatedir,;t t +s,@runstatedir@,$runstatedir,;t t s,@libdir@,$libdir,;t t s,@includedir@,$includedir,;t t s,@oldincludedir@,$oldincludedir,;t t @@ -24978,8 +26534,18 @@ s,@CPPFLAGS@,$CPPFLAGS,;t t s,@ac_ct_CC@,$ac_ct_CC,;t t s,@EXEEXT@,$EXEEXT,;t t s,@OBJEXT@,$OBJEXT,;t t +s,@build@,$build,;t t +s,@build_cpu@,$build_cpu,;t t +s,@build_vendor@,$build_vendor,;t t +s,@build_os@,$build_os,;t t +s,@host@,$host,;t t +s,@host_cpu@,$host_cpu,;t t +s,@host_vendor@,$host_vendor,;t t +s,@host_os@,$host_os,;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,@SET_MAKE@,$SET_MAKE,;t t s,@RANLIB@,$RANLIB,;t t s,@ac_ct_RANLIB@,$ac_ct_RANLIB,;t t @@ -24997,6 +26563,7 @@ s,@NROFF_NOTE@,$NROFF_NOTE,;t t s,@AR@,$AR,;t t s,@ac_ct_AR@,$ac_ct_AR,;t t s,@ARFLAGS@,$ARFLAGS,;t t +s,@FGREP@,$FGREP,;t t s,@cf_cv_makeflags@,$cf_cv_makeflags,;t t s,@CTAGS@,$CTAGS,;t t s,@ETAGS@,$ETAGS,;t t @@ -25007,16 +26574,12 @@ s,@ECHO_LD@,$ECHO_LD,;t t s,@RULE_CC@,$RULE_CC,;t t s,@SHOW_CC@,$SHOW_CC,;t t s,@ECHO_CC@,$ECHO_CC,;t t -s,@build@,$build,;t t -s,@build_cpu@,$build_cpu,;t t -s,@build_vendor@,$build_vendor,;t t -s,@build_os@,$build_os,;t t -s,@host@,$host,;t t -s,@host_cpu@,$host_cpu,;t t -s,@host_vendor@,$host_vendor,;t t -s,@host_os@,$host_os,;t t s,@PROG_EXT@,$PROG_EXT,;t t s,@LIB_PREFIX@,$LIB_PREFIX,;t t +s,@X_CFLAGS@,$X_CFLAGS,;t t +s,@X_PRE_LIBS@,$X_PRE_LIBS,;t t +s,@X_LIBS@,$X_LIBS,;t t +s,@X_EXTRA_LIBS@,$X_EXTRA_LIBS,;t t s,@EXTRA_CFLAGS@,$EXTRA_CFLAGS,;t t s,@PKG_CONFIG@,$PKG_CONFIG,;t t s,@ac_pt_PKG_CONFIG@,$ac_pt_PKG_CONFIG,;t t @@ -25107,10 +26670,6 @@ s,@MAKE_SHARED@,$MAKE_SHARED,;t t s,@MAKE_STATIC@,$MAKE_STATIC,;t t s,@NCURSES_CONFIG@,$NCURSES_CONFIG,;t t s,@ac_ct_NCURSES_CONFIG@,$ac_ct_NCURSES_CONFIG,;t t -s,@X_CFLAGS@,$X_CFLAGS,;t t -s,@X_PRE_LIBS@,$X_PRE_LIBS,;t t -s,@X_LIBS@,$X_LIBS,;t t -s,@X_EXTRA_LIBS@,$X_EXTRA_LIBS,;t t s,@XCURSES_CONFIG@,$XCURSES_CONFIG,;t t s,@ac_ct_XCURSES_CONFIG@,$ac_ct_XCURSES_CONFIG,;t t s,@EXTRAOBJS@,$EXTRAOBJS,;t t @@ -25119,11 +26678,12 @@ s,@PACKAGE_CONFIG@,$PACKAGE_CONFIG,;t t s,@cf_ldd_prog@,$cf_ldd_prog,;t t s,@SET_SHLIB_VARS@,$SET_SHLIB_VARS,;t t s,@LIB_TARGET@,$LIB_TARGET,;t t +s,@LD_SEARCHPATH@,$LD_SEARCHPATH,;t t 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 @@ -25132,8 +26692,8 @@ 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 + 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 @@ -25150,15 +26710,15 @@ EOF # 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` + 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` + if test "$ac_beg" -gt 1; then + ac_end=`expr "$ac_end" - 1` continue fi fi @@ -25170,9 +26730,9 @@ EOF else 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 @@ -25181,10 +26741,10 @@ EOF 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 ac_file_in=`echo "$ac_file" | sed 's,[^:]*:,,'` @@ -25230,19 +26790,19 @@ done; } 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 @@ -25251,7 +26811,7 @@ done; } esac if test x"$ac_file" != x-; then - { echo "$as_me:25254: creating $ac_file" >&5 + { echo "$as_me:26814: creating $ac_file" >&5 echo "$as_me: creating $ac_file" >&6;} rm -f "$ac_file" fi @@ -25269,7 +26829,7 @@ echo "$as_me: creating $ac_file" >&6;} -) echo $tmp/stdin ;; [\\/$]*) # Absolute (can't be DOS-style, as IFS=:) - test -f "$f" || { { echo "$as_me:25272: error: cannot find input file: $f" >&5 + test -f "$f" || { { echo "$as_me:26832: error: cannot find input file: $f" >&5 echo "$as_me: error: cannot find input file: $f" >&2;} { (exit 1); exit 1; }; } echo $f;; @@ -25279,35 +26839,35 @@ 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:25285: error: cannot find input file: $f" >&5 + { { echo "$as_me:26845: 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:25301: WARNING: datarootdir was used implicitly but not set: + { echo "$as_me:26861: 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:25310: WARNING: datarootdir was used explicitly but not set: + { echo "$as_me:26870: 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;} @@ -25321,11 +26881,11 @@ if test "x$ac_warn_datarootdir" = xyes; then fi EOF -cat >>$CONFIG_STATUS <<EOF +cat >>"$CONFIG_STATUS" <<EOF sed "$ac_vpsub $extrasub EOF -cat >>$CONFIG_STATUS <<\EOF +cat >>"$CONFIG_STATUS" <<\EOF :t /@[a-zA-Z_][a-zA-Z_0-9]*@/!b s,@configure_input@,$configure_input,;t t @@ -25335,27 +26895,27 @@ s,@INSTALL@,$ac_INSTALL,;t t " $ac_file_inputs | (eval "$ac_sed_cmds") >$tmp/out rm -f $tmp/stdin 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-fgrep} -n '${'$ac_name'[:=].*}' "$ac_file"` if test -n "$ac_seen"; then - ac_init=`egrep '[ ]*'$ac_name'[ ]*=' $ac_file` + ac_init=`${EGREP-egrep} '[ ]*'$ac_name'[ ]*=' "$ac_file"` if test -z "$ac_init"; then ac_seen=`echo "$ac_seen" |sed -e 's,^,'$ac_file':,'` - { echo "$as_me:25347: WARNING: Variable $ac_name is used but was not set: + { echo "$as_me:26907: 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 + ${EGREP-egrep} -n '@[a-z_][a-z_0-9]+@' "$ac_file" >$tmp/out + ${EGREP-egrep} -n '@[A-Z_][A-Z_0-9]+@' "$ac_file" >>$tmp/out if test -s $tmp/out; then ac_seen=`sed -e 's,^,'$ac_file':,' < $tmp/out` - { echo "$as_me:25358: WARNING: Some variables may not be substituted: + { echo "$as_me:26918: WARNING: Some variables may not be substituted: $ac_seen" >&5 echo "$as_me: WARNING: Some variables may not be substituted: $ac_seen" >&2;} @@ -25367,7 +26927,7 @@ $ac_seen" >&2;} done EOF -cat >>$CONFIG_STATUS <<\EOF +cat >>"$CONFIG_STATUS" <<\EOF # # CONFIG_HEADER section. @@ -25394,7 +26954,7 @@ 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 ac_file_in=`echo "$ac_file" | sed 's,[^:]*:,,'` @@ -25404,7 +26964,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:25407: creating $ac_file" >&5 + test x"$ac_file" != x- && { echo "$as_me:26967: creating $ac_file" >&5 echo "$as_me: creating $ac_file" >&6;} # First look for the input files in the build tree, otherwise in the @@ -25415,7 +26975,7 @@ echo "$as_me: creating $ac_file" >&6;} -) echo $tmp/stdin ;; [\\/$]*) # Absolute (can't be DOS-style, as IFS=:) - test -f "$f" || { { echo "$as_me:25418: error: cannot find input file: $f" >&5 + test -f "$f" || { { echo "$as_me:26978: error: cannot find input file: $f" >&5 echo "$as_me: error: cannot find input file: $f" >&2;} { (exit 1); exit 1; }; } echo $f;; @@ -25425,10 +26985,10 @@ 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:25431: error: cannot find input file: $f" >&5 + { { echo "$as_me:26991: error: cannot find input file: $f" >&5 echo "$as_me: error: cannot find input file: $f" >&2;} { (exit 1); exit 1; }; } fi;; @@ -25448,14 +27008,14 @@ sort -u 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 <<CEOF' >> $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 <<CEOF' >> "$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 @@ -25471,9 +27031,9 @@ 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. */ @@ -25485,8 +27045,8 @@ cat >>$CONFIG_STATUS <<\EOF 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:25489: $ac_file is unchanged" >&5 + if cmp -s "$ac_file" "$tmp/config.h" 2>/dev/null; then + { echo "$as_me:27049: $ac_file is unchanged" >&5 echo "$as_me: $ac_file is unchanged" >&6;} else ac_dir=`$as_expr X"$ac_file" : 'X\(.*[^/]\)//*[^/][^/]*/*$' \| \ @@ -25518,8 +27078,8 @@ 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 @@ -25527,7 +27087,7 @@ done; } fi done EOF -cat >>$CONFIG_STATUS <<\EOF +cat >>"$CONFIG_STATUS" <<\EOF # # CONFIG_COMMANDS section. # @@ -25535,7 +27095,7 @@ 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-1 ) for ac_file in $CONFIG_FILES; do # Support "outfile[:infile[:infile...]]" @@ -25547,10 +27107,10 @@ for ac_file in : $CONFIG_COMMANDS; do test "x$ac_file" = x: && continue case "$ac_file" in (*/[Mm]akefile.in) # Adjust a relative srcdir. - ac_dir=`echo "$ac_file"|sed 's%/[^/][^/]*$%%'` + ac_dir="`echo "$ac_file"|sed 's%/[^/][^/]*$%%'`" ac_dir_suffix="/`echo "$ac_dir"|sed 's%^\./%%'`" - ac_dots=`echo "$ac_dir_suffix"|sed 's%/[^/]*%../%g'` - ac_base=`basename $ac_file .in` + ac_dots="`echo "$ac_dir_suffix"|sed 's%/[^/]*%../%g'`" + ac_base="`basename $ac_file .in`" # In autoconf-2.13 it is called $ac_given_srcdir. # In autoconf-2.50 it is called $srcdir. test -n "$ac_given_srcdir" || ac_given_srcdir="$srcdir" @@ -25697,11 +27257,11 @@ CF_EOF 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. @@ -25715,10 +27275,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 |