Mercurial > dwindows
changeset 80:5e4730c42014
Added dw-config script to solve build problems.
| author | bsmith@81767d24-ef19-dc11-ae90-00e081727c95 |
|---|---|
| date | Wed, 27 Mar 2002 10:33:44 +0000 |
| parents | 8082cb0e7c2e |
| children | dea8021b4f47 |
| files | Makefile.in configure configure.in dw-config.in |
| diffstat | 4 files changed, 649 insertions(+), 538 deletions(-) [+] |
line wrap: on
line diff
--- a/Makefile.in Wed Mar 27 09:10:49 2002 +0000 +++ b/Makefile.in Wed Mar 27 10:33:44 2002 +0000 @@ -75,6 +75,7 @@ install: $(INSTALL) dw.h $(PREFIX)/include; \ $(INSTALL) compat.h $(PREFIX)/include; \ + $(INSTALL) dw-config $(PREFIX)/bin; \ cd $(DESTDIR); \ $(INSTALL) $(SYSCONF_LINK_TARGET) $(PREFIX)/lib; \ $(INSTALL) $(SYSCONF_LINK_TARGET2) $(PREFIX)/lib; \
--- a/configure Wed Mar 27 09:10:49 2002 +0000 +++ b/configure Wed Mar 27 10:33:44 2002 +0000 @@ -1,12 +1,25 @@ #! /bin/sh # Guess values for system-dependent variables and create Makefiles. -# Generated by Autoconf 2.49e. +# Generated by Autoconf 2.52. # # Copyright 1992, 1993, 1994, 1995, 1996, 1998, 1999, 2000, 2001 # Free Software Foundation, Inc. # This configure script is free software; the Free Software Foundation # gives unlimited permission to copy, distribute and modify it. +# Avoid depending upon Character Ranges. +as_cr_letters='abcdefghijklmnopqrstuvwxyz' +as_cr_LETTERS='ABCDEFGHIJKLMNOPQRSTUVWXYZ' +as_cr_Letters=$as_cr_letters$as_cr_LETTERS +as_cr_digits='0123456789' +as_cr_alnum=$as_cr_Letters$as_cr_digits + +# Sed expression to map a string onto a valid variable name. +as_tr_sh="sed y%*+%pp%;s%[^_$as_cr_alnum]%_%g" + +# Sed expression to map a string onto a valid CPP name. +as_tr_cpp="sed y%*$as_cr_letters%P$as_cr_LETTERS%;s%[^_$as_cr_alnum]%_%g" + # Be Bourne compatible if test -n "${ZSH_VERSION+set}" && (emulate sh) >/dev/null 2>&1; then emulate sh @@ -91,16 +104,6 @@ # only ac_max_sed_lines should be used. : ${ac_max_here_lines=38} -# Avoid depending upon Character Ranges. -ac_cr_az='abcdefghijklmnopqrstuvwxyz' -ac_cr_AZ='ABCDEFGHIJKLMNOPQRSTUVWXYZ' -ac_cr_09='0123456789' -ac_cr_alnum=$ac_cr_az$ac_cr_AZ$ac_cr_09 - -# Sed expression to map a string onto a valid sh and CPP variable names. -ac_tr_sh="sed y%*+%pp%;s%[^_$ac_cr_alnum]%_%g" -ac_tr_cpp="sed y%*$ac_cr_az%P$ac_cr_AZ%;s%[^_$ac_cr_alnum]%_%g" - ac_unique_file="winmain.c" # Initialize some variables set by options. @@ -193,7 +196,7 @@ -disable-* | --disable-*) ac_feature=`expr "x$ac_option" : 'x-*disable-\(.*\)'` # Reject names that are not valid shell variable names. - expr "x$ac_feature" : ".*[^-_$ac_cr_alnum]" >/dev/null && + 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'` @@ -202,7 +205,7 @@ -enable-* | --enable-*) ac_feature=`expr "x$ac_option" : 'x-*enable-\([^=]*\)'` # Reject names that are not valid shell variable names. - expr "x$ac_feature" : ".*[^-_$ac_cr_alnum]" >/dev/null && + 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'` @@ -384,7 +387,7 @@ -with-* | --with-*) ac_package=`expr "x$ac_option" : 'x-*with-\([^=]*\)'` # Reject names that are not valid shell variable names. - expr "x$ac_package" : ".*[^-_$ac_cr_alnum]" >/dev/null && + 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'` @@ -397,7 +400,7 @@ -without-* | --without-*) ac_package=`expr "x$ac_option" : 'x-*without-\(.*\)'` # Reject names that are not valid shell variable names. - expr "x$ac_package" : ".*[^-_$ac_cr_alnum]" >/dev/null && + 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'` @@ -429,7 +432,7 @@ *=*) ac_envvar=`expr "x$ac_option" : 'x\([^=]*\)='` # Reject names that are not valid shell variable names. - expr "x$ac_envvar" : ".*[^_$ac_cr_alnum]" >/dev/null && + expr "x$ac_envvar" : ".*[^_$as_cr_alnum]" >/dev/null && { echo "$as_me: error: invalid variable name: $ac_envvar" >&2 { (exit 1); exit 1; }; } ac_optarg=`echo "$ac_optarg" | sed "s/'/'\\\\\\\\''/g"` @@ -439,7 +442,7 @@ *) # FIXME: should be removed in autoconf 3.0. echo "$as_me: WARNING: you should use --build, --host, --target" >&2 - expr "x$ac_option" : ".*[^-._$ac_cr_alnum]" >/dev/null && + 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} ;; @@ -454,14 +457,23 @@ 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 + [\\/$]* | ?:[\\/]* | NONE | '' ) ;; + *) { echo "$as_me: error: expected an absolute path for --$ac_var: $ac_val" >&2 + { (exit 1); exit 1; }; };; + esac +done + +# Be sure to have absolute paths. for ac_var in bindir sbindir libexecdir datadir sysconfdir sharedstatedir \ - localstatedir libdir includedir oldincludedir infodir mandir \ - exec_prefix prefix + localstatedir libdir includedir oldincludedir infodir mandir do 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; }; };; esac @@ -537,14 +549,14 @@ ac_env_LDFLAGS_value=$LDFLAGS ac_cv_env_LDFLAGS_set=${LDFLAGS+set} ac_cv_env_LDFLAGS_value=$LDFLAGS +ac_env_CPPFLAGS_set=${CPPFLAGS+set} +ac_env_CPPFLAGS_value=$CPPFLAGS +ac_cv_env_CPPFLAGS_set=${CPPFLAGS+set} +ac_cv_env_CPPFLAGS_value=$CPPFLAGS ac_env_CPP_set=${CPP+set} ac_env_CPP_value=$CPP ac_cv_env_CPP_set=${CPP+set} ac_cv_env_CPP_value=$CPP -ac_env_CPPFLAGS_set=${CPPFLAGS+set} -ac_env_CPPFLAGS_value=$CPPFLAGS -ac_cv_env_CPPFLAGS_set=${CPPFLAGS+set} -ac_cv_env_CPPFLAGS_value=$CPPFLAGS # # Report the --help message. @@ -634,9 +646,9 @@ CFLAGS C compiler flags LDFLAGS linker flags, e.g. -L<lib dir> if you have libraries in a nonstandard directory <lib dir> - CPP C preprocessor CPPFLAGS C/C++ preprocessor flags, e.g. -I<include dir> if you have headers in a nonstandard directory <include dir> + CPP C preprocessor Use these variables to override the choices made by `configure' or to help it to find libraries and programs with nonstandard names/locations. @@ -697,7 +709,7 @@ running configure, to aid debugging if configure makes a mistake. It was created by $as_me, which was -generated by GNU Autoconf 2.49e. Invocation command line was +generated by GNU Autoconf 2.52. Invocation command line was $ $0 $@ @@ -776,11 +788,11 @@ *ac_space=\ *) sed -n \ "s/'"'"'/'"'"'\\\\'"'"''"'"'/g; - s/^\\([_$ac_cr_alnum]*_cv_[_$ac_cr_alnum]*\\)=\\(.*\\)/\\1='"'"'\\2'"'"'/p" + s/^\\([_$as_cr_alnum]*_cv_[_$as_cr_alnum]*\\)=\\(.*\\)/\\1='"'"'\\2'"'"'/p" ;; *) sed -n \ - "s/^\\([_$ac_cr_alnum]*_cv_[_$ac_cr_alnum]*\\)=\\(.*\\)/\\1=\\2/p" + "s/^\\([_$as_cr_alnum]*_cv_[_$as_cr_alnum]*\\)=\\(.*\\)/\\1=\\2/p" ;; esac; } >&5 @@ -801,7 +813,7 @@ exit $exit_status ' 0 for ac_signal in 1 2 13 15; do - trap 'ac_status=$?; ac_signal='$ac_signal'; { (exit $ac_status); exit $ac_status; }' $ac_signal + trap 'ac_signal='$ac_signal'; { (exit 1); exit 1; }' $ac_signal done ac_signal=0 @@ -821,7 +833,7 @@ fi for ac_site_file in $CONFIG_SITE; do if test -r "$ac_site_file"; then - { echo "$as_me:824: loading site script $ac_site_file" >&5 + { echo "$as_me:836: 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" @@ -832,7 +844,7 @@ # 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:835: loading cache $cache_file" >&5 + { echo "$as_me:847: loading cache $cache_file" >&5 echo "$as_me: loading cache $cache_file" >&6;} case $cache_file in [\\/]* | ?:[\\/]* ) . $cache_file;; @@ -840,14 +852,14 @@ esac fi else - { echo "$as_me:843: creating cache $cache_file" >&5 + { echo "$as_me:855: creating cache $cache_file" >&5 echo "$as_me: creating cache $cache_file" >&6;} >$cache_file fi # Check that the precious variables saved in the cache have kept the same # value. -ac_suggest_removing_cache=false +ac_cache_corrupted=false for ac_var in `(set) 2>&1 | sed -n 's/^ac_env_\([a-zA-Z_0-9]*\)_set=.*/\1/p'`; do eval ac_old_set=\$ac_cv_env_${ac_var}_set @@ -856,31 +868,44 @@ eval ac_new_val="\$ac_env_${ac_var}_value" case $ac_old_set,$ac_new_set in set,) - { echo "$as_me:859: WARNING: \`$ac_var' was set to \`$ac_old_val' in the previous run" >&5 -echo "$as_me: WARNING: \`$ac_var' was set to \`$ac_old_val' in the previous run" >&2;} - ac_suggest_removing_cache=: ;; + { echo "$as_me:871: 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:863: WARNING: \`$ac_var' was not set in the previous run" >&5 -echo "$as_me: WARNING: \`$ac_var' was not set in the previous run" >&2;} - ac_suggest_removing_cache=: ;; + { echo "$as_me:875: 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:869: WARNING: \`$ac_var' has changed since the previous run:" >&5 -echo "$as_me: WARNING: \`$ac_var' has changed since the previous run:" >&2;} - { echo "$as_me:871: WARNING: former value: $ac_old_val" >&5 -echo "$as_me: WARNING: former value: $ac_old_val" >&2;} - { echo "$as_me:873: WARNING: current value: $ac_new_val" >&5 -echo "$as_me: WARNING: current value: $ac_new_val" >&2;} - ac_suggest_removing_cache=: + { echo "$as_me:881: 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:883: former value: $ac_old_val" >&5 +echo "$as_me: former value: $ac_old_val" >&2;} + { echo "$as_me:885: current value: $ac_new_val" >&5 +echo "$as_me: current value: $ac_new_val" >&2;} + ac_cache_corrupted=: fi;; esac + # 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 + *" "*|*" "*|*[\[\]\~\#\$\^\&\*\(\)\{\}\\\|\;\<\>\?\"\']*) + ac_arg=$ac_var=`echo "$ac_new_val" | sed "s/'/'\\\\\\\\''/g"` + ac_configure_args="$ac_configure_args '$ac_arg'" + ;; + *) ac_configure_args="$ac_configure_args $ac_var=$ac_new_val" + ;; + esac + fi done -if $ac_suggest_removing_cache; then - { echo "$as_me:880: WARNING: changes in the environment can compromise the build" >&5 -echo "$as_me: WARNING: changes in the environment can compromise the build" >&2;} - { echo "$as_me:882: WARNING: consider removing $cache_file and starting over" >&5 -echo "$as_me: WARNING: consider removing $cache_file and starting over" >&2;} +if $ac_cache_corrupted; then + { echo "$as_me:904: 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:906: 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 @@ -898,10 +923,10 @@ echo "#! $SHELL" >conftest.sh echo "exit 0" >>conftest.sh chmod +x conftest.sh -if { (echo "$as_me:901: PATH=\".;.\"; conftest.sh") >&5 +if { (echo "$as_me:926: PATH=\".;.\"; conftest.sh") >&5 (PATH=".;."; conftest.sh) 2>&5 ac_status=$? - echo "$as_me:904: \$? = $ac_status" >&5 + echo "$as_me:929: \$? = $ac_status" >&5 (exit $ac_status); }; then ac_path_separator=';' else @@ -912,6 +937,10 @@ ac_config_headers="$ac_config_headers config.h" +DW_MAJOR_VERSION=0 +DW_MINOR_VERSION=5 +DW_SUB_VERSION=0 + INCLUDES="-I." ac_ext=c @@ -922,7 +951,7 @@ 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:925: checking for $ac_word" >&5 +echo "$as_me:954: 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 @@ -937,13 +966,7 @@ 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:940: found $ac_dir/$ac_word" >&5 -{ ac_try='$ac_dir/$ac_word --version </dev/null >&2' - { (eval echo "$as_me:942: \"$ac_try\"") >&5 - (eval $ac_try) 2>&5 - ac_status=$? - echo "$as_me:945: \$? = $ac_status" >&5 - (exit $ac_status); }; } +echo "$as_me:969: found $ac_dir/$ac_word" >&5 break done @@ -951,10 +974,10 @@ fi CC=$ac_cv_prog_CC if test -n "$CC"; then - echo "$as_me:954: result: $CC" >&5 + echo "$as_me:977: result: $CC" >&5 echo "${ECHO_T}$CC" >&6 else - echo "$as_me:957: result: no" >&5 + echo "$as_me:980: result: no" >&5 echo "${ECHO_T}no" >&6 fi @@ -963,7 +986,7 @@ 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:966: checking for $ac_word" >&5 +echo "$as_me:989: 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 @@ -978,13 +1001,7 @@ test -z "$ac_dir" && ac_dir=. $as_executable_p "$ac_dir/$ac_word" || continue ac_cv_prog_ac_ct_CC="gcc" -echo "$as_me:981: found $ac_dir/$ac_word" >&5 -{ ac_try='$ac_dir/$ac_word --version </dev/null >&2' - { (eval echo "$as_me:983: \"$ac_try\"") >&5 - (eval $ac_try) 2>&5 - ac_status=$? - echo "$as_me:986: \$? = $ac_status" >&5 - (exit $ac_status); }; } +echo "$as_me:1004: found $ac_dir/$ac_word" >&5 break done @@ -992,10 +1009,10 @@ fi ac_ct_CC=$ac_cv_prog_ac_ct_CC if test -n "$ac_ct_CC"; then - echo "$as_me:995: result: $ac_ct_CC" >&5 + echo "$as_me:1012: result: $ac_ct_CC" >&5 echo "${ECHO_T}$ac_ct_CC" >&6 else - echo "$as_me:998: result: no" >&5 + echo "$as_me:1015: result: no" >&5 echo "${ECHO_T}no" >&6 fi @@ -1008,7 +1025,7 @@ 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:1011: checking for $ac_word" >&5 +echo "$as_me:1028: 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 @@ -1023,13 +1040,7 @@ 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:1026: found $ac_dir/$ac_word" >&5 -{ ac_try='$ac_dir/$ac_word --version </dev/null >&2' - { (eval echo "$as_me:1028: \"$ac_try\"") >&5 - (eval $ac_try) 2>&5 - ac_status=$? - echo "$as_me:1031: \$? = $ac_status" >&5 - (exit $ac_status); }; } +echo "$as_me:1043: found $ac_dir/$ac_word" >&5 break done @@ -1037,10 +1048,10 @@ fi CC=$ac_cv_prog_CC if test -n "$CC"; then - echo "$as_me:1040: result: $CC" >&5 + echo "$as_me:1051: result: $CC" >&5 echo "${ECHO_T}$CC" >&6 else - echo "$as_me:1043: result: no" >&5 + echo "$as_me:1054: result: no" >&5 echo "${ECHO_T}no" >&6 fi @@ -1049,7 +1060,7 @@ 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:1052: checking for $ac_word" >&5 +echo "$as_me:1063: 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 @@ -1064,13 +1075,7 @@ test -z "$ac_dir" && ac_dir=. $as_executable_p "$ac_dir/$ac_word" || continue ac_cv_prog_ac_ct_CC="cc" -echo "$as_me:1067: found $ac_dir/$ac_word" >&5 -{ ac_try='$ac_dir/$ac_word --version </dev/null >&2' - { (eval echo "$as_me:1069: \"$ac_try\"") >&5 - (eval $ac_try) 2>&5 - ac_status=$? - echo "$as_me:1072: \$? = $ac_status" >&5 - (exit $ac_status); }; } +echo "$as_me:1078: found $ac_dir/$ac_word" >&5 break done @@ -1078,10 +1083,10 @@ fi ac_ct_CC=$ac_cv_prog_ac_ct_CC if test -n "$ac_ct_CC"; then - echo "$as_me:1081: result: $ac_ct_CC" >&5 + echo "$as_me:1086: result: $ac_ct_CC" >&5 echo "${ECHO_T}$ac_ct_CC" >&6 else - echo "$as_me:1084: result: no" >&5 + echo "$as_me:1089: result: no" >&5 echo "${ECHO_T}no" >&6 fi @@ -1094,7 +1099,7 @@ 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:1097: checking for $ac_word" >&5 +echo "$as_me:1102: 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 @@ -1114,13 +1119,7 @@ continue fi ac_cv_prog_CC="cc" -echo "$as_me:1117: found $ac_dir/$ac_word" >&5 -{ ac_try='$ac_dir/$ac_word --version </dev/null >&2' - { (eval echo "$as_me:1119: \"$ac_try\"") >&5 - (eval $ac_try) 2>&5 - ac_status=$? - echo "$as_me:1122: \$? = $ac_status" >&5 - (exit $ac_status); }; } +echo "$as_me:1122: found $ac_dir/$ac_word" >&5 break done @@ -1142,10 +1141,10 @@ fi CC=$ac_cv_prog_CC if test -n "$CC"; then - echo "$as_me:1145: result: $CC" >&5 + echo "$as_me:1144: result: $CC" >&5 echo "${ECHO_T}$CC" >&6 else - echo "$as_me:1148: result: no" >&5 + echo "$as_me:1147: result: no" >&5 echo "${ECHO_T}no" >&6 fi @@ -1156,7 +1155,7 @@ 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:1159: checking for $ac_word" >&5 +echo "$as_me:1158: 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 @@ -1171,13 +1170,7 @@ 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:1174: found $ac_dir/$ac_word" >&5 -{ ac_try='$ac_dir/$ac_word --version </dev/null >&2' - { (eval echo "$as_me:1176: \"$ac_try\"") >&5 - (eval $ac_try) 2>&5 - ac_status=$? - echo "$as_me:1179: \$? = $ac_status" >&5 - (exit $ac_status); }; } +echo "$as_me:1173: found $ac_dir/$ac_word" >&5 break done @@ -1185,10 +1178,10 @@ fi CC=$ac_cv_prog_CC if test -n "$CC"; then - echo "$as_me:1188: result: $CC" >&5 + echo "$as_me:1181: result: $CC" >&5 echo "${ECHO_T}$CC" >&6 else - echo "$as_me:1191: result: no" >&5 + echo "$as_me:1184: result: no" >&5 echo "${ECHO_T}no" >&6 fi @@ -1201,7 +1194,7 @@ 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:1204: checking for $ac_word" >&5 +echo "$as_me:1197: 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 @@ -1216,13 +1209,7 @@ 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:1219: found $ac_dir/$ac_word" >&5 -{ ac_try='$ac_dir/$ac_word --version </dev/null >&2' - { (eval echo "$as_me:1221: \"$ac_try\"") >&5 - (eval $ac_try) 2>&5 - ac_status=$? - echo "$as_me:1224: \$? = $ac_status" >&5 - (exit $ac_status); }; } +echo "$as_me:1212: found $ac_dir/$ac_word" >&5 break done @@ -1230,10 +1217,10 @@ fi ac_ct_CC=$ac_cv_prog_ac_ct_CC if test -n "$ac_ct_CC"; then - echo "$as_me:1233: result: $ac_ct_CC" >&5 + echo "$as_me:1220: result: $ac_ct_CC" >&5 echo "${ECHO_T}$ac_ct_CC" >&6 else - echo "$as_me:1236: result: no" >&5 + echo "$as_me:1223: result: no" >&5 echo "${ECHO_T}no" >&6 fi @@ -1245,12 +1232,32 @@ fi -test -z "$CC" && { { echo "$as_me:1248: error: no acceptable cc found in \$PATH" >&5 +test -z "$CC" && { { echo "$as_me:1235: 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:1240:" \ + "checking for C compiler version" >&5 +ac_compiler=`set X $ac_compile; echo $2` +{ (eval echo "$as_me:1243: \"$ac_compiler --version </dev/null >&5\"") >&5 + (eval $ac_compiler --version </dev/null >&5) 2>&5 + ac_status=$? + echo "$as_me:1246: \$? = $ac_status" >&5 + (exit $ac_status); } +{ (eval echo "$as_me:1248: \"$ac_compiler -v </dev/null >&5\"") >&5 + (eval $ac_compiler -v </dev/null >&5) 2>&5 + ac_status=$? + echo "$as_me:1251: \$? = $ac_status" >&5 + (exit $ac_status); } +{ (eval echo "$as_me:1253: \"$ac_compiler -V </dev/null >&5\"") >&5 + (eval $ac_compiler -V </dev/null >&5) 2>&5 + ac_status=$? + echo "$as_me:1256: \$? = $ac_status" >&5 + (exit $ac_status); } + cat >conftest.$ac_ext <<_ACEOF -#line 1253 "configure" +#line 1260 "configure" #include "confdefs.h" int @@ -1264,23 +1271,29 @@ ac_clean_files_save=$ac_clean_files 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 compiler, and finding out an intuition +# It will help us diagnose broken compilers, and finding out an intuition # of exeext. -echo "$as_me:1269: checking for C compiler default output" >&5 +echo "$as_me:1276: 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:1272: \"$ac_link_default\"") >&5 +if { (eval echo "$as_me:1279: \"$ac_link_default\"") >&5 (eval $ac_link_default) 2>&5 ac_status=$? - echo "$as_me:1275: \$? = $ac_status" >&5 + echo "$as_me:1282: \$? = $ac_status" >&5 (exit $ac_status); }; then - for ac_file in `ls a.exe conftest.exe a.* conftest conftest.* 2>/dev/null`; do + # 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. +for ac_file in `ls a.exe conftest.exe 2>/dev/null; + ls a.out conftest 2>/dev/null; + ls a.* conftest.* 2>/dev/null`; do case $ac_file in *.$ac_ext | *.o | *.obj | *.xcoff | *.tds | *.d | *.pdb ) ;; a.out ) # We found the default executable, but exeext='' is most # certainly right. break;; *.* ) ac_cv_exeext=`expr "$ac_file" : '[^.]*\(\..*\)'` + # FIXME: I believe we export ac_cv_exeext for Libtool --akim. export ac_cv_exeext break;; * ) break;; @@ -1289,34 +1302,34 @@ else echo "$as_me: failed program was:" >&5 cat conftest.$ac_ext >&5 -{ { echo "$as_me:1292: error: C compiler cannot create executables" >&5 +{ { echo "$as_me:1305: 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:1298: result: $ac_file" >&5 +echo "$as_me:1311: 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:1303: checking whether the C compiler works" >&5 +echo "$as_me:1316: 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:1309: \"$ac_try\"") >&5 + { (eval echo "$as_me:1322: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? - echo "$as_me:1312: \$? = $ac_status" >&5 + echo "$as_me:1325: \$? = $ac_status" >&5 (exit $ac_status); }; }; then cross_compiling=no else if test "$cross_compiling" = maybe; then cross_compiling=yes else - { { echo "$as_me:1319: error: cannot run C compiled programs. + { { echo "$as_me:1332: 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;} @@ -1324,24 +1337,24 @@ fi fi fi -echo "$as_me:1327: result: yes" >&5 +echo "$as_me:1340: result: yes" >&5 echo "${ECHO_T}yes" >&6 rm -f a.out a.exe conftest$ac_cv_exeext ac_clean_files=$ac_clean_files_save # Check the compiler produces executables we can run. If not, either # the compiler is broken, or we cross compile. -echo "$as_me:1334: checking whether we are cross compiling" >&5 +echo "$as_me:1347: checking whether we are cross compiling" >&5 echo $ECHO_N "checking whether we are cross compiling... $ECHO_C" >&6 -echo "$as_me:1336: result: $cross_compiling" >&5 +echo "$as_me:1349: result: $cross_compiling" >&5 echo "${ECHO_T}$cross_compiling" >&6 -echo "$as_me:1339: checking for executable suffix" >&5 +echo "$as_me:1352: checking for executable suffix" >&5 echo $ECHO_N "checking for executable suffix... $ECHO_C" >&6 -if { (eval echo "$as_me:1341: \"$ac_link\"") >&5 +if { (eval echo "$as_me:1354: \"$ac_link\"") >&5 (eval $ac_link) 2>&5 ac_status=$? - echo "$as_me:1344: \$? = $ac_status" >&5 + echo "$as_me:1357: \$? = $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 @@ -1357,25 +1370,25 @@ esac done else - { { echo "$as_me:1360: error: cannot compute EXEEXT: cannot compile and link" >&5 + { { echo "$as_me:1373: 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:1366: result: $ac_cv_exeext" >&5 +echo "$as_me:1379: result: $ac_cv_exeext" >&5 echo "${ECHO_T}$ac_cv_exeext" >&6 rm -f conftest.$ac_ext EXEEXT=$ac_cv_exeext ac_exeext=$EXEEXT -echo "$as_me:1372: checking for object suffix" >&5 +echo "$as_me:1385: 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 1378 "configure" +#line 1391 "configure" #include "confdefs.h" int @@ -1387,10 +1400,10 @@ } _ACEOF rm -f conftest.o conftest.obj -if { (eval echo "$as_me:1390: \"$ac_compile\"") >&5 +if { (eval echo "$as_me:1403: \"$ac_compile\"") >&5 (eval $ac_compile) 2>&5 ac_status=$? - echo "$as_me:1393: \$? = $ac_status" >&5 + echo "$as_me:1406: \$? = $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 @@ -1402,24 +1415,24 @@ else echo "$as_me: failed program was:" >&5 cat conftest.$ac_ext >&5 -{ { echo "$as_me:1405: error: cannot compute OBJEXT: cannot compile" >&5 +{ { echo "$as_me:1418: error: cannot compute OBJEXT: cannot compile" >&5 echo "$as_me: error: cannot compute OBJEXT: cannot compile" >&2;} { (exit 1); exit 1; }; } fi rm -f conftest.$ac_cv_objext conftest.$ac_ext fi -echo "$as_me:1412: result: $ac_cv_objext" >&5 +echo "$as_me:1425: result: $ac_cv_objext" >&5 echo "${ECHO_T}$ac_cv_objext" >&6 OBJEXT=$ac_cv_objext ac_objext=$OBJEXT -echo "$as_me:1416: checking whether we are using the GNU C compiler" >&5 +echo "$as_me:1429: 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 1422 "configure" +#line 1435 "configure" #include "confdefs.h" int @@ -1434,16 +1447,16 @@ } _ACEOF rm -f conftest.$ac_objext -if { (eval echo "$as_me:1437: \"$ac_compile\"") >&5 +if { (eval echo "$as_me:1450: \"$ac_compile\"") >&5 (eval $ac_compile) 2>&5 ac_status=$? - echo "$as_me:1440: \$? = $ac_status" >&5 + echo "$as_me:1453: \$? = $ac_status" >&5 (exit $ac_status); } && { ac_try='test -s conftest.$ac_objext' - { (eval echo "$as_me:1443: \"$ac_try\"") >&5 + { (eval echo "$as_me:1456: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? - echo "$as_me:1446: \$? = $ac_status" >&5 + echo "$as_me:1459: \$? = $ac_status" >&5 (exit $ac_status); }; }; then ac_compiler_gnu=yes else @@ -1455,19 +1468,19 @@ ac_cv_c_compiler_gnu=$ac_compiler_gnu fi -echo "$as_me:1458: result: $ac_cv_c_compiler_gnu" >&5 +echo "$as_me:1471: 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:1464: checking whether $CC accepts -g" >&5 +echo "$as_me:1477: 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 1470 "configure" +#line 1483 "configure" #include "confdefs.h" int @@ -1479,16 +1492,16 @@ } _ACEOF rm -f conftest.$ac_objext -if { (eval echo "$as_me:1482: \"$ac_compile\"") >&5 +if { (eval echo "$as_me:1495: \"$ac_compile\"") >&5 (eval $ac_compile) 2>&5 ac_status=$? - echo "$as_me:1485: \$? = $ac_status" >&5 + echo "$as_me:1498: \$? = $ac_status" >&5 (exit $ac_status); } && { ac_try='test -s conftest.$ac_objext' - { (eval echo "$as_me:1488: \"$ac_try\"") >&5 + { (eval echo "$as_me:1501: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? - echo "$as_me:1491: \$? = $ac_status" >&5 + echo "$as_me:1504: \$? = $ac_status" >&5 (exit $ac_status); }; }; then ac_cv_prog_cc_g=yes else @@ -1498,7 +1511,7 @@ fi rm -f conftest.$ac_objext conftest.$ac_ext fi -echo "$as_me:1501: result: $ac_cv_prog_cc_g" >&5 +echo "$as_me:1514: 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 @@ -1525,16 +1538,16 @@ #endif _ACEOF rm -f conftest.$ac_objext -if { (eval echo "$as_me:1528: \"$ac_compile\"") >&5 +if { (eval echo "$as_me:1541: \"$ac_compile\"") >&5 (eval $ac_compile) 2>&5 ac_status=$? - echo "$as_me:1531: \$? = $ac_status" >&5 + echo "$as_me:1544: \$? = $ac_status" >&5 (exit $ac_status); } && { ac_try='test -s conftest.$ac_objext' - { (eval echo "$as_me:1534: \"$ac_try\"") >&5 + { (eval echo "$as_me:1547: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? - echo "$as_me:1537: \$? = $ac_status" >&5 + echo "$as_me:1550: \$? = $ac_status" >&5 (exit $ac_status); }; }; then for ac_declaration in \ ''\ @@ -1546,7 +1559,7 @@ 'void exit (int);' do cat >conftest.$ac_ext <<_ACEOF -#line 1549 "configure" +#line 1562 "configure" #include "confdefs.h" #include <stdlib.h> $ac_declaration @@ -1559,16 +1572,16 @@ } _ACEOF rm -f conftest.$ac_objext -if { (eval echo "$as_me:1562: \"$ac_compile\"") >&5 +if { (eval echo "$as_me:1575: \"$ac_compile\"") >&5 (eval $ac_compile) 2>&5 ac_status=$? - echo "$as_me:1565: \$? = $ac_status" >&5 + echo "$as_me:1578: \$? = $ac_status" >&5 (exit $ac_status); } && { ac_try='test -s conftest.$ac_objext' - { (eval echo "$as_me:1568: \"$ac_try\"") >&5 + { (eval echo "$as_me:1581: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? - echo "$as_me:1571: \$? = $ac_status" >&5 + echo "$as_me:1584: \$? = $ac_status" >&5 (exit $ac_status); }; }; then : else @@ -1578,7 +1591,7 @@ fi rm -f conftest.$ac_objext conftest.$ac_ext cat >conftest.$ac_ext <<_ACEOF -#line 1581 "configure" +#line 1594 "configure" #include "confdefs.h" $ac_declaration int @@ -1590,16 +1603,16 @@ } _ACEOF rm -f conftest.$ac_objext -if { (eval echo "$as_me:1593: \"$ac_compile\"") >&5 +if { (eval echo "$as_me:1606: \"$ac_compile\"") >&5 (eval $ac_compile) 2>&5 ac_status=$? - echo "$as_me:1596: \$? = $ac_status" >&5 + echo "$as_me:1609: \$? = $ac_status" >&5 (exit $ac_status); } && { ac_try='test -s conftest.$ac_objext' - { (eval echo "$as_me:1599: \"$ac_try\"") >&5 + { (eval echo "$as_me:1612: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? - echo "$as_me:1602: \$? = $ac_status" >&5 + echo "$as_me:1615: \$? = $ac_status" >&5 (exit $ac_status); }; }; then break else @@ -1608,9 +1621,12 @@ fi rm -f conftest.$ac_objext conftest.$ac_ext done -echo '#ifdef __cplusplus' >>confdefs.h -echo $ac_declaration >>confdefs.h -echo '#endif' >>confdefs.h +rm -f conftest* +if test -n "$ac_declaration"; then + echo '#ifdef __cplusplus' >>confdefs.h + echo $ac_declaration >>confdefs.h + echo '#endif' >>confdefs.h +fi else echo "$as_me: failed program was:" >&5 @@ -1625,7 +1641,7 @@ # Extract the first word of "gmake", so it can be a program name with args. set dummy gmake; ac_word=$2 -echo "$as_me:1628: checking for $ac_word" >&5 +echo "$as_me:1644: checking for $ac_word" >&5 echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6 if test "${ac_cv_prog_MAKE+set}" = set; then echo $ECHO_N "(cached) $ECHO_C" >&6 @@ -1640,13 +1656,7 @@ test -z "$ac_dir" && ac_dir=. $as_executable_p "$ac_dir/$ac_word" || continue ac_cv_prog_MAKE="gmake" -echo "$as_me:1643: found $ac_dir/$ac_word" >&5 -{ ac_try='$ac_dir/$ac_word --version </dev/null >&2' - { (eval echo "$as_me:1645: \"$ac_try\"") >&5 - (eval $ac_try) 2>&5 - ac_status=$? - echo "$as_me:1648: \$? = $ac_status" >&5 - (exit $ac_status); }; } +echo "$as_me:1659: found $ac_dir/$ac_word" >&5 break done @@ -1654,17 +1664,17 @@ fi MAKE=$ac_cv_prog_MAKE if test -n "$MAKE"; then - echo "$as_me:1657: result: $MAKE" >&5 + echo "$as_me:1667: result: $MAKE" >&5 echo "${ECHO_T}$MAKE" >&6 else - echo "$as_me:1660: result: no" >&5 + echo "$as_me:1670: result: no" >&5 echo "${ECHO_T}no" >&6 fi if test x"$MAKE" = x; then # Extract the first word of "make", so it can be a program name with args. set dummy make; ac_word=$2 -echo "$as_me:1667: checking for $ac_word" >&5 +echo "$as_me:1677: checking for $ac_word" >&5 echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6 if test "${ac_cv_prog_MAKE+set}" = set; then echo $ECHO_N "(cached) $ECHO_C" >&6 @@ -1679,13 +1689,7 @@ test -z "$ac_dir" && ac_dir=. $as_executable_p "$ac_dir/$ac_word" || continue ac_cv_prog_MAKE="make" -echo "$as_me:1682: found $ac_dir/$ac_word" >&5 -{ ac_try='$ac_dir/$ac_word --version </dev/null >&2' - { (eval echo "$as_me:1684: \"$ac_try\"") >&5 - (eval $ac_try) 2>&5 - ac_status=$? - echo "$as_me:1687: \$? = $ac_status" >&5 - (exit $ac_status); }; } +echo "$as_me:1692: found $ac_dir/$ac_word" >&5 break done @@ -1693,10 +1697,10 @@ fi MAKE=$ac_cv_prog_MAKE if test -n "$MAKE"; then - echo "$as_me:1696: result: $MAKE" >&5 + echo "$as_me:1700: result: $MAKE" >&5 echo "${ECHO_T}$MAKE" >&6 else - echo "$as_me:1699: result: no" >&5 + echo "$as_me:1703: result: no" >&5 echo "${ECHO_T}no" >&6 fi @@ -1719,7 +1723,7 @@ fi done if test -z "$ac_aux_dir"; then - { { echo "$as_me:1722: error: cannot find install-sh or install.sh in $srcdir $srcdir/.. $srcdir/../.." >&5 + { { echo "$as_me:1726: 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 @@ -1739,7 +1743,7 @@ # 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:1742: checking for a BSD compatible install" >&5 +echo "$as_me:1746: 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 @@ -1788,7 +1792,7 @@ INSTALL=$ac_install_sh fi fi -echo "$as_me:1791: result: $INSTALL" >&5 +echo "$as_me:1795: result: $INSTALL" >&5 echo "${ECHO_T}$INSTALL" >&6 # Use test -z because SunOS4 sh mishandles braces in ${var-val}. @@ -1804,7 +1808,7 @@ ac_compile='$CC -c $CFLAGS $CPPFLAGS conftest.$ac_ext >&5' ac_link='$CC -o conftest$ac_exeext $CFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5' ac_compiler_gnu=$ac_cv_c_compiler_gnu -echo "$as_me:1807: checking how to run the C preprocessor" >&5 +echo "$as_me:1811: 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 @@ -1817,24 +1821,26 @@ # Double quotes because CPP needs to be expanded for CPP in "$CC -E" "$CC -E -traditional-cpp" "/lib/cpp" do - # Use a header file that comes with gcc, so configuring glibc -# 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. -ac_c_preproc_warn_flag=maybe -cat >conftest.$ac_ext <<_ACEOF -#line 1826 "configure" + ac_preproc_ok=false +for ac_c_preproc_warn_flag in '' yes +do + # Use a header file that comes with gcc, so configuring glibc + # 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 1832 "configure" #include "confdefs.h" #include <assert.h> -Syntax error + Syntax error _ACEOF -if { (eval echo "$as_me:1831: \"$ac_cpp conftest.$ac_ext\"") >&5 +if { (eval echo "$as_me:1837: \"$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:1837: \$? = $ac_status" >&5 + echo "$as_me:1843: \$? = $ac_status" >&5 (exit $ac_status); } >/dev/null; then if test -s conftest.err; then ac_cpp_err=$ac_c_preproc_warn_flag @@ -1845,21 +1851,29 @@ ac_cpp_err=yes fi if test -z "$ac_cpp_err"; then - # Now check whether non-existent headers can be detected and how -# Skip if ac_cpp_err is not empty - ac_cpp is broken -if test -z "$ac_cpp_err"; then + : +else + echo "$as_me: failed program was:" >&5 + cat conftest.$ac_ext >&5 + # Broken: fails on valid input. +continue +fi +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 1852 "configure" +#line 1866 "configure" #include "confdefs.h" #include <ac_nonexistent.h> _ACEOF -if { (eval echo "$as_me:1856: \"$ac_cpp conftest.$ac_ext\"") >&5 +if { (eval echo "$as_me:1870: \"$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:1862: \$? = $ac_status" >&5 + echo "$as_me:1876: \$? = $ac_status" >&5 (exit $ac_status); } >/dev/null; then if test -s conftest.err; then ac_cpp_err=$ac_c_preproc_warn_flag @@ -1870,53 +1884,54 @@ ac_cpp_err=yes fi if test -z "$ac_cpp_err"; then - # cannot detect missing includes at all -ac_cpp_err=yes + # Broken: success on invalid input. +continue else echo "$as_me: failed program was:" >&5 cat conftest.$ac_ext >&5 - if test "x$ac_cpp_err" = xmaybe; then - ac_c_preproc_warn_flag=yes - else - ac_c_preproc_warn_flag= - fi - ac_cpp_err= + # Passes both tests. +ac_preproc_ok=: +break fi 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 +if $ac_preproc_ok; then + break fi -else - echo "$as_me: failed program was:" >&5 - cat conftest.$ac_ext >&5 - -fi -rm -f conftest.err conftest.$ac_ext - if test -z "$ac_cpp_err"; then - break - fi + done ac_cv_prog_CPP=$CPP fi CPP=$ac_cv_prog_CPP else + ac_cv_prog_CPP=$CPP +fi +echo "$as_me:1913: result: $CPP" >&5 +echo "${ECHO_T}$CPP" >&6 +ac_preproc_ok=false +for ac_c_preproc_warn_flag in '' yes +do # Use a header file that comes with gcc, so configuring glibc -# 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. -ac_c_preproc_warn_flag=maybe -cat >conftest.$ac_ext <<_ACEOF -#line 1908 "configure" + # 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 1923 "configure" #include "confdefs.h" #include <assert.h> -Syntax error + Syntax error _ACEOF -if { (eval echo "$as_me:1913: \"$ac_cpp conftest.$ac_ext\"") >&5 +if { (eval echo "$as_me:1928: \"$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:1919: \$? = $ac_status" >&5 + echo "$as_me:1934: \$? = $ac_status" >&5 (exit $ac_status); } >/dev/null; then if test -s conftest.err; then ac_cpp_err=$ac_c_preproc_warn_flag @@ -1927,21 +1942,29 @@ ac_cpp_err=yes fi if test -z "$ac_cpp_err"; then - # Now check whether non-existent headers can be detected and how -# Skip if ac_cpp_err is not empty - ac_cpp is broken -if test -z "$ac_cpp_err"; then + : +else + echo "$as_me: failed program was:" >&5 + cat conftest.$ac_ext >&5 + # Broken: fails on valid input. +continue +fi +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 1934 "configure" +#line 1957 "configure" #include "confdefs.h" #include <ac_nonexistent.h> _ACEOF -if { (eval echo "$as_me:1938: \"$ac_cpp conftest.$ac_ext\"") >&5 +if { (eval echo "$as_me:1961: \"$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:1944: \$? = $ac_status" >&5 + echo "$as_me:1967: \$? = $ac_status" >&5 (exit $ac_status); } >/dev/null; then if test -s conftest.err; then ac_cpp_err=$ac_c_preproc_warn_flag @@ -1952,48 +1975,41 @@ ac_cpp_err=yes fi if test -z "$ac_cpp_err"; then - # cannot detect missing includes at all -ac_cpp_err=yes + # Broken: success on invalid input. +continue else echo "$as_me: failed program was:" >&5 cat conftest.$ac_ext >&5 - if test "x$ac_cpp_err" = xmaybe; then - ac_c_preproc_warn_flag=yes - else - ac_c_preproc_warn_flag= - fi - ac_cpp_err= + # Passes both tests. +ac_preproc_ok=: +break fi rm -f conftest.err conftest.$ac_ext -fi -else - echo "$as_me: failed program was:" >&5 - cat conftest.$ac_ext >&5 - -fi + +done +# Because of `break', _AC_PREPROC_IFELSE's cleaning code was skipped. rm -f conftest.err conftest.$ac_ext - ac_cv_prog_CPP=$CPP -fi -echo "$as_me:1977: result: $CPP" >&5 -echo "${ECHO_T}$CPP" >&6 -if test -n "$ac_cpp_err"; then - { { echo "$as_me:1980: error: C preprocessor \"$CPP\" fails sanity check" >&5 +if $ac_preproc_ok; then + : +else + { { echo "$as_me:1995: 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_compiler_gnu=$ac_cv_c_compiler_gnu -echo "$as_me:1990: checking for ANSI C header files" >&5 +echo "$as_me:2006: 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 1996 "configure" +#line 2012 "configure" #include "confdefs.h" #include <stdlib.h> #include <stdarg.h> @@ -2001,13 +2017,13 @@ #include <float.h> _ACEOF -if { (eval echo "$as_me:2004: \"$ac_cpp conftest.$ac_ext\"") >&5 +if { (eval echo "$as_me:2020: \"$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:2010: \$? = $ac_status" >&5 + echo "$as_me:2026: \$? = $ac_status" >&5 (exit $ac_status); } >/dev/null; then if test -s conftest.err; then ac_cpp_err=$ac_c_preproc_warn_flag @@ -2029,7 +2045,7 @@ 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 2032 "configure" +#line 2048 "configure" #include "confdefs.h" #include <string.h> @@ -2047,7 +2063,7 @@ 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 2050 "configure" +#line 2066 "configure" #include "confdefs.h" #include <stdlib.h> @@ -2068,7 +2084,7 @@ : else cat >conftest.$ac_ext <<_ACEOF -#line 2071 "configure" +#line 2087 "configure" #include "confdefs.h" #include <ctype.h> #if ((' ' & 0x0FF) == 0x020) @@ -2094,15 +2110,15 @@ } _ACEOF rm -f conftest$ac_exeext -if { (eval echo "$as_me:2097: \"$ac_link\"") >&5 +if { (eval echo "$as_me:2113: \"$ac_link\"") >&5 (eval $ac_link) 2>&5 ac_status=$? - echo "$as_me:2100: \$? = $ac_status" >&5 + echo "$as_me:2116: \$? = $ac_status" >&5 (exit $ac_status); } && { ac_try='./conftest$ac_exeext' - { (eval echo "$as_me:2102: \"$ac_try\"") >&5 + { (eval echo "$as_me:2118: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? - echo "$as_me:2105: \$? = $ac_status" >&5 + echo "$as_me:2121: \$? = $ac_status" >&5 (exit $ac_status); }; }; then : else @@ -2111,11 +2127,11 @@ cat conftest.$ac_ext >&5 ac_cv_header_stdc=no fi -rm -f conftest$ac_exeext conftest.$ac_ext +rm -f core core.* *.core conftest$ac_exeext conftest.$ac_objext conftest.$ac_ext fi fi fi -echo "$as_me:2118: result: $ac_cv_header_stdc" >&5 +echo "$as_me:2134: result: $ac_cv_header_stdc" >&5 echo "${ECHO_T}$ac_cv_header_stdc" >&6 if test $ac_cv_header_stdc = yes; then @@ -2127,14 +2143,14 @@ ac_header_dirent=no for ac_hdr in dirent.h sys/ndir.h sys/dir.h ndir.h; do - ac_ac_Header=`echo "ac_cv_header_dirent_$ac_hdr" | $ac_tr_sh` -echo "$as_me:2131: checking for $ac_hdr that defines DIR" >&5 + as_ac_Header=`echo "ac_cv_header_dirent_$ac_hdr" | $as_tr_sh` +echo "$as_me:2147: checking for $ac_hdr that defines DIR" >&5 echo $ECHO_N "checking for $ac_hdr that defines DIR... $ECHO_C" >&6 -if eval "test \"\${$ac_ac_Header+set}\" = set"; then +if eval "test \"\${$as_ac_Header+set}\" = set"; then echo $ECHO_N "(cached) $ECHO_C" >&6 else cat >conftest.$ac_ext <<_ACEOF -#line 2137 "configure" +#line 2153 "configure" #include "confdefs.h" #include <sys/types.h> #include <$ac_hdr> @@ -2142,36 +2158,37 @@ int main () { -DIR *dirp = 0; +if ((DIR *) 0) +return 0; ; return 0; } _ACEOF rm -f conftest.$ac_objext -if { (eval echo "$as_me:2151: \"$ac_compile\"") >&5 +if { (eval echo "$as_me:2168: \"$ac_compile\"") >&5 (eval $ac_compile) 2>&5 ac_status=$? - echo "$as_me:2154: \$? = $ac_status" >&5 + echo "$as_me:2171: \$? = $ac_status" >&5 (exit $ac_status); } && { ac_try='test -s conftest.$ac_objext' - { (eval echo "$as_me:2157: \"$ac_try\"") >&5 + { (eval echo "$as_me:2174: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? - echo "$as_me:2160: \$? = $ac_status" >&5 + echo "$as_me:2177: \$? = $ac_status" >&5 (exit $ac_status); }; }; then - eval "$ac_ac_Header=yes" + eval "$as_ac_Header=yes" else echo "$as_me: failed program was:" >&5 cat conftest.$ac_ext >&5 -eval "$ac_ac_Header=no" +eval "$as_ac_Header=no" fi rm -f conftest.$ac_objext conftest.$ac_ext fi -echo "$as_me:2170: result: `eval echo '${'$ac_ac_Header'}'`" >&5 -echo "${ECHO_T}`eval echo '${'$ac_ac_Header'}'`" >&6 -if test `eval echo '${'$ac_ac_Header'}'` = yes; then +echo "$as_me:2187: 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" | $ac_tr_cpp` 1 +#define `echo "HAVE_$ac_hdr" | $as_tr_cpp` 1 EOF ac_header_dirent=$ac_hdr; break @@ -2180,7 +2197,7 @@ 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:2183: checking for opendir in -ldir" >&5 + echo "$as_me:2200: 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 @@ -2188,7 +2205,7 @@ ac_check_lib_save_LIBS=$LIBS LIBS="-ldir $LIBS" cat >conftest.$ac_ext <<_ACEOF -#line 2191 "configure" +#line 2208 "configure" #include "confdefs.h" /* Override any gcc2 internal prototype to avoid an error. */ @@ -2207,16 +2224,16 @@ } _ACEOF rm -f conftest.$ac_objext conftest$ac_exeext -if { (eval echo "$as_me:2210: \"$ac_link\"") >&5 +if { (eval echo "$as_me:2227: \"$ac_link\"") >&5 (eval $ac_link) 2>&5 ac_status=$? - echo "$as_me:2213: \$? = $ac_status" >&5 + echo "$as_me:2230: \$? = $ac_status" >&5 (exit $ac_status); } && { ac_try='test -s conftest$ac_exeext' - { (eval echo "$as_me:2216: \"$ac_try\"") >&5 + { (eval echo "$as_me:2233: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? - echo "$as_me:2219: \$? = $ac_status" >&5 + echo "$as_me:2236: \$? = $ac_status" >&5 (exit $ac_status); }; }; then ac_cv_lib_dir_opendir=yes else @@ -2227,14 +2244,14 @@ rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext LIBS=$ac_check_lib_save_LIBS fi -echo "$as_me:2230: result: $ac_cv_lib_dir_opendir" >&5 +echo "$as_me:2247: result: $ac_cv_lib_dir_opendir" >&5 echo "${ECHO_T}$ac_cv_lib_dir_opendir" >&6 if test $ac_cv_lib_dir_opendir = yes; then LIBS="$LIBS -ldir" fi else - echo "$as_me:2237: checking for opendir in -lx" >&5 + echo "$as_me:2254: 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 @@ -2242,7 +2259,7 @@ ac_check_lib_save_LIBS=$LIBS LIBS="-lx $LIBS" cat >conftest.$ac_ext <<_ACEOF -#line 2245 "configure" +#line 2262 "configure" #include "confdefs.h" /* Override any gcc2 internal prototype to avoid an error. */ @@ -2261,16 +2278,16 @@ } _ACEOF rm -f conftest.$ac_objext conftest$ac_exeext -if { (eval echo "$as_me:2264: \"$ac_link\"") >&5 +if { (eval echo "$as_me:2281: \"$ac_link\"") >&5 (eval $ac_link) 2>&5 ac_status=$? - echo "$as_me:2267: \$? = $ac_status" >&5 + echo "$as_me:2284: \$? = $ac_status" >&5 (exit $ac_status); } && { ac_try='test -s conftest$ac_exeext' - { (eval echo "$as_me:2270: \"$ac_try\"") >&5 + { (eval echo "$as_me:2287: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? - echo "$as_me:2273: \$? = $ac_status" >&5 + echo "$as_me:2290: \$? = $ac_status" >&5 (exit $ac_status); }; }; then ac_cv_lib_x_opendir=yes else @@ -2281,7 +2298,7 @@ rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext LIBS=$ac_check_lib_save_LIBS fi -echo "$as_me:2284: result: $ac_cv_lib_x_opendir" >&5 +echo "$as_me:2301: result: $ac_cv_lib_x_opendir" >&5 echo "${ECHO_T}$ac_cv_lib_x_opendir" >&6 if test $ac_cv_lib_x_opendir = yes; then LIBS="$LIBS -lx" @@ -2291,24 +2308,24 @@ for ac_header in unistd.h do -ac_ac_Header=`echo "ac_cv_header_$ac_header" | $ac_tr_sh` -echo "$as_me:2295: checking for $ac_header" >&5 +as_ac_Header=`echo "ac_cv_header_$ac_header" | $as_tr_sh` +echo "$as_me:2312: checking for $ac_header" >&5 echo $ECHO_N "checking for $ac_header... $ECHO_C" >&6 -if eval "test \"\${$ac_ac_Header+set}\" = set"; then +if eval "test \"\${$as_ac_Header+set}\" = set"; then echo $ECHO_N "(cached) $ECHO_C" >&6 else cat >conftest.$ac_ext <<_ACEOF -#line 2301 "configure" +#line 2318 "configure" #include "confdefs.h" #include <$ac_header> _ACEOF -if { (eval echo "$as_me:2305: \"$ac_cpp conftest.$ac_ext\"") >&5 +if { (eval echo "$as_me:2322: \"$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:2311: \$? = $ac_status" >&5 + echo "$as_me:2328: \$? = $ac_status" >&5 (exit $ac_status); } >/dev/null; then if test -s conftest.err; then ac_cpp_err=$ac_c_preproc_warn_flag @@ -2319,19 +2336,19 @@ ac_cpp_err=yes fi if test -z "$ac_cpp_err"; then - eval "$ac_ac_Header=yes" + eval "$as_ac_Header=yes" else echo "$as_me: failed program was:" >&5 cat conftest.$ac_ext >&5 - eval "$ac_ac_Header=no" + eval "$as_ac_Header=no" fi rm -f conftest.err conftest.$ac_ext fi -echo "$as_me:2330: result: `eval echo '${'$ac_ac_Header'}'`" >&5 -echo "${ECHO_T}`eval echo '${'$ac_ac_Header'}'`" >&6 -if test `eval echo '${'$ac_ac_Header'}'` = yes; then +echo "$as_me:2347: 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" | $ac_tr_cpp` 1 +#define `echo "HAVE_$ac_header" | $as_tr_cpp` 1 EOF fi @@ -2339,24 +2356,24 @@ for ac_header in sys/stat.h do -ac_ac_Header=`echo "ac_cv_header_$ac_header" | $ac_tr_sh` -echo "$as_me:2343: checking for $ac_header" >&5 +as_ac_Header=`echo "ac_cv_header_$ac_header" | $as_tr_sh` +echo "$as_me:2360: checking for $ac_header" >&5 echo $ECHO_N "checking for $ac_header... $ECHO_C" >&6 -if eval "test \"\${$ac_ac_Header+set}\" = set"; then +if eval "test \"\${$as_ac_Header+set}\" = set"; then echo $ECHO_N "(cached) $ECHO_C" >&6 else cat >conftest.$ac_ext <<_ACEOF -#line 2349 "configure" +#line 2366 "configure" #include "confdefs.h" #include <$ac_header> _ACEOF -if { (eval echo "$as_me:2353: \"$ac_cpp conftest.$ac_ext\"") >&5 +if { (eval echo "$as_me:2370: \"$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:2359: \$? = $ac_status" >&5 + echo "$as_me:2376: \$? = $ac_status" >&5 (exit $ac_status); } >/dev/null; then if test -s conftest.err; then ac_cpp_err=$ac_c_preproc_warn_flag @@ -2367,19 +2384,19 @@ ac_cpp_err=yes fi if test -z "$ac_cpp_err"; then - eval "$ac_ac_Header=yes" + eval "$as_ac_Header=yes" else echo "$as_me: failed program was:" >&5 cat conftest.$ac_ext >&5 - eval "$ac_ac_Header=no" + eval "$as_ac_Header=no" fi rm -f conftest.err conftest.$ac_ext fi -echo "$as_me:2378: result: `eval echo '${'$ac_ac_Header'}'`" >&5 -echo "${ECHO_T}`eval echo '${'$ac_ac_Header'}'`" >&6 -if test `eval echo '${'$ac_ac_Header'}'` = yes; then +echo "$as_me:2395: 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" | $ac_tr_cpp` 1 +#define `echo "HAVE_$ac_header" | $as_tr_cpp` 1 EOF fi @@ -2387,14 +2404,14 @@ for ac_func in pipe do -ac_ac_var=`echo "ac_cv_func_$ac_func" | $ac_tr_sh` -echo "$as_me:2391: checking for $ac_func" >&5 +as_ac_var=`echo "ac_cv_func_$ac_func" | $as_tr_sh` +echo "$as_me:2408: checking for $ac_func" >&5 echo $ECHO_N "checking for $ac_func... $ECHO_C" >&6 -if eval "test \"\${$ac_ac_var+set}\" = set"; then +if eval "test \"\${$as_ac_var+set}\" = set"; then echo $ECHO_N "(cached) $ECHO_C" >&6 else cat >conftest.$ac_ext <<_ACEOF -#line 2397 "configure" +#line 2414 "configure" #include "confdefs.h" /* System header to define __stub macros and hopefully few prototypes, which can conflict with char $ac_func (); below. */ @@ -2425,30 +2442,30 @@ } _ACEOF rm -f conftest.$ac_objext conftest$ac_exeext -if { (eval echo "$as_me:2428: \"$ac_link\"") >&5 +if { (eval echo "$as_me:2445: \"$ac_link\"") >&5 (eval $ac_link) 2>&5 ac_status=$? - echo "$as_me:2431: \$? = $ac_status" >&5 + echo "$as_me:2448: \$? = $ac_status" >&5 (exit $ac_status); } && { ac_try='test -s conftest$ac_exeext' - { (eval echo "$as_me:2434: \"$ac_try\"") >&5 + { (eval echo "$as_me:2451: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? - echo "$as_me:2437: \$? = $ac_status" >&5 + echo "$as_me:2454: \$? = $ac_status" >&5 (exit $ac_status); }; }; then - eval "$ac_ac_var=yes" + eval "$as_ac_var=yes" else echo "$as_me: failed program was:" >&5 cat conftest.$ac_ext >&5 -eval "$ac_ac_var=no" +eval "$as_ac_var=no" fi rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext fi -echo "$as_me:2447: result: `eval echo '${'$ac_ac_var'}'`" >&5 -echo "${ECHO_T}`eval echo '${'$ac_ac_var'}'`" >&6 -if test `eval echo '${'$ac_ac_var'}'` = yes; then +echo "$as_me:2464: 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" | $ac_tr_cpp` 1 +#define `echo "HAVE_$ac_func" | $as_tr_cpp` 1 EOF cat >>confdefs.h <<\EOF @@ -2460,14 +2477,14 @@ for ac_func in connect do -ac_ac_var=`echo "ac_cv_func_$ac_func" | $ac_tr_sh` -echo "$as_me:2464: checking for $ac_func" >&5 +as_ac_var=`echo "ac_cv_func_$ac_func" | $as_tr_sh` +echo "$as_me:2481: checking for $ac_func" >&5 echo $ECHO_N "checking for $ac_func... $ECHO_C" >&6 -if eval "test \"\${$ac_ac_var+set}\" = set"; then +if eval "test \"\${$as_ac_var+set}\" = set"; then echo $ECHO_N "(cached) $ECHO_C" >&6 else cat >conftest.$ac_ext <<_ACEOF -#line 2470 "configure" +#line 2487 "configure" #include "confdefs.h" /* System header to define __stub macros and hopefully few prototypes, which can conflict with char $ac_func (); below. */ @@ -2498,30 +2515,30 @@ } _ACEOF rm -f conftest.$ac_objext conftest$ac_exeext -if { (eval echo "$as_me:2501: \"$ac_link\"") >&5 +if { (eval echo "$as_me:2518: \"$ac_link\"") >&5 (eval $ac_link) 2>&5 ac_status=$? - echo "$as_me:2504: \$? = $ac_status" >&5 + echo "$as_me:2521: \$? = $ac_status" >&5 (exit $ac_status); } && { ac_try='test -s conftest$ac_exeext' - { (eval echo "$as_me:2507: \"$ac_try\"") >&5 + { (eval echo "$as_me:2524: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? - echo "$as_me:2510: \$? = $ac_status" >&5 + echo "$as_me:2527: \$? = $ac_status" >&5 (exit $ac_status); }; }; then - eval "$ac_ac_var=yes" + eval "$as_ac_var=yes" else echo "$as_me: failed program was:" >&5 cat conftest.$ac_ext >&5 -eval "$ac_ac_var=no" +eval "$as_ac_var=no" fi rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext fi -echo "$as_me:2520: result: `eval echo '${'$ac_ac_var'}'`" >&5 -echo "${ECHO_T}`eval echo '${'$ac_ac_var'}'`" >&6 -if test `eval echo '${'$ac_ac_var'}'` = yes; then +echo "$as_me:2537: 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" | $ac_tr_cpp` 1 +#define `echo "HAVE_$ac_func" | $as_tr_cpp` 1 EOF fi @@ -2529,7 +2546,7 @@ if test x"$ac_cv_func_connect" = x"no"; then if test -z "$libsocket"; then - echo "$as_me:2532: checking for socket in -lsocket" >&5 + echo "$as_me:2549: checking for socket in -lsocket" >&5 echo $ECHO_N "checking for socket in -lsocket... $ECHO_C" >&6 if test "${ac_cv_lib_socket_socket+set}" = set; then echo $ECHO_N "(cached) $ECHO_C" >&6 @@ -2537,7 +2554,7 @@ ac_check_lib_save_LIBS=$LIBS LIBS="-lsocket $LIBS" cat >conftest.$ac_ext <<_ACEOF -#line 2540 "configure" +#line 2557 "configure" #include "confdefs.h" /* Override any gcc2 internal prototype to avoid an error. */ @@ -2556,16 +2573,16 @@ } _ACEOF rm -f conftest.$ac_objext conftest$ac_exeext -if { (eval echo "$as_me:2559: \"$ac_link\"") >&5 +if { (eval echo "$as_me:2576: \"$ac_link\"") >&5 (eval $ac_link) 2>&5 ac_status=$? - echo "$as_me:2562: \$? = $ac_status" >&5 + echo "$as_me:2579: \$? = $ac_status" >&5 (exit $ac_status); } && { ac_try='test -s conftest$ac_exeext' - { (eval echo "$as_me:2565: \"$ac_try\"") >&5 + { (eval echo "$as_me:2582: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? - echo "$as_me:2568: \$? = $ac_status" >&5 + echo "$as_me:2585: \$? = $ac_status" >&5 (exit $ac_status); }; }; then ac_cv_lib_socket_socket=yes else @@ -2576,7 +2593,7 @@ rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext LIBS=$ac_check_lib_save_LIBS fi -echo "$as_me:2579: result: $ac_cv_lib_socket_socket" >&5 +echo "$as_me:2596: result: $ac_cv_lib_socket_socket" >&5 echo "${ECHO_T}$ac_cv_lib_socket_socket" >&6 if test $ac_cv_lib_socket_socket = yes; then LIBS="$LIBS -lsocket" @@ -2585,7 +2602,7 @@ fi if test -z "$libinet"; then - echo "$as_me:2588: checking for socket in -linet" >&5 + echo "$as_me:2605: checking for socket in -linet" >&5 echo $ECHO_N "checking for socket in -linet... $ECHO_C" >&6 if test "${ac_cv_lib_inet_socket+set}" = set; then echo $ECHO_N "(cached) $ECHO_C" >&6 @@ -2593,7 +2610,7 @@ ac_check_lib_save_LIBS=$LIBS LIBS="-linet $LIBS" cat >conftest.$ac_ext <<_ACEOF -#line 2596 "configure" +#line 2613 "configure" #include "confdefs.h" /* Override any gcc2 internal prototype to avoid an error. */ @@ -2612,16 +2629,16 @@ } _ACEOF rm -f conftest.$ac_objext conftest$ac_exeext -if { (eval echo "$as_me:2615: \"$ac_link\"") >&5 +if { (eval echo "$as_me:2632: \"$ac_link\"") >&5 (eval $ac_link) 2>&5 ac_status=$? - echo "$as_me:2618: \$? = $ac_status" >&5 + echo "$as_me:2635: \$? = $ac_status" >&5 (exit $ac_status); } && { ac_try='test -s conftest$ac_exeext' - { (eval echo "$as_me:2621: \"$ac_try\"") >&5 + { (eval echo "$as_me:2638: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? - echo "$as_me:2624: \$? = $ac_status" >&5 + echo "$as_me:2641: \$? = $ac_status" >&5 (exit $ac_status); }; }; then ac_cv_lib_inet_socket=yes else @@ -2632,7 +2649,7 @@ rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext LIBS=$ac_check_lib_save_LIBS fi -echo "$as_me:2635: result: $ac_cv_lib_inet_socket" >&5 +echo "$as_me:2652: result: $ac_cv_lib_inet_socket" >&5 echo "${ECHO_T}$ac_cv_lib_inet_socket" >&6 if test $ac_cv_lib_inet_socket = yes; then libnsl=1; LIBS="$LIBS -linet -lnsl_s" @@ -2641,7 +2658,7 @@ fi if test -z "$libnsl"; then - echo "$as_me:2644: checking for gethostname in -lnsl" >&5 + echo "$as_me:2661: checking for gethostname in -lnsl" >&5 echo $ECHO_N "checking for gethostname in -lnsl... $ECHO_C" >&6 if test "${ac_cv_lib_nsl_gethostname+set}" = set; then echo $ECHO_N "(cached) $ECHO_C" >&6 @@ -2649,7 +2666,7 @@ ac_check_lib_save_LIBS=$LIBS LIBS="-lnsl $LIBS" cat >conftest.$ac_ext <<_ACEOF -#line 2652 "configure" +#line 2669 "configure" #include "confdefs.h" /* Override any gcc2 internal prototype to avoid an error. */ @@ -2668,16 +2685,16 @@ } _ACEOF rm -f conftest.$ac_objext conftest$ac_exeext -if { (eval echo "$as_me:2671: \"$ac_link\"") >&5 +if { (eval echo "$as_me:2688: \"$ac_link\"") >&5 (eval $ac_link) 2>&5 ac_status=$? - echo "$as_me:2674: \$? = $ac_status" >&5 + echo "$as_me:2691: \$? = $ac_status" >&5 (exit $ac_status); } && { ac_try='test -s conftest$ac_exeext' - { (eval echo "$as_me:2677: \"$ac_try\"") >&5 + { (eval echo "$as_me:2694: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? - echo "$as_me:2680: \$? = $ac_status" >&5 + echo "$as_me:2697: \$? = $ac_status" >&5 (exit $ac_status); }; }; then ac_cv_lib_nsl_gethostname=yes else @@ -2688,7 +2705,7 @@ rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext LIBS=$ac_check_lib_save_LIBS fi -echo "$as_me:2691: result: $ac_cv_lib_nsl_gethostname" >&5 +echo "$as_me:2708: result: $ac_cv_lib_nsl_gethostname" >&5 echo "${ECHO_T}$ac_cv_lib_nsl_gethostname" >&6 if test $ac_cv_lib_nsl_gethostname = yes; then LIBS="$LIBS -lnsl" @@ -2697,7 +2714,7 @@ fi fi -echo "$as_me:2700: checking for getpwnam in -lsun" >&5 +echo "$as_me:2717: checking for getpwnam in -lsun" >&5 echo $ECHO_N "checking for getpwnam in -lsun... $ECHO_C" >&6 if test "${ac_cv_lib_sun_getpwnam+set}" = set; then echo $ECHO_N "(cached) $ECHO_C" >&6 @@ -2705,7 +2722,7 @@ ac_check_lib_save_LIBS=$LIBS LIBS="-lsun $LIBS" cat >conftest.$ac_ext <<_ACEOF -#line 2708 "configure" +#line 2725 "configure" #include "confdefs.h" /* Override any gcc2 internal prototype to avoid an error. */ @@ -2724,16 +2741,16 @@ } _ACEOF rm -f conftest.$ac_objext conftest$ac_exeext -if { (eval echo "$as_me:2727: \"$ac_link\"") >&5 +if { (eval echo "$as_me:2744: \"$ac_link\"") >&5 (eval $ac_link) 2>&5 ac_status=$? - echo "$as_me:2730: \$? = $ac_status" >&5 + echo "$as_me:2747: \$? = $ac_status" >&5 (exit $ac_status); } && { ac_try='test -s conftest$ac_exeext' - { (eval echo "$as_me:2733: \"$ac_try\"") >&5 + { (eval echo "$as_me:2750: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? - echo "$as_me:2736: \$? = $ac_status" >&5 + echo "$as_me:2753: \$? = $ac_status" >&5 (exit $ac_status); }; }; then ac_cv_lib_sun_getpwnam=yes else @@ -2744,13 +2761,13 @@ rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext LIBS=$ac_check_lib_save_LIBS fi -echo "$as_me:2747: result: $ac_cv_lib_sun_getpwnam" >&5 +echo "$as_me:2764: result: $ac_cv_lib_sun_getpwnam" >&5 echo "${ECHO_T}$ac_cv_lib_sun_getpwnam" >&6 if test $ac_cv_lib_sun_getpwnam = yes; then LIBS="$LIBS -lsun" fi -echo "$as_me:2753: checking for inet_addr in -ldgc" >&5 +echo "$as_me:2770: checking for inet_addr in -ldgc" >&5 echo $ECHO_N "checking for inet_addr in -ldgc... $ECHO_C" >&6 if test "${ac_cv_lib_dgc_inet_addr+set}" = set; then echo $ECHO_N "(cached) $ECHO_C" >&6 @@ -2758,7 +2775,7 @@ ac_check_lib_save_LIBS=$LIBS LIBS="-ldgc $LIBS" cat >conftest.$ac_ext <<_ACEOF -#line 2761 "configure" +#line 2778 "configure" #include "confdefs.h" /* Override any gcc2 internal prototype to avoid an error. */ @@ -2777,16 +2794,16 @@ } _ACEOF rm -f conftest.$ac_objext conftest$ac_exeext -if { (eval echo "$as_me:2780: \"$ac_link\"") >&5 +if { (eval echo "$as_me:2797: \"$ac_link\"") >&5 (eval $ac_link) 2>&5 ac_status=$? - echo "$as_me:2783: \$? = $ac_status" >&5 + echo "$as_me:2800: \$? = $ac_status" >&5 (exit $ac_status); } && { ac_try='test -s conftest$ac_exeext' - { (eval echo "$as_me:2786: \"$ac_try\"") >&5 + { (eval echo "$as_me:2803: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? - echo "$as_me:2789: \$? = $ac_status" >&5 + echo "$as_me:2806: \$? = $ac_status" >&5 (exit $ac_status); }; }; then ac_cv_lib_dgc_inet_addr=yes else @@ -2797,13 +2814,13 @@ rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext LIBS=$ac_check_lib_save_LIBS fi -echo "$as_me:2800: result: $ac_cv_lib_dgc_inet_addr" >&5 +echo "$as_me:2817: result: $ac_cv_lib_dgc_inet_addr" >&5 echo "${ECHO_T}$ac_cv_lib_dgc_inet_addr" >&6 if test $ac_cv_lib_dgc_inet_addr = yes; then LIBS="$LIBS -ldgc" fi -echo "$as_me:2806: checking for gethostbyname in -lresolv" >&5 +echo "$as_me:2823: checking for gethostbyname in -lresolv" >&5 echo $ECHO_N "checking for gethostbyname in -lresolv... $ECHO_C" >&6 if test "${ac_cv_lib_resolv_gethostbyname+set}" = set; then echo $ECHO_N "(cached) $ECHO_C" >&6 @@ -2811,7 +2828,7 @@ ac_check_lib_save_LIBS=$LIBS LIBS="-lresolv $LIBS" cat >conftest.$ac_ext <<_ACEOF -#line 2814 "configure" +#line 2831 "configure" #include "confdefs.h" /* Override any gcc2 internal prototype to avoid an error. */ @@ -2830,16 +2847,16 @@ } _ACEOF rm -f conftest.$ac_objext conftest$ac_exeext -if { (eval echo "$as_me:2833: \"$ac_link\"") >&5 +if { (eval echo "$as_me:2850: \"$ac_link\"") >&5 (eval $ac_link) 2>&5 ac_status=$? - echo "$as_me:2836: \$? = $ac_status" >&5 + echo "$as_me:2853: \$? = $ac_status" >&5 (exit $ac_status); } && { ac_try='test -s conftest$ac_exeext' - { (eval echo "$as_me:2839: \"$ac_try\"") >&5 + { (eval echo "$as_me:2856: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? - echo "$as_me:2842: \$? = $ac_status" >&5 + echo "$as_me:2859: \$? = $ac_status" >&5 (exit $ac_status); }; }; then ac_cv_lib_resolv_gethostbyname=yes else @@ -2850,7 +2867,7 @@ rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext LIBS=$ac_check_lib_save_LIBS fi -echo "$as_me:2853: result: $ac_cv_lib_resolv_gethostbyname" >&5 +echo "$as_me:2870: result: $ac_cv_lib_resolv_gethostbyname" >&5 echo "${ECHO_T}$ac_cv_lib_resolv_gethostbyname" >&6 if test $ac_cv_lib_resolv_gethostbyname = yes; then LIBS="$LIBS -lresolv" @@ -2906,7 +2923,7 @@ # Extract the first word of "glib-config", so it can be a program name with args. set dummy glib-config; ac_word=$2 -echo "$as_me:2909: checking for $ac_word" >&5 +echo "$as_me:2926: checking for $ac_word" >&5 echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6 if test "${ac_cv_path_GLIB_CONFIG+set}" = set; then echo $ECHO_N "(cached) $ECHO_C" >&6 @@ -2923,13 +2940,7 @@ test -z "$ac_dir" && ac_dir=. if $as_executable_p "$ac_dir/$ac_word"; then ac_cv_path_GLIB_CONFIG="$ac_dir/$ac_word" - echo "$as_me:2926: found $ac_dir/$ac_word" >&5 - { ac_try='$ac_dir/$ac_word --version </dev/null >&2' - { (eval echo "$as_me:2928: \"$ac_try\"") >&5 - (eval $ac_try) 2>&5 - ac_status=$? - echo "$as_me:2931: \$? = $ac_status" >&5 - (exit $ac_status); }; } + echo "$as_me:2943: found $ac_dir/$ac_word" >&5 break fi done @@ -2941,15 +2952,15 @@ GLIB_CONFIG=$ac_cv_path_GLIB_CONFIG if test -n "$GLIB_CONFIG"; then - echo "$as_me:2944: result: $GLIB_CONFIG" >&5 + echo "$as_me:2955: result: $GLIB_CONFIG" >&5 echo "${ECHO_T}$GLIB_CONFIG" >&6 else - echo "$as_me:2947: result: no" >&5 + echo "$as_me:2958: result: no" >&5 echo "${ECHO_T}no" >&6 fi min_glib_version=1.2.0 - echo "$as_me:2952: checking for GLIB - version >= $min_glib_version" >&5 + echo "$as_me:2963: checking for GLIB - version >= $min_glib_version" >&5 echo $ECHO_N "checking for GLIB - version >= $min_glib_version... $ECHO_C" >&6 no_glib="" if test "$GLIB_CONFIG" = "no" ; then @@ -2973,7 +2984,7 @@ echo $ac_n "cross compiling; assumed OK... $ac_c" else cat >conftest.$ac_ext <<_ACEOF -#line 2976 "configure" +#line 2987 "configure" #include "confdefs.h" #include <glib.h> @@ -3050,15 +3061,15 @@ _ACEOF rm -f conftest$ac_exeext -if { (eval echo "$as_me:3053: \"$ac_link\"") >&5 +if { (eval echo "$as_me:3064: \"$ac_link\"") >&5 (eval $ac_link) 2>&5 ac_status=$? - echo "$as_me:3056: \$? = $ac_status" >&5 + echo "$as_me:3067: \$? = $ac_status" >&5 (exit $ac_status); } && { ac_try='./conftest$ac_exeext' - { (eval echo "$as_me:3058: \"$ac_try\"") >&5 + { (eval echo "$as_me:3069: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? - echo "$as_me:3061: \$? = $ac_status" >&5 + echo "$as_me:3072: \$? = $ac_status" >&5 (exit $ac_status); }; }; then : else @@ -3067,18 +3078,18 @@ cat conftest.$ac_ext >&5 no_glib=yes fi -rm -f conftest$ac_exeext conftest.$ac_ext +rm -f core core.* *.core conftest$ac_exeext conftest.$ac_objext conftest.$ac_ext fi CFLAGS="$ac_save_CFLAGS" LIBS="$ac_save_LIBS" fi fi if test "x$no_glib" = x ; then - echo "$as_me:3077: result: yes" >&5 + echo "$as_me:3088: result: yes" >&5 echo "${ECHO_T}yes" >&6 : else - echo "$as_me:3081: result: no" >&5 + echo "$as_me:3092: result: no" >&5 echo "${ECHO_T}no" >&6 if test "$GLIB_CONFIG" = "no" ; then echo "*** The glib-config script installed by GLIB could not be found" @@ -3093,7 +3104,7 @@ CFLAGS="$CFLAGS $GLIB_CFLAGS" LIBS="$LIBS $GLIB_LIBS" cat >conftest.$ac_ext <<_ACEOF -#line 3096 "configure" +#line 3107 "configure" #include "confdefs.h" #include <glib.h> @@ -3108,16 +3119,16 @@ } _ACEOF rm -f conftest.$ac_objext conftest$ac_exeext -if { (eval echo "$as_me:3111: \"$ac_link\"") >&5 +if { (eval echo "$as_me:3122: \"$ac_link\"") >&5 (eval $ac_link) 2>&5 ac_status=$? - echo "$as_me:3114: \$? = $ac_status" >&5 + echo "$as_me:3125: \$? = $ac_status" >&5 (exit $ac_status); } && { ac_try='test -s conftest$ac_exeext' - { (eval echo "$as_me:3117: \"$ac_try\"") >&5 + { (eval echo "$as_me:3128: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? - echo "$as_me:3120: \$? = $ac_status" >&5 + echo "$as_me:3131: \$? = $ac_status" >&5 (exit $ac_status); }; }; then echo "*** The test program compiled, but did not run. This usually means" echo "*** that the run-time linker is not finding GLIB or finding the wrong" @@ -3143,10 +3154,10 @@ fi GLIB_CFLAGS="" GLIB_LIBS="" - { { echo "$as_me:3146: error: { { echo \"$as_me:3146: error: Cannot find GLIB: Is glib-config in path?\" >&5 + { { echo "$as_me:3157: error: { { echo \"$as_me:3157: error: Cannot find GLIB: Is glib-config in path?\" >&5 echo \"$as_me: error: Cannot find GLIB: Is glib-config in path?\" >&2;} { (exit 1); exit 1; }; }" >&5 -echo "$as_me: error: { { echo \"$as_me:3149: error: Cannot find GLIB: Is glib-config in path?\" >&5 +echo "$as_me: error: { { echo \"$as_me:3160: error: Cannot find GLIB: Is glib-config in path?\" >&5 echo \"$as_me: error: Cannot find GLIB: Is glib-config in path?\" >&2;} { (exit 1); exit 1; }; }" >&2;} { (exit 1); exit 1; }; } @@ -3201,7 +3212,7 @@ # Extract the first word of "gtk-config", so it can be a program name with args. set dummy gtk-config; ac_word=$2 -echo "$as_me:3204: checking for $ac_word" >&5 +echo "$as_me:3215: checking for $ac_word" >&5 echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6 if test "${ac_cv_path_GTK_CONFIG+set}" = set; then echo $ECHO_N "(cached) $ECHO_C" >&6 @@ -3218,13 +3229,7 @@ test -z "$ac_dir" && ac_dir=. if $as_executable_p "$ac_dir/$ac_word"; then ac_cv_path_GTK_CONFIG="$ac_dir/$ac_word" - echo "$as_me:3221: found $ac_dir/$ac_word" >&5 - { ac_try='$ac_dir/$ac_word --version </dev/null >&2' - { (eval echo "$as_me:3223: \"$ac_try\"") >&5 - (eval $ac_try) 2>&5 - ac_status=$? - echo "$as_me:3226: \$? = $ac_status" >&5 - (exit $ac_status); }; } + echo "$as_me:3232: found $ac_dir/$ac_word" >&5 break fi done @@ -3236,15 +3241,15 @@ GTK_CONFIG=$ac_cv_path_GTK_CONFIG if test -n "$GTK_CONFIG"; then - echo "$as_me:3239: result: $GTK_CONFIG" >&5 + echo "$as_me:3244: result: $GTK_CONFIG" >&5 echo "${ECHO_T}$GTK_CONFIG" >&6 else - echo "$as_me:3242: result: no" >&5 + echo "$as_me:3247: result: no" >&5 echo "${ECHO_T}no" >&6 fi min_gtk_version=1.2.0 - echo "$as_me:3247: checking for GTK - version >= $min_gtk_version" >&5 + echo "$as_me:3252: checking for GTK - version >= $min_gtk_version" >&5 echo $ECHO_N "checking for GTK - version >= $min_gtk_version... $ECHO_C" >&6 no_gtk="" if test "$GTK_CONFIG" = "no" ; then @@ -3268,7 +3273,7 @@ echo $ac_n "cross compiling; assumed OK... $ac_c" else cat >conftest.$ac_ext <<_ACEOF -#line 3271 "configure" +#line 3276 "configure" #include "confdefs.h" #include <gtk/gtk.h> @@ -3347,15 +3352,15 @@ _ACEOF rm -f conftest$ac_exeext -if { (eval echo "$as_me:3350: \"$ac_link\"") >&5 +if { (eval echo "$as_me:3355: \"$ac_link\"") >&5 (eval $ac_link) 2>&5 ac_status=$? - echo "$as_me:3353: \$? = $ac_status" >&5 + echo "$as_me:3358: \$? = $ac_status" >&5 (exit $ac_status); } && { ac_try='./conftest$ac_exeext' - { (eval echo "$as_me:3355: \"$ac_try\"") >&5 + { (eval echo "$as_me:3360: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? - echo "$as_me:3358: \$? = $ac_status" >&5 + echo "$as_me:3363: \$? = $ac_status" >&5 (exit $ac_status); }; }; then : else @@ -3364,18 +3369,18 @@ cat conftest.$ac_ext >&5 no_gtk=yes fi -rm -f conftest$ac_exeext conftest.$ac_ext +rm -f core core.* *.core conftest$ac_exeext conftest.$ac_objext conftest.$ac_ext fi CFLAGS="$ac_save_CFLAGS" LIBS="$ac_save_LIBS" fi fi if test "x$no_gtk" = x ; then - echo "$as_me:3374: result: yes" >&5 + echo "$as_me:3379: result: yes" >&5 echo "${ECHO_T}yes" >&6 : else - echo "$as_me:3378: result: no" >&5 + echo "$as_me:3383: result: no" >&5 echo "${ECHO_T}no" >&6 if test "$GTK_CONFIG" = "no" ; then echo "*** The gtk-config script installed by GTK could not be found" @@ -3390,7 +3395,7 @@ CFLAGS="$CFLAGS $GTK_CFLAGS" LIBS="$LIBS $GTK_LIBS" cat >conftest.$ac_ext <<_ACEOF -#line 3393 "configure" +#line 3398 "configure" #include "confdefs.h" #include <gtk/gtk.h> @@ -3405,16 +3410,16 @@ } _ACEOF rm -f conftest.$ac_objext conftest$ac_exeext -if { (eval echo "$as_me:3408: \"$ac_link\"") >&5 +if { (eval echo "$as_me:3413: \"$ac_link\"") >&5 (eval $ac_link) 2>&5 ac_status=$? - echo "$as_me:3411: \$? = $ac_status" >&5 + echo "$as_me:3416: \$? = $ac_status" >&5 (exit $ac_status); } && { ac_try='test -s conftest$ac_exeext' - { (eval echo "$as_me:3414: \"$ac_try\"") >&5 + { (eval echo "$as_me:3419: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? - echo "$as_me:3417: \$? = $ac_status" >&5 + echo "$as_me:3422: \$? = $ac_status" >&5 (exit $ac_status); }; }; then echo "*** The test program compiled, but did not run. This usually means" echo "*** that the run-time linker is not finding GTK or finding the wrong" @@ -3440,10 +3445,10 @@ fi GTK_CFLAGS="" GTK_LIBS="" - { { echo "$as_me:3443: error: { { echo \"$as_me:3443: error: Cannot find GTK: Is gtk-config in path?\" >&5 + { { echo "$as_me:3448: error: { { echo \"$as_me:3448: error: Cannot find GTK: Is gtk-config in path?\" >&5 echo \"$as_me: error: Cannot find GTK: Is gtk-config in path?\" >&2;} { (exit 1); exit 1; }; }" >&5 -echo "$as_me: error: { { echo \"$as_me:3446: error: Cannot find GTK: Is gtk-config in path?\" >&5 +echo "$as_me: error: { { echo \"$as_me:3451: error: Cannot find GTK: Is gtk-config in path?\" >&5 echo \"$as_me: error: Cannot find GTK: Is gtk-config in path?\" >&2;} { (exit 1); exit 1; }; }" >&2;} { (exit 1); exit 1; }; } @@ -3451,23 +3456,23 @@ rm -f conf.gtktest -echo "$as_me:3454: checking for pthread.h" >&5 +echo "$as_me:3459: checking for pthread.h" >&5 echo $ECHO_N "checking for pthread.h... $ECHO_C" >&6 if test "${ac_cv_header_pthread_h+set}" = set; then echo $ECHO_N "(cached) $ECHO_C" >&6 else cat >conftest.$ac_ext <<_ACEOF -#line 3460 "configure" +#line 3465 "configure" #include "confdefs.h" #include <pthread.h> _ACEOF -if { (eval echo "$as_me:3464: \"$ac_cpp conftest.$ac_ext\"") >&5 +if { (eval echo "$as_me:3469: \"$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:3470: \$? = $ac_status" >&5 + echo "$as_me:3475: \$? = $ac_status" >&5 (exit $ac_status); } >/dev/null; then if test -s conftest.err; then ac_cpp_err=$ac_c_preproc_warn_flag @@ -3486,17 +3491,17 @@ fi rm -f conftest.err conftest.$ac_ext fi -echo "$as_me:3489: result: $ac_cv_header_pthread_h" >&5 +echo "$as_me:3494: result: $ac_cv_header_pthread_h" >&5 echo "${ECHO_T}$ac_cv_header_pthread_h" >&6 if test $ac_cv_header_pthread_h = yes; then : else - { { echo "$as_me:3494: error: pthread header not found. Dynamic Windows cannot build without it." >&5 + { { echo "$as_me:3499: error: pthread header not found. Dynamic Windows cannot build without it." >&5 echo "$as_me: error: pthread header not found. Dynamic Windows cannot build without it." >&2;} { (exit 1); exit 1; }; } fi -echo "$as_me:3499: checking for pthread_attr_init in -lpthread" >&5 +echo "$as_me:3504: checking for pthread_attr_init in -lpthread" >&5 echo $ECHO_N "checking for pthread_attr_init in -lpthread... $ECHO_C" >&6 if test "${ac_cv_lib_pthread_pthread_attr_init+set}" = set; then echo $ECHO_N "(cached) $ECHO_C" >&6 @@ -3504,7 +3509,7 @@ ac_check_lib_save_LIBS=$LIBS LIBS="-lpthread $LIBS" cat >conftest.$ac_ext <<_ACEOF -#line 3507 "configure" +#line 3512 "configure" #include "confdefs.h" /* Override any gcc2 internal prototype to avoid an error. */ @@ -3523,16 +3528,16 @@ } _ACEOF rm -f conftest.$ac_objext conftest$ac_exeext -if { (eval echo "$as_me:3526: \"$ac_link\"") >&5 +if { (eval echo "$as_me:3531: \"$ac_link\"") >&5 (eval $ac_link) 2>&5 ac_status=$? - echo "$as_me:3529: \$? = $ac_status" >&5 + echo "$as_me:3534: \$? = $ac_status" >&5 (exit $ac_status); } && { ac_try='test -s conftest$ac_exeext' - { (eval echo "$as_me:3532: \"$ac_try\"") >&5 + { (eval echo "$as_me:3537: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? - echo "$as_me:3535: \$? = $ac_status" >&5 + echo "$as_me:3540: \$? = $ac_status" >&5 (exit $ac_status); }; }; then ac_cv_lib_pthread_pthread_attr_init=yes else @@ -3543,12 +3548,12 @@ rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext LIBS=$ac_check_lib_save_LIBS fi -echo "$as_me:3546: result: $ac_cv_lib_pthread_pthread_attr_init" >&5 +echo "$as_me:3551: result: $ac_cv_lib_pthread_pthread_attr_init" >&5 echo "${ECHO_T}$ac_cv_lib_pthread_pthread_attr_init" >&6 if test $ac_cv_lib_pthread_pthread_attr_init = yes; then PTHREAD_LIBS="-lpthread" else - echo "$as_me:3551: checking for pthread_attr_init in -lpthreads" >&5 + echo "$as_me:3556: checking for pthread_attr_init in -lpthreads" >&5 echo $ECHO_N "checking for pthread_attr_init in -lpthreads... $ECHO_C" >&6 if test "${ac_cv_lib_pthreads_pthread_attr_init+set}" = set; then echo $ECHO_N "(cached) $ECHO_C" >&6 @@ -3556,7 +3561,7 @@ ac_check_lib_save_LIBS=$LIBS LIBS="-lpthreads $LIBS" cat >conftest.$ac_ext <<_ACEOF -#line 3559 "configure" +#line 3564 "configure" #include "confdefs.h" /* Override any gcc2 internal prototype to avoid an error. */ @@ -3575,16 +3580,16 @@ } _ACEOF rm -f conftest.$ac_objext conftest$ac_exeext -if { (eval echo "$as_me:3578: \"$ac_link\"") >&5 +if { (eval echo "$as_me:3583: \"$ac_link\"") >&5 (eval $ac_link) 2>&5 ac_status=$? - echo "$as_me:3581: \$? = $ac_status" >&5 + echo "$as_me:3586: \$? = $ac_status" >&5 (exit $ac_status); } && { ac_try='test -s conftest$ac_exeext' - { (eval echo "$as_me:3584: \"$ac_try\"") >&5 + { (eval echo "$as_me:3589: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? - echo "$as_me:3587: \$? = $ac_status" >&5 + echo "$as_me:3592: \$? = $ac_status" >&5 (exit $ac_status); }; }; then ac_cv_lib_pthreads_pthread_attr_init=yes else @@ -3595,12 +3600,12 @@ rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext LIBS=$ac_check_lib_save_LIBS fi -echo "$as_me:3598: result: $ac_cv_lib_pthreads_pthread_attr_init" >&5 +echo "$as_me:3603: result: $ac_cv_lib_pthreads_pthread_attr_init" >&5 echo "${ECHO_T}$ac_cv_lib_pthreads_pthread_attr_init" >&6 if test $ac_cv_lib_pthreads_pthread_attr_init = yes; then PTHREAD_LIBS="-lpthreads" else - echo "$as_me:3603: checking for pthread_attr_init in -lc_r" >&5 + echo "$as_me:3608: checking for pthread_attr_init in -lc_r" >&5 echo $ECHO_N "checking for pthread_attr_init in -lc_r... $ECHO_C" >&6 if test "${ac_cv_lib_c_r_pthread_attr_init+set}" = set; then echo $ECHO_N "(cached) $ECHO_C" >&6 @@ -3608,7 +3613,7 @@ ac_check_lib_save_LIBS=$LIBS LIBS="-lc_r $LIBS" cat >conftest.$ac_ext <<_ACEOF -#line 3611 "configure" +#line 3616 "configure" #include "confdefs.h" /* Override any gcc2 internal prototype to avoid an error. */ @@ -3627,16 +3632,16 @@ } _ACEOF rm -f conftest.$ac_objext conftest$ac_exeext -if { (eval echo "$as_me:3630: \"$ac_link\"") >&5 +if { (eval echo "$as_me:3635: \"$ac_link\"") >&5 (eval $ac_link) 2>&5 ac_status=$? - echo "$as_me:3633: \$? = $ac_status" >&5 + echo "$as_me:3638: \$? = $ac_status" >&5 (exit $ac_status); } && { ac_try='test -s conftest$ac_exeext' - { (eval echo "$as_me:3636: \"$ac_try\"") >&5 + { (eval echo "$as_me:3641: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? - echo "$as_me:3639: \$? = $ac_status" >&5 + echo "$as_me:3644: \$? = $ac_status" >&5 (exit $ac_status); }; }; then ac_cv_lib_c_r_pthread_attr_init=yes else @@ -3647,12 +3652,12 @@ rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext LIBS=$ac_check_lib_save_LIBS fi -echo "$as_me:3650: result: $ac_cv_lib_c_r_pthread_attr_init" >&5 +echo "$as_me:3655: result: $ac_cv_lib_c_r_pthread_attr_init" >&5 echo "${ECHO_T}$ac_cv_lib_c_r_pthread_attr_init" >&6 if test $ac_cv_lib_c_r_pthread_attr_init = yes; then PTHREAD_LIBS="-lc_r" else - { { echo "$as_me:3655: error: pthread library not found. HandyFTP cannot build without it. + { { echo "$as_me:3660: error: pthread library not found. HandyFTP cannot build without it. " >&5 echo "$as_me: error: pthread library not found. HandyFTP cannot build without it. " >&2;} @@ -3702,7 +3707,7 @@ # Extract the first word of "imlib-config", so it can be a program name with args. set dummy imlib-config; ac_word=$2 -echo "$as_me:3705: checking for $ac_word" >&5 +echo "$as_me:3710: checking for $ac_word" >&5 echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6 if test "${ac_cv_path_IMLIB_CONFIG+set}" = set; then echo $ECHO_N "(cached) $ECHO_C" >&6 @@ -3719,13 +3724,7 @@ test -z "$ac_dir" && ac_dir=. if $as_executable_p "$ac_dir/$ac_word"; then ac_cv_path_IMLIB_CONFIG="$ac_dir/$ac_word" - echo "$as_me:3722: found $ac_dir/$ac_word" >&5 - { ac_try='$ac_dir/$ac_word --version </dev/null >&2' - { (eval echo "$as_me:3724: \"$ac_try\"") >&5 - (eval $ac_try) 2>&5 - ac_status=$? - echo "$as_me:3727: \$? = $ac_status" >&5 - (exit $ac_status); }; } + echo "$as_me:3727: found $ac_dir/$ac_word" >&5 break fi done @@ -3737,15 +3736,15 @@ IMLIB_CONFIG=$ac_cv_path_IMLIB_CONFIG if test -n "$IMLIB_CONFIG"; then - echo "$as_me:3740: result: $IMLIB_CONFIG" >&5 + echo "$as_me:3739: result: $IMLIB_CONFIG" >&5 echo "${ECHO_T}$IMLIB_CONFIG" >&6 else - echo "$as_me:3743: result: no" >&5 + echo "$as_me:3742: result: no" >&5 echo "${ECHO_T}no" >&6 fi min_imlib_version=1.9.4 - echo "$as_me:3748: checking for IMLIB - version >= $min_imlib_version" >&5 + echo "$as_me:3747: checking for IMLIB - version >= $min_imlib_version" >&5 echo $ECHO_N "checking for IMLIB - version >= $min_imlib_version... $ECHO_C" >&6 no_imlib="" if test "$IMLIB_CONFIG" = "no" ; then @@ -3770,7 +3769,7 @@ echo $ac_n "cross compiling; assumed OK... $ac_c" else cat >conftest.$ac_ext <<_ACEOF -#line 3773 "configure" +#line 3772 "configure" #include "confdefs.h" #include <stdio.h> @@ -3812,15 +3811,15 @@ _ACEOF rm -f conftest$ac_exeext -if { (eval echo "$as_me:3815: \"$ac_link\"") >&5 +if { (eval echo "$as_me:3814: \"$ac_link\"") >&5 (eval $ac_link) 2>&5 ac_status=$? - echo "$as_me:3818: \$? = $ac_status" >&5 + echo "$as_me:3817: \$? = $ac_status" >&5 (exit $ac_status); } && { ac_try='./conftest$ac_exeext' - { (eval echo "$as_me:3820: \"$ac_try\"") >&5 + { (eval echo "$as_me:3819: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? - echo "$as_me:3823: \$? = $ac_status" >&5 + echo "$as_me:3822: \$? = $ac_status" >&5 (exit $ac_status); }; }; then : else @@ -3829,21 +3828,21 @@ cat conftest.$ac_ext >&5 no_imlib=yes fi -rm -f conftest$ac_exeext conftest.$ac_ext +rm -f core core.* *.core conftest$ac_exeext conftest.$ac_objext conftest.$ac_ext fi CFLAGS="$ac_save_CFLAGS" LIBS="$ac_save_LIBS" fi fi if test "x$no_imlib" = x ; then - echo "$as_me:3839: result: yes" >&5 + echo "$as_me:3838: result: yes" >&5 echo "${ECHO_T}yes" >&6 cat >>confdefs.h <<\EOF #define USE_IMLIB 1 EOF else - echo "$as_me:3846: result: no" >&5 + echo "$as_me:3845: result: no" >&5 echo "${ECHO_T}no" >&6 if test "$IMLIB_CONFIG" = "no" ; then echo "*** The imlib-config script installed by IMLIB could not be found" @@ -3858,7 +3857,7 @@ CFLAGS="$CFLAGS $GDK_IMLIB_CFLAGS" LIBS="$LIBS $GDK_IMLIB_LIBS" cat >conftest.$ac_ext <<_ACEOF -#line 3861 "configure" +#line 3860 "configure" #include "confdefs.h" #include <stdio.h> @@ -3873,16 +3872,16 @@ } _ACEOF rm -f conftest.$ac_objext conftest$ac_exeext -if { (eval echo "$as_me:3876: \"$ac_link\"") >&5 +if { (eval echo "$as_me:3875: \"$ac_link\"") >&5 (eval $ac_link) 2>&5 ac_status=$? - echo "$as_me:3879: \$? = $ac_status" >&5 + echo "$as_me:3878: \$? = $ac_status" >&5 (exit $ac_status); } && { ac_try='test -s conftest$ac_exeext' - { (eval echo "$as_me:3882: \"$ac_try\"") >&5 + { (eval echo "$as_me:3881: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? - echo "$as_me:3885: \$? = $ac_status" >&5 + echo "$as_me:3884: \$? = $ac_status" >&5 (exit $ac_status); }; }; then echo "*** The test program compiled, but did not run. This usually means" echo "*** that the run-time linker is not finding IMLIB or finding the wrong" @@ -3908,7 +3907,7 @@ fi GDK_IMLIB_CFLAGS="" GDK_IMLIB_LIBS="" - { { echo "$as_me:3911: error: IMLIB not found or too old. Dynamic Windows cannot build without it." >&5 + { { echo "$as_me:3910: error: IMLIB not found or too old. Dynamic Windows cannot build without it." >&5 echo "$as_me: error: IMLIB not found or too old. Dynamic Windows cannot build without it." >&2;} { (exit 1); exit 1; }; } fi @@ -3924,7 +3923,8 @@ MV="mv" MKDIR="mkdir" -ac_config_files="$ac_config_files Makefile:Makefile.in" +ac_config_files="$ac_config_files Makefile dw-config" + cat >confcache <<\_ACEOF # This file is a shell script that caches the results of configure # tests run on this system so they can be shared between configure @@ -3954,12 +3954,12 @@ # substitution turns \\\\ into \\, and sed turns \\ into \). sed -n \ "s/'/'\\\\''/g; - s/^\\([_$ac_cr_alnum]*_cv_[_$ac_cr_alnum]*\\)=\\(.*\\)/\\1='\\2'/p" + s/^\\([_$as_cr_alnum]*_cv_[_$as_cr_alnum]*\\)=\\(.*\\)/\\1='\\2'/p" ;; *) # `set' quotes correctly as required by POSIX, so do not add quotes. sed -n \ - "s/^\\([_$ac_cr_alnum]*_cv_[_$ac_cr_alnum]*\\)=\\(.*\\)/\\1=\\2/p" + "s/^\\([_$as_cr_alnum]*_cv_[_$as_cr_alnum]*\\)=\\(.*\\)/\\1=\\2/p" ;; esac; } | @@ -4133,8 +4133,8 @@ cat >>$CONFIG_STATUS <<EOF ac_cs_version="\\ config.status -configured by $0, generated by GNU Autoconf 2.49e, - with options \"`echo "$ac_configure_args" | sed 's/[\\""\`\$]/\\\\&/g'`\" +configured by $0, generated by GNU Autoconf 2.52, + with options \\"`echo "$ac_configure_args" | sed 's/[\\""\`\$]/\\\\&/g'`\\" Copyright 1992, 1993, 1994, 1995, 1996, 1998, 1999, 2000, 2001 Free Software Foundation, Inc. @@ -4195,19 +4195,15 @@ CONFIG_HEADERS="$CONFIG_HEADERS $1" ac_need_defaults=false;; - # Handling of arguments. - 'Makefile' ) CONFIG_FILES="$CONFIG_FILES Makefile:Makefile.in" ;; - 'config.h' ) CONFIG_HEADERS="$CONFIG_HEADERS config.h" ;; - # This is an error. - -*) { { echo "$as_me:4203: error: unrecognized option: $1 + -*) { { echo "$as_me:4199: 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;} { (exit 1); exit 1; }; } ;; - *) { { echo "$as_me:4208: error: invalid argument: $1" >&5 -echo "$as_me: error: invalid argument: $1" >&2;} - { (exit 1); exit 1; }; };; + + *) ac_config_targets="$ac_config_targets $1" ;; + esac shift done @@ -4219,7 +4215,11 @@ ## Running config.status. ## ## ----------------------- ## -This file was extended by $as_me 2.49e, executed with +This file was extended by $as_me 2.52, executed with + CONFIG_FILES = $CONFIG_FILES + CONFIG_HEADERS = $CONFIG_HEADERS + CONFIG_LINKS = $CONFIG_LINKS + CONFIG_COMMANDS = $CONFIG_COMMANDS > $ac_cs_invocation on `(hostname || uname -n) 2>/dev/null | sed 1q` @@ -4227,6 +4227,19 @@ EOF cat >>$CONFIG_STATUS <<\EOF +for ac_config_target in $ac_config_targets +do + case "$ac_config_target" in + # Handling of arguments. + "Makefile" ) CONFIG_FILES="$CONFIG_FILES Makefile" ;; + "dw-config" ) CONFIG_FILES="$CONFIG_FILES dw-config" ;; + "config.h" ) CONFIG_HEADERS="$CONFIG_HEADERS config.h" ;; + *) { { echo "$as_me:4237: error: invalid argument: $ac_config_target" >&5 +echo "$as_me: error: invalid argument: $ac_config_target" >&2;} + { (exit 1); exit 1; }; };; + esac +done + # If the user did not use the arguments to specify the items to instantiate, # 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 @@ -4240,7 +4253,7 @@ $debug || { trap 'exit_status=$?; rm -rf $tmp && exit $exit_status' 0 - trap '{ (exit $?); exit $?; }' 1 2 13 15 + trap '{ (exit 1); exit 1; }' 1 2 13 15 } # Create a (secure) tmp directory for tmp files. @@ -4293,15 +4306,22 @@ s,@PACKAGE_VERSION@,$PACKAGE_VERSION,;t t s,@PACKAGE_STRING@,$PACKAGE_STRING,;t t s,@PACKAGE_BUGREPORT@,$PACKAGE_BUGREPORT,;t t +s,@build_alias@,$build_alias,;t t +s,@host_alias@,$host_alias,;t t +s,@target_alias@,$target_alias,;t t s,@ECHO_C@,$ECHO_C,;t t s,@ECHO_N@,$ECHO_N,;t t s,@ECHO_T@,$ECHO_T,;t t s,@PATH_SEPARATOR@,$PATH_SEPARATOR,;t t s,@DEFS@,$DEFS,;t t s,@LIBS@,$LIBS,;t t +s,@DW_MAJOR_VERSION@,$DW_MAJOR_VERSION,;t t +s,@DW_MINOR_VERSION@,$DW_MINOR_VERSION,;t t +s,@DW_SUB_VERSION@,$DW_SUB_VERSION,;t t s,@CC@,$CC,;t t s,@CFLAGS@,$CFLAGS,;t t s,@LDFLAGS@,$LDFLAGS,;t t +s,@CPPFLAGS@,$CPPFLAGS,;t t s,@ac_ct_CC@,$ac_ct_CC,;t t s,@EXEEXT@,$EXEEXT,;t t s,@OBJEXT@,$OBJEXT,;t t @@ -4310,7 +4330,6 @@ s,@INSTALL_SCRIPT@,$INSTALL_SCRIPT,;t t s,@INSTALL_DATA@,$INSTALL_DATA,;t t s,@CPP@,$CPP,;t t -s,@CPPFLAGS@,$CPPFLAGS,;t t s,@GLIB_CONFIG@,$GLIB_CONFIG,;t t s,@GLIB_CFLAGS@,$GLIB_CFLAGS,;t t s,@GLIB_LIBS@,$GLIB_LIBS,;t t @@ -4440,7 +4459,7 @@ esac if test x"$ac_file" != x-; then - { echo "$as_me:4443: creating $ac_file" >&5 + { echo "$as_me:4462: creating $ac_file" >&5 echo "$as_me: creating $ac_file" >&6;} rm -f "$ac_file" fi @@ -4458,7 +4477,7 @@ -) echo $tmp/stdin ;; [\\/$]*) # Absolute (can't be DOS-style, as IFS=:) - test -f "$f" || { { echo "$as_me:4461: error: cannot find input file: $f" >&5 + test -f "$f" || { { echo "$as_me:4480: error: cannot find input file: $f" >&5 echo "$as_me: error: cannot find input file: $f" >&2;} { (exit 1); exit 1; }; } echo $f;; @@ -4471,7 +4490,7 @@ echo $srcdir/$f else # /dev/null tree - { { echo "$as_me:4474: error: cannot find input file: $f" >&5 + { { echo "$as_me:4493: error: cannot find input file: $f" >&5 echo "$as_me: error: cannot find input file: $f" >&2;} { (exit 1); exit 1; }; } fi;; @@ -4532,7 +4551,7 @@ * ) ac_file_in=$ac_file.in ;; esac - test x"$ac_file" != x- && { echo "$as_me:4535: creating $ac_file" >&5 + test x"$ac_file" != x- && { echo "$as_me:4554: creating $ac_file" >&5 echo "$as_me: creating $ac_file" >&6;} # First look for the input files in the build tree, otherwise in the @@ -4543,7 +4562,7 @@ -) echo $tmp/stdin ;; [\\/$]*) # Absolute (can't be DOS-style, as IFS=:) - test -f "$f" || { { echo "$as_me:4546: error: cannot find input file: $f" >&5 + test -f "$f" || { { echo "$as_me:4565: error: cannot find input file: $f" >&5 echo "$as_me: error: cannot find input file: $f" >&2;} { (exit 1); exit 1; }; } echo $f;; @@ -4556,7 +4575,7 @@ echo $srcdir/$f else # /dev/null tree - { { echo "$as_me:4559: error: cannot find input file: $f" >&5 + { { echo "$as_me:4578: error: cannot find input file: $f" >&5 echo "$as_me: error: cannot find input file: $f" >&2;} { (exit 1); exit 1; }; } fi;; @@ -4673,7 +4692,7 @@ 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:4676: $ac_file is unchanged" >&5 + { echo "$as_me:4695: $ac_file is unchanged" >&5 echo "$as_me: $ac_file is unchanged" >&6;} else ac_dir=`$as_expr X"$ac_file" : 'X\(.*[^/]\)//*[^/][^/]*/*$' \| \ @@ -4739,3 +4758,4 @@ # would make configure fail if this is the last instruction. $ac_cs_success || { (exit 1); exit 1; } fi +
--- a/configure.in Wed Mar 27 09:10:49 2002 +0000 +++ b/configure.in Wed Mar 27 10:33:44 2002 +0000 @@ -1,6 +1,14 @@ AC_INIT(winmain.c) AC_CONFIG_HEADER(config.h) +DW_MAJOR_VERSION=0 +DW_MINOR_VERSION=5 +DW_SUB_VERSION=0 + +AC_SUBST(DW_MAJOR_VERSION) +AC_SUBST(DW_MINOR_VERSION) +AC_SUBST(DW_SUB_VERSION) + INCLUDES="-I." AC_PROG_CC @@ -73,4 +81,7 @@ AC_SUBST(MV) AC_SUBST(MKDIR) -AC_OUTPUT(Makefile:Makefile.in) \ No newline at end of file +AC_CONFIG_FILES([ +Makefile +dw-config ]) +AC_OUTPUT
--- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/dw-config.in Wed Mar 27 10:33:44 2002 +0000 @@ -0,0 +1,79 @@ +#!/bin/sh + +dw_libs="@LIBS@" +dw_cflags="@CFLAGS@" + +prefix=@prefix@ +exec_prefix=@exec_prefix@ +exec_prefix_set=no + +usage() +{ + cat <<EOF +Usage: dw-config [OPTIONS] +Options: + [--prefix[=DIR]] + [--exec-prefix[=DIR]] + [--version] + [--libs] + [--cflags] +EOF + exit $1 +} + +if test $# -eq 0; then + usage 1 1>&2 +fi + +while test $# -gt 0; do + case "$1" in + -*=*) optarg=`echo "$1" | sed 's/[-_a-zA-Z0-9]*=//'` ;; + *) optarg= ;; + esac + + case $1 in + --prefix=*) + prefix=$optarg + if test $exec_prefix_set = no ; then + exec_prefix=$optarg + fi + ;; + --prefix) + echo_prefix=yes + ;; + --exec-prefix=*) + exec_prefix=$optarg + exec_prefix_set=yes + ;; + --version) + echo @DW_MAJOR_VERSION@.@DW_MINOR_VERSION@.@DW_SUB_VERSION@ + ;; + --cflags) + echo_cflags=yes + ;; + --libs) + echo_libs=yes + ;; + *) + usage 1 1>&2 + ;; + esac + shift +done + +if test "$echo_prefix" = "yes"; then + echo $prefix +fi + +if test "$echo_exec_prefix" = "yes"; then + echo $exec_prefix +fi + +if test "$echo_cflags" = "yes"; then + echo -I${prefix}/include $dw_cflags +fi + +if test "$echo_libs" = "yes"; then + echo -L${prefix}/lib $dw_libs +fi +