diff --git a/ChangeLog b/ChangeLog index 47a2551d2..b172fa2d8 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,27 +1,62 @@ +2001-12-15 Werner Lemberg + + * src/base/ftglyph (FT_Glyph_To_Bitmap): Remove compiler warning. + * include/freetype/ftcache.h (FTC_Node_Unref): Removed. It is + already in ftcmanag.h. + * src/cache/ftcsbits.c (ftc_sbit_node_load): Remove unused variable + `gfam'. + * src/cache/ftcmanag.c (ftc_family_table_alloc, + * ftc_family_table_free): Use FT_EXPORT_DEF. + * include/freetype/cache/ftcmanag.h: Updated. + * src/cache/ftccache.c (ftc_node_destroy): Use FT_EXPORT_DEF. + * src/cache/ftccmap.c (ftc_cmap_node_init): Remove unused variable + `cfam'. + Remove compiler warning. + (FTC_CMapCache_Lookup): Remove compiler warnings. + (ftc_cmap_family_init): Ditto. + (FTC_CMapCache_Lookup): Ditto. + + * builds/unix/configure.ac: Increase `version_info' to 8:0:2. + * builds/unix/configure: Regenerated. + +2001-12-14 Werner Lemberg + + * builds/mac/README: Updated. + 2001-12-14 Scott Long - * src/truetype/ttgload.c (load_truetype_glyph): fixing crash when dealing - with invalid fonts (i.e. glyph size < 10 bytes).. + * src/truetype/ttgload.c (load_truetype_glyph): Fixing crash when + dealing with invalid fonts (i.e. glyph size < 10 bytes). 2001-12-14 Sam Latinga - * builds/mac/freetype.mac: a new Makefile to build with MPW on MacOS - classic.. + * builds/mac/freetype.make: A new Makefile to build with MPW on + MacOS classic. 2001-12-14 David Turner - * src/truetype/ttgload.c (TT_Load_Glyph), src/type1/t1gload.c - (T1_Load_Glyph), src/cid/cidgload.c (CID_Load_Glyph), src/cff/cffgload.c - (CFF_Load_Glyph): fixed an important bug common to all font drivers (the - advance width was never hinted when it should) + * src/truetype/ttgload.c (TT_Load_Glyph), src/type1/t1gload.c + (T1_Load_Glyph), src/cid/cidgload.c (CID_Load_Glyph), + src/cff/cffgload.c (CFF_Load_Glyph): Fixed a serious bug common to + all font drivers (the advance width was never hinted when it + should). + * include/freetype/freetype.h (FREETYPE_PATCH): New macro. + * src/base/ftdbgmem.c (debug_mem_dummy) [!FT_DEBUG_MEMORY]: Don't + use `extern' keyword. 2001-12-12 David Turner - * src/pshint/pshglob.c: adding correct BlueScale/BlueShift support, - plus family blues processing + * src/pshint/pshglob.c (psh_blues_scale_zones, psh_blues_snap_stem + psh_globals_new): Adding correct BlueScale/BlueShift support, plus + family blues processing. + * src/pshint/pshglob.h (PSH_BluesRec): Updated. + + Started adding support for the Postscript hinter in the CFF module. - * src/cff/cffgload.c: started adding support for the Postscript hinter + * src/cff/cffgload.c: Include FT_INTERNAL_POSTSCRIPT_HINTS_H. + (CFF_Parse_CharStrings): Implement it. + * src/cff/cffgload.h: Updated. 2001-12-12 Werner Lemberg @@ -49,14 +84,14 @@ * INSTALL: Updated the instructions to build shared libraries with Jam. They were simply wrong. - * src/base/fttrigon.c (FT_Cos): Fixed a small bug that caused slightly - improper results for FT_Cos and FT_Sin (example: FT_Sin(0) == -1!). + * src/base/fttrigon.c (FT_Cos): Fixed a small bug that caused + slightly improper results for `FT_Cos' and `FT_Sin' (example: + FT_Sin(0) == -1!). 2001-12-11 Detlef Würkner - * include/freetype/internal/ftstream.h: Fixed the definitions of - GET_LongLE and GET_ULongLE which where incorrect (creating problems - in the pcf driver). + * include/freetype/internal/ftstream.h (GET_LongLE, GET_ULongLE): + Fixed incorrect argument types. 2001-12-10 Francesco Zappa Nardelli @@ -67,6 +102,7 @@ * include/freetype/cache/ftccmap.h, src/cache/ftccmap.c: Added new charmap cache. + * src/cache/ftcache.c: Updated. 2001-12-06 Leonard Rosenthol diff --git a/builds/mac/README b/builds/mac/README index 937fb4693..f933c56cc 100644 --- a/builds/mac/README +++ b/builds/mac/README @@ -1,5 +1,9 @@ -This folder contains supporting code and CodeWarrior Pro 7 project -files to build the FreeType library. +This folder contains + + . a Makefile for Apple MPW build environment (currently PPC only) + + . supporting code and CodeWarrior Pro 7 project files to build the + FreeType library. Notes: The library will be built as a static lib in the obj/ folder. diff --git a/builds/unix/configure b/builds/unix/configure index a135cd033..207909274 100644 --- a/builds/unix/configure +++ b/builds/unix/configure @@ -1,6 +1,6 @@ #! /bin/sh # Guess values for system-dependent variables and create Makefiles. -# Generated by Autoconf 2.50. +# Generated by Autoconf 2.52. # # Copyright 1992, 1993, 1994, 1995, 1996, 1998, 1999, 2000, 2001 # Free Software Foundation, Inc. @@ -162,6 +162,19 @@ if test "X$ECHO" = "X$CONFIG_SHELL $0 --fallback-echo"; then ECHO="$CONFIG_SHELL \\\$\$0 --fallback-echo" fi +# 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 @@ -246,22 +259,16 @@ SHELL=${CONFIG_SHELL-/bin/sh} # 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="ftconfig.in" # Factoring default headers for most tests. ac_includes_default="\ #include -#include -#include +#if HAVE_SYS_TYPES_H +# include +#endif +#if HAVE_SYS_STAT_H +# include +#endif #if STDC_HEADERS # include # include @@ -275,13 +282,16 @@ ac_includes_default="\ # include # endif # include -#else -# if HAVE_STRINGS_H -# include -# endif +#endif +#if HAVE_STRINGS_H +# include #endif #if HAVE_INTTYPES_H # include +#else +# if HAVE_STDINT_H +# include +# endif #endif #if HAVE_UNISTD_H # include @@ -377,7 +387,7 @@ do -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'` @@ -386,7 +396,7 @@ do -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'` @@ -568,7 +578,7 @@ do -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'` @@ -581,7 +591,7 @@ do -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'` @@ -613,7 +623,7 @@ Try \`$0 --help' for more information." >&2 *=*) 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"` @@ -623,7 +633,7 @@ Try \`$0 --help' for more information." >&2 *) # 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} ;; @@ -637,15 +647,24 @@ if test -n "$ac_prev"; then { (exit 1); exit 1; }; } 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 @@ -883,7 +902,7 @@ This file contains any messages produced by compilers while running configure, to aid debugging if configure makes a mistake. It was created by $as_me, which was -generated by GNU Autoconf 2.50. Invocation command line was +generated by GNU Autoconf 2.52. Invocation command line was $ $0 $@ @@ -962,11 +981,11 @@ trap 'exit_status=$? *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 @@ -987,7 +1006,7 @@ trap 'exit_status=$? 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 @@ -1007,7 +1026,7 @@ if test -z "$CONFIG_SITE"; then fi for ac_site_file in $CONFIG_SITE; do if test -r "$ac_site_file"; then - { echo "$as_me:1010: loading site script $ac_site_file" >&5 + { echo "$as_me:1029: 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" @@ -1018,7 +1037,7 @@ if test -r "$cache_file"; then # Some versions of bash will fail to source /dev/null (special # files actually), so we avoid doing that. if test -f "$cache_file"; then - { echo "$as_me:1021: loading cache $cache_file" >&5 + { echo "$as_me:1040: loading cache $cache_file" >&5 echo "$as_me: loading cache $cache_file" >&6;} case $cache_file in [\\/]* | ?:[\\/]* ) . $cache_file;; @@ -1026,14 +1045,14 @@ echo "$as_me: loading cache $cache_file" >&6;} esac fi else - { echo "$as_me:1029: creating cache $cache_file" >&5 + { echo "$as_me:1048: 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 @@ -1042,31 +1061,44 @@ for ac_var in `(set) 2>&1 | eval ac_new_val="\$ac_env_${ac_var}_value" case $ac_old_set,$ac_new_set in set,) - { echo "$as_me:1045: 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:1064: 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:1049: 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:1068: 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:1055: 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:1057: WARNING: former value: $ac_old_val" >&5 -echo "$as_me: WARNING: former value: $ac_old_val" >&2;} - { echo "$as_me:1059: WARNING: current value: $ac_new_val" >&5 -echo "$as_me: WARNING: current value: $ac_new_val" >&2;} - ac_suggest_removing_cache=: + { echo "$as_me:1074: 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:1076: former value: $ac_old_val" >&5 +echo "$as_me: former value: $ac_old_val" >&2;} + { echo "$as_me:1078: 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:1066: 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:1068: 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:1097: 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:1099: 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 @@ -1084,10 +1116,10 @@ esac echo "#! $SHELL" >conftest.sh echo "exit 0" >>conftest.sh chmod +x conftest.sh -if { (echo "$as_me:1087: PATH=\".;.\"; conftest.sh") >&5 +if { (echo "$as_me:1119: PATH=\".;.\"; conftest.sh") >&5 (PATH=".;."; conftest.sh) 2>&5 ac_status=$? - echo "$as_me:1090: \$? = $ac_status" >&5 + echo "$as_me:1122: \$? = $ac_status" >&5 (exit $ac_status); }; then ac_path_separator=';' else @@ -1098,7 +1130,7 @@ rm -f conftest.sh ac_config_headers="$ac_config_headers ftconfig.h:ftconfig.in" -version_info='7:0:1' +version_info='8:0:2' ft_version=`echo $version_info | tr : .` @@ -1119,7 +1151,7 @@ for ac_dir in $srcdir $srcdir/.. $srcdir/../..; do fi done if test -z "$ac_aux_dir"; then - { { echo "$as_me:1122: error: cannot find install-sh or install.sh in $srcdir $srcdir/.. $srcdir/../.." >&5 + { { echo "$as_me:1154: 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 @@ -1129,11 +1161,11 @@ ac_configure="$SHELL $ac_aux_dir/configure" # This should be Cygnus configure. # Make sure we can run config.sub. $ac_config_sub sun4 >/dev/null 2>&1 || - { { echo "$as_me:1132: error: cannot run $ac_config_sub" >&5 + { { echo "$as_me:1164: error: cannot run $ac_config_sub" >&5 echo "$as_me: error: cannot run $ac_config_sub" >&2;} { (exit 1); exit 1; }; } -echo "$as_me:1136: checking build system type" >&5 +echo "$as_me:1168: checking build system type" >&5 echo $ECHO_N "checking build system type... $ECHO_C" >&6 if test "${ac_cv_build+set}" = set; then echo $ECHO_N "(cached) $ECHO_C" >&6 @@ -1142,23 +1174,26 @@ else test -z "$ac_cv_build_alias" && ac_cv_build_alias=`$ac_config_guess` test -z "$ac_cv_build_alias" && - { { echo "$as_me:1145: error: cannot guess build type; you must specify one" >&5 + { { echo "$as_me:1177: error: cannot guess build type; you must specify one" >&5 echo "$as_me: error: cannot guess build type; you must specify one" >&2;} { (exit 1); exit 1; }; } ac_cv_build=`$ac_config_sub $ac_cv_build_alias` || - { { echo "$as_me:1149: error: $ac_config_sub $ac_cv_build_alias failed." >&5 + { { echo "$as_me:1181: error: $ac_config_sub $ac_cv_build_alias failed." >&5 echo "$as_me: error: $ac_config_sub $ac_cv_build_alias failed." >&2;} { (exit 1); exit 1; }; } fi -echo "$as_me:1154: result: $ac_cv_build" >&5 +echo "$as_me:1186: result: $ac_cv_build" >&5 echo "${ECHO_T}$ac_cv_build" >&6 build=$ac_cv_build build_cpu=`echo $ac_cv_build | sed 's/^\([^-]*\)-\([^-]*\)-\(.*\)$/\1/'` build_vendor=`echo $ac_cv_build | sed 's/^\([^-]*\)-\([^-]*\)-\(.*\)$/\2/'` build_os=`echo $ac_cv_build | sed 's/^\([^-]*\)-\([^-]*\)-\(.*\)$/\3/'` -echo "$as_me:1161: checking host system type" >&5 +test -z "$build_alias" && + build_alias=$ac_cv_build + +echo "$as_me:1196: checking host system type" >&5 echo $ECHO_N "checking host system type... $ECHO_C" >&6 if test "${ac_cv_host+set}" = set; then echo $ECHO_N "(cached) $ECHO_C" >&6 @@ -1167,19 +1202,22 @@ else test -z "$ac_cv_host_alias" && ac_cv_host_alias=$ac_cv_build_alias ac_cv_host=`$ac_config_sub $ac_cv_host_alias` || - { { echo "$as_me:1170: error: $ac_config_sub $ac_cv_host_alias failed" >&5 + { { echo "$as_me:1205: error: $ac_config_sub $ac_cv_host_alias failed" >&5 echo "$as_me: error: $ac_config_sub $ac_cv_host_alias failed" >&2;} { (exit 1); exit 1; }; } fi -echo "$as_me:1175: result: $ac_cv_host" >&5 +echo "$as_me:1210: result: $ac_cv_host" >&5 echo "${ECHO_T}$ac_cv_host" >&6 host=$ac_cv_host host_cpu=`echo $ac_cv_host | sed 's/^\([^-]*\)-\([^-]*\)-\(.*\)$/\1/'` host_vendor=`echo $ac_cv_host | sed 's/^\([^-]*\)-\([^-]*\)-\(.*\)$/\2/'` host_os=`echo $ac_cv_host | sed 's/^\([^-]*\)-\([^-]*\)-\(.*\)$/\3/'` -echo "$as_me:1182: checking target system type" >&5 +test -z "$host_alias" && + host_alias=$ac_cv_host + +echo "$as_me:1220: checking target system type" >&5 echo $ECHO_N "checking target system type... $ECHO_C" >&6 if test "${ac_cv_target+set}" = set; then echo $ECHO_N "(cached) $ECHO_C" >&6 @@ -1188,12 +1226,12 @@ else test "x$ac_cv_target_alias" = "x" && ac_cv_target_alias=$ac_cv_host_alias ac_cv_target=`$ac_config_sub $ac_cv_target_alias` || - { { echo "$as_me:1191: error: $ac_config_sub $ac_cv_target_alias failed" >&5 + { { echo "$as_me:1229: error: $ac_config_sub $ac_cv_target_alias failed" >&5 echo "$as_me: error: $ac_config_sub $ac_cv_target_alias failed" >&2;} { (exit 1); exit 1; }; } fi -echo "$as_me:1196: result: $ac_cv_target" >&5 +echo "$as_me:1234: result: $ac_cv_target" >&5 echo "${ECHO_T}$ac_cv_target" >&6 target=$ac_cv_target target_cpu=`echo $ac_cv_target | sed 's/^\([^-]*\)-\([^-]*\)-\(.*\)$/\1/'` @@ -1206,6 +1244,8 @@ test -n "$target_alias" && test "$program_prefix$program_suffix$program_transform_name" = \ NONENONEs,x,x, && program_prefix=${target_alias}- +test -z "$target_alias" && + target_alias=$ac_cv_target ac_ext=c ac_cpp='$CPP $CPPFLAGS' @@ -1215,7 +1255,7 @@ ac_compiler_gnu=$ac_cv_c_compiler_gnu 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:1218: checking for $ac_word" >&5 +echo "$as_me:1258: 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 @@ -1230,7 +1270,7 @@ for ac_dir in $ac_dummy; do test -z "$ac_dir" && ac_dir=. $as_executable_p "$ac_dir/$ac_word" || continue ac_cv_prog_CC="${ac_tool_prefix}gcc" -echo "$as_me:1233: found $ac_dir/$ac_word" >&5 +echo "$as_me:1273: found $ac_dir/$ac_word" >&5 break done @@ -1238,10 +1278,10 @@ fi fi CC=$ac_cv_prog_CC if test -n "$CC"; then - echo "$as_me:1241: result: $CC" >&5 + echo "$as_me:1281: result: $CC" >&5 echo "${ECHO_T}$CC" >&6 else - echo "$as_me:1244: result: no" >&5 + echo "$as_me:1284: result: no" >&5 echo "${ECHO_T}no" >&6 fi @@ -1250,7 +1290,7 @@ if test -z "$ac_cv_prog_CC"; then ac_ct_CC=$CC # Extract the first word of "gcc", so it can be a program name with args. set dummy gcc; ac_word=$2 -echo "$as_me:1253: checking for $ac_word" >&5 +echo "$as_me:1293: 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 @@ -1265,7 +1305,7 @@ for ac_dir in $ac_dummy; do test -z "$ac_dir" && ac_dir=. $as_executable_p "$ac_dir/$ac_word" || continue ac_cv_prog_ac_ct_CC="gcc" -echo "$as_me:1268: found $ac_dir/$ac_word" >&5 +echo "$as_me:1308: found $ac_dir/$ac_word" >&5 break done @@ -1273,10 +1313,10 @@ fi fi ac_ct_CC=$ac_cv_prog_ac_ct_CC if test -n "$ac_ct_CC"; then - echo "$as_me:1276: result: $ac_ct_CC" >&5 + echo "$as_me:1316: result: $ac_ct_CC" >&5 echo "${ECHO_T}$ac_ct_CC" >&6 else - echo "$as_me:1279: result: no" >&5 + echo "$as_me:1319: result: no" >&5 echo "${ECHO_T}no" >&6 fi @@ -1289,7 +1329,7 @@ if test -z "$CC"; then if test -n "$ac_tool_prefix"; then # Extract the first word of "${ac_tool_prefix}cc", so it can be a program name with args. set dummy ${ac_tool_prefix}cc; ac_word=$2 -echo "$as_me:1292: checking for $ac_word" >&5 +echo "$as_me:1332: 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 @@ -1304,7 +1344,7 @@ for ac_dir in $ac_dummy; do test -z "$ac_dir" && ac_dir=. $as_executable_p "$ac_dir/$ac_word" || continue ac_cv_prog_CC="${ac_tool_prefix}cc" -echo "$as_me:1307: found $ac_dir/$ac_word" >&5 +echo "$as_me:1347: found $ac_dir/$ac_word" >&5 break done @@ -1312,10 +1352,10 @@ fi fi CC=$ac_cv_prog_CC if test -n "$CC"; then - echo "$as_me:1315: result: $CC" >&5 + echo "$as_me:1355: result: $CC" >&5 echo "${ECHO_T}$CC" >&6 else - echo "$as_me:1318: result: no" >&5 + echo "$as_me:1358: result: no" >&5 echo "${ECHO_T}no" >&6 fi @@ -1324,7 +1364,7 @@ if test -z "$ac_cv_prog_CC"; then ac_ct_CC=$CC # Extract the first word of "cc", so it can be a program name with args. set dummy cc; ac_word=$2 -echo "$as_me:1327: checking for $ac_word" >&5 +echo "$as_me:1367: 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 @@ -1339,7 +1379,7 @@ for ac_dir in $ac_dummy; do test -z "$ac_dir" && ac_dir=. $as_executable_p "$ac_dir/$ac_word" || continue ac_cv_prog_ac_ct_CC="cc" -echo "$as_me:1342: found $ac_dir/$ac_word" >&5 +echo "$as_me:1382: found $ac_dir/$ac_word" >&5 break done @@ -1347,10 +1387,10 @@ fi fi ac_ct_CC=$ac_cv_prog_ac_ct_CC if test -n "$ac_ct_CC"; then - echo "$as_me:1350: result: $ac_ct_CC" >&5 + echo "$as_me:1390: result: $ac_ct_CC" >&5 echo "${ECHO_T}$ac_ct_CC" >&6 else - echo "$as_me:1353: result: no" >&5 + echo "$as_me:1393: result: no" >&5 echo "${ECHO_T}no" >&6 fi @@ -1363,7 +1403,7 @@ fi if test -z "$CC"; then # Extract the first word of "cc", so it can be a program name with args. set dummy cc; ac_word=$2 -echo "$as_me:1366: checking for $ac_word" >&5 +echo "$as_me:1406: 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 @@ -1383,7 +1423,7 @@ if test "$ac_dir/$ac_word" = "/usr/ucb/cc"; then continue fi ac_cv_prog_CC="cc" -echo "$as_me:1386: found $ac_dir/$ac_word" >&5 +echo "$as_me:1426: found $ac_dir/$ac_word" >&5 break done @@ -1405,10 +1445,10 @@ fi fi CC=$ac_cv_prog_CC if test -n "$CC"; then - echo "$as_me:1408: result: $CC" >&5 + echo "$as_me:1448: result: $CC" >&5 echo "${ECHO_T}$CC" >&6 else - echo "$as_me:1411: result: no" >&5 + echo "$as_me:1451: result: no" >&5 echo "${ECHO_T}no" >&6 fi @@ -1419,7 +1459,7 @@ if test -z "$CC"; then do # Extract the first word of "$ac_tool_prefix$ac_prog", so it can be a program name with args. set dummy $ac_tool_prefix$ac_prog; ac_word=$2 -echo "$as_me:1422: checking for $ac_word" >&5 +echo "$as_me:1462: 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 @@ -1434,7 +1474,7 @@ for ac_dir in $ac_dummy; do test -z "$ac_dir" && ac_dir=. $as_executable_p "$ac_dir/$ac_word" || continue ac_cv_prog_CC="$ac_tool_prefix$ac_prog" -echo "$as_me:1437: found $ac_dir/$ac_word" >&5 +echo "$as_me:1477: found $ac_dir/$ac_word" >&5 break done @@ -1442,10 +1482,10 @@ fi fi CC=$ac_cv_prog_CC if test -n "$CC"; then - echo "$as_me:1445: result: $CC" >&5 + echo "$as_me:1485: result: $CC" >&5 echo "${ECHO_T}$CC" >&6 else - echo "$as_me:1448: result: no" >&5 + echo "$as_me:1488: result: no" >&5 echo "${ECHO_T}no" >&6 fi @@ -1458,7 +1498,7 @@ if test -z "$CC"; then do # Extract the first word of "$ac_prog", so it can be a program name with args. set dummy $ac_prog; ac_word=$2 -echo "$as_me:1461: checking for $ac_word" >&5 +echo "$as_me:1501: 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 @@ -1473,7 +1513,7 @@ for ac_dir in $ac_dummy; do test -z "$ac_dir" && ac_dir=. $as_executable_p "$ac_dir/$ac_word" || continue ac_cv_prog_ac_ct_CC="$ac_prog" -echo "$as_me:1476: found $ac_dir/$ac_word" >&5 +echo "$as_me:1516: found $ac_dir/$ac_word" >&5 break done @@ -1481,10 +1521,10 @@ fi fi ac_ct_CC=$ac_cv_prog_ac_ct_CC if test -n "$ac_ct_CC"; then - echo "$as_me:1484: result: $ac_ct_CC" >&5 + echo "$as_me:1524: result: $ac_ct_CC" >&5 echo "${ECHO_T}$ac_ct_CC" >&6 else - echo "$as_me:1487: result: no" >&5 + echo "$as_me:1527: result: no" >&5 echo "${ECHO_T}no" >&6 fi @@ -1496,12 +1536,32 @@ fi fi -test -z "$CC" && { { echo "$as_me:1499: error: no acceptable cc found in \$PATH" >&5 +test -z "$CC" && { { echo "$as_me:1539: 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:1544:" \ + "checking for C compiler version" >&5 +ac_compiler=`set X $ac_compile; echo $2` +{ (eval echo "$as_me:1547: \"$ac_compiler --version &5\"") >&5 + (eval $ac_compiler --version &5) 2>&5 + ac_status=$? + echo "$as_me:1550: \$? = $ac_status" >&5 + (exit $ac_status); } +{ (eval echo "$as_me:1552: \"$ac_compiler -v &5\"") >&5 + (eval $ac_compiler -v &5) 2>&5 + ac_status=$? + echo "$as_me:1555: \$? = $ac_status" >&5 + (exit $ac_status); } +{ (eval echo "$as_me:1557: \"$ac_compiler -V &5\"") >&5 + (eval $ac_compiler -V &5) 2>&5 + ac_status=$? + echo "$as_me:1560: \$? = $ac_status" >&5 + (exit $ac_status); } + cat >conftest.$ac_ext <<_ACEOF -#line 1504 "configure" +#line 1564 "configure" #include "confdefs.h" int @@ -1515,23 +1575,29 @@ _ACEOF 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:1520: checking for C compiler default output" >&5 +echo "$as_me:1580: 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:1523: \"$ac_link_default\"") >&5 +if { (eval echo "$as_me:1583: \"$ac_link_default\"") >&5 (eval $ac_link_default) 2>&5 ac_status=$? - echo "$as_me:1526: \$? = $ac_status" >&5 + echo "$as_me:1586: \$? = $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;; @@ -1540,34 +1606,34 @@ done else echo "$as_me: failed program was:" >&5 cat conftest.$ac_ext >&5 -{ { echo "$as_me:1543: error: C compiler cannot create executables" >&5 +{ { echo "$as_me:1609: 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:1549: result: $ac_file" >&5 +echo "$as_me:1615: 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:1554: checking whether the C compiler works" >&5 +echo "$as_me:1620: 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:1560: \"$ac_try\"") >&5 + { (eval echo "$as_me:1626: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? - echo "$as_me:1563: \$? = $ac_status" >&5 + echo "$as_me:1629: \$? = $ac_status" >&5 (exit $ac_status); }; }; then cross_compiling=no else if test "$cross_compiling" = maybe; then cross_compiling=yes else - { { echo "$as_me:1570: error: cannot run C compiled programs. + { { echo "$as_me:1636: 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;} @@ -1575,24 +1641,24 @@ If you meant to cross compile, use \`--host'." >&2;} fi fi fi -echo "$as_me:1578: result: yes" >&5 +echo "$as_me:1644: 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:1585: checking whether we are cross compiling" >&5 +echo "$as_me:1651: checking whether we are cross compiling" >&5 echo $ECHO_N "checking whether we are cross compiling... $ECHO_C" >&6 -echo "$as_me:1587: result: $cross_compiling" >&5 +echo "$as_me:1653: result: $cross_compiling" >&5 echo "${ECHO_T}$cross_compiling" >&6 -echo "$as_me:1590: checking for executable suffix" >&5 +echo "$as_me:1656: checking for executable suffix" >&5 echo $ECHO_N "checking for executable suffix... $ECHO_C" >&6 -if { (eval echo "$as_me:1592: \"$ac_link\"") >&5 +if { (eval echo "$as_me:1658: \"$ac_link\"") >&5 (eval $ac_link) 2>&5 ac_status=$? - echo "$as_me:1595: \$? = $ac_status" >&5 + echo "$as_me:1661: \$? = $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 @@ -1608,25 +1674,25 @@ for ac_file in `(ls conftest.exe; ls conftest; ls conftest.*) 2>/dev/null`; do esac done else - { { echo "$as_me:1611: error: cannot compute EXEEXT: cannot compile and link" >&5 + { { echo "$as_me:1677: 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:1617: result: $ac_cv_exeext" >&5 +echo "$as_me:1683: 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:1623: checking for object suffix" >&5 +echo "$as_me:1689: 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 1629 "configure" +#line 1695 "configure" #include "confdefs.h" int @@ -1638,10 +1704,10 @@ main () } _ACEOF rm -f conftest.o conftest.obj -if { (eval echo "$as_me:1641: \"$ac_compile\"") >&5 +if { (eval echo "$as_me:1707: \"$ac_compile\"") >&5 (eval $ac_compile) 2>&5 ac_status=$? - echo "$as_me:1644: \$? = $ac_status" >&5 + echo "$as_me:1710: \$? = $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 @@ -1653,24 +1719,24 @@ done else echo "$as_me: failed program was:" >&5 cat conftest.$ac_ext >&5 -{ { echo "$as_me:1656: error: cannot compute OBJEXT: cannot compile" >&5 +{ { echo "$as_me:1722: 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:1663: result: $ac_cv_objext" >&5 +echo "$as_me:1729: result: $ac_cv_objext" >&5 echo "${ECHO_T}$ac_cv_objext" >&6 OBJEXT=$ac_cv_objext ac_objext=$OBJEXT -echo "$as_me:1667: checking whether we are using the GNU C compiler" >&5 +echo "$as_me:1733: 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 1673 "configure" +#line 1739 "configure" #include "confdefs.h" int @@ -1685,16 +1751,16 @@ main () } _ACEOF rm -f conftest.$ac_objext -if { (eval echo "$as_me:1688: \"$ac_compile\"") >&5 +if { (eval echo "$as_me:1754: \"$ac_compile\"") >&5 (eval $ac_compile) 2>&5 ac_status=$? - echo "$as_me:1691: \$? = $ac_status" >&5 + echo "$as_me:1757: \$? = $ac_status" >&5 (exit $ac_status); } && { ac_try='test -s conftest.$ac_objext' - { (eval echo "$as_me:1694: \"$ac_try\"") >&5 + { (eval echo "$as_me:1760: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? - echo "$as_me:1697: \$? = $ac_status" >&5 + echo "$as_me:1763: \$? = $ac_status" >&5 (exit $ac_status); }; }; then ac_compiler_gnu=yes else @@ -1706,19 +1772,19 @@ rm -f conftest.$ac_objext conftest.$ac_ext ac_cv_c_compiler_gnu=$ac_compiler_gnu fi -echo "$as_me:1709: result: $ac_cv_c_compiler_gnu" >&5 +echo "$as_me:1775: 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:1715: checking whether $CC accepts -g" >&5 +echo "$as_me:1781: 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 1721 "configure" +#line 1787 "configure" #include "confdefs.h" int @@ -1730,16 +1796,16 @@ main () } _ACEOF rm -f conftest.$ac_objext -if { (eval echo "$as_me:1733: \"$ac_compile\"") >&5 +if { (eval echo "$as_me:1799: \"$ac_compile\"") >&5 (eval $ac_compile) 2>&5 ac_status=$? - echo "$as_me:1736: \$? = $ac_status" >&5 + echo "$as_me:1802: \$? = $ac_status" >&5 (exit $ac_status); } && { ac_try='test -s conftest.$ac_objext' - { (eval echo "$as_me:1739: \"$ac_try\"") >&5 + { (eval echo "$as_me:1805: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? - echo "$as_me:1742: \$? = $ac_status" >&5 + echo "$as_me:1808: \$? = $ac_status" >&5 (exit $ac_status); }; }; then ac_cv_prog_cc_g=yes else @@ -1749,7 +1815,7 @@ ac_cv_prog_cc_g=no fi rm -f conftest.$ac_objext conftest.$ac_ext fi -echo "$as_me:1752: result: $ac_cv_prog_cc_g" >&5 +echo "$as_me:1818: 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 @@ -1776,16 +1842,16 @@ cat >conftest.$ac_ext <<_ACEOF #endif _ACEOF rm -f conftest.$ac_objext -if { (eval echo "$as_me:1779: \"$ac_compile\"") >&5 +if { (eval echo "$as_me:1845: \"$ac_compile\"") >&5 (eval $ac_compile) 2>&5 ac_status=$? - echo "$as_me:1782: \$? = $ac_status" >&5 + echo "$as_me:1848: \$? = $ac_status" >&5 (exit $ac_status); } && { ac_try='test -s conftest.$ac_objext' - { (eval echo "$as_me:1785: \"$ac_try\"") >&5 + { (eval echo "$as_me:1851: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? - echo "$as_me:1788: \$? = $ac_status" >&5 + echo "$as_me:1854: \$? = $ac_status" >&5 (exit $ac_status); }; }; then for ac_declaration in \ ''\ @@ -1797,7 +1863,7 @@ if { (eval echo "$as_me:1779: \"$ac_compile\"") >&5 'void exit (int);' do cat >conftest.$ac_ext <<_ACEOF -#line 1800 "configure" +#line 1866 "configure" #include "confdefs.h" #include $ac_declaration @@ -1810,16 +1876,16 @@ exit (42); } _ACEOF rm -f conftest.$ac_objext -if { (eval echo "$as_me:1813: \"$ac_compile\"") >&5 +if { (eval echo "$as_me:1879: \"$ac_compile\"") >&5 (eval $ac_compile) 2>&5 ac_status=$? - echo "$as_me:1816: \$? = $ac_status" >&5 + echo "$as_me:1882: \$? = $ac_status" >&5 (exit $ac_status); } && { ac_try='test -s conftest.$ac_objext' - { (eval echo "$as_me:1819: \"$ac_try\"") >&5 + { (eval echo "$as_me:1885: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? - echo "$as_me:1822: \$? = $ac_status" >&5 + echo "$as_me:1888: \$? = $ac_status" >&5 (exit $ac_status); }; }; then : else @@ -1829,7 +1895,7 @@ continue fi rm -f conftest.$ac_objext conftest.$ac_ext cat >conftest.$ac_ext <<_ACEOF -#line 1832 "configure" +#line 1898 "configure" #include "confdefs.h" $ac_declaration int @@ -1841,16 +1907,16 @@ exit (42); } _ACEOF rm -f conftest.$ac_objext -if { (eval echo "$as_me:1844: \"$ac_compile\"") >&5 +if { (eval echo "$as_me:1910: \"$ac_compile\"") >&5 (eval $ac_compile) 2>&5 ac_status=$? - echo "$as_me:1847: \$? = $ac_status" >&5 + echo "$as_me:1913: \$? = $ac_status" >&5 (exit $ac_status); } && { ac_try='test -s conftest.$ac_objext' - { (eval echo "$as_me:1850: \"$ac_try\"") >&5 + { (eval echo "$as_me:1916: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? - echo "$as_me:1853: \$? = $ac_status" >&5 + echo "$as_me:1919: \$? = $ac_status" >&5 (exit $ac_status); }; }; then break else @@ -1859,9 +1925,12 @@ cat conftest.$ac_ext >&5 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 @@ -1879,7 +1948,7 @@ 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:1882: checking how to run the C preprocessor" >&5 +echo "$as_me:1951: 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 @@ -1892,7 +1961,6 @@ else # Double quotes because CPP needs to be expanded for CPP in "$CC -E" "$CC -E -traditional-cpp" "/lib/cpp" do - # break 2 since there is a loop in there. ac_preproc_ok=false for ac_c_preproc_warn_flag in '' yes do @@ -1901,18 +1969,18 @@ do # 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 1904 "configure" +#line 1972 "configure" #include "confdefs.h" #include Syntax error _ACEOF -if { (eval echo "$as_me:1909: \"$ac_cpp conftest.$ac_ext\"") >&5 +if { (eval echo "$as_me:1977: \"$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:1915: \$? = $ac_status" >&5 + echo "$as_me:1983: \$? = $ac_status" >&5 (exit $ac_status); } >/dev/null; then if test -s conftest.err; then ac_cpp_err=$ac_c_preproc_warn_flag @@ -1935,17 +2003,17 @@ 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 1938 "configure" +#line 2006 "configure" #include "confdefs.h" #include _ACEOF -if { (eval echo "$as_me:1942: \"$ac_cpp conftest.$ac_ext\"") >&5 +if { (eval echo "$as_me:2010: \"$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:1948: \$? = $ac_status" >&5 + echo "$as_me:2016: \$? = $ac_status" >&5 (exit $ac_status); } >/dev/null; then if test -s conftest.err; then ac_cpp_err=$ac_c_preproc_warn_flag @@ -1971,7 +2039,7 @@ 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 2 + break fi done @@ -1982,7 +2050,7 @@ fi else ac_cv_prog_CPP=$CPP fi -echo "$as_me:1985: result: $CPP" >&5 +echo "$as_me:2053: result: $CPP" >&5 echo "${ECHO_T}$CPP" >&6 ac_preproc_ok=false for ac_c_preproc_warn_flag in '' yes @@ -1992,18 +2060,18 @@ do # 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 1995 "configure" +#line 2063 "configure" #include "confdefs.h" #include Syntax error _ACEOF -if { (eval echo "$as_me:2000: \"$ac_cpp conftest.$ac_ext\"") >&5 +if { (eval echo "$as_me:2068: \"$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:2006: \$? = $ac_status" >&5 + echo "$as_me:2074: \$? = $ac_status" >&5 (exit $ac_status); } >/dev/null; then if test -s conftest.err; then ac_cpp_err=$ac_c_preproc_warn_flag @@ -2026,17 +2094,17 @@ 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 2029 "configure" +#line 2097 "configure" #include "confdefs.h" #include _ACEOF -if { (eval echo "$as_me:2033: \"$ac_cpp conftest.$ac_ext\"") >&5 +if { (eval echo "$as_me:2101: \"$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:2039: \$? = $ac_status" >&5 + echo "$as_me:2107: \$? = $ac_status" >&5 (exit $ac_status); } >/dev/null; then if test -s conftest.err; then ac_cpp_err=$ac_c_preproc_warn_flag @@ -2064,7 +2132,7 @@ rm -f conftest.err conftest.$ac_ext if $ac_preproc_ok; then : else - { { echo "$as_me:2067: error: C preprocessor \"$CPP\" fails sanity check" >&5 + { { echo "$as_me:2135: error: C preprocessor \"$CPP\" fails sanity check" >&5 echo "$as_me: error: C preprocessor \"$CPP\" fails sanity check" >&2;} { (exit 1); exit 1; }; } fi @@ -2094,7 +2162,7 @@ fi # Extract the first word of "rm", so it can be a program name with args. set dummy rm; ac_word=$2 -echo "$as_me:2097: checking for $ac_word" >&5 +echo "$as_me:2165: checking for $ac_word" >&5 echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6 if test "${ac_cv_prog_RMF+set}" = set; then echo $ECHO_N "(cached) $ECHO_C" >&6 @@ -2109,7 +2177,7 @@ for ac_dir in $ac_dummy; do test -z "$ac_dir" && ac_dir=. $as_executable_p "$ac_dir/$ac_word" || continue ac_cv_prog_RMF="rm -f" -echo "$as_me:2112: found $ac_dir/$ac_word" >&5 +echo "$as_me:2180: found $ac_dir/$ac_word" >&5 break done @@ -2117,16 +2185,16 @@ fi fi RMF=$ac_cv_prog_RMF if test -n "$RMF"; then - echo "$as_me:2120: result: $RMF" >&5 + echo "$as_me:2188: result: $RMF" >&5 echo "${ECHO_T}$RMF" >&6 else - echo "$as_me:2123: result: no" >&5 + echo "$as_me:2191: result: no" >&5 echo "${ECHO_T}no" >&6 fi # Extract the first word of "rmdir", so it can be a program name with args. set dummy rmdir; ac_word=$2 -echo "$as_me:2129: checking for $ac_word" >&5 +echo "$as_me:2197: checking for $ac_word" >&5 echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6 if test "${ac_cv_prog_RMDIR+set}" = set; then echo $ECHO_N "(cached) $ECHO_C" >&6 @@ -2141,7 +2209,7 @@ for ac_dir in $ac_dummy; do test -z "$ac_dir" && ac_dir=. $as_executable_p "$ac_dir/$ac_word" || continue ac_cv_prog_RMDIR="rmdir" -echo "$as_me:2144: found $ac_dir/$ac_word" >&5 +echo "$as_me:2212: found $ac_dir/$ac_word" >&5 break done @@ -2149,10 +2217,10 @@ fi fi RMDIR=$ac_cv_prog_RMDIR if test -n "$RMDIR"; then - echo "$as_me:2152: result: $RMDIR" >&5 + echo "$as_me:2220: result: $RMDIR" >&5 echo "${ECHO_T}$RMDIR" >&6 else - echo "$as_me:2155: result: no" >&5 + echo "$as_me:2223: result: no" >&5 echo "${ECHO_T}no" >&6 fi @@ -2168,7 +2236,7 @@ fi # 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:2171: checking for a BSD compatible install" >&5 +echo "$as_me:2239: 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 @@ -2217,7 +2285,7 @@ fi INSTALL=$ac_install_sh fi fi -echo "$as_me:2220: result: $INSTALL" >&5 +echo "$as_me:2288: result: $INSTALL" >&5 echo "${ECHO_T}$INSTALL" >&6 # Use test -z because SunOS4 sh mishandles braces in ${var-val}. @@ -2235,13 +2303,13 @@ case "$INSTALL" in INSTALL="`pwd`/$INSTALL" ;; esac -echo "$as_me:2238: checking for ANSI C header files" >&5 +echo "$as_me:2306: 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 2244 "configure" +#line 2312 "configure" #include "confdefs.h" #include #include @@ -2249,13 +2317,13 @@ else #include _ACEOF -if { (eval echo "$as_me:2252: \"$ac_cpp conftest.$ac_ext\"") >&5 +if { (eval echo "$as_me:2320: \"$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:2258: \$? = $ac_status" >&5 + echo "$as_me:2326: \$? = $ac_status" >&5 (exit $ac_status); } >/dev/null; then if test -s conftest.err; then ac_cpp_err=$ac_c_preproc_warn_flag @@ -2277,7 +2345,7 @@ rm -f conftest.err conftest.$ac_ext if test $ac_cv_header_stdc = yes; then # SunOS 4.x string.h does not declare mem*, contrary to ANSI. cat >conftest.$ac_ext <<_ACEOF -#line 2280 "configure" +#line 2348 "configure" #include "confdefs.h" #include @@ -2295,7 +2363,7 @@ fi if test $ac_cv_header_stdc = yes; then # ISC 2.0.2 stdlib.h does not declare free, contrary to ANSI. cat >conftest.$ac_ext <<_ACEOF -#line 2298 "configure" +#line 2366 "configure" #include "confdefs.h" #include @@ -2316,7 +2384,7 @@ if test $ac_cv_header_stdc = yes; then : else cat >conftest.$ac_ext <<_ACEOF -#line 2319 "configure" +#line 2387 "configure" #include "confdefs.h" #include #if ((' ' & 0x0FF) == 0x020) @@ -2342,15 +2410,15 @@ main () } _ACEOF rm -f conftest$ac_exeext -if { (eval echo "$as_me:2345: \"$ac_link\"") >&5 +if { (eval echo "$as_me:2413: \"$ac_link\"") >&5 (eval $ac_link) 2>&5 ac_status=$? - echo "$as_me:2348: \$? = $ac_status" >&5 + echo "$as_me:2416: \$? = $ac_status" >&5 (exit $ac_status); } && { ac_try='./conftest$ac_exeext' - { (eval echo "$as_me:2350: \"$ac_try\"") >&5 + { (eval echo "$as_me:2418: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? - echo "$as_me:2353: \$? = $ac_status" >&5 + echo "$as_me:2421: \$? = $ac_status" >&5 (exit $ac_status); }; }; then : else @@ -2359,11 +2427,11 @@ echo "$as_me: failed program was:" >&5 cat conftest.$ac_ext >&5 ac_cv_header_stdc=no fi -rm -f core core.* *.core conftest$ac_exeext conftest.$ac_ext +rm -f core core.* *.core conftest$ac_exeext conftest.$ac_objext conftest.$ac_ext fi fi fi -echo "$as_me:2366: result: $ac_cv_header_stdc" >&5 +echo "$as_me:2434: result: $ac_cv_header_stdc" >&5 echo "${ECHO_T}$ac_cv_header_stdc" >&6 if test $ac_cv_header_stdc = yes; then @@ -2375,24 +2443,24 @@ fi for ac_header in fcntl.h unistd.h do -ac_ac_Header=`echo "ac_cv_header_$ac_header" | $ac_tr_sh` -echo "$as_me:2379: checking for $ac_header" >&5 +as_ac_Header=`echo "ac_cv_header_$ac_header" | $as_tr_sh` +echo "$as_me:2447: 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 2385 "configure" +#line 2453 "configure" #include "confdefs.h" #include <$ac_header> _ACEOF -if { (eval echo "$as_me:2389: \"$ac_cpp conftest.$ac_ext\"") >&5 +if { (eval echo "$as_me:2457: \"$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:2395: \$? = $ac_status" >&5 + echo "$as_me:2463: \$? = $ac_status" >&5 (exit $ac_status); } >/dev/null; then if test -s conftest.err; then ac_cpp_err=$ac_c_preproc_warn_flag @@ -2403,25 +2471,25 @@ else 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:2414: 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:2482: result: `eval echo '${'$as_ac_Header'}'`" >&5 +echo "${ECHO_T}`eval echo '${'$as_ac_Header'}'`" >&6 +if test `eval echo '${'$as_ac_Header'}'` = yes; then cat >>confdefs.h <&5 +echo "$as_me:2492: checking for $CC option to accept ANSI C" >&5 echo $ECHO_N "checking for $CC option to accept ANSI C... $ECHO_C" >&6 if test "${ac_cv_prog_cc_stdc+set}" = set; then echo $ECHO_N "(cached) $ECHO_C" >&6 @@ -2429,7 +2497,7 @@ else ac_cv_prog_cc_stdc=no ac_save_CC=$CC cat >conftest.$ac_ext <<_ACEOF -#line 2432 "configure" +#line 2500 "configure" #include "confdefs.h" #include #include @@ -2478,16 +2546,16 @@ for ac_arg in "" -qlanglvl=ansi -std1 -Ae "-Aa -D_HPUX_SOURCE" "-Xc -D__EXTENSIO do CC="$ac_save_CC $ac_arg" rm -f conftest.$ac_objext -if { (eval echo "$as_me:2481: \"$ac_compile\"") >&5 +if { (eval echo "$as_me:2549: \"$ac_compile\"") >&5 (eval $ac_compile) 2>&5 ac_status=$? - echo "$as_me:2484: \$? = $ac_status" >&5 + echo "$as_me:2552: \$? = $ac_status" >&5 (exit $ac_status); } && { ac_try='test -s conftest.$ac_objext' - { (eval echo "$as_me:2487: \"$ac_try\"") >&5 + { (eval echo "$as_me:2555: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? - echo "$as_me:2490: \$? = $ac_status" >&5 + echo "$as_me:2558: \$? = $ac_status" >&5 (exit $ac_status); }; }; then ac_cv_prog_cc_stdc=$ac_arg break @@ -2504,21 +2572,21 @@ fi case "x$ac_cv_prog_cc_stdc" in x|xno) - echo "$as_me:2507: result: none needed" >&5 + echo "$as_me:2575: result: none needed" >&5 echo "${ECHO_T}none needed" >&6 ;; *) - echo "$as_me:2510: result: $ac_cv_prog_cc_stdc" >&5 + echo "$as_me:2578: result: $ac_cv_prog_cc_stdc" >&5 echo "${ECHO_T}$ac_cv_prog_cc_stdc" >&6 CC="$CC $ac_cv_prog_cc_stdc" ;; esac -echo "$as_me:2515: checking for an ANSI C-conforming const" >&5 +echo "$as_me:2583: checking for an ANSI C-conforming const" >&5 echo $ECHO_N "checking for an ANSI C-conforming const... $ECHO_C" >&6 if test "${ac_cv_c_const+set}" = set; then echo $ECHO_N "(cached) $ECHO_C" >&6 else cat >conftest.$ac_ext <<_ACEOF -#line 2521 "configure" +#line 2589 "configure" #include "confdefs.h" int @@ -2576,16 +2644,16 @@ main () } _ACEOF rm -f conftest.$ac_objext -if { (eval echo "$as_me:2579: \"$ac_compile\"") >&5 +if { (eval echo "$as_me:2647: \"$ac_compile\"") >&5 (eval $ac_compile) 2>&5 ac_status=$? - echo "$as_me:2582: \$? = $ac_status" >&5 + echo "$as_me:2650: \$? = $ac_status" >&5 (exit $ac_status); } && { ac_try='test -s conftest.$ac_objext' - { (eval echo "$as_me:2585: \"$ac_try\"") >&5 + { (eval echo "$as_me:2653: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? - echo "$as_me:2588: \$? = $ac_status" >&5 + echo "$as_me:2656: \$? = $ac_status" >&5 (exit $ac_status); }; }; then ac_cv_c_const=yes else @@ -2595,7 +2663,7 @@ ac_cv_c_const=no fi rm -f conftest.$ac_objext conftest.$ac_ext fi -echo "$as_me:2598: result: $ac_cv_c_const" >&5 +echo "$as_me:2666: result: $ac_cv_c_const" >&5 echo "${ECHO_T}$ac_cv_c_const" >&6 if test $ac_cv_c_const = no; then @@ -2605,61 +2673,60 @@ EOF fi -for ac_header in stdlib.h string.h memory.h strings.h inttypes.h unistd.h +# On IRIX 5.3, sys/types and inttypes.h are conflicting. + +for ac_header in sys/types.h sys/stat.h stdlib.h string.h memory.h strings.h \ + inttypes.h stdint.h unistd.h do -ac_ac_Header=`echo "ac_cv_header_$ac_header" | $ac_tr_sh` -echo "$as_me:2611: checking for $ac_header" >&5 +as_ac_Header=`echo "ac_cv_header_$ac_header" | $as_tr_sh` +echo "$as_me:2682: 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 2617 "configure" +#line 2688 "configure" #include "confdefs.h" +$ac_includes_default #include <$ac_header> _ACEOF -if { (eval echo "$as_me:2621: \"$ac_cpp conftest.$ac_ext\"") >&5 - (eval $ac_cpp conftest.$ac_ext) 2>conftest.er1 +rm -f conftest.$ac_objext +if { (eval echo "$as_me:2694: \"$ac_compile\"") >&5 + (eval $ac_compile) 2>&5 ac_status=$? - egrep -v '^ *\+' conftest.er1 >conftest.err - rm -f conftest.er1 - cat conftest.err >&5 - echo "$as_me:2627: \$? = $ac_status" >&5 - (exit $ac_status); } >/dev/null; then - if test -s conftest.err; then - ac_cpp_err=$ac_c_preproc_warn_flag - else - ac_cpp_err= - fi -else - ac_cpp_err=yes -fi -if test -z "$ac_cpp_err"; then - eval "$ac_ac_Header=yes" + echo "$as_me:2697: \$? = $ac_status" >&5 + (exit $ac_status); } && + { ac_try='test -s conftest.$ac_objext' + { (eval echo "$as_me:2700: \"$ac_try\"") >&5 + (eval $ac_try) 2>&5 + ac_status=$? + echo "$as_me:2703: \$? = $ac_status" >&5 + (exit $ac_status); }; }; then + eval "$as_ac_Header=yes" else echo "$as_me: failed program was:" >&5 - cat conftest.$ac_ext >&5 - eval "$ac_ac_Header=no" +cat conftest.$ac_ext >&5 +eval "$as_ac_Header=no" fi -rm -f conftest.err conftest.$ac_ext +rm -f conftest.$ac_objext conftest.$ac_ext fi -echo "$as_me:2646: 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:2713: result: `eval echo '${'$as_ac_Header'}'`" >&5 +echo "${ECHO_T}`eval echo '${'$as_ac_Header'}'`" >&6 +if test `eval echo '${'$as_ac_Header'}'` = yes; then cat >>confdefs.h <&5 +echo "$as_me:2723: checking for int" >&5 echo $ECHO_N "checking for int... $ECHO_C" >&6 if test "${ac_cv_type_int+set}" = set; then echo $ECHO_N "(cached) $ECHO_C" >&6 else cat >conftest.$ac_ext <<_ACEOF -#line 2662 "configure" +#line 2729 "configure" #include "confdefs.h" $ac_includes_default int @@ -2674,16 +2741,16 @@ if (sizeof (int)) } _ACEOF rm -f conftest.$ac_objext -if { (eval echo "$as_me:2677: \"$ac_compile\"") >&5 +if { (eval echo "$as_me:2744: \"$ac_compile\"") >&5 (eval $ac_compile) 2>&5 ac_status=$? - echo "$as_me:2680: \$? = $ac_status" >&5 + echo "$as_me:2747: \$? = $ac_status" >&5 (exit $ac_status); } && { ac_try='test -s conftest.$ac_objext' - { (eval echo "$as_me:2683: \"$ac_try\"") >&5 + { (eval echo "$as_me:2750: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? - echo "$as_me:2686: \$? = $ac_status" >&5 + echo "$as_me:2753: \$? = $ac_status" >&5 (exit $ac_status); }; }; then ac_cv_type_int=yes else @@ -2693,10 +2760,10 @@ ac_cv_type_int=no fi rm -f conftest.$ac_objext conftest.$ac_ext fi -echo "$as_me:2696: result: $ac_cv_type_int" >&5 +echo "$as_me:2763: result: $ac_cv_type_int" >&5 echo "${ECHO_T}$ac_cv_type_int" >&6 -echo "$as_me:2699: checking size of int" >&5 +echo "$as_me:2766: checking size of int" >&5 echo $ECHO_N "checking size of int... $ECHO_C" >&6 if test "${ac_cv_sizeof_int+set}" = set; then echo $ECHO_N "(cached) $ECHO_C" >&6 @@ -2705,7 +2772,7 @@ else if test "$cross_compiling" = yes; then # Depending upon the size, compute the lo and hi bounds. cat >conftest.$ac_ext <<_ACEOF -#line 2708 "configure" +#line 2775 "configure" #include "confdefs.h" $ac_includes_default int @@ -2717,21 +2784,21 @@ int _array_ [1 - 2 * !((sizeof (int)) >= 0)] } _ACEOF rm -f conftest.$ac_objext -if { (eval echo "$as_me:2720: \"$ac_compile\"") >&5 +if { (eval echo "$as_me:2787: \"$ac_compile\"") >&5 (eval $ac_compile) 2>&5 ac_status=$? - echo "$as_me:2723: \$? = $ac_status" >&5 + echo "$as_me:2790: \$? = $ac_status" >&5 (exit $ac_status); } && { ac_try='test -s conftest.$ac_objext' - { (eval echo "$as_me:2726: \"$ac_try\"") >&5 + { (eval echo "$as_me:2793: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? - echo "$as_me:2729: \$? = $ac_status" >&5 + echo "$as_me:2796: \$? = $ac_status" >&5 (exit $ac_status); }; }; then ac_lo=0 ac_mid=0 while :; do cat >conftest.$ac_ext <<_ACEOF -#line 2734 "configure" +#line 2801 "configure" #include "confdefs.h" $ac_includes_default int @@ -2743,16 +2810,16 @@ int _array_ [1 - 2 * !((sizeof (int)) <= $ac_mid)] } _ACEOF rm -f conftest.$ac_objext -if { (eval echo "$as_me:2746: \"$ac_compile\"") >&5 +if { (eval echo "$as_me:2813: \"$ac_compile\"") >&5 (eval $ac_compile) 2>&5 ac_status=$? - echo "$as_me:2749: \$? = $ac_status" >&5 + echo "$as_me:2816: \$? = $ac_status" >&5 (exit $ac_status); } && { ac_try='test -s conftest.$ac_objext' - { (eval echo "$as_me:2752: \"$ac_try\"") >&5 + { (eval echo "$as_me:2819: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? - echo "$as_me:2755: \$? = $ac_status" >&5 + echo "$as_me:2822: \$? = $ac_status" >&5 (exit $ac_status); }; }; then ac_hi=$ac_mid; break else @@ -2768,7 +2835,7 @@ cat conftest.$ac_ext >&5 ac_hi=-1 ac_mid=-1 while :; do cat >conftest.$ac_ext <<_ACEOF -#line 2771 "configure" +#line 2838 "configure" #include "confdefs.h" $ac_includes_default int @@ -2780,16 +2847,16 @@ int _array_ [1 - 2 * !((sizeof (int)) >= $ac_mid)] } _ACEOF rm -f conftest.$ac_objext -if { (eval echo "$as_me:2783: \"$ac_compile\"") >&5 +if { (eval echo "$as_me:2850: \"$ac_compile\"") >&5 (eval $ac_compile) 2>&5 ac_status=$? - echo "$as_me:2786: \$? = $ac_status" >&5 + echo "$as_me:2853: \$? = $ac_status" >&5 (exit $ac_status); } && { ac_try='test -s conftest.$ac_objext' - { (eval echo "$as_me:2789: \"$ac_try\"") >&5 + { (eval echo "$as_me:2856: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? - echo "$as_me:2792: \$? = $ac_status" >&5 + echo "$as_me:2859: \$? = $ac_status" >&5 (exit $ac_status); }; }; then ac_lo=$ac_mid; break else @@ -2805,7 +2872,7 @@ rm -f conftest.$ac_objext conftest.$ac_ext while test "x$ac_lo" != "x$ac_hi"; do ac_mid=`expr '(' $ac_hi - $ac_lo ')' / 2 + $ac_lo` cat >conftest.$ac_ext <<_ACEOF -#line 2808 "configure" +#line 2875 "configure" #include "confdefs.h" $ac_includes_default int @@ -2817,16 +2884,16 @@ int _array_ [1 - 2 * !((sizeof (int)) <= $ac_mid)] } _ACEOF rm -f conftest.$ac_objext -if { (eval echo "$as_me:2820: \"$ac_compile\"") >&5 +if { (eval echo "$as_me:2887: \"$ac_compile\"") >&5 (eval $ac_compile) 2>&5 ac_status=$? - echo "$as_me:2823: \$? = $ac_status" >&5 + echo "$as_me:2890: \$? = $ac_status" >&5 (exit $ac_status); } && { ac_try='test -s conftest.$ac_objext' - { (eval echo "$as_me:2826: \"$ac_try\"") >&5 + { (eval echo "$as_me:2893: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? - echo "$as_me:2829: \$? = $ac_status" >&5 + echo "$as_me:2896: \$? = $ac_status" >&5 (exit $ac_status); }; }; then ac_hi=$ac_mid else @@ -2839,12 +2906,12 @@ done ac_cv_sizeof_int=$ac_lo else if test "$cross_compiling" = yes; then - { { echo "$as_me:2842: error: cannot run test program while cross compiling" >&5 + { { echo "$as_me:2909: error: cannot run test program while cross compiling" >&5 echo "$as_me: error: cannot run test program while cross compiling" >&2;} { (exit 1); exit 1; }; } else cat >conftest.$ac_ext <<_ACEOF -#line 2847 "configure" +#line 2914 "configure" #include "confdefs.h" $ac_includes_default int @@ -2860,15 +2927,15 @@ fclose (f); } _ACEOF rm -f conftest$ac_exeext -if { (eval echo "$as_me:2863: \"$ac_link\"") >&5 +if { (eval echo "$as_me:2930: \"$ac_link\"") >&5 (eval $ac_link) 2>&5 ac_status=$? - echo "$as_me:2866: \$? = $ac_status" >&5 + echo "$as_me:2933: \$? = $ac_status" >&5 (exit $ac_status); } && { ac_try='./conftest$ac_exeext' - { (eval echo "$as_me:2868: \"$ac_try\"") >&5 + { (eval echo "$as_me:2935: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? - echo "$as_me:2871: \$? = $ac_status" >&5 + echo "$as_me:2938: \$? = $ac_status" >&5 (exit $ac_status); }; }; then ac_cv_sizeof_int=`cat conftest.val` else @@ -2876,7 +2943,7 @@ else echo "$as_me: failed program was:" >&5 cat conftest.$ac_ext >&5 fi -rm -f core core.* *.core conftest$ac_exeext conftest.$ac_ext +rm -f core core.* *.core conftest$ac_exeext conftest.$ac_objext conftest.$ac_ext fi fi rm -f conftest.val @@ -2884,19 +2951,19 @@ else ac_cv_sizeof_int=0 fi fi -echo "$as_me:2887: result: $ac_cv_sizeof_int" >&5 +echo "$as_me:2954: result: $ac_cv_sizeof_int" >&5 echo "${ECHO_T}$ac_cv_sizeof_int" >&6 cat >>confdefs.h <&5 +echo "$as_me:2960: checking for long" >&5 echo $ECHO_N "checking for long... $ECHO_C" >&6 if test "${ac_cv_type_long+set}" = set; then echo $ECHO_N "(cached) $ECHO_C" >&6 else cat >conftest.$ac_ext <<_ACEOF -#line 2899 "configure" +#line 2966 "configure" #include "confdefs.h" $ac_includes_default int @@ -2911,16 +2978,16 @@ if (sizeof (long)) } _ACEOF rm -f conftest.$ac_objext -if { (eval echo "$as_me:2914: \"$ac_compile\"") >&5 +if { (eval echo "$as_me:2981: \"$ac_compile\"") >&5 (eval $ac_compile) 2>&5 ac_status=$? - echo "$as_me:2917: \$? = $ac_status" >&5 + echo "$as_me:2984: \$? = $ac_status" >&5 (exit $ac_status); } && { ac_try='test -s conftest.$ac_objext' - { (eval echo "$as_me:2920: \"$ac_try\"") >&5 + { (eval echo "$as_me:2987: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? - echo "$as_me:2923: \$? = $ac_status" >&5 + echo "$as_me:2990: \$? = $ac_status" >&5 (exit $ac_status); }; }; then ac_cv_type_long=yes else @@ -2930,10 +2997,10 @@ ac_cv_type_long=no fi rm -f conftest.$ac_objext conftest.$ac_ext fi -echo "$as_me:2933: result: $ac_cv_type_long" >&5 +echo "$as_me:3000: result: $ac_cv_type_long" >&5 echo "${ECHO_T}$ac_cv_type_long" >&6 -echo "$as_me:2936: checking size of long" >&5 +echo "$as_me:3003: checking size of long" >&5 echo $ECHO_N "checking size of long... $ECHO_C" >&6 if test "${ac_cv_sizeof_long+set}" = set; then echo $ECHO_N "(cached) $ECHO_C" >&6 @@ -2942,7 +3009,7 @@ else if test "$cross_compiling" = yes; then # Depending upon the size, compute the lo and hi bounds. cat >conftest.$ac_ext <<_ACEOF -#line 2945 "configure" +#line 3012 "configure" #include "confdefs.h" $ac_includes_default int @@ -2954,21 +3021,21 @@ int _array_ [1 - 2 * !((sizeof (long)) >= 0)] } _ACEOF rm -f conftest.$ac_objext -if { (eval echo "$as_me:2957: \"$ac_compile\"") >&5 +if { (eval echo "$as_me:3024: \"$ac_compile\"") >&5 (eval $ac_compile) 2>&5 ac_status=$? - echo "$as_me:2960: \$? = $ac_status" >&5 + echo "$as_me:3027: \$? = $ac_status" >&5 (exit $ac_status); } && { ac_try='test -s conftest.$ac_objext' - { (eval echo "$as_me:2963: \"$ac_try\"") >&5 + { (eval echo "$as_me:3030: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? - echo "$as_me:2966: \$? = $ac_status" >&5 + echo "$as_me:3033: \$? = $ac_status" >&5 (exit $ac_status); }; }; then ac_lo=0 ac_mid=0 while :; do cat >conftest.$ac_ext <<_ACEOF -#line 2971 "configure" +#line 3038 "configure" #include "confdefs.h" $ac_includes_default int @@ -2980,16 +3047,16 @@ int _array_ [1 - 2 * !((sizeof (long)) <= $ac_mid)] } _ACEOF rm -f conftest.$ac_objext -if { (eval echo "$as_me:2983: \"$ac_compile\"") >&5 +if { (eval echo "$as_me:3050: \"$ac_compile\"") >&5 (eval $ac_compile) 2>&5 ac_status=$? - echo "$as_me:2986: \$? = $ac_status" >&5 + echo "$as_me:3053: \$? = $ac_status" >&5 (exit $ac_status); } && { ac_try='test -s conftest.$ac_objext' - { (eval echo "$as_me:2989: \"$ac_try\"") >&5 + { (eval echo "$as_me:3056: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? - echo "$as_me:2992: \$? = $ac_status" >&5 + echo "$as_me:3059: \$? = $ac_status" >&5 (exit $ac_status); }; }; then ac_hi=$ac_mid; break else @@ -3005,7 +3072,7 @@ cat conftest.$ac_ext >&5 ac_hi=-1 ac_mid=-1 while :; do cat >conftest.$ac_ext <<_ACEOF -#line 3008 "configure" +#line 3075 "configure" #include "confdefs.h" $ac_includes_default int @@ -3017,16 +3084,16 @@ int _array_ [1 - 2 * !((sizeof (long)) >= $ac_mid)] } _ACEOF rm -f conftest.$ac_objext -if { (eval echo "$as_me:3020: \"$ac_compile\"") >&5 +if { (eval echo "$as_me:3087: \"$ac_compile\"") >&5 (eval $ac_compile) 2>&5 ac_status=$? - echo "$as_me:3023: \$? = $ac_status" >&5 + echo "$as_me:3090: \$? = $ac_status" >&5 (exit $ac_status); } && { ac_try='test -s conftest.$ac_objext' - { (eval echo "$as_me:3026: \"$ac_try\"") >&5 + { (eval echo "$as_me:3093: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? - echo "$as_me:3029: \$? = $ac_status" >&5 + echo "$as_me:3096: \$? = $ac_status" >&5 (exit $ac_status); }; }; then ac_lo=$ac_mid; break else @@ -3042,7 +3109,7 @@ rm -f conftest.$ac_objext conftest.$ac_ext while test "x$ac_lo" != "x$ac_hi"; do ac_mid=`expr '(' $ac_hi - $ac_lo ')' / 2 + $ac_lo` cat >conftest.$ac_ext <<_ACEOF -#line 3045 "configure" +#line 3112 "configure" #include "confdefs.h" $ac_includes_default int @@ -3054,16 +3121,16 @@ int _array_ [1 - 2 * !((sizeof (long)) <= $ac_mid)] } _ACEOF rm -f conftest.$ac_objext -if { (eval echo "$as_me:3057: \"$ac_compile\"") >&5 +if { (eval echo "$as_me:3124: \"$ac_compile\"") >&5 (eval $ac_compile) 2>&5 ac_status=$? - echo "$as_me:3060: \$? = $ac_status" >&5 + echo "$as_me:3127: \$? = $ac_status" >&5 (exit $ac_status); } && { ac_try='test -s conftest.$ac_objext' - { (eval echo "$as_me:3063: \"$ac_try\"") >&5 + { (eval echo "$as_me:3130: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? - echo "$as_me:3066: \$? = $ac_status" >&5 + echo "$as_me:3133: \$? = $ac_status" >&5 (exit $ac_status); }; }; then ac_hi=$ac_mid else @@ -3076,12 +3143,12 @@ done ac_cv_sizeof_long=$ac_lo else if test "$cross_compiling" = yes; then - { { echo "$as_me:3079: error: cannot run test program while cross compiling" >&5 + { { echo "$as_me:3146: error: cannot run test program while cross compiling" >&5 echo "$as_me: error: cannot run test program while cross compiling" >&2;} { (exit 1); exit 1; }; } else cat >conftest.$ac_ext <<_ACEOF -#line 3084 "configure" +#line 3151 "configure" #include "confdefs.h" $ac_includes_default int @@ -3097,15 +3164,15 @@ fclose (f); } _ACEOF rm -f conftest$ac_exeext -if { (eval echo "$as_me:3100: \"$ac_link\"") >&5 +if { (eval echo "$as_me:3167: \"$ac_link\"") >&5 (eval $ac_link) 2>&5 ac_status=$? - echo "$as_me:3103: \$? = $ac_status" >&5 + echo "$as_me:3170: \$? = $ac_status" >&5 (exit $ac_status); } && { ac_try='./conftest$ac_exeext' - { (eval echo "$as_me:3105: \"$ac_try\"") >&5 + { (eval echo "$as_me:3172: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? - echo "$as_me:3108: \$? = $ac_status" >&5 + echo "$as_me:3175: \$? = $ac_status" >&5 (exit $ac_status); }; }; then ac_cv_sizeof_long=`cat conftest.val` else @@ -3113,7 +3180,7 @@ else echo "$as_me: failed program was:" >&5 cat conftest.$ac_ext >&5 fi -rm -f core core.* *.core conftest$ac_exeext conftest.$ac_ext +rm -f core core.* *.core conftest$ac_exeext conftest.$ac_objext conftest.$ac_ext fi fi rm -f conftest.val @@ -3121,7 +3188,7 @@ else ac_cv_sizeof_long=0 fi fi -echo "$as_me:3124: result: $ac_cv_sizeof_long" >&5 +echo "$as_me:3191: result: $ac_cv_sizeof_long" >&5 echo "${ECHO_T}$ac_cv_sizeof_long" >&6 cat >>confdefs.h <&5 +as_ac_Header=`echo "ac_cv_header_$ac_header" | $as_tr_sh` +echo "$as_me:3200: 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 3139 "configure" +#line 3206 "configure" #include "confdefs.h" #include <$ac_header> _ACEOF -if { (eval echo "$as_me:3143: \"$ac_cpp conftest.$ac_ext\"") >&5 +if { (eval echo "$as_me:3210: \"$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:3149: \$? = $ac_status" >&5 + echo "$as_me:3216: \$? = $ac_status" >&5 (exit $ac_status); } >/dev/null; then if test -s conftest.err; then ac_cpp_err=$ac_c_preproc_warn_flag @@ -3157,19 +3224,19 @@ else 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:3168: 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:3235: result: `eval echo '${'$as_ac_Header'}'`" >&5 +echo "${ECHO_T}`eval echo '${'$as_ac_Header'}'`" >&6 +if test `eval echo '${'$as_ac_Header'}'` = yes; then cat >>confdefs.h <&5 +as_ac_var=`echo "ac_cv_func_$ac_func" | $as_tr_sh` +echo "$as_me:3248: 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 3187 "configure" +#line 3254 "configure" #include "confdefs.h" /* System header to define __stub macros and hopefully few prototypes, which can conflict with char $ac_func (); below. */ @@ -3215,36 +3282,36 @@ f = $ac_func; } _ACEOF rm -f conftest.$ac_objext conftest$ac_exeext -if { (eval echo "$as_me:3218: \"$ac_link\"") >&5 +if { (eval echo "$as_me:3285: \"$ac_link\"") >&5 (eval $ac_link) 2>&5 ac_status=$? - echo "$as_me:3221: \$? = $ac_status" >&5 + echo "$as_me:3288: \$? = $ac_status" >&5 (exit $ac_status); } && { ac_try='test -s conftest$ac_exeext' - { (eval echo "$as_me:3224: \"$ac_try\"") >&5 + { (eval echo "$as_me:3291: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? - echo "$as_me:3227: \$? = $ac_status" >&5 + echo "$as_me:3294: \$? = $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:3237: 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:3304: result: `eval echo '${'$as_ac_var'}'`" >&5 +echo "${ECHO_T}`eval echo '${'$as_ac_var'}'`" >&6 +if test `eval echo '${'$as_ac_var'}'` = yes; then cat >>confdefs.h <&5 +echo "$as_me:3314: checking for working mmap" >&5 echo $ECHO_N "checking for working mmap... $ECHO_C" >&6 if test "${ac_cv_func_mmap_fixed_mapped+set}" = set; then echo $ECHO_N "(cached) $ECHO_C" >&6 @@ -3253,8 +3320,9 @@ else ac_cv_func_mmap_fixed_mapped=no else cat >conftest.$ac_ext <<_ACEOF -#line 3256 "configure" +#line 3323 "configure" #include "confdefs.h" +$ac_includes_default /* Thanks to Mike Haertel and Jim Avera for this test. Here is a matrix of mmap possibilities: mmap private not fixed @@ -3276,19 +3344,13 @@ else The main things grep needs to know about mmap are: * does it exist and is it safe to write into the mmap'd area * how to use it (BSD variants) */ -#include + #include #include -#if STDC_HEADERS || HAVE_STDLIB_H -# include -#else +#if !STDC_HEADERS && !HAVE_STDLIB_H char *malloc (); #endif -#if HAVE_UNISTD_H -# include -#endif -#include /* This mess was copied from the GNU getpagesize.h. */ #if !HAVE_GETPAGESIZE @@ -3385,15 +3447,15 @@ main () } _ACEOF rm -f conftest$ac_exeext -if { (eval echo "$as_me:3388: \"$ac_link\"") >&5 +if { (eval echo "$as_me:3450: \"$ac_link\"") >&5 (eval $ac_link) 2>&5 ac_status=$? - echo "$as_me:3391: \$? = $ac_status" >&5 + echo "$as_me:3453: \$? = $ac_status" >&5 (exit $ac_status); } && { ac_try='./conftest$ac_exeext' - { (eval echo "$as_me:3393: \"$ac_try\"") >&5 + { (eval echo "$as_me:3455: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? - echo "$as_me:3396: \$? = $ac_status" >&5 + echo "$as_me:3458: \$? = $ac_status" >&5 (exit $ac_status); }; }; then ac_cv_func_mmap_fixed_mapped=yes else @@ -3402,10 +3464,10 @@ echo "$as_me: failed program was:" >&5 cat conftest.$ac_ext >&5 ac_cv_func_mmap_fixed_mapped=no fi -rm -f core core.* *.core conftest$ac_exeext conftest.$ac_ext +rm -f core core.* *.core conftest$ac_exeext conftest.$ac_objext conftest.$ac_ext fi fi -echo "$as_me:3408: result: $ac_cv_func_mmap_fixed_mapped" >&5 +echo "$as_me:3470: result: $ac_cv_func_mmap_fixed_mapped" >&5 echo "${ECHO_T}$ac_cv_func_mmap_fixed_mapped" >&6 if test $ac_cv_func_mmap_fixed_mapped = yes; then @@ -3421,13 +3483,13 @@ if test "$ac_cv_func_mmap_fixed_mapped" != yes; then else FTSYS_SRC='$(BUILD)/ftsystem.c' - echo "$as_me:3424: checking whether munmap must be declared" >&5 + echo "$as_me:3486: checking whether munmap must be declared" >&5 echo $ECHO_N "checking whether munmap must be declared... $ECHO_C" >&6 if test "${ft_cv_munmap_decl+set}" = set; then echo $ECHO_N "(cached) $ECHO_C" >&6 else cat >conftest.$ac_ext <<_ACEOF -#line 3430 "configure" +#line 3492 "configure" #include "confdefs.h" #ifdef HAVE_UNISTD_H @@ -3443,16 +3505,16 @@ char *(*pfn) = (char *(*))munmap } _ACEOF rm -f conftest.$ac_objext -if { (eval echo "$as_me:3446: \"$ac_compile\"") >&5 +if { (eval echo "$as_me:3508: \"$ac_compile\"") >&5 (eval $ac_compile) 2>&5 ac_status=$? - echo "$as_me:3449: \$? = $ac_status" >&5 + echo "$as_me:3511: \$? = $ac_status" >&5 (exit $ac_status); } && { ac_try='test -s conftest.$ac_objext' - { (eval echo "$as_me:3452: \"$ac_try\"") >&5 + { (eval echo "$as_me:3514: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? - echo "$as_me:3455: \$? = $ac_status" >&5 + echo "$as_me:3517: \$? = $ac_status" >&5 (exit $ac_status); }; }; then ft_cv_munmap_decl=no else @@ -3463,7 +3525,7 @@ fi rm -f conftest.$ac_objext conftest.$ac_ext fi -echo "$as_me:3466: result: $ft_cv_munmap_decl" >&5 +echo "$as_me:3528: result: $ft_cv_munmap_decl" >&5 echo "${ECHO_T}$ft_cv_munmap_decl" >&6 if test $ft_cv_munmap_decl = yes; then cat >>confdefs.h <<\EOF @@ -3471,10 +3533,10 @@ if test $ft_cv_munmap_decl = yes; then EOF fi - echo "$as_me:3474: checking for munmap's first parameter type" >&5 + echo "$as_me:3536: checking for munmap's first parameter type" >&5 echo $ECHO_N "checking for munmap's first parameter type... $ECHO_C" >&6 cat >conftest.$ac_ext <<_ACEOF -#line 3477 "configure" +#line 3539 "configure" #include "confdefs.h" #include @@ -3489,18 +3551,18 @@ main () } _ACEOF rm -f conftest.$ac_objext -if { (eval echo "$as_me:3492: \"$ac_compile\"") >&5 +if { (eval echo "$as_me:3554: \"$ac_compile\"") >&5 (eval $ac_compile) 2>&5 ac_status=$? - echo "$as_me:3495: \$? = $ac_status" >&5 + echo "$as_me:3557: \$? = $ac_status" >&5 (exit $ac_status); } && { ac_try='test -s conftest.$ac_objext' - { (eval echo "$as_me:3498: \"$ac_try\"") >&5 + { (eval echo "$as_me:3560: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? - echo "$as_me:3501: \$? = $ac_status" >&5 + echo "$as_me:3563: \$? = $ac_status" >&5 (exit $ac_status); }; }; then - echo "$as_me:3503: result: void *" >&5 + echo "$as_me:3565: result: void *" >&5 echo "${ECHO_T}void *" >&6;cat >>confdefs.h <<\EOF #define MUNMAP_USES_VOIDP 1 EOF @@ -3508,7 +3570,7 @@ EOF else echo "$as_me: failed program was:" >&5 cat conftest.$ac_ext >&5 -echo "$as_me:3511: result: char *" >&5 +echo "$as_me:3573: result: char *" >&5 echo "${ECHO_T}char *" >&6 fi rm -f conftest.$ac_objext conftest.$ac_ext @@ -3517,14 +3579,14 @@ fi for ac_func in memcpy memmove do -ac_ac_var=`echo "ac_cv_func_$ac_func" | $ac_tr_sh` -echo "$as_me:3521: checking for $ac_func" >&5 +as_ac_var=`echo "ac_cv_func_$ac_func" | $as_tr_sh` +echo "$as_me:3583: 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 3527 "configure" +#line 3589 "configure" #include "confdefs.h" /* System header to define __stub macros and hopefully few prototypes, which can conflict with char $ac_func (); below. */ @@ -3555,30 +3617,30 @@ f = $ac_func; } _ACEOF rm -f conftest.$ac_objext conftest$ac_exeext -if { (eval echo "$as_me:3558: \"$ac_link\"") >&5 +if { (eval echo "$as_me:3620: \"$ac_link\"") >&5 (eval $ac_link) 2>&5 ac_status=$? - echo "$as_me:3561: \$? = $ac_status" >&5 + echo "$as_me:3623: \$? = $ac_status" >&5 (exit $ac_status); } && { ac_try='test -s conftest$ac_exeext' - { (eval echo "$as_me:3564: \"$ac_try\"") >&5 + { (eval echo "$as_me:3626: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? - echo "$as_me:3567: \$? = $ac_status" >&5 + echo "$as_me:3629: \$? = $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:3577: 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:3639: result: `eval echo '${'$as_ac_var'}'`" >&5 +echo "${ECHO_T}`eval echo '${'$as_ac_var'}'`" >&6 +if test `eval echo '${'$as_ac_var'}'` = yes; then cat >>confdefs.h <&5 + echo "$as_me:3726: checking for ld used by GCC" >&5 echo $ECHO_N "checking for ld used by GCC... $ECHO_C" >&6 case $host in *-*-mingw*) @@ -3691,10 +3753,10 @@ echo $ECHO_N "checking for ld used by GCC... $ECHO_C" >&6 ;; esac elif test "$with_gnu_ld" = yes; then - echo "$as_me:3694: checking for GNU ld" >&5 + echo "$as_me:3756: checking for GNU ld" >&5 echo $ECHO_N "checking for GNU ld... $ECHO_C" >&6 else - echo "$as_me:3697: checking for non-GNU ld" >&5 + echo "$as_me:3759: checking for non-GNU ld" >&5 echo $ECHO_N "checking for non-GNU ld... $ECHO_C" >&6 fi if test "${lt_cv_path_LD+set}" = set; then @@ -3724,16 +3786,16 @@ fi LD="$lt_cv_path_LD" if test -n "$LD"; then - echo "$as_me:3727: result: $LD" >&5 + echo "$as_me:3789: result: $LD" >&5 echo "${ECHO_T}$LD" >&6 else - echo "$as_me:3730: result: no" >&5 + echo "$as_me:3792: result: no" >&5 echo "${ECHO_T}no" >&6 fi -test -z "$LD" && { { echo "$as_me:3733: error: no acceptable ld found in \$PATH" >&5 +test -z "$LD" && { { echo "$as_me:3795: error: no acceptable ld found in \$PATH" >&5 echo "$as_me: error: no acceptable ld found in \$PATH" >&2;} { (exit 1); exit 1; }; } -echo "$as_me:3736: checking if the linker ($LD) is GNU ld" >&5 +echo "$as_me:3798: checking if the linker ($LD) is GNU ld" >&5 echo $ECHO_N "checking if the linker ($LD) is GNU ld... $ECHO_C" >&6 if test "${lt_cv_prog_gnu_ld+set}" = set; then echo $ECHO_N "(cached) $ECHO_C" >&6 @@ -3745,23 +3807,23 @@ else lt_cv_prog_gnu_ld=no fi fi -echo "$as_me:3748: result: $lt_cv_prog_gnu_ld" >&5 +echo "$as_me:3810: result: $lt_cv_prog_gnu_ld" >&5 echo "${ECHO_T}$lt_cv_prog_gnu_ld" >&6 with_gnu_ld=$lt_cv_prog_gnu_ld -echo "$as_me:3752: checking for $LD option to reload object files" >&5 +echo "$as_me:3814: checking for $LD option to reload object files" >&5 echo $ECHO_N "checking for $LD option to reload object files... $ECHO_C" >&6 if test "${lt_cv_ld_reload_flag+set}" = set; then echo $ECHO_N "(cached) $ECHO_C" >&6 else lt_cv_ld_reload_flag='-r' fi -echo "$as_me:3759: result: $lt_cv_ld_reload_flag" >&5 +echo "$as_me:3821: result: $lt_cv_ld_reload_flag" >&5 echo "${ECHO_T}$lt_cv_ld_reload_flag" >&6 reload_flag=$lt_cv_ld_reload_flag test -n "$reload_flag" && reload_flag=" $reload_flag" -echo "$as_me:3764: checking for BSD-compatible nm" >&5 +echo "$as_me:3826: checking for BSD-compatible nm" >&5 echo $ECHO_N "checking for BSD-compatible nm... $ECHO_C" >&6 if test "${lt_cv_path_NM+set}" = set; then echo $ECHO_N "(cached) $ECHO_C" >&6 @@ -3797,21 +3859,21 @@ fi fi NM="$lt_cv_path_NM" -echo "$as_me:3800: result: $NM" >&5 +echo "$as_me:3862: result: $NM" >&5 echo "${ECHO_T}$NM" >&6 -echo "$as_me:3803: checking whether ln -s works" >&5 +echo "$as_me:3865: checking whether ln -s works" >&5 echo $ECHO_N "checking whether ln -s works... $ECHO_C" >&6 LN_S=$as_ln_s if test "$LN_S" = "ln -s"; then - echo "$as_me:3807: result: yes" >&5 + echo "$as_me:3869: result: yes" >&5 echo "${ECHO_T}yes" >&6 else - echo "$as_me:3810: result: no, using $LN_S" >&5 + echo "$as_me:3872: result: no, using $LN_S" >&5 echo "${ECHO_T}no, using $LN_S" >&6 fi -echo "$as_me:3814: checking how to recognise dependant libraries" >&5 +echo "$as_me:3876: checking how to recognise dependant libraries" >&5 echo $ECHO_N "checking how to recognise dependant libraries... $ECHO_C" >&6 if test "${lt_cv_deplibs_check_method+set}" = set; then echo $ECHO_N "(cached) $ECHO_C" >&6 @@ -3979,13 +4041,13 @@ sysv4 | sysv4.2uw2* | sysv4.3* | sysv5*) esac fi -echo "$as_me:3982: result: $lt_cv_deplibs_check_method" >&5 +echo "$as_me:4044: result: $lt_cv_deplibs_check_method" >&5 echo "${ECHO_T}$lt_cv_deplibs_check_method" >&6 file_magic_cmd=$lt_cv_file_magic_cmd deplibs_check_method=$lt_cv_deplibs_check_method # Check for command to grab the raw symbol name followed by C symbol from nm. -echo "$as_me:3988: checking command to parse $NM output" >&5 +echo "$as_me:4050: checking command to parse $NM output" >&5 echo $ECHO_N "checking command to parse $NM output... $ECHO_C" >&6 if test "${lt_cv_sys_global_symbol_pipe+set}" = set; then echo $ECHO_N "(cached) $ECHO_C" >&6 @@ -4062,17 +4124,17 @@ void nm_test_func(){} int main(){nm_test_var='a';nm_test_func();return(0);} EOF - if { (eval echo "$as_me:4065: \"$ac_compile\"") >&5 + if { (eval echo "$as_me:4127: \"$ac_compile\"") >&5 (eval $ac_compile) 2>&5 ac_status=$? - echo "$as_me:4068: \$? = $ac_status" >&5 + echo "$as_me:4130: \$? = $ac_status" >&5 (exit $ac_status); }; then # Now try to grab the symbols. nlist=conftest.nm - if { (eval echo "$as_me:4072: \"$NM conftest.$ac_objext \| $lt_cv_sys_global_symbol_pipe \> $nlist\"") >&5 + if { (eval echo "$as_me:4134: \"$NM conftest.$ac_objext \| $lt_cv_sys_global_symbol_pipe \> $nlist\"") >&5 (eval $NM conftest.$ac_objext \| $lt_cv_sys_global_symbol_pipe \> $nlist) 2>&5 ac_status=$? - echo "$as_me:4075: \$? = $ac_status" >&5 + echo "$as_me:4137: \$? = $ac_status" >&5 (exit $ac_status); } && test -s "$nlist"; then # Try sorting and uniquifying the output. if sort "$nlist" | uniq > "$nlist"T; then @@ -4124,10 +4186,10 @@ EOF save_CFLAGS="$CFLAGS" LIBS="conftstm.$ac_objext" CFLAGS="$CFLAGS$no_builtin_flag" - if { (eval echo "$as_me:4127: \"$ac_link\"") >&5 + if { (eval echo "$as_me:4189: \"$ac_link\"") >&5 (eval $ac_link) 2>&5 ac_status=$? - echo "$as_me:4130: \$? = $ac_status" >&5 + echo "$as_me:4192: \$? = $ac_status" >&5 (exit $ac_status); } && test -s conftest; then pipe_works=yes fi @@ -4165,33 +4227,33 @@ else global_symbol_to_cdecl="$lt_cv_global_symbol_to_cdecl" fi if test -z "$global_symbol_pipe$global_symbol_to_cdecl"; then - echo "$as_me:4168: result: failed" >&5 + echo "$as_me:4230: result: failed" >&5 echo "${ECHO_T}failed" >&6 else - echo "$as_me:4171: result: ok" >&5 + echo "$as_me:4233: result: ok" >&5 echo "${ECHO_T}ok" >&6 fi for ac_header in dlfcn.h do -ac_ac_Header=`echo "ac_cv_header_$ac_header" | $ac_tr_sh` -echo "$as_me:4178: checking for $ac_header" >&5 +as_ac_Header=`echo "ac_cv_header_$ac_header" | $as_tr_sh` +echo "$as_me:4240: 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 4184 "configure" +#line 4246 "configure" #include "confdefs.h" #include <$ac_header> _ACEOF -if { (eval echo "$as_me:4188: \"$ac_cpp conftest.$ac_ext\"") >&5 +if { (eval echo "$as_me:4250: \"$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:4194: \$? = $ac_status" >&5 + echo "$as_me:4256: \$? = $ac_status" >&5 (exit $ac_status); } >/dev/null; then if test -s conftest.err; then ac_cpp_err=$ac_c_preproc_warn_flag @@ -4202,19 +4264,19 @@ else 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:4213: 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:4275: result: `eval echo '${'$as_ac_Header'}'`" >&5 +echo "${ECHO_T}`eval echo '${'$as_ac_Header'}'`" >&6 +if test `eval echo '${'$as_ac_Header'}'` = yes; then cat >>confdefs.h <&5 + echo "$as_me:4289: checking for ${ac_tool_prefix}file" >&5 echo $ECHO_N "checking for ${ac_tool_prefix}file... $ECHO_C" >&6 if test "${lt_cv_path_MAGIC_CMD+set}" = set; then echo $ECHO_N "(cached) $ECHO_C" >&6 @@ -4279,16 +4341,16 @@ fi MAGIC_CMD="$lt_cv_path_MAGIC_CMD" if test -n "$MAGIC_CMD"; then - echo "$as_me:4282: result: $MAGIC_CMD" >&5 + echo "$as_me:4344: result: $MAGIC_CMD" >&5 echo "${ECHO_T}$MAGIC_CMD" >&6 else - echo "$as_me:4285: result: no" >&5 + echo "$as_me:4347: result: no" >&5 echo "${ECHO_T}no" >&6 fi if test -z "$lt_cv_path_MAGIC_CMD"; then if test -n "$ac_tool_prefix"; then - echo "$as_me:4291: checking for file" >&5 + echo "$as_me:4353: checking for file" >&5 echo $ECHO_N "checking for file... $ECHO_C" >&6 if test "${lt_cv_path_MAGIC_CMD+set}" = set; then echo $ECHO_N "(cached) $ECHO_C" >&6 @@ -4343,10 +4405,10 @@ fi MAGIC_CMD="$lt_cv_path_MAGIC_CMD" if test -n "$MAGIC_CMD"; then - echo "$as_me:4346: result: $MAGIC_CMD" >&5 + echo "$as_me:4408: result: $MAGIC_CMD" >&5 echo "${ECHO_T}$MAGIC_CMD" >&6 else - echo "$as_me:4349: result: no" >&5 + echo "$as_me:4411: result: no" >&5 echo "${ECHO_T}no" >&6 fi @@ -4362,7 +4424,7 @@ esac if test -n "$ac_tool_prefix"; then # Extract the first word of "${ac_tool_prefix}ranlib", so it can be a program name with args. set dummy ${ac_tool_prefix}ranlib; ac_word=$2 -echo "$as_me:4365: checking for $ac_word" >&5 +echo "$as_me:4427: checking for $ac_word" >&5 echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6 if test "${ac_cv_prog_RANLIB+set}" = set; then echo $ECHO_N "(cached) $ECHO_C" >&6 @@ -4377,7 +4439,7 @@ for ac_dir in $ac_dummy; do test -z "$ac_dir" && ac_dir=. $as_executable_p "$ac_dir/$ac_word" || continue ac_cv_prog_RANLIB="${ac_tool_prefix}ranlib" -echo "$as_me:4380: found $ac_dir/$ac_word" >&5 +echo "$as_me:4442: found $ac_dir/$ac_word" >&5 break done @@ -4385,10 +4447,10 @@ fi fi RANLIB=$ac_cv_prog_RANLIB if test -n "$RANLIB"; then - echo "$as_me:4388: result: $RANLIB" >&5 + echo "$as_me:4450: result: $RANLIB" >&5 echo "${ECHO_T}$RANLIB" >&6 else - echo "$as_me:4391: result: no" >&5 + echo "$as_me:4453: result: no" >&5 echo "${ECHO_T}no" >&6 fi @@ -4397,7 +4459,7 @@ if test -z "$ac_cv_prog_RANLIB"; then ac_ct_RANLIB=$RANLIB # Extract the first word of "ranlib", so it can be a program name with args. set dummy ranlib; ac_word=$2 -echo "$as_me:4400: checking for $ac_word" >&5 +echo "$as_me:4462: checking for $ac_word" >&5 echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6 if test "${ac_cv_prog_ac_ct_RANLIB+set}" = set; then echo $ECHO_N "(cached) $ECHO_C" >&6 @@ -4412,7 +4474,7 @@ for ac_dir in $ac_dummy; do test -z "$ac_dir" && ac_dir=. $as_executable_p "$ac_dir/$ac_word" || continue ac_cv_prog_ac_ct_RANLIB="ranlib" -echo "$as_me:4415: found $ac_dir/$ac_word" >&5 +echo "$as_me:4477: found $ac_dir/$ac_word" >&5 break done @@ -4421,10 +4483,10 @@ fi fi ac_ct_RANLIB=$ac_cv_prog_ac_ct_RANLIB if test -n "$ac_ct_RANLIB"; then - echo "$as_me:4424: result: $ac_ct_RANLIB" >&5 + echo "$as_me:4486: result: $ac_ct_RANLIB" >&5 echo "${ECHO_T}$ac_ct_RANLIB" >&6 else - echo "$as_me:4427: result: no" >&5 + echo "$as_me:4489: result: no" >&5 echo "${ECHO_T}no" >&6 fi @@ -4436,7 +4498,7 @@ fi if test -n "$ac_tool_prefix"; then # Extract the first word of "${ac_tool_prefix}strip", so it can be a program name with args. set dummy ${ac_tool_prefix}strip; ac_word=$2 -echo "$as_me:4439: checking for $ac_word" >&5 +echo "$as_me:4501: checking for $ac_word" >&5 echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6 if test "${ac_cv_prog_STRIP+set}" = set; then echo $ECHO_N "(cached) $ECHO_C" >&6 @@ -4451,7 +4513,7 @@ for ac_dir in $ac_dummy; do test -z "$ac_dir" && ac_dir=. $as_executable_p "$ac_dir/$ac_word" || continue ac_cv_prog_STRIP="${ac_tool_prefix}strip" -echo "$as_me:4454: found $ac_dir/$ac_word" >&5 +echo "$as_me:4516: found $ac_dir/$ac_word" >&5 break done @@ -4459,10 +4521,10 @@ fi fi STRIP=$ac_cv_prog_STRIP if test -n "$STRIP"; then - echo "$as_me:4462: result: $STRIP" >&5 + echo "$as_me:4524: result: $STRIP" >&5 echo "${ECHO_T}$STRIP" >&6 else - echo "$as_me:4465: result: no" >&5 + echo "$as_me:4527: result: no" >&5 echo "${ECHO_T}no" >&6 fi @@ -4471,7 +4533,7 @@ if test -z "$ac_cv_prog_STRIP"; then ac_ct_STRIP=$STRIP # Extract the first word of "strip", so it can be a program name with args. set dummy strip; ac_word=$2 -echo "$as_me:4474: checking for $ac_word" >&5 +echo "$as_me:4536: checking for $ac_word" >&5 echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6 if test "${ac_cv_prog_ac_ct_STRIP+set}" = set; then echo $ECHO_N "(cached) $ECHO_C" >&6 @@ -4486,7 +4548,7 @@ for ac_dir in $ac_dummy; do test -z "$ac_dir" && ac_dir=. $as_executable_p "$ac_dir/$ac_word" || continue ac_cv_prog_ac_ct_STRIP="strip" -echo "$as_me:4489: found $ac_dir/$ac_word" >&5 +echo "$as_me:4551: found $ac_dir/$ac_word" >&5 break done @@ -4495,10 +4557,10 @@ fi fi ac_ct_STRIP=$ac_cv_prog_ac_ct_STRIP if test -n "$ac_ct_STRIP"; then - echo "$as_me:4498: result: $ac_ct_STRIP" >&5 + echo "$as_me:4560: result: $ac_ct_STRIP" >&5 echo "${ECHO_T}$ac_ct_STRIP" >&6 else - echo "$as_me:4501: result: no" >&5 + echo "$as_me:4563: result: no" >&5 echo "${ECHO_T}no" >&6 fi @@ -4522,11 +4584,11 @@ test "x$enable_libtool_lock" != xno && enable_libtool_lock=yes case $host in *-*-irix6*) # Find out which ABI we are using. - echo '#line 4525 "configure"' > conftest.$ac_ext - if { (eval echo "$as_me:4526: \"$ac_compile\"") >&5 + echo '#line 4587 "configure"' > conftest.$ac_ext + if { (eval echo "$as_me:4588: \"$ac_compile\"") >&5 (eval $ac_compile) 2>&5 ac_status=$? - echo "$as_me:4529: \$? = $ac_status" >&5 + echo "$as_me:4591: \$? = $ac_status" >&5 (exit $ac_status); }; then case `/usr/bin/file conftest.$ac_objext` in *32-bit*) @@ -4547,7 +4609,7 @@ case $host in # On SCO OpenServer 5, we need -belf to get full-featured binaries. SAVE_CFLAGS="$CFLAGS" CFLAGS="$CFLAGS -belf" - echo "$as_me:4550: checking whether the C compiler needs -belf" >&5 + echo "$as_me:4612: checking whether the C compiler needs -belf" >&5 echo $ECHO_N "checking whether the C compiler needs -belf... $ECHO_C" >&6 if test "${lt_cv_cc_needs_belf+set}" = set; then echo $ECHO_N "(cached) $ECHO_C" >&6 @@ -4560,7 +4622,7 @@ ac_link='$CC -o conftest$ac_exeext $CFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $ ac_compiler_gnu=$ac_cv_c_compiler_gnu cat >conftest.$ac_ext <<_ACEOF -#line 4563 "configure" +#line 4625 "configure" #include "confdefs.h" int @@ -4572,16 +4634,16 @@ main () } _ACEOF rm -f conftest.$ac_objext conftest$ac_exeext -if { (eval echo "$as_me:4575: \"$ac_link\"") >&5 +if { (eval echo "$as_me:4637: \"$ac_link\"") >&5 (eval $ac_link) 2>&5 ac_status=$? - echo "$as_me:4578: \$? = $ac_status" >&5 + echo "$as_me:4640: \$? = $ac_status" >&5 (exit $ac_status); } && { ac_try='test -s conftest$ac_exeext' - { (eval echo "$as_me:4581: \"$ac_try\"") >&5 + { (eval echo "$as_me:4643: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? - echo "$as_me:4584: \$? = $ac_status" >&5 + echo "$as_me:4646: \$? = $ac_status" >&5 (exit $ac_status); }; }; then lt_cv_cc_needs_belf=yes else @@ -4597,7 +4659,7 @@ ac_link='$CC -o conftest$ac_exeext $CFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $ ac_compiler_gnu=$ac_cv_c_compiler_gnu fi -echo "$as_me:4600: result: $lt_cv_cc_needs_belf" >&5 +echo "$as_me:4662: result: $lt_cv_cc_needs_belf" >&5 echo "${ECHO_T}$lt_cv_cc_needs_belf" >&6 if test x"$lt_cv_cc_needs_belf" != x"yes"; then # this is probably gcc 2.8.0, egcs 1.0 or newer; no need for -belf @@ -4692,7 +4754,7 @@ compiler="$2" ## FIXME: this should be a separate macro ## -echo "$as_me:4695: checking for objdir" >&5 +echo "$as_me:4757: checking for objdir" >&5 echo $ECHO_N "checking for objdir... $ECHO_C" >&6 rm -f .libs 2>/dev/null mkdir .libs 2>/dev/null @@ -4703,7 +4765,7 @@ else objdir=_libs fi rmdir .libs 2>/dev/null -echo "$as_me:4706: result: $objdir" >&5 +echo "$as_me:4768: result: $objdir" >&5 echo "${ECHO_T}$objdir" >&6 ## ## END FIXME @@ -4723,7 +4785,7 @@ test -z "$pic_mode" && pic_mode=default # We assume here that the value for lt_cv_prog_cc_pic will not be cached # in isolation, and that seeing it set (from the cache) indicates that # the associated values are set (in the cache) correctly too. -echo "$as_me:4726: checking for $compiler option to produce PIC" >&5 +echo "$as_me:4788: checking for $compiler option to produce PIC" >&5 echo $ECHO_N "checking for $compiler option to produce PIC... $ECHO_C" >&6 if test "${lt_cv_prog_cc_pic+set}" = set; then echo $ECHO_N "(cached) $ECHO_C" >&6 @@ -4870,14 +4932,14 @@ else fi if test -z "$lt_cv_prog_cc_pic"; then - echo "$as_me:4873: result: none" >&5 + echo "$as_me:4935: result: none" >&5 echo "${ECHO_T}none" >&6 else - echo "$as_me:4876: result: $lt_cv_prog_cc_pic" >&5 + echo "$as_me:4938: result: $lt_cv_prog_cc_pic" >&5 echo "${ECHO_T}$lt_cv_prog_cc_pic" >&6 # Check to make sure the pic_flag actually works. - echo "$as_me:4880: checking if $compiler PIC flag $lt_cv_prog_cc_pic works" >&5 + echo "$as_me:4942: checking if $compiler PIC flag $lt_cv_prog_cc_pic works" >&5 echo $ECHO_N "checking if $compiler PIC flag $lt_cv_prog_cc_pic works... $ECHO_C" >&6 if test "${lt_cv_prog_cc_pic_works+set}" = set; then echo $ECHO_N "(cached) $ECHO_C" >&6 @@ -4885,7 +4947,7 @@ else save_CFLAGS="$CFLAGS" CFLAGS="$CFLAGS $lt_cv_prog_cc_pic -DPIC" cat >conftest.$ac_ext <<_ACEOF -#line 4888 "configure" +#line 4950 "configure" #include "confdefs.h" int @@ -4897,16 +4959,16 @@ main () } _ACEOF rm -f conftest.$ac_objext -if { (eval echo "$as_me:4900: \"$ac_compile\"") >&5 +if { (eval echo "$as_me:4962: \"$ac_compile\"") >&5 (eval $ac_compile) 2>&5 ac_status=$? - echo "$as_me:4903: \$? = $ac_status" >&5 + echo "$as_me:4965: \$? = $ac_status" >&5 (exit $ac_status); } && { ac_try='test -s conftest.$ac_objext' - { (eval echo "$as_me:4906: \"$ac_try\"") >&5 + { (eval echo "$as_me:4968: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? - echo "$as_me:4909: \$? = $ac_status" >&5 + echo "$as_me:4971: \$? = $ac_status" >&5 (exit $ac_status); }; }; then case $host_os in hpux9* | hpux10* | hpux11*) @@ -4942,7 +5004,7 @@ fi lt_cv_prog_cc_pic=" $lt_cv_prog_cc_pic" fi - echo "$as_me:4945: result: $lt_cv_prog_cc_pic_works" >&5 + echo "$as_me:5007: result: $lt_cv_prog_cc_pic_works" >&5 echo "${ECHO_T}$lt_cv_prog_cc_pic_works" >&6 fi ## @@ -4950,11 +5012,11 @@ fi # Check for any special shared library compilation flags. if test -n "$lt_cv_prog_cc_shlib"; then - { echo "$as_me:4953: WARNING: \`$CC' requires \`$lt_cv_prog_cc_shlib' to build shared libraries" >&5 + { echo "$as_me:5015: WARNING: \`$CC' requires \`$lt_cv_prog_cc_shlib' to build shared libraries" >&5 echo "$as_me: WARNING: \`$CC' requires \`$lt_cv_prog_cc_shlib' to build shared libraries" >&2;} if echo "$old_CC $old_CFLAGS " | egrep -e "[ ]$lt_cv_prog_cc_shlib[ ]" >/dev/null; then : else - { echo "$as_me:4957: WARNING: add \`$lt_cv_prog_cc_shlib' to the CC or CFLAGS env variable and reconfigure" >&5 + { echo "$as_me:5019: WARNING: add \`$lt_cv_prog_cc_shlib' to the CC or CFLAGS env variable and reconfigure" >&5 echo "$as_me: WARNING: add \`$lt_cv_prog_cc_shlib' to the CC or CFLAGS env variable and reconfigure" >&2;} lt_cv_prog_cc_can_build_shared=no fi @@ -4962,7 +5024,7 @@ fi ## FIXME: this should be a separate macro ## -echo "$as_me:4965: checking if $compiler static flag $lt_cv_prog_cc_static works" >&5 +echo "$as_me:5027: checking if $compiler static flag $lt_cv_prog_cc_static works" >&5 echo $ECHO_N "checking if $compiler static flag $lt_cv_prog_cc_static works... $ECHO_C" >&6 if test "${lt_cv_prog_cc_static_works+set}" = set; then echo $ECHO_N "(cached) $ECHO_C" >&6 @@ -4971,7 +5033,7 @@ else save_LDFLAGS="$LDFLAGS" LDFLAGS="$LDFLAGS $lt_cv_prog_cc_static" cat >conftest.$ac_ext <<_ACEOF -#line 4974 "configure" +#line 5036 "configure" #include "confdefs.h" int @@ -4983,16 +5045,16 @@ main () } _ACEOF rm -f conftest.$ac_objext conftest$ac_exeext -if { (eval echo "$as_me:4986: \"$ac_link\"") >&5 +if { (eval echo "$as_me:5048: \"$ac_link\"") >&5 (eval $ac_link) 2>&5 ac_status=$? - echo "$as_me:4989: \$? = $ac_status" >&5 + echo "$as_me:5051: \$? = $ac_status" >&5 (exit $ac_status); } && { ac_try='test -s conftest$ac_exeext' - { (eval echo "$as_me:4992: \"$ac_try\"") >&5 + { (eval echo "$as_me:5054: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? - echo "$as_me:4995: \$? = $ac_status" >&5 + echo "$as_me:5057: \$? = $ac_status" >&5 (exit $ac_status); }; }; then lt_cv_prog_cc_static_works=yes else @@ -5006,7 +5068,7 @@ fi # Belt *and* braces to stop my trousers falling down: test "X$lt_cv_prog_cc_static_works" = Xno && lt_cv_prog_cc_static= -echo "$as_me:5009: result: $lt_cv_prog_cc_static_works" >&5 +echo "$as_me:5071: result: $lt_cv_prog_cc_static_works" >&5 echo "${ECHO_T}$lt_cv_prog_cc_static_works" >&6 pic_flag="$lt_cv_prog_cc_pic" @@ -5021,7 +5083,7 @@ can_build_shared="$lt_cv_prog_cc_can_build_shared" ## FIXME: this should be a separate macro ## # Check to see if options -o and -c are simultaneously supported by compiler -echo "$as_me:5024: checking if $compiler supports -c -o file.$ac_objext" >&5 +echo "$as_me:5086: checking if $compiler supports -c -o file.$ac_objext" >&5 echo $ECHO_N "checking if $compiler supports -c -o file.$ac_objext... $ECHO_C" >&6 if test "${lt_cv_compiler_c_o+set}" = set; then echo $ECHO_N "(cached) $ECHO_C" >&6 @@ -5041,7 +5103,7 @@ chmod -w . save_CFLAGS="$CFLAGS" CFLAGS="$CFLAGS -o out/conftest2.$ac_objext" compiler_c_o=no -if { (eval echo configure:5044: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>out/conftest.err; } && test -s out/conftest2.$ac_objext; then +if { (eval echo configure:5106: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>out/conftest.err; } && test -s out/conftest2.$ac_objext; then # The compiler can only warn and ignore the option if not recognized # So say no if there are warnings if test -s out/conftest.err; then @@ -5065,12 +5127,12 @@ $rm -r conftest 2>/dev/null fi compiler_c_o=$lt_cv_compiler_c_o -echo "$as_me:5068: result: $compiler_c_o" >&5 +echo "$as_me:5130: result: $compiler_c_o" >&5 echo "${ECHO_T}$compiler_c_o" >&6 if test x"$compiler_c_o" = x"yes"; then # Check to see if we can write to a .lo - echo "$as_me:5073: checking if $compiler supports -c -o file.lo" >&5 + echo "$as_me:5135: checking if $compiler supports -c -o file.lo" >&5 echo $ECHO_N "checking if $compiler supports -c -o file.lo... $ECHO_C" >&6 if test "${lt_cv_compiler_o_lo+set}" = set; then echo $ECHO_N "(cached) $ECHO_C" >&6 @@ -5080,7 +5142,7 @@ else save_CFLAGS="$CFLAGS" CFLAGS="$CFLAGS -c -o conftest.lo" cat >conftest.$ac_ext <<_ACEOF -#line 5083 "configure" +#line 5145 "configure" #include "confdefs.h" int @@ -5092,16 +5154,16 @@ int some_variable = 0; } _ACEOF rm -f conftest.$ac_objext -if { (eval echo "$as_me:5095: \"$ac_compile\"") >&5 +if { (eval echo "$as_me:5157: \"$ac_compile\"") >&5 (eval $ac_compile) 2>&5 ac_status=$? - echo "$as_me:5098: \$? = $ac_status" >&5 + echo "$as_me:5160: \$? = $ac_status" >&5 (exit $ac_status); } && { ac_try='test -s conftest.$ac_objext' - { (eval echo "$as_me:5101: \"$ac_try\"") >&5 + { (eval echo "$as_me:5163: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? - echo "$as_me:5104: \$? = $ac_status" >&5 + echo "$as_me:5166: \$? = $ac_status" >&5 (exit $ac_status); }; }; then # The compiler can only warn and ignore the option if not recognized # So say no if there are warnings @@ -5121,7 +5183,7 @@ rm -f conftest.$ac_objext conftest.$ac_ext fi compiler_o_lo=$lt_cv_compiler_o_lo - echo "$as_me:5124: result: $compiler_c_lo" >&5 + echo "$as_me:5186: result: $compiler_c_lo" >&5 echo "${ECHO_T}$compiler_c_lo" >&6 else compiler_o_lo=no @@ -5135,7 +5197,7 @@ fi hard_links="nottested" if test "$compiler_c_o" = no && test "$need_locks" != no; then # do not overwrite the value of need_locks provided by the user - echo "$as_me:5138: checking if we can lock with hard links" >&5 + echo "$as_me:5200: checking if we can lock with hard links" >&5 echo $ECHO_N "checking if we can lock with hard links... $ECHO_C" >&6 hard_links=yes $rm conftest* @@ -5143,10 +5205,10 @@ echo $ECHO_N "checking if we can lock with hard links... $ECHO_C" >&6 touch conftest.a ln conftest.a conftest.b 2>&5 || hard_links=no ln conftest.a conftest.b 2>/dev/null && hard_links=no - echo "$as_me:5146: result: $hard_links" >&5 + echo "$as_me:5208: result: $hard_links" >&5 echo "${ECHO_T}$hard_links" >&6 if test "$hard_links" = no; then - { echo "$as_me:5149: WARNING: \`$CC' does not support \`-c -o', so \`make -j' may be unsafe" >&5 + { echo "$as_me:5211: WARNING: \`$CC' does not support \`-c -o', so \`make -j' may be unsafe" >&5 echo "$as_me: WARNING: \`$CC' does not support \`-c -o', so \`make -j' may be unsafe" >&2;} need_locks=warn fi @@ -5160,14 +5222,14 @@ fi ## if test "$GCC" = yes; then # Check to see if options -fno-rtti -fno-exceptions are supported by compiler - echo "$as_me:5163: checking if $compiler supports -fno-rtti -fno-exceptions" >&5 + echo "$as_me:5225: checking if $compiler supports -fno-rtti -fno-exceptions" >&5 echo $ECHO_N "checking if $compiler supports -fno-rtti -fno-exceptions... $ECHO_C" >&6 echo "int some_variable = 0;" > conftest.$ac_ext save_CFLAGS="$CFLAGS" CFLAGS="$CFLAGS -fno-rtti -fno-exceptions -c conftest.$ac_ext" compiler_rtti_exceptions=no cat >conftest.$ac_ext <<_ACEOF -#line 5170 "configure" +#line 5232 "configure" #include "confdefs.h" int @@ -5179,16 +5241,16 @@ int some_variable = 0; } _ACEOF rm -f conftest.$ac_objext -if { (eval echo "$as_me:5182: \"$ac_compile\"") >&5 +if { (eval echo "$as_me:5244: \"$ac_compile\"") >&5 (eval $ac_compile) 2>&5 ac_status=$? - echo "$as_me:5185: \$? = $ac_status" >&5 + echo "$as_me:5247: \$? = $ac_status" >&5 (exit $ac_status); } && { ac_try='test -s conftest.$ac_objext' - { (eval echo "$as_me:5188: \"$ac_try\"") >&5 + { (eval echo "$as_me:5250: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? - echo "$as_me:5191: \$? = $ac_status" >&5 + echo "$as_me:5253: \$? = $ac_status" >&5 (exit $ac_status); }; }; then # The compiler can only warn and ignore the option if not recognized # So say no if there are warnings @@ -5204,7 +5266,7 @@ cat conftest.$ac_ext >&5 fi rm -f conftest.$ac_objext conftest.$ac_ext CFLAGS="$save_CFLAGS" - echo "$as_me:5207: result: $compiler_rtti_exceptions" >&5 + echo "$as_me:5269: result: $compiler_rtti_exceptions" >&5 echo "${ECHO_T}$compiler_rtti_exceptions" >&6 if test "$compiler_rtti_exceptions" = "yes"; then @@ -5219,7 +5281,7 @@ fi ## FIXME: this should be a separate macro ## # See if the linker supports building shared libraries. -echo "$as_me:5222: checking whether the linker ($LD) supports shared libraries" >&5 +echo "$as_me:5284: checking whether the linker ($LD) supports shared libraries" >&5 echo $ECHO_N "checking whether the linker ($LD) supports shared libraries... $ECHO_C" >&6 allow_undefined_flag= @@ -5831,7 +5893,7 @@ else ;; esac fi -echo "$as_me:5834: result: $ld_shlibs" >&5 +echo "$as_me:5896: result: $ld_shlibs" >&5 echo "${ECHO_T}$ld_shlibs" >&6 test "$ld_shlibs" = no && can_build_shared=no ## @@ -5840,7 +5902,7 @@ test "$ld_shlibs" = no && can_build_shared=no ## FIXME: this should be a separate macro ## # Check hardcoding attributes. -echo "$as_me:5843: checking how to hardcode library paths into programs" >&5 +echo "$as_me:5905: checking how to hardcode library paths into programs" >&5 echo $ECHO_N "checking how to hardcode library paths into programs... $ECHO_C" >&6 hardcode_action= if test -n "$hardcode_libdir_flag_spec" || \ @@ -5864,7 +5926,7 @@ else # directories. hardcode_action=unsupported fi -echo "$as_me:5867: result: $hardcode_action" >&5 +echo "$as_me:5929: result: $hardcode_action" >&5 echo "${ECHO_T}$hardcode_action" >&6 ## ## END FIXME @@ -5873,15 +5935,15 @@ echo "${ECHO_T}$hardcode_action" >&6 ## striplib= old_striplib= -echo "$as_me:5876: checking whether stripping libraries is possible" >&5 +echo "$as_me:5938: checking whether stripping libraries is possible" >&5 echo $ECHO_N "checking whether stripping libraries is possible... $ECHO_C" >&6 if test -n "$STRIP" && $STRIP -V 2>&1 | grep "GNU strip" >/dev/null; then test -z "$old_striplib" && old_striplib="$STRIP --strip-debug" test -z "$striplib" && striplib="$STRIP --strip-unneeded" - echo "$as_me:5881: result: yes" >&5 + echo "$as_me:5943: result: yes" >&5 echo "${ECHO_T}yes" >&6 else - echo "$as_me:5884: result: no" >&5 + echo "$as_me:5946: result: no" >&5 echo "${ECHO_T}no" >&6 fi ## @@ -5893,7 +5955,7 @@ test -z "$deplibs_check_method" && deplibs_check_method=unknown ## FIXME: this should be a separate macro ## # PORTME Fill in your ld.so characteristics -echo "$as_me:5896: checking dynamic linker characteristics" >&5 +echo "$as_me:5958: checking dynamic linker characteristics" >&5 echo $ECHO_N "checking dynamic linker characteristics... $ECHO_C" >&6 library_names_spec= libname_spec='lib$name' @@ -6275,7 +6337,7 @@ sysv4*MP*) dynamic_linker=no ;; esac -echo "$as_me:6278: result: $dynamic_linker" >&5 +echo "$as_me:6340: result: $dynamic_linker" >&5 echo "${ECHO_T}$dynamic_linker" >&6 test "$dynamic_linker" = no && can_build_shared=no ## @@ -6284,9 +6346,9 @@ test "$dynamic_linker" = no && can_build_shared=no ## FIXME: this should be a separate macro ## # Report the final consequences. -echo "$as_me:6287: checking if libtool supports shared libraries" >&5 +echo "$as_me:6349: checking if libtool supports shared libraries" >&5 echo $ECHO_N "checking if libtool supports shared libraries... $ECHO_C" >&6 -echo "$as_me:6289: result: $can_build_shared" >&5 +echo "$as_me:6351: result: $can_build_shared" >&5 echo "${ECHO_T}$can_build_shared" >&6 ## ## END FIXME @@ -6326,7 +6388,7 @@ else ;; *) - echo "$as_me:6329: checking for dlopen in -ldl" >&5 + echo "$as_me:6391: checking for dlopen in -ldl" >&5 echo $ECHO_N "checking for dlopen in -ldl... $ECHO_C" >&6 if test "${ac_cv_lib_dl_dlopen+set}" = set; then echo $ECHO_N "(cached) $ECHO_C" >&6 @@ -6334,7 +6396,7 @@ else ac_check_lib_save_LIBS=$LIBS LIBS="-ldl $LIBS" cat >conftest.$ac_ext <<_ACEOF -#line 6337 "configure" +#line 6399 "configure" #include "confdefs.h" /* Override any gcc2 internal prototype to avoid an error. */ @@ -6353,16 +6415,16 @@ dlopen (); } _ACEOF rm -f conftest.$ac_objext conftest$ac_exeext -if { (eval echo "$as_me:6356: \"$ac_link\"") >&5 +if { (eval echo "$as_me:6418: \"$ac_link\"") >&5 (eval $ac_link) 2>&5 ac_status=$? - echo "$as_me:6359: \$? = $ac_status" >&5 + echo "$as_me:6421: \$? = $ac_status" >&5 (exit $ac_status); } && { ac_try='test -s conftest$ac_exeext' - { (eval echo "$as_me:6362: \"$ac_try\"") >&5 + { (eval echo "$as_me:6424: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? - echo "$as_me:6365: \$? = $ac_status" >&5 + echo "$as_me:6427: \$? = $ac_status" >&5 (exit $ac_status); }; }; then ac_cv_lib_dl_dlopen=yes else @@ -6373,18 +6435,18 @@ fi rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext LIBS=$ac_check_lib_save_LIBS fi -echo "$as_me:6376: result: $ac_cv_lib_dl_dlopen" >&5 +echo "$as_me:6438: result: $ac_cv_lib_dl_dlopen" >&5 echo "${ECHO_T}$ac_cv_lib_dl_dlopen" >&6 if test $ac_cv_lib_dl_dlopen = yes; then lt_cv_dlopen="dlopen" lt_cv_dlopen_libs="-ldl" else - echo "$as_me:6381: checking for dlopen" >&5 + echo "$as_me:6443: checking for dlopen" >&5 echo $ECHO_N "checking for dlopen... $ECHO_C" >&6 if test "${ac_cv_func_dlopen+set}" = set; then echo $ECHO_N "(cached) $ECHO_C" >&6 else cat >conftest.$ac_ext <<_ACEOF -#line 6387 "configure" +#line 6449 "configure" #include "confdefs.h" /* System header to define __stub macros and hopefully few prototypes, which can conflict with char dlopen (); below. */ @@ -6415,16 +6477,16 @@ f = dlopen; } _ACEOF rm -f conftest.$ac_objext conftest$ac_exeext -if { (eval echo "$as_me:6418: \"$ac_link\"") >&5 +if { (eval echo "$as_me:6480: \"$ac_link\"") >&5 (eval $ac_link) 2>&5 ac_status=$? - echo "$as_me:6421: \$? = $ac_status" >&5 + echo "$as_me:6483: \$? = $ac_status" >&5 (exit $ac_status); } && { ac_try='test -s conftest$ac_exeext' - { (eval echo "$as_me:6424: \"$ac_try\"") >&5 + { (eval echo "$as_me:6486: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? - echo "$as_me:6427: \$? = $ac_status" >&5 + echo "$as_me:6489: \$? = $ac_status" >&5 (exit $ac_status); }; }; then ac_cv_func_dlopen=yes else @@ -6434,18 +6496,18 @@ ac_cv_func_dlopen=no fi rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext fi -echo "$as_me:6437: result: $ac_cv_func_dlopen" >&5 +echo "$as_me:6499: result: $ac_cv_func_dlopen" >&5 echo "${ECHO_T}$ac_cv_func_dlopen" >&6 if test $ac_cv_func_dlopen = yes; then lt_cv_dlopen="dlopen" else - echo "$as_me:6442: checking for shl_load" >&5 + echo "$as_me:6504: checking for shl_load" >&5 echo $ECHO_N "checking for shl_load... $ECHO_C" >&6 if test "${ac_cv_func_shl_load+set}" = set; then echo $ECHO_N "(cached) $ECHO_C" >&6 else cat >conftest.$ac_ext <<_ACEOF -#line 6448 "configure" +#line 6510 "configure" #include "confdefs.h" /* System header to define __stub macros and hopefully few prototypes, which can conflict with char shl_load (); below. */ @@ -6476,16 +6538,16 @@ f = shl_load; } _ACEOF rm -f conftest.$ac_objext conftest$ac_exeext -if { (eval echo "$as_me:6479: \"$ac_link\"") >&5 +if { (eval echo "$as_me:6541: \"$ac_link\"") >&5 (eval $ac_link) 2>&5 ac_status=$? - echo "$as_me:6482: \$? = $ac_status" >&5 + echo "$as_me:6544: \$? = $ac_status" >&5 (exit $ac_status); } && { ac_try='test -s conftest$ac_exeext' - { (eval echo "$as_me:6485: \"$ac_try\"") >&5 + { (eval echo "$as_me:6547: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? - echo "$as_me:6488: \$? = $ac_status" >&5 + echo "$as_me:6550: \$? = $ac_status" >&5 (exit $ac_status); }; }; then ac_cv_func_shl_load=yes else @@ -6495,12 +6557,12 @@ ac_cv_func_shl_load=no fi rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext fi -echo "$as_me:6498: result: $ac_cv_func_shl_load" >&5 +echo "$as_me:6560: result: $ac_cv_func_shl_load" >&5 echo "${ECHO_T}$ac_cv_func_shl_load" >&6 if test $ac_cv_func_shl_load = yes; then lt_cv_dlopen="shl_load" else - echo "$as_me:6503: checking for dlopen in -lsvld" >&5 + echo "$as_me:6565: checking for dlopen in -lsvld" >&5 echo $ECHO_N "checking for dlopen in -lsvld... $ECHO_C" >&6 if test "${ac_cv_lib_svld_dlopen+set}" = set; then echo $ECHO_N "(cached) $ECHO_C" >&6 @@ -6508,7 +6570,7 @@ else ac_check_lib_save_LIBS=$LIBS LIBS="-lsvld $LIBS" cat >conftest.$ac_ext <<_ACEOF -#line 6511 "configure" +#line 6573 "configure" #include "confdefs.h" /* Override any gcc2 internal prototype to avoid an error. */ @@ -6527,16 +6589,16 @@ dlopen (); } _ACEOF rm -f conftest.$ac_objext conftest$ac_exeext -if { (eval echo "$as_me:6530: \"$ac_link\"") >&5 +if { (eval echo "$as_me:6592: \"$ac_link\"") >&5 (eval $ac_link) 2>&5 ac_status=$? - echo "$as_me:6533: \$? = $ac_status" >&5 + echo "$as_me:6595: \$? = $ac_status" >&5 (exit $ac_status); } && { ac_try='test -s conftest$ac_exeext' - { (eval echo "$as_me:6536: \"$ac_try\"") >&5 + { (eval echo "$as_me:6598: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? - echo "$as_me:6539: \$? = $ac_status" >&5 + echo "$as_me:6601: \$? = $ac_status" >&5 (exit $ac_status); }; }; then ac_cv_lib_svld_dlopen=yes else @@ -6547,12 +6609,12 @@ fi rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext LIBS=$ac_check_lib_save_LIBS fi -echo "$as_me:6550: result: $ac_cv_lib_svld_dlopen" >&5 +echo "$as_me:6612: result: $ac_cv_lib_svld_dlopen" >&5 echo "${ECHO_T}$ac_cv_lib_svld_dlopen" >&6 if test $ac_cv_lib_svld_dlopen = yes; then lt_cv_dlopen="dlopen" lt_cv_dlopen_libs="-lsvld" else - echo "$as_me:6555: checking for shl_load in -ldld" >&5 + echo "$as_me:6617: checking for shl_load in -ldld" >&5 echo $ECHO_N "checking for shl_load in -ldld... $ECHO_C" >&6 if test "${ac_cv_lib_dld_shl_load+set}" = set; then echo $ECHO_N "(cached) $ECHO_C" >&6 @@ -6560,7 +6622,7 @@ else ac_check_lib_save_LIBS=$LIBS LIBS="-ldld $LIBS" cat >conftest.$ac_ext <<_ACEOF -#line 6563 "configure" +#line 6625 "configure" #include "confdefs.h" /* Override any gcc2 internal prototype to avoid an error. */ @@ -6579,16 +6641,16 @@ shl_load (); } _ACEOF rm -f conftest.$ac_objext conftest$ac_exeext -if { (eval echo "$as_me:6582: \"$ac_link\"") >&5 +if { (eval echo "$as_me:6644: \"$ac_link\"") >&5 (eval $ac_link) 2>&5 ac_status=$? - echo "$as_me:6585: \$? = $ac_status" >&5 + echo "$as_me:6647: \$? = $ac_status" >&5 (exit $ac_status); } && { ac_try='test -s conftest$ac_exeext' - { (eval echo "$as_me:6588: \"$ac_try\"") >&5 + { (eval echo "$as_me:6650: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? - echo "$as_me:6591: \$? = $ac_status" >&5 + echo "$as_me:6653: \$? = $ac_status" >&5 (exit $ac_status); }; }; then ac_cv_lib_dld_shl_load=yes else @@ -6599,7 +6661,7 @@ fi rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext LIBS=$ac_check_lib_save_LIBS fi -echo "$as_me:6602: result: $ac_cv_lib_dld_shl_load" >&5 +echo "$as_me:6664: result: $ac_cv_lib_dld_shl_load" >&5 echo "${ECHO_T}$ac_cv_lib_dld_shl_load" >&6 if test $ac_cv_lib_dld_shl_load = yes; then lt_cv_dlopen="dld_link" lt_cv_dlopen_libs="-dld" @@ -6633,7 +6695,7 @@ fi save_LIBS="$LIBS" LIBS="$lt_cv_dlopen_libs $LIBS" - echo "$as_me:6636: checking whether a program can dlopen itself" >&5 + echo "$as_me:6698: checking whether a program can dlopen itself" >&5 echo $ECHO_N "checking whether a program can dlopen itself... $ECHO_C" >&6 if test "${lt_cv_dlopen_self+set}" = set; then echo $ECHO_N "(cached) $ECHO_C" >&6 @@ -6644,7 +6706,7 @@ else lt_dlunknown=0; lt_dlno_uscore=1; lt_dlneed_uscore=2 lt_status=$lt_dlunknown cat > conftest.$ac_ext <&5 + if { (eval echo "$as_me:6770: \"$ac_link\"") >&5 (eval $ac_link) 2>&5 ac_status=$? - echo "$as_me:6711: \$? = $ac_status" >&5 + echo "$as_me:6773: \$? = $ac_status" >&5 (exit $ac_status); } && test -s conftest${ac_exeext} 2>/dev/null; then (./conftest; exit; ) 2>/dev/null lt_status=$? @@ -6725,12 +6787,12 @@ fi rm -fr conftest* fi -echo "$as_me:6728: result: $lt_cv_dlopen_self" >&5 +echo "$as_me:6790: result: $lt_cv_dlopen_self" >&5 echo "${ECHO_T}$lt_cv_dlopen_self" >&6 if test "x$lt_cv_dlopen_self" = xyes; then LDFLAGS="$LDFLAGS $link_static_flag" - echo "$as_me:6733: checking whether a statically linked program can dlopen itself" >&5 + echo "$as_me:6795: checking whether a statically linked program can dlopen itself" >&5 echo $ECHO_N "checking whether a statically linked program can dlopen itself... $ECHO_C" >&6 if test "${lt_cv_dlopen_self_static+set}" = set; then echo $ECHO_N "(cached) $ECHO_C" >&6 @@ -6741,7 +6803,7 @@ else lt_dlunknown=0; lt_dlno_uscore=1; lt_dlneed_uscore=2 lt_status=$lt_dlunknown cat > conftest.$ac_ext <&5 + if { (eval echo "$as_me:6867: \"$ac_link\"") >&5 (eval $ac_link) 2>&5 ac_status=$? - echo "$as_me:6808: \$? = $ac_status" >&5 + echo "$as_me:6870: \$? = $ac_status" >&5 (exit $ac_status); } && test -s conftest${ac_exeext} 2>/dev/null; then (./conftest; exit; ) 2>/dev/null lt_status=$? @@ -6822,7 +6884,7 @@ fi rm -fr conftest* fi -echo "$as_me:6825: result: $lt_cv_dlopen_self_static" >&5 +echo "$as_me:6887: result: $lt_cv_dlopen_self_static" >&5 echo "${ECHO_T}$lt_cv_dlopen_self_static" >&6 fi @@ -6854,7 +6916,7 @@ if test "$enable_shared" = yes && test "$GCC" = yes; then # Test whether the compiler implicitly links with -lc since on some # systems, -lgcc has to come before -lc. If gcc already passes -lc # to ld, don't add -lc before -lgcc. - echo "$as_me:6857: checking whether -lc should be explicitly linked in" >&5 + echo "$as_me:6919: checking whether -lc should be explicitly linked in" >&5 echo $ECHO_N "checking whether -lc should be explicitly linked in... $ECHO_C" >&6 if test "${lt_cv_archive_cmds_need_lc+set}" = set; then echo $ECHO_N "(cached) $ECHO_C" >&6 @@ -6862,10 +6924,10 @@ else $rm conftest* echo 'static int dummy;' > conftest.$ac_ext - if { (eval echo "$as_me:6865: \"$ac_compile\"") >&5 + if { (eval echo "$as_me:6927: \"$ac_compile\"") >&5 (eval $ac_compile) 2>&5 ac_status=$? - echo "$as_me:6868: \$? = $ac_status" >&5 + echo "$as_me:6930: \$? = $ac_status" >&5 (exit $ac_status); }; then soname=conftest lib=conftest @@ -6879,10 +6941,10 @@ else libname=conftest save_allow_undefined_flag=$allow_undefined_flag allow_undefined_flag= - if { (eval echo "$as_me:6882: \"$archive_cmds 2\>\&1 \| grep \" -lc \" \>/dev/null 2\>\&1\"") >&5 + if { (eval echo "$as_me:6944: \"$archive_cmds 2\>\&1 \| grep \" -lc \" \>/dev/null 2\>\&1\"") >&5 (eval $archive_cmds 2\>\&1 \| grep \" -lc \" \>/dev/null 2\>\&1) 2>&5 ac_status=$? - echo "$as_me:6885: \$? = $ac_status" >&5 + echo "$as_me:6947: \$? = $ac_status" >&5 (exit $ac_status); } then lt_cv_archive_cmds_need_lc=no @@ -6895,7 +6957,7 @@ else fi fi - echo "$as_me:6898: result: $lt_cv_archive_cmds_need_lc" >&5 + echo "$as_me:6960: result: $lt_cv_archive_cmds_need_lc" >&5 echo "${ECHO_T}$lt_cv_archive_cmds_need_lc" >&6 ;; esac @@ -7493,12 +7555,12 @@ _ACEOF # 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; } | @@ -7543,7 +7605,7 @@ DEFS=-DHAVE_CONFIG_H : ${CONFIG_STATUS=./config.status} ac_clean_files_save=$ac_clean_files ac_clean_files="$ac_clean_files $CONFIG_STATUS" -{ echo "$as_me:7546: creating $CONFIG_STATUS" >&5 +{ echo "$as_me:7608: creating $CONFIG_STATUS" >&5 echo "$as_me: creating $CONFIG_STATUS" >&6;} cat >$CONFIG_STATUS <<_ACEOF #! $SHELL @@ -7672,7 +7734,7 @@ EOF cat >>$CONFIG_STATUS <>$CONFIG_STATUS <<\EOF echo "$ac_cs_version"; exit 0 ;; --he | --h) # Conflict between --help and --header - { { echo "$as_me:7719: error: ambiguous option: $1 + { { echo "$as_me:7781: error: ambiguous option: $1 Try \`$0 --help' for more information." >&5 echo "$as_me: error: ambiguous option: $1 Try \`$0 --help' for more information." >&2;} @@ -7734,21 +7796,15 @@ Try \`$0 --help' for more information." >&2;} CONFIG_HEADERS="$CONFIG_HEADERS $1" ac_need_defaults=false;; - # Handling of arguments. - 'unix-cc.mk' ) CONFIG_FILES="$CONFIG_FILES unix-cc.mk:unix-cc.in" ;; - 'unix-def.mk' ) CONFIG_FILES="$CONFIG_FILES unix-def.mk:unix-def.in" ;; - 'freetype-config' ) CONFIG_FILES="$CONFIG_FILES freetype-config" ;; - 'ftconfig.h' ) CONFIG_HEADERS="$CONFIG_HEADERS ftconfig.h:ftconfig.in" ;; - # This is an error. - -*) { { echo "$as_me:7744: error: unrecognized option: $1 + -*) { { echo "$as_me:7800: 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:7749: 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 @@ -7760,7 +7816,11 @@ cat >&5 << _ACEOF ## Running config.status. ## ## ----------------------- ## -This file was extended by $as_me 2.50, 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` @@ -7768,6 +7828,20 @@ _ACEOF EOF cat >>$CONFIG_STATUS <<\EOF +for ac_config_target in $ac_config_targets +do + case "$ac_config_target" in + # Handling of arguments. + "unix-cc.mk" ) CONFIG_FILES="$CONFIG_FILES unix-cc.mk:unix-cc.in" ;; + "unix-def.mk" ) CONFIG_FILES="$CONFIG_FILES unix-def.mk:unix-def.in" ;; + "freetype-config" ) CONFIG_FILES="$CONFIG_FILES freetype-config" ;; + "ftconfig.h" ) CONFIG_HEADERS="$CONFIG_HEADERS ftconfig.h:ftconfig.in" ;; + *) { { echo "$as_me:7839: 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 @@ -7781,7 +7855,7 @@ fi $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. @@ -7834,6 +7908,9 @@ s,@PACKAGE_TARNAME@,$PACKAGE_TARNAME,;t t 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 @@ -7991,7 +8068,7 @@ done; } esac if test x"$ac_file" != x-; then - { echo "$as_me:7994: creating $ac_file" >&5 + { echo "$as_me:8071: creating $ac_file" >&5 echo "$as_me: creating $ac_file" >&6;} rm -f "$ac_file" fi @@ -8009,7 +8086,7 @@ echo "$as_me: creating $ac_file" >&6;} -) echo $tmp/stdin ;; [\\/$]*) # Absolute (can't be DOS-style, as IFS=:) - test -f "$f" || { { echo "$as_me:8012: error: cannot find input file: $f" >&5 + test -f "$f" || { { echo "$as_me:8089: error: cannot find input file: $f" >&5 echo "$as_me: error: cannot find input file: $f" >&2;} { (exit 1); exit 1; }; } echo $f;; @@ -8022,7 +8099,7 @@ echo "$as_me: error: cannot find input file: $f" >&2;} echo $srcdir/$f else # /dev/null tree - { { echo "$as_me:8025: error: cannot find input file: $f" >&5 + { { echo "$as_me:8102: error: cannot find input file: $f" >&5 echo "$as_me: error: cannot find input file: $f" >&2;} { (exit 1); exit 1; }; } fi;; @@ -8083,7 +8160,7 @@ for ac_file in : $CONFIG_HEADERS; do test "x$ac_file" = x: && continue * ) ac_file_in=$ac_file.in ;; esac - test x"$ac_file" != x- && { echo "$as_me:8086: creating $ac_file" >&5 + test x"$ac_file" != x- && { echo "$as_me:8163: creating $ac_file" >&5 echo "$as_me: creating $ac_file" >&6;} # First look for the input files in the build tree, otherwise in the @@ -8094,7 +8171,7 @@ echo "$as_me: creating $ac_file" >&6;} -) echo $tmp/stdin ;; [\\/$]*) # Absolute (can't be DOS-style, as IFS=:) - test -f "$f" || { { echo "$as_me:8097: error: cannot find input file: $f" >&5 + test -f "$f" || { { echo "$as_me:8174: error: cannot find input file: $f" >&5 echo "$as_me: error: cannot find input file: $f" >&2;} { (exit 1); exit 1; }; } echo $f;; @@ -8107,7 +8184,7 @@ echo "$as_me: error: cannot find input file: $f" >&2;} echo $srcdir/$f else # /dev/null tree - { { echo "$as_me:8110: error: cannot find input file: $f" >&5 + { { echo "$as_me:8187: error: cannot find input file: $f" >&5 echo "$as_me: error: cannot find input file: $f" >&2;} { (exit 1); exit 1; }; } fi;; @@ -8224,7 +8301,7 @@ cat >>$CONFIG_STATUS <<\EOF 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:8227: $ac_file is unchanged" >&5 + { echo "$as_me:8304: $ac_file is unchanged" >&5 echo "$as_me: $ac_file is unchanged" >&6;} else ac_dir=`$as_expr X"$ac_file" : 'X\(.*[^/]\)//*[^/][^/]*/*$' \| \ diff --git a/builds/unix/configure.ac b/builds/unix/configure.ac index 6de58aa62..c15f90323 100644 --- a/builds/unix/configure.ac +++ b/builds/unix/configure.ac @@ -9,7 +9,7 @@ AC_CONFIG_SRCDIR([ftconfig.in]) dnl configuration file -- stay in 8.3 limit AC_CONFIG_HEADER(ftconfig.h:ftconfig.in) -version_info='7:0:1' +version_info='8:0:2' AC_SUBST(version_info) ft_version=`echo $version_info | tr : .` AC_SUBST(ft_version) diff --git a/builds/unix/freetype-config.in b/builds/unix/freetype-config.in index 82a54d034..09bd6e425 100644 --- a/builds/unix/freetype-config.in +++ b/builds/unix/freetype-config.in @@ -1,4 +1,4 @@ -#!/bin/sh +#! /bin/sh prefix=@prefix@ exec_prefix=@exec_prefix@ diff --git a/include/freetype/cache/ftccache.h b/include/freetype/cache/ftccache.h index b6eee1f67..81d036605 100644 --- a/include/freetype/cache/ftccache.h +++ b/include/freetype/cache/ftccache.h @@ -54,14 +54,14 @@ FT_BEGIN_HEADER #define FTC_NODE(x) ((FTC_Node)(x)) #define FTC_NODE_P(x) ((FTC_Node*)(x)) - /* can be used as a FTC_Node_DoneFunc */ - FT_EXPORT(void) + /* can be used as a FTC_Node_DoneFunc */ + FT_EXPORT( void ) ftc_node_done( FTC_Node node, FTC_Cache cache ); - /* reserved for manager's use */ - FT_EXPORT(void) + /* reserved for manager's use */ + FT_EXPORT( void ) ftc_node_destroy( FTC_Node node, FTC_Manager manager ); diff --git a/include/freetype/cache/ftcmanag.h b/include/freetype/cache/ftcmanag.h index aa32cd019..712101fea 100644 --- a/include/freetype/cache/ftcmanag.h +++ b/include/freetype/cache/ftcmanag.h @@ -108,13 +108,13 @@ FT_BEGIN_HEADER } FTC_FamilyTableRec, *FTC_FamilyTable; - FT_LOCAL FT_Error + FT_EXPORT( FT_Error ) ftc_family_table_alloc( FTC_FamilyTable table, FT_Memory memory, FTC_FamilyEntry *aentry ); - FT_LOCAL void + FT_EXPORT( void ) ftc_family_table_free( FTC_FamilyTable table, FT_UInt index ); @@ -210,8 +210,22 @@ FT_BEGIN_HEADER FTC_Manager manager ); - /* can be called to decrement a node's reference count */ - FT_EXPORT(void) + /*************************************************************************/ + /* */ + /* */ + /* FTC_Node_Unref */ + /* */ + /* */ + /* Decrement a cache node's internal reference count. When the count */ + /* reaches 0, it is not destroyed but becomes eligible for subsequent */ + /* cache flushes. */ + /* */ + /* */ + /* node :: The cache node handle. */ + /* */ + /* manager :: The cache manager handle. */ + /* */ + FT_EXPORT( void ) FTC_Node_Unref( FTC_Node node, FTC_Manager manager ); diff --git a/include/freetype/ftcache.h b/include/freetype/ftcache.h index b05910202..0e4974648 100644 --- a/include/freetype/ftcache.h +++ b/include/freetype/ftcache.h @@ -67,6 +67,7 @@ FT_BEGIN_HEADER /* FTC_Manager_Lookup_Size */ /* */ /* FTC_Node */ + /* FTC_Node_Ref */ /* FTC_Node_Unref */ /* */ /* FTC_Font */ @@ -86,7 +87,7 @@ FT_BEGIN_HEADER /* FTC_Image_Cache_Lookup */ /* */ /* FTC_SBit_Cache */ - /* FTC_Sbit_Cache_Lookup */ + /* FTC_SBit_Cache_Lookup */ /* */ /*************************************************************************/ @@ -399,26 +400,6 @@ FT_BEGIN_HEADER FT_Face *aface, FT_Size *asize ); - /*************************************************************************/ - /* */ - /* */ - /* FTC_Node_Unref */ - /* */ - /* */ - /* decrement a cache node's internal reference count. when the count */ - /* reaches 0, it is not destroyed but becomes eligible for subsequent */ - /* cache flushes.. */ - /* */ - /* */ - /* node :: cache node handle */ - /* manager :: cache manager handle */ - /* */ - FT_EXPORT( void ) - FTC_Node_Unref( FTC_Node node, - FTC_Manager manager ); - - /* */ - FT_END_HEADER diff --git a/include/freetype/ftglyph.h b/include/freetype/ftglyph.h index b51e95989..abf9a6461 100644 --- a/include/freetype/ftglyph.h +++ b/include/freetype/ftglyph.h @@ -69,16 +69,16 @@ FT_BEGIN_HEADER /* FT_Glyph */ /* */ /* */ - /* Handle to an object used to model generic glyph images. It's a */ + /* Handle to an object used to model generic glyph images. It is a */ /* pointer to the @FT_GlyphRec structure and can contain a glyph */ - /* bitmap or pointer.. */ + /* bitmap or pointer. */ /* */ /* */ - /* glyph objects are not owned by the library. You must thus release */ + /* Glyph objects are not owned by the library. You must thus release */ /* them manually (through @FT_Done_Glyph) _before_ calling */ /* @FT_Done_FreeType. */ /* */ - typedef struct FT_GlyphRec_* FT_Glyph; + typedef struct FT_GlyphRec_* FT_Glyph; /*************************************************************************/ @@ -115,10 +115,10 @@ FT_BEGIN_HEADER /* FT_BitmapGlyph */ /* */ /* */ - /* Handle to an object used to model a bitmap glyph image. This is */ - /* a sub-class of @FT_Glyph, and a pointer to @FT_BitmapGlyphRec */ + /* A handle to an object used to model a bitmap glyph image. This is */ + /* a sub-class of @FT_Glyph, and a pointer to @FT_BitmapGlyphRec. */ /* */ - typedef struct FT_BitmapGlyphRec_* FT_BitmapGlyph; + typedef struct FT_BitmapGlyphRec_* FT_BitmapGlyph; /*************************************************************************/ @@ -167,10 +167,10 @@ FT_BEGIN_HEADER /* FT_OutlineGlyph */ /* */ /* */ - /* Handle to an object used to model an outline glyph image. This is */ - /* a sub-class of @FT_Glyph, and a pointer to @FT_OutlineGlyphRec */ + /* A handle to an object used to model an outline glyph image. This */ + /* is a sub-class of @FT_Glyph, and a pointer to @FT_OutlineGlyphRec. */ /* */ - typedef struct FT_OutlineGlyphRec_* FT_OutlineGlyph; + typedef struct FT_OutlineGlyphRec_* FT_OutlineGlyph; /*************************************************************************/ diff --git a/src/base/ftglyph.c b/src/base/ftglyph.c index b0934c3fd..094d1db08 100644 --- a/src/base/ftglyph.c +++ b/src/base/ftglyph.c @@ -608,6 +608,8 @@ /* if `origin' is set, translate the glyph image */ if ( origin ) FT_Glyph_Transform( glyph, 0, origin ); +#else + FT_UNUSED( origin ); #endif /* prepare dummy slot for rendering */ diff --git a/src/base/fttrigon.c b/src/base/fttrigon.c index 4176d0cc8..8a2778b69 100644 --- a/src/base/fttrigon.c +++ b/src/base/fttrigon.c @@ -292,7 +292,7 @@ v.y = 0; ft_trig_pseudo_rotate( &v, angle ); - return v.x/(1 << 12); + return v.x / ( 1 << 12 ); } diff --git a/src/cache/ftccache.c b/src/cache/ftccache.c index 147a624f9..5eefb0372 100644 --- a/src/cache/ftccache.c +++ b/src/cache/ftccache.c @@ -147,9 +147,8 @@ } - - /* remove a node from the cache manager */ - FT_LOCAL_DEF void + /* remove a node from the cache manager */ + FT_EXPORT_DEF( void ) ftc_node_destroy( FTC_Node node, FTC_Manager manager ) { diff --git a/src/cache/ftccmap.c b/src/cache/ftccmap.c index fa72a388b..3badfba32 100644 --- a/src/cache/ftccmap.c +++ b/src/cache/ftccmap.c @@ -107,9 +107,9 @@ FTC_CMapQuery cquery, FTC_Cache cache ) { - FTC_CMapFamily cfam = FTC_CMAP_FAMILY( FTC_QUERY(cquery)->family ); - FT_UInt32 first; - FT_UInt n; + FT_UInt32 first; + FT_UInt n; + FT_UNUSED( cache ); first = (cquery->char_code / FTC_CMAP_INDICES_MAX) * FTC_CMAP_INDICES_MAX; @@ -158,7 +158,7 @@ { FTC_Manager manager = cache->manager; FTC_CMapDesc desc = cquery->desc; - FT_UInt32 hash; + FT_UInt32 hash = 0; FT_Error error; FT_Face face; @@ -331,7 +331,7 @@ FTC_CMapQueryRec cquery; FTC_CMapNode node; FT_Error error; - FT_UInt gindex; + FT_UInt gindex = 0; if ( !cache || !desc ) { @@ -353,7 +353,7 @@ if ( gindex == FTC_CMAP_UNKNOWN ) { FT_Face face; - FT_CharMap old, cmap, limit; + /* we need to use @FT_Get_Char_Index */ gindex = 0; @@ -387,5 +387,4 @@ } - /* END */ diff --git a/src/cache/ftcmanag.c b/src/cache/ftcmanag.c index 8e834d174..50941eaf0 100644 --- a/src/cache/ftcmanag.c +++ b/src/cache/ftcmanag.c @@ -345,7 +345,7 @@ } - FT_LOCAL_DEF FT_Error + FT_EXPORT_DEF( FT_Error ) ftc_family_table_alloc( FTC_FamilyTable table, FT_Memory memory, FTC_FamilyEntry *aentry ) @@ -411,7 +411,7 @@ } - FT_LOCAL_DEF void + FT_EXPORT_DEF( void ) ftc_family_table_free( FTC_FamilyTable table, FT_UInt index ) { diff --git a/src/cache/ftcsbits.c b/src/cache/ftcsbits.c index 7386ad72e..571155728 100644 --- a/src/cache/ftcsbits.c +++ b/src/cache/ftcsbits.c @@ -128,7 +128,6 @@ { FT_Error error; FTC_GlyphNode gnode = FTC_GLYPH_NODE(snode); - FTC_GlyphFamily gfam = FTC_GLYPH_FAMILY(sfam); FT_Memory memory; FT_Face face; FT_Size size; diff --git a/src/cff/cffgload.c b/src/cff/cffgload.c index 8ea8c5382..be58ac132 100644 --- a/src/cff/cffgload.c +++ b/src/cff/cffgload.c @@ -704,6 +704,7 @@ T2_Hints_Funcs hinter; + /* set default width */ decoder->num_hints = 0; decoder->read_width = 1; @@ -1064,19 +1065,18 @@ /* the number of arguments is always even here */ FT_TRACE4(( op == cff_op_hstem ? " hstem" : ( op == cff_op_vstem ? " vstem" : - ( op == cff_op_hstemhm ? " hstemhm" : " vstemhm" )) )); + ( op == cff_op_hstemhm ? " hstemhm" : " vstemhm" ) ) )); if ( hinter ) hinter->stems( hinter->hints, ( op == cff_op_vstem || op == cff_op_vstemhm ), - num_args/2, + num_args / 2, args ); decoder->num_hints += num_args / 2; args = stack; break; - case cff_op_hintmask: case cff_op_cntrmask: FT_TRACE4(( op == cff_op_hintmask ? " hintmask" : " cntrmask" )); @@ -1088,11 +1088,11 @@ if ( op == cff_op_hintmask ) hinter->hintmask( hinter->hints, builder->current->n_points, - (decoder->num_hints+7) >> 3, + ( decoder->num_hints + 7 ) >> 3, ip ); else hinter->counter( hinter->hints, - (decoder->num_hints+7) >> 3, + ( decoder->num_hints + 7 ) >> 3, ip ); } @@ -1645,7 +1645,7 @@ /* close hints recording session */ if ( hinter ) { - if (hinter->close( hinter->hints, builder->current->n_points )) + if (hinter->close( hinter->hints, builder->current->n_points ) ) goto Syntax_Error; /* apply hints to the loaded glyph outline now */ @@ -2304,11 +2304,11 @@ if ( hinting ) { - metrics->horiAdvance = (metrics->horiAdvance+32) & -64; - metrics->vertAdvance = (metrics->vertAdvance+32) & -64; + metrics->horiAdvance = ( metrics->horiAdvance + 32 ) & -64; + metrics->vertAdvance = ( metrics->vertAdvance + 32 ) & -64; - metrics->vertBearingX = (metrics->vertBearingX+32) & -64; - metrics->vertBearingY = (metrics->vertBearingY+32) & -64; + metrics->vertBearingX = ( metrics->vertBearingX + 32 ) & -64; + metrics->vertBearingY = ( metrics->vertBearingY + 32 ) & -64; } } diff --git a/src/cid/cidgload.c b/src/cid/cidgload.c index c37dd1c8b..3769da105 100644 --- a/src/cid/cidgload.c +++ b/src/cid/cidgload.c @@ -333,11 +333,11 @@ if ( hinting ) { - metrics->horiAdvance = (metrics->horiAdvance+32) & -64; - metrics->vertAdvance = (metrics->vertAdvance+32) & -64; + metrics->horiAdvance = ( metrics->horiAdvance + 32 ) & -64; + metrics->vertAdvance = ( metrics->vertAdvance + 32 ) & -64; - metrics->vertBearingX = (metrics->vertBearingX+32) & -64; - metrics->vertBearingY = (metrics->vertBearingY+32) & -64; + metrics->vertBearingX = ( metrics->vertBearingX + 32 ) & -64; + metrics->vertBearingY = ( metrics->vertBearingY + 32 ) & -64; } } diff --git a/src/pshinter/pshglob.c b/src/pshinter/pshglob.c index 36f775917..0cebb45cb 100644 --- a/src/pshinter/pshglob.c +++ b/src/pshinter/pshglob.c @@ -346,23 +346,23 @@ PSH_Blue_Table table = 0; /* */ - /* determine wether we need to suppress overshoots or not */ - /* we simply need to compare the vertical scale parameter */ - /* to the raw bluescale value. Here's why */ + /* Determine whether we need to suppress overshoots or */ + /* not. We simply need to compare the vertical scale */ + /* parameter to the raw bluescale value. Here is why: */ /* */ - /* we need to suppress overshoots for all pointsizes */ - /* at 300dpi that satisfy: */ + /* We need to suppress overshoots for all pointsizes. */ + /* At 300dpi that satisfy: */ /* */ /* pointsize < 240*bluescale + 0.49 */ /* */ - /* this corresponds to: */ + /* This corresponds to: */ /* */ /* pixelsize < 1000*bluescale + 49/24 */ /* */ /* scale*EM_Size < 1000*bluescale + 49/24 */ /* */ - /* however, for normal Type 1 fonts, EM_Size is 1000 !! */ - /* we thus only check: */ + /* However, for normal Type 1 fonts, EM_Size is 1000! */ + /* We thus only check: */ /* */ /* scale < bluescale + 49/24000 */ /* */ @@ -373,17 +373,18 @@ blues->no_overshoots = FT_BOOL( scale < blues->blue_scale ); /* */ - /* the blue threshold is the font units distance under */ + /* The blue threshold is the font units distance under */ /* which overshoots are suppressed due to the BlueShift */ - /* even if the scale is greater than BlueScale */ + /* even if the scale is greater than BlueScale. */ /* */ - /* it's the smallest distance such that */ + /* It is the smallest distance such that */ /* */ /* dist <= BlueShift && dist*scale <= 0.5 pixels */ /* */ { FT_Int threshold = blues->blue_shift; + while ( threshold > 0 && FT_MulFix( threshold, scale ) > 32 ) threshold --; @@ -433,32 +434,36 @@ } /* process the families now */ + for ( num = 0; num < 2; num++ ) { - PSH_Blue_Zone zone1, zone2; - FT_UInt count1, count2; - PSH_Blue_Table normal, family; + PSH_Blue_Zone zone1, zone2; + FT_UInt count1, count2; + PSH_Blue_Table normal, family; + - switch (num) + switch ( num ) { - case 0: - normal = &blues->normal_top; - family = &blues->family_top; - break; + case 0: + normal = &blues->normal_top; + family = &blues->family_top; + break; - default: - normal = &blues->normal_bottom; - family = &blues->family_bottom; + default: + normal = &blues->normal_bottom; + family = &blues->family_bottom; } zone1 = normal->zones; count1 = normal->count; + for ( ; count1 > 0; count1--, zone1++ ) { /* try to find a family zone whose reference position is less */ - /* than 1 pixel far from the current zone.. */ + /* than 1 pixel far from the current zone */ zone2 = family->zones; count2 = family->count; + for ( ; count2 > 0; count2--, zone2++ ) { if ( FT_MulFix( zone1->org_ref - zone2->org_ref, scale ) < 64 ) @@ -639,7 +644,7 @@ priv->family_other_blues, priv->blue_fuzz, 1 ); globals->blues.blue_scale = priv->blue_scale ? priv->blue_scale - : (0.039625*0x400000L); + : ( 0.039625 * 0x400000L ); globals->blues.blue_shift = priv->blue_shift ? priv->blue_shift : 7; diff --git a/src/truetype/ttgload.c b/src/truetype/ttgload.c index 0c5ee047e..7f1481fe3 100644 --- a/src/truetype/ttgload.c +++ b/src/truetype/ttgload.c @@ -1186,7 +1186,7 @@ /* don't forget to hint the advance when we need to */ if ( IS_HINTED( loader->load_flags ) ) - glyph->metrics.horiAdvance = (glyph->metrics.horiAdvance+32) & -64; + glyph->metrics.horiAdvance = ( glyph->metrics.horiAdvance + 32 ) & -64; /* Now take care of vertical metrics. In the case where there is */ /* no vertical information within the font (relatively common), make */ diff --git a/src/type1/t1gload.c b/src/type1/t1gload.c index 688564562..515e3050c 100644 --- a/src/type1/t1gload.c +++ b/src/type1/t1gload.c @@ -280,11 +280,11 @@ if ( hinting ) { - metrics->horiAdvance = (metrics->horiAdvance+32) & -64; - metrics->vertAdvance = (metrics->vertAdvance+32) & -64; + metrics->horiAdvance = ( metrics->horiAdvance + 32 ) & -64; + metrics->vertAdvance = ( metrics->vertAdvance + 32 ) & -64; - metrics->vertBearingX = (metrics->vertBearingX+32) & -64; - metrics->vertBearingY = (metrics->vertBearingY+32) & -64; + metrics->vertBearingX = ( metrics->vertBearingX + 32 ) & -64; + metrics->vertBearingY = ( metrics->vertBearingY + 32 ) & -64; } }